clippy

Delete agent-stream-edits feature flag
Delete old create_file and edit_file tools.
2025-05-05 12:03:38 -04:00 · 2025-05-05 11:59:52 -04:00 · 2025-05-05 11:59:48 -04:00
239 changed files with 6385 additions and 13519 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -162,23 +162,13 @@ jobs:
        working-directory: ./docs
        run: |
          pnpm dlx prettier@${PRETTIER_VERSION} . --check || {
-            echo "To fix, run from the root of the Zed repo:"
+            echo "To fix, run from the root of the zed repo:"
            echo "  cd docs && pnpm dlx prettier@${PRETTIER_VERSION} . --write && cd .."
            false
          }
        env:
          PRETTIER_VERSION: 3.5.0

-      - name: Prettier Check on default.json
-        run: |
-          pnpm dlx prettier@${PRETTIER_VERSION} assets/settings/default.json --check || {
-            echo "To fix, run from the root of the Zed repo:"
-            echo "  pnpm dlx prettier@${PRETTIER_VERSION} assets/settings/default.json --write"
-            false
-          }
-        env:
-          PRETTIER_VERSION: 3.5.0
-
      # To support writing comments that they will certainly be revisited.
      - name: Check for todo! and FIXME comments
        run: script/check-todos
--- a/.prettierrc
+++ b/.prettierrc
@@ -1,3 +0,0 @@
-{
-  "printWidth": 120
-}
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -52,9 +52,9 @@ dependencies = [
 name = "agent"
 version = "0.1.0"
 dependencies = [
- "agent_settings",
 "anyhow",
 "assistant_context_editor",
+ "assistant_settings",
 "assistant_slash_command",
 "assistant_tool",
 "async-watch",
@@ -106,7 +106,6 @@ dependencies = [
 "rope",
 "rules_library",
 "schemars",
- "search",
 "serde",
 "serde_json",
 "serde_json_lenient",
@@ -125,7 +124,6 @@ dependencies = [
 "time_format",
 "ui",
 "ui_input",
- "urlencoding",
 "util",
 "uuid",
 "workspace",
@@ -134,31 +132,6 @@ dependencies = [
 "zed_llm_client",
 ]

-[[package]]
-name = "agent_settings"
-version = "0.1.0"
-dependencies = [
- "anthropic",
- "anyhow",
- "deepseek",
- "feature_flags",
- "fs",
- "gpui",
- "indexmap",
- "language_model",
- "lmstudio",
- "log",
- "ollama",
- "open_ai",
- "paths",
- "schemars",
- "serde",
- "serde_json",
- "serde_json_lenient",
- "settings",
- "workspace-hack",
-]
-
 [[package]]
 name = "ahash"
 version = "0.7.8"
@@ -500,9 +473,9 @@ dependencies = [
 name = "assistant"
 version = "0.1.0"
 dependencies = [
- "agent_settings",
 "anyhow",
 "assistant_context_editor",
+ "assistant_settings",
 "assistant_slash_command",
 "assistant_slash_commands",
 "assistant_tool",
@@ -510,6 +483,7 @@ dependencies = [
 "client",
 "collections",
 "command_palette_hooks",
+ "context_server",
 "ctor",
 "db",
 "editor",
@@ -562,8 +536,8 @@ dependencies = [
 name = "assistant_context_editor"
 version = "0.1.0"
 dependencies = [
- "agent_settings",
 "anyhow",
+ "assistant_settings",
 "assistant_slash_command",
 "assistant_slash_commands",
 "chrono",
@@ -614,6 +588,30 @@ dependencies = [
 "zed_actions",
 ]

+[[package]]
+name = "assistant_settings"
+version = "0.1.0"
+dependencies = [
+ "anthropic",
+ "anyhow",
+ "deepseek",
+ "feature_flags",
+ "fs",
+ "gpui",
+ "indexmap",
+ "language_model",
+ "lmstudio",
+ "log",
+ "ollama",
+ "open_ai",
+ "paths",
+ "schemars",
+ "serde",
+ "serde_json_lenient",
+ "settings",
+ "workspace-hack",
+]
+
 [[package]]
 name = "assistant_slash_command"
 version = "0.1.0"
@@ -711,9 +709,9 @@ dependencies = [
 name = "assistant_tools"
 version = "0.1.0"
 dependencies = [
- "agent_settings",
 "aho-corasick",
 "anyhow",
+ "assistant_settings",
 "assistant_tool",
 "buffer_diff",
 "chrono",
@@ -737,7 +735,6 @@ dependencies = [
 "language_model",
 "language_models",
 "linkme",
- "log",
 "open",
 "paths",
 "portable-pty",
@@ -764,7 +761,6 @@ dependencies = [
 "unindent",
 "util",
 "web_search",
- "which 6.0.3",
 "workspace",
 "workspace-hack",
 "zed_llm_client",
@@ -3238,7 +3234,6 @@ dependencies = [
 "gpui",
 "linkme",
 "parking_lot",
- "strum 0.27.1",
 "theme",
 "workspace-hack",
 ]
@@ -3254,7 +3249,6 @@ dependencies = [
 "collections",
 "component",
 "db",
- "futures 0.3.31",
 "gpui",
 "languages",
 "log",
@@ -3264,7 +3258,6 @@ dependencies = [
 "serde",
 "ui",
 "ui_input",
- "util",
 "workspace",
 "workspace-hack",
 ]
@@ -3334,22 +3327,43 @@ name = "context_server"
 version = "0.1.0"
 dependencies = [
 "anyhow",
+ "assistant_tool",
 "async-trait",
 "collections",
+ "command_palette_hooks",
+ "context_server_settings",
+ "extension",
 "futures 0.3.31",
 "gpui",
+ "icons",
+ "language_model",
 "log",
 "parking_lot",
 "postage",
- "schemars",
+ "project",
 "serde",
 "serde_json",
+ "settings",
 "smol",
 "url",
 "util",
 "workspace-hack",
 ]

+[[package]]
+name = "context_server_settings"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "collections",
+ "gpui",
+ "schemars",
+ "serde",
+ "serde_json",
+ "settings",
+ "workspace-hack",
+]
+
 [[package]]
 name = "convert_case"
 version = "0.4.0"
@@ -4101,7 +4115,6 @@ dependencies = [
 "anyhow",
 "async-trait",
 "dap",
- "futures 0.3.31",
 "gpui",
 "language",
 "lsp-types",
@@ -5004,7 +5017,6 @@ name = "eval"
 version = "0.1.0"
 dependencies = [
 "agent",
- "agent_settings",
 "anyhow",
 "assistant_tool",
 "assistant_tools",
@@ -5015,6 +5027,7 @@ dependencies = [
 "clap",
 "client",
 "collections",
+ "context_server",
 "dirs 4.0.0",
 "dotenv",
 "env_logger 0.11.8",
@@ -5167,6 +5180,7 @@ dependencies = [
 "async-trait",
 "client",
 "collections",
+ "context_server_settings",
 "ctor",
 "env_logger 0.11.8",
 "extension",
@@ -6064,9 +6078,9 @@ dependencies = [
 name = "git_ui"
 version = "0.1.0"
 dependencies = [
- "agent_settings",
 "anyhow",
 "askpass",
+ "assistant_settings",
 "buffer_diff",
 "chrono",
 "collections",
@@ -7299,7 +7313,6 @@ dependencies = [
 "lsp",
 "paths",
 "project",
- "proto",
 "regex",
 "serde_json",
 "settings",
@@ -7307,7 +7320,6 @@ dependencies = [
 "telemetry",
 "theme",
 "ui",
- "util",
 "workspace",
 "workspace-hack",
 "zed_actions",
@@ -11098,7 +11110,6 @@ dependencies = [
 "client",
 "clock",
 "collections",
- "context_server",
 "dap",
 "dap_adapters",
 "env_logger 0.11.8",
@@ -14748,7 +14759,6 @@ dependencies = [
 "log",
 "project",
 "rand 0.8.5",
- "regex",
 "schemars",
 "search",
 "serde",
@@ -18158,7 +18168,6 @@ dependencies = [
 "itertools 0.14.0",
 "language",
 "log",
- "menu",
 "node_runtime",
 "parking_lot",
 "postage",
@@ -18698,13 +18707,13 @@ version = "0.186.0"
 dependencies = [
 "activity_indicator",
 "agent",
- "agent_settings",
 "anyhow",
 "ashpd",
 "askpass",
 "assets",
 "assistant",
 "assistant_context_editor",
+ "assistant_settings",
 "assistant_tools",
 "async-watch",
 "audio",
@@ -18884,9 +18893,9 @@ dependencies = [

 [[package]]
 name = "zed_llm_client"
-version = "0.7.5"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fe0d60001c02d0d21a4114a13bee3a905fbb9e146ada80a90435c05fda18852"
+checksum = "2adf9bc80def4ec93c190f06eb78111865edc2576019a9753eaef6fd7bc3b72c"
 dependencies = [
 "anyhow",
 "serde",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,12 +3,12 @@ resolver = "2"
 members = [
    "crates/activity_indicator",
    "crates/agent",
-    "crates/agent_settings",
    "crates/anthropic",
    "crates/askpass",
    "crates/assets",
    "crates/assistant",
    "crates/assistant_context_editor",
+    "crates/assistant_settings",
    "crates/assistant_slash_command",
    "crates/assistant_slash_commands",
    "crates/assistant_tool",
@@ -34,6 +34,7 @@ members = [
    "crates/component",
    "crates/component_preview",
    "crates/context_server",
+    "crates/context_server_settings",
    "crates/copilot",
    "crates/credentials_provider",
    "crates/dap",
@@ -216,7 +217,7 @@ askpass = { path = "crates/askpass" }
 assets = { path = "crates/assets" }
 assistant = { path = "crates/assistant" }
 assistant_context_editor = { path = "crates/assistant_context_editor" }
-agent_settings = { path = "crates/agent_settings" }
+assistant_settings = { path = "crates/assistant_settings" }
 assistant_slash_command = { path = "crates/assistant_slash_command" }
 assistant_slash_commands = { path = "crates/assistant_slash_commands" }
 assistant_tool = { path = "crates/assistant_tool" }
@@ -242,6 +243,7 @@ command_palette_hooks = { path = "crates/command_palette_hooks" }
 component = { path = "crates/component" }
 component_preview = { path = "crates/component_preview" }
 context_server = { path = "crates/context_server" }
+context_server_settings = { path = "crates/context_server_settings" }
 copilot = { path = "crates/copilot" }
 credentials_provider = { path = "crates/credentials_provider" }
 dap = { path = "crates/dap" }
@@ -610,7 +612,7 @@ wasmtime-wasi = "29"
 which = "6.0.0"
 wit-component = "0.221"
 workspace-hack = "0.1.0"
-zed_llm_client = "0.7.5"
+zed_llm_client = "0.7.4"
 zstd = "0.11"

 [workspace.dependencies.async-stripe]
--- a/assets/images/ai_grid.svg
+++ b/assets/images/ai_grid.svg
@@ -1,334 +0,0 @@
-<svg width="400" height="92" viewBox="0 0 400 92" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_2501_1466)">
-<path d="M73.6743 -4.41071L75.5416 -1.32632L73.4126 1.58358" stroke="black" stroke-width="1.5"/>
-<path d="M71.6108 -2.99939L72.5445 -1.4572L71.48 -0.00224495" stroke="black" stroke-width="1.5"/>
-<path d="M69.0085 -0.710689L68.9169 1.38731C66.8498 1.29706 65.9887 1.25947 63.9216 1.16922L63.9478 0.569787L69.1524 -4.00755L69.1786 -4.60698L64.1833 -4.82507L64.0917 -2.72707" stroke="black" stroke-width="1.5"/>
-<path d="M91.1332 -5.23706C90.8807 -5.51263 90.529 -5.67673 90.1555 -5.69303C89.7821 -5.70934 89.4174 -5.57672 89.1418 -5.3242C88.8661 -5.07169 88.7021 -4.72001 88.6858 -4.34656C88.6694 -3.97312 88.8021 -3.60849 89.0546 -3.33281L95.4319 3.62501C95.5424 3.74604 95.681 3.83803 95.8356 3.89288L97.9807 4.64767C98.0234 4.66247 98.0692 4.66544 98.1133 4.65629C98.1576 4.64713 98.1984 4.62618 98.2317 4.59567C98.2649 4.56516 98.2894 4.52621 98.3023 4.48296C98.3152 4.43971 98.3161 4.39377 98.305 4.35003L97.7405 2.14679C97.6998 1.98827 97.6207 1.84218 97.5104 1.72135L91.1332 -5.23706Z" stroke="black" stroke-width="1.33" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M88.9944 0.874369L87.9954 0.83075" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M91.8171 5.0014L91.8608 4.00236" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M89.9062 2.91609L88.8635 3.87152" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<g clip-path="url(#clip1_2501_1466)">
-<mask id="mask0_2501_1466" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="109" y="-8" width="17" height="17">
-<path d="M125.843 -7.13772L109.858 -7.83563L109.16 8.14914L125.145 8.84705L125.843 -7.13772Z" fill="white"/>
-</mask>
-<g mask="url(#mask0_2501_1466)">
-<path d="M120.459 1.53575L120.368 3.63375C117.887 3.52545 116.854 3.48034 114.374 3.37204L114.4 2.77261L120.603 -1.76111L120.63 -2.36054L114.635 -2.62225L114.544 -0.524252" stroke="black" stroke-width="1.5"/>
-<path d="M110.899 2.71985L110.724 6.71604L114.221 6.86871" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M123.886 3.28688L123.712 7.28308L120.215 7.13041" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-</g>
-</g>
-<path d="M141.74 -4.44171L140.298 -0.625665C140.224 -0.430368 140.105 -0.255126 139.951 -0.114073C139.798 0.026993 139.613 0.129928 139.412 0.186449L135.484 1.29086L139.3 2.73335C139.496 2.80717 139.671 2.92583 139.812 3.07978C139.953 3.23371 140.056 3.41863 140.113 3.61962L141.217 7.54686L142.659 3.73082C142.733 3.53552 142.852 3.36028 143.006 3.21922C143.16 3.07816 143.345 2.97522 143.546 2.9187L147.473 1.81429L143.657 0.371802C143.462 0.297979 143.286 0.179319 143.145 0.0253739C143.004 -0.12856 142.901 -0.313477 142.845 -0.514465L141.74 -4.44171Z" fill="black" fill-opacity="0.15" stroke="black" stroke-width="1.42857" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M145.995 5.08642L145.879 7.75054M144.605 6.36028L147.269 6.4766" stroke="black" stroke-opacity="0.75" stroke-width="1.42857" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M169.583 -0.223267L171.45 2.86112L169.321 5.77102" stroke="black" stroke-width="1.5"/>
-<path d="M167.52 1.18805L168.453 2.73024L167.389 4.18519" stroke="black" stroke-width="1.5"/>
-<path d="M164.917 3.47675L164.826 5.57475C162.759 5.4845 161.897 5.4469 159.83 5.35666L159.856 4.75723L165.061 0.179892L165.087 -0.419537L160.092 -0.637634L160 1.46037" stroke="black" stroke-width="1.5"/>
-<g clip-path="url(#clip2_2501_1466)">
-<mask id="mask1_2501_1466" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="181" y="-5" width="17" height="17">
-<path d="M197.774 -3.99716L181.79 -4.69507L181.092 11.2897L197.076 11.9876L197.774 -3.99716Z" fill="white"/>
-</mask>
-<g mask="url(#mask1_2501_1466)">
-<path d="M192.391 4.67631L192.299 6.77432C189.819 6.66602 188.785 6.6209 186.305 6.5126L186.331 5.91317L192.535 1.37946L192.561 0.780027L186.567 0.518311L186.475 2.61631" stroke="black" stroke-width="1.5"/>
-<path d="M183.048 0.86515L183.223 -3.13104L186.719 -2.97837" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M196.036 1.43219L196.21 -2.56401L192.714 -2.71667" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M182.83 5.86041L182.656 9.85661L186.152 10.0093" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M195.818 6.42745L195.643 10.4236L192.147 10.271" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-</g>
-</g>
-<path d="M211.019 -0.00268162C210.766 -0.278258 210.415 -0.442354 210.041 -0.458659C209.668 -0.474965 209.303 -0.342345 209.028 -0.0898278C208.752 0.162689 208.588 0.514369 208.571 0.887811C208.555 1.26125 208.688 1.62589 208.94 1.90157L215.318 8.85938C215.428 8.98042 215.567 9.0724 215.721 9.12725L217.866 9.88204C217.909 9.89685 217.955 9.89982 217.999 9.89067C218.043 9.88151 218.084 9.86056 218.117 9.83004C218.151 9.79953 218.175 9.76058 218.188 9.71733C218.201 9.67408 218.202 9.62815 218.191 9.5844L217.626 7.38117C217.586 7.22265 217.506 7.07656 217.396 6.95572L211.019 -0.00268162Z" stroke="black" stroke-width="1.33" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M209.501 2.52063L211.587 0.609772" stroke="black" stroke-width="1.33" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M208.88 6.10874L207.881 6.06512" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M218.174 3.32983L219.173 3.37345" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M211.703 10.2358L211.747 9.23673" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M215.351 -0.797205L215.307 0.201843" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M209.792 8.15047L208.749 9.1059" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M217.262 1.28815L218.305 0.332718" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M241.514 2.91736L243.382 6.00174L241.253 8.91165" stroke="black" stroke-width="1.5"/>
-<path d="M239.451 4.32867L240.385 5.87087L239.32 7.32582" stroke="black" stroke-width="1.5"/>
-<path d="M236.849 6.61738L236.757 8.71538C234.69 8.62513 233.829 8.58753 231.762 8.49728L231.788 7.89785L236.993 3.32052L237.019 2.72109L232.023 2.50299L231.932 4.60099" stroke="black" stroke-width="1.5"/>
-<path d="M258.973 2.09101C258.721 1.81543 258.369 1.65134 257.996 1.63503C257.622 1.61872 257.258 1.75134 256.982 2.00386C256.706 2.25638 256.542 2.60806 256.526 2.9815C256.509 3.35494 256.642 3.71958 256.895 3.99525L263.272 10.9531C263.382 11.0741 263.521 11.1661 263.676 11.2209L265.821 11.9757C265.863 11.9905 265.909 11.9935 265.953 11.9844C265.998 11.9752 266.039 11.9542 266.072 11.9237C266.105 11.8932 266.129 11.8543 266.142 11.811C266.155 11.7678 266.156 11.7218 266.145 11.6781L265.581 9.47486C265.54 9.31634 265.461 9.17025 265.35 9.04941L258.973 2.09101Z" stroke="black" stroke-width="1.33" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M257.456 4.61432L259.541 2.70346" stroke="black" stroke-width="1.33" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M256.834 8.20243L255.835 8.15881" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M266.128 5.42352L267.127 5.46714" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M259.657 12.3295L259.701 11.3304" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M263.305 1.29648L263.262 2.29553" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M257.746 10.2442L256.704 11.1996" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M265.216 3.38184L266.259 2.42641" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<g clip-path="url(#clip3_2501_1466)">
-<mask id="mask2_2501_1466" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="277" y="-1" width="17" height="18">
-<path d="M293.683 0.190342L277.698 -0.507568L277 15.4772L292.985 16.1751L293.683 0.190342Z" fill="white"/>
-</mask>
-<g mask="url(#mask2_2501_1466)">
-<path d="M288.3 8.86381L288.208 10.9618C285.727 10.8535 284.694 10.8084 282.214 10.7001L282.24 10.1007L288.443 5.56696L288.47 4.96753L282.475 4.70581L282.384 6.80381" stroke="black" stroke-width="1.5"/>
-<path d="M278.957 5.05265L279.131 1.05646L282.628 1.20913" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M291.945 5.61969L292.119 1.62349L288.622 1.47083" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M278.739 10.0479L278.564 14.0441L282.061 14.1968" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M291.726 10.6149L291.552 14.6111L288.055 14.4585" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-</g>
-</g>
-<g clip-path="url(#clip4_2501_1466)">
-<path d="M309.58 2.88629L308.138 6.70234C308.064 6.89763 307.945 7.07288 307.792 7.21393C307.638 7.355 307.453 7.45793 307.252 7.51445L303.324 8.61886L307.141 10.0614C307.336 10.1352 307.511 10.2538 307.652 10.4078C307.793 10.5617 307.896 10.7466 307.953 10.9476L309.057 14.8749L310.5 11.0588C310.573 10.8635 310.692 10.6883 310.846 10.5472C311 10.4062 311.185 10.3032 311.386 10.2467L315.313 9.14229L311.497 7.6998C311.302 7.62598 311.126 7.50732 310.985 7.35338C310.844 7.19944 310.741 7.01453 310.685 6.81354L309.58 2.88629Z" fill="black" fill-opacity="0.15" stroke="black" stroke-width="1.42857" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M304.918 2.68273L304.802 5.34686M303.528 3.95664L306.192 4.07296" stroke="black" stroke-opacity="0.75" stroke-width="1.42857" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M313.836 12.4144L313.719 15.0785M312.446 13.6882L315.11 13.8045" stroke="black" stroke-opacity="0.75" stroke-width="1.42857" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<path d="M337.423 7.1048L339.29 10.1892L337.161 13.0991" stroke="black" stroke-width="1.5"/>
-<path d="M335.36 8.51611L336.293 10.0583L335.229 11.5133" stroke="black" stroke-width="1.5"/>
-<path d="M332.757 10.8048L332.666 12.9028C330.599 12.8126 329.737 12.775 327.67 12.6847L327.697 12.0853L332.901 7.50796L332.927 6.90853L327.932 6.69043L327.841 8.78843" stroke="black" stroke-width="1.5"/>
-<g clip-path="url(#clip5_2501_1466)">
-<mask id="mask3_2501_1466" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="348" y="2" width="18" height="18">
-<path d="M365.614 3.33091L349.63 2.633L348.932 18.6178L364.917 19.3157L365.614 3.33091Z" fill="white"/>
-</mask>
-<g mask="url(#mask3_2501_1466)">
-<path d="M360.231 12.0044L360.139 14.1024C357.659 13.9941 356.625 13.949 354.145 13.8407L354.171 13.2412L360.375 8.70752L360.401 8.10809L354.407 7.84637L354.315 9.94438" stroke="black" stroke-width="1.5"/>
-<path d="M350.888 8.19321L351.063 4.19702L354.559 4.34969" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M363.876 8.76025L364.05 4.76406L360.554 4.61139" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M350.67 13.1885L350.496 17.1847L353.992 17.3373" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M363.658 13.7555L363.483 17.7517L359.987 17.599" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-</g>
-</g>
-<path d="M378.859 7.32532C378.606 7.04974 378.255 6.88565 377.881 6.86934C377.508 6.85304 377.143 6.98566 376.868 7.23818C376.592 7.49069 376.428 7.84237 376.412 8.21581C376.395 8.58926 376.528 8.95389 376.78 9.22957L383.158 16.1874C383.268 16.3084 383.407 16.4004 383.561 16.4553L385.707 17.21C385.749 17.2249 385.795 17.2278 385.839 17.2187C385.883 17.2095 385.924 17.1886 385.958 17.158C385.991 17.1275 386.015 17.0886 386.028 17.0453C386.041 17.0021 386.042 16.9562 386.031 16.9124L385.466 14.7092C385.426 14.5507 385.347 14.4046 385.236 14.2837L378.859 7.32532Z" stroke="black" stroke-width="1.33" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M377.341 9.84863L379.427 7.93778" stroke="black" stroke-width="1.33" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M376.72 13.4367L375.721 13.3931" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M386.014 10.6578L387.013 10.7015" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M379.543 17.5638L379.587 16.5647" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M383.191 6.5308L383.147 7.52985" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M377.632 15.4785L376.589 16.4339" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M385.102 8.61615L386.145 7.66072" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<g clip-path="url(#clip6_2501_1466)">
-<mask id="mask4_2501_1466" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="58" y="46" width="18" height="17">
-<path d="M75.446 46.7152L59.4612 46.0173L58.7633 62.0021L74.748 62.7L75.446 46.7152Z" fill="white"/>
-</mask>
-<g mask="url(#mask4_2501_1466)">
-<path d="M70.0625 55.3887L69.9709 57.4867C67.4904 57.3784 66.457 57.3333 63.9766 57.225L64.0027 56.6256L70.2064 52.0919L70.2326 51.4924L64.2383 51.2307L64.1467 53.3287" stroke="black" stroke-width="1.5"/>
-<path d="M60.7198 51.5776L60.8943 47.5814L64.391 47.734" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M73.7074 52.1446L73.8819 48.1484L70.3853 47.9957" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M60.5017 56.5728L60.3272 60.569L63.8239 60.7217" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M73.4893 57.1399L73.3149 61.136L69.8182 60.9834" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-</g>
-</g>
-<path d="M91.3434 49.4113L89.9009 53.2273C89.8271 53.4226 89.7084 53.5978 89.5545 53.7389C89.4006 53.88 89.2156 53.9829 89.0147 54.0394L85.0874 55.1438L88.9035 56.5863C89.0988 56.6601 89.274 56.7788 89.415 56.9327C89.5561 57.0867 89.659 57.2716 89.7156 57.4726L90.82 61.3998L92.2625 57.5838C92.3363 57.3885 92.4549 57.2132 92.6089 57.0722C92.7628 56.9311 92.9477 56.8282 93.1487 56.7717L97.076 55.6673L93.2599 54.2248C93.0646 54.1509 92.8894 54.0323 92.7483 53.8783C92.6073 53.7244 92.5043 53.5395 92.4478 53.3385L91.3434 49.4113Z" fill="black" fill-opacity="0.15" stroke="black" stroke-width="1.42857" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M86.6812 49.2077L86.5649 51.8718M85.291 50.4816L87.9551 50.5979" stroke="black" stroke-opacity="0.75" stroke-width="1.42857" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M95.5984 58.9394L95.4821 61.6035M94.2082 60.2132L96.8723 60.3296" stroke="black" stroke-opacity="0.75" stroke-width="1.42857" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M112.668 51.7565C112.415 51.481 112.063 51.3169 111.69 51.3006C111.316 51.2843 110.952 51.4169 110.676 51.6694C110.401 51.9219 110.237 52.2736 110.22 52.647C110.204 53.0205 110.337 53.3851 110.589 53.6608L116.966 60.6186C117.077 60.7396 117.215 60.8316 117.37 60.8865L119.515 61.6413C119.558 61.6561 119.604 61.659 119.648 61.6499C119.692 61.6407 119.733 61.6198 119.766 61.5893C119.799 61.5587 119.824 61.5198 119.837 61.4765C119.85 61.4333 119.85 61.3874 119.839 61.3436L119.275 59.1404C119.234 58.9819 119.155 58.8358 119.045 58.7149L112.668 51.7565Z" stroke="black" stroke-width="1.33" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M111.15 54.2798L113.235 52.369" stroke="black" stroke-width="1.33" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M110.529 57.868L109.53 57.8243" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M119.822 55.0891L120.821 55.1327" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M113.352 61.995L113.395 60.9959" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M117 50.962L116.956 51.9611" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M111.441 59.9097L110.398 60.8651" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M118.911 53.0474L119.953 52.0919" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M143.163 54.6766L145.03 57.761L142.901 60.6709" stroke="black" stroke-width="1.5"/>
-<path d="M141.1 56.088L142.033 57.6301L140.969 59.0851" stroke="black" stroke-width="1.5"/>
-<path d="M138.497 58.3767L138.406 60.4747C136.339 60.3844 135.477 60.3468 133.41 60.2566L133.437 59.6571L138.641 55.0798L138.667 54.4804L133.672 54.2623L133.581 56.3603" stroke="black" stroke-width="1.5"/>
-<g clip-path="url(#clip7_2501_1466)">
-<mask id="mask5_2501_1466" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="154" y="50" width="18" height="17">
-<path d="M171.355 50.9027L155.37 50.2048L154.672 66.1895L170.657 66.8875L171.355 50.9027Z" fill="white"/>
-</mask>
-<g mask="url(#mask5_2501_1466)">
-<path d="M165.971 59.5762L165.88 61.6742C163.399 61.5659 162.366 61.5207 159.885 61.4124L159.911 60.813L166.115 56.2793L166.141 55.6799L160.147 55.4182L160.055 57.5162" stroke="black" stroke-width="1.5"/>
-<path d="M156.629 55.765L156.803 51.7688L160.3 51.9215" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M169.616 56.332L169.791 52.3358L166.294 52.1832" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M156.41 60.7603L156.236 64.7564L159.733 64.9091" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M169.398 61.3273L169.224 65.3235L165.727 65.1708" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-</g>
-</g>
-<path d="M187.252 53.5987L185.81 57.4147C185.736 57.61 185.617 57.7853 185.463 57.9263C185.309 58.0674 185.124 58.1703 184.923 58.2269L180.996 59.3313L184.812 60.7738C185.007 60.8476 185.183 60.9662 185.324 61.1202C185.465 61.2741 185.568 61.459 185.624 61.66L186.729 65.5873L188.171 61.7712C188.245 61.5759 188.364 61.4007 188.518 61.2596C188.672 61.1186 188.856 61.0156 189.057 60.9591L192.985 59.8547L189.169 58.4122C188.973 58.3384 188.798 58.2197 188.657 58.0658C188.516 57.9118 188.413 57.7269 188.357 57.5259L187.252 53.5987Z" fill="black" fill-opacity="0.15" stroke="black" stroke-width="1.42857" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M182.59 53.3951L182.474 56.0593M181.2 54.669L183.864 54.7854" stroke="black" stroke-opacity="0.75" stroke-width="1.42857" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M191.507 63.1268L191.391 65.7909M190.117 64.4007L192.781 64.517" stroke="black" stroke-opacity="0.75" stroke-width="1.42857" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M208.576 55.944C208.324 55.6685 207.972 55.5044 207.599 55.4881C207.225 55.4718 206.861 55.6044 206.585 55.8569C206.309 56.1094 206.145 56.4611 206.129 56.8345C206.113 57.208 206.245 57.5726 206.498 57.8483L212.875 64.8061C212.986 64.9271 213.124 65.0191 213.279 65.074L215.424 65.8288C215.466 65.8436 215.512 65.8465 215.556 65.8374C215.601 65.8282 215.642 65.8073 215.675 65.7768C215.708 65.7462 215.732 65.7073 215.745 65.664C215.758 65.6208 215.759 65.5749 215.748 65.5311L215.184 63.3279C215.143 63.1694 215.064 63.0233 214.953 62.9024L208.576 55.944Z" stroke="black" stroke-width="1.33" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M207.059 58.4673L209.144 56.5565" stroke="black" stroke-width="1.33" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M206.438 62.0555L205.438 62.0118" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M215.731 59.2766L216.73 59.3202" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M209.26 66.1825L209.304 65.1834" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M212.908 55.1495L212.865 56.1486" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M207.349 64.0972L206.307 65.0526" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M214.819 57.2349L215.862 56.2794" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M239.072 58.8641L240.939 61.9485L238.81 64.8584" stroke="black" stroke-width="1.5"/>
-<path d="M237.008 60.2754L237.942 61.8176L236.877 63.2725" stroke="black" stroke-width="1.5"/>
-<path d="M234.406 62.5641L234.314 64.6621C232.247 64.5718 231.386 64.5342 229.319 64.444L229.345 63.8446L234.55 59.2672L234.576 58.6678L229.581 58.4497L229.489 60.5477" stroke="black" stroke-width="1.5"/>
-<g clip-path="url(#clip8_2501_1466)">
-<mask id="mask6_2501_1466" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="250" y="54" width="18" height="18">
-<path d="M267.263 55.0902L251.278 54.3923L250.58 70.377L266.565 71.075L267.263 55.0902Z" fill="white"/>
-</mask>
-<g mask="url(#mask6_2501_1466)">
-<path d="M261.88 63.7637L261.788 65.8617C259.308 65.7534 258.274 65.7082 255.794 65.5999L255.82 65.0005L262.024 60.4668L262.05 59.8674L256.055 59.6057L255.964 61.7037" stroke="black" stroke-width="1.5"/>
-<path d="M252.537 59.9525L252.711 55.9563L256.208 56.109" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M265.525 60.5195L265.699 56.5233L262.202 56.3707" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M252.319 64.9478L252.144 68.9439L255.641 69.0966" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M265.306 65.5148L265.132 69.511L261.635 69.3583" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-</g>
-</g>
-<g clip-path="url(#clip9_2501_1466)">
-<path d="M283.161 57.7862L281.718 61.6022C281.644 61.7975 281.526 61.9728 281.372 62.1138C281.218 62.2549 281.033 62.3578 280.832 62.4144L276.905 63.5188L280.721 64.9613C280.916 65.0351 281.091 65.1537 281.232 65.3077C281.373 65.4616 281.476 65.6465 281.533 65.8475L282.637 69.7748L284.08 65.9587C284.154 65.7634 284.272 65.5882 284.426 65.4471C284.58 65.3061 284.765 65.2031 284.966 65.1466L288.893 64.0422L285.077 62.5997C284.882 62.5259 284.707 62.4072 284.566 62.2533C284.425 62.0993 284.322 61.9144 284.265 61.7134L283.161 57.7862Z" fill="black" fill-opacity="0.15" stroke="black" stroke-width="1.42857" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M278.499 57.5826L278.382 60.2468M277.108 58.8565L279.772 58.9729" stroke="black" stroke-opacity="0.75" stroke-width="1.42857" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M287.416 67.3143L287.3 69.9784M286.026 68.5881L288.69 68.7044" stroke="black" stroke-opacity="0.75" stroke-width="1.42857" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<path d="M304.485 60.1315C304.232 59.8559 303.881 59.6918 303.507 59.6755C303.134 59.6592 302.769 59.7918 302.494 60.0443C302.218 60.2968 302.054 60.6485 302.038 61.022C302.021 61.3954 302.154 61.76 302.406 62.0357L308.784 68.9935C308.894 69.1146 309.033 69.2066 309.187 69.2614L311.332 70.0162C311.375 70.031 311.421 70.034 311.465 70.0248C311.509 70.0157 311.55 69.9947 311.583 69.9642C311.617 69.9337 311.641 69.8947 311.654 69.8515C311.667 69.8082 311.668 69.7623 311.657 69.7186L311.092 67.5153C311.052 67.3568 310.973 67.2107 310.862 67.0899L304.485 60.1315Z" stroke="black" stroke-width="1.33" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M302.967 62.6548L305.053 60.7439" stroke="black" stroke-width="1.33" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M302.346 66.2429L301.347 66.1993" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M311.64 63.464L312.639 63.5076" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M305.169 70.3699L305.213 69.3709" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M308.817 59.337L308.773 60.336" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M303.258 68.2846L302.215 69.2401" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M310.728 61.4223L311.771 60.4669" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<g clip-path="url(#clip10_2501_1466)">
-<path d="M331.115 59.8799L329.673 63.6959C329.599 63.8912 329.48 64.0665 329.326 64.2075C329.172 64.3486 328.987 64.4515 328.786 64.508L324.859 65.6125L328.675 67.0549C328.87 67.1288 329.046 67.2474 329.187 67.4014C329.328 67.5553 329.431 67.7402 329.487 67.9412L330.592 71.8685L332.034 68.0524C332.108 67.8571 332.227 67.6819 332.381 67.5408C332.535 67.3998 332.719 67.2968 332.92 67.2403L336.848 66.1359L333.032 64.6934C332.836 64.6196 332.661 64.5009 332.52 64.347C332.379 64.193 332.276 64.0081 332.22 63.8071L331.115 59.8799Z" fill="black" fill-opacity="0.15" stroke="black" stroke-width="1.42857" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M326.453 59.6763L326.337 62.3404M325.063 60.9502L327.727 61.0666" stroke="black" stroke-opacity="0.75" stroke-width="1.42857" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M335.37 69.4079L335.254 72.0721M333.98 70.6818L336.644 70.7981" stroke="black" stroke-opacity="0.75" stroke-width="1.42857" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<path d="M358.958 64.0984L360.825 67.1828L358.696 70.0927" stroke="black" stroke-width="1.5"/>
-<path d="M356.894 65.5097L357.828 67.0519L356.763 68.5068" stroke="black" stroke-width="1.5"/>
-<path d="M354.292 67.7984L354.2 69.8964C352.133 69.8062 351.272 69.7686 349.205 69.6783L349.231 69.0789L354.436 64.5015L354.462 63.9021L349.467 63.684L349.375 65.782" stroke="black" stroke-width="1.5"/>
-<g clip-path="url(#clip11_2501_1466)">
-<mask id="mask7_2501_1466" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="370" y="59" width="18" height="18">
-<path d="M387.149 60.3245L371.164 59.6266L370.466 75.6114L386.451 76.3093L387.149 60.3245Z" fill="white"/>
-</mask>
-<g mask="url(#mask7_2501_1466)">
-<path d="M381.766 68.998L381.674 71.096C379.194 70.9877 378.16 70.9426 375.68 70.8343L375.706 70.2348L381.91 65.7011L381.936 65.1017L375.941 64.84L375.85 66.938" stroke="black" stroke-width="1.5"/>
-<path d="M372.423 65.1868L372.597 61.1906L376.094 61.3433" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M385.411 65.7538L385.585 61.7576L382.088 61.605" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M372.205 70.1821L372.03 74.1783L375.527 74.3309" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M385.192 70.7491L385.018 74.7453L381.521 74.5926" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-</g>
-</g>
-<path d="M402.246 69.8922L402.154 71.9902C400.087 71.8999 399.226 71.8623 397.159 71.7721L397.185 71.1726L402.39 66.5953L402.416 65.9959L397.421 65.7778L397.329 67.8758" stroke="black" stroke-width="1.5"/>
-<path d="M53.9459 21.166C53.6934 20.8904 53.3417 20.7263 52.9683 20.71C52.5948 20.6937 52.2302 20.8263 51.9545 21.0788C51.6789 21.3313 51.5149 21.683 51.4985 22.0565C51.4821 22.4299 51.6148 22.7945 51.8673 23.0702L58.2446 30.028C58.3551 30.1491 58.4938 30.241 58.6483 30.2959L60.7934 31.0507C60.8361 31.0655 60.8819 31.0685 60.9261 31.0593C60.9703 31.0501 61.0112 31.0292 61.0444 30.9987C61.0777 30.9682 61.1021 30.9292 61.115 30.886C61.1279 30.8427 61.1288 30.7968 61.1177 30.753L60.5533 28.5498C60.5126 28.3913 60.4335 28.2452 60.3231 28.1244L53.9459 21.166Z" stroke="black" stroke-width="1.33" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M52.4282 23.6893L54.5136 21.7784" stroke="black" stroke-width="1.33" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M51.8072 27.2774L50.8081 27.2338" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M61.1006 24.4985L62.0996 24.5421" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M54.6299 31.4044L54.6735 30.4054" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M58.278 20.3714L58.2344 21.3705" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M52.7189 29.3191L51.6763 30.2745" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M60.189 22.4568L61.2316 21.5014" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M84.4414 24.0861L86.3086 27.1704L84.1797 30.0803" stroke="black" stroke-width="1.5"/>
-<path d="M82.3779 25.4974L83.3115 27.0396L82.2471 28.4945" stroke="black" stroke-width="1.5"/>
-<path d="M79.7756 27.7861L79.684 29.8841C77.6169 29.7938 76.7558 29.7562 74.6887 29.666L74.7149 29.0666L79.9195 24.4892L79.9457 23.8898L74.9504 23.6717L74.8588 25.7697" stroke="black" stroke-width="1.5"/>
-<path d="M104.553 21.9613L103.111 25.7773C103.037 25.9726 102.918 26.1479 102.764 26.2889C102.611 26.43 102.426 26.5329 102.225 26.5895L98.2974 27.6939L102.113 29.1364C102.309 29.2102 102.484 29.3288 102.625 29.4828C102.766 29.6367 102.869 29.8216 102.926 30.0226L104.03 33.9499L105.472 30.1338C105.546 29.9385 105.665 29.7633 105.819 29.6222C105.973 29.4812 106.158 29.3782 106.359 29.3217L110.286 28.2173L106.47 26.7748C106.275 26.701 106.099 26.5823 105.958 26.4284C105.817 26.2745 105.714 26.0895 105.658 25.8885L104.553 21.9613Z" fill="black" fill-opacity="0.15" stroke="black" stroke-width="1.42857" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M99.8912 21.7577L99.7748 24.4219M98.5009 23.0317L101.165 23.148" stroke="black" stroke-opacity="0.75" stroke-width="1.42857" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M108.808 31.4894L108.692 34.1536M107.418 32.7633L110.082 32.8796" stroke="black" stroke-opacity="0.75" stroke-width="1.42857" stroke-linecap="round" stroke-linejoin="round"/>
-<g clip-path="url(#clip12_2501_1466)">
-<mask id="mask8_2501_1466" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="119" y="20" width="18" height="18">
-<path d="M136.61 21.359L120.625 20.6611L119.927 36.6459L135.912 37.3438L136.61 21.359Z" fill="white"/>
-</mask>
-<g mask="url(#mask8_2501_1466)">
-<path d="M131.227 30.0325L131.135 32.1305C128.654 32.0222 127.621 31.9771 125.141 31.8688L125.167 31.2694L131.37 26.7357L131.397 26.1362L125.402 25.8745L125.311 27.9725" stroke="black" stroke-width="1.5"/>
-<path d="M121.884 26.2214L122.058 22.2252L125.555 22.3778" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M134.872 26.7884L135.046 22.7922L131.549 22.6395" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M121.666 31.2166L121.491 35.2128L124.988 35.3655" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M134.653 31.7836L134.479 35.7798L130.982 35.6272" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-</g>
-</g>
-<path d="M149.855 25.3535C149.602 25.0779 149.25 24.9138 148.877 24.8975C148.504 24.8812 148.139 25.0138 147.863 25.2663C147.588 25.5188 147.424 25.8705 147.407 26.244C147.391 26.6174 147.524 26.982 147.776 27.2577L154.153 34.2155C154.264 34.3366 154.402 34.4285 154.557 34.4834L156.702 35.2382C156.745 35.253 156.791 35.256 156.835 35.2468C156.879 35.2376 156.92 35.2167 156.953 35.1862C156.986 35.1557 157.011 35.1167 157.024 35.0735C157.037 35.0302 157.038 34.9843 157.026 34.9405L156.462 32.7373C156.421 32.5788 156.342 32.4327 156.232 32.3119L149.855 25.3535Z" stroke="black" stroke-width="1.33" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M148.337 27.8768L150.422 25.9659" stroke="black" stroke-width="1.33" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M147.716 31.4649L146.717 31.4213" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M157.009 28.686L158.008 28.7296" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M150.539 35.5919L150.582 34.5929" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M154.187 24.5589L154.143 25.558" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M148.628 33.5066L147.585 34.462" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M156.098 26.6443L157.14 25.6889" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M180.35 28.2735L182.217 31.3579L180.088 34.2678" stroke="black" stroke-width="1.5"/>
-<path d="M178.287 29.6848L179.22 31.227L178.156 32.682" stroke="black" stroke-width="1.5"/>
-<path d="M175.684 31.9735L175.593 34.0715C173.526 33.9813 172.664 33.9437 170.597 33.8534L170.624 33.254L175.828 28.6767L175.854 28.0772L170.859 27.8591L170.768 29.9571" stroke="black" stroke-width="1.5"/>
-<path d="M200.462 26.1487L199.02 29.9648C198.946 30.1601 198.827 30.3353 198.673 30.4764C198.519 30.6174 198.334 30.7204 198.133 30.7769L194.206 31.8813L198.022 33.3238C198.217 33.3976 198.393 33.5163 198.534 33.6702C198.675 33.8242 198.778 34.0091 198.834 34.2101L199.939 38.1373L201.381 34.3213C201.455 34.126 201.574 33.9507 201.728 33.8097C201.881 33.6686 202.066 33.5657 202.267 33.5092L206.195 32.4047L202.379 30.9623C202.183 30.8884 202.008 30.7698 201.867 30.6158C201.726 30.4619 201.623 30.277 201.566 30.076L200.462 26.1487Z" fill="black" fill-opacity="0.15" stroke="black" stroke-width="1.42857" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M195.8 25.9452L195.684 28.6093M194.41 27.2191L197.074 27.3354" stroke="black" stroke-opacity="0.75" stroke-width="1.42857" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M204.717 35.6769L204.601 38.341M203.327 36.9507L205.991 37.0671" stroke="black" stroke-opacity="0.75" stroke-width="1.42857" stroke-linecap="round" stroke-linejoin="round"/>
-<g clip-path="url(#clip13_2501_1466)">
-<mask id="mask9_2501_1466" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="215" y="24" width="18" height="18">
-<path d="M232.519 25.5465L216.534 24.8486L215.836 40.8333L231.821 41.5313L232.519 25.5465Z" fill="white"/>
-</mask>
-<g mask="url(#mask9_2501_1466)">
-<path d="M227.135 34.22L227.044 36.318C224.563 36.2097 223.53 36.1645 221.049 36.0562L221.075 35.4568L227.279 30.9231L227.305 30.3237L221.311 30.062L221.219 32.16" stroke="black" stroke-width="1.5"/>
-<path d="M217.793 30.4088L217.967 26.4126L221.464 26.5653" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M230.78 30.9758L230.955 26.9796L227.458 26.827" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M217.574 35.4041L217.4 39.4002L220.897 39.5529" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M230.562 35.9711L230.388 39.9673L226.891 39.8146" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-</g>
-</g>
-<path d="M245.763 29.5409C245.511 29.2653 245.159 29.1012 244.786 29.0849C244.412 29.0686 244.048 29.2012 243.772 29.4538C243.496 29.7063 243.332 30.0579 243.316 30.4314C243.3 30.8048 243.432 31.1695 243.685 31.4451L250.062 38.403C250.173 38.524 250.311 38.616 250.466 38.6708L252.611 39.4256C252.654 39.4404 252.699 39.4434 252.743 39.4342C252.788 39.4251 252.829 39.4041 252.862 39.3736C252.895 39.3431 252.919 39.3042 252.932 39.2609C252.945 39.2177 252.946 39.1717 252.935 39.128L252.371 36.9247C252.33 36.7662 252.251 36.6201 252.141 36.4993L245.763 29.5409Z" stroke="black" stroke-width="1.33" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M244.246 32.0642L246.331 30.1534" stroke="black" stroke-width="1.33" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M243.625 35.6523L242.625 35.6087" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M252.918 32.8734L253.917 32.917" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M246.447 39.7794L246.491 38.7803" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M250.095 28.7464L250.052 29.7454" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M244.536 37.694L243.494 38.6495" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M252.006 30.8317L253.049 29.8763" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M276.259 32.461L278.126 35.5454L275.997 38.4553" stroke="black" stroke-width="1.5"/>
-<path d="M274.195 33.8723L275.129 35.4145L274.064 36.8695" stroke="black" stroke-width="1.5"/>
-<path d="M271.593 36.161L271.501 38.259C269.434 38.1688 268.573 38.1312 266.506 38.0409L266.532 37.4415L271.737 32.8642L271.763 32.2647L266.768 32.0466L266.676 34.1446" stroke="black" stroke-width="1.5"/>
-<g clip-path="url(#clip14_2501_1466)">
-<mask id="mask10_2501_1466" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="287" y="27" width="18" height="18">
-<path d="M304.45 28.687L288.465 27.9891L287.767 43.9739L303.752 44.6718L304.45 28.687Z" fill="white"/>
-</mask>
-<g mask="url(#mask10_2501_1466)">
-<path d="M299.067 37.3605L298.975 39.4585C296.495 39.3502 295.461 39.3051 292.981 39.1968L293.007 38.5974L299.211 34.0637L299.237 33.4642L293.242 33.2025L293.151 35.3005" stroke="black" stroke-width="1.5"/>
-<path d="M289.724 33.5494L289.898 29.5532L293.395 29.7058" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M302.712 34.1164L302.886 30.1202L299.389 29.9675" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M289.506 38.5446L289.331 42.5408L292.828 42.6935" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-<path d="M302.493 39.1117L302.319 43.1078L298.822 42.9552" stroke="black" stroke-opacity="0.5" stroke-width="1.5"/>
-</g>
-</g>
-<path d="M317.695 32.6815C317.442 32.4059 317.091 32.2419 316.717 32.2255C316.344 32.2092 315.979 32.3419 315.703 32.5944C315.428 32.8469 315.264 33.1986 315.247 33.572C315.231 33.9455 315.364 34.3101 315.616 34.5858L321.993 41.5436C322.104 41.6646 322.243 41.7566 322.397 41.8115L324.542 42.5662C324.585 42.5811 324.631 42.584 324.675 42.5749C324.719 42.5657 324.76 42.5448 324.793 42.5142C324.826 42.4837 324.851 42.4448 324.864 42.4015C324.877 42.3583 324.878 42.3124 324.866 42.2686L324.302 40.0654C324.261 39.9069 324.182 39.7608 324.072 39.6399L317.695 32.6815Z" stroke="black" stroke-width="1.33" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M316.177 35.2048L318.262 33.294" stroke="black" stroke-width="1.33" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M315.556 38.7929L314.557 38.7493" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M324.849 36.014L325.848 36.0577" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M318.379 42.92L318.422 41.9209" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M322.027 31.887L321.983 32.886" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M316.468 40.8347L315.425 41.7901" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M323.938 33.9724L324.98 33.0169" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M344.325 32.4299L342.882 36.246C342.809 36.4413 342.69 36.6165 342.536 36.7576C342.382 36.8986 342.197 37.0016 341.996 37.0581L338.069 38.1625L341.885 39.605C342.08 39.6788 342.255 39.7975 342.396 39.9514C342.538 40.1054 342.64 40.2903 342.697 40.4913L343.801 44.4185L345.244 40.6025C345.318 40.4072 345.436 40.2319 345.59 40.0909C345.744 39.9498 345.929 39.8469 346.13 39.7903L350.057 38.6859L346.241 37.2434C346.046 37.1696 345.871 37.051 345.73 36.897C345.589 36.7431 345.486 36.5582 345.429 36.3572L344.325 32.4299Z" fill="black" fill-opacity="0.15" stroke="black" stroke-width="1.42857" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M339.663 32.2264L339.546 34.8905M338.272 33.5003L340.937 33.6166" stroke="black" stroke-opacity="0.75" stroke-width="1.42857" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M348.58 41.9579L348.464 44.6221M347.19 43.2318L349.854 43.3481" stroke="black" stroke-opacity="0.75" stroke-width="1.42857" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M372.167 36.6484L374.035 39.7328L371.906 42.6427" stroke="black" stroke-width="1.5"/>
-<path d="M370.104 38.0598L371.038 39.6019L369.973 41.0569" stroke="black" stroke-width="1.5"/>
-<path d="M367.502 40.3485L367.41 42.4465C365.343 42.3562 364.482 42.3186 362.415 42.2284L362.441 41.6289L367.646 37.0516L367.672 36.4522L362.677 36.2341L362.585 38.3321" stroke="black" stroke-width="1.5"/>
-<path d="M392.279 34.5237L390.837 38.3397C390.763 38.535 390.644 38.7103 390.49 38.8513C390.336 38.9924 390.151 39.0953 389.95 39.1518L386.023 40.2563L389.839 41.6987C390.035 41.7726 390.21 41.8912 390.351 42.0452C390.492 42.1991 390.595 42.384 390.651 42.585L391.756 46.5123L393.198 42.6962C393.272 42.5009 393.391 42.3257 393.545 42.1846C393.699 42.0435 393.884 41.9406 394.085 41.8841L398.012 40.7797L394.196 39.3372C394 39.2634 393.825 39.1447 393.684 38.9908C393.543 38.8368 393.44 38.6519 393.384 38.4509L392.279 34.5237Z" fill="black" fill-opacity="0.15" stroke="black" stroke-width="1.42857" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M387.617 34.3201L387.501 36.9842M386.227 35.594L388.891 35.7103" stroke="black" stroke-opacity="0.75" stroke-width="1.42857" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M396.534 44.0517L396.418 46.7159M395.144 45.3256L397.808 45.4419" stroke="black" stroke-opacity="0.75" stroke-width="1.42857" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<defs>
-<clipPath id="clip0_2501_1466">
-<rect width="400" height="92" fill="white"/>
-</clipPath>
-<clipPath id="clip1_2501_1466">
-<rect width="16" height="16" fill="white" transform="translate(109.858 -7.83563) rotate(2.5)"/>
-</clipPath>
-<clipPath id="clip2_2501_1466">
-<rect width="16" height="16" fill="white" transform="translate(181.79 -4.69507) rotate(2.5)"/>
-</clipPath>
-<clipPath id="clip3_2501_1466">
-<rect width="16" height="16" fill="white" transform="translate(277.698 -0.507568) rotate(2.5)"/>
-</clipPath>
-<clipPath id="clip4_2501_1466">
-<rect width="16" height="16" fill="white" transform="translate(301.675 0.539246) rotate(2.5)"/>
-</clipPath>
-<clipPath id="clip5_2501_1466">
-<rect width="16" height="16" fill="white" transform="translate(349.63 2.633) rotate(2.5)"/>
-</clipPath>
-<clipPath id="clip6_2501_1466">
-<rect width="16" height="16" fill="white" transform="translate(59.4612 46.0173) rotate(2.5)"/>
-</clipPath>
-<clipPath id="clip7_2501_1466">
-<rect width="16" height="16" fill="white" transform="translate(155.37 50.2048) rotate(2.5)"/>
-</clipPath>
-<clipPath id="clip8_2501_1466">
-<rect width="16" height="16" fill="white" transform="translate(251.278 54.3923) rotate(2.5)"/>
-</clipPath>
-<clipPath id="clip9_2501_1466">
-<rect width="16" height="16" fill="white" transform="translate(275.256 55.4391) rotate(2.5)"/>
-</clipPath>
-<clipPath id="clip10_2501_1466">
-<rect width="16" height="16" fill="white" transform="translate(323.21 57.5328) rotate(2.5)"/>
-</clipPath>
-<clipPath id="clip11_2501_1466">
-<rect width="16" height="16" fill="white" transform="translate(371.164 59.6266) rotate(2.5)"/>
-</clipPath>
-<clipPath id="clip12_2501_1466">
-<rect width="16" height="16" fill="white" transform="translate(120.625 20.6611) rotate(2.5)"/>
-</clipPath>
-<clipPath id="clip13_2501_1466">
-<rect width="16" height="16" fill="white" transform="translate(216.534 24.8486) rotate(2.5)"/>
-</clipPath>
-<clipPath id="clip14_2501_1466">
-<rect width="16" height="16" fill="white" transform="translate(288.465 27.9891) rotate(2.5)"/>
-</clipPath>
-</defs>
-</svg>
--- a/assets/images/grid.svg
+++ b/assets/images/grid.svg
@@ -1,153 +0,0 @@
-<svg width="441" height="167" viewBox="0 0 441 167" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_2500_1167)">
-<path d="M440 3H441V98H440V3Z" fill="black"/>
-<path d="M429 3H430V98H429V3Z" fill="black"/>
-<path d="M418 3H419V98H418V3Z" fill="black"/>
-<path d="M407 3H408V98H407V3Z" fill="black"/>
-<path d="M396 3H397V98H396V3Z" fill="black"/>
-<path d="M385 3H386V98H385V3Z" fill="black"/>
-<path d="M374 0H375V95H374V0Z" fill="black"/>
-<path d="M308 0H309V95H308V0Z" fill="black"/>
-<path d="M242 0H243V95H242V0Z" fill="black"/>
-<path d="M429 -2H430V93H429V-2Z" fill="black"/>
-<path d="M429 -2H430V93H429V-2Z" fill="black"/>
-<path d="M441 11V12L202 12V11L441 11Z" fill="black"/>
-<path d="M441 22V23L202 23V22L441 22Z" fill="black"/>
-<path d="M441 33V34L202 34V33L441 33Z" fill="black"/>
-<path d="M441 44V45L202 45V44L441 44Z" fill="black"/>
-<path d="M441 55V56L202 56V55L441 55Z" fill="black"/>
-<path d="M440 66V67L201 67V66L440 66Z" fill="black"/>
-<path d="M440 77V78L201 78V77L440 77Z" fill="black"/>
-<path d="M363 0H364V95H363V0Z" fill="black"/>
-<path d="M297 0H298V95H297V0Z" fill="black"/>
-<path d="M231 0H232V95H231V0Z" fill="black"/>
-<path d="M418 -2H419V93H418V-2Z" fill="black"/>
-<path d="M352 0H353V95H352V0Z" fill="black"/>
-<path d="M286 0H287V95H286V0Z" fill="black"/>
-<path d="M220 0H221V95H220V0Z" fill="black"/>
-<path d="M407 -2H408V93H407V-2Z" fill="black"/>
-<path d="M341 0H342V95H341V0Z" fill="black"/>
-<path d="M275 0H276V95H275V0Z" fill="black"/>
-<path d="M396 -2H397V93H396V-2Z" fill="black"/>
-<path d="M330 0H331V95H330V0Z" fill="black"/>
-<path d="M264 0H265V95H264V0Z" fill="black"/>
-<path d="M198 0H199V95H198V0Z" fill="black"/>
-<path d="M385 -2H386V93H385V-2Z" fill="black"/>
-<path d="M319 0H320V95H319V0Z" fill="black"/>
-<path d="M253 0H254V95H253V0Z" fill="black"/>
-<path d="M187 0H188V95H187V0Z" fill="black"/>
-<path d="M231 3H232V98H231V3Z" fill="black"/>
-<path d="M220 3H221V98H220V3Z" fill="black"/>
-<path d="M209 3H210V98H209V3Z" fill="black"/>
-<path d="M198 3H199V98H198V3Z" fill="black"/>
-<path d="M187 3H188V98H187V3Z" fill="black"/>
-<path d="M176 3H177V98H176V3Z" fill="black"/>
-<path d="M165 0H166V95H165V0Z" fill="black"/>
-<path d="M99 0H100V95H99V0Z" fill="black"/>
-<path d="M33 0H34V95H33V0Z" fill="black"/>
-<path d="M220 -2H221V93H220V-2Z" fill="black"/>
-<path d="M220 -2H221V93H220V-2Z" fill="black"/>
-<path d="M232 11V12L-7 12V11L232 11Z" fill="black"/>
-<path d="M232 22V23L-7 23V22L232 22Z" fill="black"/>
-<path d="M232 33V34L-7 34V33L232 33Z" fill="black"/>
-<path d="M232 44V45L-7 45V44L232 44Z" fill="black"/>
-<path d="M232 55V56L-7 56V55L232 55Z" fill="black"/>
-<path d="M231 66V67L-8 67V66L231 66Z" fill="black"/>
-<path d="M231 77V78L-8 78V77L231 77Z" fill="black"/>
-<path d="M154 0H155V95H154V0Z" fill="black"/>
-<path d="M88 0H89V95H88V0Z" fill="black"/>
-<path d="M22 0H23V95H22V0Z" fill="black"/>
-<path d="M209 -2H210V93H209V-2Z" fill="black"/>
-<path d="M143 0H144V95H143V0Z" fill="black"/>
-<path d="M77 0H78V95H77V0Z" fill="black"/>
-<path d="M11 0H12V95H11V0Z" fill="black"/>
-<path d="M198 -2H199V93H198V-2Z" fill="black"/>
-<path d="M132 0H133V95H132V0Z" fill="black"/>
-<path d="M66 0H67V95H66V0Z" fill="black"/>
-<path d="M187 -2H188V93H187V-2Z" fill="black"/>
-<path d="M121 0H122V95H121V0Z" fill="black"/>
-<path d="M55 0H56V95H55V0Z" fill="black"/>
-<path d="M-11 0H-10V95H-11V0Z" fill="black"/>
-<path d="M176 -2H177V93H176V-2Z" fill="black"/>
-<path d="M110 0H111V95H110V0Z" fill="black"/>
-<path d="M44 0H45V95H44V0Z" fill="black"/>
-<path d="M-22 0H-21V95H-22V0Z" fill="black"/>
-<path d="M440 81H441V176H440V81Z" fill="black"/>
-<path d="M429 81H430V176H429V81Z" fill="black"/>
-<path d="M418 81H419V176H418V81Z" fill="black"/>
-<path d="M407 81H408V176H407V81Z" fill="black"/>
-<path d="M396 81H397V176H396V81Z" fill="black"/>
-<path d="M385 81H386V176H385V81Z" fill="black"/>
-<path d="M374 78H375V173H374V78Z" fill="black"/>
-<path d="M308 78H309V173H308V78Z" fill="black"/>
-<path d="M242 78H243V173H242V78Z" fill="black"/>
-<path d="M429 76H430V171H429V76Z" fill="black"/>
-<path d="M429 76H430V171H429V76Z" fill="black"/>
-<path d="M441 89V90L202 90V89L441 89Z" fill="black"/>
-<path d="M441 100V101L202 101V100L441 100Z" fill="black"/>
-<path d="M441 111V112L202 112V111L441 111Z" fill="black"/>
-<path d="M441 122V123L202 123V122L441 122Z" fill="black"/>
-<path d="M441 133V134L202 134V133L441 133Z" fill="black"/>
-<path d="M440 144V145L201 145V144L440 144Z" fill="black"/>
-<path d="M440 155V156L201 156V155L440 155Z" fill="black"/>
-<path d="M363 78H364V173H363V78Z" fill="black"/>
-<path d="M297 78H298V173H297V78Z" fill="black"/>
-<path d="M231 78L232 78V173H231V78Z" fill="black"/>
-<path d="M418 76H419V171H418V76Z" fill="black"/>
-<path d="M352 78H353V173H352V78Z" fill="black"/>
-<path d="M286 78H287V173H286V78Z" fill="black"/>
-<path d="M220 78H221V173H220V78Z" fill="black"/>
-<path d="M407 76H408V171H407V76Z" fill="black"/>
-<path d="M341 78H342V173H341V78Z" fill="black"/>
-<path d="M275 78H276V173H275V78Z" fill="black"/>
-<path d="M396 76H397V171H396V76Z" fill="black"/>
-<path d="M330 78H331V173H330V78Z" fill="black"/>
-<path d="M264 78H265V173H264V78Z" fill="black"/>
-<path d="M198 78H199V173H198V78Z" fill="black"/>
-<path d="M385 76H386V171H385V76Z" fill="black"/>
-<path d="M319 78H320V173H319V78Z" fill="black"/>
-<path d="M253 78H254V173H253V78Z" fill="black"/>
-<path d="M187 78H188V173H187V78Z" fill="black"/>
-<path d="M231 81H232V176H231V81Z" fill="black"/>
-<path d="M220 81H221V176H220V81Z" fill="black"/>
-<path d="M209 81H210V176H209V81Z" fill="black"/>
-<path d="M198 81H199V176H198V81Z" fill="black"/>
-<path d="M187 81H188V176H187V81Z" fill="black"/>
-<path d="M176 81H177V176H176V81Z" fill="black"/>
-<path d="M165 78H166V173H165V78Z" fill="black"/>
-<path d="M99 78H100V173H99V78Z" fill="black"/>
-<path d="M33 78H34V173H33V78Z" fill="black"/>
-<path d="M220 76H221V171H220V76Z" fill="black"/>
-<path d="M220 76H221V171H220V76Z" fill="black"/>
-<path d="M232 89V90L-7 90V89L232 89Z" fill="black"/>
-<path d="M232 100V101L-7 101V100L232 100Z" fill="black"/>
-<path d="M232 111V112L-7 112V111L232 111Z" fill="black"/>
-<path d="M232 122V123L-7 123V122L232 122Z" fill="black"/>
-<path d="M232 133V134L-7 134V133L232 133Z" fill="black"/>
-<path d="M231 144V145L-8 145V144L231 144Z" fill="black"/>
-<path d="M231 155V156L-8 156V155L231 155Z" fill="black"/>
-<path d="M154 78H155V173H154V78Z" fill="black"/>
-<path d="M88 78H89V173H88V78Z" fill="black"/>
-<path d="M22 78H23V173H22V78Z" fill="black"/>
-<path d="M209 76H210V171H209V76Z" fill="black"/>
-<path d="M143 78H144V173H143V78Z" fill="black"/>
-<path d="M77 78H78V173H77V78Z" fill="black"/>
-<path d="M11 78H12V173H11V78Z" fill="black"/>
-<path d="M198 76H199V171H198V76Z" fill="black"/>
-<path d="M132 78H133V173H132V78Z" fill="black"/>
-<path d="M66 78H67V173H66V78Z" fill="black"/>
-<path d="M187 76H188V171H187V76Z" fill="black"/>
-<path d="M121 78H122V173H121V78Z" fill="black"/>
-<path d="M55 78H56V173H55V78Z" fill="black"/>
-<path d="M-11 78H-10V173H-11V78Z" fill="black"/>
-<path d="M176 76H177V171H176V76Z" fill="black"/>
-<path d="M110 78H111V173H110V78Z" fill="black"/>
-<path d="M44 78H45V173H44V78Z" fill="black"/>
-<path d="M-22 78H-21V173H-22V78Z" fill="black"/>
-</g>
-<defs>
-<clipPath id="clip0_2500_1167">
-<rect width="441" height="167" fill="white"/>
-</clipPath>
-</defs>
-</svg>
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -220,9 +220,9 @@
      "ctrl-shift-e": "project_panel::ToggleFocus",
      "ctrl-g": "search::SelectNextMatch",
      "ctrl-shift-g": "search::SelectPreviousMatch",
-      "ctrl-alt-/": "agent::ToggleModelSelector",
+      "ctrl-alt-/": "assistant::ToggleModelSelector",
      "ctrl-k h": "assistant::DeployHistory",
-      "ctrl-k l": "agent::OpenRulesLibrary",
+      "ctrl-k l": "assistant::OpenRulesLibrary",
      "new": "assistant::NewChat",
      "ctrl-t": "assistant::NewChat",
      "ctrl-n": "assistant::NewChat"
@@ -237,7 +237,7 @@
      "save": "workspace::Save",
      "ctrl->": "assistant::QuoteSelection",
      "ctrl-<": "assistant::InsertIntoEditor",
-      "ctrl-alt-/": "agent::ToggleModelSelector",
+      "ctrl-alt-/": "assistant::ToggleModelSelector",
      "shift-enter": "assistant::Split",
      "ctrl-r": "assistant::CycleMessageRole",
      "enter": "assistant::ConfirmCommand",
@@ -251,9 +251,9 @@
      "ctrl-alt-n": "agent::NewTextThread",
      "ctrl-shift-h": "agent::OpenHistory",
      "ctrl-alt-c": "agent::OpenConfiguration",
-      "ctrl-alt-p": "agent::OpenRulesLibrary",
+      "ctrl-alt-p": "assistant::OpenRulesLibrary",
      "ctrl-i": "agent::ToggleProfileSelector",
-      "ctrl-alt-/": "agent::ToggleModelSelector",
+      "ctrl-alt-/": "assistant::ToggleModelSelector",
      "ctrl-shift-a": "agent::ToggleContextPicker",
      "ctrl-shift-o": "agent::ToggleNavigationMenu",
      "ctrl-shift-i": "agent::ToggleOptionsMenu",
@@ -568,7 +568,7 @@
      "ctrl-shift-e": "project_panel::ToggleFocus",
      "ctrl-shift-b": "outline_panel::ToggleFocus",
      "ctrl-shift-g": "git_panel::ToggleFocus",
-      "ctrl-?": "agent::ToggleFocus",
+      "ctrl-?": "assistant::ToggleFocus",
      "alt-save": "workspace::SaveAll",
      "ctrl-alt-s": "workspace::SaveAll",
      "ctrl-k m": "language_selector::Toggle",
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -266,9 +266,9 @@
      "cmd-shift-e": "project_panel::ToggleFocus",
      "cmd-g": "search::SelectNextMatch",
      "cmd-shift-g": "search::SelectPreviousMatch",
-      "cmd-alt-/": "agent::ToggleModelSelector",
+      "cmd-alt-/": "assistant::ToggleModelSelector",
      "cmd-k h": "assistant::DeployHistory",
-      "cmd-k l": "agent::OpenRulesLibrary",
+      "cmd-k l": "assistant::OpenRulesLibrary",
      "cmd-t": "assistant::NewChat",
      "cmd-n": "assistant::NewChat"
    }
@@ -282,14 +282,11 @@
      "cmd-s": "workspace::Save",
      "cmd->": "assistant::QuoteSelection",
      "cmd-<": "assistant::InsertIntoEditor",
+      "cmd-alt-/": "assistant::ToggleModelSelector",
      "shift-enter": "assistant::Split",
      "ctrl-r": "assistant::CycleMessageRole",
      "enter": "assistant::ConfirmCommand",
-      "alt-enter": "editor::Newline",
-      "cmd-k c": "assistant::CopyCode",
-      "cmd-g": "search::SelectNextMatch",
-      "cmd-shift-g": "search::SelectPreviousMatch",
-      "cmd-k l": "agent::OpenRulesLibrary"
+      "alt-enter": "editor::Newline"
    }
  },
  {
@@ -300,15 +297,14 @@
      "cmd-alt-n": "agent::NewTextThread",
      "cmd-shift-h": "agent::OpenHistory",
      "cmd-alt-c": "agent::OpenConfiguration",
-      "cmd-alt-p": "agent::OpenRulesLibrary",
+      "cmd-alt-p": "assistant::OpenRulesLibrary",
      "cmd-i": "agent::ToggleProfileSelector",
-      "cmd-alt-/": "agent::ToggleModelSelector",
+      "cmd-alt-/": "assistant::ToggleModelSelector",
      "cmd-shift-a": "agent::ToggleContextPicker",
      "cmd-shift-o": "agent::ToggleNavigationMenu",
      "cmd-shift-i": "agent::ToggleOptionsMenu",
      "shift-escape": "agent::ExpandMessageEditor",
-      "cmd-alt-e": "agent::RemoveAllContext",
-      "cmd-shift-e": "project_panel::ToggleFocus"
+      "cmd-alt-e": "agent::RemoveAllContext"
    }
  },
  {
@@ -639,7 +635,7 @@
      "cmd-shift-e": "project_panel::ToggleFocus",
      "cmd-shift-b": "outline_panel::ToggleFocus",
      "ctrl-shift-g": "git_panel::ToggleFocus",
-      "cmd-?": "agent::ToggleFocus",
+      "cmd-?": "assistant::ToggleFocus",
      "cmd-alt-s": "workspace::SaveAll",
      "cmd-k m": "language_selector::Toggle",
      "escape": "workspace::Unfollow",
@@ -778,7 +774,7 @@
    "use_key_equivalents": true,
    "bindings": {
      "cmd-shift-a": "agent::ToggleContextPicker",
-      "cmd-alt-/": "agent::ToggleModelSelector",
+      "cmd-alt-/": "assistant::ToggleModelSelector",
      "cmd-alt-e": "agent::RemoveAllContext",
      "ctrl-[": "assistant::CyclePreviousInlineAssist",
      "ctrl-]": "assistant::CycleNextInlineAssist"
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -67,8 +67,6 @@
  "ui_font_weight": 400,
  // The default font size for text in the UI
  "ui_font_size": 16,
-  // The default font size for text in the agent panel
-  "agent_font_size": 16,
  // How much to fade out unused code.
  "unnecessary_code_fade": 0.3,
  // Active pane styling settings.
@@ -307,15 +305,6 @@
    // Whether to show agent review buttons in the editor toolbar.
    "agent_review": true
  },
-  // Titlebar related settings
-  "title_bar": {
-    // Whether to show the branch icon beside branch switcher in the titlebar.
-    "show_branch_icon": false,
-    // Whether to show onboarding banners in the titlebar.
-    "show_onboarding_banner": true,
-    // Whether to show user picture in the titlebar.
-    "show_user_picture": true
-  },
  // Scrollbar related settings
  "scrollbar": {
    // When to show the scrollbar in the editor.
@@ -641,27 +630,27 @@
    // Default width of the notification panel.
    "default_width": 380
  },
-  "agent": {
+  "assistant": {
    // Version of this setting.
    "version": "2",
-    // Whether the agent is enabled.
+    // Whether the assistant is enabled.
    "enabled": true,
-    // Whether to show the agent panel button in the status bar.
+    // Whether to show the assistant panel button in the status bar.
    "button": true,
-    // Where to dock the agent panel. Can be 'left', 'right' or 'bottom'.
+    // Where to dock the assistant panel. Can be 'left', 'right' or 'bottom'.
    "dock": "right",
-    // Default width when the agent panel is docked to the left or right.
+    // Default width when the assistant is docked to the left or right.
    "default_width": 640,
-    // Default height when the agent panel is docked to the bottom.
+    // Default height when the assistant is docked to the bottom.
    "default_height": 320,
-    // The default model to use when creating new threads.
+    // The default model to use when creating new chats.
    "default_model": {
      // The provider to use.
      "provider": "zed.dev",
      // The model to use.
      "model": "claude-3-7-sonnet-latest"
    },
-    // The model to use when applying edits from the agent.
+    // The model to use when applying edits from the assistant.
    "editor_model": {
      // The provider to use.
      "provider": "zed.dev",
@@ -682,7 +671,6 @@
        "tools": {
          "copy_path": true,
          "create_directory": true,
-          "create_file": true,
          "delete_path": true,
          "diagnostics": true,
          "edit_file": true,
@@ -716,13 +704,13 @@
          "web_search": true
        }
      },
-      "minimal": {
-        "name": "Minimal",
+      "manual": {
+        "name": "Manual",
        "enable_all_context_servers": false,
        "tools": {}
      }
    },
-    // Where to show notifications when the agent has either completed
+    // Where to show notifications when an agent has either completed
    // its response, or else needs confirmation before it can run a
    // tool action.
    // "primary_screen" - Show the notification only on your primary screen (default)
@@ -912,8 +900,6 @@
  "hard_tabs": false,
  // How many columns a tab should occupy.
  "tab_size": 4,
-  // What debuggers are preferred by default for all languages.
-  "debuggers": [],
  // Control what info is collected by Zed.
  "telemetry": {
    // Send debug info like crash reports.
@@ -1029,9 +1015,9 @@
    // 2. Display predictions inline only when holding a modifier key (alt by default).
    //     "mode": "subtle"
    "mode": "eager",
-    // Whether edit predictions are enabled when editing text threads.
+    // Whether edit predictions are enabled in the assistant panel.
    // This setting has no effect if globally disabled.
-    "enabled_in_text_threads": true
+    "enabled_in_assistant": true
  },
  // Settings specific to journaling
  "journal": {
@@ -1333,9 +1319,6 @@
    "Elixir": {
      "language_servers": ["elixir-ls", "!next-ls", "!lexical", "..."]
    },
-    "Elm": {
-      "tab_size": 4
-    },
    "Erlang": {
      "language_servers": ["erlang-ls", "!elp", "..."]
    },
@@ -1610,6 +1593,8 @@
  //   "W": "workspace::Save"
  // }
  "command_aliases": {},
+  // Whether to show user picture in titlebar.
+  "show_user_picture": true,
  // ssh_connections is an array of ssh connections.
  // You can configure these from `project: Open Remote` in the command palette.
  // Zed's ssh support will pull configuration from your ~/.ssh too.
@@ -1626,7 +1611,7 @@
  //   }
  // ]
  "ssh_connections": [],
-  // Configures context servers for use by the agent.
+  // Configures context servers for use in the Assistant.
  "context_servers": {},
  "debugger": {
    "stepping_granularity": "line",
--- a/crates/activity_indicator/src/activity_indicator.rs
+++ b/crates/activity_indicator/src/activity_indicator.rs
@@ -84,6 +84,19 @@ impl ActivityIndicator {
            })
            .detach();

+            let mut status_events = languages.dap_server_binary_statuses();
+            cx.spawn(async move |this, cx| {
+                while let Some((name, status)) = status_events.next().await {
+                    this.update(cx, |this, cx| {
+                        this.statuses.retain(|s| s.name != name);
+                        this.statuses.push(ServerStatus { name, status });
+                        cx.notify();
+                    })?;
+                }
+                anyhow::Ok(())
+            })
+            .detach();
+
            cx.subscribe(
                &project.read(cx).lsp_store(),
                |_, _, event, cx| match event {
--- a/crates/agent/Cargo.toml
+++ b/crates/agent/Cargo.toml
@@ -21,7 +21,7 @@ test-support = [
 [dependencies]
 anyhow.workspace = true
 assistant_context_editor.workspace = true
-agent_settings.workspace = true
+assistant_settings.workspace = true
 assistant_slash_command.workspace = true
 assistant_tool.workspace = true
 async-watch.workspace = true
@@ -64,14 +64,13 @@ paths.workspace = true
 picker.workspace = true
 postage.workspace = true
 project.workspace = true
+rules_library.workspace = true
 prompt_store.workspace = true
 proto.workspace = true
 ref-cast.workspace = true
 release_channel.workspace = true
 rope.workspace = true
-rules_library.workspace = true
 schemars.workspace = true
-search.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 serde_json_lenient.workspace = true
@@ -90,7 +89,6 @@ time.workspace = true
 time_format.workspace = true
 ui.workspace = true
 ui_input.workspace = true
-urlencoding.workspace = true
 util.workspace = true
 uuid.workspace = true
 workspace-hack.workspace = true
--- a/crates/agent/src/active_thread.rs
+++ b/crates/agent/src/active_thread.rs
@@ -1,4 +1,3 @@
-use crate::AssistantPanel;
 use crate::context::{AgentContextHandle, RULES_ICON};
 use crate::context_picker::{ContextPicker, MentionLink};
 use crate::context_store::ContextStore;
@@ -7,13 +6,14 @@ use crate::thread::{
    LastRestoreCheckpoint, MessageId, MessageSegment, Thread, ThreadError, ThreadEvent,
    ThreadFeedback,
 };
-use crate::thread_store::{RulesLoadingError, TextThreadStore, ThreadStore};
+use crate::thread_store::{RulesLoadingError, ThreadStore};
 use crate::tool_use::{PendingToolUseStatus, ToolUse};
 use crate::ui::{
    AddedContext, AgentNotification, AgentNotificationEvent, AnimatedLabel, ContextPill,
 };
-use agent_settings::{AgentSettings, NotifyWhenAgentWaiting};
+use crate::{AssistantPanel, OpenActiveThreadAsMarkdown};
 use anyhow::Context as _;
+use assistant_settings::{AssistantSettings, NotifyWhenAgentWaiting};
 use assistant_tool::ToolUseStatus;
 use collections::{HashMap, HashSet};
 use editor::actions::{MoveUp, Paste};
@@ -35,7 +35,7 @@ use markdown::parser::{CodeBlockKind, CodeBlockMetadata};
 use markdown::{HeadingLevelStyles, Markdown, MarkdownElement, MarkdownStyle, ParsedMarkdown};
 use project::{ProjectEntryId, ProjectItem as _};
 use rope::Point;
-use settings::{Settings as _, SettingsStore, update_settings_file};
+use settings::{Settings as _, update_settings_file};
 use std::ffi::OsStr;
 use std::path::Path;
 use std::rc::Rc;
@@ -43,7 +43,6 @@ use std::sync::Arc;
 use std::time::Duration;
 use text::ToPoint;
 use theme::ThemeSettings;
-use ui::utils::WithRemSize;
 use ui::{
    Disclosure, IconButton, KeyBinding, PopoverMenuHandle, Scrollbar, ScrollbarState, TextSize,
    Tooltip, prelude::*,
@@ -57,7 +56,6 @@ pub struct ActiveThread {
    context_store: Entity<ContextStore>,
    language_registry: Arc<LanguageRegistry>,
    thread_store: Entity<ThreadStore>,
-    text_thread_store: Entity<TextThreadStore>,
    thread: Entity<Thread>,
    workspace: WeakEntity<Workspace>,
    save_thread_task: Option<Task<()>>,
@@ -177,7 +175,7 @@ fn parse_markdown(
    cx.new(|cx| Markdown::new(text, Some(language_registry), None, cx))
 }

-pub(crate) fn default_markdown_style(window: &Window, cx: &App) -> MarkdownStyle {
+fn default_markdown_style(window: &Window, cx: &App) -> MarkdownStyle {
    let theme_settings = ThemeSettings::get_global(cx);
    let colors = cx.theme().colors();
    let ui_font_size = TextSize::Default.rems(cx);
@@ -721,15 +719,6 @@ fn open_markdown_link(
                });
            }
        }),
-        Some(MentionLink::TextThread(path)) => workspace.update(cx, |workspace, cx| {
-            if let Some(panel) = workspace.panel::<AssistantPanel>(cx) {
-                panel.update(cx, |panel, cx| {
-                    panel
-                        .open_saved_prompt_editor(path, window, cx)
-                        .detach_and_log_err(cx);
-                });
-            }
-        }),
        Some(MentionLink::Fetch(url)) => cx.open_url(&url),
        Some(MentionLink::Rule(prompt_id)) => window.dispatch_action(
            Box::new(OpenRulesLibrary {
@@ -754,7 +743,6 @@ impl ActiveThread {
    pub fn new(
        thread: Entity<Thread>,
        thread_store: Entity<ThreadStore>,
-        text_thread_store: Entity<TextThreadStore>,
        context_store: Entity<ContextStore>,
        language_registry: Arc<LanguageRegistry>,
        workspace: WeakEntity<Workspace>,
@@ -765,7 +753,6 @@ impl ActiveThread {
            cx.observe(&thread, |_, _, cx| cx.notify()),
            cx.subscribe_in(&thread, window, Self::handle_thread_event),
            cx.subscribe(&thread_store, Self::handle_rules_loading_error),
-            cx.observe_global::<SettingsStore>(|_, cx| cx.notify()),
        ];

        let list_state = ListState::new(0, ListAlignment::Bottom, px(2048.), {
@@ -778,7 +765,6 @@ impl ActiveThread {
        let mut this = Self {
            language_registry,
            thread_store,
-            text_thread_store,
            context_store,
            thread: thread.clone(),
            workspace,
@@ -858,18 +844,6 @@ impl ActiveThread {
            .map(|(id, state)| (*id, state.last_estimated_token_count.unwrap_or(0)))
    }

-    pub fn context_store(&self) -> &Entity<ContextStore> {
-        &self.context_store
-    }
-
-    pub fn thread_store(&self) -> &Entity<ThreadStore> {
-        &self.thread_store
-    }
-
-    pub fn text_thread_store(&self) -> &Entity<TextThreadStore> {
-        &self.text_thread_store
-    }
-
    fn push_message(
        &mut self,
        id: &MessageId,
@@ -1096,22 +1070,6 @@ impl ActiveThread {
                    cx,
                );
            }
-            ThreadEvent::MissingToolUse {
-                tool_use_id,
-                ui_text,
-            } => {
-                self.render_tool_use_markdown(
-                    tool_use_id.clone(),
-                    ui_text,
-                    "",
-                    self.thread
-                        .read(cx)
-                        .output_for_tool(tool_use_id)
-                        .map(|output| output.clone().into())
-                        .unwrap_or("".into()),
-                    cx,
-                );
-            }
        }
    }

@@ -1145,7 +1103,7 @@ impl ActiveThread {
            .summary()
            .unwrap_or("Agent Panel".into());

-        match AgentSettings::get_global(cx).notify_when_agent_waiting {
+        match AssistantSettings::get_global(cx).notify_when_agent_waiting {
            NotifyWhenAgentWaiting::PrimaryScreen => {
                if let Some(primary) = cx.primary_display() {
                    self.pop_up(icon, caption.into(), title.clone(), window, primary, cx);
@@ -1290,7 +1248,6 @@ impl ActiveThread {
            self.workspace.clone(),
            self.context_store.downgrade(),
            self.thread_store.downgrade(),
-            self.text_thread_store.downgrade(),
            window,
            cx,
        );
@@ -1312,7 +1269,6 @@ impl ActiveThread {
                self.context_store.clone(),
                self.workspace.clone(),
                Some(self.thread_store.downgrade()),
-                Some(self.text_thread_store.downgrade()),
                context_picker_menu_handle.clone(),
                SuggestContextKind::File,
                window,
@@ -1695,14 +1651,12 @@ impl ActiveThread {
    fn render_edit_message_editor(
        &self,
        state: &EditingMessageState,
-        _window: &mut Window,
+        window: &mut Window,
        cx: &Context<Self>,
    ) -> impl IntoElement {
        let settings = ThemeSettings::get_global(cx);
-        let font_size = TextSize::Small
-            .rems(cx)
-            .to_pixels(settings.agent_font_size(cx));
-        let line_height = font_size * 1.75;
+        let font_size = TextSize::Small.rems(cx);
+        let line_height = font_size.to_pixels(window.rem_size()) * 1.75;

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

@@ -1786,15 +1740,8 @@ impl ActiveThread {
            .icon_size(IconSize::XSmall)
            .icon_color(Color::Ignored)
            .tooltip(Tooltip::text("Open Thread as Markdown"))
-            .on_click({
-                let thread = self.thread.clone();
-                let workspace = self.workspace.clone();
-                move |_, window, cx| {
-                    if let Some(workspace) = workspace.upgrade() {
-                        open_active_thread_as_markdown(thread.clone(), workspace, window, cx)
-                            .detach_and_log_err(cx);
-                    }
-                }
+            .on_click(|_, window, cx| {
+                window.dispatch_action(Box::new(OpenActiveThreadAsMarkdown), cx)
            });

        // For all items that should be aligned with the LLM's response.
@@ -2076,202 +2023,185 @@ impl ActiveThread {

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

-        WithRemSize::new(ThemeSettings::get_global(cx).agent_font_size(cx))
-            .size_full()
-            .child(
-                v_flex()
-                    .w_full()
-                    .map(|parent| {
-                        if let Some(checkpoint) = checkpoint.filter(|_| !is_generating) {
-                            let mut is_pending = false;
-                            let mut error = None;
-                            if let Some(last_restore_checkpoint) =
-                                self.thread.read(cx).last_restore_checkpoint()
-                            {
-                                if last_restore_checkpoint.message_id() == message_id {
-                                    match last_restore_checkpoint {
-                                        LastRestoreCheckpoint::Pending { .. } => is_pending = true,
-                                        LastRestoreCheckpoint::Error { error: err, .. } => {
-                                            error = Some(err.clone());
-                                        }
-                                    }
+        v_flex()
+            .w_full()
+            .map(|parent| {
+                if let Some(checkpoint) = checkpoint.filter(|_| is_generating) {
+                    let mut is_pending = false;
+                    let mut error = None;
+                    if let Some(last_restore_checkpoint) =
+                        self.thread.read(cx).last_restore_checkpoint()
+                    {
+                        if last_restore_checkpoint.message_id() == message_id {
+                            match last_restore_checkpoint {
+                                LastRestoreCheckpoint::Pending { .. } => is_pending = true,
+                                LastRestoreCheckpoint::Error { error: err, .. } => {
+                                    error = Some(err.clone());
                                }
                            }
-
-                            let restore_checkpoint_button =
-                                Button::new(("restore-checkpoint", ix), "Restore Checkpoint")
-                                    .icon(if error.is_some() {
-                                        IconName::XCircle
-                                    } else {
-                                        IconName::Undo
-                                    })
-                                    .icon_size(IconSize::XSmall)
-                                    .icon_position(IconPosition::Start)
-                                    .icon_color(if error.is_some() {
-                                        Some(Color::Error)
-                                    } else {
-                                        None
-                                    })
-                                    .label_size(LabelSize::XSmall)
-                                    .disabled(is_pending)
-                                    .on_click(cx.listener(move |this, _, _window, cx| {
-                                        this.thread.update(cx, |thread, cx| {
-                                            thread
-                                                .restore_checkpoint(checkpoint.clone(), cx)
-                                                .detach_and_log_err(cx);
-                                        });
-                                    }));
-
-                            let restore_checkpoint_button = if is_pending {
-                                restore_checkpoint_button
-                                    .with_animation(
-                                        ("pulsating-restore-checkpoint-button", ix),
-                                        Animation::new(Duration::from_secs(2))
-                                            .repeat()
-                                            .with_easing(pulsating_between(0.6, 1.)),
-                                        |label, delta| label.alpha(delta),
-                                    )
-                                    .into_any_element()
-                            } else if let Some(error) = error {
-                                restore_checkpoint_button
-                                    .tooltip(Tooltip::text(error.to_string()))
-                                    .into_any_element()
-                            } else {
-                                restore_checkpoint_button.into_any_element()
-                            };
-
-                            parent.child(
-                                h_flex()
-                                    .pt_2p5()
-                                    .px_2p5()
-                                    .w_full()
-                                    .gap_1()
-                                    .child(ui::Divider::horizontal())
-                                    .child(restore_checkpoint_button)
-                                    .child(ui::Divider::horizontal()),
-                            )
-                        } else {
-                            parent
                        }
-                    })
-                    .when(is_first_message, |parent| {
-                        parent.child(self.render_rules_item(cx))
-                    })
-                    .child(styled_message)
-                    .when(is_generating && is_last_message, |this| {
-                        this.child(
-                            h_flex()
-                                .h_8()
-                                .mt_2()
-                                .mb_4()
-                                .ml_4()
-                                .py_1p5()
-                                .when_some(loading_dots, |this, loading_dots| {
-                                    this.child(loading_dots)
-                                }),
-                        )
-                    })
-                    .when(show_feedback, move |parent| {
-                        parent.child(feedback_items).when_some(
-                            self.open_feedback_editors.get(&message_id),
-                            move |parent, feedback_editor| {
-                                let focus_handle = feedback_editor.focus_handle(cx);
-                                parent.child(
-                                    v_flex()
-                                        .key_context("AgentFeedbackMessageEditor")
-                                        .on_action(cx.listener(
-                                            move |this, _: &menu::Cancel, _, cx| {
-                                                this.open_feedback_editors.remove(&message_id);
-                                                cx.notify();
-                                            },
-                                        ))
-                                        .on_action(cx.listener(
-                                            move |this, _: &menu::Confirm, _, cx| {
-                                                this.submit_feedback_message(message_id, cx);
-                                                cx.notify();
-                                            },
-                                        ))
-                                        .on_action(cx.listener(Self::confirm_editing_message))
-                                        .mb_2()
-                                        .mx_4()
-                                        .p_2()
-                                        .rounded_md()
-                                        .border_1()
-                                        .border_color(cx.theme().colors().border)
-                                        .bg(cx.theme().colors().editor_background)
-                                        .child(feedback_editor.clone())
+                    }
+
+                    let restore_checkpoint_button =
+                        Button::new(("restore-checkpoint", ix), "Restore Checkpoint")
+                            .icon(if error.is_some() {
+                                IconName::XCircle
+                            } else {
+                                IconName::Undo
+                            })
+                            .icon_size(IconSize::XSmall)
+                            .icon_position(IconPosition::Start)
+                            .icon_color(if error.is_some() {
+                                Some(Color::Error)
+                            } else {
+                                None
+                            })
+                            .label_size(LabelSize::XSmall)
+                            .disabled(is_pending)
+                            .on_click(cx.listener(move |this, _, _window, cx| {
+                                this.thread.update(cx, |thread, cx| {
+                                    thread
+                                        .restore_checkpoint(checkpoint.clone(), cx)
+                                        .detach_and_log_err(cx);
+                                });
+                            }));
+
+                    let restore_checkpoint_button = if is_pending {
+                        restore_checkpoint_button
+                            .with_animation(
+                                ("pulsating-restore-checkpoint-button", ix),
+                                Animation::new(Duration::from_secs(2))
+                                    .repeat()
+                                    .with_easing(pulsating_between(0.6, 1.)),
+                                |label, delta| label.alpha(delta),
+                            )
+                            .into_any_element()
+                    } else if let Some(error) = error {
+                        restore_checkpoint_button
+                            .tooltip(Tooltip::text(error.to_string()))
+                            .into_any_element()
+                    } else {
+                        restore_checkpoint_button.into_any_element()
+                    };
+
+                    parent.child(
+                        h_flex()
+                            .pt_2p5()
+                            .px_2p5()
+                            .w_full()
+                            .gap_1()
+                            .child(ui::Divider::horizontal())
+                            .child(restore_checkpoint_button)
+                            .child(ui::Divider::horizontal()),
+                    )
+                } else {
+                    parent
+                }
+            })
+            .when(is_first_message, |parent| {
+                parent.child(self.render_rules_item(cx))
+            })
+            .child(styled_message)
+            .when(is_generating && is_last_message, |this| {
+                this.child(
+                    h_flex()
+                        .h_8()
+                        .mt_2()
+                        .mb_4()
+                        .ml_4()
+                        .py_1p5()
+                        .when_some(loading_dots, |this, loading_dots| this.child(loading_dots)),
+                )
+            })
+            .when(show_feedback, move |parent| {
+                parent.child(feedback_items).when_some(
+                    self.open_feedback_editors.get(&message_id),
+                    move |parent, feedback_editor| {
+                        let focus_handle = feedback_editor.focus_handle(cx);
+                        parent.child(
+                            v_flex()
+                                .key_context("AgentFeedbackMessageEditor")
+                                .on_action(cx.listener(move |this, _: &menu::Cancel, _, cx| {
+                                    this.open_feedback_editors.remove(&message_id);
+                                    cx.notify();
+                                }))
+                                .on_action(cx.listener(move |this, _: &menu::Confirm, _, cx| {
+                                    this.submit_feedback_message(message_id, cx);
+                                    cx.notify();
+                                }))
+                                .on_action(cx.listener(Self::confirm_editing_message))
+                                .mb_2()
+                                .mx_4()
+                                .p_2()
+                                .rounded_md()
+                                .border_1()
+                                .border_color(cx.theme().colors().border)
+                                .bg(cx.theme().colors().editor_background)
+                                .child(feedback_editor.clone())
+                                .child(
+                                    h_flex()
+                                        .gap_1()
+                                        .justify_end()
                                        .child(
-                                            h_flex()
-                                                .gap_1()
-                                                .justify_end()
-                                                .child(
-                                                    Button::new(
-                                                        "dismiss-feedback-message",
-                                                        "Cancel",
+                                            Button::new("dismiss-feedback-message", "Cancel")
+                                                .label_size(LabelSize::Small)
+                                                .key_binding(
+                                                    KeyBinding::for_action_in(
+                                                        &menu::Cancel,
+                                                        &focus_handle,
+                                                        window,
+                                                        cx,
                                                    )
-                                                    .label_size(LabelSize::Small)
-                                                    .key_binding(
-                                                        KeyBinding::for_action_in(
-                                                            &menu::Cancel,
-                                                            &focus_handle,
-                                                            window,
-                                                            cx,
-                                                        )
-                                                        .map(|kb| kb.size(rems_from_px(10.))),
-                                                    )
-                                                    .on_click(cx.listener(
-                                                        move |this, _, _window, cx| {
-                                                            this.open_feedback_editors
-                                                                .remove(&message_id);
-                                                            cx.notify();
-                                                        },
-                                                    )),
+                                                    .map(|kb| kb.size(rems_from_px(10.))),
                                                )
-                                                .child(
-                                                    Button::new(
-                                                        "submit-feedback-message",
-                                                        "Share Feedback",
-                                                    )
-                                                    .style(ButtonStyle::Tinted(
-                                                        ui::TintColor::Accent,
-                                                    ))
-                                                    .label_size(LabelSize::Small)
-                                                    .key_binding(
-                                                        KeyBinding::for_action_in(
-                                                            &menu::Confirm,
-                                                            &focus_handle,
-                                                            window,
-                                                            cx,
-                                                        )
-                                                        .map(|kb| kb.size(rems_from_px(10.))),
-                                                    )
-                                                    .on_click(cx.listener(
-                                                        move |this, _, _window, cx| {
-                                                            this.submit_feedback_message(
-                                                                message_id, cx,
-                                                            );
-                                                            cx.notify()
-                                                        },
-                                                    )),
-                                                ),
+                                                .on_click(cx.listener(
+                                                    move |this, _, _window, cx| {
+                                                        this.open_feedback_editors
+                                                            .remove(&message_id);
+                                                        cx.notify();
+                                                    },
+                                                )),
+                                        )
+                                        .child(
+                                            Button::new(
+                                                "submit-feedback-message",
+                                                "Share Feedback",
+                                            )
+                                            .style(ButtonStyle::Tinted(ui::TintColor::Accent))
+                                            .label_size(LabelSize::Small)
+                                            .key_binding(
+                                                KeyBinding::for_action_in(
+                                                    &menu::Confirm,
+                                                    &focus_handle,
+                                                    window,
+                                                    cx,
+                                                )
+                                                .map(|kb| kb.size(rems_from_px(10.))),
+                                            )
+                                            .on_click(
+                                                cx.listener(move |this, _, _window, cx| {
+                                                    this.submit_feedback_message(message_id, cx);
+                                                    cx.notify()
+                                                }),
+                                            ),
                                        ),
-                                )
-                            },
+                                ),
                        )
-                    })
-                    .when(after_editing_message, |parent| {
-                        // Backdrop to dim out the whole thread below the editing user message
-                        parent.relative().child(
-                            div()
-                                .occlude()
-                                .absolute()
-                                .inset_0()
-                                .size_full()
-                                .bg(panel_background)
-                                .opacity(0.8),
-                        )
-                    }),
-            )
+                    },
+                )
+            })
+            .when(after_editing_message, |parent| {
+                // Backdrop to dim out the whole thread below the editing user message
+                parent.relative().child(
+                    div()
+                        .occlude()
+                        .absolute()
+                        .inset_0()
+                        .size_full()
+                        .bg(panel_background)
+                        .opacity(0.8),
+                )
+            })
            .into_any()
    }

@@ -3080,7 +3010,7 @@ impl ActiveThread {
                                            .on_click(cx.listener(
                                                move |this, event, window, cx| {
                                                    if let Some(fs) = fs.clone() {
-                                                        update_settings_file::<AgentSettings>(
+                                                        update_settings_file::<AssistantSettings>(
                                                            fs.clone(),
                                                            cx,
                                                            |settings, _| {
@@ -3439,55 +3369,6 @@ impl Render for ActiveThread {
    }
 }

-pub(crate) fn open_active_thread_as_markdown(
-    thread: Entity<Thread>,
-    workspace: Entity<Workspace>,
-    window: &mut Window,
-    cx: &mut App,
-) -> Task<anyhow::Result<()>> {
-    let markdown_language_task = workspace
-        .read(cx)
-        .app_state()
-        .languages
-        .language_for_name("Markdown");
-
-    window.spawn(cx, async move |cx| {
-        let markdown_language = markdown_language_task.await?;
-
-        workspace.update_in(cx, |workspace, window, cx| {
-            let thread = thread.read(cx);
-            let markdown = thread.to_markdown(cx)?;
-            let thread_summary = thread
-                .summary()
-                .map(|summary| summary.to_string())
-                .unwrap_or_else(|| "Thread".to_string());
-
-            let project = workspace.project().clone();
-            let buffer = project.update(cx, |project, cx| {
-                project.create_local_buffer(&markdown, Some(markdown_language), cx)
-            });
-            let buffer =
-                cx.new(|cx| MultiBuffer::singleton(buffer, cx).with_title(thread_summary.clone()));
-
-            workspace.add_item_to_active_pane(
-                Box::new(cx.new(|cx| {
-                    let mut editor =
-                        Editor::for_multibuffer(buffer, Some(project.clone()), window, cx);
-                    editor.set_breadcrumb_header(thread_summary);
-                    editor
-                })),
-                None,
-                true,
-                window,
-                cx,
-            );
-
-            anyhow::Ok(())
-        })??;
-        anyhow::Ok(())
-    })
-}
-
 pub(crate) fn open_context(
    context: &AgentContextHandle,
    workspace: Entity<Workspace>,
@@ -3542,21 +3423,14 @@ pub(crate) fn open_context(
        AgentContextHandle::Thread(thread_context) => workspace.update(cx, |workspace, cx| {
            if let Some(panel) = workspace.panel::<AssistantPanel>(cx) {
                panel.update(cx, |panel, cx| {
-                    panel.open_thread(thread_context.thread.clone(), window, cx);
+                    let thread_id = thread_context.thread.read(cx).id().clone();
+                    panel
+                        .open_thread_by_id(&thread_id, window, cx)
+                        .detach_and_log_err(cx)
                });
            }
        }),

-        AgentContextHandle::TextThread(text_thread_context) => {
-            workspace.update(cx, |workspace, cx| {
-                if let Some(panel) = workspace.panel::<AssistantPanel>(cx) {
-                    panel.update(cx, |panel, cx| {
-                        panel.open_prompt_editor(text_thread_context.context.clone(), window, cx)
-                    });
-                }
-            })
-        }
-
        AgentContextHandle::Rules(rules_context) => window.dispatch_action(
            Box::new(OpenRulesLibrary {
                prompt_to_select: Some(rules_context.prompt_id.0),
@@ -3597,6 +3471,7 @@ fn open_editor_at_position(
 #[cfg(test)]
 mod tests {
    use assistant_tool::{ToolRegistry, ToolWorkingSet};
+    use context_server::ContextServerSettings;
    use editor::EditorSettings;
    use fs::FakeFs;
    use gpui::{TestAppContext, VisualTestContext};
@@ -3662,12 +3537,13 @@ mod tests {
            cx.set_global(settings_store);
            language::init(cx);
            Project::init_settings(cx);
-            AgentSettings::register(cx);
+            AssistantSettings::register(cx);
            prompt_store::init(cx);
            thread_store::init(cx);
            workspace::init_settings(cx);
            language_model::init_settings(cx);
            ThemeSettings::register(cx);
+            ContextServerSettings::register(cx);
            EditorSettings::register(cx);
            ToolRegistry::default_global(cx);
        });
@@ -3695,25 +3571,18 @@ mod tests {
        let (workspace, cx) =
            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));

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

        let thread = thread_store.update(cx, |store, cx| store.create_thread(cx));
        let context_store = cx.new(|_cx| ContextStore::new(project.downgrade(), None));
@@ -3729,7 +3598,6 @@ mod tests {
                ActiveThread::new(
                    thread.clone(),
                    thread_store.clone(),
-                    text_thread_store.clone(),
                    context_store.clone(),
                    language_registry.clone(),
                    workspace.downgrade(),
--- a/crates/agent/src/agent_diff.rs
+++ b/crates/agent/src/agent_diff.rs
@@ -1,8 +1,8 @@
 use crate::{
    Keep, KeepAll, OpenAgentDiff, Reject, RejectAll, Thread, ThreadEvent, ui::AnimatedLabel,
 };
-use agent_settings::AgentSettings;
 use anyhow::Result;
+use assistant_settings::AssistantSettings;
 use buffer_diff::DiffHunkStatus;
 use collections::{HashMap, HashSet};
 use editor::{
@@ -26,7 +26,7 @@ use std::{
    ops::Range,
    sync::Arc,
 };
-use ui::{IconButtonShape, KeyBinding, Tooltip, prelude::*, vertical_divider};
+use ui::{Divider, IconButtonShape, KeyBinding, Tooltip, prelude::*, vertical_divider};
 use util::ResultExt;
 use workspace::{
    Item, ItemHandle, ItemNavHistory, ToolbarItemEvent, ToolbarItemLocation, ToolbarItemView,
@@ -219,7 +219,7 @@ impl AgentDiffPane {
            .thread
            .read(cx)
            .summary()
-            .unwrap_or("Agent Changes".into());
+            .unwrap_or("Assistant Changes".into());
        if new_title != self.title {
            self.title = new_title;
            cx.emit(EditorEvent::TitleChanged);
@@ -324,6 +324,10 @@ fn keep_edits_in_ranges(
    window: &mut Window,
    cx: &mut Context<Editor>,
 ) {
+    if thread.read(cx).is_generating() {
+        return;
+    }
+
    let diff_hunks_in_ranges = editor
        .diff_hunks_in_ranges(&ranges, buffer_snapshot)
        .collect::<Vec<_>>();
@@ -349,6 +353,10 @@ fn reject_edits_in_ranges(
    window: &mut Window,
    cx: &mut Context<Editor>,
 ) {
+    if thread.read(cx).is_generating() {
+        return;
+    }
+
    let diff_hunks_in_ranges = editor
        .diff_hunks_in_ranges(&ranges, buffer_snapshot)
        .collect::<Vec<_>>();
@@ -473,7 +481,7 @@ impl Item for AgentDiffPane {
            .thread
            .read(cx)
            .summary()
-            .unwrap_or("Agent Changes".into());
+            .unwrap_or("Assistant Changes".into());
        Label::new(format!("Review: {}", summary))
            .color(if params.selected {
                Color::Default
@@ -695,6 +703,10 @@ fn render_diff_hunk_controls(
 ) -> AnyElement {
    let editor = editor.clone();

+    if thread.read(cx).is_generating() {
+        return Empty.into_any();
+    }
+
    h_flex()
        .h(line_height)
        .mr_0p5()
@@ -1035,8 +1047,8 @@ impl Render for AgentDiffToolbar {
                                        }
                                    }),
                            )
-                            .into_any_element(),
-                        vertical_divider().into_any_element(),
+                            .into_any(),
+                        Divider::vertical().into_any_element(),
                        h_flex()
                            .gap_0p5()
                            .child(
@@ -1069,34 +1081,37 @@ impl Render for AgentDiffToolbar {
                                        this.dispatch_action(&KeepAll, window, cx)
                                    })),
                            )
-                            .into_any_element(),
+                            .into_any(),
+                        Divider::vertical().into_any_element(),
                    ],
                };

                h_flex()
                    .track_focus(&editor_focus_handle)
                    .size_full()
-                    .px_1()
-                    .mr_1()
-                    .gap_1()
-                    .children(content)
-                    .child(vertical_divider())
-                    .when_some(editor.read(cx).workspace(), |this, _workspace| {
-                        this.child(
-                            IconButton::new("review", IconName::ListCollapse)
-                                .icon_size(IconSize::Small)
-                                .tooltip(Tooltip::for_action_title_in(
-                                    "Review All Files",
-                                    &OpenAgentDiff,
-                                    &editor_focus_handle,
-                                ))
-                                .on_click({
-                                    cx.listener(move |this, _, window, cx| {
-                                        this.dispatch_action(&OpenAgentDiff, window, cx);
-                                    })
-                                }),
-                        )
-                    })
+                    .child(
+                        h_flex()
+                            .py(DynamicSpacing::Base08.rems(cx))
+                            .px_2()
+                            .gap_1()
+                            .children(content)
+                            .when_some(editor.read(cx).workspace(), |this, _workspace| {
+                                this.child(
+                                    IconButton::new("review", IconName::ListCollapse)
+                                        .icon_size(IconSize::Small)
+                                        .tooltip(Tooltip::for_action_title_in(
+                                            "Review All Files",
+                                            &OpenAgentDiff,
+                                            &editor_focus_handle,
+                                        ))
+                                        .on_click({
+                                            cx.listener(move |this, _, window, cx| {
+                                                this.dispatch_action(&OpenAgentDiff, window, cx);
+                                            })
+                                        }),
+                                )
+                            }),
+                    )
                    .child(vertical_divider())
                    .on_action({
                        let editor = editor.clone();
@@ -1126,8 +1141,7 @@ impl Render for AgentDiffToolbar {
                let focus_handle = agent_diff.focus_handle(cx);

                h_group_xl()
-                    .my_neg_1()
-                    .py_1()
+                    .px_2()
                    .items_center()
                    .flex_wrap()
                    .child(
@@ -1250,9 +1264,9 @@ impl AgentDiff {

        let settings_subscription = cx.observe_global_in::<SettingsStore>(window, {
            let workspace = workspace.clone();
-            let mut was_active = AgentSettings::get_global(cx).single_file_review;
+            let mut was_active = AssistantSettings::get_global(cx).single_file_review;
            move |this, window, cx| {
-                let is_active = AgentSettings::get_global(cx).single_file_review;
+                let is_active = AssistantSettings::get_global(cx).single_file_review;
                if was_active != is_active {
                    was_active = is_active;
                    this.update_reviewing_editors(&workspace, window, cx);
@@ -1358,7 +1372,6 @@ impl AgentDiff {
            | ThreadEvent::StreamedAssistantThinking(_, _)
            | ThreadEvent::StreamedToolUse { .. }
            | ThreadEvent::InvalidToolInput { .. }
-            | ThreadEvent::MissingToolUse { .. }
            | ThreadEvent::MessageAdded(_)
            | ThreadEvent::MessageEdited(_)
            | ThreadEvent::MessageDeleted(_)
@@ -1457,7 +1470,7 @@ impl AgentDiff {
        window: &mut Window,
        cx: &mut Context<Self>,
    ) {
-        if !AgentSettings::get_global(cx).single_file_review {
+        if !AssistantSettings::get_global(cx).single_file_review {
            for (editor, _) in self.reviewing_editors.drain() {
                editor
                    .update(cx, |editor, cx| editor.end_temporary_diff_override(cx))
@@ -1732,8 +1745,9 @@ impl editor::Addon for EditorAgentDiffAddon {
 mod tests {
    use super::*;
    use crate::{Keep, ThreadStore, thread_store};
-    use agent_settings::AgentSettings;
+    use assistant_settings::AssistantSettings;
    use assistant_tool::ToolWorkingSet;
+    use context_server::ContextServerSettings;
    use editor::EditorSettings;
    use gpui::{TestAppContext, UpdateGlobal, VisualTestContext};
    use project::{FakeFs, Project};
@@ -1751,11 +1765,12 @@ mod tests {
            cx.set_global(settings_store);
            language::init(cx);
            Project::init_settings(cx);
-            AgentSettings::register(cx);
+            AssistantSettings::register(cx);
            prompt_store::init(cx);
            thread_store::init(cx);
            workspace::init_settings(cx);
            ThemeSettings::register(cx);
+            ContextServerSettings::register(cx);
            EditorSettings::register(cx);
            language_model::init_settings(cx);
        });
@@ -1907,11 +1922,12 @@ mod tests {
            cx.set_global(settings_store);
            language::init(cx);
            Project::init_settings(cx);
-            AgentSettings::register(cx);
+            AssistantSettings::register(cx);
            prompt_store::init(cx);
            thread_store::init(cx);
            workspace::init_settings(cx);
            ThemeSettings::register(cx);
+            ContextServerSettings::register(cx);
            EditorSettings::register(cx);
            language_model::init_settings(cx);
            workspace::register_project_item::<Editor>(cx);
--- a/crates/agent/src/assistant.rs
+++ b/crates/agent/src/assistant.rs
@@ -7,7 +7,6 @@ mod buffer_codegen;
 mod context;
 mod context_picker;
 mod context_server_configuration;
-mod context_server_tool;
 mod context_store;
 mod context_strip;
 mod debug;
@@ -27,7 +26,7 @@ mod ui;

 use std::sync::Arc;

-use agent_settings::{AgentProfileId, AgentSettings};
+use assistant_settings::{AgentProfileId, AssistantSettings};
 use client::Client;
 use command_palette_hooks::CommandPaletteFilter;
 use feature_flags::{Assistant2FeatureFlag, FeatureFlagAppExt};
@@ -46,7 +45,7 @@ pub use crate::assistant_panel::{AssistantPanel, ConcreteAssistantPanelDelegate}
 pub use crate::context::{ContextLoadResult, LoadedContext};
 pub use crate::inline_assistant::InlineAssistant;
 pub use crate::thread::{Message, MessageSegment, Thread, ThreadEvent};
-pub use crate::thread_store::{TextThreadStore, ThreadStore};
+pub use crate::thread_store::ThreadStore;
 pub use agent_diff::{AgentDiffPane, AgentDiffToolbar};
 pub use context_store::ContextStore;
 pub use ui::preview::{all_agent_previews, get_agent_preview};
@@ -80,8 +79,7 @@ actions!(
        Reject,
        RejectAll,
        KeepAll,
-        Follow,
-        ResetTrialUpsell,
+        Follow
    ]
 );

@@ -117,7 +115,7 @@ pub fn init(
    language_registry: Arc<LanguageRegistry>,
    cx: &mut App,
 ) {
-    AgentSettings::register(cx);
+    AssistantSettings::register(cx);
    thread_store::init(cx);
    assistant_panel::init(cx);
    context_server_configuration::init(language_registry, cx);
--- a/crates/agent/src/assistant_configuration.rs
+++ b/crates/agent/src/assistant_configuration.rs
@@ -5,17 +5,16 @@ mod tool_picker;

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

-use agent_settings::AgentSettings;
+use assistant_settings::AssistantSettings;
 use assistant_tool::{ToolSource, ToolWorkingSet};
 use collections::HashMap;
-use context_server::ContextServerId;
+use context_server::manager::{ContextServer, ContextServerManager, ContextServerStatus};
 use fs::Fs;
 use gpui::{
    Action, Animation, AnimationExt as _, AnyView, App, Entity, EventEmitter, FocusHandle,
    Focusable, ScrollHandle, Subscription, pulsating_between,
 };
 use language_model::{LanguageModelProvider, LanguageModelProviderId, LanguageModelRegistry};
-use project::context_server_store::{ContextServerStatus, ContextServerStore};
 use settings::{Settings, update_settings_file};
 use ui::{
    Disclosure, Divider, DividerColor, ElevationIndex, Indicator, Scrollbar, ScrollbarState,
@@ -34,8 +33,8 @@ pub struct AssistantConfiguration {
    fs: Arc<dyn Fs>,
    focus_handle: FocusHandle,
    configuration_views_by_provider: HashMap<LanguageModelProviderId, AnyView>,
-    context_server_store: Entity<ContextServerStore>,
-    expanded_context_server_tools: HashMap<ContextServerId, bool>,
+    context_server_manager: Entity<ContextServerManager>,
+    expanded_context_server_tools: HashMap<Arc<str>, bool>,
    tools: Entity<ToolWorkingSet>,
    _registry_subscription: Subscription,
    scroll_handle: ScrollHandle,
@@ -45,7 +44,7 @@ pub struct AssistantConfiguration {
 impl AssistantConfiguration {
    pub fn new(
        fs: Arc<dyn Fs>,
-        context_server_store: Entity<ContextServerStore>,
+        context_server_manager: Entity<ContextServerManager>,
        tools: Entity<ToolWorkingSet>,
        window: &mut Window,
        cx: &mut Context<Self>,
@@ -76,7 +75,7 @@ impl AssistantConfiguration {
            fs,
            focus_handle,
            configuration_views_by_provider: HashMap::default(),
-            context_server_store,
+            context_server_manager,
            expanded_context_server_tools: HashMap::default(),
            tools,
            _registry_subscription: registry_subscription,
@@ -213,7 +212,7 @@ impl AssistantConfiguration {
    }

    fn render_command_permission(&mut self, cx: &mut Context<Self>) -> impl IntoElement {
-        let always_allow_tool_actions = AgentSettings::get_global(cx).always_allow_tool_actions;
+        let always_allow_tool_actions = AssistantSettings::get_global(cx).always_allow_tool_actions;

        h_flex()
            .gap_4()
@@ -241,7 +240,7 @@ impl AssistantConfiguration {
                    let fs = self.fs.clone();
                    move |state, _window, cx| {
                        let allow = state == &ToggleState::Selected;
-                        update_settings_file::<AgentSettings>(
+                        update_settings_file::<AssistantSettings>(
                            fs.clone(),
                            cx,
                            move |settings, _| {
@@ -254,7 +253,7 @@ impl AssistantConfiguration {
    }

    fn render_single_file_review(&mut self, cx: &mut Context<Self>) -> impl IntoElement {
-        let single_file_review = AgentSettings::get_global(cx).single_file_review;
+        let single_file_review = AssistantSettings::get_global(cx).single_file_review;

        h_flex()
            .gap_4()
@@ -279,7 +278,7 @@ impl AssistantConfiguration {
                        let fs = self.fs.clone();
                        move |state, _window, cx| {
                            let allow = state == &ToggleState::Selected;
-                            update_settings_file::<AgentSettings>(
+                            update_settings_file::<AssistantSettings>(
                                fs.clone(),
                                cx,
                                move |settings, _| {
@@ -307,7 +306,7 @@ impl AssistantConfiguration {
        window: &mut Window,
        cx: &mut Context<Self>,
    ) -> impl IntoElement {
-        let context_server_ids = self.context_server_store.read(cx).all_server_ids().clone();
+        let context_servers = self.context_server_manager.read(cx).all_servers().clone();

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

@@ -323,9 +322,9 @@ impl AssistantConfiguration {
                    .child(Label::new(SUBHEADING).color(Color::Muted)),
            )
            .children(
-                context_server_ids.into_iter().map(|context_server_id| {
-                    self.render_context_server(context_server_id, window, cx)
-                }),
+                context_servers
+                    .into_iter()
+                    .map(|context_server| self.render_context_server(context_server, window, cx)),
            )
            .child(
                h_flex()
@@ -375,20 +374,19 @@ impl AssistantConfiguration {

    fn render_context_server(
        &self,
-        context_server_id: ContextServerId,
+        context_server: Arc<ContextServer>,
        window: &mut Window,
        cx: &mut Context<Self>,
    ) -> impl use<> + IntoElement {
        let tools_by_source = self.tools.read(cx).tools_by_source(cx);
        let server_status = self
-            .context_server_store
+            .context_server_manager
            .read(cx)
-            .status_for_server(&context_server_id)
-            .unwrap_or(ContextServerStatus::Stopped);
+            .status_for_server(&context_server.id());

-        let is_running = matches!(server_status, ContextServerStatus::Running);
+        let is_running = matches!(server_status, Some(ContextServerStatus::Running));

-        let error = if let ContextServerStatus::Error(error) = server_status.clone() {
+        let error = if let Some(ContextServerStatus::Error(error)) = server_status.clone() {
            Some(error)
        } else {
            None
@@ -396,13 +394,13 @@ impl AssistantConfiguration {

        let are_tools_expanded = self
            .expanded_context_server_tools
-            .get(&context_server_id)
+            .get(&context_server.id())
            .copied()
            .unwrap_or_default();

        let tools = tools_by_source
            .get(&ToolSource::ContextServer {
-                id: context_server_id.0.clone().into(),
+                id: context_server.id().into(),
            })
            .map_or([].as_slice(), |tools| tools.as_slice());
        let tool_count = tools.len();
@@ -410,7 +408,7 @@ impl AssistantConfiguration {
        let border_color = cx.theme().colors().border.opacity(0.6);

        v_flex()
-            .id(SharedString::from(context_server_id.0.clone()))
+            .id(SharedString::from(context_server.id()))
            .border_1()
            .rounded_md()
            .border_color(border_color)
@@ -434,7 +432,7 @@ impl AssistantConfiguration {
                                )
                                .disabled(tool_count == 0)
                                .on_click(cx.listener({
-                                    let context_server_id = context_server_id.clone();
+                                    let context_server_id = context_server.id();
                                    move |this, _event, _window, _cx| {
                                        let is_open = this
                                            .expanded_context_server_tools
@@ -446,14 +444,14 @@ impl AssistantConfiguration {
                                })),
                            )
                            .child(match server_status {
-                                ContextServerStatus::Starting => {
+                                Some(ContextServerStatus::Starting) => {
                                    let color = Color::Success.color(cx);
                                    Indicator::dot()
                                        .color(Color::Success)
                                        .with_animation(
                                            SharedString::from(format!(
                                                "{}-starting",
-                                                context_server_id.0.clone(),
+                                                context_server.id(),
                                            )),
                                            Animation::new(Duration::from_secs(2))
                                                .repeat()
@@ -464,17 +462,15 @@ impl AssistantConfiguration {
                                        )
                                        .into_any_element()
                                }
-                                ContextServerStatus::Running => {
+                                Some(ContextServerStatus::Running) => {
                                    Indicator::dot().color(Color::Success).into_any_element()
                                }
-                                ContextServerStatus::Error(_) => {
+                                Some(ContextServerStatus::Error(_)) => {
                                    Indicator::dot().color(Color::Error).into_any_element()
                                }
-                                ContextServerStatus::Stopped => {
-                                    Indicator::dot().color(Color::Muted).into_any_element()
-                                }
+                                None => Indicator::dot().color(Color::Muted).into_any_element(),
                            })
-                            .child(Label::new(context_server_id.0.clone()).ml_0p5())
+                            .child(Label::new(context_server.id()).ml_0p5())
                            .when(is_running, |this| {
                                this.child(
                                    Label::new(if tool_count == 1 {
@@ -491,22 +487,32 @@ impl AssistantConfiguration {
                        Switch::new("context-server-switch", is_running.into())
                            .color(SwitchColor::Accent)
                            .on_click({
-                                let context_server_manager = self.context_server_store.clone();
-                                let context_server_id = context_server_id.clone();
+                                let context_server_manager = self.context_server_manager.clone();
+                                let context_server = context_server.clone();
                                move |state, _window, cx| match state {
                                    ToggleState::Unselected | ToggleState::Indeterminate => {
                                        context_server_manager.update(cx, |this, cx| {
-                                            this.stop_server(&context_server_id, cx).log_err();
+                                            this.stop_server(context_server.clone(), cx).log_err();
                                        });
                                    }
                                    ToggleState::Selected => {
-                                        context_server_manager.update(cx, |this, cx| {
-                                            if let Some(server) =
-                                                this.get_server(&context_server_id)
-                                            {
-                                                this.start_server(server, cx).log_err();
+                                        cx.spawn({
+                                            let context_server_manager =
+                                                context_server_manager.clone();
+                                            let context_server = context_server.clone();
+                                            async move |cx| {
+                                                if let Some(start_server_task) =
+                                                    context_server_manager
+                                                        .update(cx, |this, cx| {
+                                                            this.start_server(context_server, cx)
+                                                        })
+                                                        .log_err()
+                                                {
+                                                    start_server_task.await.log_err();
+                                                }
                                            }
                                        })
+                                        .detach();
                                    }
                                }
                            }),
--- a/crates/agent/src/assistant_configuration/add_context_server_modal.rs
+++ b/crates/agent/src/assistant_configuration/add_context_server_modal.rs
@@ -1,6 +1,5 @@
-use context_server::ContextServerCommand;
+use context_server::{ContextServerSettings, ServerCommand, ServerConfig};
 use gpui::{DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, WeakEntity, prelude::*};
-use project::project_settings::{ContextServerConfiguration, ProjectSettings};
 use serde_json::json;
 use settings::update_settings_file;
 use ui::{KeyBinding, Modal, ModalFooter, ModalHeader, Section, Tooltip, prelude::*};
@@ -78,11 +77,11 @@ impl AddContextServerModal {
        if let Some(workspace) = self.workspace.upgrade() {
            workspace.update(cx, |workspace, cx| {
                let fs = workspace.app_state().fs.clone();
-                update_settings_file::<ProjectSettings>(fs.clone(), cx, |settings, _| {
+                update_settings_file::<ContextServerSettings>(fs.clone(), cx, |settings, _| {
                    settings.context_servers.insert(
                        name.into(),
-                        ContextServerConfiguration {
-                            command: Some(ContextServerCommand {
+                        ServerConfig {
+                            command: Some(ServerCommand {
                                path,
                                args,
                                env: None,
@@ -147,50 +146,47 @@ impl Render for AddContextServerModal {
                        ),
                    )
                    .footer(
-                        ModalFooter::new().end_slot(
-                            h_flex()
-                                .gap_2()
-                                .child(
-                                    Button::new("cancel", "Cancel")
-                                        .key_binding(
-                                            KeyBinding::for_action_in(
-                                                &menu::Cancel,
-                                                &focus_handle,
-                                                window,
-                                                cx,
-                                            )
-                                            .map(|kb| kb.size(rems_from_px(12.))),
+                        ModalFooter::new()
+                            .start_slot(
+                                Button::new("cancel", "Cancel")
+                                    .key_binding(
+                                        KeyBinding::for_action_in(
+                                            &menu::Cancel,
+                                            &focus_handle,
+                                            window,
+                                            cx,
                                        )
-                                        .on_click(cx.listener(|this, _event, _window, cx| {
-                                            this.cancel(&menu::Cancel, cx)
-                                        })),
-                                )
-                                .child(
-                                    Button::new("add-server", "Add Server")
-                                        .disabled(is_name_empty || is_command_empty)
-                                        .key_binding(
-                                            KeyBinding::for_action_in(
-                                                &menu::Confirm,
-                                                &focus_handle,
-                                                window,
-                                                cx,
-                                            )
-                                            .map(|kb| kb.size(rems_from_px(12.))),
+                                        .map(|kb| kb.size(rems_from_px(12.))),
+                                    )
+                                    .on_click(cx.listener(|this, _event, _window, cx| {
+                                        this.cancel(&menu::Cancel, cx)
+                                    })),
+                            )
+                            .end_slot(
+                                Button::new("add-server", "Add Server")
+                                    .disabled(is_name_empty || is_command_empty)
+                                    .key_binding(
+                                        KeyBinding::for_action_in(
+                                            &menu::Confirm,
+                                            &focus_handle,
+                                            window,
+                                            cx,
                                        )
-                                        .map(|button| {
-                                            if is_name_empty {
-                                                button.tooltip(Tooltip::text("Name is required"))
-                                            } else if is_command_empty {
-                                                button.tooltip(Tooltip::text("Command is required"))
-                                            } else {
-                                                button
-                                            }
-                                        })
-                                        .on_click(cx.listener(|this, _event, _window, cx| {
-                                            this.confirm(&menu::Confirm, cx)
-                                        })),
-                                ),
-                        ),
+                                        .map(|kb| kb.size(rems_from_px(12.))),
+                                    )
+                                    .map(|button| {
+                                        if is_name_empty {
+                                            button.tooltip(Tooltip::text("Name is required"))
+                                        } else if is_command_empty {
+                                            button.tooltip(Tooltip::text("Command is required"))
+                                        } else {
+                                            button
+                                        }
+                                    })
+                                    .on_click(cx.listener(|this, _event, _window, cx| {
+                                        this.confirm(&menu::Confirm, cx)
+                                    })),
+                            ),
                    ),
            )
    }
--- a/crates/agent/src/assistant_configuration/configure_context_server_modal.rs
+++ b/crates/agent/src/assistant_configuration/configure_context_server_modal.rs
@@ -4,8 +4,9 @@ use std::{
 };

 use anyhow::Context as _;
-use context_server::ContextServerId;
+use context_server::manager::{ContextServerManager, ContextServerStatus};
 use editor::{Editor, EditorElement, EditorStyle};
+use extension::ContextServerConfiguration;
 use gpui::{
    Animation, AnimationExt, App, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, Task,
    TextStyle, TextStyleRefinement, Transformation, UnderlineStyle, WeakEntity, percentage,
@@ -13,30 +14,20 @@ use gpui::{
 use language::{Language, LanguageRegistry};
 use markdown::{Markdown, MarkdownElement, MarkdownStyle};
 use notifications::status_toast::{StatusToast, ToastIcon};
-use project::{
-    context_server_store::{ContextServerStatus, ContextServerStore},
-    project_settings::{ContextServerConfiguration, ProjectSettings},
-};
 use settings::{Settings as _, update_settings_file};
 use theme::ThemeSettings;
-use ui::{KeyBinding, Modal, ModalFooter, ModalHeader, Section, Tooltip, prelude::*};
+use ui::{KeyBinding, Modal, ModalFooter, ModalHeader, Section, prelude::*};
 use util::ResultExt;
 use workspace::{ModalView, Workspace};

 pub(crate) struct ConfigureContextServerModal {
    workspace: WeakEntity<Workspace>,
-    focus_handle: FocusHandle,
-    context_servers_to_setup: Vec<ContextServerSetup>,
-    context_server_store: Entity<ContextServerStore>,
+    context_servers_to_setup: Vec<ConfigureContextServer>,
+    context_server_manager: Entity<ContextServerManager>,
 }

-#[allow(clippy::large_enum_variant)]
-enum Configuration {
-    NotAvailable,
-    Required(ConfigurationRequiredState),
-}
-
-struct ConfigurationRequiredState {
+struct ConfigureContextServer {
+    id: Arc<str>,
    installation_instructions: Entity<markdown::Markdown>,
    settings_validator: Option<jsonschema::Validator>,
    settings_editor: Entity<Editor>,
@@ -44,91 +35,64 @@ struct ConfigurationRequiredState {
    waiting_for_context_server: bool,
 }

-struct ContextServerSetup {
-    id: ContextServerId,
-    repository_url: Option<SharedString>,
-    configuration: Configuration,
-}
-
 impl ConfigureContextServerModal {
    pub fn new(
-        configurations: impl Iterator<Item = crate::context_server_configuration::Configuration>,
-        context_server_store: Entity<ContextServerStore>,
+        configurations: impl Iterator<Item = (Arc<str>, ContextServerConfiguration)>,
        jsonc_language: Option<Arc<Language>>,
+        context_server_manager: Entity<ContextServerManager>,
        language_registry: Arc<LanguageRegistry>,
        workspace: WeakEntity<Workspace>,
        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
+        cx: &mut App,
+    ) -> Option<Self> {
        let context_servers_to_setup = configurations
-            .map(|config| match config {
-                crate::context_server_configuration::Configuration::NotAvailable(
-                    context_server_id,
-                    repository_url,
-                ) => ContextServerSetup {
-                    id: context_server_id,
-                    repository_url,
-                    configuration: Configuration::NotAvailable,
-                },
-                crate::context_server_configuration::Configuration::Required(
-                    context_server_id,
-                    repository_url,
-                    config,
-                ) => {
-                    let jsonc_language = jsonc_language.clone();
-                    let settings_validator = jsonschema::validator_for(&config.settings_schema)
-                        .context("Failed to load JSON schema for context server settings")
-                        .log_err();
-                    let state = ConfigurationRequiredState {
-                        installation_instructions: cx.new(|cx| {
-                            Markdown::new(
-                                config.installation_instructions.clone().into(),
-                                Some(language_registry.clone()),
-                                None,
-                                cx,
-                            )
-                        }),
-                        settings_validator,
-                        settings_editor: cx.new(|cx| {
-                            let mut editor = Editor::auto_height(16, window, cx);
-                            editor.set_text(config.default_settings.trim(), window, cx);
-                            editor.set_show_gutter(false, cx);
-                            editor.set_soft_wrap_mode(
-                                language::language_settings::SoftWrap::None,
-                                cx,
-                            );
-                            if let Some(buffer) = editor.buffer().read(cx).as_singleton() {
-                                buffer.update(cx, |buffer, cx| {
-                                    buffer.set_language(jsonc_language, cx)
-                                })
-                            }
-                            editor
-                        }),
-                        waiting_for_context_server: false,
-                        last_error: None,
-                    };
-                    ContextServerSetup {
-                        id: context_server_id,
-                        repository_url,
-                        configuration: Configuration::Required(state),
-                    }
+            .map(|(id, manifest)| {
+                let jsonc_language = jsonc_language.clone();
+                let settings_validator = jsonschema::validator_for(&manifest.settings_schema)
+                    .context("Failed to load JSON schema for context server settings")
+                    .log_err();
+                ConfigureContextServer {
+                    id: id.clone(),
+                    installation_instructions: cx.new(|cx| {
+                        Markdown::new(
+                            manifest.installation_instructions.clone().into(),
+                            Some(language_registry.clone()),
+                            None,
+                            cx,
+                        )
+                    }),
+                    settings_validator,
+                    settings_editor: cx.new(|cx| {
+                        let mut editor = Editor::auto_height(16, window, cx);
+                        editor.set_text(manifest.default_settings.trim(), window, cx);
+                        editor.set_show_gutter(false, cx);
+                        editor.set_soft_wrap_mode(language::language_settings::SoftWrap::None, cx);
+                        if let Some(buffer) = editor.buffer().read(cx).as_singleton() {
+                            buffer.update(cx, |buffer, cx| buffer.set_language(jsonc_language, cx))
+                        }
+                        editor
+                    }),
+                    waiting_for_context_server: false,
+                    last_error: None,
                }
            })
            .collect::<Vec<_>>();

-        Self {
-            workspace,
-            focus_handle: cx.focus_handle(),
-            context_servers_to_setup,
-            context_server_store,
+        if context_servers_to_setup.is_empty() {
+            return None;
        }
+
+        Some(Self {
+            workspace,
+            context_servers_to_setup,
+            context_server_manager,
+        })
    }
 }

 impl ConfigureContextServerModal {
    pub fn confirm(&mut self, cx: &mut Context<Self>) {
        if self.context_servers_to_setup.is_empty() {
-            self.dismiss(cx);
            return;
        }

@@ -136,18 +100,7 @@ impl ConfigureContextServerModal {
            return;
        };

-        let id = self.context_servers_to_setup[0].id.clone();
-        let configuration = match &mut self.context_servers_to_setup[0].configuration {
-            Configuration::NotAvailable => {
-                self.context_servers_to_setup.remove(0);
-                if self.context_servers_to_setup.is_empty() {
-                    self.dismiss(cx);
-                }
-                return;
-            }
-            Configuration::Required(state) => state,
-        };
-
+        let configuration = &mut self.context_servers_to_setup[0];
        configuration.last_error.take();
        if configuration.waiting_for_context_server {
            return;
@@ -171,16 +124,16 @@ impl ConfigureContextServerModal {
                return;
            }
        }
-        let id = id.clone();
+        let id = configuration.id.clone();

-        let settings_changed = ProjectSettings::get_global(cx)
+        let settings_changed = context_server::ContextServerSettings::get_global(cx)
            .context_servers
-            .get(&id.0)
+            .get(&id)
            .map_or(true, |config| {
                config.settings.as_ref() != Some(&settings_value)
            });

-        let is_running = self.context_server_store.read(cx).status_for_server(&id)
+        let is_running = self.context_server_manager.read(cx).status_for_server(&id)
            == Some(ContextServerStatus::Running);

        if !settings_changed && is_running {
@@ -190,7 +143,7 @@ impl ConfigureContextServerModal {

        configuration.waiting_for_context_server = true;

-        let task = wait_for_context_server(&self.context_server_store, id.clone(), cx);
+        let task = wait_for_context_server(&self.context_server_manager, id.clone(), cx);
        cx.spawn({
            let id = id.clone();
            async move |this, cx| {
@@ -200,14 +153,9 @@ impl ConfigureContextServerModal {
                        this.complete_setup(id, cx);
                    }
                    Err(err) => {
-                        if let Some(setup) = this.context_servers_to_setup.get_mut(0) {
-                            match &mut setup.configuration {
-                                Configuration::NotAvailable => {}
-                                Configuration::Required(state) => {
-                                    state.last_error = Some(err.into());
-                                    state.waiting_for_context_server = false;
-                                }
-                            }
+                        if let Some(configuration) = this.context_servers_to_setup.get_mut(0) {
+                            configuration.last_error = Some(err.into());
+                            configuration.waiting_for_context_server = false;
                        } else {
                            this.dismiss(cx);
                        }
@@ -219,25 +167,29 @@ impl ConfigureContextServerModal {
        .detach();

        // When we write the settings to the file, the context server will be restarted.
-        update_settings_file::<ProjectSettings>(workspace.read(cx).app_state().fs.clone(), cx, {
-            let id = id.clone();
-            |settings, _| {
-                if let Some(server_config) = settings.context_servers.get_mut(&id.0) {
-                    server_config.settings = Some(settings_value);
-                } else {
-                    settings.context_servers.insert(
-                        id.0,
-                        ContextServerConfiguration {
-                            settings: Some(settings_value),
-                            ..Default::default()
-                        },
-                    );
+        update_settings_file::<context_server::ContextServerSettings>(
+            workspace.read(cx).app_state().fs.clone(),
+            cx,
+            {
+                let id = id.clone();
+                |settings, _| {
+                    if let Some(server_config) = settings.context_servers.get_mut(&id) {
+                        server_config.settings = Some(settings_value);
+                    } else {
+                        settings.context_servers.insert(
+                            id,
+                            context_server::ServerConfig {
+                                settings: Some(settings_value),
+                                ..Default::default()
+                            },
+                        );
+                    }
                }
-            }
-        });
+            },
+        );
    }

-    fn complete_setup(&mut self, id: ContextServerId, cx: &mut Context<Self>) {
+    fn complete_setup(&mut self, id: Arc<str>, cx: &mut Context<Self>) {
        self.context_servers_to_setup.remove(0);
        cx.notify();

@@ -271,40 +223,31 @@ impl ConfigureContextServerModal {
 }

 fn wait_for_context_server(
-    context_server_store: &Entity<ContextServerStore>,
-    context_server_id: ContextServerId,
+    context_server_manager: &Entity<ContextServerManager>,
+    context_server_id: Arc<str>,
    cx: &mut App,
 ) -> Task<Result<(), Arc<str>>> {
    let (tx, rx) = futures::channel::oneshot::channel();
    let tx = Arc::new(Mutex::new(Some(tx)));

-    let subscription = cx.subscribe(context_server_store, move |_, event, _cx| match event {
-        project::context_server_store::Event::ServerStatusChanged { server_id, status } => {
-            match status {
-                ContextServerStatus::Running => {
-                    if server_id == &context_server_id {
-                        if let Some(tx) = tx.lock().unwrap().take() {
-                            let _ = tx.send(Ok(()));
-                        }
+    let subscription = cx.subscribe(context_server_manager, move |_, event, _cx| match event {
+        context_server::manager::Event::ServerStatusChanged { server_id, status } => match status {
+            Some(ContextServerStatus::Running) => {
+                if server_id == &context_server_id {
+                    if let Some(tx) = tx.lock().unwrap().take() {
+                        let _ = tx.send(Ok(()));
                    }
                }
-                ContextServerStatus::Stopped => {
-                    if server_id == &context_server_id {
-                        if let Some(tx) = tx.lock().unwrap().take() {
-                            let _ = tx.send(Err("Context server stopped running".into()));
-                        }
-                    }
-                }
-                ContextServerStatus::Error(error) => {
-                    if server_id == &context_server_id {
-                        if let Some(tx) = tx.lock().unwrap().take() {
-                            let _ = tx.send(Err(error.clone()));
-                        }
-                    }
-                }
-                _ => {}
            }
-        }
+            Some(ContextServerStatus::Error(error)) => {
+                if server_id == &context_server_id {
+                    if let Some(tx) = tx.lock().unwrap().take() {
+                        let _ = tx.send(Err(error.clone()));
+                    }
+                }
+            }
+            _ => {}
+        },
    });

    cx.spawn(async move |_cx| {
@@ -316,8 +259,8 @@ fn wait_for_context_server(

 impl Render for ConfigureContextServerModal {
    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let Some(setup) = self.context_servers_to_setup.first() else {
-            return div().into_any_element();
+        let Some(configuration) = self.context_servers_to_setup.first() else {
+            return div().child("No context servers to setup");
        };

        let focus_handle = self.focus_handle(cx);
@@ -326,7 +269,6 @@ impl Render for ConfigureContextServerModal {
            .elevation_3(cx)
            .w(rems(42.))
            .key_context("ConfigureContextServerModal")
-            .track_focus(&focus_handle)
            .on_action(cx.listener(|this, _: &menu::Confirm, _window, cx| this.confirm(cx)))
            .on_action(cx.listener(|this, _: &menu::Cancel, _window, cx| this.dismiss(cx)))
            .capture_any_mouse_down(cx.listener(|this, _, window, cx| {
@@ -334,15 +276,9 @@ impl Render for ConfigureContextServerModal {
            }))
            .child(
                Modal::new("configure-context-server", None)
-                    .header(ModalHeader::new().headline(format!("Configure {}", setup.id)))
-                    .section(match &setup.configuration {
-                        Configuration::NotAvailable => Section::new().child(
-                            Label::new(
-                                "No configuration options available for this context server. Visit the Repository for any further instructions.",
-                            )
-                            .color(Color::Muted),
-                        ),
-                        Configuration::Required(configuration) => Section::new()
+                    .header(ModalHeader::new().headline(format!("Configure {}", configuration.id)))
+                    .section(
+                        Section::new()
                            .child(div().pb_2().text_sm().child(MarkdownElement::new(
                                configuration.installation_instructions.clone(),
                                default_markdown_style(window, cx),
@@ -426,84 +362,45 @@ impl Render for ConfigureContextServerModal {
                                        ),
                                )
                            }),
-                    })
+                    )
                    .footer(
-                        ModalFooter::new()
-                            .when_some(setup.repository_url.clone(), |this, repository_url| {
-                                this.start_slot(
-                                    h_flex().w_full().child(
-                                        Button::new("open-repository", "Open Repository")
-                                            .icon(IconName::ArrowUpRight)
-                                            .icon_color(Color::Muted)
-                                            .icon_size(IconSize::XSmall)
-                                            .tooltip({
-                                                let repository_url = repository_url.clone();
-                                                move |window, cx| {
-                                                    Tooltip::with_meta(
-                                                        "Open Repository",
-                                                        None,
-                                                        repository_url.clone(),
-                                                        window,
-                                                        cx,
-                                                    )
-                                                }
-                                            })
-                                            .on_click(move |_, _, cx| cx.open_url(&repository_url)),
-                                    ),
-                                )
-                            })
-                            .end_slot(match &setup.configuration {
-                                Configuration::NotAvailable => Button::new("dismiss", "Dismiss")
-                                    .key_binding(
-                                        KeyBinding::for_action_in(
-                                            &menu::Cancel,
-                                            &focus_handle,
-                                            window,
-                                            cx,
+                        ModalFooter::new().end_slot(
+                            h_flex()
+                                .gap_1()
+                                .child(
+                                    Button::new("cancel", "Cancel")
+                                        .key_binding(
+                                            KeyBinding::for_action_in(
+                                                &menu::Cancel,
+                                                &focus_handle,
+                                                window,
+                                                cx,
+                                            )
+                                            .map(|kb| kb.size(rems_from_px(12.))),
                                        )
-                                        .map(|kb| kb.size(rems_from_px(12.))),
-                                    )
-                                    .on_click(
-                                        cx.listener(|this, _event, _window, cx| this.dismiss(cx)),
-                                    )
-                                    .into_any_element(),
-                                Configuration::Required(state) => h_flex()
-                                    .gap_2()
-                                    .child(
-                                        Button::new("cancel", "Cancel")
-                                            .key_binding(
-                                                KeyBinding::for_action_in(
-                                                    &menu::Cancel,
-                                                    &focus_handle,
-                                                    window,
-                                                    cx,
-                                                )
-                                                .map(|kb| kb.size(rems_from_px(12.))),
+                                        .on_click(cx.listener(|this, _event, _window, cx| {
+                                            this.dismiss(cx)
+                                        })),
+                                )
+                                .child(
+                                    Button::new("configure-server", "Configure MCP")
+                                        .disabled(configuration.waiting_for_context_server)
+                                        .key_binding(
+                                            KeyBinding::for_action_in(
+                                                &menu::Confirm,
+                                                &focus_handle,
+                                                window,
+                                                cx,
                                            )
-                                            .on_click(cx.listener(|this, _event, _window, cx| {
-                                                this.dismiss(cx)
-                                            })),
-                                    )
-                                    .child(
-                                        Button::new("configure-server", "Configure MCP")
-                                            .disabled(state.waiting_for_context_server)
-                                            .key_binding(
-                                                KeyBinding::for_action_in(
-                                                    &menu::Confirm,
-                                                    &focus_handle,
-                                                    window,
-                                                    cx,
-                                                )
-                                                .map(|kb| kb.size(rems_from_px(12.))),
-                                            )
-                                            .on_click(cx.listener(|this, _event, _window, cx| {
-                                                this.confirm(cx)
-                                            })),
-                                    )
-                                    .into_any_element(),
-                            }),
+                                            .map(|kb| kb.size(rems_from_px(12.))),
+                                        )
+                                        .on_click(cx.listener(|this, _event, _window, cx| {
+                                            this.confirm(cx)
+                                        })),
+                                ),
+                        ),
                    ),
-            ).into_any_element()
+            )
    }
 }

@@ -541,14 +438,9 @@ impl EventEmitter<DismissEvent> for ConfigureContextServerModal {}
 impl Focusable for ConfigureContextServerModal {
    fn focus_handle(&self, cx: &App) -> FocusHandle {
        if let Some(current) = self.context_servers_to_setup.first() {
-            match &current.configuration {
-                Configuration::NotAvailable => self.focus_handle.clone(),
-                Configuration::Required(configuration) => {
-                    configuration.settings_editor.read(cx).focus_handle(cx)
-                }
-            }
+            current.settings_editor.read(cx).focus_handle(cx)
        } else {
-            self.focus_handle.clone()
+            cx.focus_handle()
        }
    }
 }
--- a/crates/agent/src/assistant_configuration/manage_profiles_modal.rs
+++ b/crates/agent/src/assistant_configuration/manage_profiles_modal.rs
@@ -2,7 +2,7 @@ mod profile_modal_header;

 use std::sync::Arc;

-use agent_settings::{AgentProfile, AgentProfileId, AgentSettings, builtin_profiles};
+use assistant_settings::{AgentProfile, AgentProfileId, AssistantSettings, builtin_profiles};
 use assistant_tool::ToolWorkingSet;
 use convert_case::{Case, Casing as _};
 use editor::Editor;
@@ -42,7 +42,7 @@ enum Mode {

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

        let mut builtin_profiles = Vec::new();
        let mut custom_profiles = Vec::new();
@@ -196,7 +196,7 @@ impl ManageProfilesModal {
        window: &mut Window,
        cx: &mut Context<Self>,
    ) {
-        let settings = AgentSettings::get_global(cx);
+        let settings = AssistantSettings::get_global(cx);
        let Some(profile) = settings.profiles.get(&profile_id).cloned() else {
            return;
        };
@@ -234,7 +234,7 @@ impl ManageProfilesModal {
        window: &mut Window,
        cx: &mut Context<Self>,
    ) {
-        let settings = AgentSettings::get_global(cx);
+        let settings = AssistantSettings::get_global(cx);
        let Some(profile) = settings.profiles.get(&profile_id).cloned() else {
            return;
        };
@@ -270,7 +270,7 @@ impl ManageProfilesModal {
        match &self.mode {
            Mode::ChooseProfile { .. } => {}
            Mode::NewProfile(mode) => {
-                let settings = AgentSettings::get_global(cx);
+                let settings = AssistantSettings::get_global(cx);

                let base_profile = mode
                    .base_profile_id
@@ -332,7 +332,7 @@ impl ManageProfilesModal {
        profile: AgentProfile,
        cx: &mut Context<Self>,
    ) {
-        update_settings_file::<AgentSettings>(self.fs.clone(), cx, {
+        update_settings_file::<AssistantSettings>(self.fs.clone(), cx, {
            move |settings, _cx| {
                settings.create_profile(profile_id, profile).log_err();
            }
@@ -485,7 +485,7 @@ impl ManageProfilesModal {
        _window: &mut Window,
        cx: &mut Context<Self>,
    ) -> impl IntoElement {
-        let settings = AgentSettings::get_global(cx);
+        let settings = AssistantSettings::get_global(cx);

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

        let profile_id = &settings.default_profile;
        let profile_name = settings
@@ -704,7 +704,7 @@ impl ManageProfilesModal {

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

        let go_back_item = div()
            .id("cancel-item")
--- a/crates/agent/src/assistant_configuration/tool_picker.rs
+++ b/crates/agent/src/assistant_configuration/tool_picker.rs
@@ -1,7 +1,7 @@
 use std::{collections::BTreeMap, sync::Arc};

-use agent_settings::{
-    AgentProfile, AgentProfileContent, AgentProfileId, AgentSettings, AgentSettingsContent,
+use assistant_settings::{
+    AgentProfile, AgentProfileContent, AgentProfileId, AssistantSettings, AssistantSettingsContent,
    ContextServerPresetContent,
 };
 use assistant_tool::{ToolSource, ToolWorkingSet};
@@ -259,7 +259,7 @@ impl PickerDelegate for ToolPickerDelegate {
            is_enabled
        };

-        let active_profile_id = &AgentSettings::get_global(cx).default_profile;
+        let active_profile_id = &AssistantSettings::get_global(cx).default_profile;
        if active_profile_id == &self.profile_id {
            self.thread_store
                .update(cx, |this, cx| {
@@ -268,12 +268,12 @@ impl PickerDelegate for ToolPickerDelegate {
                .log_err();
        }

-        update_settings_file::<AgentSettings>(self.fs.clone(), cx, {
+        update_settings_file::<AssistantSettings>(self.fs.clone(), cx, {
            let profile_id = self.profile_id.clone();
            let default_profile = self.profile.clone();
            let server_id = server_id.clone();
            let tool_name = tool_name.clone();
-            move |settings: &mut AgentSettingsContent, _cx| {
+            move |settings: &mut AssistantSettingsContent, _cx| {
                settings
                    .v2_setting(|v2_settings| {
                        let profiles = v2_settings.profiles.get_or_insert_default();
--- a/crates/agent/src/assistant_model_selector.rs
+++ b/crates/agent/src/assistant_model_selector.rs
@@ -1,4 +1,4 @@
-use agent_settings::AgentSettings;
+use assistant_settings::AssistantSettings;
 use fs::Fs;
 use gpui::{Entity, FocusHandle, SharedString};

@@ -63,7 +63,7 @@ impl AssistantModelSelector {
                                        );
                                    }
                                });
-                                update_settings_file::<AgentSettings>(
+                                update_settings_file::<AssistantSettings>(
                                    fs.clone(),
                                    cx,
                                    move |settings, _cx| {
@@ -72,7 +72,7 @@ impl AssistantModelSelector {
                                );
                            }
                            ModelType::InlineAssistant => {
-                                update_settings_file::<AgentSettings>(
+                                update_settings_file::<AssistantSettings>(
                                    fs.clone(),
                                    cx,
                                    move |settings, _cx| {
--- a/crates/agent/src/assistant_panel.rs
+++ b/crates/agent/src/assistant_panel.rs
--- a/crates/agent/src/buffer_codegen.rs
+++ b/crates/agent/src/buffer_codegen.rs
@@ -772,7 +772,7 @@ impl CodegenAlternative {
        cx: &mut Context<CodegenAlternative>,
    ) {
        let transaction = self.buffer.update(cx, |buffer, cx| {
-            // Avoid grouping agent edits with user edits.
+            // Avoid grouping assistant edits with user edits.
            buffer.finalize_last_transaction(cx);
            buffer.start_transaction(cx);
            buffer.edit(edits, None, cx);
@@ -781,7 +781,7 @@ impl CodegenAlternative {

        if let Some(transaction) = transaction {
            if let Some(first_transaction) = self.transformation_transaction_id {
-                // Group all agent edits into the first transaction.
+                // Group all assistant edits into the first transaction.
                self.buffer.update(cx, |buffer, cx| {
                    buffer.merge_transactions(transaction, first_transaction, cx)
                });
@@ -1095,7 +1095,9 @@ mod tests {

    #[gpui::test(iterations = 10)]
    async fn test_transform_autoindent(cx: &mut TestAppContext, mut rng: StdRng) {
-        init_test(cx);
+        cx.set_global(cx.update(SettingsStore::test));
+        cx.update(language_model::LanguageModelRegistry::test);
+        cx.update(language_settings::init);

        let text = indoc! {"
            fn main() {
@@ -1165,7 +1167,8 @@ mod tests {
        cx: &mut TestAppContext,
        mut rng: StdRng,
    ) {
-        init_test(cx);
+        cx.set_global(cx.update(SettingsStore::test));
+        cx.update(language_settings::init);

        let text = indoc! {"
            fn main() {
@@ -1234,7 +1237,9 @@ mod tests {
        cx: &mut TestAppContext,
        mut rng: StdRng,
    ) {
-        init_test(cx);
+        cx.update(LanguageModelRegistry::test);
+        cx.set_global(cx.update(SettingsStore::test));
+        cx.update(language_settings::init);

        let text = concat!(
            "fn main() {\n",
@@ -1300,7 +1305,9 @@ mod tests {

    #[gpui::test(iterations = 10)]
    async fn test_autoindent_respects_tabs_in_selection(cx: &mut TestAppContext) {
-        init_test(cx);
+        cx.update(LanguageModelRegistry::test);
+        cx.set_global(cx.update(SettingsStore::test));
+        cx.update(language_settings::init);

        let text = indoc! {"
            func main() {
@@ -1360,7 +1367,9 @@ mod tests {

    #[gpui::test]
    async fn test_inactive_codegen_alternative(cx: &mut TestAppContext) {
-        init_test(cx);
+        cx.update(LanguageModelRegistry::test);
+        cx.set_global(cx.update(SettingsStore::test));
+        cx.update(language_settings::init);

        let text = indoc! {"
            fn main() {
@@ -1464,13 +1473,6 @@ mod tests {
        }
    }

-    fn init_test(cx: &mut TestAppContext) {
-        cx.update(LanguageModelRegistry::test);
-        cx.set_global(cx.update(SettingsStore::test));
-        cx.update(Project::init_settings);
-        cx.update(language_settings::init);
-    }
-
    fn simulate_response_stream(
        codegen: Entity<CodegenAlternative>,
        cx: &mut TestAppContext,
--- a/crates/agent/src/context.rs
+++ b/crates/agent/src/context.rs
@@ -3,7 +3,6 @@ use std::hash::{Hash, Hasher};
 use std::path::PathBuf;
 use std::{ops::Range, path::Path, sync::Arc};

-use assistant_context_editor::AssistantContext;
 use assistant_tool::outline;
 use collections::{HashMap, HashSet};
 use editor::display_map::CreaseId;
@@ -34,7 +33,6 @@ pub enum ContextKind {
    Selection,
    FetchedUrl,
    Thread,
-    TextThread,
    Rules,
    Image,
 }
@@ -48,7 +46,6 @@ impl ContextKind {
            ContextKind::Selection => IconName::Context,
            ContextKind::FetchedUrl => IconName::Globe,
            ContextKind::Thread => IconName::MessageBubbles,
-            ContextKind::TextThread => IconName::MessageBubbles,
            ContextKind::Rules => RULES_ICON,
            ContextKind::Image => IconName::Image,
        }
@@ -68,7 +65,6 @@ pub enum AgentContextHandle {
    Selection(SelectionContextHandle),
    FetchedUrl(FetchedUrlContext),
    Thread(ThreadContextHandle),
-    TextThread(TextThreadContextHandle),
    Rules(RulesContextHandle),
    Image(ImageContext),
 }
@@ -82,7 +78,6 @@ impl AgentContextHandle {
            Self::Selection(context) => context.context_id,
            Self::FetchedUrl(context) => context.context_id,
            Self::Thread(context) => context.context_id,
-            Self::TextThread(context) => context.context_id,
            Self::Rules(context) => context.context_id,
            Self::Image(context) => context.context_id,
        }
@@ -103,7 +98,6 @@ pub enum AgentContext {
    Selection(SelectionContext),
    FetchedUrl(FetchedUrlContext),
    Thread(ThreadContext),
-    TextThread(TextThreadContext),
    Rules(RulesContext),
    Image(ImageContext),
 }
@@ -121,9 +115,6 @@ impl AgentContext {
            }
            AgentContext::FetchedUrl(context) => AgentContextHandle::FetchedUrl(context.clone()),
            AgentContext::Thread(context) => AgentContextHandle::Thread(context.handle.clone()),
-            AgentContext::TextThread(context) => {
-                AgentContextHandle::TextThread(context.handle.clone())
-            }
            AgentContext::Rules(context) => AgentContextHandle::Rules(context.handle.clone()),
            AgentContext::Image(context) => AgentContextHandle::Image(context.clone()),
        }
@@ -618,54 +609,6 @@ impl Display for ThreadContext {
    }
 }

-#[derive(Debug, Clone)]
-pub struct TextThreadContextHandle {
-    pub context: Entity<AssistantContext>,
-    pub context_id: ContextId,
-}
-
-#[derive(Debug, Clone)]
-pub struct TextThreadContext {
-    pub handle: TextThreadContextHandle,
-    pub title: SharedString,
-    pub text: SharedString,
-}
-
-impl TextThreadContextHandle {
-    // pub fn lookup_key() ->
-    pub fn eq_for_key(&self, other: &Self) -> bool {
-        self.context == other.context
-    }
-
-    pub fn hash_for_key<H: Hasher>(&self, state: &mut H) {
-        self.context.hash(state)
-    }
-
-    pub fn title(&self, cx: &App) -> SharedString {
-        self.context.read(cx).summary_or_default()
-    }
-
-    fn load(self, cx: &App) -> Task<Option<(AgentContext, Vec<Entity<Buffer>>)>> {
-        let title = self.title(cx);
-        let text = self.context.read(cx).to_xml(cx);
-        let context = AgentContext::TextThread(TextThreadContext {
-            title,
-            text: text.into(),
-            handle: self,
-        });
-        Task::ready(Some((context, vec![])))
-    }
-}
-
-impl Display for TextThreadContext {
-    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
-        // TODO: escape title?
-        write!(f, "<text_thread title=\"{}\">\n", self.title)?;
-        write!(f, "{}", self.text.trim())?;
-        write!(f, "\n</text_thread>")
-    }
-}
-
 #[derive(Debug, Clone)]
 pub struct RulesContextHandle {
    pub prompt_id: UserPromptId,
@@ -842,7 +785,6 @@ pub fn load_context(
            AgentContextHandle::Selection(context) => load_tasks.push(context.load(cx)),
            AgentContextHandle::FetchedUrl(context) => load_tasks.push(context.load()),
            AgentContextHandle::Thread(context) => load_tasks.push(context.load(cx)),
-            AgentContextHandle::TextThread(context) => load_tasks.push(context.load(cx)),
            AgentContextHandle::Rules(context) => load_tasks.push(context.load(prompt_store, cx)),
            AgentContextHandle::Image(context) => load_tasks.push(context.load(cx)),
        }
@@ -868,7 +810,6 @@ pub fn load_context(
        let mut selection_context = Vec::new();
        let mut fetched_url_context = Vec::new();
        let mut thread_context = Vec::new();
-        let mut text_thread_context = Vec::new();
        let mut rules_context = Vec::new();
        let mut images = Vec::new();
        for context in &contexts {
@@ -879,21 +820,17 @@ pub fn load_context(
                AgentContext::Selection(context) => selection_context.push(context),
                AgentContext::FetchedUrl(context) => fetched_url_context.push(context),
                AgentContext::Thread(context) => thread_context.push(context),
-                AgentContext::TextThread(context) => text_thread_context.push(context),
                AgentContext::Rules(context) => rules_context.push(context),
                AgentContext::Image(context) => images.extend(context.image()),
            }
        }

-        // Use empty text if there are no contexts that contribute to text (everything but image
-        // context).
        if file_context.is_empty()
            && directory_context.is_empty()
            && symbol_context.is_empty()
            && selection_context.is_empty()
            && fetched_url_context.is_empty()
            && thread_context.is_empty()
-            && text_thread_context.is_empty()
            && rules_context.is_empty()
        {
            return ContextLoadResult {
@@ -966,15 +903,6 @@ pub fn load_context(
            text.push_str("</conversation_threads>\n");
        }

-        if !text_thread_context.is_empty() {
-            text.push_str("<text_threads>");
-            for context in text_thread_context {
-                text.push('\n');
-                let _ = writeln!(text, "{context}");
-            }
-            text.push_str("<text_threads>");
-        }
-
        if !rules_context.is_empty() {
            text.push_str(
                "<user_rules>\n\
@@ -1091,11 +1019,6 @@ impl PartialEq for AgentContextKey {
                    return context.eq_for_key(other_context);
                }
            }
-            AgentContextHandle::TextThread(context) => {
-                if let AgentContextHandle::TextThread(other_context) = &other.0 {
-                    return context.eq_for_key(other_context);
-                }
-            }
        }
        false
    }
@@ -1110,7 +1033,6 @@ impl Hash for AgentContextKey {
            AgentContextHandle::Selection(context) => context.hash_for_key(state),
            AgentContextHandle::FetchedUrl(context) => context.hash_for_key(state),
            AgentContextHandle::Thread(context) => context.hash_for_key(state),
-            AgentContextHandle::TextThread(context) => context.hash_for_key(state),
            AgentContextHandle::Rules(context) => context.hash_for_key(state),
            AgentContextHandle::Image(context) => context.hash_for_key(state),
        }
--- a/crates/agent/src/context_picker.rs
+++ b/crates/agent/src/context_picker.rs
@@ -6,7 +6,7 @@ mod symbol_context_picker;
 mod thread_context_picker;

 use std::ops::Range;
-use std::path::{Path, PathBuf};
+use std::path::PathBuf;
 use std::sync::Arc;

 use anyhow::{Result, anyhow};
@@ -22,14 +22,11 @@ use gpui::{
 };
 use language::Buffer;
 use multi_buffer::MultiBufferRow;
-use paths::contexts_dir;
 use project::{Entry, ProjectPath};
 use prompt_store::{PromptStore, UserPromptId};
 use rules_context_picker::{RulesContextEntry, RulesContextPicker};
 use symbol_context_picker::SymbolContextPicker;
-use thread_context_picker::{
-    ThreadContextEntry, ThreadContextPicker, render_thread_context_entry, unordered_thread_entries,
-};
+use thread_context_picker::{ThreadContextEntry, ThreadContextPicker, render_thread_context_entry};
 use ui::{
    ButtonLike, ContextMenu, ContextMenuEntry, ContextMenuItem, Disclosure, TintColor, prelude::*,
 };
@@ -40,7 +37,7 @@ use crate::AssistantPanel;
 use crate::context::RULES_ICON;
 use crate::context_store::ContextStore;
 use crate::thread::ThreadId;
-use crate::thread_store::{TextThreadStore, ThreadStore};
+use crate::thread_store::ThreadStore;

 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 enum ContextPickerEntry {
@@ -167,7 +164,6 @@ pub(super) struct ContextPicker {
    workspace: WeakEntity<Workspace>,
    context_store: WeakEntity<ContextStore>,
    thread_store: Option<WeakEntity<ThreadStore>>,
-    text_thread_store: Option<WeakEntity<TextThreadStore>>,
    prompt_store: Option<Entity<PromptStore>>,
    _subscriptions: Vec<Subscription>,
 }
@@ -176,7 +172,6 @@ impl ContextPicker {
    pub fn new(
        workspace: WeakEntity<Workspace>,
        thread_store: Option<WeakEntity<ThreadStore>>,
-        text_thread_store: Option<WeakEntity<TextThreadStore>>,
        context_store: WeakEntity<ContextStore>,
        window: &mut Window,
        cx: &mut Context<Self>,
@@ -213,7 +208,6 @@ impl ContextPicker {
            workspace,
            context_store,
            thread_store,
-            text_thread_store,
            prompt_store,
            _subscriptions: subscriptions,
        }
@@ -346,15 +340,10 @@ impl ContextPicker {
                    }));
                }
                ContextPickerMode::Thread => {
-                    if let Some((thread_store, text_thread_store)) = self
-                        .thread_store
-                        .as_ref()
-                        .zip(self.text_thread_store.as_ref())
-                    {
+                    if let Some(thread_store) = self.thread_store.as_ref() {
                        self.mode = ContextPickerState::Thread(cx.new(|cx| {
                            ThreadContextPicker::new(
                                thread_store.clone(),
-                                text_thread_store.clone(),
                                context_picker.clone(),
                                self.context_store.clone(),
                                window,
@@ -458,53 +447,30 @@ impl ContextPicker {

    fn add_recent_thread(
        &self,
-        entry: ThreadContextEntry,
+        thread: ThreadContextEntry,
        cx: &mut Context<Self>,
    ) -> Task<Result<()>> {
        let Some(context_store) = self.context_store.upgrade() else {
            return Task::ready(Err(anyhow!("context store not available")));
        };

-        match entry {
-            ThreadContextEntry::Thread { id, .. } => {
-                let Some(thread_store) = self
-                    .thread_store
-                    .as_ref()
-                    .and_then(|thread_store| thread_store.upgrade())
-                else {
-                    return Task::ready(Err(anyhow!("thread store not available")));
-                };
+        let Some(thread_store) = self
+            .thread_store
+            .as_ref()
+            .and_then(|thread_store| thread_store.upgrade())
+        else {
+            return Task::ready(Err(anyhow!("thread store not available")));
+        };

-                let open_thread_task =
-                    thread_store.update(cx, |this, cx| this.open_thread(&id, cx));
-                cx.spawn(async move |this, cx| {
-                    let thread = open_thread_task.await?;
-                    context_store.update(cx, |context_store, cx| {
-                        context_store.add_thread(thread, true, cx);
-                    })?;
-                    this.update(cx, |_this, cx| cx.notify())
-                })
-            }
-            ThreadContextEntry::Context { path, .. } => {
-                let Some(text_thread_store) = self
-                    .text_thread_store
-                    .as_ref()
-                    .and_then(|thread_store| thread_store.upgrade())
-                else {
-                    return Task::ready(Err(anyhow!("text thread store not available")));
-                };
+        let open_thread_task = thread_store.update(cx, |this, cx| this.open_thread(&thread.id, cx));
+        cx.spawn(async move |this, cx| {
+            let thread = open_thread_task.await?;
+            context_store.update(cx, |context_store, cx| {
+                context_store.add_thread(thread, true, cx);
+            })?;

-                let task = text_thread_store
-                    .update(cx, |this, cx| this.open_local_context(path.clone(), cx));
-                cx.spawn(async move |this, cx| {
-                    let thread = task.await?;
-                    context_store.update(cx, |context_store, cx| {
-                        context_store.add_text_thread(thread, true, cx);
-                    })?;
-                    this.update(cx, |_this, cx| cx.notify())
-                })
-            }
-        }
+            this.update(cx, |_this, cx| cx.notify())
+        })
    }

    fn recent_entries(&self, cx: &mut App) -> Vec<RecentEntry> {
@@ -519,7 +485,6 @@ impl ContextPicker {
        recent_context_picker_entries(
            context_store,
            self.thread_store.clone(),
-            self.text_thread_store.clone(),
            workspace,
            None,
            cx,
@@ -618,7 +583,6 @@ fn available_context_picker_entries(
 fn recent_context_picker_entries(
    context_store: Entity<ContextStore>,
    thread_store: Option<WeakEntity<ThreadStore>>,
-    text_thread_store: Option<WeakEntity<TextThreadStore>>,
    workspace: Entity<Workspace>,
    exclude_path: Option<ProjectPath>,
    cx: &App,
@@ -648,34 +612,24 @@ fn recent_context_picker_entries(

    let active_thread_id = workspace
        .panel::<AssistantPanel>(cx)
-        .and_then(|panel| Some(panel.read(cx).active_thread()?.read(cx).id()));
-
-    if let Some((thread_store, text_thread_store)) = thread_store
-        .and_then(|store| store.upgrade())
-        .zip(text_thread_store.and_then(|store| store.upgrade()))
-    {
-        let mut threads = unordered_thread_entries(thread_store, text_thread_store, cx)
-            .filter(|(_, thread)| match thread {
-                ThreadContextEntry::Thread { id, .. } => {
-                    Some(id) != active_thread_id && !current_threads.contains(id)
-                }
-                ThreadContextEntry::Context { .. } => true,
-            })
-            .collect::<Vec<_>>();
-
-        const RECENT_COUNT: usize = 2;
-        if threads.len() > RECENT_COUNT {
-            threads.select_nth_unstable_by_key(RECENT_COUNT - 1, |(updated_at, _)| {
-                std::cmp::Reverse(*updated_at)
-            });
-            threads.truncate(RECENT_COUNT);
-        }
-        threads.sort_unstable_by_key(|(updated_at, _)| std::cmp::Reverse(*updated_at));
+        .map(|panel| panel.read(cx).active_thread(cx).read(cx).id());

+    if let Some(thread_store) = thread_store.and_then(|thread_store| thread_store.upgrade()) {
        recent.extend(
-            threads
+            thread_store
+                .read(cx)
+                .reverse_chronological_threads()
                .into_iter()
-                .map(|(_, thread)| RecentEntry::Thread(thread)),
+                .filter(|thread| {
+                    Some(&thread.id) != active_thread_id && !current_threads.contains(&thread.id)
+                })
+                .take(2)
+                .map(|thread| {
+                    RecentEntry::Thread(ThreadContextEntry {
+                        id: thread.id,
+                        summary: thread.summary,
+                    })
+                }),
        );
    }

@@ -873,7 +827,6 @@ pub enum MentionLink {
    Selection(ProjectPath, Range<usize>),
    Fetch(String),
    Thread(ThreadId),
-    TextThread(Arc<Path>),
    Rule(UserPromptId),
 }

@@ -885,8 +838,6 @@ impl MentionLink {
    const FETCH: &str = "@fetch";
    const RULE: &str = "@rule";

-    const TEXT_THREAD_URL_PREFIX: &str = "text-thread://";
-
    const SEPARATOR: &str = ":";

    pub fn is_valid(url: &str) -> bool {
@@ -926,22 +877,7 @@ impl MentionLink {
    }

    pub fn for_thread(thread: &ThreadContextEntry) -> String {
-        match thread {
-            ThreadContextEntry::Thread { id, title } => {
-                format!("[@{}]({}:{})", title, Self::THREAD, id)
-            }
-            ThreadContextEntry::Context { path, title } => {
-                let filename = path.file_name().unwrap_or_default();
-                let escaped_filename = urlencoding::encode(&filename.to_string_lossy()).to_string();
-                format!(
-                    "[@{}]({}:{}{})",
-                    title,
-                    Self::THREAD,
-                    Self::TEXT_THREAD_URL_PREFIX,
-                    escaped_filename
-                )
-            }
-        }
+        format!("[@{}]({}:{})", thread.summary, Self::THREAD, thread.id)
    }

    pub fn for_fetch(url: &str) -> String {
@@ -1003,15 +939,8 @@ impl MentionLink {
                Some(MentionLink::Selection(project_path, line_range))
            }
            Self::THREAD => {
-                if let Some(encoded_filename) = argument.strip_prefix(Self::TEXT_THREAD_URL_PREFIX)
-                {
-                    let filename = urlencoding::decode(encoded_filename).ok()?;
-                    let path = contexts_dir().join(filename.as_ref()).into();
-                    Some(MentionLink::TextThread(path))
-                } else {
-                    let thread_id = ThreadId::from(argument);
-                    Some(MentionLink::Thread(thread_id))
-                }
+                let thread_id = ThreadId::from(argument);
+                Some(MentionLink::Thread(thread_id))
            }
            Self::FETCH => Some(MentionLink::Fetch(argument.to_string())),
            Self::RULE => {
--- a/crates/agent/src/context_picker/completion_provider.rs
+++ b/crates/agent/src/context_picker/completion_provider.rs
@@ -25,7 +25,7 @@ use workspace::Workspace;
 use crate::Thread;
 use crate::context::{AgentContextHandle, AgentContextKey, ContextCreasesAddon, RULES_ICON};
 use crate::context_store::ContextStore;
-use crate::thread_store::{TextThreadStore, ThreadStore};
+use crate::thread_store::ThreadStore;

 use super::fetch_context_picker::fetch_url_content;
 use super::file_context_picker::{FileMatch, search_files};
@@ -72,7 +72,6 @@ fn search(
    recent_entries: Vec<RecentEntry>,
    prompt_store: Option<Entity<PromptStore>>,
    thread_store: Option<WeakEntity<ThreadStore>>,
-    text_thread_context_store: Option<WeakEntity<assistant_context_editor::ContextStore>>,
    workspace: Entity<Workspace>,
    cx: &mut App,
 ) -> Task<Vec<Match>> {
@@ -102,18 +101,9 @@ fn search(
        }

        Some(ContextPickerMode::Thread) => {
-            if let Some((thread_store, context_store)) = thread_store
-                .as_ref()
-                .and_then(|t| t.upgrade())
-                .zip(text_thread_context_store.as_ref().and_then(|t| t.upgrade()))
-            {
-                let search_threads_task = search_threads(
-                    query.clone(),
-                    cancellation_flag.clone(),
-                    thread_store,
-                    context_store,
-                    cx,
-                );
+            if let Some(thread_store) = thread_store.as_ref().and_then(|t| t.upgrade()) {
+                let search_threads_task =
+                    search_threads(query.clone(), cancellation_flag.clone(), thread_store, cx);
                cx.background_spawn(async move {
                    search_threads_task
                        .await
@@ -246,7 +236,6 @@ pub struct ContextPickerCompletionProvider {
    workspace: WeakEntity<Workspace>,
    context_store: WeakEntity<ContextStore>,
    thread_store: Option<WeakEntity<ThreadStore>>,
-    text_thread_store: Option<WeakEntity<TextThreadStore>>,
    editor: WeakEntity<Editor>,
    excluded_buffer: Option<WeakEntity<Buffer>>,
 }
@@ -256,7 +245,6 @@ impl ContextPickerCompletionProvider {
        workspace: WeakEntity<Workspace>,
        context_store: WeakEntity<ContextStore>,
        thread_store: Option<WeakEntity<ThreadStore>>,
-        text_thread_store: Option<WeakEntity<TextThreadStore>>,
        editor: WeakEntity<Editor>,
        exclude_buffer: Option<WeakEntity<Buffer>>,
    ) -> Self {
@@ -264,7 +252,6 @@ impl ContextPickerCompletionProvider {
            workspace,
            context_store,
            thread_store,
-            text_thread_store,
            editor,
            excluded_buffer: exclude_buffer,
        }
@@ -413,7 +400,6 @@ impl ContextPickerCompletionProvider {
        editor: Entity<Editor>,
        context_store: Entity<ContextStore>,
        thread_store: Entity<ThreadStore>,
-        text_thread_store: Entity<TextThreadStore>,
    ) -> Completion {
        let icon_for_completion = if recent {
            IconName::HistoryRerun
@@ -425,58 +411,38 @@ impl ContextPickerCompletionProvider {
        Completion {
            replace_range: source_range.clone(),
            new_text,
-            label: CodeLabel::plain(thread_entry.title().to_string(), None),
+            label: CodeLabel::plain(thread_entry.summary.to_string(), None),
            documentation: None,
            insert_text_mode: None,
            source: project::CompletionSource::Custom,
            icon_path: Some(icon_for_completion.path().into()),
            confirm: Some(confirm_completion_callback(
                IconName::MessageBubbles.path().into(),
-                thread_entry.title().clone(),
+                thread_entry.summary.clone(),
                excerpt_id,
                source_range.start,
                new_text_len,
                editor.clone(),
                context_store.clone(),
-                move |cx| match &thread_entry {
-                    ThreadContextEntry::Thread { id, .. } => {
-                        let thread_id = id.clone();
-                        let context_store = context_store.clone();
-                        let thread_store = thread_store.clone();
-                        cx.spawn::<_, Option<_>>(async move |cx| {
-                            let thread: Entity<Thread> = thread_store
-                                .update(cx, |thread_store, cx| {
-                                    thread_store.open_thread(&thread_id, cx)
-                                })
-                                .ok()?
-                                .await
-                                .log_err()?;
-                            let context = context_store
-                                .update(cx, |context_store, cx| {
-                                    context_store.add_thread(thread, false, cx)
-                                })
-                                .ok()??;
-                            Some(context)
-                        })
-                    }
-                    ThreadContextEntry::Context { path, .. } => {
-                        let path = path.clone();
-                        let context_store = context_store.clone();
-                        let text_thread_store = text_thread_store.clone();
-                        cx.spawn::<_, Option<_>>(async move |cx| {
-                            let thread = text_thread_store
-                                .update(cx, |store, cx| store.open_local_context(path, cx))
-                                .ok()?
-                                .await
-                                .log_err()?;
-                            let context = context_store
-                                .update(cx, |context_store, cx| {
-                                    context_store.add_text_thread(thread, false, cx)
-                                })
-                                .ok()??;
-                            Some(context)
-                        })
-                    }
+                move |cx| {
+                    let thread_id = thread_entry.id.clone();
+                    let context_store = context_store.clone();
+                    let thread_store = thread_store.clone();
+                    cx.spawn::<_, Option<_>>(async move |cx| {
+                        let thread: Entity<Thread> = thread_store
+                            .update(cx, |thread_store, cx| {
+                                thread_store.open_thread(&thread_id, cx)
+                            })
+                            .ok()?
+                            .await
+                            .log_err()?;
+                        let context = context_store
+                            .update(cx, |context_store, cx| {
+                                context_store.add_thread(thread, false, cx)
+                            })
+                            .ok()??;
+                        Some(context)
+                    })
                },
            )),
        }
@@ -767,7 +733,6 @@ impl CompletionProvider for ContextPickerCompletionProvider {
            ..snapshot.anchor_before(state.source_range.end);

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

@@ -784,7 +749,6 @@ impl CompletionProvider for ContextPickerCompletionProvider {
        let recent_entries = recent_context_picker_entries(
            context_store.clone(),
            thread_store.clone(),
-            text_thread_store.clone(),
            workspace.clone(),
            excluded_path.clone(),
            cx,
@@ -804,7 +768,6 @@ impl CompletionProvider for ContextPickerCompletionProvider {
            recent_entries,
            prompt_store,
            thread_store.clone(),
-            text_thread_store.clone(),
            workspace.clone(),
            cx,
        );
@@ -856,8 +819,6 @@ impl CompletionProvider for ContextPickerCompletionProvider {
                            thread, is_recent, ..
                        }) => {
                            let thread_store = thread_store.as_ref().and_then(|t| t.upgrade())?;
-                            let text_thread_store =
-                                text_thread_store.as_ref().and_then(|t| t.upgrade())?;
                            Some(Self::completion_for_thread(
                                thread,
                                excerpt_id,
@@ -866,7 +827,6 @@ impl CompletionProvider for ContextPickerCompletionProvider {
                                editor.clone(),
                                context_store.clone(),
                                thread_store,
-                                text_thread_store,
                            ))
                        }

@@ -1287,7 +1247,6 @@ mod tests {
                workspace.downgrade(),
                context_store.downgrade(),
                None,
-                None,
                editor_entity,
                last_opened_buffer,
            ))));
--- a/crates/agent/src/context_picker/thread_context_picker.rs
+++ b/crates/agent/src/context_picker/thread_context_picker.rs
@@ -1,8 +1,6 @@
-use std::path::Path;
 use std::sync::Arc;
 use std::sync::atomic::AtomicBool;

-use chrono::{DateTime, Utc};
 use fuzzy::StringMatchCandidate;
 use gpui::{App, DismissEvent, Entity, FocusHandle, Focusable, Task, WeakEntity};
 use picker::{Picker, PickerDelegate};
@@ -11,7 +9,7 @@ use ui::{ListItem, prelude::*};
 use crate::context_picker::ContextPicker;
 use crate::context_store::{self, ContextStore};
 use crate::thread::ThreadId;
-use crate::thread_store::{TextThreadStore, ThreadStore};
+use crate::thread_store::ThreadStore;

 pub struct ThreadContextPicker {
    picker: Entity<Picker<ThreadContextPickerDelegate>>,
@@ -20,18 +18,13 @@ pub struct ThreadContextPicker {
 impl ThreadContextPicker {
    pub fn new(
        thread_store: WeakEntity<ThreadStore>,
-        text_thread_context_store: WeakEntity<TextThreadStore>,
        context_picker: WeakEntity<ContextPicker>,
        context_store: WeakEntity<context_store::ContextStore>,
        window: &mut Window,
        cx: &mut Context<Self>,
    ) -> Self {
-        let delegate = ThreadContextPickerDelegate::new(
-            thread_store,
-            text_thread_context_store,
-            context_picker,
-            context_store,
-        );
+        let delegate =
+            ThreadContextPickerDelegate::new(thread_store, context_picker, context_store);
        let picker = cx.new(|cx| Picker::uniform_list(delegate, window, cx));

        ThreadContextPicker { picker }
@@ -51,29 +44,13 @@ impl Render for ThreadContextPicker {
 }

 #[derive(Debug, Clone)]
-pub enum ThreadContextEntry {
-    Thread {
-        id: ThreadId,
-        title: SharedString,
-    },
-    Context {
-        path: Arc<Path>,
-        title: SharedString,
-    },
-}
-
-impl ThreadContextEntry {
-    pub fn title(&self) -> &SharedString {
-        match self {
-            Self::Thread { title, .. } => title,
-            Self::Context { title, .. } => title,
-        }
-    }
+pub struct ThreadContextEntry {
+    pub id: ThreadId,
+    pub summary: SharedString,
 }

 pub struct ThreadContextPickerDelegate {
    thread_store: WeakEntity<ThreadStore>,
-    text_thread_store: WeakEntity<TextThreadStore>,
    context_picker: WeakEntity<ContextPicker>,
    context_store: WeakEntity<context_store::ContextStore>,
    matches: Vec<ThreadContextEntry>,
@@ -83,7 +60,6 @@ pub struct ThreadContextPickerDelegate {
 impl ThreadContextPickerDelegate {
    pub fn new(
        thread_store: WeakEntity<ThreadStore>,
-        text_thread_store: WeakEntity<TextThreadStore>,
        context_picker: WeakEntity<ContextPicker>,
        context_store: WeakEntity<context_store::ContextStore>,
    ) -> Self {
@@ -91,7 +67,6 @@ impl ThreadContextPickerDelegate {
            thread_store,
            context_picker,
            context_store,
-            text_thread_store,
            matches: Vec::new(),
            selected_index: 0,
        }
@@ -128,21 +103,11 @@ impl PickerDelegate for ThreadContextPickerDelegate {
        window: &mut Window,
        cx: &mut Context<Picker<Self>>,
    ) -> Task<()> {
-        let Some((thread_store, text_thread_context_store)) = self
-            .thread_store
-            .upgrade()
-            .zip(self.text_thread_store.upgrade())
-        else {
+        let Some(thread_store) = self.thread_store.upgrade() else {
            return Task::ready(());
        };

-        let search_task = search_threads(
-            query,
-            Arc::new(AtomicBool::default()),
-            thread_store,
-            text_thread_context_store,
-            cx,
-        );
+        let search_task = search_threads(query, Arc::new(AtomicBool::default()), thread_store, cx);
        cx.spawn_in(window, async move |this, cx| {
            let matches = search_task.await;
            this.update(cx, |this, cx| {
@@ -159,48 +124,24 @@ impl PickerDelegate for ThreadContextPickerDelegate {
            return;
        };

-        match entry {
-            ThreadContextEntry::Thread { id, .. } => {
-                let Some(thread_store) = self.thread_store.upgrade() else {
-                    return;
-                };
-                let open_thread_task =
-                    thread_store.update(cx, |this, cx| this.open_thread(&id, cx));
+        let Some(thread_store) = self.thread_store.upgrade() else {
+            return;
+        };

-                cx.spawn(async move |this, cx| {
-                    let thread = open_thread_task.await?;
-                    this.update(cx, |this, cx| {
-                        this.delegate
-                            .context_store
-                            .update(cx, |context_store, cx| {
-                                context_store.add_thread(thread, true, cx)
-                            })
-                            .ok();
-                    })
-                })
-                .detach_and_log_err(cx);
-            }
-            ThreadContextEntry::Context { path, .. } => {
-                let Some(text_thread_store) = self.text_thread_store.upgrade() else {
-                    return;
-                };
-                let task = text_thread_store
-                    .update(cx, |this, cx| this.open_local_context(path.clone(), cx));
+        let open_thread_task = thread_store.update(cx, |this, cx| this.open_thread(&entry.id, cx));

-                cx.spawn(async move |this, cx| {
-                    let thread = task.await?;
-                    this.update(cx, |this, cx| {
-                        this.delegate
-                            .context_store
-                            .update(cx, |context_store, cx| {
-                                context_store.add_text_thread(thread, true, cx)
-                            })
-                            .ok();
+        cx.spawn(async move |this, cx| {
+            let thread = open_thread_task.await?;
+            this.update(cx, |this, cx| {
+                this.delegate
+                    .context_store
+                    .update(cx, |context_store, cx| {
+                        context_store.add_thread(thread, true, cx)
                    })
-                })
-                .detach_and_log_err(cx);
-            }
-        }
+                    .ok();
+            })
+        })
+        .detach_and_log_err(cx);
    }

    fn dismissed(&mut self, _window: &mut Window, cx: &mut Context<Picker<Self>>) {
@@ -227,20 +168,13 @@ impl PickerDelegate for ThreadContextPickerDelegate {
 }

 pub fn render_thread_context_entry(
-    entry: &ThreadContextEntry,
+    thread: &ThreadContextEntry,
    context_store: WeakEntity<ContextStore>,
    cx: &mut App,
 ) -> Div {
-    let is_added = match entry {
-        ThreadContextEntry::Thread { id, .. } => context_store
-            .upgrade()
-            .map_or(false, |ctx_store| ctx_store.read(cx).includes_thread(&id)),
-        ThreadContextEntry::Context { path, .. } => {
-            context_store.upgrade().map_or(false, |ctx_store| {
-                ctx_store.read(cx).includes_text_thread(path)
-            })
-        }
-    };
+    let added = context_store.upgrade().map_or(false, |ctx_store| {
+        ctx_store.read(cx).includes_thread(&thread.id)
+    });

    h_flex()
        .gap_1p5()
@@ -255,9 +189,9 @@ pub fn render_thread_context_entry(
                        .size(IconSize::XSmall)
                        .color(Color::Muted),
                )
-                .child(Label::new(entry.title().clone()).truncate()),
+                .child(Label::new(thread.summary.clone()).truncate()),
        )
-        .when(is_added, |el| {
+        .when(added, |el| {
            el.child(
                h_flex()
                    .gap_1()
@@ -277,54 +211,28 @@ pub struct ThreadMatch {
    pub is_recent: bool,
 }

-pub fn unordered_thread_entries(
-    thread_store: Entity<ThreadStore>,
-    text_thread_store: Entity<TextThreadStore>,
-    cx: &App,
-) -> impl Iterator<Item = (DateTime<Utc>, ThreadContextEntry)> {
-    let threads = thread_store.read(cx).unordered_threads().map(|thread| {
-        (
-            thread.updated_at,
-            ThreadContextEntry::Thread {
-                id: thread.id.clone(),
-                title: thread.summary.clone(),
-            },
-        )
-    });
-
-    let text_threads = text_thread_store
-        .read(cx)
-        .unordered_contexts()
-        .map(|context| {
-            (
-                context.mtime.to_utc(),
-                ThreadContextEntry::Context {
-                    path: context.path.clone(),
-                    title: context.title.clone().into(),
-                },
-            )
-        });
-
-    threads.chain(text_threads)
-}
-
 pub(crate) fn search_threads(
    query: String,
    cancellation_flag: Arc<AtomicBool>,
    thread_store: Entity<ThreadStore>,
-    text_thread_store: Entity<TextThreadStore>,
    cx: &mut App,
 ) -> Task<Vec<ThreadMatch>> {
-    let mut threads =
-        unordered_thread_entries(thread_store, text_thread_store, cx).collect::<Vec<_>>();
-    threads.sort_unstable_by_key(|(updated_at, _)| std::cmp::Reverse(*updated_at));
+    let threads = thread_store
+        .read(cx)
+        .reverse_chronological_threads()
+        .into_iter()
+        .map(|thread| ThreadContextEntry {
+            id: thread.id,
+            summary: thread.summary,
+        })
+        .collect::<Vec<_>>();

    let executor = cx.background_executor().clone();
    cx.background_spawn(async move {
        if query.is_empty() {
            threads
                .into_iter()
-                .map(|(_, thread)| ThreadMatch {
+                .map(|thread| ThreadMatch {
                    thread,
                    is_recent: false,
                })
@@ -333,7 +241,7 @@ pub(crate) fn search_threads(
            let candidates = threads
                .iter()
                .enumerate()
-                .map(|(id, (_, thread))| StringMatchCandidate::new(id, &thread.title()))
+                .map(|(id, thread)| StringMatchCandidate::new(id, &thread.summary))
                .collect::<Vec<_>>();
            let matches = fuzzy::match_strings(
                &candidates,
@@ -348,7 +256,7 @@ pub(crate) fn search_threads(
            matches
                .into_iter()
                .map(|mat| ThreadMatch {
-                    thread: threads[mat.candidate_id].1.clone(),
+                    thread: threads[mat.candidate_id].clone(),
                    is_recent: false,
                })
                .collect()
--- a/crates/agent/src/context_server_configuration.rs
+++ b/crates/agent/src/context_server_configuration.rs
@@ -1,16 +1,14 @@
 use std::sync::Arc;

 use anyhow::Context as _;
-use context_server::ContextServerId;
-use extension::{ContextServerConfiguration, ExtensionManifest};
-use gpui::Task;
+use context_server::ContextServerDescriptorRegistry;
+use extension::ExtensionManifest;
 use language::LanguageRegistry;
-use project::context_server_store::registry::ContextServerDescriptorRegistry;
 use ui::prelude::*;
 use util::ResultExt;
 use workspace::Workspace;

-use crate::assistant_configuration::ConfigureContextServerModal;
+use crate::{AssistantPanel, assistant_configuration::ConfigureContextServerModal};

 pub(crate) fn init(language_registry: Arc<LanguageRegistry>, cx: &mut App) {
    cx.observe_new(move |_: &mut Workspace, window, cx| {
@@ -55,15 +53,6 @@ pub(crate) fn init(language_registry: Arc<LanguageRegistry>, cx: &mut App) {
    .detach();
 }

-pub enum Configuration {
-    NotAvailable(ContextServerId, Option<SharedString>),
-    Required(
-        ContextServerId,
-        Option<SharedString>,
-        ContextServerConfiguration,
-    ),
-}
-
 fn show_configure_mcp_modal(
    language_registry: Arc<LanguageRegistry>,
    manifest: &Arc<ExtensionManifest>,
@@ -71,46 +60,37 @@ fn show_configure_mcp_modal(
    window: &mut Window,
    cx: &mut Context<'_, Workspace>,
 ) {
-    let context_server_store = workspace.project().read(cx).context_server_store();
-    let repository: Option<SharedString> = manifest.repository.as_ref().map(|s| s.clone().into());
+    let Some(context_server_manager) = workspace.panel::<AssistantPanel>(cx).map(|panel| {
+        panel
+            .read(cx)
+            .thread_store()
+            .read(cx)
+            .context_server_manager()
+    }) else {
+        return;
+    };

-    let registry = ContextServerDescriptorRegistry::default_global(cx).read(cx);
-    let worktree_store = workspace.project().read(cx).worktree_store();
+    let registry = ContextServerDescriptorRegistry::global(cx).read(cx);
+    let project = workspace.project().clone();
    let configuration_tasks = manifest
        .context_servers
        .keys()
        .cloned()
-        .map({
+        .filter_map({
            |key| {
-                let Some(descriptor) = registry.context_server_descriptor(&key) else {
-                    return Task::ready(Configuration::NotAvailable(
-                        ContextServerId(key),
-                        repository.clone(),
-                    ));
-                };
-                cx.spawn({
-                    let repository_url = repository.clone();
-                    let worktree_store = worktree_store.clone();
+                let descriptor = registry.context_server_descriptor(&key)?;
+                Some(cx.spawn({
+                    let project = project.clone();
                    async move |_, cx| {
-                        let configuration = descriptor
-                            .configuration(worktree_store.clone(), &cx)
+                        descriptor
+                            .configuration(project, &cx)
                            .await
                            .context("Failed to resolve context server configuration")
                            .log_err()
-                            .flatten();
-
-                        match configuration {
-                            Some(config) => Configuration::Required(
-                                ContextServerId(key),
-                                repository_url,
-                                config,
-                            ),
-                            None => {
-                                Configuration::NotAvailable(ContextServerId(key), repository_url)
-                            }
-                        }
+                            .flatten()
+                            .map(|config| (key, config))
                    }
-                })
+                }))
            }
        })
        .collect::<Vec<_>>();
@@ -118,22 +98,22 @@ fn show_configure_mcp_modal(
    let jsonc_language = language_registry.language_for_name("jsonc");

    cx.spawn_in(window, async move |this, cx| {
-        let configurations = futures::future::join_all(configuration_tasks).await;
+        let descriptors = futures::future::join_all(configuration_tasks).await;
        let jsonc_language = jsonc_language.await.ok();

        this.update_in(cx, |this, window, cx| {
-            let workspace = cx.entity().downgrade();
-            this.toggle_modal(window, cx, |window, cx| {
-                ConfigureContextServerModal::new(
-                    configurations.into_iter(),
-                    context_server_store,
-                    jsonc_language,
-                    language_registry,
-                    workspace,
-                    window,
-                    cx,
-                )
-            });
+            let modal = ConfigureContextServerModal::new(
+                descriptors.into_iter().flatten(),
+                jsonc_language,
+                context_server_manager,
+                language_registry,
+                cx.entity().downgrade(),
+                window,
+                cx,
+            );
+            if let Some(modal) = modal {
+                this.toggle_modal(window, cx, |_, _| modal);
+            }
        })
    })
    .detach();
--- a/crates/agent/src/context_store.rs
+++ b/crates/agent/src/context_store.rs
@@ -1,9 +1,8 @@
 use std::ops::Range;
-use std::path::{Path, PathBuf};
+use std::path::PathBuf;
 use std::sync::Arc;

 use anyhow::{Result, anyhow};
-use assistant_context_editor::AssistantContext;
 use collections::{HashSet, IndexSet};
 use futures::{self, FutureExt};
 use gpui::{App, Context, Entity, EventEmitter, Image, SharedString, Task, WeakEntity};
@@ -19,7 +18,7 @@ use crate::ThreadStore;
 use crate::context::{
    AgentContextHandle, AgentContextKey, ContextId, DirectoryContextHandle, FetchedUrlContext,
    FileContextHandle, ImageContext, RulesContextHandle, SelectionContextHandle,
-    SymbolContextHandle, TextThreadContextHandle, ThreadContextHandle,
+    SymbolContextHandle, ThreadContextHandle,
 };
 use crate::context_strip::SuggestedContext;
 use crate::thread::{MessageId, Thread, ThreadId};
@@ -30,7 +29,6 @@ pub struct ContextStore {
    next_context_id: ContextId,
    context_set: IndexSet<AgentContextKey>,
    context_thread_ids: HashSet<ThreadId>,
-    context_text_thread_paths: HashSet<Arc<Path>>,
 }

 pub enum ContextStoreEvent {
@@ -50,7 +48,6 @@ impl ContextStore {
            next_context_id: ContextId::zero(),
            context_set: IndexSet::default(),
            context_thread_ids: HashSet::default(),
-            context_text_thread_paths: HashSet::default(),
        }
    }

@@ -230,31 +227,6 @@ impl ContextStore {
        }
    }

-    pub fn add_text_thread(
-        &mut self,
-        context: Entity<AssistantContext>,
-        remove_if_exists: bool,
-        cx: &mut Context<Self>,
-    ) -> Option<AgentContextHandle> {
-        let context_id = self.next_context_id.post_inc();
-        let context = AgentContextHandle::TextThread(TextThreadContextHandle {
-            context,
-            context_id,
-        });
-
-        if let Some(existing) = self.context_set.get(AgentContextKey::ref_cast(&context)) {
-            if remove_if_exists {
-                self.remove_context(&context, cx);
-                None
-            } else {
-                Some(existing.as_ref().clone())
-            }
-        } else {
-            self.insert_context(context.clone(), cx);
-            Some(context)
-        }
-    }
-
    pub fn add_rules(
        &mut self,
        prompt_id: UserPromptId,
@@ -392,18 +364,6 @@ impl ContextStore {
                    );
                }
            }
-            SuggestedContext::TextThread { context, name: _ } => {
-                if let Some(context) = context.upgrade() {
-                    let context_id = self.next_context_id.post_inc();
-                    self.insert_context(
-                        AgentContextHandle::TextThread(TextThreadContextHandle {
-                            context,
-                            context_id,
-                        }),
-                        cx,
-                    );
-                }
-            }
        }
    }

@@ -420,10 +380,6 @@ impl ContextStore {
                    return false;
                }
            }
-            AgentContextHandle::TextThread(text_thread_context) => {
-                self.context_text_thread_paths
-                    .extend(text_thread_context.context.read(cx).path().cloned());
-            }
            _ => {}
        }
        let inserted = self.context_set.insert(AgentContextKey(context));
@@ -443,11 +399,6 @@ impl ContextStore {
                    self.context_thread_ids
                        .remove(thread_context.thread.read(cx).id());
                }
-                AgentContextHandle::TextThread(text_thread_context) => {
-                    if let Some(path) = text_thread_context.context.read(cx).path() {
-                        self.context_text_thread_paths.remove(path);
-                    }
-                }
                _ => {}
            }
            cx.emit(ContextStoreEvent::ContextRemoved(key));
@@ -517,10 +468,6 @@ impl ContextStore {
        self.context_thread_ids.contains(thread_id)
    }

-    pub fn includes_text_thread(&self, path: &Arc<Path>) -> bool {
-        self.context_text_thread_paths.contains(path)
-    }
-
    pub fn includes_user_rules(&self, prompt_id: UserPromptId) -> bool {
        self.context_set
            .contains(&RulesContextHandle::lookup_key(prompt_id))
@@ -549,7 +496,6 @@ impl ContextStore {
                | AgentContextHandle::Selection(_)
                | AgentContextHandle::FetchedUrl(_)
                | AgentContextHandle::Thread(_)
-                | AgentContextHandle::TextThread(_)
                | AgentContextHandle::Rules(_)
                | AgentContextHandle::Image(_) => None,
            })
--- a/crates/agent/src/context_strip.rs
+++ b/crates/agent/src/context_strip.rs
@@ -1,7 +1,6 @@
 use std::path::Path;
 use std::rc::Rc;

-use assistant_context_editor::AssistantContext;
 use collections::HashSet;
 use editor::Editor;
 use file_icons::FileIcons;
@@ -19,7 +18,7 @@ use crate::context::{AgentContextHandle, ContextKind};
 use crate::context_picker::ContextPicker;
 use crate::context_store::ContextStore;
 use crate::thread::Thread;
-use crate::thread_store::{TextThreadStore, ThreadStore};
+use crate::thread_store::ThreadStore;
 use crate::ui::{AddedContext, ContextPill};
 use crate::{
    AcceptSuggestedContext, AssistantPanel, FocusDown, FocusLeft, FocusRight, FocusUp,
@@ -44,7 +43,6 @@ impl ContextStrip {
        context_store: Entity<ContextStore>,
        workspace: WeakEntity<Workspace>,
        thread_store: Option<WeakEntity<ThreadStore>>,
-        text_thread_store: Option<WeakEntity<TextThreadStore>>,
        context_picker_menu_handle: PopoverMenuHandle<ContextPicker>,
        suggest_context_kind: SuggestContextKind,
        window: &mut Window,
@@ -54,7 +52,6 @@ impl ContextStrip {
            ContextPicker::new(
                workspace.clone(),
                thread_store.clone(),
-                text_thread_store,
                context_store.downgrade(),
                window,
                cx,
@@ -144,42 +141,27 @@ impl ContextStrip {
        }

        let workspace = self.workspace.upgrade()?;
-        let panel = workspace.read(cx).panel::<AssistantPanel>(cx)?.read(cx);
+        let active_thread = workspace
+            .read(cx)
+            .panel::<AssistantPanel>(cx)?
+            .read(cx)
+            .active_thread(cx);
+        let weak_active_thread = active_thread.downgrade();

-        if let Some(active_thread) = panel.active_thread() {
-            let weak_active_thread = active_thread.downgrade();
+        let active_thread = active_thread.read(cx);

-            let active_thread = active_thread.read(cx);
-
-            if self
-                .context_store
-                .read(cx)
-                .includes_thread(active_thread.id())
-            {
-                return None;
-            }
-
-            Some(SuggestedContext::Thread {
-                name: active_thread.summary_or_default(),
-                thread: weak_active_thread,
-            })
-        } else if let Some(active_context_editor) = panel.active_context_editor() {
-            let context = active_context_editor.read(cx).context();
-            let weak_context = context.downgrade();
-            let context = context.read(cx);
-            let path = context.path()?;
-
-            if self.context_store.read(cx).includes_text_thread(path) {
-                return None;
-            }
-
-            Some(SuggestedContext::TextThread {
-                name: context.summary_or_default(),
-                context: weak_context,
-            })
-        } else {
-            None
+        if self
+            .context_store
+            .read(cx)
+            .includes_thread(active_thread.id())
+        {
+            return None;
        }
+
+        Some(SuggestedContext::Thread {
+            name: active_thread.summary_or_default(),
+            thread: weak_active_thread,
+        })
    }

    fn handle_context_picker_event(
@@ -556,10 +538,6 @@ pub enum SuggestedContext {
        name: SharedString,
        thread: WeakEntity<Thread>,
    },
-    TextThread {
-        name: SharedString,
-        context: WeakEntity<AssistantContext>,
-    },
 }

 impl SuggestedContext {
@@ -567,7 +545,6 @@ impl SuggestedContext {
        match self {
            Self::File { name, .. } => name,
            Self::Thread { name, .. } => name,
-            Self::TextThread { name, .. } => name,
        }
    }

@@ -575,7 +552,6 @@ impl SuggestedContext {
        match self {
            Self::File { icon_path, .. } => icon_path.clone(),
            Self::Thread { .. } => None,
-            Self::TextThread { .. } => None,
        }
    }

@@ -583,7 +559,6 @@ impl SuggestedContext {
        match self {
            Self::File { .. } => ContextKind::File,
            Self::Thread { .. } => ContextKind::Thread,
-            Self::TextThread { .. } => ContextKind::TextThread,
        }
    }
 }
--- a/crates/agent/src/history_store.rs
+++ b/crates/agent/src/history_store.rs
@@ -97,10 +97,9 @@ impl HistoryStore {
                let contents = cx
                    .background_spawn(async move { std::fs::read_to_string(path) })
                    .await
-                    .ok()?;
+                    .context("reading persisted agent panel navigation history")?;
                let entries = serde_json::from_str::<Vec<SerializedRecentEntry>>(&contents)
-                    .context("deserializing persisted agent panel navigation history")
-                    .log_err()?
+                    .context("deserializing persisted agent panel navigation history")?
                    .into_iter()
                    .take(MAX_RECENTLY_OPENED_ENTRIES)
                    .map(|serialized| match serialized {
@@ -135,10 +134,10 @@ impl HistoryStore {
                })
                .ok();

-                Some(())
+                anyhow::Ok(())
            }
        })
-        .detach();
+        .detach_and_log_err(cx);

        Self {
            thread_store,
@@ -164,10 +163,7 @@ impl HistoryStore {
            history_entries.push(HistoryEntry::Thread(thread));
        }

-        for context in self
-            .context_store
-            .update(cx, |this, _cx| this.reverse_chronological_contexts())
-        {
+        for context in self.context_store.update(cx, |this, _cx| this.contexts()) {
            history_entries.push(HistoryEntry::Context(context));
        }

--- a/crates/agent/src/inline_assistant.rs
+++ b/crates/agent/src/inline_assistant.rs
@@ -4,8 +4,8 @@ use std::ops::Range;
 use std::rc::Rc;
 use std::sync::Arc;

-use agent_settings::AgentSettings;
 use anyhow::{Context as _, Result};
+use assistant_settings::AssistantSettings;
 use client::telemetry::Telemetry;
 use collections::{HashMap, HashSet, VecDeque, hash_map};
 use editor::{
@@ -48,7 +48,6 @@ use crate::buffer_codegen::{BufferCodegen, CodegenAlternative, CodegenEvent};
 use crate::context_store::ContextStore;
 use crate::inline_prompt_editor::{CodegenStatus, InlineAssistId, PromptEditor, PromptEditorEvent};
 use crate::terminal_inline_assistant::TerminalInlineAssistant;
-use crate::thread_store::TextThreadStore;
 use crate::thread_store::ThreadStore;

 pub fn init(
@@ -145,7 +144,7 @@ impl InlineAssistant {
            let Some(terminal_panel) = workspace.read(cx).panel::<TerminalPanel>(cx) else {
                return;
            };
-            let enabled = AgentSettings::get_global(cx).enabled;
+            let enabled = AssistantSettings::get_global(cx).enabled;
            terminal_panel.update(cx, |terminal_panel, cx| {
                terminal_panel.set_assistant_enabled(enabled, cx)
            });
@@ -193,20 +192,16 @@ impl InlineAssistant {
        if let Some(editor) = item.act_as::<Editor>(cx) {
            editor.update(cx, |editor, cx| {
                if is_assistant2_enabled {
-                    let panel = workspace.read(cx).panel::<AssistantPanel>(cx);
-                    let thread_store = panel
-                        .as_ref()
+                    let thread_store = workspace
+                        .read(cx)
+                        .panel::<AssistantPanel>(cx)
                        .map(|assistant_panel| assistant_panel.read(cx).thread_store().downgrade());
-                    let text_thread_store = panel.map(|assistant_panel| {
-                        assistant_panel.read(cx).text_thread_store().downgrade()
-                    });

                    editor.add_code_action_provider(
                        Rc::new(AssistantCodeActionProvider {
                            editor: cx.entity().downgrade(),
                            workspace: workspace.downgrade(),
                            thread_store,
-                            text_thread_store,
                        }),
                        window,
                        cx,
@@ -227,11 +222,11 @@ impl InlineAssistant {

    pub fn inline_assist(
        workspace: &mut Workspace,
-        action: &zed_actions::assistant::InlineAssist,
+        _action: &zed_actions::assistant::InlineAssist,
        window: &mut Window,
        cx: &mut Context<Workspace>,
    ) {
-        let settings = AgentSettings::get_global(cx);
+        let settings = AssistantSettings::get_global(cx);
        if !settings.enabled {
            return;
        }
@@ -251,15 +246,13 @@ impl InlineAssistant {
                .map_or(false, |model| model.provider.is_authenticated(cx))
        };

-        let Some(assistant_panel) = workspace.panel::<AssistantPanel>(cx) else {
-            return;
-        };
-        let assistant_panel = assistant_panel.read(cx);
-
-        let prompt_store = assistant_panel.prompt_store().as_ref().cloned();
-        let thread_store = Some(assistant_panel.thread_store().downgrade());
-        let text_thread_store = Some(assistant_panel.text_thread_store().downgrade());
-        let context_store = assistant_panel.inline_assist_context_store().clone();
+        let assistant_panel = workspace
+            .panel::<AssistantPanel>(cx)
+            .map(|assistant_panel| assistant_panel.read(cx));
+        let prompt_store = assistant_panel
+            .and_then(|assistant_panel| assistant_panel.prompt_store().as_ref().cloned());
+        let thread_store =
+            assistant_panel.map(|assistant_panel| assistant_panel.thread_store().downgrade());

        let handle_assist =
            |window: &mut Window, cx: &mut Context<Workspace>| match inline_assist_target {
@@ -268,12 +261,9 @@ impl InlineAssistant {
                        assistant.assist(
                            &active_editor,
                            cx.entity().downgrade(),
-                            context_store,
                            workspace.project().downgrade(),
                            prompt_store,
                            thread_store,
-                            text_thread_store,
-                            action.prompt.clone(),
                            window,
                            cx,
                        )
@@ -287,8 +277,6 @@ impl InlineAssistant {
                            workspace.project().downgrade(),
                            prompt_store,
                            thread_store,
-                            text_thread_store,
-                            action.prompt.clone(),
                            window,
                            cx,
                        )
@@ -341,12 +329,9 @@ impl InlineAssistant {
        &mut self,
        editor: &Entity<Editor>,
        workspace: WeakEntity<Workspace>,
-        context_store: Entity<ContextStore>,
        project: WeakEntity<Project>,
        prompt_store: Option<Entity<PromptStore>>,
        thread_store: Option<WeakEntity<ThreadStore>>,
-        text_thread_store: Option<WeakEntity<TextThreadStore>>,
-        initial_prompt: Option<String>,
        window: &mut Window,
        cx: &mut App,
    ) {
@@ -445,17 +430,15 @@ impl InlineAssistant {
        }

        let assist_group_id = self.next_assist_group_id.post_inc();
-        let prompt_buffer = cx.new(|cx| {
-            MultiBuffer::singleton(
-                cx.new(|cx| Buffer::local(initial_prompt.unwrap_or_default(), cx)),
-                cx,
-            )
-        });
+        let prompt_buffer =
+            cx.new(|cx| MultiBuffer::singleton(cx.new(|cx| Buffer::local(String::new(), cx)), cx));

        let mut assists = Vec::new();
        let mut assist_to_focus = None;
        for range in codegen_ranges {
            let assist_id = self.next_assist_id.post_inc();
+            let context_store =
+                cx.new(|_cx| ContextStore::new(project.clone(), thread_store.clone()));
            let codegen = cx.new(|cx| {
                BufferCodegen::new(
                    editor.read(cx).buffer().clone(),
@@ -479,10 +462,9 @@ impl InlineAssistant {
                    prompt_buffer.clone(),
                    codegen.clone(),
                    self.fs.clone(),
-                    context_store.clone(),
+                    context_store,
                    workspace.clone(),
                    thread_store.clone(),
-                    text_thread_store.clone(),
                    window,
                    cx,
                )
@@ -555,7 +537,6 @@ impl InlineAssistant {
        workspace: Entity<Workspace>,
        prompt_store: Option<Entity<PromptStore>>,
        thread_store: Option<WeakEntity<ThreadStore>>,
-        text_thread_store: Option<WeakEntity<TextThreadStore>>,
        window: &mut Window,
        cx: &mut App,
    ) -> InlineAssistId {
@@ -601,7 +582,6 @@ impl InlineAssistant {
                context_store,
                workspace.downgrade(),
                thread_store,
-                text_thread_store,
                window,
                cx,
            )
@@ -1749,7 +1729,6 @@ struct AssistantCodeActionProvider {
    editor: WeakEntity<Editor>,
    workspace: WeakEntity<Workspace>,
    thread_store: Option<WeakEntity<ThreadStore>>,
-    text_thread_store: Option<WeakEntity<TextThreadStore>>,
 }

 const ASSISTANT_CODE_ACTION_PROVIDER_ID: &str = "assistant2";
@@ -1766,7 +1745,7 @@ impl CodeActionProvider for AssistantCodeActionProvider {
        _: &mut Window,
        cx: &mut App,
    ) -> Task<Result<Vec<CodeAction>>> {
-        if !AgentSettings::get_global(cx).enabled {
+        if !AssistantSettings::get_global(cx).enabled {
            return Task::ready(Ok(Vec::new()));
        }

@@ -1824,7 +1803,6 @@ impl CodeActionProvider for AssistantCodeActionProvider {
        let editor = self.editor.clone();
        let workspace = self.workspace.clone();
        let thread_store = self.thread_store.clone();
-        let text_thread_store = self.text_thread_store.clone();
        let prompt_store = PromptStore::global(cx);
        window.spawn(cx, async move |cx| {
            let workspace = workspace.upgrade().context("workspace was released")?;
@@ -1877,7 +1855,6 @@ impl CodeActionProvider for AssistantCodeActionProvider {
                    workspace,
                    prompt_store,
                    thread_store,
-                    text_thread_store,
                    window,
                    cx,
                );
--- a/crates/agent/src/inline_prompt_editor.rs
+++ b/crates/agent/src/inline_prompt_editor.rs
@@ -6,7 +6,7 @@ use crate::context_store::ContextStore;
 use crate::context_strip::{ContextStrip, ContextStripEvent, SuggestContextKind};
 use crate::message_editor::{extract_message_creases, insert_message_creases};
 use crate::terminal_codegen::TerminalCodegen;
-use crate::thread_store::{TextThreadStore, ThreadStore};
+use crate::thread_store::ThreadStore;
 use crate::{CycleNextInlineAssist, CyclePreviousInlineAssist};
 use crate::{RemoveAllContext, ToggleContextPicker};
 use client::ErrorExt;
@@ -846,7 +846,6 @@ impl PromptEditor<BufferCodegen> {
        context_store: Entity<ContextStore>,
        workspace: WeakEntity<Workspace>,
        thread_store: Option<WeakEntity<ThreadStore>>,
-        text_thread_store: Option<WeakEntity<TextThreadStore>>,
        window: &mut Window,
        cx: &mut Context<PromptEditor<BufferCodegen>>,
    ) -> PromptEditor<BufferCodegen> {
@@ -890,7 +889,6 @@ impl PromptEditor<BufferCodegen> {
                workspace.clone(),
                context_store.downgrade(),
                thread_store.clone(),
-                text_thread_store.clone(),
                prompt_editor_entity,
                codegen_buffer.as_ref().map(Entity::downgrade),
            ))));
@@ -904,7 +902,6 @@ impl PromptEditor<BufferCodegen> {
                context_store.clone(),
                workspace.clone(),
                thread_store.clone(),
-                text_thread_store.clone(),
                context_picker_menu_handle.clone(),
                SuggestContextKind::Thread,
                window,
@@ -1026,7 +1023,6 @@ impl PromptEditor<TerminalCodegen> {
        context_store: Entity<ContextStore>,
        workspace: WeakEntity<Workspace>,
        thread_store: Option<WeakEntity<ThreadStore>>,
-        text_thread_store: Option<WeakEntity<TextThreadStore>>,
        window: &mut Window,
        cx: &mut Context<Self>,
    ) -> Self {
@@ -1063,7 +1059,6 @@ impl PromptEditor<TerminalCodegen> {
                workspace.clone(),
                context_store.downgrade(),
                thread_store.clone(),
-                text_thread_store.clone(),
                prompt_editor_entity,
                None,
            ))));
@@ -1077,7 +1072,6 @@ impl PromptEditor<TerminalCodegen> {
                context_store.clone(),
                workspace.clone(),
                thread_store.clone(),
-                text_thread_store.clone(),
                context_picker_menu_handle.clone(),
                SuggestContextKind::Thread,
                window,
--- a/crates/agent/src/message_editor.rs
+++ b/crates/agent/src/message_editor.rs
@@ -26,10 +26,7 @@ use gpui::{
    Task, TextStyle, WeakEntity, linear_color_stop, linear_gradient, point, pulsating_between,
 };
 use language::{Buffer, Language};
-use language_model::{
-    ConfiguredModel, LanguageModelRequestMessage, MessageContent, RequestUsage,
-    ZED_CLOUD_PROVIDER_ID,
-};
+use language_model::{ConfiguredModel, LanguageModelRequestMessage, MessageContent};
 use language_model_selector::ToggleModelSelector;
 use multi_buffer;
 use project::Project;
@@ -38,9 +35,8 @@ use proto::Plan;
 use settings::Settings;
 use std::time::Duration;
 use theme::ThemeSettings;
-use ui::{Disclosure, DocumentationSide, KeyBinding, PopoverMenuHandle, Tooltip, prelude::*};
-use util::{ResultExt as _, maybe};
-use workspace::dock::DockPosition;
+use ui::{Disclosure, KeyBinding, PopoverMenuHandle, Tooltip, prelude::*};
+use util::ResultExt as _;
 use workspace::{CollaboratorId, Workspace};
 use zed_llm_client::CompletionMode;

@@ -49,7 +45,7 @@ use crate::context_store::ContextStore;
 use crate::context_strip::{ContextStrip, ContextStripEvent, SuggestContextKind};
 use crate::profile_selector::ProfileSelector;
 use crate::thread::{MessageCrease, Thread, TokenUsageRatio};
-use crate::thread_store::{TextThreadStore, ThreadStore};
+use crate::thread_store::ThreadStore;
 use crate::{
    ActiveThread, AgentDiffPane, Chat, ExpandMessageEditor, Follow, NewThread, OpenAgentDiff,
    RemoveAllContext, ToggleContextPicker, ToggleProfileSelector, register_agent_preview,
@@ -84,7 +80,6 @@ pub(crate) fn create_editor(
    workspace: WeakEntity<Workspace>,
    context_store: WeakEntity<ContextStore>,
    thread_store: WeakEntity<ThreadStore>,
-    text_thread_store: WeakEntity<TextThreadStore>,
    window: &mut Window,
    cx: &mut App,
 ) -> Entity<Editor> {
@@ -126,7 +121,6 @@ pub(crate) fn create_editor(
            workspace,
            context_store,
            Some(thread_store),
-            Some(text_thread_store),
            editor_entity,
            None,
        ))));
@@ -134,14 +128,6 @@ pub(crate) fn create_editor(
    editor
 }

-fn documentation_side(position: DockPosition) -> DocumentationSide {
-    match position {
-        DockPosition::Left => DocumentationSide::Right,
-        DockPosition::Bottom => DocumentationSide::Left,
-        DockPosition::Right => DocumentationSide::Left,
-    }
-}
-
 impl MessageEditor {
    pub fn new(
        fs: Arc<dyn Fs>,
@@ -150,9 +136,7 @@ impl MessageEditor {
        context_store: Entity<ContextStore>,
        prompt_store: Option<Entity<PromptStore>>,
        thread_store: WeakEntity<ThreadStore>,
-        text_thread_store: WeakEntity<TextThreadStore>,
        thread: Entity<Thread>,
-        dock_position: DockPosition,
        window: &mut Window,
        cx: &mut Context<Self>,
    ) -> Self {
@@ -163,7 +147,6 @@ impl MessageEditor {
            workspace.clone(),
            context_store.downgrade(),
            thread_store.clone(),
-            text_thread_store.clone(),
            window,
            cx,
        );
@@ -173,7 +156,6 @@ impl MessageEditor {
                context_store.clone(),
                workspace.clone(),
                Some(thread_store.clone()),
-                Some(text_thread_store.clone()),
                context_picker_menu_handle.clone(),
                SuggestContextKind::File,
                window,
@@ -226,15 +208,8 @@ impl MessageEditor {
            model_selector,
            edits_expanded: false,
            editor_is_expanded: false,
-            profile_selector: cx.new(|cx| {
-                ProfileSelector::new(
-                    fs,
-                    thread_store,
-                    editor.focus_handle(cx),
-                    documentation_side(dock_position),
-                    cx,
-                )
-            }),
+            profile_selector: cx
+                .new(|cx| ProfileSelector::new(fs, thread_store, editor.focus_handle(cx), cx)),
            last_estimated_token_count: None,
            update_token_count_task: None,
            _subscriptions: subscriptions,
@@ -315,10 +290,6 @@ impl MessageEditor {
        self.editor.read(cx).text(cx).trim().is_empty()
    }

-    pub fn is_editor_fully_empty(&self, cx: &App) -> bool {
-        self.editor.read(cx).is_empty(cx)
-    }
-
    fn send_to_model(&mut self, window: &mut Window, cx: &mut Context<Self>) {
        let Some(ConfiguredModel { model, provider }) = self
            .thread
@@ -475,17 +446,12 @@ impl MessageEditor {
        }

        let active_completion_mode = thread.completion_mode();
-        let max_mode_enabled = active_completion_mode == CompletionMode::Max;

        Some(
-            Button::new("max-mode", "Max Mode")
-                .label_size(LabelSize::Small)
-                .color(Color::Muted)
-                .icon(IconName::ZedMaxMode)
+            IconButton::new("max-mode", IconName::ZedMaxMode)
                .icon_size(IconSize::Small)
                .icon_color(Color::Muted)
-                .icon_position(IconPosition::Start)
-                .toggle_state(max_mode_enabled)
+                .toggle_state(active_completion_mode == CompletionMode::Max)
                .on_click(cx.listener(move |this, _event, _window, cx| {
                    this.thread.update(cx, |thread, _cx| {
                        thread.set_completion_mode(match active_completion_mode {
@@ -494,10 +460,7 @@ impl MessageEditor {
                        });
                    });
                }))
-                .tooltip(move |_window, cx| {
-                    cx.new(|_| MaxModeTooltip::new().selected(max_mode_enabled))
-                        .into()
-                })
+                .tooltip(|_, cx| cx.new(MaxModeTooltip::new).into())
                .into_any_element(),
        )
    }
@@ -541,7 +504,13 @@ impl MessageEditor {
            }))
    }

-    fn render_editor(&self, window: &mut Window, cx: &mut Context<Self>) -> Div {
+    fn render_editor(
+        &self,
+        font_size: Rems,
+        line_height: Pixels,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Div {
        let thread = self.thread.read(cx);
        let model = thread.configured_model();

@@ -647,10 +616,6 @@ impl MessageEditor {
                            .when(is_editor_expanded, |this| this.h_full())
                            .child({
                                let settings = ThemeSettings::get_global(cx);
-                                let font_size = TextSize::Small
-                                    .rems(cx)
-                                    .to_pixels(settings.agent_font_size(cx));
-                                let line_height = settings.buffer_line_height.value() * font_size;

                                let text_style = TextStyle {
                                    color: cx.theme().colors().text,
@@ -1078,28 +1043,9 @@ impl MessageEditor {
            return None;
        }

-        let is_using_zed_provider = self
-            .thread
+        let plan = self
+            .user_store
            .read(cx)
-            .configured_model()
-            .map_or(false, |model| {
-                model.provider.id().0 == ZED_CLOUD_PROVIDER_ID
-            });
-        if !is_using_zed_provider {
-            return None;
-        }
-
-        let user_store = self.user_store.read(cx);
-
-        let ubb_enable = user_store
-            .usage_based_billing_enabled()
-            .map_or(false, |enabled| enabled);
-
-        if ubb_enable {
-            return None;
-        }
-
-        let plan = user_store
            .current_plan()
            .map(|plan| match plan {
                Plan::Free => zed_llm_client::Plan::Free,
@@ -1107,24 +1053,7 @@ impl MessageEditor {
                Plan::ZedProTrial => zed_llm_client::Plan::ZedProTrial,
            })
            .unwrap_or(zed_llm_client::Plan::Free);
-        let usage = self.thread.read(cx).last_usage().or_else(|| {
-            maybe!({
-                let amount = user_store.model_request_usage_amount()?;
-                let limit = user_store.model_request_usage_limit()?.variant?;
-
-                Some(RequestUsage {
-                    amount: amount as i32,
-                    limit: match limit {
-                        proto::usage_limit::Variant::Limited(limited) => {
-                            zed_llm_client::UsageLimit::Limited(limited.limit as i32)
-                        }
-                        proto::usage_limit::Variant::Unlimited(_) => {
-                            zed_llm_client::UsageLimit::Unlimited
-                        }
-                    },
-                })
-            })
-        })?;
+        let usage = self.thread.read(cx).last_usage()?;

        Some(
            div()
@@ -1296,12 +1225,6 @@ impl MessageEditor {
            .ok();
        }));
    }
-
-    pub fn set_dock_position(&mut self, position: DockPosition, cx: &mut Context<Self>) {
-        self.profile_selector.update(cx, |profile_selector, cx| {
-            profile_selector.set_documentation_side(documentation_side(position), cx)
-        });
-    }
 }

 pub fn extract_message_creases(
@@ -1376,14 +1299,15 @@ impl Render for MessageEditor {
        let action_log = self.thread.read(cx).action_log();
        let changed_buffers = action_log.read(cx).changed_buffers(cx);

-        let line_height = TextSize::Small.rems(cx).to_pixels(window.rem_size()) * 1.5;
+        let font_size = TextSize::Small.rems(cx);
+        let line_height = font_size.to_pixels(window.rem_size()) * 1.5;

        v_flex()
            .size_full()
            .when(changed_buffers.len() > 0, |parent| {
                parent.child(self.render_changed_buffers(&changed_buffers, window, cx))
            })
-            .child(self.render_editor(window, cx))
+            .child(self.render_editor(font_size, line_height, window, cx))
            .children({
                let usage_callout = self.render_usage_callout(line_height, cx);

@@ -1451,19 +1375,16 @@ impl AgentPreview for MessageEditor {
    fn agent_preview(
        workspace: WeakEntity<Workspace>,
        active_thread: Entity<ActiveThread>,
+        thread_store: WeakEntity<ThreadStore>,
        window: &mut Window,
        cx: &mut App,
    ) -> Option<AnyElement> {
        if let Some(workspace) = workspace.upgrade() {
            let fs = workspace.read(cx).app_state().fs.clone();
            let user_store = workspace.read(cx).app_state().user_store.clone();
-            let project = workspace.read(cx).project().clone();
-            let weak_project = project.downgrade();
+            let weak_project = workspace.read(cx).project().clone().downgrade();
            let context_store = cx.new(|_cx| ContextStore::new(weak_project, None));
-            let active_thread = active_thread.read(cx);
-            let thread = active_thread.thread().clone();
-            let thread_store = active_thread.thread_store().clone();
-            let text_thread_store = active_thread.text_thread_store().clone();
+            let thread = active_thread.read(cx).thread().clone();

            let default_message_editor = cx.new(|cx| {
                MessageEditor::new(
@@ -1472,10 +1393,8 @@ impl AgentPreview for MessageEditor {
                    user_store,
                    context_store,
                    None,
-                    thread_store.downgrade(),
-                    text_thread_store.downgrade(),
+                    thread_store,
                    thread,
-                    DockPosition::Left,
                    window,
                    cx,
                )
--- a/crates/agent/src/profile_selector.rs
+++ b/crates/agent/src/profile_selector.rs
@@ -1,16 +1,13 @@
 use std::sync::Arc;

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

 use crate::{ManageProfiles, ThreadStore, ToggleProfileSelector};
@@ -22,7 +19,6 @@ pub struct ProfileSelector {
    menu_handle: PopoverMenuHandle<ContextMenu>,
    focus_handle: FocusHandle,
    _subscriptions: Vec<Subscription>,
-    documentation_side: DocumentationSide,
 }

 impl ProfileSelector {
@@ -30,7 +26,6 @@ impl ProfileSelector {
        fs: Arc<dyn Fs>,
        thread_store: WeakEntity<ThreadStore>,
        focus_handle: FocusHandle,
-        documentation_side: DocumentationSide,
        cx: &mut Context<Self>,
    ) -> Self {
        let settings_subscription = cx.observe_global::<SettingsStore>(move |this, cx| {
@@ -38,27 +33,21 @@ impl ProfileSelector {
        });

        Self {
-            profiles: GroupedAgentProfiles::from_settings(AgentSettings::get_global(cx)),
+            profiles: GroupedAgentProfiles::from_settings(AssistantSettings::get_global(cx)),
            fs,
            thread_store,
            menu_handle: PopoverMenuHandle::default(),
            focus_handle,
            _subscriptions: vec![settings_subscription],
-            documentation_side,
        }
    }

-    pub fn set_documentation_side(&mut self, side: DocumentationSide, cx: &mut Context<Self>) {
-        self.documentation_side = side;
-        cx.notify();
-    }
-
    pub fn menu_handle(&self) -> PopoverMenuHandle<ContextMenu> {
        self.menu_handle.clone()
    }

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

    fn build_context_menu(
@@ -67,7 +56,7 @@ impl ProfileSelector {
        cx: &mut Context<Self>,
    ) -> Entity<ContextMenu> {
        ContextMenu::build(window, cx, |mut menu, _window, cx| {
-            let settings = AgentSettings::get_global(cx);
+            let settings = AssistantSettings::get_global(cx);
            for (profile_id, profile) in self.profiles.builtin.iter() {
                menu =
                    menu.item(self.menu_entry_for_profile(profile_id.clone(), profile, settings));
@@ -99,12 +88,12 @@ impl ProfileSelector {
        &self,
        profile_id: AgentProfileId,
        profile: &AgentProfile,
-        settings: &AgentSettings,
+        settings: &AssistantSettings,
    ) -> ContextMenuEntry {
        let documentation = match profile.name.to_lowercase().as_str() {
            builtin_profiles::WRITE => Some("Get help to write anything."),
            builtin_profiles::ASK => Some("Chat about your codebase."),
-            builtin_profiles::MINIMAL => Some("Chat about anything with no tools."),
+            builtin_profiles::MANUAL => Some("Chat about anything with no tools."),
            _ => None,
        };

@@ -112,9 +101,7 @@ impl ProfileSelector {
            .toggleable(IconPosition::End, profile_id == settings.default_profile);

        let entry = if let Some(doc_text) = documentation {
-            entry.documentation_aside(self.documentation_side, move |_| {
-                Label::new(doc_text).into_any_element()
-            })
+            entry.documentation_aside(move |_| Label::new(doc_text).into_any_element())
        } else {
            entry
        };
@@ -124,7 +111,7 @@ impl ProfileSelector {
            let thread_store = self.thread_store.clone();
            let profile_id = profile_id.clone();
            move |_window, cx| {
-                update_settings_file::<AgentSettings>(fs.clone(), cx, {
+                update_settings_file::<AssistantSettings>(fs.clone(), cx, {
                    let profile_id = profile_id.clone();
                    move |settings, _cx| {
                        settings.set_profile(profile_id.clone());
@@ -143,7 +130,7 @@ impl ProfileSelector {

 impl Render for ProfileSelector {
    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let settings = AgentSettings::get_global(cx);
+        let settings = AssistantSettings::get_global(cx);
        let profile_id = &settings.default_profile;
        let profile = settings.profiles.get(profile_id);

@@ -188,11 +175,7 @@ impl Render for ProfileSelector {
                    )
                }
            })
-            .anchor(if self.documentation_side == DocumentationSide::Left {
-                gpui::Corner::BottomRight
-            } else {
-                gpui::Corner::BottomLeft
-            })
+            .anchor(gpui::Corner::BottomRight)
            .with_handle(self.menu_handle.clone())
            .menu(move |window, cx| {
                Some(this.update(cx, |this, cx| this.build_context_menu(window, cx)))
--- a/crates/agent/src/terminal_inline_assistant.rs
+++ b/crates/agent/src/terminal_inline_assistant.rs
@@ -4,7 +4,7 @@ use crate::inline_prompt_editor::{
    CodegenStatus, PromptEditor, PromptEditorEvent, TerminalInlineAssistId,
 };
 use crate::terminal_codegen::{CLEAR_INPUT, CodegenEvent, TerminalCodegen};
-use crate::thread_store::{TextThreadStore, ThreadStore};
+use crate::thread_store::ThreadStore;
 use anyhow::{Context as _, Result};
 use client::telemetry::Telemetry;
 use collections::{HashMap, VecDeque};
@@ -71,19 +71,13 @@ impl TerminalInlineAssistant {
        project: WeakEntity<Project>,
        prompt_store: Option<Entity<PromptStore>>,
        thread_store: Option<WeakEntity<ThreadStore>>,
-        text_thread_store: Option<WeakEntity<TextThreadStore>>,
-        initial_prompt: Option<String>,
        window: &mut Window,
        cx: &mut App,
    ) {
        let terminal = terminal_view.read(cx).terminal().clone();
        let assist_id = self.next_assist_id.post_inc();
-        let prompt_buffer = cx.new(|cx| {
-            MultiBuffer::singleton(
-                cx.new(|cx| Buffer::local(initial_prompt.unwrap_or_default(), cx)),
-                cx,
-            )
-        });
+        let prompt_buffer =
+            cx.new(|cx| MultiBuffer::singleton(cx.new(|cx| Buffer::local(String::new(), cx)), cx));
        let context_store = cx.new(|_cx| ContextStore::new(project, thread_store.clone()));
        let codegen = cx.new(|_| TerminalCodegen::new(terminal, self.telemetry.clone()));

@@ -97,7 +91,6 @@ impl TerminalInlineAssistant {
                context_store.clone(),
                workspace.clone(),
                thread_store.clone(),
-                text_thread_store.clone(),
                window,
                cx,
            )
--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
@@ -4,8 +4,8 @@ use std::ops::Range;
 use std::sync::Arc;
 use std::time::Instant;

-use agent_settings::AgentSettings;
 use anyhow::{Result, anyhow};
+use assistant_settings::AssistantSettings;
 use assistant_tool::{ActionLog, AnyToolCard, Tool, ToolWorkingSet};
 use chrono::{DateTime, Utc};
 use collections::HashMap;
@@ -267,7 +267,7 @@ impl DetailedSummaryState {
    }
 }

-#[derive(Default, Debug)]
+#[derive(Default)]
 pub struct TotalTokenUsage {
    pub total: usize,
    pub max: usize,
@@ -998,7 +998,7 @@ impl Thread {
        for message in &self.messages {
            text.push_str(match message.role {
                language_model::Role::User => "User:",
-                language_model::Role::Assistant => "Agent:",
+                language_model::Role::Assistant => "Assistant:",
                language_model::Role::System => "System:",
            });
            text.push('\n');
@@ -1890,7 +1890,7 @@ impl Thread {
        for tool_use in pending_tool_uses.iter() {
            if let Some(tool) = self.tools.read(cx).tool(&tool_use.name, cx) {
                if tool.needs_confirmation(&tool_use.input, cx)
-                    && !AgentSettings::get_global(cx).always_allow_tool_actions
+                    && !AssistantSettings::get_global(cx).always_allow_tool_actions
                {
                    self.tool_use.confirm_tool_use(
                        tool_use.id.clone(),
@@ -1911,54 +1911,12 @@ impl Thread {
                        cx,
                    );
                }
-            } else {
-                self.handle_hallucinated_tool_use(
-                    tool_use.id.clone(),
-                    tool_use.name.clone(),
-                    window,
-                    cx,
-                );
            }
        }

        pending_tool_uses
    }

-    pub fn handle_hallucinated_tool_use(
-        &mut self,
-        tool_use_id: LanguageModelToolUseId,
-        hallucinated_tool_name: Arc<str>,
-        window: Option<AnyWindowHandle>,
-        cx: &mut Context<Thread>,
-    ) {
-        let available_tools = self.tools.read(cx).enabled_tools(cx);
-
-        let tool_list = available_tools
-            .iter()
-            .map(|tool| format!("- {}: {}", tool.name(), tool.description()))
-            .collect::<Vec<_>>()
-            .join("\n");
-
-        let error_message = format!(
-            "The tool '{}' doesn't exist or is not enabled. Available tools:\n{}",
-            hallucinated_tool_name, tool_list
-        );
-
-        let pending_tool_use = self.tool_use.insert_tool_output(
-            tool_use_id.clone(),
-            hallucinated_tool_name,
-            Err(anyhow!("Missing tool call: {error_message}")),
-            self.configured_model.as_ref(),
-        );
-
-        cx.emit(ThreadEvent::MissingToolUse {
-            tool_use_id: tool_use_id.clone(),
-            ui_text: error_message.into(),
-        });
-
-        self.tool_finished(tool_use_id, pending_tool_use, false, window, cx);
-    }
-
    pub fn receive_invalid_tool_json(
        &mut self,
        tool_use_id: LanguageModelToolUseId,
@@ -2360,7 +2318,7 @@ impl Thread {
                "## {role}\n",
                role = match message.role {
                    Role::User => "User",
-                    Role::Assistant => "Agent",
+                    Role::Assistant => "Assistant",
                    Role::System => "System",
                }
            )?;
@@ -2616,10 +2574,6 @@ pub enum ThreadEvent {
        ui_text: Arc<str>,
        input: serde_json::Value,
    },
-    MissingToolUse {
-        tool_use_id: LanguageModelToolUseId,
-        ui_text: Arc<str>,
-    },
    InvalidToolInput {
        tool_use_id: LanguageModelToolUseId,
        ui_text: Arc<str>,
@@ -2658,8 +2612,9 @@ struct PendingCompletion {
 mod tests {
    use super::*;
    use crate::{ThreadStore, context::load_context, context_store::ContextStore, thread_store};
-    use agent_settings::AgentSettings;
+    use assistant_settings::AssistantSettings;
    use assistant_tool::ToolRegistry;
+    use context_server::ContextServerSettings;
    use editor::EditorSettings;
    use gpui::TestAppContext;
    use language_model::fake_provider::FakeLanguageModel;
@@ -3075,12 +3030,13 @@ fn main() {{
            cx.set_global(settings_store);
            language::init(cx);
            Project::init_settings(cx);
-            AgentSettings::register(cx);
+            AssistantSettings::register(cx);
            prompt_store::init(cx);
            thread_store::init(cx);
            workspace::init_settings(cx);
            language_model::init_settings(cx);
            ThemeSettings::register(cx);
+            ContextServerSettings::register(cx);
            EditorSettings::register(cx);
            ToolRegistry::default_global(cx);
        });
--- a/crates/agent/src/thread_history.rs
+++ b/crates/agent/src/thread_history.rs
@@ -1,14 +1,11 @@
-use std::fmt::Display;
-use std::ops::Range;
 use std::sync::Arc;

 use assistant_context_editor::SavedContextMetadata;
-use chrono::{Datelike as _, NaiveDate, TimeDelta, Utc};
 use editor::{Editor, EditorEvent};
 use fuzzy::{StringMatch, StringMatchCandidate};
 use gpui::{
-    App, Empty, Entity, FocusHandle, Focusable, ScrollStrategy, Stateful, Task,
-    UniformListScrollHandle, WeakEntity, Window, uniform_list,
+    App, Entity, FocusHandle, Focusable, ScrollStrategy, Stateful, Task, UniformListScrollHandle,
+    WeakEntity, Window, uniform_list,
 };
 use time::{OffsetDateTime, UtcOffset};
 use ui::{
@@ -26,45 +23,14 @@ pub struct ThreadHistory {
    history_store: Entity<HistoryStore>,
    scroll_handle: UniformListScrollHandle,
    selected_index: usize,
+    search_query: SharedString,
    search_editor: Entity<Editor>,
    all_entries: Arc<Vec<HistoryEntry>>,
-    // When the search is empty, we display date separators between history entries
-    // This vector contains an enum of either a separator or an actual entry
-    separated_items: Vec<HistoryListItem>,
-    _separated_items_task: Option<Task<()>>,
-    search_state: SearchState,
+    matches: Vec<StringMatch>,
+    _subscriptions: Vec<gpui::Subscription>,
+    _search_task: Option<Task<()>>,
    scrollbar_visibility: bool,
    scrollbar_state: ScrollbarState,
-    _subscriptions: Vec<gpui::Subscription>,
-}
-
-enum SearchState {
-    Empty,
-    Searching {
-        query: SharedString,
-        _task: Task<()>,
-    },
-    Searched {
-        query: SharedString,
-        matches: Vec<StringMatch>,
-    },
-}
-
-enum HistoryListItem {
-    BucketSeparator(TimeBucket),
-    Entry {
-        index: usize,
-        format: EntryTimeFormat,
-    },
-}
-
-impl HistoryListItem {
-    fn entry_index(&self) -> Option<usize> {
-        match self {
-            HistoryListItem::BucketSeparator(_) => None,
-            HistoryListItem::Entry { index, .. } => Some(*index),
-        }
-    }
 }

 impl ThreadHistory {
@@ -84,10 +50,15 @@ impl ThreadHistory {
            cx.subscribe(&search_editor, |this, search_editor, event, cx| {
                if let EditorEvent::BufferEdited = event {
                    let query = search_editor.read(cx).text(cx);
-                    this.search(query.into(), cx);
+                    this.search_query = query.into();
+                    this.update_search(cx);
                }
            });

+        let entries: Arc<Vec<_>> = history_store
+            .update(cx, |store, cx| store.entries(cx))
+            .into();
+
        let history_store_subscription = cx.observe(&history_store, |this, _, cx| {
            this.update_all_entries(cx);
        });
@@ -95,22 +66,20 @@ impl ThreadHistory {
        let scroll_handle = UniformListScrollHandle::default();
        let scrollbar_state = ScrollbarState::new(scroll_handle.clone());

-        let mut this = Self {
+        Self {
            assistant_panel,
            history_store,
            scroll_handle,
            selected_index: 0,
-            search_state: SearchState::Empty,
-            all_entries: Default::default(),
-            separated_items: Default::default(),
+            search_query: SharedString::new_static(""),
+            all_entries: entries,
+            matches: Vec::new(),
            search_editor,
+            _subscriptions: vec![search_editor_subscription, history_store_subscription],
+            _search_task: None,
            scrollbar_visibility: true,
            scrollbar_state,
-            _subscriptions: vec![search_editor_subscription, history_store_subscription],
-            _separated_items_task: None,
-        };
-        this.update_all_entries(cx);
-        this
+        }
    }

    fn update_all_entries(&mut self, cx: &mut Context<Self>) {
@@ -118,155 +87,88 @@ impl ThreadHistory {
            .history_store
            .update(cx, |store, cx| store.entries(cx))
            .into();
-
-        self.set_selected_index(0, cx);
-        self.update_separated_items(cx);
-
-        match &self.search_state {
-            SearchState::Empty => {}
-            SearchState::Searching { query, .. } | SearchState::Searched { query, .. } => {
-                self.search(query.clone(), cx);
-            }
-        }
-        cx.notify();
+        self.matches.clear();
+        self.update_search(cx);
    }

-    fn update_separated_items(&mut self, cx: &mut Context<Self>) {
-        self._separated_items_task.take();
+    fn update_search(&mut self, cx: &mut Context<Self>) {
+        self._search_task.take();

-        let mut separated_items = std::mem::take(&mut self.separated_items);
-        separated_items.clear();
+        if self.has_search_query() {
+            self.perform_search(cx);
+        } else {
+            self.matches.clear();
+            self.set_selected_index(0, cx);
+            cx.notify();
+        }
+    }
+
+    fn perform_search(&mut self, cx: &mut Context<Self>) {
+        let query = self.search_query.clone();
        let all_entries = self.all_entries.clone();

-        let bg_task = cx.background_spawn(async move {
-            let mut bucket = None;
-            let today = Utc::now().naive_local().date();
-
-            for (index, entry) in all_entries.iter().enumerate() {
-                let entry_date = entry.updated_at().naive_local().date();
-                let entry_bucket = TimeBucket::from_dates(today, entry_date);
-
-                if Some(entry_bucket) != bucket {
-                    bucket = Some(entry_bucket);
-                    separated_items.push(HistoryListItem::BucketSeparator(entry_bucket));
-                }
-                separated_items.push(HistoryListItem::Entry {
-                    index,
-                    format: entry_bucket.into(),
-                });
-            }
-            separated_items
-        });
-
        let task = cx.spawn(async move |this, cx| {
-            let separated_items = bg_task.await;
+            let executor = cx.background_executor().clone();
+
+            let matches = cx
+                .background_spawn(async move {
+                    let mut candidates = Vec::with_capacity(all_entries.len());
+
+                    for (idx, entry) in all_entries.iter().enumerate() {
+                        match entry {
+                            HistoryEntry::Thread(thread) => {
+                                candidates.push(StringMatchCandidate::new(idx, &thread.summary));
+                            }
+                            HistoryEntry::Context(context) => {
+                                candidates.push(StringMatchCandidate::new(idx, &context.title));
+                            }
+                        }
+                    }
+
+                    const MAX_MATCHES: usize = 100;
+
+                    fuzzy::match_strings(
+                        &candidates,
+                        &query,
+                        false,
+                        MAX_MATCHES,
+                        &Default::default(),
+                        executor,
+                    )
+                    .await
+                })
+                .await;
+
            this.update(cx, |this, cx| {
-                this.separated_items = separated_items;
+                this.matches = matches;
+                this.set_selected_index(0, cx);
                cx.notify();
            })
            .log_err();
        });
-        self._separated_items_task = Some(task);
+
+        self._search_task = Some(task);
    }

-    fn search(&mut self, query: SharedString, cx: &mut Context<Self>) {
-        if query.is_empty() {
-            self.search_state = SearchState::Empty;
-            cx.notify();
-            return;
-        }
-
-        let all_entries = self.all_entries.clone();
-
-        let fuzzy_search_task = cx.background_spawn({
-            let query = query.clone();
-            let executor = cx.background_executor().clone();
-            async move {
-                let mut candidates = Vec::with_capacity(all_entries.len());
-
-                for (idx, entry) in all_entries.iter().enumerate() {
-                    match entry {
-                        HistoryEntry::Thread(thread) => {
-                            candidates.push(StringMatchCandidate::new(idx, &thread.summary));
-                        }
-                        HistoryEntry::Context(context) => {
-                            candidates.push(StringMatchCandidate::new(idx, &context.title));
-                        }
-                    }
-                }
-
-                const MAX_MATCHES: usize = 100;
-
-                fuzzy::match_strings(
-                    &candidates,
-                    &query,
-                    false,
-                    MAX_MATCHES,
-                    &Default::default(),
-                    executor,
-                )
-                .await
-            }
-        });
-
-        let task = cx.spawn({
-            let query = query.clone();
-            async move |this, cx| {
-                let matches = fuzzy_search_task.await;
-
-                this.update(cx, |this, cx| {
-                    let SearchState::Searching {
-                        query: current_query,
-                        _task,
-                    } = &this.search_state
-                    else {
-                        return;
-                    };
-
-                    if &query == current_query {
-                        this.search_state = SearchState::Searched {
-                            query: query.clone(),
-                            matches,
-                        };
-
-                        this.set_selected_index(0, cx);
-                        cx.notify();
-                    };
-                })
-                .log_err();
-            }
-        });
-
-        self.search_state = SearchState::Searching {
-            query: query.clone(),
-            _task: task,
-        };
-        cx.notify();
+    fn has_search_query(&self) -> bool {
+        !self.search_query.is_empty()
    }

    fn matched_count(&self) -> usize {
-        match &self.search_state {
-            SearchState::Empty => self.all_entries.len(),
-            SearchState::Searching { .. } => 0,
-            SearchState::Searched { matches, .. } => matches.len(),
-        }
-    }
-
-    fn search_produced_no_matches(&self) -> bool {
-        match &self.search_state {
-            SearchState::Empty => false,
-            SearchState::Searching { .. } => false,
-            SearchState::Searched { matches, .. } => matches.is_empty(),
+        if self.has_search_query() {
+            self.matches.len()
+        } else {
+            self.all_entries.len()
        }
    }

    fn get_match(&self, ix: usize) -> Option<&HistoryEntry> {
-        match &self.search_state {
-            SearchState::Empty => self.all_entries.get(ix),
-            SearchState::Searching { .. } => None,
-            SearchState::Searched { matches, .. } => matches
+        if self.has_search_query() {
+            self.matches
                .get(ix)
-                .and_then(|m| self.all_entries.get(m.candidate_id)),
+                .and_then(|m| self.all_entries.get(m.candidate_id))
+        } else {
+            self.all_entries.get(ix)
        }
    }

@@ -409,107 +311,6 @@ impl ThreadHistory {
            cx.notify();
        }
    }
-
-    fn list_items(
-        &mut self,
-        range: Range<usize>,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Vec<AnyElement> {
-        let range_start = range.start;
-
-        match &self.search_state {
-            SearchState::Empty => self
-                .separated_items
-                .get(range)
-                .iter()
-                .flat_map(|items| {
-                    items
-                        .iter()
-                        .map(|item| self.render_list_item(item.entry_index(), item, vec![], cx))
-                })
-                .collect(),
-            SearchState::Searched { matches, .. } => matches[range]
-                .iter()
-                .enumerate()
-                .map(|(ix, m)| {
-                    self.render_list_item(
-                        Some(range_start + ix),
-                        &HistoryListItem::Entry {
-                            index: m.candidate_id,
-                            format: EntryTimeFormat::DateAndTime,
-                        },
-                        m.positions.clone(),
-                        cx,
-                    )
-                })
-                .collect(),
-            SearchState::Searching { .. } => {
-                vec![]
-            }
-        }
-    }
-
-    fn render_list_item(
-        &self,
-        list_entry_ix: Option<usize>,
-        item: &HistoryListItem,
-        highlight_positions: Vec<usize>,
-        cx: &App,
-    ) -> AnyElement {
-        match item {
-            HistoryListItem::Entry { index, format } => match self.all_entries.get(*index) {
-                Some(entry) => h_flex()
-                    .w_full()
-                    .pb_1()
-                    .child(self.render_history_entry(
-                        entry,
-                        list_entry_ix == Some(self.selected_index),
-                        highlight_positions,
-                        *format,
-                    ))
-                    .into_any(),
-                None => Empty.into_any_element(),
-            },
-            HistoryListItem::BucketSeparator(bucket) => div()
-                .px(DynamicSpacing::Base06.rems(cx))
-                .pt_2()
-                .pb_1()
-                .child(
-                    Label::new(bucket.to_string())
-                        .size(LabelSize::XSmall)
-                        .color(Color::Muted),
-                )
-                .into_any_element(),
-        }
-    }
-
-    fn render_history_entry(
-        &self,
-        entry: &HistoryEntry,
-        is_active: bool,
-        highlight_positions: Vec<usize>,
-        format: EntryTimeFormat,
-    ) -> AnyElement {
-        match entry {
-            HistoryEntry::Thread(thread) => PastThread::new(
-                thread.clone(),
-                self.assistant_panel.clone(),
-                is_active,
-                highlight_positions,
-                format,
-            )
-            .into_any_element(),
-            HistoryEntry::Context(context) => PastContext::new(
-                context.clone(),
-                self.assistant_panel.clone(),
-                is_active,
-                highlight_positions,
-                format,
-            )
-            .into_any_element(),
-        }
-    }
 }

 impl Focusable for ThreadHistory {
@@ -520,6 +321,8 @@ impl Focusable for ThreadHistory {

 impl Render for ThreadHistory {
    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let selected_index = self.selected_index;
+
        v_flex()
            .key_context("ThreadHistory")
            .size_full()
@@ -563,7 +366,7 @@ impl Render for ThreadHistory {
                                    .size(LabelSize::Small),
                            ),
                        )
-                } else if self.search_produced_no_matches() {
+                } else if self.has_search_query() && self.matches.is_empty() {
                    view.justify_center().child(
                        h_flex().w_full().justify_center().child(
                            Label::new("No threads match your search.").size(LabelSize::Small),
@@ -576,7 +379,56 @@ impl Render for ThreadHistory {
                                cx.entity().clone(),
                                "thread-history",
                                self.matched_count(),
-                                Self::list_items,
+                                move |history, range, _window, _cx| {
+                                    let range_start = range.start;
+                                    let assistant_panel = history.assistant_panel.clone();
+
+                                    let render_item = |index: usize,
+                                                       entry: &HistoryEntry,
+                                                       highlight_positions: Vec<usize>|
+                                     -> Div {
+                                        h_flex().w_full().pb_1().child(match entry {
+                                            HistoryEntry::Thread(thread) => PastThread::new(
+                                                thread.clone(),
+                                                assistant_panel.clone(),
+                                                selected_index == index + range_start,
+                                                highlight_positions,
+                                            )
+                                            .into_any_element(),
+                                            HistoryEntry::Context(context) => PastContext::new(
+                                                context.clone(),
+                                                assistant_panel.clone(),
+                                                selected_index == index + range_start,
+                                                highlight_positions,
+                                            )
+                                            .into_any_element(),
+                                        })
+                                    };
+
+                                    if history.has_search_query() {
+                                        history.matches[range]
+                                            .iter()
+                                            .enumerate()
+                                            .filter_map(|(index, m)| {
+                                                history.all_entries.get(m.candidate_id).map(
+                                                    |entry| {
+                                                        render_item(
+                                                            index,
+                                                            entry,
+                                                            m.positions.clone(),
+                                                        )
+                                                    },
+                                                )
+                                            })
+                                            .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())
@@ -596,7 +448,6 @@ pub struct PastThread {
    assistant_panel: WeakEntity<AssistantPanel>,
    selected: bool,
    highlight_positions: Vec<usize>,
-    timestamp_format: EntryTimeFormat,
 }

 impl PastThread {
@@ -605,14 +456,12 @@ impl PastThread {
        assistant_panel: WeakEntity<AssistantPanel>,
        selected: bool,
        highlight_positions: Vec<usize>,
-        timestamp_format: EntryTimeFormat,
    ) -> Self {
        Self {
            thread,
            assistant_panel,
            selected,
            highlight_positions,
-            timestamp_format,
        }
    }
 }
@@ -621,10 +470,13 @@ impl RenderOnce for PastThread {
    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
        let summary = self.thread.summary;

-        let thread_timestamp = self.timestamp_format.format_timestamp(
-            &self.assistant_panel,
-            self.thread.updated_at.timestamp(),
-            cx,
+        let thread_timestamp = time_format::format_localized_timestamp(
+            OffsetDateTime::from_unix_timestamp(self.thread.updated_at.timestamp()).unwrap(),
+            OffsetDateTime::now_utc(),
+            self.assistant_panel
+                .update(cx, |this, _cx| this.local_timezone())
+                .unwrap_or(UtcOffset::UTC),
+            time_format::TimestampFormat::EnhancedAbsolute,
        );

        ListItem::new(SharedString::from(self.thread.id.to_string()))
@@ -688,7 +540,6 @@ pub struct PastContext {
    assistant_panel: WeakEntity<AssistantPanel>,
    selected: bool,
    highlight_positions: Vec<usize>,
-    timestamp_format: EntryTimeFormat,
 }

 impl PastContext {
@@ -697,14 +548,12 @@ impl PastContext {
        assistant_panel: WeakEntity<AssistantPanel>,
        selected: bool,
        highlight_positions: Vec<usize>,
-        timestamp_format: EntryTimeFormat,
    ) -> Self {
        Self {
            context,
            assistant_panel,
            selected,
            highlight_positions,
-            timestamp_format,
        }
    }
 }
@@ -712,10 +561,13 @@ impl PastContext {
 impl RenderOnce for PastContext {
    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
        let summary = self.context.title;
-        let context_timestamp = self.timestamp_format.format_timestamp(
-            &self.assistant_panel,
-            self.context.mtime.timestamp(),
-            cx,
+        let context_timestamp = time_format::format_localized_timestamp(
+            OffsetDateTime::from_unix_timestamp(self.context.mtime.timestamp()).unwrap(),
+            OffsetDateTime::now_utc(),
+            self.assistant_panel
+                .update(cx, |this, _cx| this.local_timezone())
+                .unwrap_or(UtcOffset::UTC),
+            time_format::TimestampFormat::EnhancedAbsolute,
        );

        ListItem::new(SharedString::from(
@@ -775,137 +627,3 @@ impl RenderOnce for PastContext {
        })
    }
 }
-
-#[derive(Clone, Copy)]
-pub enum EntryTimeFormat {
-    DateAndTime,
-    TimeOnly,
-}
-
-impl EntryTimeFormat {
-    fn format_timestamp(
-        &self,
-        assistant_panel: &WeakEntity<AssistantPanel>,
-        timestamp: i64,
-        cx: &App,
-    ) -> String {
-        let timestamp = OffsetDateTime::from_unix_timestamp(timestamp).unwrap();
-        let timezone = assistant_panel
-            .read_with(cx, |this, _cx| this.local_timezone())
-            .unwrap_or(UtcOffset::UTC);
-
-        match &self {
-            EntryTimeFormat::DateAndTime => time_format::format_localized_timestamp(
-                timestamp,
-                OffsetDateTime::now_utc(),
-                timezone,
-                time_format::TimestampFormat::EnhancedAbsolute,
-            ),
-            EntryTimeFormat::TimeOnly => time_format::format_time(timestamp),
-        }
-    }
-}
-
-impl From<TimeBucket> for EntryTimeFormat {
-    fn from(bucket: TimeBucket) -> Self {
-        match bucket {
-            TimeBucket::Today => EntryTimeFormat::TimeOnly,
-            TimeBucket::Yesterday => EntryTimeFormat::TimeOnly,
-            TimeBucket::ThisWeek => EntryTimeFormat::DateAndTime,
-            TimeBucket::PastWeek => EntryTimeFormat::DateAndTime,
-            TimeBucket::All => EntryTimeFormat::DateAndTime,
-        }
-    }
-}
-
-#[derive(PartialEq, Eq, Clone, Copy, Debug)]
-enum TimeBucket {
-    Today,
-    Yesterday,
-    ThisWeek,
-    PastWeek,
-    All,
-}
-
-impl TimeBucket {
-    fn from_dates(reference: NaiveDate, date: NaiveDate) -> Self {
-        if date == reference {
-            return TimeBucket::Today;
-        }
-
-        if date == reference - TimeDelta::days(1) {
-            return TimeBucket::Yesterday;
-        }
-
-        let week = date.iso_week();
-
-        if reference.iso_week() == week {
-            return TimeBucket::ThisWeek;
-        }
-
-        let last_week = (reference - TimeDelta::days(7)).iso_week();
-
-        if week == last_week {
-            return TimeBucket::PastWeek;
-        }
-
-        TimeBucket::All
-    }
-}
-
-impl Display for TimeBucket {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            TimeBucket::Today => write!(f, "Today"),
-            TimeBucket::Yesterday => write!(f, "Yesterday"),
-            TimeBucket::ThisWeek => write!(f, "This Week"),
-            TimeBucket::PastWeek => write!(f, "Past Week"),
-            TimeBucket::All => write!(f, "All"),
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use chrono::NaiveDate;
-
-    #[test]
-    fn test_time_bucket_from_dates() {
-        let today = NaiveDate::from_ymd_opt(2023, 1, 15).unwrap();
-
-        let date = today;
-        assert_eq!(TimeBucket::from_dates(today, date), TimeBucket::Today);
-
-        let date = NaiveDate::from_ymd_opt(2023, 1, 14).unwrap();
-        assert_eq!(TimeBucket::from_dates(today, date), TimeBucket::Yesterday);
-
-        let date = NaiveDate::from_ymd_opt(2023, 1, 13).unwrap();
-        assert_eq!(TimeBucket::from_dates(today, date), TimeBucket::ThisWeek);
-
-        let date = NaiveDate::from_ymd_opt(2023, 1, 11).unwrap();
-        assert_eq!(TimeBucket::from_dates(today, date), TimeBucket::ThisWeek);
-
-        let date = NaiveDate::from_ymd_opt(2023, 1, 8).unwrap();
-        assert_eq!(TimeBucket::from_dates(today, date), TimeBucket::PastWeek);
-
-        let date = NaiveDate::from_ymd_opt(2023, 1, 5).unwrap();
-        assert_eq!(TimeBucket::from_dates(today, date), TimeBucket::PastWeek);
-
-        // All: not in this week or last week
-        let date = NaiveDate::from_ymd_opt(2023, 1, 1).unwrap();
-        assert_eq!(TimeBucket::from_dates(today, date), TimeBucket::All);
-
-        // Test year boundary cases
-        let new_year = NaiveDate::from_ymd_opt(2023, 1, 1).unwrap();
-
-        let date = NaiveDate::from_ymd_opt(2022, 12, 31).unwrap();
-        assert_eq!(
-            TimeBucket::from_dates(new_year, date),
-            TimeBucket::Yesterday
-        );
-
-        let date = NaiveDate::from_ymd_opt(2022, 12, 28).unwrap();
-        assert_eq!(TimeBucket::from_dates(new_year, date), TimeBucket::ThisWeek);
-    }
-}
--- a/crates/agent/src/thread_store.rs
+++ b/crates/agent/src/thread_store.rs
@@ -4,12 +4,13 @@ use std::path::{Path, PathBuf};
 use std::rc::Rc;
 use std::sync::Arc;

-use agent_settings::{AgentProfile, AgentProfileId, AgentSettings};
 use anyhow::{Context as _, Result, anyhow};
+use assistant_settings::{AgentProfile, AgentProfileId, AssistantSettings};
 use assistant_tool::{ToolId, ToolSource, ToolWorkingSet};
 use chrono::{DateTime, Utc};
 use collections::HashMap;
-use context_server::ContextServerId;
+use context_server::manager::{ContextServerManager, ContextServerStatus};
+use context_server::{ContextServerDescriptorRegistry, ContextServerTool};
 use futures::channel::{mpsc, oneshot};
 use futures::future::{self, BoxFuture, Shared};
 use futures::{FutureExt as _, StreamExt as _};
@@ -20,7 +21,6 @@ use gpui::{
 use heed::Database;
 use heed::types::SerdeBincode;
 use language_model::{LanguageModelToolUseId, Role, TokenUsage};
-use project::context_server_store::{ContextServerStatus, ContextServerStore};
 use project::{Project, ProjectItem, ProjectPath, Worktree};
 use prompt_store::{
    ProjectContext, PromptBuilder, PromptId, PromptStore, PromptsUpdatedEvent, RulesFileContext,
@@ -30,7 +30,6 @@ use serde::{Deserialize, Serialize};
 use settings::{Settings as _, SettingsStore};
 use util::ResultExt as _;

-use crate::context_server_tool::ContextServerTool;
 use crate::thread::{
    DetailedSummaryState, ExceededWindowError, MessageId, ProjectSnapshot, Thread, ThreadId,
 };
@@ -58,14 +57,13 @@ impl SharedProjectContext {
    }
 }

-pub type TextThreadStore = assistant_context_editor::ContextStore;
-
 pub struct ThreadStore {
    project: Entity<Project>,
    tools: Entity<ToolWorkingSet>,
    prompt_builder: Arc<PromptBuilder>,
    prompt_store: Option<Entity<PromptStore>>,
-    context_server_tool_ids: HashMap<ContextServerId, Vec<ToolId>>,
+    context_server_manager: Entity<ContextServerManager>,
+    context_server_tool_ids: HashMap<Arc<str>, Vec<ToolId>>,
    threads: Vec<SerializedThreadMetadata>,
    project_context: SharedProjectContext,
    reload_system_prompt_tx: mpsc::Sender<()>,
@@ -110,6 +108,11 @@ impl ThreadStore {
        prompt_store: Option<Entity<PromptStore>>,
        cx: &mut Context<Self>,
    ) -> (Self, oneshot::Receiver<()>) {
+        let context_server_factory_registry = ContextServerDescriptorRegistry::default_global(cx);
+        let context_server_manager = cx.new(|cx| {
+            ContextServerManager::new(context_server_factory_registry, project.clone(), cx)
+        });
+
        let mut subscriptions = vec![
            cx.observe_global::<SettingsStore>(move |this: &mut Self, cx| {
                this.load_default_profile(cx);
@@ -156,6 +159,7 @@ impl ThreadStore {
            tools,
            prompt_builder,
            prompt_store,
+            context_server_manager,
            context_server_tool_ids: HashMap::default(),
            threads: Vec::new(),
            project_context: SharedProjectContext::default(),
@@ -350,6 +354,10 @@ impl ThreadStore {
        })
    }

+    pub fn context_server_manager(&self) -> Entity<ContextServerManager> {
+        self.context_server_manager.clone()
+    }
+
    pub fn prompt_store(&self) -> &Option<Entity<PromptStore>> {
        &self.prompt_store
    }
@@ -363,10 +371,6 @@ impl ThreadStore {
        self.threads.len()
    }

-    pub fn unordered_threads(&self) -> impl Iterator<Item = &SerializedThreadMetadata> {
-        self.threads.iter()
-    }
-
    pub fn reverse_chronological_threads(&self) -> Vec<SerializedThreadMetadata> {
        let mut threads = self.threads.iter().cloned().collect::<Vec<_>>();
        threads.sort_unstable_by_key(|thread| std::cmp::Reverse(thread.updated_at));
@@ -462,15 +466,15 @@ impl ThreadStore {
    }

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

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

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

-        if let Some(profile) = agent_settings.profiles.get(&profile_id) {
+        if let Some(profile) = assistant_settings.profiles.get(&profile_id) {
            self.load_profile(profile.clone(), cx);
        }
    }
@@ -490,17 +494,11 @@ impl ThreadStore {
        });

        if profile.enable_all_context_servers {
-            for context_server_id in self
-                .project
-                .read(cx)
-                .context_server_store()
-                .read(cx)
-                .all_server_ids()
-            {
+            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.0.into(),
+                            id: context_server.id().into(),
                        },
                        cx,
                    );
@@ -543,7 +541,7 @@ impl ThreadStore {

    fn register_context_server_handlers(&self, cx: &mut Context<Self>) {
        cx.subscribe(
-            &self.project.read(cx).context_server_store(),
+            &self.context_server_manager.clone(),
            Self::handle_context_server_event,
        )
        .detach();
@@ -551,19 +549,18 @@ impl ThreadStore {

    fn handle_context_server_event(
        &mut self,
-        context_server_store: Entity<ContextServerStore>,
-        event: &project::context_server_store::Event,
+        context_server_manager: Entity<ContextServerManager>,
+        event: &context_server::manager::Event,
        cx: &mut Context<Self>,
    ) {
        let tool_working_set = self.tools.clone();
        match event {
-            project::context_server_store::Event::ServerStatusChanged { server_id, status } => {
+            context_server::manager::Event::ServerStatusChanged { server_id, status } => {
                match status {
-                    ContextServerStatus::Running => {
-                        if let Some(server) =
-                            context_server_store.read(cx).get_running_server(server_id)
+                    Some(ContextServerStatus::Running) => {
+                        if let Some(server) = context_server_manager.read(cx).get_server(server_id)
                        {
-                            let context_server_manager = context_server_store.clone();
+                            let context_server_manager = context_server_manager.clone();
                            cx.spawn({
                                let server = server.clone();
                                let server_id = server_id.clone();
@@ -611,7 +608,7 @@ impl ThreadStore {
                            .detach();
                        }
                    }
-                    ContextServerStatus::Stopped | ContextServerStatus::Error(_) => {
+                    None => {
                        if let Some(tool_ids) = self.context_server_tool_ids.remove(server_id) {
                            tool_working_set.update(cx, |tool_working_set, _| {
                                tool_working_set.remove(&tool_ids);
--- a/crates/agent/src/tool_use.rs
+++ b/crates/agent/src/tool_use.rs
@@ -110,27 +110,20 @@ impl ToolUseState {
    }

    pub fn cancel_pending(&mut self) -> Vec<PendingToolUse> {
-        let mut cancelled_tool_uses = Vec::new();
-        self.pending_tool_uses_by_id
-            .retain(|tool_use_id, tool_use| {
-                if matches!(tool_use.status, PendingToolUseStatus::Error { .. }) {
-                    return true;
-                }
-
-                let content = "Tool canceled by user".into();
-                self.tool_results.insert(
-                    tool_use_id.clone(),
-                    LanguageModelToolResult {
-                        tool_use_id: tool_use_id.clone(),
-                        tool_name: tool_use.name.clone(),
-                        content,
-                        is_error: true,
-                    },
-                );
-                cancelled_tool_uses.push(tool_use.clone());
-                false
-            });
-        cancelled_tool_uses
+        let mut pending_tools = Vec::new();
+        for (tool_use_id, tool_use) in self.pending_tool_uses_by_id.drain() {
+            self.tool_results.insert(
+                tool_use_id.clone(),
+                LanguageModelToolResult {
+                    tool_use_id,
+                    tool_name: tool_use.name.clone(),
+                    content: "Tool canceled by user".into(),
+                    is_error: true,
+                },
+            );
+            pending_tools.push(tool_use.clone());
+        }
+        pending_tools
    }

    pub fn pending_tool_uses(&self) -> Vec<&PendingToolUse> {
--- a/crates/agent/src/trial_markdown.md
+++ b/crates/agent/src/trial_markdown.md
@@ -1,3 +0,0 @@
-# Build better with Zed Pro
-
-Try [Zed Pro](https://zed.dev/pricing) for free for 14 days - no credit card required. Only $20/month afterward. Cancel anytime.
--- a/crates/agent/src/ui/context_pill.rs
+++ b/crates/agent/src/ui/context_pill.rs
@@ -16,8 +16,7 @@ use crate::context::{
    AgentContext, AgentContextHandle, ContextId, ContextKind, DirectoryContext,
    DirectoryContextHandle, FetchedUrlContext, FileContext, FileContextHandle, ImageContext,
    ImageStatus, RulesContext, RulesContextHandle, SelectionContext, SelectionContextHandle,
-    SymbolContext, SymbolContextHandle, TextThreadContext, TextThreadContextHandle, ThreadContext,
-    ThreadContextHandle,
+    SymbolContext, SymbolContextHandle, ThreadContext, ThreadContextHandle,
 };

 #[derive(IntoElement)]
@@ -302,7 +301,6 @@ impl AddedContext {
            AgentContextHandle::Selection(handle) => Self::pending_selection(handle, cx),
            AgentContextHandle::FetchedUrl(handle) => Some(Self::fetched_url(handle)),
            AgentContextHandle::Thread(handle) => Some(Self::pending_thread(handle, cx)),
-            AgentContextHandle::TextThread(handle) => Some(Self::pending_text_thread(handle, cx)),
            AgentContextHandle::Rules(handle) => Self::pending_rules(handle, prompt_store, cx),
            AgentContextHandle::Image(handle) => Some(Self::image(handle)),
        }
@@ -316,7 +314,6 @@ impl AddedContext {
            AgentContext::Selection(context) => Self::attached_selection(context, cx),
            AgentContext::FetchedUrl(context) => Self::fetched_url(context.clone()),
            AgentContext::Thread(context) => Self::attached_thread(context),
-            AgentContext::TextThread(context) => Self::attached_text_thread(context),
            AgentContext::Rules(context) => Self::attached_rules(context),
            AgentContext::Image(context) => Self::image(context.clone()),
        }
@@ -523,43 +520,6 @@ impl AddedContext {
        }
    }

-    fn pending_text_thread(handle: TextThreadContextHandle, cx: &App) -> AddedContext {
-        AddedContext {
-            kind: ContextKind::TextThread,
-            name: handle.title(cx),
-            parent: None,
-            tooltip: None,
-            icon_path: None,
-            status: ContextStatus::Ready,
-            render_hover: {
-                let context = handle.context.clone();
-                Some(Rc::new(move |_, cx| {
-                    let text = context.read(cx).to_xml(cx);
-                    ContextPillHover::new_text(text.into(), cx).into()
-                }))
-            },
-            handle: AgentContextHandle::TextThread(handle),
-        }
-    }
-
-    fn attached_text_thread(context: &TextThreadContext) -> AddedContext {
-        AddedContext {
-            kind: ContextKind::TextThread,
-            name: context.title.clone(),
-            parent: None,
-            tooltip: None,
-            icon_path: None,
-            status: ContextStatus::Ready,
-            render_hover: {
-                let text = context.text.clone();
-                Some(Rc::new(move |_, cx| {
-                    ContextPillHover::new_text(text.clone(), cx).into()
-                }))
-            },
-            handle: AgentContextHandle::TextThread(context.handle.clone()),
-        }
-    }
-
    fn pending_rules(
        handle: RulesContextHandle,
        prompt_store: Option<&Entity<PromptStore>>,
--- a/crates/agent/src/ui/max_mode_tooltip.rs
+++ b/crates/agent/src/ui/max_mode_tooltip.rs
@@ -1,50 +1,24 @@
 use gpui::{Context, IntoElement, Render, Window};
 use ui::{prelude::*, tooltip_container};

-pub struct MaxModeTooltip {
-    selected: bool,
-}
+pub struct MaxModeTooltip;

 impl MaxModeTooltip {
-    pub fn new() -> Self {
-        Self { selected: false }
-    }
-
-    pub fn selected(mut self, selected: bool) -> Self {
-        self.selected = selected;
-        self
+    pub fn new(_cx: &mut Context<Self>) -> Self {
+        Self
    }
 }

 impl Render for MaxModeTooltip {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        tooltip_container(window, cx, |this, _, _| {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        tooltip_container(_window, cx, |this, _, _| {
            this.gap_1()
-                .map(|header| if self.selected {
-                    header.child(
-                        h_flex()
-                            .justify_between()
-                            .child(
-                                h_flex()
-                                    .gap_1p5()
-                                    .child(Icon::new(IconName::ZedMaxMode).size(IconSize::Small).color(Color::Accent))
-                                    .child(Label::new("Zed's Max Mode"))
-                            )
-                            .child(
-                                h_flex()
-                                    .gap_0p5()
-                                    .child(Icon::new(IconName::Check).size(IconSize::XSmall).color(Color::Accent))
-                                    .child(Label::new("Turned On").size(LabelSize::XSmall).color(Color::Accent))
-                            )
-                    )
-                } else {
-                    header.child(
-                        h_flex()
-                            .gap_1p5()
-                            .child(Icon::new(IconName::ZedMaxMode).size(IconSize::Small))
-                            .child(Label::new("Zed's Max Mode"))
-                    )
-                })
+                .child(
+                    h_flex()
+                        .gap_1p5()
+                        .child(Icon::new(IconName::ZedMaxMode).size(IconSize::Small))
+                        .child(Label::new("Zed's Max Mode"))
+                )
                .child(
                    div()
                        .max_w_72()
--- a/crates/agent/src/ui/preview/agent_preview.rs
+++ b/crates/agent/src/ui/preview/agent_preview.rs
@@ -6,11 +6,16 @@ use std::sync::OnceLock;
 use ui::{AnyElement, Component, ComponentScope, Window};
 use workspace::Workspace;

-use crate::ActiveThread;
+use crate::{ActiveThread, ThreadStore};

 /// Function type for creating agent component previews
-pub type PreviewFn =
-    fn(WeakEntity<Workspace>, Entity<ActiveThread>, &mut Window, &mut App) -> Option<AnyElement>;
+pub type PreviewFn = fn(
+    WeakEntity<Workspace>,
+    Entity<ActiveThread>,
+    WeakEntity<ThreadStore>,
+    &mut Window,
+    &mut App,
+) -> Option<AnyElement>;

 /// Distributed slice for preview registration functions
 #[distributed_slice]
@@ -27,6 +32,7 @@ pub trait AgentPreview: Component + Sized {
    fn agent_preview(
        workspace: WeakEntity<Workspace>,
        active_thread: Entity<ActiveThread>,
+        thread_store: WeakEntity<ThreadStore>,
        window: &mut Window,
        cx: &mut App,
    ) -> Option<AnyElement>;
@@ -69,13 +75,14 @@ pub fn get_agent_preview(
    id: &ComponentId,
    workspace: WeakEntity<Workspace>,
    active_thread: Entity<ActiveThread>,
+    thread_store: WeakEntity<ThreadStore>,
    window: &mut Window,
    cx: &mut App,
 ) -> Option<AnyElement> {
    let registry = get_or_init_registry();
    registry
        .get(id)
-        .and_then(|preview_fn| preview_fn(workspace, active_thread, window, cx))
+        .and_then(|preview_fn| preview_fn(workspace, active_thread, thread_store, window, cx))
 }

 /// Get all registered agent previews.
--- a/crates/agent/src/ui/upsell.rs
+++ b/crates/agent/src/ui/upsell.rs
@@ -15,7 +15,7 @@ use ui::{
 /// ```
 /// let upsell = Upsell::new(
 ///     "Upgrade to Zed Pro",
-///     "Get access to advanced AI features and more",
+///     "Get unlimited access to AI features and more",
 ///     "Upgrade Now",
 ///     Box::new(|_, _window, cx| {
 ///         cx.open_url("https://zed.dev/pricing");
@@ -33,9 +33,9 @@ pub struct Upsell {
    title: SharedString,
    message: SharedString,
    cta_text: SharedString,
-    on_click: Box<dyn Fn(&ClickEvent, &mut Window, &mut App) + 'static>,
-    on_dismiss: Box<dyn Fn(&ClickEvent, &mut Window, &mut App) + 'static>,
-    on_dont_show_again: Box<dyn Fn(bool, &mut Window, &mut App) + 'static>,
+    on_click: Box<dyn Fn(&ClickEvent, &mut Window, &mut App)>,
+    on_dismiss: Box<dyn Fn(&ClickEvent, &mut Window, &mut App)>,
+    on_dont_show_again: Box<dyn Fn(bool, &mut Window, &mut App)>,
 }

 impl Upsell {
@@ -44,9 +44,9 @@ impl Upsell {
        title: impl Into<SharedString>,
        message: impl Into<SharedString>,
        cta_text: impl Into<SharedString>,
-        on_click: Box<dyn Fn(&ClickEvent, &mut Window, &mut App) + 'static>,
-        on_dismiss: Box<dyn Fn(&ClickEvent, &mut Window, &mut App) + 'static>,
-        on_dont_show_again: Box<dyn Fn(bool, &mut Window, &mut App) + 'static>,
+        on_click: Box<dyn Fn(&ClickEvent, &mut Window, &mut App)>,
+        on_dismiss: Box<dyn Fn(&ClickEvent, &mut Window, &mut App)>,
+        on_dont_show_again: Box<dyn Fn(bool, &mut Window, &mut App)>,
    ) -> Self {
        Self {
            title: title.into(),
@@ -105,7 +105,7 @@ impl RenderOnce for Upsell {
                        h_flex()
                            .gap_2()
                            .child(
-                                Button::new("dismiss-button", "No Thanks")
+                                Button::new("dismiss-button", "Dismiss")
                                    .style(ButtonStyle::Subtle)
                                    .on_click(self.on_dismiss),
                            )
--- a/crates/assistant/Cargo.toml
+++ b/crates/assistant/Cargo.toml
@@ -23,7 +23,7 @@ test-support = [
 [dependencies]
 anyhow.workspace = true
 assistant_context_editor.workspace = true
-agent_settings.workspace = true
+assistant_settings.workspace = true
 assistant_slash_command.workspace = true
 assistant_slash_commands.workspace = true
 assistant_tool.workspace = true
@@ -31,6 +31,7 @@ async-watch.workspace = true
 client.workspace = true
 collections.workspace = true
 command_palette_hooks.workspace = true
+context_server.workspace = true
 db.workspace = true
 editor.workspace = true
 feature_flags.workspace = true
--- a/crates/assistant/src/assistant.rs
+++ b/crates/assistant/src/assistant.rs
@@ -8,7 +8,7 @@ mod terminal_inline_assistant;

 use std::sync::Arc;

-use agent_settings::{AgentSettings, LanguageModelSelection};
+use assistant_settings::{AssistantSettings, LanguageModelSelection};
 use assistant_slash_command::SlashCommandRegistry;
 use client::Client;
 use command_palette_hooks::CommandPaletteFilter;
@@ -97,7 +97,7 @@ pub fn init(
    cx: &mut App,
 ) {
    cx.set_global(Assistant::default());
-    AgentSettings::register(cx);
+    AssistantSettings::register(cx);
    SlashCommandSettings::register(cx);

    assistant_context_editor::init(client.clone(), cx);
@@ -106,6 +106,7 @@ pub fn init(
    assistant_slash_command::init(cx);
    assistant_tool::init(cx);
    assistant_panel::init(cx);
+    context_server::init(cx);

    register_slash_commands(cx);
    inline_assistant::init(
@@ -126,13 +127,13 @@ pub fn init(
        filter.hide_namespace(Assistant::NAMESPACE);
    });
    Assistant::update_global(cx, |assistant, cx| {
-        let settings = AgentSettings::get_global(cx);
+        let settings = AssistantSettings::get_global(cx);

        assistant.set_enabled(settings.enabled, cx);
    });
    cx.observe_global::<SettingsStore>(|cx| {
        Assistant::update_global(cx, |assistant, cx| {
-            let settings = AgentSettings::get_global(cx);
+            let settings = AssistantSettings::get_global(cx);
            assistant.set_enabled(settings.enabled, cx);
        });
    })
@@ -159,7 +160,7 @@ fn init_language_model_settings(cx: &mut App) {
 }

 fn update_active_language_model_from_settings(cx: &mut App) {
-    let settings = AgentSettings::get_global(cx);
+    let settings = AssistantSettings::get_global(cx);

    fn to_selected_model(selection: &LanguageModelSelection) -> language_model::SelectedModel {
        language_model::SelectedModel {
--- a/crates/assistant/src/assistant_panel.rs
+++ b/crates/assistant/src/assistant_panel.rs
@@ -3,7 +3,6 @@ use crate::assistant_configuration::{ConfigurationView, ConfigurationViewEvent};
 use crate::{
    DeployHistory, InlineAssistant, NewChat, terminal_inline_assistant::TerminalInlineAssistant,
 };
-use agent_settings::{AgentDockPosition, AgentSettings};
 use anyhow::{Result, anyhow};
 use assistant_context_editor::{
    AssistantContext, AssistantPanelDelegate, ContextEditor, ContextEditorToolbarItem,
@@ -11,6 +10,7 @@ use assistant_context_editor::{
    DEFAULT_TAB_TITLE, InsertDraggedFiles, SlashCommandCompletionProvider,
    make_lsp_adapter_delegate,
 };
+use assistant_settings::{AssistantDockPosition, AssistantSettings};
 use assistant_slash_command::SlashCommandWorkingSet;
 use client::{Client, Status, proto};
 use editor::{Anchor, AnchorRangeExt as _, Editor, EditorEvent, MultiBuffer};
@@ -34,7 +34,7 @@ use smol::stream::StreamExt;

 use std::ops::Range;
 use std::path::Path;
-use std::{ops::ControlFlow, sync::Arc};
+use std::{ops::ControlFlow, path::PathBuf, sync::Arc};
 use terminal_view::{TerminalView, terminal_panel::TerminalPanel};
 use ui::{ContextMenu, PopoverMenu, Tooltip, prelude::*};
 use util::{ResultExt, maybe};
@@ -54,7 +54,7 @@ pub fn init(cx: &mut App) {
                .register_action(ContextEditor::quote_selection)
                .register_action(ContextEditor::insert_selection)
                .register_action(ContextEditor::copy_code)
-                .register_action(ContextEditor::handle_insert_dragged_files)
+                .register_action(ContextEditor::insert_dragged_files)
                .register_action(AssistantPanel::show_configuration)
                .register_action(AssistantPanel::create_new_context)
                .register_action(AssistantPanel::restart_context_servers)
@@ -182,7 +182,20 @@ impl AssistantPanel {
                        None
                    }?;

-                    Some(InsertDraggedFiles::ProjectPaths(project_paths))
+                    let paths = project_paths
+                        .into_iter()
+                        .filter_map(|project_path| {
+                            let worktree = project
+                                .read(cx)
+                                .worktree_for_id(project_path.worktree_id, cx)?;
+
+                            let mut full_path = PathBuf::from(worktree.read(cx).root_name());
+                            full_path.push(&project_path.path);
+                            Some(full_path)
+                        })
+                        .collect::<Vec<_>>();
+
+                    Some(InsertDraggedFiles::ProjectPaths(paths))
                });

                if let Some(action) = action {
@@ -320,7 +333,7 @@ impl AssistantPanel {

        let watch_client_status = Self::watch_client_status(workspace.client().clone(), window, cx);

-        Self {
+        let mut this = Self {
            pane,
            workspace: workspace.weak_handle(),
            width: None,
@@ -336,7 +349,9 @@ impl AssistantPanel {
            client_status: None,
            watch_client_status: Some(watch_client_status),
            show_zed_ai_notice: false,
-        }
+        };
+        this.new_context(window, cx);
+        this
    }

    pub fn toggle_focus(
@@ -984,7 +999,7 @@ impl AssistantPanel {
                            .map_or(true, |default| default.provider.id() != provider.id())
                        {
                            if let Some(model) = provider.default_model(cx) {
-                                update_settings_file::<AgentSettings>(
+                                update_settings_file::<AssistantSettings>(
                                    this.fs.clone(),
                                    cx,
                                    move |settings, _| settings.set_model(model),
@@ -1177,19 +1192,21 @@ impl AssistantPanel {

    fn restart_context_servers(
        workspace: &mut Workspace,
-        _action: &project::context_server_store::Restart,
+        _action: &context_server::Restart,
        _: &mut Window,
        cx: &mut Context<Workspace>,
    ) {
-        workspace
-            .project()
-            .read(cx)
-            .context_server_store()
-            .update(cx, |store, cx| {
-                for server in store.running_servers() {
-                    store.restart_server(&server.id(), cx).log_err();
-                }
-            });
+        let Some(assistant_panel) = workspace.panel::<AssistantPanel>(cx) else {
+            return;
+        };
+
+        assistant_panel.update(cx, |assistant_panel, cx| {
+            assistant_panel
+                .context_store
+                .update(cx, |context_store, cx| {
+                    context_store.restart_context_servers(cx);
+                });
+        });
    }
 }

@@ -1231,10 +1248,10 @@ impl Panel for AssistantPanel {
    }

    fn position(&self, _: &Window, cx: &App) -> DockPosition {
-        match AgentSettings::get_global(cx).dock {
-            AgentDockPosition::Left => DockPosition::Left,
-            AgentDockPosition::Bottom => DockPosition::Bottom,
-            AgentDockPosition::Right => DockPosition::Right,
+        match AssistantSettings::get_global(cx).dock {
+            AssistantDockPosition::Left => DockPosition::Left,
+            AssistantDockPosition::Bottom => DockPosition::Bottom,
+            AssistantDockPosition::Right => DockPosition::Right,
        }
    }

@@ -1243,18 +1260,22 @@ impl Panel for AssistantPanel {
    }

    fn set_position(&mut self, position: DockPosition, _: &mut Window, cx: &mut Context<Self>) {
-        settings::update_settings_file::<AgentSettings>(self.fs.clone(), cx, move |settings, _| {
-            let dock = match position {
-                DockPosition::Left => AgentDockPosition::Left,
-                DockPosition::Bottom => AgentDockPosition::Bottom,
-                DockPosition::Right => AgentDockPosition::Right,
-            };
-            settings.set_dock(dock);
-        });
+        settings::update_settings_file::<AssistantSettings>(
+            self.fs.clone(),
+            cx,
+            move |settings, _| {
+                let dock = match position {
+                    DockPosition::Left => AssistantDockPosition::Left,
+                    DockPosition::Bottom => AssistantDockPosition::Bottom,
+                    DockPosition::Right => AssistantDockPosition::Right,
+                };
+                settings.set_dock(dock);
+            },
+        );
    }

    fn size(&self, window: &Window, cx: &App) -> Pixels {
-        let settings = AgentSettings::get_global(cx);
+        let settings = AssistantSettings::get_global(cx);
        match self.position(window, cx) {
            DockPosition::Left | DockPosition::Right => {
                self.width.unwrap_or(settings.default_width)
@@ -1298,7 +1319,8 @@ impl Panel for AssistantPanel {
    }

    fn icon(&self, _: &Window, cx: &App) -> Option<IconName> {
-        (self.enabled(cx) && AgentSettings::get_global(cx).button).then_some(IconName::ZedAssistant)
+        (self.enabled(cx) && AssistantSettings::get_global(cx).button)
+            .then_some(IconName::ZedAssistant)
    }

    fn icon_tooltip(&self, _: &Window, _: &App) -> Option<&'static str> {
--- a/crates/assistant/src/inline_assistant.rs
+++ b/crates/assistant/src/inline_assistant.rs
@@ -2,9 +2,9 @@ use crate::{
    Assistant, AssistantPanel, AssistantPanelEvent, CycleNextInlineAssist,
    CyclePreviousInlineAssist,
 };
-use agent_settings::AgentSettings;
 use anyhow::{Context as _, Result, anyhow};
 use assistant_context_editor::{RequestType, humanize_token_count};
+use assistant_settings::AssistantSettings;
 use client::{ErrorExt, telemetry::Telemetry};
 use collections::{HashMap, HashSet, VecDeque, hash_map};
 use editor::{
@@ -156,7 +156,7 @@ impl InlineAssistant {
            let Some(terminal_panel) = workspace.read(cx).panel::<TerminalPanel>(cx) else {
                return;
            };
-            let enabled = AgentSettings::get_global(cx).enabled;
+            let enabled = AssistantSettings::get_global(cx).enabled;
            terminal_panel.update(cx, |terminal_panel, cx| {
                terminal_panel.set_assistant_enabled(enabled, cx)
            });
@@ -1761,7 +1761,7 @@ impl PromptEditor {
                LanguageModelSelector::new(
                    |cx| LanguageModelRegistry::read_global(cx).default_model(),
                    move |model, cx| {
-                        update_settings_file::<AgentSettings>(
+                        update_settings_file::<AssistantSettings>(
                            fs.clone(),
                            cx,
                            move |settings, _| settings.set_model(model.clone()),
--- a/crates/assistant/src/terminal_inline_assistant.rs
+++ b/crates/assistant/src/terminal_inline_assistant.rs
@@ -1,7 +1,7 @@
 use crate::{AssistantPanel, AssistantPanelEvent, DEFAULT_CONTEXT_LINES};
-use agent_settings::AgentSettings;
 use anyhow::{Context as _, Result};
 use assistant_context_editor::{RequestType, humanize_token_count};
+use assistant_settings::AssistantSettings;
 use client::telemetry::Telemetry;
 use collections::{HashMap, VecDeque};
 use editor::{
@@ -756,7 +756,7 @@ impl PromptEditor {
                LanguageModelSelector::new(
                    |cx| LanguageModelRegistry::read_global(cx).default_model(),
                    move |model, cx| {
-                        update_settings_file::<AgentSettings>(
+                        update_settings_file::<AssistantSettings>(
                            fs.clone(),
                            cx,
                            move |settings, _| settings.set_model(model.clone()),
--- a/crates/assistant_context_editor/Cargo.toml
+++ b/crates/assistant_context_editor/Cargo.toml
@@ -13,7 +13,7 @@ path = "src/assistant_context_editor.rs"

 [dependencies]
 anyhow.workspace = true
-agent_settings.workspace = true
+assistant_settings.workspace = true
 assistant_slash_command.workspace = true
 assistant_slash_commands.workspace = true
 chrono.workspace = true
--- a/crates/assistant_context_editor/src/context.rs
+++ b/crates/assistant_context_editor/src/context.rs
@@ -32,7 +32,7 @@ use serde::{Deserialize, Serialize};
 use smallvec::SmallVec;
 use std::{
    cmp::{Ordering, max},
-    fmt::{Debug, Write as _},
+    fmt::Debug,
    iter, mem,
    ops::Range,
    path::Path,
@@ -2539,26 +2539,6 @@ impl AssistantContext {
        Some(user_message)
    }

-    pub fn to_xml(&self, cx: &App) -> String {
-        let mut output = String::new();
-        let buffer = self.buffer.read(cx);
-        for message in self.messages(cx) {
-            if message.status != MessageStatus::Done {
-                continue;
-            }
-
-            writeln!(&mut output, "<{}>", message.role).unwrap();
-            for chunk in buffer.text_for_range(message.offset_range) {
-                output.push_str(chunk);
-            }
-            if !output.ends_with('\n') {
-                output.push('\n');
-            }
-            writeln!(&mut output, "</{}>", message.role).unwrap();
-        }
-        output
-    }
-
    pub fn to_completion_request(
        &self,
        request_type: RequestType,
--- a/crates/assistant_context_editor/src/context_editor.rs
+++ b/crates/assistant_context_editor/src/context_editor.rs
@@ -1,5 +1,5 @@
-use agent_settings::AgentSettings;
 use anyhow::Result;
+use assistant_settings::AssistantSettings;
 use assistant_slash_command::{SlashCommand, SlashCommandOutputSection, SlashCommandWorkingSet};
 use assistant_slash_commands::{
    DefaultSlashCommand, DocsSlashCommand, DocsSlashCommandArgs, FileSlashCommand,
@@ -43,8 +43,8 @@ use language_model_selector::{
 };
 use multi_buffer::MultiBufferRow;
 use picker::Picker;
+use project::lsp_store::LocalLspAdapterDelegate;
 use project::{Project, Worktree};
-use project::{ProjectPath, lsp_store::LocalLspAdapterDelegate};
 use rope::Point;
 use serde::{Deserialize, Serialize};
 use settings::{Settings, SettingsStore, update_settings_file};
@@ -100,7 +100,7 @@ actions!(

 #[derive(PartialEq, Clone)]
 pub enum InsertDraggedFiles {
-    ProjectPaths(Vec<ProjectPath>),
+    ProjectPaths(Vec<PathBuf>),
    ExternalFiles(Vec<PathBuf>),
 }

@@ -258,7 +258,7 @@ impl ContextEditor {

            let show_edit_predictions = all_language_settings(None, cx)
                .edit_predictions
-                .enabled_in_text_threads;
+                .enabled_in_assistant;

            editor.set_show_edit_predictions(Some(show_edit_predictions), window, cx);

@@ -303,7 +303,7 @@ impl ContextEditor {
                LanguageModelSelector::new(
                    |cx| LanguageModelRegistry::read_global(cx).default_model(),
                    move |model, cx| {
-                        update_settings_file::<AgentSettings>(
+                        update_settings_file::<AssistantSettings>(
                            fs.clone(),
                            cx,
                            move |settings, _| settings.set_model(model.clone()),
@@ -333,7 +333,7 @@ impl ContextEditor {
        self.editor.update(cx, |editor, cx| {
            let show_edit_predictions = all_language_settings(None, cx)
                .edit_predictions
-                .enabled_in_text_threads;
+                .enabled_in_assistant;

            editor.set_show_edit_predictions(Some(show_edit_predictions), window, cx);
        });
@@ -1406,7 +1406,7 @@ impl ContextEditor {
                                None,
                            ),
                            Role::Assistant => {
-                                let base_label = Label::new("Agent").color(Color::Info);
+                                let base_label = Label::new("Assistant").color(Color::Info);
                                let mut spinner = None;
                                let mut note = None;
                                let animated_label = if llm_loading {
@@ -1468,7 +1468,7 @@ impl ContextEditor {
                                        Tooltip::with_meta(
                                            "Toggle message role",
                                            None,
-                                            "Available roles: You (User), Agent, System",
+                                            "Available roles: You (User), Assistant, System",
                                            window,
                                            cx,
                                        )
@@ -1725,7 +1725,7 @@ impl ContextEditor {
        );
    }

-    pub fn handle_insert_dragged_files(
+    pub fn insert_dragged_files(
        workspace: &mut Workspace,
        action: &InsertDraggedFiles,
        window: &mut Window,
@@ -1740,7 +1740,7 @@ impl ContextEditor {
            return;
        };

-        let project = context_editor_view.read(cx).project.clone();
+        let project = workspace.project().clone();

        let paths = match action {
            InsertDraggedFiles::ProjectPaths(paths) => Task::ready((paths.clone(), vec![])),
@@ -1751,17 +1751,22 @@ impl ContextEditor {
                    .map(|path| Workspace::project_path_for_path(project.clone(), &path, false, cx))
                    .collect::<Vec<_>>();

-                cx.background_spawn(async move {
+                cx.spawn(async move |_, cx| {
                    let mut paths = vec![];
                    let mut worktrees = vec![];

                    let opened_paths = futures::future::join_all(tasks).await;
+                    for (worktree, project_path) in opened_paths.into_iter().flatten() {
+                        let Ok(worktree_root_name) =
+                            worktree.read_with(cx, |worktree, _| worktree.root_name().to_string())
+                        else {
+                            continue;
+                        };

-                    for entry in opened_paths {
-                        if let Some((worktree, project_path)) = entry.log_err() {
-                            worktrees.push(worktree);
-                            paths.push(project_path);
-                        }
+                        let mut full_path = PathBuf::from(worktree_root_name.clone());
+                        full_path.push(&project_path.path);
+                        paths.push(full_path);
+                        worktrees.push(worktree);
                    }

                    (paths, worktrees)
@@ -1769,50 +1774,33 @@ impl ContextEditor {
            }
        };

-        context_editor_view.update(cx, |_, cx| {
-            cx.spawn_in(window, async move |this, cx| {
+        window
+            .spawn(cx, async move |cx| {
                let (paths, dragged_file_worktrees) = paths.await;
-                this.update_in(cx, |this, window, cx| {
-                    this.insert_dragged_files(paths, dragged_file_worktrees, window, cx);
-                })
-                .ok();
+                let cmd_name = FileSlashCommand.name();
+
+                context_editor_view
+                    .update_in(cx, |context_editor, window, cx| {
+                        let file_argument = paths
+                            .into_iter()
+                            .map(|path| path.to_string_lossy().to_string())
+                            .collect::<Vec<_>>()
+                            .join(" ");
+
+                        context_editor.editor.update(cx, |editor, cx| {
+                            editor.insert("\n", window, cx);
+                            editor.insert(&format!("/{} {}", cmd_name, file_argument), window, cx);
+                        });
+
+                        context_editor.confirm_command(&ConfirmCommand, window, cx);
+
+                        context_editor
+                            .dragged_file_worktrees
+                            .extend(dragged_file_worktrees);
+                    })
+                    .log_err();
            })
            .detach();
-        })
-    }
-
-    pub fn insert_dragged_files(
-        &mut self,
-        opened_paths: Vec<ProjectPath>,
-        added_worktrees: Vec<Entity<Worktree>>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let mut file_slash_command_args = vec![];
-        for project_path in opened_paths.into_iter() {
-            let Some(worktree) = self
-                .project
-                .read(cx)
-                .worktree_for_id(project_path.worktree_id, cx)
-            else {
-                continue;
-            };
-            let worktree_root_name = worktree.read(cx).root_name().to_string();
-            let mut full_path = PathBuf::from(worktree_root_name.clone());
-            full_path.push(&project_path.path);
-            file_slash_command_args.push(full_path.to_string_lossy().to_string());
-        }
-
-        let cmd_name = FileSlashCommand.name();
-
-        let file_argument = file_slash_command_args.join(" ");
-
-        self.editor.update(cx, |editor, cx| {
-            editor.insert("\n", window, cx);
-            editor.insert(&format!("/{} {}", cmd_name, file_argument), window, cx);
-        });
-        self.confirm_command(&ConfirmCommand, window, cx);
-        self.dragged_file_worktrees.extend(added_worktrees);
    }

    pub fn quote_selection(
@@ -2462,7 +2450,7 @@ impl ContextEditor {
            })
            .layer(ElevationIndex::ModalSurface)
            .child(Label::new(
-                if AgentSettings::get_global(cx).are_live_diffs_enabled(cx) {
+                if AssistantSettings::get_global(cx).are_live_diffs_enabled(cx) {
                    "Chat"
                } else {
                    "Send"
@@ -3149,7 +3137,7 @@ impl Render for ContextEditor {
                                .w_full()
                                .justify_end()
                                .when(
-                                    AgentSettings::get_global(cx).are_live_diffs_enabled(cx),
+                                    AssistantSettings::get_global(cx).are_live_diffs_enabled(cx),
                                    |buttons| {
                                        buttons
                                            .items_center()
--- a/crates/assistant_context_editor/src/context_store.rs
+++ b/crates/assistant_context_editor/src/context_store.rs
@@ -7,17 +7,15 @@ use assistant_slash_command::{SlashCommandId, SlashCommandWorkingSet};
 use client::{Client, TypedEnvelope, proto, telemetry::Telemetry};
 use clock::ReplicaId;
 use collections::HashMap;
-use context_server::ContextServerId;
+use context_server::ContextServerDescriptorRegistry;
+use context_server::manager::{ContextServerManager, ContextServerStatus};
 use fs::{Fs, RemoveOptions};
 use futures::StreamExt;
 use fuzzy::StringMatchCandidate;
 use gpui::{App, AppContext as _, AsyncApp, Context, Entity, EventEmitter, Task, WeakEntity};
 use language::LanguageRegistry;
 use paths::contexts_dir;
-use project::{
-    Project,
-    context_server_store::{ContextServerStatus, ContextServerStore},
-};
+use project::Project;
 use prompt_store::PromptBuilder;
 use regex::Regex;
 use rpc::AnyProtoClient;
@@ -42,7 +40,8 @@ pub struct RemoteContextMetadata {
 pub struct ContextStore {
    contexts: Vec<ContextHandle>,
    contexts_metadata: Vec<SavedContextMetadata>,
-    context_server_slash_command_ids: HashMap<ContextServerId, Vec<SlashCommandId>>,
+    context_server_manager: Entity<ContextServerManager>,
+    context_server_slash_command_ids: HashMap<Arc<str>, Vec<SlashCommandId>>,
    host_contexts: Vec<RemoteContextMetadata>,
    fs: Arc<dyn Fs>,
    languages: Arc<LanguageRegistry>,
@@ -99,9 +98,15 @@ impl ContextStore {
            let (mut events, _) = fs.watch(contexts_dir(), CONTEXT_WATCH_DURATION).await;

            let this = cx.new(|cx: &mut Context<Self>| {
+                let context_server_factory_registry =
+                    ContextServerDescriptorRegistry::default_global(cx);
+                let context_server_manager = cx.new(|cx| {
+                    ContextServerManager::new(context_server_factory_registry, project.clone(), cx)
+                });
                let mut this = Self {
                    contexts: Vec::new(),
                    contexts_metadata: Vec::new(),
+                    context_server_manager,
                    context_server_slash_command_ids: HashMap::default(),
                    host_contexts: Vec::new(),
                    fs,
@@ -339,11 +344,7 @@ impl ContextStore {
        }
    }

-    pub fn unordered_contexts(&self) -> impl Iterator<Item = &SavedContextMetadata> {
-        self.contexts_metadata.iter()
-    }
-
-    pub fn reverse_chronological_contexts(&self) -> Vec<SavedContextMetadata> {
+    pub fn contexts(&self) -> Vec<SavedContextMetadata> {
        let mut contexts = self.contexts_metadata.iter().cloned().collect::<Vec<_>>();
        contexts.sort_unstable_by_key(|thread| std::cmp::Reverse(thread.mtime));
        contexts
@@ -801,9 +802,22 @@ impl ContextStore {
        })
    }

+    pub fn restart_context_servers(&mut self, cx: &mut Context<Self>) {
+        cx.update_entity(
+            &self.context_server_manager,
+            |context_server_manager, cx| {
+                for server in context_server_manager.running_servers() {
+                    context_server_manager
+                        .restart_server(&server.id(), cx)
+                        .detach_and_log_err(cx);
+                }
+            },
+        );
+    }
+
    fn register_context_server_handlers(&self, cx: &mut Context<Self>) {
        cx.subscribe(
-            &self.project.read(cx).context_server_store(),
+            &self.context_server_manager.clone(),
            Self::handle_context_server_event,
        )
        .detach();
@@ -811,18 +825,16 @@ impl ContextStore {

    fn handle_context_server_event(
        &mut self,
-        context_server_manager: Entity<ContextServerStore>,
-        event: &project::context_server_store::Event,
+        context_server_manager: Entity<ContextServerManager>,
+        event: &context_server::manager::Event,
        cx: &mut Context<Self>,
    ) {
        let slash_command_working_set = self.slash_commands.clone();
        match event {
-            project::context_server_store::Event::ServerStatusChanged { server_id, status } => {
+            context_server::manager::Event::ServerStatusChanged { server_id, status } => {
                match status {
-                    ContextServerStatus::Running => {
-                        if let Some(server) = context_server_manager
-                            .read(cx)
-                            .get_running_server(server_id)
+                    Some(ContextServerStatus::Running) => {
+                        if let Some(server) = context_server_manager.read(cx).get_server(server_id)
                        {
                            let context_server_manager = context_server_manager.clone();
                            cx.spawn({
@@ -846,7 +858,7 @@ impl ContextStore {
                                                    slash_command_working_set.insert(Arc::new(
                                                        assistant_slash_commands::ContextServerSlashCommand::new(
                                                            context_server_manager.clone(),
-                                                            server.id(),
+                                                            &server,
                                                            prompt,
                                                        ),
                                                    ))
@@ -865,7 +877,7 @@ impl ContextStore {
                            .detach();
                        }
                    }
-                    ContextServerStatus::Stopped | ContextServerStatus::Error(_) => {
+                    None => {
                        if let Some(slash_command_ids) =
                            self.context_server_slash_command_ids.remove(server_id)
                        {
--- a/crates/assistant_settings/Cargo.toml
+++ b/crates/assistant_settings/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "agent_settings"
+name = "assistant_settings"
 version = "0.1.0"
 edition.workspace = true
 publish.workspace = true
@@ -9,7 +9,7 @@ license = "GPL-3.0-or-later"
 workspace = true

 [lib]
-path = "src/agent_settings.rs"
+path = "src/assistant_settings.rs"

 [dependencies]
 anthropic = { workspace = true, features = ["schemars"] }
@@ -33,5 +33,4 @@ fs.workspace = true
 gpui = { workspace = true, features = ["test-support"] }
 paths.workspace = true
 serde_json_lenient.workspace = true
-serde_json.workspace = true
 settings = { workspace = true, features = ["test-support"] }
--- a/crates/assistant_settings/LICENSE-GPL
+++ b/crates/assistant_settings/LICENSE-GPL
--- a/crates/assistant_settings/src/agent_profile.rs
+++ b/crates/assistant_settings/src/agent_profile.rs
@@ -10,10 +10,10 @@ pub mod builtin_profiles {

    pub const WRITE: &str = "write";
    pub const ASK: &str = "ask";
-    pub const MINIMAL: &str = "minimal";
+    pub const MANUAL: &str = "manual";

    pub fn is_builtin(profile_id: &AgentProfileId) -> bool {
-        profile_id.as_str() == WRITE || profile_id.as_str() == ASK || profile_id.as_str() == MINIMAL
+        profile_id.as_str() == WRITE || profile_id.as_str() == ASK || profile_id.as_str() == MANUAL
    }
 }

@@ -24,7 +24,7 @@ pub struct GroupedAgentProfiles {
 }

 impl GroupedAgentProfiles {
-    pub fn from_settings(settings: &crate::AgentSettings) -> Self {
+    pub fn from_settings(settings: &crate::AssistantSettings) -> Self {
        let mut builtin = IndexMap::default();
        let mut custom = IndexMap::default();

--- a/crates/assistant_settings/src/assistant_settings.rs
+++ b/crates/assistant_settings/src/assistant_settings.rs
@@ -6,7 +6,7 @@ use ::open_ai::Model as OpenAiModel;
 use anthropic::Model as AnthropicModel;
 use anyhow::{Result, bail};
 use deepseek::Model as DeepseekModel;
-use feature_flags::{AgentStreamEditsFeatureFlag, Assistant2FeatureFlag, FeatureFlagAppExt};
+use feature_flags::{Assistant2FeatureFlag, FeatureFlagAppExt};
 use gpui::{App, Pixels};
 use indexmap::IndexMap;
 use language_model::{CloudModel, LanguageModel};
@@ -20,7 +20,7 @@ pub use crate::agent_profile::*;

 #[derive(Copy, Clone, Default, Debug, Serialize, Deserialize, JsonSchema)]
 #[serde(rename_all = "snake_case")]
-pub enum AgentDockPosition {
+pub enum AssistantDockPosition {
    Left,
    #[default]
    Right,
@@ -70,10 +70,10 @@ pub enum AssistantProviderContentV1 {
 }

 #[derive(Default, Clone, Debug)]
-pub struct AgentSettings {
+pub struct AssistantSettings {
    pub enabled: bool,
    pub button: bool,
-    pub dock: AgentDockPosition,
+    pub dock: AssistantDockPosition,
    pub default_width: Pixels,
    pub default_height: Pixels,
    pub default_model: LanguageModelSelection,
@@ -91,11 +91,7 @@ pub struct AgentSettings {
    pub single_file_review: bool,
 }

-impl AgentSettings {
-    pub fn stream_edits(&self, cx: &App) -> bool {
-        cx.has_flag::<AgentStreamEditsFeatureFlag>() || self.stream_edits
-    }
-
+impl AssistantSettings {
    pub fn are_live_diffs_enabled(&self, cx: &App) -> bool {
        if cx.has_flag::<Assistant2FeatureFlag>() {
            return false;
@@ -119,54 +115,56 @@ impl AgentSettings {

 /// Assistant panel settings
 #[derive(Clone, Serialize, Deserialize, Debug, Default)]
-pub struct AgentSettingsContent {
+pub struct AssistantSettingsContent {
    #[serde(flatten)]
-    pub inner: Option<AgentSettingsContentInner>,
+    pub inner: Option<AssistantSettingsContentInner>,
 }

 #[derive(Clone, Serialize, Deserialize, Debug)]
 #[serde(untagged)]
-pub enum AgentSettingsContentInner {
-    Versioned(Box<VersionedAgentSettingsContent>),
+pub enum AssistantSettingsContentInner {
+    Versioned(Box<VersionedAssistantSettingsContent>),
    Legacy(LegacyAssistantSettingsContent),
 }

-impl AgentSettingsContentInner {
-    fn for_v2(content: AgentSettingsContentV2) -> Self {
-        AgentSettingsContentInner::Versioned(Box::new(VersionedAgentSettingsContent::V2(content)))
+impl AssistantSettingsContentInner {
+    fn for_v2(content: AssistantSettingsContentV2) -> Self {
+        AssistantSettingsContentInner::Versioned(Box::new(VersionedAssistantSettingsContent::V2(
+            content,
+        )))
    }
 }

-impl JsonSchema for AgentSettingsContent {
+impl JsonSchema for AssistantSettingsContent {
    fn schema_name() -> String {
-        VersionedAgentSettingsContent::schema_name()
+        VersionedAssistantSettingsContent::schema_name()
    }

    fn json_schema(r#gen: &mut schemars::r#gen::SchemaGenerator) -> Schema {
-        VersionedAgentSettingsContent::json_schema(r#gen)
+        VersionedAssistantSettingsContent::json_schema(r#gen)
    }

    fn is_referenceable() -> bool {
-        VersionedAgentSettingsContent::is_referenceable()
+        VersionedAssistantSettingsContent::is_referenceable()
    }
 }

-impl AgentSettingsContent {
+impl AssistantSettingsContent {
    pub fn is_version_outdated(&self) -> bool {
        match &self.inner {
-            Some(AgentSettingsContentInner::Versioned(settings)) => match **settings {
-                VersionedAgentSettingsContent::V1(_) => true,
-                VersionedAgentSettingsContent::V2(_) => false,
+            Some(AssistantSettingsContentInner::Versioned(settings)) => match **settings {
+                VersionedAssistantSettingsContent::V1(_) => true,
+                VersionedAssistantSettingsContent::V2(_) => false,
            },
-            Some(AgentSettingsContentInner::Legacy(_)) => true,
+            Some(AssistantSettingsContentInner::Legacy(_)) => true,
            None => false,
        }
    }

-    fn upgrade(&self) -> AgentSettingsContentV2 {
+    fn upgrade(&self) -> AssistantSettingsContentV2 {
        match &self.inner {
-            Some(AgentSettingsContentInner::Versioned(settings)) => match **settings {
-                VersionedAgentSettingsContent::V1(ref settings) => AgentSettingsContentV2 {
+            Some(AssistantSettingsContentInner::Versioned(settings)) => match **settings {
+                VersionedAssistantSettingsContent::V1(ref settings) => AssistantSettingsContentV2 {
                    enabled: settings.enabled,
                    button: settings.button,
                    dock: settings.dock,
@@ -225,9 +223,9 @@ impl AgentSettingsContent {
                    stream_edits: None,
                    single_file_review: None,
                },
-                VersionedAgentSettingsContent::V2(ref settings) => settings.clone(),
+                VersionedAssistantSettingsContent::V2(ref settings) => settings.clone(),
            },
-            Some(AgentSettingsContentInner::Legacy(settings)) => AgentSettingsContentV2 {
+            Some(AssistantSettingsContentInner::Legacy(settings)) => AssistantSettingsContentV2 {
                enabled: None,
                button: settings.button,
                dock: settings.dock,
@@ -254,28 +252,30 @@ impl AgentSettingsContent {
                stream_edits: None,
                single_file_review: None,
            },
-            None => AgentSettingsContentV2::default(),
+            None => AssistantSettingsContentV2::default(),
        }
    }

-    pub fn set_dock(&mut self, dock: AgentDockPosition) {
+    pub fn set_dock(&mut self, dock: AssistantDockPosition) {
        match &mut self.inner {
-            Some(AgentSettingsContentInner::Versioned(settings)) => match **settings {
-                VersionedAgentSettingsContent::V1(ref mut settings) => {
+            Some(AssistantSettingsContentInner::Versioned(settings)) => match **settings {
+                VersionedAssistantSettingsContent::V1(ref mut settings) => {
                    settings.dock = Some(dock);
                }
-                VersionedAgentSettingsContent::V2(ref mut settings) => {
+                VersionedAssistantSettingsContent::V2(ref mut settings) => {
                    settings.dock = Some(dock);
                }
            },
-            Some(AgentSettingsContentInner::Legacy(settings)) => {
+            Some(AssistantSettingsContentInner::Legacy(settings)) => {
                settings.dock = Some(dock);
            }
            None => {
-                self.inner = Some(AgentSettingsContentInner::for_v2(AgentSettingsContentV2 {
-                    dock: Some(dock),
-                    ..Default::default()
-                }))
+                self.inner = Some(AssistantSettingsContentInner::for_v2(
+                    AssistantSettingsContentV2 {
+                        dock: Some(dock),
+                        ..Default::default()
+                    },
+                ))
            }
        }
    }
@@ -285,95 +285,94 @@ impl AgentSettingsContent {
        let provider = language_model.provider_id().0.to_string();

        match &mut self.inner {
-            Some(AgentSettingsContentInner::Versioned(settings)) => match **settings {
-                VersionedAgentSettingsContent::V1(ref mut settings) => match provider.as_ref() {
-                    "zed.dev" => {
-                        log::warn!("attempted to set zed.dev model on outdated settings");
-                    }
-                    "anthropic" => {
-                        let api_url = match &settings.provider {
-                            Some(AssistantProviderContentV1::Anthropic { api_url, .. }) => {
-                                api_url.clone()
-                            }
-                            _ => None,
-                        };
-                        settings.provider = Some(AssistantProviderContentV1::Anthropic {
-                            default_model: AnthropicModel::from_id(&model).ok(),
-                            api_url,
-                        });
-                    }
-                    "ollama" => {
-                        let api_url = match &settings.provider {
-                            Some(AssistantProviderContentV1::Ollama { api_url, .. }) => {
-                                api_url.clone()
-                            }
-                            _ => None,
-                        };
-                        settings.provider = Some(AssistantProviderContentV1::Ollama {
-                            default_model: Some(ollama::Model::new(
-                                &model,
-                                None,
-                                None,
-                                language_model.supports_tools(),
-                            )),
-                            api_url,
-                        });
-                    }
-                    "lmstudio" => {
-                        let api_url = match &settings.provider {
-                            Some(AssistantProviderContentV1::LmStudio { api_url, .. }) => {
-                                api_url.clone()
-                            }
-                            _ => None,
-                        };
-                        settings.provider = Some(AssistantProviderContentV1::LmStudio {
-                            default_model: Some(lmstudio::Model::new(&model, None, None)),
-                            api_url,
-                        });
-                    }
-                    "openai" => {
-                        let (api_url, available_models) = match &settings.provider {
-                            Some(AssistantProviderContentV1::OpenAi {
+            Some(AssistantSettingsContentInner::Versioned(settings)) => match **settings {
+                VersionedAssistantSettingsContent::V1(ref mut settings) => {
+                    match provider.as_ref() {
+                        "zed.dev" => {
+                            log::warn!("attempted to set zed.dev model on outdated settings");
+                        }
+                        "anthropic" => {
+                            let api_url = match &settings.provider {
+                                Some(AssistantProviderContentV1::Anthropic { api_url, .. }) => {
+                                    api_url.clone()
+                                }
+                                _ => None,
+                            };
+                            settings.provider = Some(AssistantProviderContentV1::Anthropic {
+                                default_model: AnthropicModel::from_id(&model).ok(),
+                                api_url,
+                            });
+                        }
+                        "ollama" => {
+                            let api_url = match &settings.provider {
+                                Some(AssistantProviderContentV1::Ollama { api_url, .. }) => {
+                                    api_url.clone()
+                                }
+                                _ => None,
+                            };
+                            settings.provider = Some(AssistantProviderContentV1::Ollama {
+                                default_model: Some(ollama::Model::new(&model, None, None)),
+                                api_url,
+                            });
+                        }
+                        "lmstudio" => {
+                            let api_url = match &settings.provider {
+                                Some(AssistantProviderContentV1::LmStudio { api_url, .. }) => {
+                                    api_url.clone()
+                                }
+                                _ => None,
+                            };
+                            settings.provider = Some(AssistantProviderContentV1::LmStudio {
+                                default_model: Some(lmstudio::Model::new(&model, None, None)),
+                                api_url,
+                            });
+                        }
+                        "openai" => {
+                            let (api_url, available_models) = match &settings.provider {
+                                Some(AssistantProviderContentV1::OpenAi {
+                                    api_url,
+                                    available_models,
+                                    ..
+                                }) => (api_url.clone(), available_models.clone()),
+                                _ => (None, None),
+                            };
+                            settings.provider = Some(AssistantProviderContentV1::OpenAi {
+                                default_model: OpenAiModel::from_id(&model).ok(),
                                api_url,
                                available_models,
-                                ..
-                            }) => (api_url.clone(), available_models.clone()),
-                            _ => (None, None),
-                        };
-                        settings.provider = Some(AssistantProviderContentV1::OpenAi {
-                            default_model: OpenAiModel::from_id(&model).ok(),
-                            api_url,
-                            available_models,
-                        });
+                            });
+                        }
+                        "deepseek" => {
+                            let api_url = match &settings.provider {
+                                Some(AssistantProviderContentV1::DeepSeek { api_url, .. }) => {
+                                    api_url.clone()
+                                }
+                                _ => None,
+                            };
+                            settings.provider = Some(AssistantProviderContentV1::DeepSeek {
+                                default_model: DeepseekModel::from_id(&model).ok(),
+                                api_url,
+                            });
+                        }
+                        _ => {}
                    }
-                    "deepseek" => {
-                        let api_url = match &settings.provider {
-                            Some(AssistantProviderContentV1::DeepSeek { api_url, .. }) => {
-                                api_url.clone()
-                            }
-                            _ => None,
-                        };
-                        settings.provider = Some(AssistantProviderContentV1::DeepSeek {
-                            default_model: DeepseekModel::from_id(&model).ok(),
-                            api_url,
-                        });
-                    }
-                    _ => {}
-                },
-                VersionedAgentSettingsContent::V2(ref mut settings) => {
+                }
+                VersionedAssistantSettingsContent::V2(ref mut settings) => {
                    settings.default_model = Some(LanguageModelSelection { provider, model });
                }
            },
-            Some(AgentSettingsContentInner::Legacy(settings)) => {
+            Some(AssistantSettingsContentInner::Legacy(settings)) => {
                if let Ok(model) = OpenAiModel::from_id(&language_model.id().0) {
                    settings.default_open_ai_model = Some(model);
                }
            }
            None => {
-                self.inner = Some(AgentSettingsContentInner::for_v2(AgentSettingsContentV2 {
-                    default_model: Some(LanguageModelSelection { provider, model }),
-                    ..Default::default()
-                }));
+                self.inner = Some(AssistantSettingsContentInner::for_v2(
+                    AssistantSettingsContentV2 {
+                        default_model: Some(LanguageModelSelection { provider, model }),
+                        ..Default::default()
+                    },
+                ));
            }
        }
    }
@@ -396,15 +395,15 @@ impl AgentSettingsContent {

    pub fn v2_setting(
        &mut self,
-        f: impl FnOnce(&mut AgentSettingsContentV2) -> anyhow::Result<()>,
+        f: impl FnOnce(&mut AssistantSettingsContentV2) -> anyhow::Result<()>,
    ) -> anyhow::Result<()> {
        match self.inner.get_or_insert_with(|| {
-            AgentSettingsContentInner::for_v2(AgentSettingsContentV2 {
+            AssistantSettingsContentInner::for_v2(AssistantSettingsContentV2 {
                ..Default::default()
            })
        }) {
-            AgentSettingsContentInner::Versioned(boxed) => {
-                if let VersionedAgentSettingsContent::V2(ref mut settings) = **boxed {
+            AssistantSettingsContentInner::Versioned(boxed) => {
+                if let VersionedAssistantSettingsContent::V2(ref mut settings) = **boxed {
                    f(settings)
                } else {
                    Ok(())
@@ -485,16 +484,16 @@ impl AgentSettingsContent {

 #[derive(Clone, Serialize, Deserialize, JsonSchema, Debug)]
 #[serde(tag = "version")]
-pub enum VersionedAgentSettingsContent {
+pub enum VersionedAssistantSettingsContent {
    #[serde(rename = "1")]
    V1(AssistantSettingsContentV1),
    #[serde(rename = "2")]
-    V2(AgentSettingsContentV2),
+    V2(AssistantSettingsContentV2),
 }

-impl Default for VersionedAgentSettingsContent {
+impl Default for VersionedAssistantSettingsContent {
    fn default() -> Self {
-        Self::V2(AgentSettingsContentV2 {
+        Self::V2(AssistantSettingsContentV2 {
            enabled: None,
            button: None,
            dock: None,
@@ -517,30 +516,30 @@ impl Default for VersionedAgentSettingsContent {
 }

 #[derive(Clone, Serialize, Deserialize, JsonSchema, Debug, Default)]
-pub struct AgentSettingsContentV2 {
-    /// Whether the agent is enabled.
+pub struct AssistantSettingsContentV2 {
+    /// Whether the Assistant is enabled.
    ///
    /// Default: true
    enabled: Option<bool>,
-    /// Whether to show the agent panel button in the status bar.
+    /// Whether to show the assistant panel button in the status bar.
    ///
    /// Default: true
    button: Option<bool>,
-    /// Where to dock the agent.
+    /// Where to dock the assistant.
    ///
    /// Default: right
-    dock: Option<AgentDockPosition>,
-    /// Default width in pixels when the agent is docked to the left or right.
+    dock: Option<AssistantDockPosition>,
+    /// Default width in pixels when the assistant is docked to the left or right.
    ///
    /// Default: 640
    default_width: Option<f32>,
-    /// Default height in pixels when the agent is docked to the bottom.
+    /// Default height in pixels when the assistant is docked to the bottom.
    ///
    /// Default: 320
    default_height: Option<f32>,
    /// The default model to use when creating new chats and for other features when a specific model is not specified.
    default_model: Option<LanguageModelSelection>,
-    /// Model to use for the inline agent. Defaults to default_model when not specified.
+    /// Model to use for the inline assistant. Defaults to default_model when not specified.
    inline_assistant_model: Option<LanguageModelSelection>,
    /// Model to use for generating git commit messages. Defaults to default_model when not specified.
    commit_message_model: Option<LanguageModelSelection>,
@@ -548,7 +547,7 @@ pub struct AgentSettingsContentV2 {
    thread_summary_model: Option<LanguageModelSelection>,
    /// Additional models with which to generate alternatives when performing inline assists.
    inline_alternatives: Option<Vec<LanguageModelSelection>>,
-    /// Enable experimental live diffs in the agent panel.
+    /// Enable experimental live diffs in the assistant panel.
    ///
    /// Default: false
    enable_experimental_live_diffs: Option<bool>,
@@ -640,7 +639,7 @@ pub struct AssistantSettingsContentV1 {
    /// Where to dock the assistant.
    ///
    /// Default: right
-    dock: Option<AgentDockPosition>,
+    dock: Option<AssistantDockPosition>,
    /// Default width in pixels when the assistant is docked to the left or right.
    ///
    /// Default: 640
@@ -665,7 +664,7 @@ pub struct LegacyAssistantSettingsContent {
    /// Where to dock the assistant.
    ///
    /// Default: right
-    pub dock: Option<AgentDockPosition>,
+    pub dock: Option<AssistantDockPosition>,
    /// Default width in pixels when the assistant is docked to the left or right.
    ///
    /// Default: 640
@@ -684,20 +683,18 @@ pub struct LegacyAssistantSettingsContent {
    pub openai_api_url: Option<String>,
 }

-impl Settings for AgentSettings {
-    const KEY: Option<&'static str> = Some("agent");
-
-    const FALLBACK_KEY: Option<&'static str> = Some("assistant");
+impl Settings for AssistantSettings {
+    const KEY: Option<&'static str> = Some("assistant");

    const PRESERVED_KEYS: Option<&'static [&'static str]> = Some(&["version"]);

-    type FileContent = AgentSettingsContent;
+    type FileContent = AssistantSettingsContent;

    fn load(
        sources: SettingsSources<Self::FileContent>,
        _: &mut gpui::App,
    ) -> anyhow::Result<Self> {
-        let mut settings = AgentSettings::default();
+        let mut settings = AssistantSettings::default();

        for value in sources.defaults_and_customizations() {
            if value.is_version_outdated() {
@@ -782,25 +779,28 @@ impl Settings for AgentSettings {
            .and_then(|b| b.as_bool())
        {
            match &mut current.inner {
-                Some(AgentSettingsContentInner::Versioned(versioned)) => match versioned.as_mut() {
-                    VersionedAgentSettingsContent::V1(setting) => {
-                        setting.enabled = Some(b);
-                        setting.button = Some(b);
-                    }
+                Some(AssistantSettingsContentInner::Versioned(versioned)) => {
+                    match versioned.as_mut() {
+                        VersionedAssistantSettingsContent::V1(setting) => {
+                            setting.enabled = Some(b);
+                            setting.button = Some(b);
+                        }

-                    VersionedAgentSettingsContent::V2(setting) => {
-                        setting.enabled = Some(b);
-                        setting.button = Some(b);
+                        VersionedAssistantSettingsContent::V2(setting) => {
+                            setting.enabled = Some(b);
+                            setting.button = Some(b);
+                        }
                    }
-                },
-                Some(AgentSettingsContentInner::Legacy(setting)) => setting.button = Some(b),
+                }
+                Some(AssistantSettingsContentInner::Legacy(setting)) => setting.button = Some(b),
                None => {
-                    current.inner =
-                        Some(AgentSettingsContentInner::for_v2(AgentSettingsContentV2 {
+                    current.inner = Some(AssistantSettingsContentInner::for_v2(
+                        AssistantSettingsContentV2 {
                            enabled: Some(b),
                            button: Some(b),
                            ..Default::default()
-                        }));
+                        },
+                    ));
                }
            }
        }
@@ -817,12 +817,11 @@ fn merge<T>(target: &mut T, value: Option<T>) {
 mod tests {
    use fs::Fs;
    use gpui::{ReadGlobal, TestAppContext};
-    use settings::SettingsStore;

    use super::*;

    #[gpui::test]
-    async fn test_deserialize_agent_settings_with_version(cx: &mut TestAppContext) {
+    async fn test_deserialize_assistant_settings_with_version(cx: &mut TestAppContext) {
        let fs = fs::FakeFs::new(cx.executor().clone());
        fs.create_dir(paths::settings_file().parent().unwrap())
            .await
@@ -831,13 +830,13 @@ mod tests {
        cx.update(|cx| {
            let test_settings = settings::SettingsStore::test(cx);
            cx.set_global(test_settings);
-            AgentSettings::register(cx);
+            AssistantSettings::register(cx);
        });

        cx.update(|cx| {
-            assert!(!AgentSettings::get_global(cx).using_outdated_settings_version);
+            assert!(!AssistantSettings::get_global(cx).using_outdated_settings_version);
            assert_eq!(
-                AgentSettings::get_global(cx).default_model,
+                AssistantSettings::get_global(cx).default_model,
                LanguageModelSelection {
                    provider: "zed.dev".into(),
                    model: "claude-3-7-sonnet-latest".into(),
@@ -846,32 +845,34 @@ mod tests {
        });

        cx.update(|cx| {
-            settings::SettingsStore::global(cx).update_settings_file::<AgentSettings>(
+            settings::SettingsStore::global(cx).update_settings_file::<AssistantSettings>(
                fs.clone(),
                |settings, _| {
-                    *settings = AgentSettingsContent {
-                        inner: Some(AgentSettingsContentInner::for_v2(AgentSettingsContentV2 {
-                            default_model: Some(LanguageModelSelection {
-                                provider: "test-provider".into(),
-                                model: "gpt-99".into(),
-                            }),
-                            inline_assistant_model: None,
-                            commit_message_model: None,
-                            thread_summary_model: None,
-                            inline_alternatives: None,
-                            enabled: None,
-                            button: None,
-                            dock: None,
-                            default_width: None,
-                            default_height: None,
-                            enable_experimental_live_diffs: None,
-                            default_profile: None,
-                            profiles: None,
-                            always_allow_tool_actions: None,
-                            notify_when_agent_waiting: None,
-                            stream_edits: None,
-                            single_file_review: None,
-                        })),
+                    *settings = AssistantSettingsContent {
+                        inner: Some(AssistantSettingsContentInner::for_v2(
+                            AssistantSettingsContentV2 {
+                                default_model: Some(LanguageModelSelection {
+                                    provider: "test-provider".into(),
+                                    model: "gpt-99".into(),
+                                }),
+                                inline_assistant_model: None,
+                                commit_message_model: None,
+                                thread_summary_model: None,
+                                inline_alternatives: None,
+                                enabled: None,
+                                button: None,
+                                dock: None,
+                                default_width: None,
+                                default_height: None,
+                                enable_experimental_live_diffs: None,
+                                default_profile: None,
+                                profiles: None,
+                                always_allow_tool_actions: None,
+                                notify_when_agent_waiting: None,
+                                stream_edits: None,
+                                single_file_review: None,
+                            },
+                        )),
                    }
                },
            );
@@ -883,74 +884,13 @@ mod tests {
        assert!(raw_settings_value.contains(r#""version": "2""#));

        #[derive(Debug, Deserialize)]
-        struct AgentSettingsTest {
-            agent: AgentSettingsContent,
+        struct AssistantSettingsTest {
+            assistant: AssistantSettingsContent,
        }

-        let agent_settings: AgentSettingsTest =
+        let assistant_settings: AssistantSettingsTest =
            serde_json_lenient::from_str(&raw_settings_value).unwrap();

-        assert!(!agent_settings.agent.is_version_outdated());
-    }
-
-    #[gpui::test]
-    async fn test_load_settings_from_old_key(cx: &mut TestAppContext) {
-        let fs = fs::FakeFs::new(cx.executor().clone());
-        fs.create_dir(paths::settings_file().parent().unwrap())
-            .await
-            .unwrap();
-
-        cx.update(|cx| {
-            let mut test_settings = settings::SettingsStore::test(cx);
-            let user_settings_content = r#"{
-            "assistant": {
-                "enabled": true,
-                "version": "2",
-                "default_model": {
-                  "provider": "zed.dev",
-                  "model": "gpt-99"
-                },
-            }}"#;
-            test_settings
-                .set_user_settings(user_settings_content, cx)
-                .unwrap();
-            cx.set_global(test_settings);
-            AgentSettings::register(cx);
-        });
-
-        cx.run_until_parked();
-
-        let agent_settings = cx.update(|cx| AgentSettings::get_global(cx).clone());
-        assert!(agent_settings.enabled);
-        assert!(!agent_settings.using_outdated_settings_version);
-        assert_eq!(agent_settings.default_model.model, "gpt-99");
-
-        cx.update_global::<SettingsStore, _>(|settings_store, cx| {
-            settings_store.update_user_settings::<AgentSettings>(cx, |settings| {
-                *settings = AgentSettingsContent {
-                    inner: Some(AgentSettingsContentInner::for_v2(AgentSettingsContentV2 {
-                        enabled: Some(false),
-                        default_model: Some(LanguageModelSelection {
-                            provider: "xai".to_owned(),
-                            model: "grok".to_owned(),
-                        }),
-                        ..Default::default()
-                    })),
-                };
-            });
-        });
-
-        cx.run_until_parked();
-
-        let settings = cx.update(|cx| SettingsStore::global(cx).raw_user_settings().clone());
-
-        #[derive(Debug, Deserialize)]
-        struct AgentSettingsTest {
-            assistant: AgentSettingsContent,
-            agent: Option<serde_json_lenient::Value>,
-        }
-
-        let agent_settings: AgentSettingsTest = serde_json::from_value(settings).unwrap();
-        assert!(agent_settings.agent.is_none());
+        assert!(!assistant_settings.assistant.is_version_outdated());
    }
 }
--- a/crates/assistant_slash_commands/src/context_server_command.rs
+++ b/crates/assistant_slash_commands/src/context_server_command.rs
@@ -4,10 +4,12 @@ use assistant_slash_command::{
    SlashCommandOutputSection, SlashCommandResult,
 };
 use collections::HashMap;
-use context_server::{ContextServerId, types::Prompt};
+use context_server::{
+    manager::{ContextServer, ContextServerManager},
+    types::Prompt,
+};
 use gpui::{App, Entity, Task, WeakEntity, Window};
 use language::{BufferSnapshot, CodeLabel, LspAdapterDelegate};
-use project::context_server_store::ContextServerStore;
 use std::sync::Arc;
 use std::sync::atomic::AtomicBool;
 use text::LineEnding;
@@ -17,17 +19,21 @@ use workspace::Workspace;
 use crate::create_label_for_command;

 pub struct ContextServerSlashCommand {
-    store: Entity<ContextServerStore>,
-    server_id: ContextServerId,
+    server_manager: Entity<ContextServerManager>,
+    server_id: Arc<str>,
    prompt: Prompt,
 }

 impl ContextServerSlashCommand {
-    pub fn new(store: Entity<ContextServerStore>, id: ContextServerId, prompt: Prompt) -> Self {
+    pub fn new(
+        server_manager: Entity<ContextServerManager>,
+        server: &Arc<ContextServer>,
+        prompt: Prompt,
+    ) -> Self {
        Self {
-            server_id: id,
+            server_id: server.id(),
            prompt,
-            store,
+            server_manager,
        }
    }
 }
@@ -82,7 +88,7 @@ impl SlashCommand for ContextServerSlashCommand {
        let server_id = self.server_id.clone();
        let prompt_name = self.prompt.name.clone();

-        if let Some(server) = self.store.read(cx).get_running_server(&server_id) {
+        if let Some(server) = self.server_manager.read(cx).get_server(&server_id) {
            cx.foreground_executor().spawn(async move {
                let Some(protocol) = server.client() else {
                    return Err(anyhow!("Context server not initialized"));
@@ -136,8 +142,8 @@ impl SlashCommand for ContextServerSlashCommand {
            Err(e) => return Task::ready(Err(e)),
        };

-        let store = self.store.read(cx);
-        if let Some(server) = store.get_running_server(&server_id) {
+        let manager = self.server_manager.read(cx);
+        if let Some(server) = manager.get_server(&server_id) {
            cx.foreground_executor().spawn(async move {
                let Some(protocol) = server.client() else {
                    return Err(anyhow!("Context server not initialized"));
--- a/crates/assistant_slash_commands/src/fetch_command.rs
+++ b/crates/assistant_slash_commands/src/fetch_command.rs
@@ -55,14 +55,11 @@ impl FetchSlashCommand {
        let content_type = content_type
            .to_str()
            .context("invalid Content-Type header")?;
-        let content_type = if content_type.starts_with("text/html") {
-            ContentType::Html
-        } else if content_type.starts_with("text/plain") {
-            ContentType::Plaintext
-        } else if content_type.starts_with("application/json") {
-            ContentType::Json
-        } else {
-            ContentType::Html
+        let content_type = match content_type {
+            "text/html" => ContentType::Html,
+            "text/plain" => ContentType::Plaintext,
+            "application/json" => ContentType::Json,
+            _ => ContentType::Html,
        };

        match content_type {
--- a/crates/assistant_tool/src/action_log.rs
+++ b/crates/assistant_tool/src/action_log.rs
@@ -64,20 +64,8 @@ impl ActionLog {
                let status;
                let unreviewed_changes;
                if is_created {
-                    let existing_file_content = if buffer
-                        .read(cx)
-                        .file()
-                        .map_or(false, |file| file.disk_state().exists())
-                    {
-                        Some(text_snapshot.as_rope().clone())
-                    } else {
-                        None
-                    };
-
                    base_text = Rope::default();
-                    status = TrackedBufferStatus::Created {
-                        existing_file_content,
-                    };
+                    status = TrackedBufferStatus::Created;
                    unreviewed_changes = Patch::new(vec![Edit {
                        old: 0..1,
                        new: 0..text_snapshot.max_point().row + 1,
@@ -140,7 +128,7 @@ impl ActionLog {
        };

        match tracked_buffer.status {
-            TrackedBufferStatus::Created { .. } | TrackedBufferStatus::Modified => {
+            TrackedBufferStatus::Created | TrackedBufferStatus::Modified => {
                if buffer
                    .read(cx)
                    .file()
@@ -301,7 +289,7 @@ impl ActionLog {
    pub fn will_delete_buffer(&mut self, buffer: Entity<Buffer>, cx: &mut Context<Self>) {
        let tracked_buffer = self.track_buffer_internal(buffer.clone(), false, cx);
        match tracked_buffer.status {
-            TrackedBufferStatus::Created { .. } => {
+            TrackedBufferStatus::Created => {
                self.tracked_buffers.remove(&buffer);
                cx.notify();
            }
@@ -385,35 +373,19 @@ impl ActionLog {
            return Task::ready(Ok(()));
        };

-        match &tracked_buffer.status {
-            TrackedBufferStatus::Created {
-                existing_file_content,
-            } => {
-                let task = if let Some(existing_file_content) = existing_file_content {
-                    buffer.update(cx, |buffer, cx| {
-                        buffer.start_transaction();
-                        buffer.set_text("", cx);
-                        for chunk in existing_file_content.chunks() {
-                            buffer.append(chunk, cx);
-                        }
-                        buffer.end_transaction(cx);
-                    });
-                    self.project
-                        .update(cx, |project, cx| project.save_buffer(buffer.clone(), cx))
-                } else {
-                    buffer
-                        .read(cx)
-                        .entry_id(cx)
-                        .and_then(|entry_id| {
-                            self.project
-                                .update(cx, |project, cx| project.delete_entry(entry_id, false, cx))
-                        })
-                        .unwrap_or(Task::ready(Ok(())))
-                };
-
+        match tracked_buffer.status {
+            TrackedBufferStatus::Created => {
+                let delete = buffer
+                    .read(cx)
+                    .entry_id(cx)
+                    .and_then(|entry_id| {
+                        self.project
+                            .update(cx, |project, cx| project.delete_entry(entry_id, false, cx))
+                    })
+                    .unwrap_or(Task::ready(Ok(())));
                self.tracked_buffers.remove(&buffer);
                cx.notify();
-                task
+                delete
            }
            TrackedBufferStatus::Deleted => {
                buffer.update(cx, |buffer, cx| {
@@ -647,8 +619,9 @@ enum ChangeAuthor {
    Agent,
 }

+#[derive(Copy, Clone, Eq, PartialEq)]
 enum TrackedBufferStatus {
-    Created { existing_file_content: Option<Rope> },
+    Created,
    Modified,
    Deleted,
 }
@@ -1036,64 +1009,6 @@ mod tests {
        assert_eq!(unreviewed_hunks(&action_log, cx), vec![]);
    }

-    #[gpui::test(iterations = 10)]
-    async fn test_overwriting_files(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            path!("/dir"),
-            json!({
-                "file1": "Lorem ipsum dolor"
-            }),
-        )
-        .await;
-        let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
-        let action_log = cx.new(|_| ActionLog::new(project.clone()));
-        let file_path = project
-            .read_with(cx, |project, cx| project.find_project_path("dir/file1", cx))
-            .unwrap();
-
-        let buffer = project
-            .update(cx, |project, cx| project.open_buffer(file_path, cx))
-            .await
-            .unwrap();
-        cx.update(|cx| {
-            action_log.update(cx, |log, cx| log.buffer_created(buffer.clone(), cx));
-            buffer.update(cx, |buffer, cx| buffer.set_text("sit amet consecteur", cx));
-            action_log.update(cx, |log, cx| log.buffer_edited(buffer.clone(), cx));
-        });
-        project
-            .update(cx, |project, cx| project.save_buffer(buffer.clone(), cx))
-            .await
-            .unwrap();
-        cx.run_until_parked();
-        assert_eq!(
-            unreviewed_hunks(&action_log, cx),
-            vec![(
-                buffer.clone(),
-                vec![HunkStatus {
-                    range: Point::new(0, 0)..Point::new(0, 19),
-                    diff_status: DiffHunkStatusKind::Added,
-                    old_text: "".into(),
-                }],
-            )]
-        );
-
-        action_log
-            .update(cx, |log, cx| {
-                log.reject_edits_in_ranges(buffer.clone(), vec![2..5], cx)
-            })
-            .await
-            .unwrap();
-        cx.run_until_parked();
-        assert_eq!(unreviewed_hunks(&action_log, cx), vec![]);
-        assert_eq!(
-            buffer.read_with(cx, |buffer, _cx| buffer.text()),
-            "Lorem ipsum dolor"
-        );
-    }
-
    #[gpui::test(iterations = 10)]
    async fn test_deleting_files(cx: &mut TestAppContext) {
        init_test(cx);
@@ -1175,7 +1090,7 @@ mod tests {
            .update(cx, |project, cx| project.open_buffer(file2_path, cx))
            .await
            .unwrap();
-        action_log.update(cx, |log, cx| log.buffer_created(buffer2.clone(), cx));
+        action_log.update(cx, |log, cx| log.buffer_read(buffer2.clone(), cx));
        buffer2.update(cx, |buffer, cx| buffer.set_text("IPSUM", cx));
        action_log.update(cx, |log, cx| log.buffer_edited(buffer2.clone(), cx));
        project
@@ -1190,8 +1105,8 @@ mod tests {
                buffer2.clone(),
                vec![HunkStatus {
                    range: Point::new(0, 0)..Point::new(0, 5),
-                    diff_status: DiffHunkStatusKind::Added,
-                    old_text: "".into(),
+                    diff_status: DiffHunkStatusKind::Modified,
+                    old_text: "ipsum\n".into(),
                }],
            )]
        );
--- a/crates/assistant_tools/Cargo.toml
+++ b/crates/assistant_tools/Cargo.toml
@@ -18,7 +18,7 @@ eval = []
 aho-corasick.workspace = true
 anyhow.workspace = true
 assistant_tool.workspace = true
-agent_settings.workspace = true
+assistant_settings.workspace = true
 buffer_diff.workspace = true
 chrono.workspace = true
 collections.workspace = true
@@ -35,7 +35,6 @@ indoc.workspace = true
 itertools.workspace = true
 language.workspace = true
 language_model.workspace = true
-log.workspace = true
 linkme.workspace = true
 open.workspace = true
 paths.workspace = true
@@ -57,7 +56,6 @@ theme.workspace = true
 ui.workspace = true
 util.workspace = true
 web_search.workspace = true
-which.workspace = true
 workspace-hack.workspace = true
 workspace.workspace = true
 zed_llm_client.workspace = true
--- a/crates/assistant_tools/src/assistant_tools.rs
+++ b/crates/assistant_tools/src/assistant_tools.rs
@@ -1,10 +1,8 @@
 mod copy_path_tool;
 mod create_directory_tool;
-mod create_file_tool;
 mod delete_path_tool;
 mod diagnostics_tool;
 mod edit_agent;
-mod edit_file_tool;
 mod fetch_tool;
 mod find_path_tool;
 mod grep_tool;
@@ -13,7 +11,6 @@ mod move_path_tool;
 mod now_tool;
 mod open_tool;
 mod read_file_tool;
-mod replace;
 mod schema;
 mod streaming_edit_file_tool;
 mod templates;
@@ -24,15 +21,12 @@ mod web_search_tool;

 use std::sync::Arc;

-use agent_settings::AgentSettings;
 use assistant_tool::ToolRegistry;
 use copy_path_tool::CopyPathTool;
-use feature_flags::{AgentStreamEditsFeatureFlag, FeatureFlagAppExt};
 use gpui::{App, Entity};
 use http_client::HttpClientWithUrl;
 use language_model::LanguageModelRegistry;
 use move_path_tool::MovePathTool;
-use settings::{Settings, SettingsStore};
 use web_search_tool::WebSearchTool;

 pub(crate) use templates::*;
@@ -49,8 +43,6 @@ use crate::read_file_tool::ReadFileTool;
 use crate::streaming_edit_file_tool::StreamingEditFileTool;
 use crate::thinking_tool::ThinkingTool;

-pub use create_file_tool::{CreateFileTool, CreateFileToolInput};
-pub use edit_file_tool::{EditFileTool, EditFileToolInput};
 pub use find_path_tool::FindPathToolInput;
 pub use open_tool::OpenTool;
 pub use read_file_tool::ReadFileToolInput;
@@ -61,7 +53,8 @@ pub fn init(http_client: Arc<HttpClientWithUrl>, cx: &mut App) {
    assistant_tool::init(cx);

    let registry = ToolRegistry::global(cx);
-    registry.register_tool(TerminalTool::new(cx));
+    registry.register_tool(StreamingEditFileTool);
+    registry.register_tool(TerminalTool);
    registry.register_tool(CreateDirectoryTool);
    registry.register_tool(CopyPathTool);
    registry.register_tool(DeletePathTool);
@@ -75,13 +68,6 @@ pub fn init(http_client: Arc<HttpClientWithUrl>, cx: &mut App) {
    registry.register_tool(GrepTool);
    registry.register_tool(ThinkingTool);
    registry.register_tool(FetchTool::new(http_client));
-
-    register_edit_file_tool(cx);
-    cx.observe_flag::<AgentStreamEditsFeatureFlag, _>(|_, cx| register_edit_file_tool(cx))
-        .detach();
-    cx.observe_global::<SettingsStore>(register_edit_file_tool)
-        .detach();
-
    register_web_search_tool(&LanguageModelRegistry::global(cx), cx);
    cx.subscribe(
        &LanguageModelRegistry::global(cx),
@@ -107,29 +93,16 @@ fn register_web_search_tool(registry: &Entity<LanguageModelRegistry>, cx: &mut A
    }
 }

-fn register_edit_file_tool(cx: &mut App) {
-    let registry = ToolRegistry::global(cx);
-
-    registry.unregister_tool(CreateFileTool);
-    registry.unregister_tool(EditFileTool);
-    registry.unregister_tool(StreamingEditFileTool);
-
-    if AgentSettings::get_global(cx).stream_edits(cx) {
-        registry.register_tool(StreamingEditFileTool);
-    } else {
-        registry.register_tool(CreateFileTool);
-        registry.register_tool(EditFileTool);
-    }
-}
-
 #[cfg(test)]
 mod tests {
    use super::*;
+    use assistant_settings::AssistantSettings;
    use client::Client;
    use clock::FakeSystemClock;
    use http_client::FakeHttpClient;
    use schemars::JsonSchema;
    use serde::Serialize;
+    use settings::Settings;

    #[test]
    fn test_json_schema() {
@@ -160,7 +133,7 @@ mod tests {
    #[gpui::test]
    fn test_builtin_tool_schema_compatibility(cx: &mut App) {
        settings::init(cx);
-        AgentSettings::register(cx);
+        AssistantSettings::register(cx);

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

            let (edits_tx, edits_rx) = mpsc::unbounded();
@@ -658,16 +652,14 @@ impl EditAgent {
 }

 fn fuzzy_eq(left: &str, right: &str) -> bool {
-    const THRESHOLD: f64 = 0.8;
-
    let min_levenshtein = left.len().abs_diff(right.len());
    let min_normalized_levenshtein =
-        1. - (min_levenshtein as f64 / cmp::max(left.len(), right.len()) as f64);
-    if min_normalized_levenshtein < THRESHOLD {
+        1. - (min_levenshtein as f32 / cmp::max(left.len(), right.len()) as f32);
+    if min_normalized_levenshtein < 0.8 {
        return false;
    }

-    strsim::normalized_levenshtein(left, right) >= THRESHOLD
+    strsim::normalized_levenshtein(left, right) >= 0.8
 }

 #[derive(Copy, Clone, Debug)]
@@ -748,42 +740,6 @@ mod tests {
    use unindent::Unindent;
    use util::test::{generate_marked_text, marked_text_ranges};

-    #[gpui::test(iterations = 100)]
-    async fn test_empty_old_text(cx: &mut TestAppContext, mut rng: StdRng) {
-        let agent = init_test(cx).await;
-        let buffer = cx.new(|cx| {
-            Buffer::local(
-                indoc! {"
-                    abc
-                    def
-                    ghi
-                "},
-                cx,
-            )
-        });
-        let raw_edits = simulate_llm_output(
-            indoc! {"
-                <old_text></old_text>
-                <new_text>jkl</new_text>
-                <old_text>def</old_text>
-                <new_text>DEF</new_text>
-            "},
-            &mut rng,
-            cx,
-        );
-        let (apply, _events) =
-            agent.apply_edit_chunks(buffer.clone(), raw_edits, &mut cx.to_async());
-        apply.await.unwrap();
-        pretty_assertions::assert_eq!(
-            buffer.read_with(cx, |buffer, _| buffer.snapshot().text()),
-            indoc! {"
-                abc
-                DEF
-                ghi
-            "}
-        );
-    }
-
    #[gpui::test(iterations = 100)]
    async fn test_indentation(cx: &mut TestAppContext, mut rng: StdRng) {
        let agent = init_test(cx).await;
--- a/crates/assistant_tools/src/edit_agent/evals.rs
+++ b/crates/assistant_tools/src/edit_agent/evals.rs
@@ -267,7 +267,7 @@ fn eval_disable_cursor_blinking() {
    let output_file_content = include_str!("evals/fixtures/disable_cursor_blinking/after.rs");
    let edit_description = "Comment out the call to `BlinkManager::enable`";
    eval(
-        200,
+        100,
        0.6, // TODO: make this eval better
        EvalInput {
            conversation: vec![
@@ -623,230 +623,6 @@ fn eval_zode() {
    );
 }

-#[test]
-#[cfg_attr(not(feature = "eval"), ignore)]
-fn eval_add_overwrite_test() {
-    let input_file_path = "root/action_log.rs";
-    let input_file_content = include_str!("evals/fixtures/add_overwrite_test/before.rs");
-    let edit_description = "Add a new test for overwriting a file in action_log.rs";
-    eval(
-        200,
-        0.5, // TODO: make this eval better
-        EvalInput {
-            conversation: vec![
-                message(
-                    User,
-                    [text(indoc! {"
-                        Introduce a new test in `action_log.rs` to test overwriting a file.
-                        That is, a file already exists, but we call `buffer_created` as if the file were new.
-                        Take inspiration from all the other tests in the file.
-                    "})],
-                ),
-                message(
-                    Assistant,
-                    [tool_use(
-                        "tool_1",
-                        "read_file",
-                        ReadFileToolInput {
-                            path: input_file_path.into(),
-                            start_line: None,
-                            end_line: None,
-                        },
-                    )],
-                ),
-                message(
-                    User,
-                    [tool_result(
-                        "tool_1",
-                        "read_file",
-                        indoc! {"
-                            pub struct ActionLog [L13-20]
-                             tracked_buffers [L15]
-                             edited_since_project_diagnostics_check [L17]
-                             project [L19]
-                            impl ActionLog [L22-498]
-                             pub fn new [L24-30]
-                             pub fn project [L32-34]
-                             pub fn checked_project_diagnostics [L37-39]
-                             pub fn has_edited_files_since_project_diagnostics_check [L42-44]
-                             fn track_buffer_internal [L46-101]
-                             fn handle_buffer_event [L103-116]
-                             fn handle_buffer_edited [L118-123]
-                             fn handle_buffer_file_changed [L125-158]
-                             async fn maintain_diff [L160-264]
-                             pub fn buffer_read [L267-269]
-                             pub fn buffer_created [L272-276]
-                             pub fn buffer_edited [L279-287]
-                             pub fn will_delete_buffer [L289-304]
-                             pub fn keep_edits_in_range [L306-364]
-                             pub fn reject_edits_in_ranges [L366-459]
-                             pub fn keep_all_edits [L461-473]
-                             pub fn changed_buffers [L476-482]
-                             pub fn stale_buffers [L485-497]
-                            fn apply_non_conflicting_edits [L500-561]
-                            fn diff_snapshots [L563-585]
-                            fn point_to_row_edit [L587-614]
-                            enum ChangeAuthor [L617-620]
-                             User [L618]
-                             Agent [L619]
-                            enum TrackedBufferStatus [L623-627]
-                             Created [L624]
-                             Modified [L625]
-                             Deleted [L626]
-                            struct TrackedBuffer [L629-641]
-                             buffer [L630]
-                             base_text [L631]
-                             unreviewed_changes [L632]
-                             status [L633]
-                             version [L634]
-                             diff [L635]
-                             snapshot [L636]
-                             diff_update [L637]
-                             _open_lsp_handle [L638]
-                             _maintain_diff [L639]
-                             _subscription [L640]
-                            impl TrackedBuffer [L643-657]
-                             fn has_changes [L644-650]
-                             fn schedule_diff_update [L652-656]
-                            pub struct ChangedBuffer [L659-661]
-                             pub diff [L660]
-                            mod tests [L664-1574]
-                             fn init_logger [L678-682]
-                             fn init_test [L684-691]
-                             async fn test_keep_edits [L694-769]
-                             async fn test_deletions [L772-854]
-                             async fn test_overlapping_user_edits [L857-951]
-                             async fn test_creating_files [L954-1010]
-                             async fn test_deleting_files [L1013-1120]
-                             async fn test_reject_edits [L1123-1255]
-                             async fn test_reject_multiple_edits [L1258-1331]
-                             async fn test_reject_deleted_file [L1334-1388]
-                             async fn test_reject_created_file [L1391-1443]
-                             async fn test_random_diffs [L1446-1535]
-                              fn quiesce [L1510-1534]
-                             struct HunkStatus [L1538-1542]
-                              range [L1539]
-                              diff_status [L1540]
-                              old_text [L1541]
-                             fn unreviewed_hunks [L1544-1573]
-
-                            Showing symbols 1-69 (total symbols: 69)
-
-                            Using the line numbers in this outline, you can call this tool again while specifying
-                            the start_line and end_line fields to see the implementations of symbols in the outline.
-                        "},
-                    )],
-                ),
-                message(
-                    Assistant,
-                    [
-                        text(
-                            "Let's look at the existing test cases that are related to file creation to understand the pattern:",
-                        ),
-                        tool_use(
-                            "tool_2",
-                            "read_file",
-                            ReadFileToolInput {
-                                path: input_file_path.into(),
-                                start_line: Some(953),
-                                end_line: Some(1010),
-                            },
-                        ),
-                    ],
-                ),
-                message(
-                    User,
-                    [tool_result(
-                        "tool_2",
-                        "read_file",
-                        lines(input_file_content, 953..1010),
-                    )],
-                ),
-                message(
-                    Assistant,
-                    [
-                        text(
-                            "Now let's look at another relevant test to understand how they're structured:",
-                        ),
-                        tool_use(
-                            "tool_3",
-                            "read_file",
-                            ReadFileToolInput {
-                                path: input_file_path.into(),
-                                start_line: Some(1012),
-                                end_line: Some(1120),
-                            },
-                        ),
-                    ],
-                ),
-                message(
-                    User,
-                    [tool_result(
-                        "tool_3",
-                        "read_file",
-                        lines(input_file_content, 1012..1120),
-                    )],
-                ),
-                message(
-                    Assistant,
-                    [
-                        text("Now let's look at how `buffer_created` is implemented:"),
-                        tool_use(
-                            "tool_4",
-                            "read_file",
-                            ReadFileToolInput {
-                                path: input_file_path.into(),
-                                start_line: Some(271),
-                                end_line: Some(276),
-                            },
-                        ),
-                    ],
-                ),
-                message(
-                    User,
-                    [tool_result(
-                        "tool_4",
-                        "read_file",
-                        lines(input_file_content, 271..276),
-                    )],
-                ),
-                message(
-                    Assistant,
-                    [
-                        text(indoc! {"
-                            Based on my understanding of the existing tests and code, I'll now create a new test for overwriting a file. In this test, we'll:
-
-                            1. Create a file
-                            2. Open a buffer for it
-                            3. Track it in the action log
-                            4. Modify the buffer
-                            5. Call `buffer_created` again as if the file were new
-                            6. Check that the changes are properly tracked
-
-                            Let's write the test:
-                        "}),
-                        tool_use(
-                            "tool_5",
-                            "edit_file",
-                            StreamingEditFileToolInput {
-                                display_description: edit_description.into(),
-                                path: input_file_path.into(),
-                                create_or_overwrite: false,
-                            },
-                        ),
-                    ],
-                ),
-            ],
-            input_path: input_file_path.into(),
-            input_content: Some(input_file_content.into()),
-            edit_description: edit_description.into(),
-            assertion: EvalAssertion::judge_diff(
-                "A new test for overwritten files was created, without changing any previous test",
-            ),
-        },
-    );
-}
-
 fn message(
    role: Role,
    contents: impl IntoIterator<Item = MessageContent>,
@@ -1103,7 +879,7 @@ fn eval(iterations: usize, expected_pass_ratio: f32, mut eval: EvalInput) {

    let mismatched_tag_ratio =
        cumulative_parser_metrics.mismatched_tags as f32 / cumulative_parser_metrics.tags as f32;
-    if mismatched_tag_ratio > 0.05 {
+    if mismatched_tag_ratio > 0.02 {
        for eval_output in eval_outputs {
            println!("{}", eval_output);
        }
@@ -1181,7 +957,7 @@ impl EditAgentTest {

                cx.spawn(async move |cx| {
                    let agent_model =
-                        Self::load_model("anthropic", "claude-3-7-sonnet-latest", cx).await;
+                        Self::load_model("google", "gemini-2.5-pro-preview-03-25", cx).await;
                    let judge_model =
                        Self::load_model("anthropic", "claude-3-7-sonnet-latest", cx).await;
                    (agent_model.unwrap(), judge_model.unwrap())
--- a/crates/assistant_tools/src/edit_agent/evals/fixtures/add_overwrite_test/before.rs
+++ b/crates/assistant_tools/src/edit_agent/evals/fixtures/add_overwrite_test/before.rs
--- a/crates/assistant_tools/src/edit_file_tool.rs
+++ b/crates/assistant_tools/src/edit_file_tool.rs
@@ -300,6 +300,7 @@ impl Tool for EditFileTool {
    }
 }

+<<<<<<< HEAD
 pub struct EditFileToolCard {
    path: PathBuf,
    editor: Entity<Editor>,
@@ -540,6 +541,7 @@ impl ToolCard for EditFileToolCard {
            });

        let (editor, editor_line_height) = self.editor.update(cx, |editor, cx| {
+            let ui_font_size = ThemeSettings::get_global(cx).ui_font_size(cx);
            let line_height = editor
                .style()
                .map(|style| style.text.line_height_in_pixels(window.rem_size()))
@@ -557,10 +559,7 @@ impl ToolCard for EditFileToolCard {
                        font_family: settings.buffer_font.family.clone(),
                        font_features: settings.buffer_font.features.clone(),
                        font_fallbacks: settings.buffer_font.fallbacks.clone(),
-                        font_size: TextSize::Small
-                            .rems(cx)
-                            .to_pixels(settings.agent_font_size(cx))
-                            .into(),
+                        font_size: ui_font_size.into(),
                        font_weight: settings.buffer_font.weight,
                        line_height: relative(settings.buffer_line_height.value()),
                        ..Default::default()
@@ -710,6 +709,7 @@ impl ToolCard for EditFileToolCard {
                                .cursor_pointer()
                                .h_5()
                                .justify_center()
+                                .rounded_b_md()
                                .border_t_1()
                                .border_color(border_color)
                                .bg(cx.theme().colors().editor_background)
@@ -805,6 +805,519 @@ async fn build_buffer_diff(
    })
 }

+||||||| parent of 8608aee26d (Delete old create_file and edit_file tools.)
+pub struct EditFileToolCard {
+    path: PathBuf,
+    editor: Entity<Editor>,
+    multibuffer: Entity<MultiBuffer>,
+    project: Entity<Project>,
+    diff_task: Option<Task<Result<()>>>,
+    preview_expanded: bool,
+    error_expanded: bool,
+    full_height_expanded: bool,
+    total_lines: Option<u32>,
+    editor_unique_id: EntityId,
+}
+
+impl EditFileToolCard {
+    pub fn new(path: PathBuf, project: Entity<Project>, window: &mut Window, cx: &mut App) -> Self {
+        let multibuffer = cx.new(|_| MultiBuffer::without_headers(Capability::ReadOnly));
+        let editor = cx.new(|cx| {
+            let mut editor = Editor::new(
+                EditorMode::Full {
+                    scale_ui_elements_with_buffer_font_size: false,
+                    show_active_line_background: false,
+                    sized_by_content: true,
+                },
+                multibuffer.clone(),
+                Some(project.clone()),
+                window,
+                cx,
+            );
+            editor.set_show_gutter(false, cx);
+            editor.disable_inline_diagnostics();
+            editor.disable_expand_excerpt_buttons(cx);
+            editor.set_soft_wrap_mode(SoftWrap::None, cx);
+            editor.scroll_manager.set_forbid_vertical_scroll(true);
+            editor.set_show_scrollbars(false, cx);
+            editor.set_show_indent_guides(false, cx);
+            editor.set_read_only(true);
+            editor.set_show_breakpoints(false, cx);
+            editor.set_show_code_actions(false, cx);
+            editor.set_show_git_diff_gutter(false, cx);
+            editor.set_expand_all_diff_hunks(cx);
+            editor
+        });
+        Self {
+            editor_unique_id: editor.entity_id(),
+            path,
+            project,
+            editor,
+            multibuffer,
+            diff_task: None,
+            preview_expanded: true,
+            error_expanded: false,
+            full_height_expanded: false,
+            total_lines: None,
+        }
+    }
+
+    pub fn has_diff(&self) -> bool {
+        self.total_lines.is_some()
+    }
+
+    pub fn set_diff(
+        &mut self,
+        path: Arc<Path>,
+        old_text: String,
+        new_text: String,
+        cx: &mut Context<Self>,
+    ) {
+        let language_registry = self.project.read(cx).languages().clone();
+        self.diff_task = Some(cx.spawn(async move |this, cx| {
+            let buffer = build_buffer(new_text, path.clone(), &language_registry, cx).await?;
+            let buffer_diff = build_buffer_diff(old_text, &buffer, &language_registry, cx).await?;
+
+            this.update(cx, |this, cx| {
+                this.total_lines = this.multibuffer.update(cx, |multibuffer, cx| {
+                    let snapshot = buffer.read(cx).snapshot();
+                    let diff = buffer_diff.read(cx);
+                    let diff_hunk_ranges = diff
+                        .hunks_intersecting_range(Anchor::MIN..Anchor::MAX, &snapshot, cx)
+                        .map(|diff_hunk| diff_hunk.buffer_range.to_point(&snapshot))
+                        .collect::<Vec<_>>();
+                    multibuffer.clear(cx);
+                    multibuffer.set_excerpts_for_path(
+                        PathKey::for_buffer(&buffer, cx),
+                        buffer,
+                        diff_hunk_ranges,
+                        editor::DEFAULT_MULTIBUFFER_CONTEXT,
+                        cx,
+                    );
+                    multibuffer.add_diff(buffer_diff, cx);
+                    let end = multibuffer.len(cx);
+                    Some(multibuffer.snapshot(cx).offset_to_point(end).row + 1)
+                });
+
+                cx.notify();
+            })
+        }));
+    }
+}
+
+impl ToolCard for EditFileToolCard {
+    fn render(
+        &mut self,
+        status: &ToolUseStatus,
+        window: &mut Window,
+        workspace: WeakEntity<Workspace>,
+        cx: &mut Context<Self>,
+    ) -> impl IntoElement {
+        let (failed, error_message) = match status {
+            ToolUseStatus::Error(err) => (true, Some(err.to_string())),
+            _ => (false, None),
+        };
+
+        let path_label_button = h_flex()
+            .id(("edit-tool-path-label-button", self.editor_unique_id))
+            .w_full()
+            .max_w_full()
+            .px_1()
+            .gap_0p5()
+            .cursor_pointer()
+            .rounded_sm()
+            .opacity(0.8)
+            .hover(|label| {
+                label
+                    .opacity(1.)
+                    .bg(cx.theme().colors().element_hover.opacity(0.5))
+            })
+            .tooltip(Tooltip::text("Jump to File"))
+            .child(
+                h_flex()
+                    .child(
+                        Icon::new(IconName::Pencil)
+                            .size(IconSize::XSmall)
+                            .color(Color::Muted),
+                    )
+                    .child(
+                        div()
+                            .text_size(rems(0.8125))
+                            .child(self.path.display().to_string())
+                            .ml_1p5()
+                            .mr_0p5(),
+                    )
+                    .child(
+                        Icon::new(IconName::ArrowUpRight)
+                            .size(IconSize::XSmall)
+                            .color(Color::Ignored),
+                    ),
+            )
+            .on_click({
+                let path = self.path.clone();
+                let workspace = workspace.clone();
+                move |_, window, cx| {
+                    workspace
+                        .update(cx, {
+                            |workspace, cx| {
+                                let Some(project_path) =
+                                    workspace.project().read(cx).find_project_path(&path, cx)
+                                else {
+                                    return;
+                                };
+                                let open_task =
+                                    workspace.open_path(project_path, None, true, window, cx);
+                                window
+                                    .spawn(cx, async move |cx| {
+                                        let item = open_task.await?;
+                                        if let Some(active_editor) = item.downcast::<Editor>() {
+                                            active_editor
+                                                .update_in(cx, |editor, window, cx| {
+                                                    editor.go_to_singleton_buffer_point(
+                                                        language::Point::new(0, 0),
+                                                        window,
+                                                        cx,
+                                                    );
+                                                })
+                                                .log_err();
+                                        }
+                                        anyhow::Ok(())
+                                    })
+                                    .detach_and_log_err(cx);
+                            }
+                        })
+                        .ok();
+                }
+            })
+            .into_any_element();
+
+        let codeblock_header_bg = cx
+            .theme()
+            .colors()
+            .element_background
+            .blend(cx.theme().colors().editor_foreground.opacity(0.025));
+
+        let codeblock_header = h_flex()
+            .flex_none()
+            .p_1()
+            .gap_1()
+            .justify_between()
+            .rounded_t_md()
+            .when(!failed, |header| header.bg(codeblock_header_bg))
+            .child(path_label_button)
+            .when(failed, |header| {
+                header.child(
+                    h_flex()
+                        .gap_1()
+                        .child(
+                            Icon::new(IconName::Close)
+                                .size(IconSize::Small)
+                                .color(Color::Error),
+                        )
+                        .child(
+                            Disclosure::new(
+                                ("edit-file-error-disclosure", self.editor_unique_id),
+                                self.error_expanded,
+                            )
+                            .opened_icon(IconName::ChevronUp)
+                            .closed_icon(IconName::ChevronDown)
+                            .on_click(cx.listener(
+                                move |this, _event, _window, _cx| {
+                                    this.error_expanded = !this.error_expanded;
+                                },
+                            )),
+                        ),
+                )
+            })
+            .when(!failed && self.has_diff(), |header| {
+                header.child(
+                    Disclosure::new(
+                        ("edit-file-disclosure", self.editor_unique_id),
+                        self.preview_expanded,
+                    )
+                    .opened_icon(IconName::ChevronUp)
+                    .closed_icon(IconName::ChevronDown)
+                    .on_click(cx.listener(
+                        move |this, _event, _window, _cx| {
+                            this.preview_expanded = !this.preview_expanded;
+                        },
+                    )),
+                )
+            });
+
+        let (editor, editor_line_height) = self.editor.update(cx, |editor, cx| {
+            let ui_font_size = ThemeSettings::get_global(cx).ui_font_size(cx);
+
+            editor.set_text_style_refinement(TextStyleRefinement {
+                font_size: Some(ui_font_size.into()),
+                ..TextStyleRefinement::default()
+            });
+
+            let line_height = editor
+                .style()
+                .map(|style| style.text.line_height_in_pixels(window.rem_size()))
+                .unwrap_or_default();
+
+            let settings = ThemeSettings::get_global(cx);
+            let element = EditorElement::new(
+                &cx.entity(),
+                EditorStyle {
+                    background: cx.theme().colors().editor_background,
+                    horizontal_padding: rems(0.25).to_pixels(window.rem_size()),
+                    local_player: cx.theme().players().local(),
+                    text: TextStyle {
+                        color: cx.theme().colors().editor_foreground,
+                        font_family: settings.buffer_font.family.clone(),
+                        font_features: settings.buffer_font.features.clone(),
+                        font_fallbacks: settings.buffer_font.fallbacks.clone(),
+                        font_size: settings.buffer_font_size(cx).into(),
+                        font_weight: settings.buffer_font.weight,
+                        line_height: relative(settings.buffer_line_height.value()),
+                        ..Default::default()
+                    },
+                    scrollbar_width: EditorElement::SCROLLBAR_WIDTH,
+                    syntax: cx.theme().syntax().clone(),
+                    status: cx.theme().status().clone(),
+                    ..Default::default()
+                },
+            );
+
+            (element.into_any_element(), line_height)
+        });
+
+        let (full_height_icon, full_height_tooltip_label) = if self.full_height_expanded {
+            (IconName::ChevronUp, "Collapse Code Block")
+        } else {
+            (IconName::ChevronDown, "Expand Code Block")
+        };
+
+        let gradient_overlay = div()
+            .absolute()
+            .bottom_0()
+            .left_0()
+            .w_full()
+            .h_2_5()
+            .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.),
+            ));
+
+        let border_color = cx.theme().colors().border.opacity(0.6);
+
+        const DEFAULT_COLLAPSED_LINES: u32 = 10;
+        let is_collapsible = self.total_lines.unwrap_or(0) > DEFAULT_COLLAPSED_LINES;
+
+        let waiting_for_diff = {
+            let styles = [
+                ("w_4_5", (0.1, 0.85), 2000),
+                ("w_1_4", (0.2, 0.75), 2200),
+                ("w_2_4", (0.15, 0.64), 1900),
+                ("w_3_5", (0.25, 0.72), 2300),
+                ("w_2_5", (0.3, 0.56), 1800),
+            ];
+
+            let mut container = v_flex()
+                .p_3()
+                .gap_1p5()
+                .border_t_1()
+                .border_color(border_color)
+                .bg(cx.theme().colors().editor_background);
+
+            for (width_method, pulse_range, duration_ms) in styles.iter() {
+                let (min_opacity, max_opacity) = *pulse_range;
+                let placeholder = match *width_method {
+                    "w_4_5" => div().w_3_4(),
+                    "w_1_4" => div().w_1_4(),
+                    "w_2_4" => div().w_2_4(),
+                    "w_3_5" => div().w_3_5(),
+                    "w_2_5" => div().w_2_5(),
+                    _ => div().w_1_2(),
+                }
+                .id("loading_div")
+                .h_2()
+                .rounded_full()
+                .bg(cx.theme().colors().element_active)
+                .with_animation(
+                    "loading_pulsate",
+                    Animation::new(Duration::from_millis(*duration_ms))
+                        .repeat()
+                        .with_easing(pulsating_between(min_opacity, max_opacity)),
+                    |label, delta| label.opacity(delta),
+                );
+
+                container = container.child(placeholder);
+            }
+
+            container
+        };
+
+        v_flex()
+            .mb_2()
+            .border_1()
+            .when(failed, |card| card.border_dashed())
+            .border_color(border_color)
+            .rounded_lg()
+            .overflow_hidden()
+            .child(codeblock_header)
+            .when(failed && self.error_expanded, |card| {
+                card.child(
+                    v_flex()
+                        .p_2()
+                        .gap_1()
+                        .border_t_1()
+                        .border_dashed()
+                        .border_color(border_color)
+                        .bg(cx.theme().colors().editor_background)
+                        .rounded_b_md()
+                        .child(
+                            Label::new("Error")
+                                .size(LabelSize::XSmall)
+                                .color(Color::Error),
+                        )
+                        .child(
+                            div()
+                                .rounded_md()
+                                .text_ui_sm(cx)
+                                .bg(cx.theme().colors().editor_background)
+                                .children(
+                                    error_message
+                                        .map(|error| div().child(error).into_any_element()),
+                                ),
+                        ),
+                )
+            })
+            .when(!self.has_diff() && !failed, |card| {
+                card.child(waiting_for_diff)
+            })
+            .when(
+                !failed && self.preview_expanded && self.has_diff(),
+                |card| {
+                    card.child(
+                        v_flex()
+                            .relative()
+                            .h_full()
+                            .when(!self.full_height_expanded, |editor_container| {
+                                editor_container
+                                    .max_h(DEFAULT_COLLAPSED_LINES as f32 * editor_line_height)
+                            })
+                            .overflow_hidden()
+                            .border_t_1()
+                            .border_color(border_color)
+                            .bg(cx.theme().colors().editor_background)
+                            .child(editor)
+                            .when(
+                                !self.full_height_expanded && is_collapsible,
+                                |editor_container| editor_container.child(gradient_overlay),
+                            ),
+                    )
+                    .when(is_collapsible, |editor_container| {
+                        editor_container.child(
+                            h_flex()
+                                .id(("expand-button", self.editor_unique_id))
+                                .flex_none()
+                                .cursor_pointer()
+                                .h_5()
+                                .justify_center()
+                                .rounded_b_md()
+                                .border_t_1()
+                                .border_color(border_color)
+                                .bg(cx.theme().colors().editor_background)
+                                .hover(|style| {
+                                    style.bg(cx.theme().colors().element_hover.opacity(0.1))
+                                })
+                                .child(
+                                    Icon::new(full_height_icon)
+                                        .size(IconSize::Small)
+                                        .color(Color::Muted),
+                                )
+                                .tooltip(Tooltip::text(full_height_tooltip_label))
+                                .on_click(cx.listener(move |this, _event, _window, _cx| {
+                                    this.full_height_expanded = !this.full_height_expanded;
+                                })),
+                        )
+                    })
+                },
+            )
+    }
+}
+
+async fn build_buffer(
+    mut text: String,
+    path: Arc<Path>,
+    language_registry: &Arc<language::LanguageRegistry>,
+    cx: &mut AsyncApp,
+) -> Result<Entity<Buffer>> {
+    let line_ending = LineEnding::detect(&text);
+    LineEnding::normalize(&mut text);
+    let text = Rope::from(text);
+    let language = cx
+        .update(|_cx| language_registry.language_for_file_path(&path))?
+        .await
+        .ok();
+    let buffer = cx.new(|cx| {
+        let buffer = TextBuffer::new_normalized(
+            0,
+            cx.entity_id().as_non_zero_u64().into(),
+            line_ending,
+            text,
+        );
+        let mut buffer = Buffer::build(buffer, None, Capability::ReadWrite);
+        buffer.set_language(language, cx);
+        buffer
+    })?;
+    Ok(buffer)
+}
+
+async fn build_buffer_diff(
+    mut old_text: String,
+    buffer: &Entity<Buffer>,
+    language_registry: &Arc<LanguageRegistry>,
+    cx: &mut AsyncApp,
+) -> Result<Entity<BufferDiff>> {
+    LineEnding::normalize(&mut old_text);
+
+    let buffer = cx.update(|cx| buffer.read(cx).snapshot())?;
+
+    let base_buffer = cx
+        .update(|cx| {
+            Buffer::build_snapshot(
+                old_text.clone().into(),
+                buffer.language().cloned(),
+                Some(language_registry.clone()),
+                cx,
+            )
+        })?
+        .await;
+
+    let diff_snapshot = cx
+        .update(|cx| {
+            BufferDiffSnapshot::new_with_base_buffer(
+                buffer.text.clone(),
+                Some(old_text.into()),
+                base_buffer,
+                cx,
+            )
+        })?
+        .await;
+
+    let secondary_diff = cx.new(|cx| {
+        let mut diff = BufferDiff::new(&buffer, cx);
+        diff.set_snapshot(diff_snapshot.clone(), &buffer, cx);
+        diff
+    })?;
+
+    cx.new(|cx| {
+        let mut diff = BufferDiff::new(&buffer.text, cx);
+        diff.set_snapshot(diff_snapshot, &buffer, cx);
+        diff.set_secondary_diff(secondary_diff);
+        diff
+    })
+}
+
+=======
+>>>>>>> 8608aee26d (Delete old create_file and edit_file tools.)
 #[cfg(test)]
 mod tests {
    use super::*;
--- 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/replace.rs
+++ b/crates/assistant_tools/src/replace.rs
@@ -1,872 +0,0 @@
-use language::{BufferSnapshot, Diff, Point, ToOffset};
-use project::search::SearchQuery;
-use std::iter;
-use util::{ResultExt as _, paths::PathMatcher};
-
-/// Performs an exact string replacement in a buffer, requiring precise character-for-character matching.
-/// Uses the search functionality to locate the first occurrence of the exact string.
-/// Returns None if no exact match is found in the buffer.
-pub async fn replace_exact(old: &str, new: &str, snapshot: &BufferSnapshot) -> Option<Diff> {
-    let query = SearchQuery::text(
-        old,
-        false,
-        true,
-        true,
-        PathMatcher::new(iter::empty::<&str>()).ok()?,
-        PathMatcher::new(iter::empty::<&str>()).ok()?,
-        false,
-        None,
-    )
-    .log_err()?;
-
-    let matches = query.search(&snapshot, None).await;
-
-    if matches.is_empty() {
-        return None;
-    }
-
-    let edit_range = matches[0].clone();
-    let diff = language::text_diff(&old, &new);
-
-    let edits = diff
-        .into_iter()
-        .map(|(old_range, text)| {
-            let start = edit_range.start + old_range.start;
-            let end = edit_range.start + old_range.end;
-            (start..end, text)
-        })
-        .collect::<Vec<_>>();
-
-    let diff = language::Diff {
-        base_version: snapshot.version().clone(),
-        line_ending: snapshot.line_ending(),
-        edits,
-    };
-
-    Some(diff)
-}
-
-/// Performs a replacement that's indentation-aware - matches text content ignoring leading whitespace differences.
-/// When replacing, preserves the indentation level found in the buffer at each matching line.
-/// Returns None if no match found or if indentation is offset inconsistently across matched lines.
-pub fn replace_with_flexible_indent(old: &str, new: &str, buffer: &BufferSnapshot) -> Option<Diff> {
-    let (old_lines, old_min_indent) = lines_with_min_indent(old);
-    let (new_lines, new_min_indent) = lines_with_min_indent(new);
-    let min_indent = old_min_indent.min(new_min_indent);
-
-    let old_lines = drop_lines_prefix(&old_lines, min_indent);
-    let new_lines = drop_lines_prefix(&new_lines, min_indent);
-
-    let max_row = buffer.max_point().row;
-
-    'windows: for start_row in 0..max_row + 1 {
-        let end_row = start_row + old_lines.len().saturating_sub(1) as u32;
-
-        if end_row > max_row {
-            // The buffer ends before fully matching the pattern
-            return None;
-        }
-
-        let start_point = Point::new(start_row, 0);
-        let end_point = Point::new(end_row, buffer.line_len(end_row));
-        let range = start_point.to_offset(buffer)..end_point.to_offset(buffer);
-
-        let window_text = buffer.text_for_range(range.clone());
-        let mut window_lines = window_text.lines();
-        let mut old_lines_iter = old_lines.iter();
-
-        let mut common_mismatch = None;
-
-        #[derive(Eq, PartialEq)]
-        enum Mismatch {
-            OverIndented(String),
-            UnderIndented(String),
-        }
-
-        while let (Some(window_line), Some(old_line)) = (window_lines.next(), old_lines_iter.next())
-        {
-            let line_trimmed = window_line.trim_start();
-
-            if line_trimmed != old_line.trim_start() {
-                continue 'windows;
-            }
-
-            if line_trimmed.is_empty() {
-                continue;
-            }
-
-            let line_mismatch = if window_line.len() > old_line.len() {
-                let prefix = window_line[..window_line.len() - old_line.len()].to_string();
-                Mismatch::UnderIndented(prefix)
-            } else {
-                let prefix = old_line[..old_line.len() - window_line.len()].to_string();
-                Mismatch::OverIndented(prefix)
-            };
-
-            match &common_mismatch {
-                Some(common_mismatch) if common_mismatch != &line_mismatch => {
-                    continue 'windows;
-                }
-                Some(_) => (),
-                None => common_mismatch = Some(line_mismatch),
-            }
-        }
-
-        if let Some(common_mismatch) = &common_mismatch {
-            let line_ending = buffer.line_ending();
-            let replacement = new_lines
-                .iter()
-                .map(|new_line| {
-                    if new_line.trim().is_empty() {
-                        new_line.to_string()
-                    } else {
-                        match common_mismatch {
-                            Mismatch::UnderIndented(prefix) => prefix.to_string() + new_line,
-                            Mismatch::OverIndented(prefix) => new_line
-                                .strip_prefix(prefix)
-                                .unwrap_or(new_line)
-                                .to_string(),
-                        }
-                    }
-                })
-                .collect::<Vec<_>>()
-                .join(line_ending.as_str());
-
-            let diff = Diff {
-                base_version: buffer.version().clone(),
-                line_ending,
-                edits: vec![(range, replacement.into())],
-            };
-
-            return Some(diff);
-        }
-    }
-
-    None
-}
-
-fn drop_lines_prefix<'a>(lines: &'a [&str], prefix_len: usize) -> Vec<&'a str> {
-    lines
-        .iter()
-        .map(|line| line.get(prefix_len..).unwrap_or(""))
-        .collect()
-}
-
-fn lines_with_min_indent(input: &str) -> (Vec<&str>, usize) {
-    let mut lines = Vec::new();
-    let mut min_indent: Option<usize> = None;
-
-    for line in input.lines() {
-        lines.push(line);
-        if !line.trim().is_empty() {
-            let indent = line.len() - line.trim_start().len();
-            min_indent = Some(min_indent.map_or(indent, |m| m.min(indent)));
-        }
-    }
-
-    (lines, min_indent.unwrap_or(0))
-}
-
-#[cfg(test)]
-mod replace_exact_tests {
-    use super::*;
-    use gpui::TestAppContext;
-    use gpui::prelude::*;
-
-    #[gpui::test]
-    async fn basic(cx: &mut TestAppContext) {
-        let result = test_replace_exact(cx, "let x = 41;", "let x = 41;", "let x = 42;").await;
-        assert_eq!(result, Some("let x = 42;".to_string()));
-    }
-
-    #[gpui::test]
-    async fn no_match(cx: &mut TestAppContext) {
-        let result = test_replace_exact(cx, "let x = 41;", "let y = 42;", "let y = 43;").await;
-        assert_eq!(result, None);
-    }
-
-    #[gpui::test]
-    async fn multi_line(cx: &mut TestAppContext) {
-        let whole = "fn example() {\n    let x = 41;\n    println!(\"x = {}\", x);\n}";
-        let old_text = "    let x = 41;\n    println!(\"x = {}\", x);";
-        let new_text = "    let x = 42;\n    println!(\"x = {}\", x);";
-        let result = test_replace_exact(cx, whole, old_text, new_text).await;
-        assert_eq!(
-            result,
-            Some("fn example() {\n    let x = 42;\n    println!(\"x = {}\", x);\n}".to_string())
-        );
-    }
-
-    #[gpui::test]
-    async fn multiple_occurrences(cx: &mut TestAppContext) {
-        let whole = "let x = 41;\nlet y = 41;\nlet z = 41;";
-        let result = test_replace_exact(cx, whole, "let x = 41;", "let x = 42;").await;
-        assert_eq!(
-            result,
-            Some("let x = 42;\nlet y = 41;\nlet z = 41;".to_string())
-        );
-    }
-
-    #[gpui::test]
-    async fn empty_buffer(cx: &mut TestAppContext) {
-        let result = test_replace_exact(cx, "", "let x = 41;", "let x = 42;").await;
-        assert_eq!(result, None);
-    }
-
-    #[gpui::test]
-    async fn partial_match(cx: &mut TestAppContext) {
-        let whole = "let x = 41; let y = 42;";
-        let result = test_replace_exact(cx, whole, "let x = 41", "let x = 42").await;
-        assert_eq!(result, Some("let x = 42; let y = 42;".to_string()));
-    }
-
-    #[gpui::test]
-    async fn whitespace_sensitive(cx: &mut TestAppContext) {
-        let result = test_replace_exact(cx, "let x = 41;", " let x = 41;", "let x = 42;").await;
-        assert_eq!(result, None);
-    }
-
-    #[gpui::test]
-    async fn entire_buffer(cx: &mut TestAppContext) {
-        let result = test_replace_exact(cx, "let x = 41;", "let x = 41;", "let x = 42;").await;
-        assert_eq!(result, Some("let x = 42;".to_string()));
-    }
-
-    async fn test_replace_exact(
-        cx: &mut TestAppContext,
-        whole: &str,
-        old: &str,
-        new: &str,
-    ) -> Option<String> {
-        let buffer = cx.new(|cx| language::Buffer::local(whole, cx));
-
-        let buffer_snapshot = buffer.read_with(cx, |buffer, _cx| buffer.snapshot());
-
-        let diff = replace_exact(old, new, &buffer_snapshot).await;
-        diff.map(|diff| {
-            buffer.update(cx, |buffer, cx| {
-                let _ = buffer.apply_diff(diff, cx);
-                buffer.text()
-            })
-        })
-    }
-}
-
-#[cfg(test)]
-mod flexible_indent_tests {
-    use super::*;
-    use gpui::TestAppContext;
-    use gpui::prelude::*;
-    use unindent::Unindent;
-
-    #[gpui::test]
-    fn test_underindented_single_line(cx: &mut TestAppContext) {
-        let cur = "        let a = 41;".to_string();
-        let old = "    let a = 41;".to_string();
-        let new = "    let a = 42;".to_string();
-        let exp = "        let a = 42;".to_string();
-
-        let result = test_replace_with_flexible_indent(cx, &cur, &old, &new);
-
-        assert_eq!(result, Some(exp.to_string()))
-    }
-
-    #[gpui::test]
-    fn test_overindented_single_line(cx: &mut TestAppContext) {
-        let cur = "    let a = 41;".to_string();
-        let old = "        let a = 41;".to_string();
-        let new = "        let a = 42;".to_string();
-        let exp = "    let a = 42;".to_string();
-
-        let result = test_replace_with_flexible_indent(cx, &cur, &old, &new);
-
-        assert_eq!(result, Some(exp.to_string()))
-    }
-
-    #[gpui::test]
-    fn test_underindented_multi_line(cx: &mut TestAppContext) {
-        let whole = r#"
-            fn test() {
-                let x = 5;
-                println!("x = {}", x);
-                let y = 10;
-            }
-        "#
-        .unindent();
-
-        let old = r#"
-            let x = 5;
-            println!("x = {}", x);
-        "#
-        .unindent();
-
-        let new = r#"
-            let x = 42;
-            println!("New value: {}", x);
-        "#
-        .unindent();
-
-        let expected = r#"
-            fn test() {
-                let x = 42;
-                println!("New value: {}", x);
-                let y = 10;
-            }
-        "#
-        .unindent();
-
-        assert_eq!(
-            test_replace_with_flexible_indent(cx, &whole, &old, &new),
-            Some(expected.to_string())
-        );
-    }
-
-    #[gpui::test]
-    fn test_overindented_multi_line(cx: &mut TestAppContext) {
-        let cur = r#"
-            fn foo() {
-                let a = 41;
-                let b = 3.13;
-            }
-        "#
-        .unindent();
-
-        // 6 space indent instead of 4
-        let old = "      let a = 41;\n      let b = 3.13;";
-        let new = "      let a = 42;\n      let b = 3.14;";
-
-        let expected = r#"
-            fn foo() {
-                let a = 42;
-                let b = 3.14;
-            }
-        "#
-        .unindent();
-
-        let result = test_replace_with_flexible_indent(cx, &cur, &old, &new);
-
-        assert_eq!(result, Some(expected.to_string()))
-    }
-
-    #[gpui::test]
-    fn test_replace_inconsistent_indentation(cx: &mut TestAppContext) {
-        let whole = r#"
-            fn test() {
-                if condition {
-                    println!("{}", 43);
-                }
-            }
-        "#
-        .unindent();
-
-        let old = r#"
-            if condition {
-            println!("{}", 43);
-        "#
-        .unindent();
-
-        let new = r#"
-            if condition {
-            println!("{}", 42);
-        "#
-        .unindent();
-
-        assert_eq!(
-            test_replace_with_flexible_indent(cx, &whole, &old, &new),
-            None
-        );
-    }
-
-    #[gpui::test]
-    fn test_replace_with_empty_lines(cx: &mut TestAppContext) {
-        // Test with empty lines
-        let whole = r#"
-            fn test() {
-                let x = 5;
-
-                println!("x = {}", x);
-            }
-        "#
-        .unindent();
-
-        let old = r#"
-            let x = 5;
-
-            println!("x = {}", x);
-        "#
-        .unindent();
-
-        let new = r#"
-            let x = 10;
-
-            println!("New x: {}", x);
-        "#
-        .unindent();
-
-        let expected = r#"
-            fn test() {
-                let x = 10;
-
-                println!("New x: {}", x);
-            }
-        "#
-        .unindent();
-
-        assert_eq!(
-            test_replace_with_flexible_indent(cx, &whole, &old, &new),
-            Some(expected.to_string())
-        );
-    }
-
-    #[gpui::test]
-    fn test_replace_no_match(cx: &mut TestAppContext) {
-        let whole = r#"
-            fn test() {
-                let x = 5;
-            }
-        "#
-        .unindent();
-
-        let old = r#"
-            let y = 10;
-        "#
-        .unindent();
-
-        let new = r#"
-            let y = 20;
-        "#
-        .unindent();
-
-        assert_eq!(
-            test_replace_with_flexible_indent(cx, &whole, &old, &new),
-            None
-        );
-    }
-
-    #[gpui::test]
-    fn test_replace_whole_ends_before_matching_old(cx: &mut TestAppContext) {
-        let whole = r#"
-            fn test() {
-                let x = 5;
-        "#
-        .unindent();
-
-        let old = r#"
-            let x = 5;
-            println!("x = {}", x);
-        "#
-        .unindent();
-
-        let new = r#"
-            let x = 10;
-            println!("x = {}", x);
-        "#
-        .unindent();
-
-        // Should return None because whole doesn't fully contain the old text
-        assert_eq!(
-            test_replace_with_flexible_indent(cx, &whole, &old, &new),
-            None
-        );
-    }
-
-    #[gpui::test]
-    fn test_replace_whole_is_shorter_than_old(cx: &mut TestAppContext) {
-        let whole = r#"
-            let x = 5;
-        "#
-        .unindent();
-
-        let old = r#"
-            let x = 5;
-            let y = 10;
-        "#
-        .unindent();
-
-        let new = r#"
-            let x = 5;
-            let y = 20;
-        "#
-        .unindent();
-
-        assert_eq!(
-            test_replace_with_flexible_indent(cx, &whole, &old, &new),
-            None
-        );
-    }
-
-    #[gpui::test]
-    fn test_replace_old_is_empty(cx: &mut TestAppContext) {
-        let whole = r#"
-            fn test() {
-                let x = 5;
-            }
-        "#
-        .unindent();
-
-        let old = "";
-        let new = r#"
-            let y = 10;
-        "#
-        .unindent();
-
-        assert_eq!(
-            test_replace_with_flexible_indent(cx, &whole, &old, &new),
-            None
-        );
-    }
-
-    #[gpui::test]
-    fn test_replace_whole_is_empty(cx: &mut TestAppContext) {
-        let whole = "";
-        let old = r#"
-            let x = 5;
-        "#
-        .unindent();
-
-        let new = r#"
-            let x = 10;
-        "#
-        .unindent();
-
-        assert_eq!(
-            test_replace_with_flexible_indent(cx, &whole, &old, &new),
-            None
-        );
-    }
-
-    #[test]
-    fn test_lines_with_min_indent() {
-        // Empty string
-        assert_eq!(lines_with_min_indent(""), (vec![], 0));
-
-        // Single line without indentation
-        assert_eq!(lines_with_min_indent("hello"), (vec!["hello"], 0));
-
-        // Multiple lines with no indentation
-        assert_eq!(
-            lines_with_min_indent("line1\nline2\nline3"),
-            (vec!["line1", "line2", "line3"], 0)
-        );
-
-        // Multiple lines with consistent indentation
-        assert_eq!(
-            lines_with_min_indent("  line1\n  line2\n  line3"),
-            (vec!["  line1", "  line2", "  line3"], 2)
-        );
-
-        // Multiple lines with varying indentation
-        assert_eq!(
-            lines_with_min_indent("    line1\n  line2\n      line3"),
-            (vec!["    line1", "  line2", "      line3"], 2)
-        );
-
-        // Lines with mixed indentation and empty lines
-        assert_eq!(
-            lines_with_min_indent("    line1\n\n  line2"),
-            (vec!["    line1", "", "  line2"], 2)
-        );
-    }
-
-    #[gpui::test]
-    fn test_replace_with_missing_indent_uneven_match(cx: &mut TestAppContext) {
-        let whole = r#"
-            fn test() {
-                if true {
-                        let x = 5;
-                        println!("x = {}", x);
-                }
-            }
-        "#
-        .unindent();
-
-        let old = r#"
-            let x = 5;
-            println!("x = {}", x);
-        "#
-        .unindent();
-
-        let new = r#"
-            let x = 42;
-            println!("x = {}", x);
-        "#
-        .unindent();
-
-        let expected = r#"
-            fn test() {
-                if true {
-                        let x = 42;
-                        println!("x = {}", x);
-                }
-            }
-        "#
-        .unindent();
-
-        assert_eq!(
-            test_replace_with_flexible_indent(cx, &whole, &old, &new),
-            Some(expected.to_string())
-        );
-    }
-
-    #[gpui::test]
-    fn test_replace_big_example(cx: &mut TestAppContext) {
-        let whole = r#"
-            #[cfg(test)]
-            mod tests {
-                use super::*;
-
-                #[test]
-                fn test_is_valid_age() {
-                    assert!(is_valid_age(0));
-                    assert!(!is_valid_age(151));
-                }
-            }
-        "#
-        .unindent();
-
-        let old = r#"
-            #[test]
-            fn test_is_valid_age() {
-                assert!(is_valid_age(0));
-                assert!(!is_valid_age(151));
-            }
-        "#
-        .unindent();
-
-        let new = r#"
-            #[test]
-            fn test_is_valid_age() {
-                assert!(is_valid_age(0));
-                assert!(!is_valid_age(151));
-            }
-
-            #[test]
-            fn test_group_people_by_age() {
-                let people = vec![
-                    Person::new("Young One", 5, "young@example.com").unwrap(),
-                    Person::new("Teen One", 15, "teen@example.com").unwrap(),
-                    Person::new("Teen Two", 18, "teen2@example.com").unwrap(),
-                    Person::new("Adult One", 25, "adult@example.com").unwrap(),
-                ];
-
-                let groups = group_people_by_age(&people);
-
-                assert_eq!(groups.get(&0).unwrap().len(), 1);  // One person in 0-9
-                assert_eq!(groups.get(&10).unwrap().len(), 2); // Two people in 10-19
-                assert_eq!(groups.get(&20).unwrap().len(), 1); // One person in 20-29
-            }
-        "#
-        .unindent();
-        let expected = r#"
-            #[cfg(test)]
-            mod tests {
-                use super::*;
-
-                #[test]
-                fn test_is_valid_age() {
-                    assert!(is_valid_age(0));
-                    assert!(!is_valid_age(151));
-                }
-
-                #[test]
-                fn test_group_people_by_age() {
-                    let people = vec![
-                        Person::new("Young One", 5, "young@example.com").unwrap(),
-                        Person::new("Teen One", 15, "teen@example.com").unwrap(),
-                        Person::new("Teen Two", 18, "teen2@example.com").unwrap(),
-                        Person::new("Adult One", 25, "adult@example.com").unwrap(),
-                    ];
-
-                    let groups = group_people_by_age(&people);
-
-                    assert_eq!(groups.get(&0).unwrap().len(), 1);  // One person in 0-9
-                    assert_eq!(groups.get(&10).unwrap().len(), 2); // Two people in 10-19
-                    assert_eq!(groups.get(&20).unwrap().len(), 1); // One person in 20-29
-                }
-            }
-        "#
-        .unindent();
-        assert_eq!(
-            test_replace_with_flexible_indent(cx, &whole, &old, &new),
-            Some(expected.to_string())
-        );
-    }
-
-    #[test]
-    fn test_drop_lines_prefix() {
-        // Empty array
-        assert_eq!(drop_lines_prefix(&[], 2), Vec::<&str>::new());
-
-        // Zero prefix length
-        assert_eq!(
-            drop_lines_prefix(&["line1", "line2"], 0),
-            vec!["line1", "line2"]
-        );
-
-        // Normal prefix drop
-        assert_eq!(
-            drop_lines_prefix(&["  line1", "  line2"], 2),
-            vec!["line1", "line2"]
-        );
-
-        // Prefix longer than some lines
-        assert_eq!(drop_lines_prefix(&["  line1", "a"], 2), vec!["line1", ""]);
-
-        // Prefix longer than all lines
-        assert_eq!(drop_lines_prefix(&["a", "b"], 5), vec!["", ""]);
-
-        // Mixed length lines
-        assert_eq!(
-            drop_lines_prefix(&["    line1", "  line2", "      line3"], 2),
-            vec!["  line1", "line2", "    line3"]
-        );
-    }
-
-    #[gpui::test]
-    async fn test_replace_exact_basic(cx: &mut TestAppContext) {
-        let buffer = cx.new(|cx| language::Buffer::local("let x = 41;", cx));
-        let snapshot = buffer.read_with(cx, |buffer, _cx| buffer.snapshot());
-
-        let diff = replace_exact("let x = 41;", "let x = 42;", &snapshot).await;
-        assert!(diff.is_some());
-
-        let diff = diff.unwrap();
-        assert_eq!(diff.edits.len(), 1);
-
-        let result = buffer.update(cx, |buffer, cx| {
-            let _ = buffer.apply_diff(diff, cx);
-            buffer.text()
-        });
-
-        assert_eq!(result, "let x = 42;");
-    }
-
-    #[gpui::test]
-    async fn test_replace_exact_no_match(cx: &mut TestAppContext) {
-        let buffer = cx.new(|cx| language::Buffer::local("let x = 41;", cx));
-        let snapshot = buffer.read_with(cx, |buffer, _cx| buffer.snapshot());
-
-        let diff = replace_exact("let y = 42;", "let y = 43;", &snapshot).await;
-        assert!(diff.is_none());
-    }
-
-    #[gpui::test]
-    async fn test_replace_exact_multi_line(cx: &mut TestAppContext) {
-        let buffer = cx.new(|cx| {
-            language::Buffer::local(
-                "fn example() {\n    let x = 41;\n    println!(\"x = {}\", x);\n}",
-                cx,
-            )
-        });
-        let snapshot = buffer.read_with(cx, |buffer, _cx| buffer.snapshot());
-
-        let old_text = "    let x = 41;\n    println!(\"x = {}\", x);";
-        let new_text = "    let x = 42;\n    println!(\"x = {}\", x);";
-        let diff = replace_exact(old_text, new_text, &snapshot).await;
-        assert!(diff.is_some());
-
-        let diff = diff.unwrap();
-        let result = buffer.update(cx, |buffer, cx| {
-            let _ = buffer.apply_diff(diff, cx);
-            buffer.text()
-        });
-
-        assert_eq!(
-            result,
-            "fn example() {\n    let x = 42;\n    println!(\"x = {}\", x);\n}"
-        );
-    }
-
-    #[gpui::test]
-    async fn test_replace_exact_multiple_occurrences(cx: &mut TestAppContext) {
-        let buffer =
-            cx.new(|cx| language::Buffer::local("let x = 41;\nlet y = 41;\nlet z = 41;", cx));
-        let snapshot = buffer.read_with(cx, |buffer, _cx| buffer.snapshot());
-
-        // Should replace only the first occurrence
-        let diff = replace_exact("let x = 41;", "let x = 42;", &snapshot).await;
-        assert!(diff.is_some());
-
-        let diff = diff.unwrap();
-        let result = buffer.update(cx, |buffer, cx| {
-            let _ = buffer.apply_diff(diff, cx);
-            buffer.text()
-        });
-
-        assert_eq!(result, "let x = 42;\nlet y = 41;\nlet z = 41;");
-    }
-
-    #[gpui::test]
-    async fn test_replace_exact_empty_buffer(cx: &mut TestAppContext) {
-        let buffer = cx.new(|cx| language::Buffer::local("", cx));
-        let snapshot = buffer.read_with(cx, |buffer, _cx| buffer.snapshot());
-
-        let diff = replace_exact("let x = 41;", "let x = 42;", &snapshot).await;
-        assert!(diff.is_none());
-    }
-
-    #[gpui::test]
-    async fn test_replace_exact_partial_match(cx: &mut TestAppContext) {
-        let buffer = cx.new(|cx| language::Buffer::local("let x = 41; let y = 42;", cx));
-        let snapshot = buffer.read_with(cx, |buffer, _cx| buffer.snapshot());
-
-        // Verify substring replacement actually works
-        let diff = replace_exact("let x = 41", "let x = 42", &snapshot).await;
-        assert!(diff.is_some());
-
-        let diff = diff.unwrap();
-        let result = buffer.update(cx, |buffer, cx| {
-            let _ = buffer.apply_diff(diff, cx);
-            buffer.text()
-        });
-
-        assert_eq!(result, "let x = 42; let y = 42;");
-    }
-
-    #[gpui::test]
-    async fn test_replace_exact_whitespace_sensitive(cx: &mut TestAppContext) {
-        let buffer = cx.new(|cx| language::Buffer::local("let x = 41;", cx));
-        let snapshot = buffer.read_with(cx, |buffer, _cx| buffer.snapshot());
-
-        let diff = replace_exact(" let x = 41;", "let x = 42;", &snapshot).await;
-        assert!(diff.is_none());
-    }
-
-    #[gpui::test]
-    async fn test_replace_exact_entire_buffer(cx: &mut TestAppContext) {
-        let buffer = cx.new(|cx| language::Buffer::local("let x = 41;", cx));
-        let snapshot = buffer.read_with(cx, |buffer, _cx| buffer.snapshot());
-
-        let diff = replace_exact("let x = 41;", "let x = 42;", &snapshot).await;
-        assert!(diff.is_some());
-
-        let diff = diff.unwrap();
-        let result = buffer.update(cx, |buffer, cx| {
-            let _ = buffer.apply_diff(diff, cx);
-            buffer.text()
-        });
-
-        assert_eq!(result, "let x = 42;");
-    }
-
-    fn test_replace_with_flexible_indent(
-        cx: &mut TestAppContext,
-        whole: &str,
-        old: &str,
-        new: &str,
-    ) -> Option<String> {
-        // Create a local buffer with the test content
-        let buffer = cx.new(|cx| language::Buffer::local(whole, cx));
-
-        // Get the buffer snapshot
-        let buffer_snapshot = buffer.read_with(cx, |buffer, _cx| buffer.snapshot());
-
-        // Call replace_flexible and transform the result
-        replace_with_flexible_indent(old, new, &buffer_snapshot).map(|diff| {
-            buffer.update(cx, |buffer, cx| {
-                let _ = buffer.apply_diff(diff, cx);
-                buffer.text()
-            })
-        })
-    }
-}
--- a/crates/assistant_tools/src/streaming_edit_file_tool.rs
+++ b/crates/assistant_tools/src/streaming_edit_file_tool.rs
@@ -1,23 +1,38 @@
 use crate::{
    Templates,
    edit_agent::{EditAgent, EditAgentOutputEvent},
-    edit_file_tool::EditFileToolCard,
    schema::json_schema_for,
 };
 use anyhow::{Context as _, Result, anyhow};
-use assistant_tool::{ActionLog, AnyToolCard, Tool, ToolResult};
+use assistant_tool::{ActionLog, AnyToolCard, Tool, ToolCard, ToolResult, ToolUseStatus};
+use buffer_diff::{BufferDiff, BufferDiffSnapshot};
+use editor::{Editor, EditorElement, EditorMode, EditorStyle, MultiBuffer, PathKey};
 use futures::StreamExt;
-use gpui::{AnyWindowHandle, App, AppContext, AsyncApp, Entity, Task};
+use gpui::{
+    Animation, AnimationExt, AnyWindowHandle, App, AppContext, AsyncApp, Context, Entity, EntityId,
+    Task, TextStyle, WeakEntity, pulsating_between,
+};
 use indoc::formatdoc;
+use language::{
+    Anchor, Buffer, Capability, LanguageRegistry, LineEnding, OffsetRangeExt, Rope, TextBuffer,
+    language_settings::SoftWrap,
+};
 use language_model::{
    LanguageModelRegistry, LanguageModelRequestMessage, LanguageModelToolSchemaFormat,
 };
 use project::Project;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use std::{path::PathBuf, sync::Arc};
-use ui::prelude::*;
+use settings::Settings;
+use std::{
+    path::{Path, PathBuf},
+    sync::Arc,
+    time::Duration,
+};
+use theme::ThemeSettings;
+use ui::{Disclosure, Tooltip, Window, prelude::*};
 use util::ResultExt;
+use workspace::Workspace;

 pub struct StreamingEditFileTool;

@@ -278,6 +293,510 @@ impl Tool for StreamingEditFileTool {
    }
 }

+pub struct EditFileToolCard {
+    path: PathBuf,
+    editor: Entity<Editor>,
+    multibuffer: Entity<MultiBuffer>,
+    project: Entity<Project>,
+    diff_task: Option<Task<Result<()>>>,
+    preview_expanded: bool,
+    error_expanded: bool,
+    full_height_expanded: bool,
+    total_lines: Option<u32>,
+    editor_unique_id: EntityId,
+}
+
+impl EditFileToolCard {
+    pub fn new(path: PathBuf, project: Entity<Project>, window: &mut Window, cx: &mut App) -> Self {
+        let multibuffer = cx.new(|_| MultiBuffer::without_headers(Capability::ReadOnly));
+        let editor = cx.new(|cx| {
+            let mut editor = Editor::new(
+                EditorMode::Full {
+                    scale_ui_elements_with_buffer_font_size: false,
+                    show_active_line_background: false,
+                    sized_by_content: true,
+                },
+                multibuffer.clone(),
+                Some(project.clone()),
+                window,
+                cx,
+            );
+            editor.set_show_gutter(false, cx);
+            editor.disable_inline_diagnostics();
+            editor.disable_expand_excerpt_buttons(cx);
+            editor.set_soft_wrap_mode(SoftWrap::None, cx);
+            editor.scroll_manager.set_forbid_vertical_scroll(true);
+            editor.set_show_scrollbars(false, cx);
+            editor.set_show_indent_guides(false, cx);
+            editor.set_read_only(true);
+            editor.set_show_breakpoints(false, cx);
+            editor.set_show_code_actions(false, cx);
+            editor.set_show_git_diff_gutter(false, cx);
+            editor.set_expand_all_diff_hunks(cx);
+            editor
+        });
+        Self {
+            editor_unique_id: editor.entity_id(),
+            path,
+            project,
+            editor,
+            multibuffer,
+            diff_task: None,
+            preview_expanded: true,
+            error_expanded: false,
+            full_height_expanded: false,
+            total_lines: None,
+        }
+    }
+
+    pub fn has_diff(&self) -> bool {
+        self.total_lines.is_some()
+    }
+
+    pub fn set_diff(
+        &mut self,
+        path: Arc<Path>,
+        old_text: String,
+        new_text: String,
+        cx: &mut Context<Self>,
+    ) {
+        let language_registry = self.project.read(cx).languages().clone();
+        self.diff_task = Some(cx.spawn(async move |this, cx| {
+            let buffer = build_buffer(new_text, path.clone(), &language_registry, cx).await?;
+            let buffer_diff = build_buffer_diff(old_text, &buffer, &language_registry, cx).await?;
+
+            this.update(cx, |this, cx| {
+                this.total_lines = this.multibuffer.update(cx, |multibuffer, cx| {
+                    let snapshot = buffer.read(cx).snapshot();
+                    let diff = buffer_diff.read(cx);
+                    let diff_hunk_ranges = diff
+                        .hunks_intersecting_range(Anchor::MIN..Anchor::MAX, &snapshot, cx)
+                        .map(|diff_hunk| diff_hunk.buffer_range.to_point(&snapshot))
+                        .collect::<Vec<_>>();
+                    multibuffer.clear(cx);
+                    multibuffer.set_excerpts_for_path(
+                        PathKey::for_buffer(&buffer, cx),
+                        buffer,
+                        diff_hunk_ranges,
+                        editor::DEFAULT_MULTIBUFFER_CONTEXT,
+                        cx,
+                    );
+                    multibuffer.add_diff(buffer_diff, cx);
+                    let end = multibuffer.len(cx);
+                    Some(multibuffer.snapshot(cx).offset_to_point(end).row + 1)
+                });
+
+                cx.notify();
+            })
+        }));
+    }
+}
+
+impl ToolCard for EditFileToolCard {
+    fn render(
+        &mut self,
+        status: &ToolUseStatus,
+        window: &mut Window,
+        workspace: WeakEntity<Workspace>,
+        cx: &mut Context<Self>,
+    ) -> impl IntoElement {
+        let (failed, error_message) = match status {
+            ToolUseStatus::Error(err) => (true, Some(err.to_string())),
+            _ => (false, None),
+        };
+
+        let path_label_button = h_flex()
+            .id(("edit-tool-path-label-button", self.editor_unique_id))
+            .w_full()
+            .max_w_full()
+            .px_1()
+            .gap_0p5()
+            .cursor_pointer()
+            .rounded_sm()
+            .opacity(0.8)
+            .hover(|label| {
+                label
+                    .opacity(1.)
+                    .bg(cx.theme().colors().element_hover.opacity(0.5))
+            })
+            .tooltip(Tooltip::text("Jump to File"))
+            .child(
+                h_flex()
+                    .child(
+                        Icon::new(IconName::Pencil)
+                            .size(IconSize::XSmall)
+                            .color(Color::Muted),
+                    )
+                    .child(
+                        div()
+                            .text_size(rems(0.8125))
+                            .child(self.path.display().to_string())
+                            .ml_1p5()
+                            .mr_0p5(),
+                    )
+                    .child(
+                        Icon::new(IconName::ArrowUpRight)
+                            .size(IconSize::XSmall)
+                            .color(Color::Ignored),
+                    ),
+            )
+            .on_click({
+                let path = self.path.clone();
+                let workspace = workspace.clone();
+                move |_, window, cx| {
+                    workspace
+                        .update(cx, {
+                            |workspace, cx| {
+                                let Some(project_path) =
+                                    workspace.project().read(cx).find_project_path(&path, cx)
+                                else {
+                                    return;
+                                };
+                                let open_task =
+                                    workspace.open_path(project_path, None, true, window, cx);
+                                window
+                                    .spawn(cx, async move |cx| {
+                                        let item = open_task.await?;
+                                        if let Some(active_editor) = item.downcast::<Editor>() {
+                                            active_editor
+                                                .update_in(cx, |editor, window, cx| {
+                                                    editor.go_to_singleton_buffer_point(
+                                                        language::Point::new(0, 0),
+                                                        window,
+                                                        cx,
+                                                    );
+                                                })
+                                                .log_err();
+                                        }
+                                        anyhow::Ok(())
+                                    })
+                                    .detach_and_log_err(cx);
+                            }
+                        })
+                        .ok();
+                }
+            })
+            .into_any_element();
+
+        let codeblock_header_bg = cx
+            .theme()
+            .colors()
+            .element_background
+            .blend(cx.theme().colors().editor_foreground.opacity(0.025));
+
+        let codeblock_header = h_flex()
+            .flex_none()
+            .p_1()
+            .gap_1()
+            .justify_between()
+            .rounded_t_md()
+            .when(!failed, |header| header.bg(codeblock_header_bg))
+            .child(path_label_button)
+            .when(failed, |header| {
+                header.child(
+                    h_flex()
+                        .gap_1()
+                        .child(
+                            Icon::new(IconName::Close)
+                                .size(IconSize::Small)
+                                .color(Color::Error),
+                        )
+                        .child(
+                            Disclosure::new(
+                                ("edit-file-error-disclosure", self.editor_unique_id),
+                                self.error_expanded,
+                            )
+                            .opened_icon(IconName::ChevronUp)
+                            .closed_icon(IconName::ChevronDown)
+                            .on_click(cx.listener(
+                                move |this, _event, _window, _cx| {
+                                    this.error_expanded = !this.error_expanded;
+                                },
+                            )),
+                        ),
+                )
+            })
+            .when(!failed && self.has_diff(), |header| {
+                header.child(
+                    Disclosure::new(
+                        ("edit-file-disclosure", self.editor_unique_id),
+                        self.preview_expanded,
+                    )
+                    .opened_icon(IconName::ChevronUp)
+                    .closed_icon(IconName::ChevronDown)
+                    .on_click(cx.listener(
+                        move |this, _event, _window, _cx| {
+                            this.preview_expanded = !this.preview_expanded;
+                        },
+                    )),
+                )
+            });
+
+        let (editor, editor_line_height) = self.editor.update(cx, |editor, cx| {
+            let ui_font_size = ThemeSettings::get_global(cx).ui_font_size(cx);
+            let line_height = editor
+                .style()
+                .map(|style| style.text.line_height_in_pixels(window.rem_size()))
+                .unwrap_or_default();
+
+            let settings = ThemeSettings::get_global(cx);
+            let element = EditorElement::new(
+                &cx.entity(),
+                EditorStyle {
+                    background: cx.theme().colors().editor_background,
+                    horizontal_padding: rems(0.25).to_pixels(window.rem_size()),
+                    local_player: cx.theme().players().local(),
+                    text: TextStyle {
+                        color: cx.theme().colors().editor_foreground,
+                        font_family: settings.buffer_font.family.clone(),
+                        font_features: settings.buffer_font.features.clone(),
+                        font_fallbacks: settings.buffer_font.fallbacks.clone(),
+                        font_size: ui_font_size.into(),
+                        font_weight: settings.buffer_font.weight,
+                        line_height: relative(settings.buffer_line_height.value()),
+                        ..Default::default()
+                    },
+                    scrollbar_width: EditorElement::SCROLLBAR_WIDTH,
+                    syntax: cx.theme().syntax().clone(),
+                    status: cx.theme().status().clone(),
+                    ..Default::default()
+                },
+            );
+
+            (element.into_any_element(), line_height)
+        });
+
+        let (full_height_icon, full_height_tooltip_label) = if self.full_height_expanded {
+            (IconName::ChevronUp, "Collapse Code Block")
+        } else {
+            (IconName::ChevronDown, "Expand Code Block")
+        };
+
+        let gradient_overlay = div()
+            .absolute()
+            .bottom_0()
+            .left_0()
+            .w_full()
+            .h_2_5()
+            .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.),
+            ));
+
+        let border_color = cx.theme().colors().border.opacity(0.6);
+
+        const DEFAULT_COLLAPSED_LINES: u32 = 10;
+        let is_collapsible = self.total_lines.unwrap_or(0) > DEFAULT_COLLAPSED_LINES;
+
+        let waiting_for_diff = {
+            let styles = [
+                ("w_4_5", (0.1, 0.85), 2000),
+                ("w_1_4", (0.2, 0.75), 2200),
+                ("w_2_4", (0.15, 0.64), 1900),
+                ("w_3_5", (0.25, 0.72), 2300),
+                ("w_2_5", (0.3, 0.56), 1800),
+            ];
+
+            let mut container = v_flex()
+                .p_3()
+                .gap_1p5()
+                .border_t_1()
+                .border_color(border_color)
+                .bg(cx.theme().colors().editor_background);
+
+            for (width_method, pulse_range, duration_ms) in styles.iter() {
+                let (min_opacity, max_opacity) = *pulse_range;
+                let placeholder = match *width_method {
+                    "w_4_5" => div().w_3_4(),
+                    "w_1_4" => div().w_1_4(),
+                    "w_2_4" => div().w_2_4(),
+                    "w_3_5" => div().w_3_5(),
+                    "w_2_5" => div().w_2_5(),
+                    _ => div().w_1_2(),
+                }
+                .id("loading_div")
+                .h_2()
+                .rounded_full()
+                .bg(cx.theme().colors().element_active)
+                .with_animation(
+                    "loading_pulsate",
+                    Animation::new(Duration::from_millis(*duration_ms))
+                        .repeat()
+                        .with_easing(pulsating_between(min_opacity, max_opacity)),
+                    |label, delta| label.opacity(delta),
+                );
+
+                container = container.child(placeholder);
+            }
+
+            container
+        };
+
+        v_flex()
+            .mb_2()
+            .border_1()
+            .when(failed, |card| card.border_dashed())
+            .border_color(border_color)
+            .rounded_lg()
+            .overflow_hidden()
+            .child(codeblock_header)
+            .when(failed && self.error_expanded, |card| {
+                card.child(
+                    v_flex()
+                        .p_2()
+                        .gap_1()
+                        .border_t_1()
+                        .border_dashed()
+                        .border_color(border_color)
+                        .bg(cx.theme().colors().editor_background)
+                        .rounded_b_md()
+                        .child(
+                            Label::new("Error")
+                                .size(LabelSize::XSmall)
+                                .color(Color::Error),
+                        )
+                        .child(
+                            div()
+                                .rounded_md()
+                                .text_ui_sm(cx)
+                                .bg(cx.theme().colors().editor_background)
+                                .children(
+                                    error_message
+                                        .map(|error| div().child(error).into_any_element()),
+                                ),
+                        ),
+                )
+            })
+            .when(!self.has_diff() && !failed, |card| {
+                card.child(waiting_for_diff)
+            })
+            .when(
+                !failed && self.preview_expanded && self.has_diff(),
+                |card| {
+                    card.child(
+                        v_flex()
+                            .relative()
+                            .h_full()
+                            .when(!self.full_height_expanded, |editor_container| {
+                                editor_container
+                                    .max_h(DEFAULT_COLLAPSED_LINES as f32 * editor_line_height)
+                            })
+                            .overflow_hidden()
+                            .border_t_1()
+                            .border_color(border_color)
+                            .bg(cx.theme().colors().editor_background)
+                            .child(editor)
+                            .when(
+                                !self.full_height_expanded && is_collapsible,
+                                |editor_container| editor_container.child(gradient_overlay),
+                            ),
+                    )
+                    .when(is_collapsible, |editor_container| {
+                        editor_container.child(
+                            h_flex()
+                                .id(("expand-button", self.editor_unique_id))
+                                .flex_none()
+                                .cursor_pointer()
+                                .h_5()
+                                .justify_center()
+                                .rounded_b_md()
+                                .border_t_1()
+                                .border_color(border_color)
+                                .bg(cx.theme().colors().editor_background)
+                                .hover(|style| {
+                                    style.bg(cx.theme().colors().element_hover.opacity(0.1))
+                                })
+                                .child(
+                                    Icon::new(full_height_icon)
+                                        .size(IconSize::Small)
+                                        .color(Color::Muted),
+                                )
+                                .tooltip(Tooltip::text(full_height_tooltip_label))
+                                .on_click(cx.listener(move |this, _event, _window, _cx| {
+                                    this.full_height_expanded = !this.full_height_expanded;
+                                })),
+                        )
+                    })
+                },
+            )
+    }
+}
+
+async fn build_buffer(
+    mut text: String,
+    path: Arc<Path>,
+    language_registry: &Arc<language::LanguageRegistry>,
+    cx: &mut AsyncApp,
+) -> Result<Entity<Buffer>> {
+    let line_ending = LineEnding::detect(&text);
+    LineEnding::normalize(&mut text);
+    let text = Rope::from(text);
+    let language = cx
+        .update(|_cx| language_registry.language_for_file_path(&path))?
+        .await
+        .ok();
+    let buffer = cx.new(|cx| {
+        let buffer = TextBuffer::new_normalized(
+            0,
+            cx.entity_id().as_non_zero_u64().into(),
+            line_ending,
+            text,
+        );
+        let mut buffer = Buffer::build(buffer, None, Capability::ReadWrite);
+        buffer.set_language(language, cx);
+        buffer
+    })?;
+    Ok(buffer)
+}
+
+async fn build_buffer_diff(
+    mut old_text: String,
+    buffer: &Entity<Buffer>,
+    language_registry: &Arc<LanguageRegistry>,
+    cx: &mut AsyncApp,
+) -> Result<Entity<BufferDiff>> {
+    LineEnding::normalize(&mut old_text);
+
+    let buffer = cx.update(|cx| buffer.read(cx).snapshot())?;
+
+    let base_buffer = cx
+        .update(|cx| {
+            Buffer::build_snapshot(
+                old_text.clone().into(),
+                buffer.language().cloned(),
+                Some(language_registry.clone()),
+                cx,
+            )
+        })?
+        .await;
+
+    let diff_snapshot = cx
+        .update(|cx| {
+            BufferDiffSnapshot::new_with_base_buffer(
+                buffer.text.clone(),
+                Some(old_text.into()),
+                base_buffer,
+                cx,
+            )
+        })?
+        .await;
+
+    let secondary_diff = cx.new(|cx| {
+        let mut diff = BufferDiff::new(&buffer, cx);
+        diff.set_snapshot(diff_snapshot.clone(), &buffer, cx);
+        diff
+    })?;
+
+    cx.new(|cx| {
+        let mut diff = BufferDiff::new(&buffer.text, cx);
+        diff.set_snapshot(diff_snapshot, &buffer, cx);
+        diff.set_secondary_diff(secondary_diff);
+        diff
+    })
+}
+
 #[cfg(test)]
 mod tests {
    use super::*;
--- a/crates/assistant_tools/src/templates/edit_file_prompt.hbs
+++ b/crates/assistant_tools/src/templates/edit_file_prompt.hbs
@@ -31,12 +31,8 @@ NEW TEXT 3 HERE

 Rules for editing:

- `old_text` represents lines in the input file that will be replaced with `new_text`.
- `old_text` MUST exactly match the existing file content, character for character, including indentation.
- `old_text` MUST NEVER come from the outline, but from actual lines in the file.
- Strive to be minimal in the lines you replace in `old_text`:
-  - If the lines you want to replace are unique, you MUST include just those in the `old_text`.
-  - If the lines you want to replace are NOT unique, you MUST include enough context around them in `old_text` to distinguish them from other lines.
+- `old_text` represents lines in the input file that will be replaced with `new_text`. `old_text` MUST exactly match the existing file content, character for character, including indentation.
+- Always include enough context around the lines you want to replace in `old_text` such that it's impossible to mistake them for other lines.
 - If you want to replace many occurrences of the same text, repeat the same `old_text`/`new_text` pair multiple times and I will apply them sequentially, one occurrence at a time.
 - When reporting multiple edits, each edit assumes the previous one has already been applied! Therefore, you must ensure `old_text` doesn't reference text that has already been modified by a previous edit.
 - Don't explain the edits, just report them.
--- a/crates/assistant_tools/src/terminal_tool.rs
+++ b/crates/assistant_tools/src/terminal_tool.rs
@@ -1,8 +1,10 @@
 use crate::schema::json_schema_for;
 use anyhow::{Context as _, Result, anyhow, bail};
 use assistant_tool::{ActionLog, Tool, ToolCard, ToolResult, ToolUseStatus};
-use futures::{FutureExt as _, future::Shared};
-use gpui::{AnyWindowHandle, App, AppContext, Empty, Entity, EntityId, Task, WeakEntity, Window};
+use gpui::{
+    Animation, AnimationExt, AnyWindowHandle, App, AppContext, Empty, Entity, EntityId, Task,
+    Transformation, WeakEntity, Window, percentage,
+};
 use language::LineEnding;
 use language_model::{LanguageModelRequestMessage, LanguageModelToolSchemaFormat};
 use portable_pty::{CommandBuilder, PtySize, native_pty_system};
@@ -17,7 +19,7 @@ use std::{
    time::{Duration, Instant},
 };
 use terminal_view::TerminalView;
-use ui::{Disclosure, Tooltip, prelude::*};
+use ui::{Disclosure, IconName, Tooltip, prelude::*};
 use util::{
    get_system_shell, markdown::MarkdownInlineCode, size::format_file_size,
    time::duration_alt_display,
@@ -34,37 +36,11 @@ pub struct TerminalToolInput {
    cd: String,
 }

-pub struct TerminalTool {
-    determine_shell: Shared<Task<String>>,
-}
-
-impl TerminalTool {
-    pub const NAME: &str = "terminal";
-
-    pub(crate) fn new(cx: &mut App) -> Self {
-        let determine_shell = cx.background_spawn(async move {
-            if cfg!(windows) {
-                return get_system_shell();
-            }
-
-            if which::which("bash").is_ok() {
-                log::info!("agent selected bash for terminal tool");
-                "bash".into()
-            } else {
-                let shell = get_system_shell();
-                log::info!("agent selected {shell} for terminal tool");
-                shell
-            }
-        });
-        Self {
-            determine_shell: determine_shell.shared(),
-        }
-    }
-}
+pub struct TerminalTool;

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

    fn needs_confirmation(&self, _: &serde_json::Value, _: &App) -> bool {
@@ -123,37 +99,17 @@ impl Tool for TerminalTool {
            Ok(dir) => dir,
            Err(err) => return Task::ready(Err(err)).into(),
        };
-        let program = self.determine_shell.clone();
-        let command = format!("({}) </dev/null", input.command);
-        let args = vec!["-c".into(), command.clone()];
+        let command = get_system_shell();
+        let args = vec!["-c".into(), input.command.clone()];
        let cwd = working_dir.clone();
-        let env = match &working_dir {
-            Some(dir) => project.update(cx, |project, cx| {
-                project.directory_environment(dir.as_path().into(), cx)
-            }),
-            None => Task::ready(None).shared(),
-        };
-
-        let env = cx.spawn(async move |_| {
-            let mut env = env.await.unwrap_or_default();
-            if cfg!(unix) {
-                env.insert("PAGER".into(), "cat".into());
-            }
-            env
-        });

        let Some(window) = window else {
            // Headless setup, a test or eval. Our terminal subsystem requires a workspace,
            // so bypass it and provide a convincing imitation using a pty.
            let task = cx.background_spawn(async move {
-                let env = env.await;
                let pty_system = native_pty_system();
-                let program = program.await;
-                let mut cmd = CommandBuilder::new(program);
+                let mut cmd = CommandBuilder::new(command);
                cmd.args(args);
-                for (k, v) in env {
-                    cmd.env(k, v);
-                }
                if let Some(cwd) = cwd {
                    cmd.cwd(cwd);
                }
@@ -186,28 +142,17 @@ impl Tool for TerminalTool {
            };
        };

-        let terminal = cx.spawn({
-            let project = project.downgrade();
-            async move |cx| {
-                let program = program.await;
-                let env = env.await;
-                let terminal = project
-                    .update(cx, |project, cx| {
-                        project.create_terminal(
-                            TerminalKind::Task(task::SpawnInTerminal {
-                                command: program,
-                                args,
-                                cwd,
-                                env,
-                                ..Default::default()
-                            }),
-                            window,
-                            cx,
-                        )
-                    })?
-                    .await;
-                terminal
-            }
+        let terminal = project.update(cx, |project, cx| {
+            project.create_terminal(
+                TerminalKind::Task(task::SpawnInTerminal {
+                    command,
+                    args,
+                    cwd,
+                    ..Default::default()
+                }),
+                window,
+                cx,
+            )
        });

        let card = cx.new(|cx| {
@@ -230,13 +175,11 @@ impl Tool for TerminalTool {
                            workspace.downgrade(),
                            None,
                            project.downgrade(),
-                            true,
                            window,
                            cx,
                        )
                    })
                })?;
-
                let _ = card.update(cx, |card, _| {
                    card.terminal = Some(terminal_view.clone());
                    card.start_instant = Instant::now();
@@ -435,118 +378,155 @@ impl ToolCard for TerminalToolCard {
        };

        let tool_failed = matches!(status, ToolUseStatus::Error(_));
-
        let command_failed =
            self.command_finished && self.exit_status.is_none_or(|code| !code.success());
-
        if (tool_failed || command_failed) && self.elapsed_time.is_none() {
            self.elapsed_time = Some(self.start_instant.elapsed());
        }
        let time_elapsed = self
            .elapsed_time
            .unwrap_or_else(|| self.start_instant.elapsed());
-        let should_hide_terminal = tool_failed || self.finished_with_empty_output;
+        let should_hide_terminal =
+            tool_failed || self.finished_with_empty_output || !self.preview_expanded;

+        let border_color = cx.theme().colors().border.opacity(0.6);
        let header_bg = cx
            .theme()
            .colors()
            .element_background
            .blend(cx.theme().colors().editor_foreground.opacity(0.025));

-        let border_color = cx.theme().colors().border.opacity(0.6);
-
-        let path = self
-            .working_dir
-            .as_ref()
-            .cloned()
-            .or_else(|| env::current_dir().ok())
-            .map(|path| format!("{}", path.display()))
-            .unwrap_or_else(|| "current directory".to_string());
+        let header_label = h_flex()
+            .w_full()
+            .max_w_full()
+            .px_1()
+            .gap_0p5()
+            .opacity(0.8)
+            .child(
+                h_flex()
+                    .child(
+                        Icon::new(IconName::Terminal)
+                            .size(IconSize::XSmall)
+                            .color(Color::Muted),
+                    )
+                    .child(
+                        div()
+                            .id(("terminal-tool-header-input-command", self.entity_id))
+                            .text_size(rems(0.8125))
+                            .font_buffer(cx)
+                            .child(self.input_command.clone())
+                            .ml_1p5()
+                            .mr_0p5()
+                            .tooltip({
+                                let path = self
+                                    .working_dir
+                                    .as_ref()
+                                    .cloned()
+                                    .or_else(|| env::current_dir().ok())
+                                    .map(|path| format!("\"{}\"", path.display()))
+                                    .unwrap_or_else(|| "current directory".to_string());
+                                Tooltip::text(if self.command_finished {
+                                    format!("Ran in {path}")
+                                } else {
+                                    format!("Running in {path}")
+                                })
+                            }),
+                    ),
+            )
+            .into_any_element();

        let header = h_flex()
            .flex_none()
+            .p_1()
            .gap_1()
            .justify_between()
            .rounded_t_md()
-            .child(
-                div()
-                    .id(("command-target-path", self.entity_id))
-                    .w_full()
-                    .max_w_full()
-                    .overflow_x_scroll()
-                    .child(
-                        Label::new(path)
-                            .buffer_font(cx)
-                            .size(LabelSize::XSmall)
-                            .color(Color::Muted),
-                    ),
-            )
-            .when(self.was_content_truncated, |header| {
-                let tooltip = if self.content_line_count + 10 > terminal::MAX_SCROLL_HISTORY_LINES {
-                    "Output exceeded terminal max lines and was \
-                        truncated, the model received the first 16 KB."
-                        .to_string()
-                } else {
-                    format!(
-                        "Output is {} long, to avoid unexpected token usage, \
-                            only 16 KB was sent back to the model.",
-                        format_file_size(self.original_content_len as u64, true),
-                    )
-                };
-                header.child(
-                    h_flex()
-                        .id(("terminal-tool-truncated-label", self.entity_id))
-                        .tooltip(Tooltip::text(tooltip))
-                        .gap_1()
-                        .child(
-                            Icon::new(IconName::Info)
-                                .size(IconSize::XSmall)
-                                .color(Color::Ignored),
+            .bg(header_bg)
+            .child(header_label)
+            .map(|header| {
+                let header = header
+                    .when(self.was_content_truncated, |header| {
+                        let tooltip =
+                            if self.content_line_count + 10 > terminal::MAX_SCROLL_HISTORY_LINES {
+                                "Output exceeded terminal max lines and was \
+                                truncated, the model received the first 16 KB."
+                                    .to_string()
+                            } else {
+                                format!(
+                                    "Output is {} long, to avoid unexpected token usage, \
+                                    only 16 KB was sent back to the model.",
+                                    format_file_size(self.original_content_len as u64, true),
+                                )
+                            };
+                        header.child(
+                            div()
+                                .id(("terminal-tool-truncated-label", self.entity_id))
+                                .tooltip(Tooltip::text(tooltip))
+                                .child(
+                                    Label::new("(truncated)")
+                                        .color(Color::Disabled)
+                                        .size(LabelSize::Small),
+                                ),
                        )
-                        .child(
-                            Label::new("Truncated")
-                                .color(Color::Muted)
+                    })
+                    .when(time_elapsed > Duration::from_secs(10), |header| {
+                        header.child(
+                            Label::new(format!("({})", duration_alt_display(time_elapsed)))
+                                .buffer_font(cx)
+                                .color(Color::Disabled)
                                .size(LabelSize::Small),
-                        ),
-                )
-            })
-            .when(time_elapsed > Duration::from_secs(10), |header| {
-                header.child(
-                    Label::new(format!("({})", duration_alt_display(time_elapsed)))
-                        .buffer_font(cx)
-                        .color(Color::Muted)
-                        .size(LabelSize::Small),
-                )
-            })
-            .when(tool_failed || command_failed, |header| {
-                header.child(
-                    div()
-                        .id(("terminal-tool-error-code-indicator", self.entity_id))
-                        .child(
-                            Icon::new(IconName::Close)
-                                .size(IconSize::Small)
-                                .color(Color::Error),
                        )
-                        .when(command_failed && self.exit_status.is_some(), |this| {
-                            this.tooltip(Tooltip::text(format!(
-                                "Exited with code {}",
-                                self.exit_status
-                                    .and_then(|status| status.code())
-                                    .unwrap_or(-1),
-                            )))
-                        })
-                        .when(
-                            !command_failed && tool_failed && status.error().is_some(),
-                            |this| {
+                    });
+
+                if tool_failed || command_failed {
+                    header.child(
+                        div()
+                            .id(("terminal-tool-error-code-indicator", self.entity_id))
+                            .child(
+                                Icon::new(IconName::Close)
+                                    .size(IconSize::Small)
+                                    .color(Color::Error),
+                            )
+                            .when(command_failed && self.exit_status.is_some(), |this| {
                                this.tooltip(Tooltip::text(format!(
-                                    "Error: {}",
-                                    status.error().unwrap(),
+                                    "Exited with code {}",
+                                    self.exit_status
+                                        .and_then(|status| status.code())
+                                        .unwrap_or(-1),
                                )))
-                            },
-                        ),
-                )
+                            })
+                            .when(
+                                !command_failed && tool_failed && status.error().is_some(),
+                                |this| {
+                                    this.tooltip(Tooltip::text(format!(
+                                        "Error: {}",
+                                        status.error().unwrap(),
+                                    )))
+                                },
+                            ),
+                    )
+                } else if self.command_finished {
+                    header.child(
+                        Icon::new(IconName::Check)
+                            .size(IconSize::Small)
+                            .color(Color::Success),
+                    )
+                } else {
+                    header.child(
+                        Icon::new(IconName::ArrowCircle)
+                            .size(IconSize::Small)
+                            .color(Color::Info)
+                            .with_animation(
+                                "arrow-circle",
+                                Animation::new(Duration::from_secs(2)).repeat(),
+                                |icon, delta| {
+                                    icon.transform(Transformation::rotate(percentage(delta)))
+                                },
+                            ),
+                    )
+                }
            })
-            .when(!should_hide_terminal, |header| {
+            .when(!tool_failed && !self.finished_with_empty_output, |header| {
                header.child(
                    Disclosure::new(
                        ("terminal-tool-disclosure", self.entity_id),
@@ -569,25 +549,9 @@ impl ToolCard for TerminalToolCard {
            .border_color(border_color)
            .rounded_lg()
            .overflow_hidden()
-            .child(
-                v_flex().p_2().gap_0p5().bg(header_bg).child(header).child(
-                    Label::new(self.input_command.clone())
-                        .buffer_font(cx)
-                        .size(LabelSize::Small),
-                ),
-            )
-            .when(self.preview_expanded && !should_hide_terminal, |this| {
-                this.child(
-                    div()
-                        .pt_2()
-                        .min_h_72()
-                        .border_t_1()
-                        .border_color(border_color)
-                        .bg(cx.theme().colors().editor_background)
-                        .rounded_b_md()
-                        .text_ui_sm(cx)
-                        .child(terminal.clone()),
-                )
+            .child(header)
+            .when(!should_hide_terminal, |this| {
+                this.child(div().child(terminal.clone()).min_h(px(250.0)))
            })
            .into_any()
    }
@@ -607,10 +571,14 @@ mod tests {

    use super::*;

-    fn init_test(executor: &BackgroundExecutor, cx: &mut TestAppContext) {
+    #[gpui::test]
+    async fn test_working_directory(executor: BackgroundExecutor, cx: &mut TestAppContext) {
+        if cfg!(windows) {
+            return;
+        }
+
        zlog::init();
        zlog::init_output_stdout();
-
        executor.allow_parking();
        cx.update(|cx| {
            let settings_store = SettingsStore::test(cx);
@@ -622,56 +590,6 @@ mod tests {
            TerminalSettings::register(cx);
            EditorSettings::register(cx);
        });
-    }
-
-    #[gpui::test]
-    async fn test_interactive_command(executor: BackgroundExecutor, cx: &mut TestAppContext) {
-        if cfg!(windows) {
-            return;
-        }
-
-        init_test(&executor, cx);
-
-        let fs = Arc::new(RealFs::new(None, executor));
-        let tree = TempTree::new(json!({
-            "project": {},
-        }));
-        let project: Entity<Project> =
-            Project::test(fs, [tree.path().join("project").as_path()], cx).await;
-        let action_log = cx.update(|cx| cx.new(|_| ActionLog::new(project.clone())));
-
-        let input = TerminalToolInput {
-            command: "cat".to_owned(),
-            cd: tree
-                .path()
-                .join("project")
-                .as_path()
-                .to_string_lossy()
-                .to_string(),
-        };
-        let result = cx.update(|cx| {
-            TerminalTool::run(
-                Arc::new(TerminalTool::new(cx)),
-                serde_json::to_value(input).unwrap(),
-                &[],
-                project.clone(),
-                action_log.clone(),
-                None,
-                cx,
-            )
-        });
-
-        let output = result.output.await.log_err();
-        assert_eq!(output, Some("Command executed successfully.".into()));
-    }
-
-    #[gpui::test]
-    async fn test_working_directory(executor: BackgroundExecutor, cx: &mut TestAppContext) {
-        if cfg!(windows) {
-            return;
-        }
-
-        init_test(&executor, cx);

        let fs = Arc::new(RealFs::new(None, executor));
        let tree = TempTree::new(json!({
@@ -684,7 +602,7 @@ mod tests {

        let check = |input, expected, cx: &mut App| {
            let headless_result = TerminalTool::run(
-                Arc::new(TerminalTool::new(cx)),
+                Arc::new(TerminalTool),
                serde_json::to_value(input).unwrap(),
                &[],
                project.clone(),
--- a/crates/assistant_tools/src/web_search_tool.rs
+++ b/crates/assistant_tools/src/web_search_tool.rs
@@ -15,7 +15,7 @@ use serde::{Deserialize, Serialize};
 use ui::{IconName, Tooltip, prelude::*};
 use web_search::WebSearchRegistry;
 use workspace::Workspace;
-use zed_llm_client::{WebSearchResponse, WebSearchResult};
+use zed_llm_client::{WebSearchCitation, WebSearchResponse};

 #[derive(Debug, Serialize, Deserialize, JsonSchema)]
 pub struct WebSearchToolInput {
@@ -120,10 +120,10 @@ impl ToolCard for WebSearchToolCard {
    ) -> impl IntoElement {
        let header = match self.response.as_ref() {
            Some(Ok(response)) => {
-                let text: SharedString = if response.results.len() == 1 {
+                let text: SharedString = if response.citations.len() == 1 {
                    "1 result".into()
                } else {
-                    format!("{} results", response.results.len()).into()
+                    format!("{} results", response.citations.len()).into()
                };
                ToolCallCardHeader::new(IconName::Globe, "Searched the Web")
                    .with_secondary_text(text)
@@ -134,47 +134,52 @@ impl ToolCard for WebSearchToolCard {
            None => ToolCallCardHeader::new(IconName::Globe, "Searching the Web").loading(),
        };

-        let content = self.response.as_ref().and_then(|response| match response {
-            Ok(response) => Some(
-                v_flex()
-                    .overflow_hidden()
-                    .ml_1p5()
-                    .pl(px(5.))
-                    .border_l_1()
-                    .border_color(cx.theme().colors().border_variant)
-                    .gap_1()
-                    .children(response.results.iter().enumerate().map(|(index, result)| {
-                        let title = result.title.clone();
-                        let url = result.url.clone();
+        let content =
+            self.response.as_ref().and_then(|response| match response {
+                Ok(response) => {
+                    Some(
+                        v_flex()
+                            .overflow_hidden()
+                            .ml_1p5()
+                            .pl(px(5.))
+                            .border_l_1()
+                            .border_color(cx.theme().colors().border_variant)
+                            .gap_1()
+                            .children(response.citations.iter().enumerate().map(
+                                |(index, citation)| {
+                                    let title = citation.title.clone();
+                                    let url = citation.url.clone();

-                        Button::new(("result", index), title)
-                            .label_size(LabelSize::Small)
-                            .color(Color::Muted)
-                            .icon(IconName::ArrowUpRight)
-                            .icon_size(IconSize::XSmall)
-                            .icon_position(IconPosition::End)
-                            .truncate(true)
-                            .tooltip({
-                                let url = url.clone();
-                                move |window, cx| {
-                                    Tooltip::with_meta(
-                                        "Web Search Result",
-                                        None,
-                                        url.clone(),
-                                        window,
-                                        cx,
-                                    )
-                                }
-                            })
-                            .on_click({
-                                let url = url.clone();
-                                move |_, _, cx| cx.open_url(&url)
-                            })
-                    }))
-                    .into_any(),
-            ),
-            Err(_) => None,
-        });
+                                    Button::new(("citation", index), title)
+                                        .label_size(LabelSize::Small)
+                                        .color(Color::Muted)
+                                        .icon(IconName::ArrowUpRight)
+                                        .icon_size(IconSize::XSmall)
+                                        .icon_position(IconPosition::End)
+                                        .truncate(true)
+                                        .tooltip({
+                                            let url = url.clone();
+                                            move |window, cx| {
+                                                Tooltip::with_meta(
+                                                    "Citation Link",
+                                                    None,
+                                                    url.clone(),
+                                                    window,
+                                                    cx,
+                                                )
+                                            }
+                                        })
+                                        .on_click({
+                                            let url = url.clone();
+                                            move |_, _, cx| cx.open_url(&url)
+                                        })
+                                },
+                            ))
+                            .into_any(),
+                    )
+                }
+                Err(_) => None,
+            });

        v_flex().mb_3().gap_1().child(header).children(content)
    }
@@ -264,39 +269,36 @@ impl Component for WebSearchToolCard {

 fn example_search_response() -> WebSearchResponse {
    WebSearchResponse {
-        results: vec![
-            WebSearchResult {
+        summary: r#"Toronto boasts a vibrant culinary scene with a diverse array of..."#
+            .to_string(),
+        citations: vec![
+            WebSearchCitation {
                title: "Alo".to_string(),
                url: "https://www.google.com/maps/search/Alo%2C+Toronto%2C+Canada".to_string(),
-                text: "Alo is a popular restaurant in Toronto.".to_string(),
+                range: Some(147..213),
            },
-            WebSearchResult {
-                title: "Alo".to_string(),
-                url: "https://www.google.com/maps/search/Alo%2C+Toronto%2C+Canada".to_string(),
-                text: "Information about Alo restaurant in Toronto.".to_string(),
-            },
-            WebSearchResult {
+            WebSearchCitation {
                title: "Edulis".to_string(),
                url: "https://www.google.com/maps/search/Edulis%2C+Toronto%2C+Canada".to_string(),
-                text: "Details about Edulis restaurant in Toronto.".to_string(),
+                range: Some(447..519),
            },
-            WebSearchResult {
+            WebSearchCitation {
                title: "Sushi Masaki Saito".to_string(),
                url: "https://www.google.com/maps/search/Sushi+Masaki+Saito%2C+Toronto%2C+Canada"
                    .to_string(),
-                text: "Information about Sushi Masaki Saito in Toronto.".to_string(),
+                range: Some(776..872),
            },
-            WebSearchResult {
+            WebSearchCitation {
                title: "Shoushin".to_string(),
                url: "https://www.google.com/maps/search/Shoushin%2C+Toronto%2C+Canada".to_string(),
-                text: "Details about Shoushin restaurant in Toronto.".to_string(),
+                range: Some(1072..1148),
            },
-            WebSearchResult {
+            WebSearchCitation {
                title: "Restaurant 20 Victoria".to_string(),
                url:
                    "https://www.google.com/maps/search/Restaurant+20+Victoria%2C+Toronto%2C+Canada"
                        .to_string(),
-                text: "Information about Restaurant 20 Victoria in Toronto.".to_string(),
+                range: Some(1291..1395),
            },
        ],
    }
--- a/crates/client/src/client.rs
+++ b/crates/client/src/client.rs
@@ -47,7 +47,6 @@ use std::{
 };
 use telemetry::Telemetry;
 use thiserror::Error;
-use tokio::net::TcpStream;
 use url::Url;
 use util::{ResultExt, TryFutureExt};

@@ -1128,10 +1127,7 @@ impl Client {
            let stream = {
                let handle = cx.update(|cx| gpui_tokio::Tokio::handle(cx)).ok().unwrap();
                let _guard = handle.enter();
-                match proxy {
-                    Some(proxy) => connect_socks_proxy_stream(&proxy, rpc_host).await?,
-                    None => Box::new(TcpStream::connect(rpc_host).await?),
-                }
+                connect_socks_proxy_stream(proxy.as_ref(), rpc_host).await?
            };

            log::info!("connected to rpc endpoint {}", rpc_url);
--- a/crates/client/src/socks.rs
+++ b/crates/client/src/socks.rs
@@ -1,98 +1,61 @@
 //! socks proxy
-use anyhow::{Context, Result, anyhow};
+use anyhow::{Result, anyhow};
 use http_client::Url;
 use tokio_socks::tcp::{Socks4Stream, Socks5Stream};

-/// Identification to a Socks V4 Proxy
-struct Socks4Identification<'a> {
-    user_id: &'a str,
-}
-
-/// Authorization to a Socks V5 Proxy
-struct Socks5Authorization<'a> {
-    username: &'a str,
-    password: &'a str,
-}
-
-/// Socks Proxy Protocol Version
-///
-/// V4 allows idenfication using a user_id
-/// V5 allows authorization using a username and password
-enum SocksVersion<'a> {
-    V4(Option<Socks4Identification<'a>>),
-    V5(Option<Socks5Authorization<'a>>),
-}
-
 pub(crate) async fn connect_socks_proxy_stream(
-    proxy: &Url,
+    proxy: Option<&Url>,
    rpc_host: (&str, u16),
 ) -> Result<Box<dyn AsyncReadWrite>> {
-    let Some((socks_proxy, version)) = parse_socks_proxy(proxy) else {
-        // If parsing the proxy URL fails, we must avoid falling back to an insecure connection.
-        // SOCKS proxies are often used in contexts where security and privacy are critical,
-        // so any fallback could expose users to significant risks.
-        return Err(anyhow!("Parsing proxy url failed"));
-    };
-
-    // Connect to proxy and wrap protocol later
-    let stream = tokio::net::TcpStream::connect(socks_proxy)
-        .await
-        .context("Failed to connect to socks proxy")?;
-
-    let socks: Box<dyn AsyncReadWrite> = match version {
-        SocksVersion::V4(None) => {
-            let socks = Socks4Stream::connect_with_socket(stream, rpc_host)
-                .await
-                .context("error connecting to socks")?;
-            Box::new(socks)
-        }
-        SocksVersion::V4(Some(Socks4Identification { user_id })) => {
-            let socks = Socks4Stream::connect_with_userid_and_socket(stream, rpc_host, user_id)
-                .await
-                .context("error connecting to socks")?;
-            Box::new(socks)
-        }
-        SocksVersion::V5(None) => {
-            let socks = Socks5Stream::connect_with_socket(stream, rpc_host)
-                .await
-                .context("error connecting to socks")?;
-            Box::new(socks)
-        }
-        SocksVersion::V5(Some(Socks5Authorization { username, password })) => {
-            let socks = Socks5Stream::connect_with_password_and_socket(
-                stream, rpc_host, username, password,
+    let stream = match parse_socks_proxy(proxy) {
+        Some((socks_proxy, SocksVersion::V4)) => {
+            let stream = Socks4Stream::connect_with_socket(
+                tokio::net::TcpStream::connect(socks_proxy).await?,
+                rpc_host,
            )
            .await
-            .context("error connecting to socks")?;
-            Box::new(socks)
+            .map_err(|err| anyhow!("error connecting to socks {}", err))?;
+            Box::new(stream) as Box<dyn AsyncReadWrite>
+        }
+        Some((socks_proxy, SocksVersion::V5)) => Box::new(
+            Socks5Stream::connect_with_socket(
+                tokio::net::TcpStream::connect(socks_proxy).await?,
+                rpc_host,
+            )
+            .await
+            .map_err(|err| anyhow!("error connecting to socks {}", err))?,
+        ) as Box<dyn AsyncReadWrite>,
+        None => {
+            Box::new(tokio::net::TcpStream::connect(rpc_host).await?) as Box<dyn AsyncReadWrite>
        }
    };
-
-    Ok(socks)
+    Ok(stream)
 }

-fn parse_socks_proxy(proxy: &Url) -> Option<((String, u16), SocksVersion<'_>)> {
-    let scheme = proxy.scheme();
+fn parse_socks_proxy(proxy: Option<&Url>) -> Option<((String, u16), SocksVersion)> {
+    let proxy_url = proxy?;
+    let scheme = proxy_url.scheme();
    let socks_version = if scheme.starts_with("socks4") {
-        let identification = match proxy.username() {
-            "" => None,
-            username => Some(Socks4Identification { user_id: username }),
-        };
-        SocksVersion::V4(identification)
+        // socks4
+        SocksVersion::V4
    } else if scheme.starts_with("socks") {
-        let authorization = proxy.password().map(|password| Socks5Authorization {
-            username: proxy.username(),
-            password,
-        });
-        SocksVersion::V5(authorization)
+        // socks, socks5
+        SocksVersion::V5
    } else {
        return None;
    };
+    if let Some((host, port)) = proxy_url.host().zip(proxy_url.port_or_known_default()) {
+        Some(((host.to_string(), port), socks_version))
+    } else {
+        None
+    }
+}

-    let host = proxy.host()?.to_string();
-    let port = proxy.port_or_known_default()?;
+// private helper structs and traits

-    Some(((host, port), socks_version))
+enum SocksVersion {
+    V4,
+    V5,
 }

 pub(crate) trait AsyncReadWrite:
@@ -103,74 +66,3 @@ impl<T: tokio::io::AsyncRead + tokio::io::AsyncWrite + Unpin + Send + 'static> A
    for T
 {
 }
-
-#[cfg(test)]
-mod tests {
-    use url::Url;
-
-    use super::*;
-
-    #[test]
-    fn parse_socks4() {
-        let proxy = Url::parse("socks4://proxy.example.com:1080").unwrap();
-
-        let ((host, port), version) = parse_socks_proxy(&proxy).unwrap();
-        assert_eq!(host, "proxy.example.com");
-        assert_eq!(port, 1080);
-        assert!(matches!(version, SocksVersion::V4(None)))
-    }
-
-    #[test]
-    fn parse_socks4_with_identification() {
-        let proxy = Url::parse("socks4://userid@proxy.example.com:1080").unwrap();
-
-        let ((host, port), version) = parse_socks_proxy(&proxy).unwrap();
-        assert_eq!(host, "proxy.example.com");
-        assert_eq!(port, 1080);
-        assert!(matches!(
-            version,
-            SocksVersion::V4(Some(Socks4Identification { user_id: "userid" }))
-        ))
-    }
-
-    #[test]
-    fn parse_socks5() {
-        let proxy = Url::parse("socks5://proxy.example.com:1080").unwrap();
-
-        let ((host, port), version) = parse_socks_proxy(&proxy).unwrap();
-        assert_eq!(host, "proxy.example.com");
-        assert_eq!(port, 1080);
-        assert!(matches!(version, SocksVersion::V5(None)))
-    }
-
-    #[test]
-    fn parse_socks5_with_authorization() {
-        let proxy = Url::parse("socks5://username:password@proxy.example.com:1080").unwrap();
-
-        let ((host, port), version) = parse_socks_proxy(&proxy).unwrap();
-        assert_eq!(host, "proxy.example.com");
-        assert_eq!(port, 1080);
-        assert!(matches!(
-            version,
-            SocksVersion::V5(Some(Socks5Authorization {
-                username: "username",
-                password: "password"
-            }))
-        ))
-    }
-
-    /// If parsing the proxy URL fails, we must avoid falling back to an insecure connection.
-    /// SOCKS proxies are often used in contexts where security and privacy are critical,
-    /// so any fallback could expose users to significant risks.
-    #[tokio::test]
-    async fn fails_on_bad_proxy() {
-        // Should fail connecting because http is not a valid Socks proxy scheme
-        let proxy = Url::parse("http://localhost:2313").unwrap();
-
-        let result = connect_socks_proxy_stream(&proxy, ("test", 1080)).await;
-        match result {
-            Err(e) => assert_eq!(e.to_string(), "Parsing proxy url failed"),
-            Ok(_) => panic!("Connecting on bad proxy should fail"),
-        };
-    }
-}
--- a/crates/client/src/user.rs
+++ b/crates/client/src/user.rs
@@ -102,10 +102,6 @@ pub struct UserStore {
    update_contacts_tx: mpsc::UnboundedSender<UpdateContacts>,
    current_plan: Option<proto::Plan>,
    trial_started_at: Option<DateTime<Utc>>,
-    model_request_usage_amount: Option<u32>,
-    model_request_usage_limit: Option<proto::UsageLimit>,
-    edit_predictions_usage_amount: Option<u32>,
-    edit_predictions_usage_limit: Option<proto::UsageLimit>,
    is_usage_based_billing_enabled: Option<bool>,
    current_user: watch::Receiver<Option<Arc<User>>>,
    accepted_tos_at: Option<Option<DateTime<Utc>>>,
@@ -167,10 +163,6 @@ impl UserStore {
            current_user: current_user_rx,
            current_plan: None,
            trial_started_at: None,
-            model_request_usage_amount: None,
-            model_request_usage_limit: None,
-            edit_predictions_usage_amount: None,
-            edit_predictions_usage_limit: None,
            is_usage_based_billing_enabled: None,
            accepted_tos_at: None,
            contacts: Default::default(),
@@ -338,14 +330,6 @@ impl UserStore {
                .trial_started_at
                .and_then(|trial_started_at| DateTime::from_timestamp(trial_started_at as i64, 0));
            this.is_usage_based_billing_enabled = message.payload.is_usage_based_billing_enabled;
-
-            if let Some(usage) = message.payload.usage {
-                this.model_request_usage_amount = Some(usage.model_requests_usage_amount);
-                this.model_request_usage_limit = usage.model_requests_usage_limit;
-                this.edit_predictions_usage_amount = Some(usage.edit_predictions_usage_amount);
-                this.edit_predictions_usage_limit = usage.edit_predictions_usage_limit;
-            }
-
            cx.notify();
        })?;
        Ok(())
@@ -713,30 +697,6 @@ impl UserStore {
        self.current_plan
    }

-    pub fn trial_started_at(&self) -> Option<DateTime<Utc>> {
-        self.trial_started_at
-    }
-
-    pub fn usage_based_billing_enabled(&self) -> Option<bool> {
-        self.is_usage_based_billing_enabled
-    }
-
-    pub fn model_request_usage_amount(&self) -> Option<u32> {
-        self.model_request_usage_amount
-    }
-
-    pub fn model_request_usage_limit(&self) -> Option<proto::UsageLimit> {
-        self.model_request_usage_limit.clone()
-    }
-
-    pub fn edit_predictions_usage_amount(&self) -> Option<u32> {
-        self.edit_predictions_usage_amount
-    }
-
-    pub fn edit_predictions_usage_limit(&self) -> Option<proto::UsageLimit> {
-        self.edit_predictions_usage_limit.clone()
-    }
-
    pub fn watch_current_user(&self) -> watch::Receiver<Option<Arc<User>>> {
        self.current_user.clone()
    }
--- a/crates/collab/src/db/tables/billing_subscription.rs
+++ b/crates/collab/src/db/tables/billing_subscription.rs
@@ -1,5 +1,4 @@
 use crate::db::{BillingCustomerId, BillingSubscriptionId};
-use chrono::{Datelike as _, NaiveDate, Utc};
 use sea_orm::entity::prelude::*;
 use serde::Serialize;

@@ -30,38 +29,6 @@ impl Model {
        let period_end = self.stripe_current_period_end?;
        chrono::DateTime::from_timestamp(period_end, 0)
    }
-
-    pub fn current_period(
-        subscription: Option<Self>,
-        is_staff: bool,
-    ) -> Option<(DateTimeUtc, DateTimeUtc)> {
-        if is_staff {
-            let now = Utc::now();
-            let year = now.year();
-            let month = now.month();
-
-            let first_day_of_this_month =
-                NaiveDate::from_ymd_opt(year, month, 1)?.and_hms_opt(0, 0, 0)?;
-
-            let next_month = if month == 12 { 1 } else { month + 1 };
-            let next_month_year = if month == 12 { year + 1 } else { year };
-            let first_day_of_next_month =
-                NaiveDate::from_ymd_opt(next_month_year, next_month, 1)?.and_hms_opt(23, 59, 59)?;
-
-            let last_day_of_this_month = first_day_of_next_month - chrono::Days::new(1);
-
-            Some((
-                first_day_of_this_month.and_utc(),
-                last_day_of_this_month.and_utc(),
-            ))
-        } else {
-            let subscription = subscription?;
-            let period_start_at = subscription.current_period_start_at()?;
-            let period_end_at = subscription.current_period_end_at()?;
-
-            Some((period_start_at, period_end_at))
-        }
-    }
 }

 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
--- a/crates/collab/src/llm/token.rs
+++ b/crates/collab/src/llm/token.rs
@@ -6,11 +6,12 @@ use crate::llm::{
 };
 use crate::{Config, db::billing_preference};
 use anyhow::{Result, anyhow};
-use chrono::{NaiveDateTime, Utc};
+use chrono::{Datelike, NaiveDate, NaiveDateTime, Utc};
 use jsonwebtoken::{DecodingKey, EncodingKey, Header, Validation};
 use serde::{Deserialize, Serialize};
 use std::time::Duration;
 use thiserror::Error;
+use util::maybe;
 use uuid::Uuid;
 use zed_llm_client::Plan;

@@ -110,11 +111,34 @@ impl LlmTokenClaims {
            has_extended_trial: feature_flags
                .iter()
                .any(|flag| flag == AGENT_EXTENDED_TRIAL_FEATURE_FLAG),
-            subscription_period: billing_subscription::Model::current_period(
-                subscription,
-                is_staff,
-            )
-            .map(|(start, end)| (start.naive_utc(), end.naive_utc())),
+            subscription_period: if is_staff {
+                maybe!({
+                    let now = Utc::now();
+                    let year = now.year();
+                    let month = now.month();
+
+                    let first_day_of_this_month =
+                        NaiveDate::from_ymd_opt(year, month, 1)?.and_hms_opt(0, 0, 0)?;
+
+                    let next_month = if month == 12 { 1 } else { month + 1 };
+                    let next_month_year = if month == 12 { year + 1 } else { year };
+                    let first_day_of_next_month =
+                        NaiveDate::from_ymd_opt(next_month_year, next_month, 1)?
+                            .and_hms_opt(23, 59, 59)?;
+
+                    let last_day_of_this_month = first_day_of_next_month - chrono::Days::new(1);
+
+                    Some((first_day_of_this_month, last_day_of_this_month))
+                })
+            } else {
+                maybe!({
+                    let subscription = subscription?;
+                    let period_start_at = subscription.current_period_start_at()?;
+                    let period_end_at = subscription.current_period_end_at()?;
+
+                    Some((period_start_at.naive_utc(), period_end_at.naive_utc()))
+                })
+            },
            enable_model_request_overages: billing_preferences
                .as_ref()
                .map_or(false, |preferences| {
--- a/crates/collab/src/rpc.rs
+++ b/crates/collab/src/rpc.rs
@@ -37,6 +37,7 @@ use core::fmt::{self, Debug, Formatter};
 use reqwest_client::ReqwestClient;
 use rpc::proto::split_repository_update;
 use supermaven_api::{CreateExternalUserRequest, SupermavenAdminApi};
+use util::maybe;

 use futures::{
    FutureExt, SinkExt, StreamExt, TryStreamExt, channel::oneshot, future::BoxFuture,
@@ -2712,10 +2713,13 @@ async fn update_user_plan(user_id: UserId, session: &Session) -> Result<()> {
    let usage = if let Some(llm_db) = session.app_state.llm_db.clone() {
        let subscription = db.get_active_billing_subscription(user_id).await?;

-        let subscription_period = crate::db::billing_subscription::Model::current_period(
-            subscription,
-            session.is_staff(),
-        );
+        let subscription_period = maybe!({
+            let subscription = subscription?;
+            let period_start_at = subscription.current_period_start_at()?;
+            let period_end_at = subscription.current_period_end_at()?;
+
+            Some((period_start_at, period_end_at))
+        });

        if let Some((period_start_at, period_end_at)) = subscription_period {
            llm_db
@@ -2737,12 +2741,8 @@ async fn update_user_plan(user_id: UserId, session: &Session) -> Result<()> {
                trial_started_at: billing_customer
                    .and_then(|billing_customer| billing_customer.trial_started_at)
                    .map(|trial_started_at| trial_started_at.and_utc().timestamp() as u64),
-                is_usage_based_billing_enabled: if session.is_staff() {
-                    Some(true)
-                } else {
-                    billing_preferences
-                        .map(|preferences| preferences.model_request_overages_enabled)
-                },
+                is_usage_based_billing_enabled: billing_preferences
+                    .map(|preferences| preferences.model_request_overages_enabled),
                usage: usage.map(|usage| {
                    let plan = match plan {
                        proto::Plan::Free => zed_llm_client::Plan::Free,
--- a/crates/collab/src/stripe_billing.rs
+++ b/crates/collab/src/stripe_billing.rs
@@ -260,7 +260,7 @@ impl StripeBilling {
        const BILLING_THRESHOLD_IN_CENTS: i64 = 20 * 100;

        let price_per_unit = price.unit_amount.unwrap_or_default();
-        let _units_for_billing_threshold = BILLING_THRESHOLD_IN_CENTS / price_per_unit;
+        let units_for_billing_threshold = BILLING_THRESHOLD_IN_CENTS / price_per_unit;

        stripe::Subscription::update(
            &self.client,
@@ -268,6 +268,9 @@ impl StripeBilling {
            stripe::UpdateSubscription {
                items: Some(vec![stripe::UpdateSubscriptionItems {
                    price: Some(price.id.to_string()),
+                    billing_thresholds: Some(stripe::SubscriptionItemBillingThresholds {
+                        usage_gte: Some(units_for_billing_threshold),
+                    }),
                    ..Default::default()
                }]),
                trial_settings: Some(stripe::UpdateSubscriptionTrialSettings {
--- a/crates/collab/src/tests/integration_tests.rs
+++ b/crates/collab/src/tests/integration_tests.rs
@@ -6709,6 +6709,8 @@ async fn test_context_collaboration_with_reconnect(
        assert_eq!(project.collaborators().len(), 1);
    });

+    cx_a.update(context_server::init);
+    cx_b.update(context_server::init);
    let prompt_builder = Arc::new(PromptBuilder::new(None).unwrap());
    let context_store_a = cx_a
        .update(|cx| {
--- a/crates/collab/src/tests/test_server.rs
+++ b/crates/collab/src/tests/test_server.rs
@@ -709,7 +709,6 @@ impl TestClient {
        worktree
            .read_with(cx, |tree, _| tree.as_local().unwrap().scan_complete())
            .await;
-        cx.run_until_parked();
        (project, worktree.read_with(cx, |tree, _| tree.id()))
    }

--- a/crates/collab_ui/src/notification_panel.rs
+++ b/crates/collab_ui/src/notification_panel.rs
@@ -22,9 +22,7 @@ use ui::{
    Avatar, Button, Icon, IconButton, IconName, Label, Tab, Tooltip, h_flex, prelude::*, v_flex,
 };
 use util::{ResultExt, TryFutureExt};
-use workspace::notifications::{
-    Notification as WorkspaceNotification, NotificationId, SuppressEvent,
-};
+use workspace::notifications::{Notification as WorkspaceNotification, NotificationId};
 use workspace::{
    Workspace,
    dock::{DockPosition, Panel, PanelEvent},
@@ -825,11 +823,6 @@ impl Render for NotificationToast {
                IconButton::new("close", IconName::Close)
                    .on_click(cx.listener(|_, _, _, cx| cx.emit(DismissEvent))),
            )
-            .child(
-                IconButton::new("suppress", IconName::XCircle)
-                    .tooltip(Tooltip::text("Do not show until restart"))
-                    .on_click(cx.listener(|_, _, _, cx| cx.emit(SuppressEvent))),
-            )
            .on_click(cx.listener(|this, _, window, cx| {
                this.focus_notification_panel(window, cx);
                cx.emit(DismissEvent);
@@ -838,4 +831,3 @@ impl Render for NotificationToast {
 }

 impl EventEmitter<DismissEvent> for NotificationToast {}
-impl EventEmitter<SuppressEvent> for NotificationToast {}
--- a/crates/component/Cargo.toml
+++ b/crates/component/Cargo.toml
@@ -16,7 +16,6 @@ collections.workspace = true
 gpui.workspace = true
 linkme.workspace = true
 parking_lot.workspace = true
-strum.workspace = true
 theme.workspace = true
 workspace-hack.workspace = true

--- a/crates/component/src/component.rs
+++ b/crates/component/src/component.rs
@@ -1,197 +1,26 @@
-//! # Component
-//!
-//! This module provides the Component trait, which is used to define
-//! components for visual testing and debugging.
-//!
-//! Additionally, it includes layouts for rendering component examples
-//! and example groups, as well as the distributed slice mechanism for
-//! registering components.
-
-mod component_layout;
-
-pub use component_layout::*;
-
+use std::fmt::Display;
+use std::ops::{Deref, DerefMut};
 use std::sync::LazyLock;

 use collections::HashMap;
-use gpui::{AnyElement, App, SharedString, Window};
+use gpui::{
+    AnyElement, App, IntoElement, Pixels, RenderOnce, SharedString, Window, div, pattern_slash,
+    prelude::*, px, rems,
+};
 use linkme::distributed_slice;
 use parking_lot::RwLock;
-use strum::{Display, EnumString};
+use theme::ActiveTheme;

-pub fn components() -> ComponentRegistry {
-    COMPONENT_DATA.read().clone()
-}
-
-pub fn init() {
-    let component_fns: Vec<_> = __ALL_COMPONENTS.iter().cloned().collect();
-    for f in component_fns {
-        f();
-    }
-}
-
-pub fn register_component<T: Component>() {
-    let id = T::id();
-    let metadata = ComponentMetadata {
-        id: id.clone(),
-        description: T::description().map(Into::into),
-        name: SharedString::new_static(T::name()),
-        preview: Some(T::preview),
-        scope: T::scope(),
-        sort_name: SharedString::new_static(T::sort_name()),
-        status: T::status(),
-    };
-
-    let mut data = COMPONENT_DATA.write();
-    data.components.insert(id, metadata);
-}
-
-#[distributed_slice]
-pub static __ALL_COMPONENTS: [fn()] = [..];
-
-pub static COMPONENT_DATA: LazyLock<RwLock<ComponentRegistry>> =
-    LazyLock::new(|| RwLock::new(ComponentRegistry::default()));
-
-#[derive(Default, Clone)]
-pub struct ComponentRegistry {
-    components: HashMap<ComponentId, ComponentMetadata>,
-}
-
-impl ComponentRegistry {
-    pub fn previews(&self) -> Vec<&ComponentMetadata> {
-        self.components
-            .values()
-            .filter(|c| c.preview.is_some())
-            .collect()
-    }
-
-    pub fn sorted_previews(&self) -> Vec<ComponentMetadata> {
-        let mut previews: Vec<ComponentMetadata> = self.previews().into_iter().cloned().collect();
-        previews.sort_by_key(|a| a.name());
-        previews
-    }
-
-    pub fn components(&self) -> Vec<&ComponentMetadata> {
-        self.components.values().collect()
-    }
-
-    pub fn sorted_components(&self) -> Vec<ComponentMetadata> {
-        let mut components: Vec<ComponentMetadata> =
-            self.components().into_iter().cloned().collect();
-        components.sort_by_key(|a| a.name());
-        components
-    }
-
-    pub fn component_map(&self) -> HashMap<ComponentId, ComponentMetadata> {
-        self.components.clone()
-    }
-
-    pub fn get(&self, id: &ComponentId) -> Option<&ComponentMetadata> {
-        self.components.get(id)
-    }
-
-    pub fn len(&self) -> usize {
-        self.components.len()
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct ComponentId(pub &'static str);
-
-#[derive(Clone)]
-pub struct ComponentMetadata {
-    id: ComponentId,
-    description: Option<SharedString>,
-    name: SharedString,
-    preview: Option<fn(&mut Window, &mut App) -> Option<AnyElement>>,
-    scope: ComponentScope,
-    sort_name: SharedString,
-    status: ComponentStatus,
-}
-
-impl ComponentMetadata {
-    pub fn id(&self) -> ComponentId {
-        self.id.clone()
-    }
-
-    pub fn description(&self) -> Option<SharedString> {
-        self.description.clone()
-    }
-
-    pub fn name(&self) -> SharedString {
-        self.name.clone()
-    }
-
-    pub fn preview(&self) -> Option<fn(&mut Window, &mut App) -> Option<AnyElement>> {
-        self.preview
-    }
-
-    pub fn scope(&self) -> ComponentScope {
-        self.scope.clone()
-    }
-
-    pub fn sort_name(&self) -> SharedString {
-        self.sort_name.clone()
-    }
-
-    pub fn scopeless_name(&self) -> SharedString {
-        self.name
-            .clone()
-            .split("::")
-            .last()
-            .unwrap_or(&self.name)
-            .to_string()
-            .into()
-    }
-
-    pub fn status(&self) -> ComponentStatus {
-        self.status.clone()
-    }
-}
-
-/// Implement this trait to define a UI component. This will allow you to
-/// derive `RegisterComponent` on it, in tutn allowing you to preview the
-/// contents of the preview fn in `workspace: open component preview`.
-///
-/// This can be useful for visual debugging and testing, documenting UI
-/// patterns, or simply showing all the variants of a component.
-///
-/// Generally you will want to implement at least `scope` and `preview`
-/// from this trait, so you can preview the component, and it will show up
-/// in a section that makes sense.
 pub trait Component {
-    /// The component's unique identifier.
-    ///
-    /// Used to access previews, or state for more
-    /// complex, stateful components.
-    fn id() -> ComponentId {
-        ComponentId(Self::name())
-    }
-    /// Returns the scope of the component.
-    ///
-    /// This scope is used to determine how components and
-    /// their previews are displayed and organized.
    fn scope() -> ComponentScope {
        ComponentScope::None
    }
-    /// The ready status of this component.
-    ///
-    /// Use this to mark when components are:
-    /// - `WorkInProgress`: Still being designed or are partially implemented.
-    /// - `EngineeringReady`: Ready to be implemented.
-    /// - `Deprecated`: No longer recommended for use.
-    ///
-    /// Defaults to [`Live`](ComponentStatus::Live).
-    fn status() -> ComponentStatus {
-        ComponentStatus::Live
-    }
-    /// The name of the component.
-    ///
-    /// This name is used to identify the component
-    /// and is usually derived from the component's type.
    fn name() -> &'static str {
        std::any::type_name::<Self>()
    }
+    fn id() -> ComponentId {
+        ComponentId(Self::name())
+    }
    /// Returns a name that the component should be sorted by.
    ///
    /// Implement this if the component should be sorted in an alternate order than its name.
@@ -208,107 +37,408 @@ pub trait Component {
    fn sort_name() -> &'static str {
        Self::name()
    }
-    /// An optional description of the component.
-    ///
-    /// This will be displayed in the component's preview. To show a
-    /// component's doc comment as it's description, derive `Documented`.
-    ///
-    /// Example:
-    ///
-    /// ```
-    /// /// This is a doc comment.
-    /// #[derive(Documented)]
-    /// struct MyComponent;
-    ///
-    /// impl MyComponent {
-    ///     fn description() -> Option<&'static str> {
-    ///         Some(Self::DOCS)
-    ///     }
-    /// }
-    /// ```
-    ///
-    /// This will result in "This is a doc comment." being passed
-    /// to the component's description.
    fn description() -> Option<&'static str> {
        None
    }
-    /// The component's preview.
-    ///
-    /// An element returned here will be shown in the component's preview.
-    ///
-    /// Useful component helpers:
-    /// - [`component::single_example`]
-    /// - [`component::component_group`]
-    /// - [`component::component_group_with_title`]
-    ///
-    /// Note: Any arbitrary element can be returned here.
-    ///
-    /// This is useful for displaying related UI to the component you are
-    /// trying to preview, such as a button that opens a modal or shows a
-    /// tooltip on hover, or a grid of icons showcasing all the icons available.
    fn preview(_window: &mut Window, _cx: &mut App) -> Option<AnyElement> {
        None
    }
 }

-/// The ready status of this component.
-///
-/// Use this to mark when components are:
-/// - `WorkInProgress`: Still being designed or are partially implemented.
-/// - `EngineeringReady`: Ready to be implemented.
-/// - `Deprecated`: No longer recommended for use.
-///
-/// Defaults to [`Live`](ComponentStatus::Live).
-#[derive(Debug, Clone, PartialEq, Eq, Hash, Display, EnumString)]
-pub enum ComponentStatus {
-    #[strum(serialize = "Work In Progress")]
-    WorkInProgress,
-    #[strum(serialize = "Ready To Build")]
-    EngineeringReady,
-    Live,
-    Deprecated,
+#[distributed_slice]
+pub static __ALL_COMPONENTS: [fn()] = [..];
+
+pub static COMPONENT_DATA: LazyLock<RwLock<ComponentRegistry>> =
+    LazyLock::new(|| RwLock::new(ComponentRegistry::new()));
+
+pub struct ComponentRegistry {
+    components: Vec<(
+        ComponentScope,
+        // name
+        &'static str,
+        // sort name
+        &'static str,
+        // description
+        Option<&'static str>,
+    )>,
+    previews: HashMap<&'static str, fn(&mut Window, &mut App) -> Option<AnyElement>>,
 }

-impl ComponentStatus {
-    pub fn description(&self) -> &str {
-        match self {
-            ComponentStatus::WorkInProgress => {
-                "These components are still being designed or refined. They shouldn't be used in the app yet."
-            }
-            ComponentStatus::EngineeringReady => {
-                "These components are design complete or partially implemented, and are ready for an engineer to complete their implementation."
-            }
-            ComponentStatus::Live => "These components are ready for use in the app.",
-            ComponentStatus::Deprecated => {
-                "These components are no longer recommended for use in the app, and may be removed in a future release."
-            }
+impl ComponentRegistry {
+    fn new() -> Self {
+        ComponentRegistry {
+            components: Vec::new(),
+            previews: HashMap::default(),
        }
    }
 }

-#[derive(Debug, Clone, PartialEq, Eq, Hash, Display, EnumString)]
+pub fn init() {
+    let component_fns: Vec<_> = __ALL_COMPONENTS.iter().cloned().collect();
+    for f in component_fns {
+        f();
+    }
+}
+
+pub fn register_component<T: Component>() {
+    let component_data = (T::scope(), T::name(), T::sort_name(), T::description());
+    let mut data = COMPONENT_DATA.write();
+    data.components.push(component_data);
+    data.previews.insert(T::id().0, T::preview);
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct ComponentId(pub &'static str);
+
+#[derive(Clone)]
+pub struct ComponentMetadata {
+    id: ComponentId,
+    name: SharedString,
+    sort_name: SharedString,
+    scope: ComponentScope,
+    description: Option<SharedString>,
+    preview: Option<fn(&mut Window, &mut App) -> Option<AnyElement>>,
+}
+
+impl ComponentMetadata {
+    pub fn id(&self) -> ComponentId {
+        self.id.clone()
+    }
+    pub fn name(&self) -> SharedString {
+        self.name.clone()
+    }
+
+    pub fn sort_name(&self) -> SharedString {
+        self.sort_name.clone()
+    }
+
+    pub fn scopeless_name(&self) -> SharedString {
+        self.name
+            .clone()
+            .split("::")
+            .last()
+            .unwrap_or(&self.name)
+            .to_string()
+            .into()
+    }
+
+    pub fn scope(&self) -> ComponentScope {
+        self.scope.clone()
+    }
+    pub fn description(&self) -> Option<SharedString> {
+        self.description.clone()
+    }
+    pub fn preview(&self) -> Option<fn(&mut Window, &mut App) -> Option<AnyElement>> {
+        self.preview
+    }
+}
+
+pub struct AllComponents(pub HashMap<ComponentId, ComponentMetadata>);
+
+impl AllComponents {
+    pub fn new() -> Self {
+        AllComponents(HashMap::default())
+    }
+    pub fn all_previews(&self) -> Vec<&ComponentMetadata> {
+        self.0.values().filter(|c| c.preview.is_some()).collect()
+    }
+    pub fn all_previews_sorted(&self) -> Vec<ComponentMetadata> {
+        let mut previews: Vec<ComponentMetadata> =
+            self.all_previews().into_iter().cloned().collect();
+        previews.sort_by_key(|a| a.name());
+        previews
+    }
+    pub fn all(&self) -> Vec<&ComponentMetadata> {
+        self.0.values().collect()
+    }
+    pub fn all_sorted(&self) -> Vec<ComponentMetadata> {
+        let mut components: Vec<ComponentMetadata> = self.all().into_iter().cloned().collect();
+        components.sort_by_key(|a| a.name());
+        components
+    }
+}
+
+impl Deref for AllComponents {
+    type Target = HashMap<ComponentId, ComponentMetadata>;
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
+impl DerefMut for AllComponents {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.0
+    }
+}
+
+pub fn components() -> AllComponents {
+    let data = COMPONENT_DATA.read();
+    let mut all_components = AllComponents::new();
+    for (scope, name, sort_name, description) in &data.components {
+        let preview = data.previews.get(name).cloned();
+        let component_name = SharedString::new_static(name);
+        let sort_name = SharedString::new_static(sort_name);
+        let id = ComponentId(name);
+        all_components.insert(
+            id.clone(),
+            ComponentMetadata {
+                id,
+                name: component_name,
+                sort_name,
+                scope: scope.clone(),
+                description: description.map(Into::into),
+                preview,
+            },
+        );
+    }
+    all_components
+}
+
+// #[derive(Debug, Clone, PartialEq, Eq, Hash)]
+// pub enum ComponentStatus {
+//     WorkInProgress,
+//     EngineeringReady,
+//     Live,
+//     Deprecated,
+// }
+
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub enum ComponentScope {
    Agent,
    Collaboration,
-    #[strum(serialize = "Data Display")]
    DataDisplay,
    Editor,
-    #[strum(serialize = "Images & Icons")]
    Images,
-    #[strum(serialize = "Forms & Input")]
    Input,
-    #[strum(serialize = "Layout & Structure")]
    Layout,
-    #[strum(serialize = "Loading & Progress")]
    Loading,
    Navigation,
-    #[strum(serialize = "Unsorted")]
    None,
    Notification,
-    #[strum(serialize = "Overlays & Layering")]
    Overlays,
    Status,
    Typography,
-    #[strum(serialize = "Version Control")]
    VersionControl,
 }
+
+impl Display for ComponentScope {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            ComponentScope::Agent => write!(f, "Agent"),
+            ComponentScope::Collaboration => write!(f, "Collaboration"),
+            ComponentScope::DataDisplay => write!(f, "Data Display"),
+            ComponentScope::Editor => write!(f, "Editor"),
+            ComponentScope::Images => write!(f, "Images & Icons"),
+            ComponentScope::Input => write!(f, "Forms & Input"),
+            ComponentScope::Layout => write!(f, "Layout & Structure"),
+            ComponentScope::Loading => write!(f, "Loading & Progress"),
+            ComponentScope::Navigation => write!(f, "Navigation"),
+            ComponentScope::None => write!(f, "Unsorted"),
+            ComponentScope::Notification => write!(f, "Notification"),
+            ComponentScope::Overlays => write!(f, "Overlays & Layering"),
+            ComponentScope::Status => write!(f, "Status"),
+            ComponentScope::Typography => write!(f, "Typography"),
+            ComponentScope::VersionControl => write!(f, "Version Control"),
+        }
+    }
+}
+
+/// A single example of a component.
+#[derive(IntoElement)]
+pub struct ComponentExample {
+    pub variant_name: SharedString,
+    pub description: Option<SharedString>,
+    pub element: AnyElement,
+    pub width: Option<Pixels>,
+}
+
+impl RenderOnce for ComponentExample {
+    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
+        div()
+            .pt_2()
+            .map(|this| {
+                if let Some(width) = self.width {
+                    this.w(width)
+                } else {
+                    this.w_full()
+                }
+            })
+            .flex()
+            .flex_col()
+            .gap_3()
+            .child(
+                div()
+                    .flex()
+                    .flex_col()
+                    .child(
+                        div()
+                            .child(self.variant_name.clone())
+                            .text_size(rems(1.0))
+                            .text_color(cx.theme().colors().text),
+                    )
+                    .when_some(self.description, |this, description| {
+                        this.child(
+                            div()
+                                .text_size(rems(0.875))
+                                .text_color(cx.theme().colors().text_muted)
+                                .child(description.clone()),
+                        )
+                    }),
+            )
+            .child(
+                div()
+                    .flex()
+                    .w_full()
+                    .rounded_xl()
+                    .min_h(px(100.))
+                    .justify_center()
+                    .p_8()
+                    .border_1()
+                    .border_color(cx.theme().colors().border.opacity(0.5))
+                    .bg(pattern_slash(
+                        cx.theme().colors().surface_background.opacity(0.5),
+                        12.0,
+                        12.0,
+                    ))
+                    .shadow_sm()
+                    .child(self.element),
+            )
+            .into_any_element()
+    }
+}
+
+impl ComponentExample {
+    pub fn new(variant_name: impl Into<SharedString>, element: AnyElement) -> Self {
+        Self {
+            variant_name: variant_name.into(),
+            element,
+            description: None,
+            width: None,
+        }
+    }
+
+    pub fn description(mut self, description: impl Into<SharedString>) -> Self {
+        self.description = Some(description.into());
+        self
+    }
+
+    pub fn width(mut self, width: Pixels) -> Self {
+        self.width = Some(width);
+        self
+    }
+}
+
+/// A group of component examples.
+#[derive(IntoElement)]
+pub struct ComponentExampleGroup {
+    pub title: Option<SharedString>,
+    pub examples: Vec<ComponentExample>,
+    pub width: Option<Pixels>,
+    pub grow: bool,
+    pub vertical: bool,
+}
+
+impl RenderOnce for ComponentExampleGroup {
+    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
+        div()
+            .flex_col()
+            .text_sm()
+            .text_color(cx.theme().colors().text_muted)
+            .map(|this| {
+                if let Some(width) = self.width {
+                    this.w(width)
+                } else {
+                    this.w_full()
+                }
+            })
+            .when_some(self.title, |this, title| {
+                this.gap_4().child(
+                    div()
+                        .flex()
+                        .items_center()
+                        .gap_3()
+                        .pb_1()
+                        .child(div().h_px().w_4().bg(cx.theme().colors().border))
+                        .child(
+                            div()
+                                .flex_none()
+                                .text_size(px(10.))
+                                .child(title.to_uppercase()),
+                        )
+                        .child(
+                            div()
+                                .h_px()
+                                .w_full()
+                                .flex_1()
+                                .bg(cx.theme().colors().border),
+                        ),
+                )
+            })
+            .child(
+                div()
+                    .flex()
+                    .flex_col()
+                    .items_start()
+                    .w_full()
+                    .gap_6()
+                    .children(self.examples)
+                    .into_any_element(),
+            )
+            .into_any_element()
+    }
+}
+
+impl ComponentExampleGroup {
+    pub fn new(examples: Vec<ComponentExample>) -> Self {
+        Self {
+            title: None,
+            examples,
+            width: None,
+            grow: false,
+            vertical: false,
+        }
+    }
+    pub fn with_title(title: impl Into<SharedString>, examples: Vec<ComponentExample>) -> Self {
+        Self {
+            title: Some(title.into()),
+            examples,
+            width: None,
+            grow: false,
+            vertical: false,
+        }
+    }
+    pub fn width(mut self, width: Pixels) -> Self {
+        self.width = Some(width);
+        self
+    }
+    pub fn grow(mut self) -> Self {
+        self.grow = true;
+        self
+    }
+    pub fn vertical(mut self) -> Self {
+        self.vertical = true;
+        self
+    }
+}
+
+pub fn single_example(
+    variant_name: impl Into<SharedString>,
+    example: AnyElement,
+) -> ComponentExample {
+    ComponentExample::new(variant_name, example)
+}
+
+pub fn empty_example(variant_name: impl Into<SharedString>) -> ComponentExample {
+    ComponentExample::new(variant_name, div().w_full().text_center().items_center().text_xs().opacity(0.4).child("This space is intentionally left blank. It indicates a case that should render nothing.").into_any_element())
+}
+
+pub fn example_group(examples: Vec<ComponentExample>) -> ComponentExampleGroup {
+    ComponentExampleGroup::new(examples)
+}
+
+pub fn example_group_with_title(
+    title: impl Into<SharedString>,
+    examples: Vec<ComponentExample>,
+) -> ComponentExampleGroup {
+    ComponentExampleGroup::with_title(title, examples)
+}
--- a/crates/component/src/component_layout.rs
+++ b/crates/component/src/component_layout.rs
@@ -1,205 +0,0 @@
-use gpui::{
-    AnyElement, App, IntoElement, Pixels, RenderOnce, SharedString, Window, div, pattern_slash,
-    prelude::*, px, rems,
-};
-use theme::ActiveTheme;
-
-/// A single example of a component.
-#[derive(IntoElement)]
-pub struct ComponentExample {
-    pub variant_name: SharedString,
-    pub description: Option<SharedString>,
-    pub element: AnyElement,
-    pub width: Option<Pixels>,
-}
-
-impl RenderOnce for ComponentExample {
-    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
-        div()
-            .pt_2()
-            .map(|this| {
-                if let Some(width) = self.width {
-                    this.w(width)
-                } else {
-                    this.w_full()
-                }
-            })
-            .flex()
-            .flex_col()
-            .gap_3()
-            .child(
-                div()
-                    .flex()
-                    .flex_col()
-                    .child(
-                        div()
-                            .child(self.variant_name.clone())
-                            .text_size(rems(1.0))
-                            .text_color(cx.theme().colors().text),
-                    )
-                    .when_some(self.description, |this, description| {
-                        this.child(
-                            div()
-                                .text_size(rems(0.875))
-                                .text_color(cx.theme().colors().text_muted)
-                                .child(description.clone()),
-                        )
-                    }),
-            )
-            .child(
-                div()
-                    .flex()
-                    .w_full()
-                    .rounded_xl()
-                    .min_h(px(100.))
-                    .justify_center()
-                    .p_8()
-                    .border_1()
-                    .border_color(cx.theme().colors().border.opacity(0.5))
-                    .bg(pattern_slash(
-                        cx.theme().colors().surface_background.opacity(0.5),
-                        12.0,
-                        12.0,
-                    ))
-                    .shadow_sm()
-                    .child(self.element),
-            )
-            .into_any_element()
-    }
-}
-
-impl ComponentExample {
-    pub fn new(variant_name: impl Into<SharedString>, element: AnyElement) -> Self {
-        Self {
-            variant_name: variant_name.into(),
-            element,
-            description: None,
-            width: None,
-        }
-    }
-
-    pub fn description(mut self, description: impl Into<SharedString>) -> Self {
-        self.description = Some(description.into());
-        self
-    }
-
-    pub fn width(mut self, width: Pixels) -> Self {
-        self.width = Some(width);
-        self
-    }
-}
-
-/// A group of component examples.
-#[derive(IntoElement)]
-pub struct ComponentExampleGroup {
-    pub title: Option<SharedString>,
-    pub examples: Vec<ComponentExample>,
-    pub width: Option<Pixels>,
-    pub grow: bool,
-    pub vertical: bool,
-}
-
-impl RenderOnce for ComponentExampleGroup {
-    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
-        div()
-            .flex_col()
-            .text_sm()
-            .text_color(cx.theme().colors().text_muted)
-            .map(|this| {
-                if let Some(width) = self.width {
-                    this.w(width)
-                } else {
-                    this.w_full()
-                }
-            })
-            .when_some(self.title, |this, title| {
-                this.gap_4().child(
-                    div()
-                        .flex()
-                        .items_center()
-                        .gap_3()
-                        .pb_1()
-                        .child(div().h_px().w_4().bg(cx.theme().colors().border))
-                        .child(
-                            div()
-                                .flex_none()
-                                .text_size(px(10.))
-                                .child(title.to_uppercase()),
-                        )
-                        .child(
-                            div()
-                                .h_px()
-                                .w_full()
-                                .flex_1()
-                                .bg(cx.theme().colors().border),
-                        ),
-                )
-            })
-            .child(
-                div()
-                    .flex()
-                    .flex_col()
-                    .items_start()
-                    .w_full()
-                    .gap_6()
-                    .children(self.examples)
-                    .into_any_element(),
-            )
-            .into_any_element()
-    }
-}
-
-impl ComponentExampleGroup {
-    pub fn new(examples: Vec<ComponentExample>) -> Self {
-        Self {
-            title: None,
-            examples,
-            width: None,
-            grow: false,
-            vertical: false,
-        }
-    }
-    pub fn with_title(title: impl Into<SharedString>, examples: Vec<ComponentExample>) -> Self {
-        Self {
-            title: Some(title.into()),
-            examples,
-            width: None,
-            grow: false,
-            vertical: false,
-        }
-    }
-    pub fn width(mut self, width: Pixels) -> Self {
-        self.width = Some(width);
-        self
-    }
-    pub fn grow(mut self) -> Self {
-        self.grow = true;
-        self
-    }
-    pub fn vertical(mut self) -> Self {
-        self.vertical = true;
-        self
-    }
-}
-
-pub fn single_example(
-    variant_name: impl Into<SharedString>,
-    example: AnyElement,
-) -> ComponentExample {
-    ComponentExample::new(variant_name, example)
-}
-
-pub fn empty_example(variant_name: impl Into<SharedString>) -> ComponentExample {
-    ComponentExample::new(variant_name, div().w_full().text_center().items_center().text_xs().opacity(0.4).child("This space is intentionally left blank. It indicates a case that should render nothing.").into_any_element())
-}
-
-pub fn example_group(examples: Vec<ComponentExample>) -> ComponentExampleGroup {
-    ComponentExampleGroup::new(examples)
-}
-
-pub fn example_group_with_title(
-    title: impl Into<SharedString>,
-    examples: Vec<ComponentExample>,
-) -> ComponentExampleGroup {
-    ComponentExampleGroup::with_title(title, examples)
-}
--- a/crates/component_preview/Cargo.toml
+++ b/crates/component_preview/Cargo.toml
@@ -21,7 +21,6 @@ client.workspace = true
 collections.workspace = true
 component.workspace = true
 db.workspace = true
-futures.workspace = true
 gpui.workspace = true
 languages.workspace = true
 log.workspace = true
@@ -31,7 +30,6 @@ prompt_store.workspace = true
 serde.workspace = true
 ui.workspace = true
 ui_input.workspace = true
-util.workspace = true
 workspace-hack.workspace = true
 workspace.workspace = true
 assistant_tool.workspace = true
--- a/crates/component_preview/src/component_preview.rs
+++ b/crates/component_preview/src/component_preview.rs
@@ -5,13 +5,12 @@
 mod persistence;
 mod preview_support;

+use std::iter::Iterator;
 use std::sync::Arc;

-use std::iter::Iterator;
-
-use agent::{ActiveThread, TextThreadStore, ThreadStore};
+use agent::{ActiveThread, ThreadStore};
 use client::UserStore;
-use component::{ComponentId, ComponentMetadata, ComponentStatus, components};
+use component::{ComponentId, ComponentMetadata, components};
 use gpui::{
    App, Entity, EventEmitter, FocusHandle, Focusable, Task, WeakEntity, Window, list, prelude::*,
 };
@@ -22,13 +21,11 @@ use gpui::{ListState, ScrollHandle, ScrollStrategy, UniformListScrollHandle};
 use languages::LanguageRegistry;
 use notifications::status_toast::{StatusToast, ToastIcon};
 use persistence::COMPONENT_PREVIEW_DB;
-use preview_support::active_thread::{
-    load_preview_text_thread_store, load_preview_thread_store, static_active_thread,
-};
+use preview_support::active_thread::{load_preview_thread_store, static_active_thread};
 use project::Project;
-use ui::{ButtonLike, Divider, HighlightedLabel, ListItem, ListSubHeader, Tooltip, prelude::*};
+use ui::{Divider, HighlightedLabel, ListItem, ListSubHeader, prelude::*};
+
 use ui_input::SingleLineInput;
-use util::ResultExt as _;
 use workspace::{AppState, ItemId, SerializableItem, delete_unloaded_items};
 use workspace::{Item, Workspace, WorkspaceId, item::ItemEvent};

@@ -105,24 +102,25 @@ enum PreviewPage {
 }

 struct ComponentPreview {
-    active_page: PreviewPage,
-    active_thread: Option<Entity<ActiveThread>>,
-    component_list: ListState,
+    workspace_id: Option<WorkspaceId>,
+    focus_handle: FocusHandle,
+    _view_scroll_handle: ScrollHandle,
+    nav_scroll_handle: UniformListScrollHandle,
    component_map: HashMap<ComponentId, ComponentMetadata>,
+    active_page: PreviewPage,
    components: Vec<ComponentMetadata>,
+    component_list: ListState,
    cursor_index: usize,
+    language_registry: Arc<LanguageRegistry>,
+    workspace: WeakEntity<Workspace>,
+    project: Entity<Project>,
+    user_store: Entity<UserStore>,
    filter_editor: Entity<SingleLineInput>,
    filter_text: String,
-    focus_handle: FocusHandle,
-    language_registry: Arc<LanguageRegistry>,
-    nav_scroll_handle: UniformListScrollHandle,
-    project: Entity<Project>,
-    text_thread_store: Option<Entity<TextThreadStore>>,
+
+    // preview support
    thread_store: Option<Entity<ThreadStore>>,
-    user_store: Entity<UserStore>,
-    workspace: WeakEntity<Workspace>,
-    workspace_id: Option<WorkspaceId>,
-    _view_scroll_handle: ScrollHandle,
+    active_thread: Option<Entity<ActiveThread>>,
 }

 impl ComponentPreview {
@@ -139,32 +137,25 @@ impl ComponentPreview {
        let workspace_clone = workspace.clone();
        let project_clone = project.clone();

-        cx.spawn_in(window, async move |entity, cx| {
-            let thread_store_future =
-                load_preview_thread_store(workspace_clone.clone(), project_clone.clone(), cx);
-            let text_thread_store_future =
-                load_preview_text_thread_store(workspace_clone.clone(), project_clone.clone(), cx);
+        let entity = cx.weak_entity();
+        window
+            .spawn(cx, async move |cx| {
+                let thread_store_task =
+                    load_preview_thread_store(workspace_clone.clone(), project_clone.clone(), cx)
+                        .await;

-            let (thread_store_result, text_thread_store_result) =
-                futures::join!(thread_store_future, text_thread_store_future);
+                if let Ok(thread_store) = thread_store_task.await {
+                    entity
+                        .update_in(cx, |this, window, cx| {
+                            this.thread_store = Some(thread_store.clone());
+                            this.create_active_thread(window, cx);
+                        })
+                        .ok();
+                }
+            })
+            .detach();

-            if let (Some(thread_store), Some(text_thread_store)) = (
-                thread_store_result.log_err(),
-                text_thread_store_result.log_err(),
-            ) {
-                entity
-                    .update_in(cx, |this, window, cx| {
-                        this.thread_store = Some(thread_store.clone());
-                        this.text_thread_store = Some(text_thread_store.clone());
-                        this.create_active_thread(window, cx);
-                    })
-                    .ok();
-            }
-        })
-        .detach();
-
-        let component_registry = Arc::new(components());
-        let sorted_components = component_registry.sorted_components();
+        let sorted_components = components().all_sorted();
        let selected_index = selected_index.into().unwrap_or(0);
        let active_page = active_page.unwrap_or(PreviewPage::AllComponents);
        let filter_editor =
@@ -188,24 +179,23 @@ impl ComponentPreview {
        );

        let mut component_preview = Self {
+            workspace_id: None,
+            focus_handle: cx.focus_handle(),
+            _view_scroll_handle: ScrollHandle::new(),
+            nav_scroll_handle: UniformListScrollHandle::new(),
+            language_registry,
+            user_store,
+            workspace,
+            project,
            active_page,
-            active_thread: None,
-            component_list,
-            component_map: component_registry.component_map(),
+            component_map: components().0,
            components: sorted_components,
+            component_list,
            cursor_index: selected_index,
            filter_editor,
            filter_text: String::new(),
-            focus_handle: cx.focus_handle(),
-            language_registry,
-            nav_scroll_handle: UniformListScrollHandle::new(),
-            project,
-            text_thread_store: None,
            thread_store: None,
-            user_store,
-            workspace,
-            workspace_id: None,
-            _view_scroll_handle: ScrollHandle::new(),
+            active_thread: None,
        };

        if component_preview.cursor_index > 0 {
@@ -230,17 +220,12 @@ impl ComponentPreview {
        let weak_handle = self.workspace.clone();
        if let Some(workspace) = workspace.upgrade() {
            let project = workspace.read(cx).project().clone();
-            if let Some((thread_store, text_thread_store)) = self
-                .thread_store
-                .clone()
-                .zip(self.text_thread_store.clone())
-            {
+            if let Some(thread_store) = self.thread_store.clone() {
                let active_thread = static_active_thread(
                    weak_handle,
                    project,
                    language_registry,
                    thread_store,
-                    text_thread_store,
                    window,
                    cx,
                );
@@ -412,88 +397,6 @@ impl ComponentPreview {
        entries
    }

-    fn update_component_list(&mut self, cx: &mut Context<Self>) {
-        let entries = self.scope_ordered_entries();
-        let new_len = entries.len();
-        let weak_entity = cx.entity().downgrade();
-
-        if new_len > 0 {
-            self.nav_scroll_handle
-                .scroll_to_item(0, ScrollStrategy::Top);
-        }
-
-        let filtered_components = self.filtered_components();
-
-        if !self.filter_text.is_empty() && !matches!(self.active_page, PreviewPage::AllComponents) {
-            if let PreviewPage::Component(ref component_id) = self.active_page {
-                let component_still_visible = filtered_components
-                    .iter()
-                    .any(|component| component.id() == *component_id);
-
-                if !component_still_visible {
-                    if !filtered_components.is_empty() {
-                        let first_component = &filtered_components[0];
-                        self.set_active_page(PreviewPage::Component(first_component.id()), cx);
-                    } else {
-                        self.set_active_page(PreviewPage::AllComponents, cx);
-                    }
-                }
-            }
-        }
-
-        self.component_list = ListState::new(
-            filtered_components.len(),
-            gpui::ListAlignment::Top,
-            px(1500.0),
-            {
-                let components = filtered_components.clone();
-                let this = cx.entity().downgrade();
-                move |ix, window: &mut Window, cx: &mut App| {
-                    if ix >= components.len() {
-                        return div().w_full().h_0().into_any_element();
-                    }
-
-                    this.update(cx, |this, cx| {
-                        let component = &components[ix];
-                        this.render_preview(component, window, cx)
-                            .into_any_element()
-                    })
-                    .unwrap()
-                }
-            },
-        );
-
-        let new_list = ListState::new(
-            new_len,
-            gpui::ListAlignment::Top,
-            px(1500.0),
-            move |ix, window, cx| {
-                if ix >= entries.len() {
-                    return div().w_full().h_0().into_any_element();
-                }
-
-                let entry = &entries[ix];
-
-                weak_entity
-                    .update(cx, |this, cx| match entry {
-                        PreviewEntry::Component(component, _) => this
-                            .render_preview(component, window, cx)
-                            .into_any_element(),
-                        PreviewEntry::SectionHeader(shared_string) => this
-                            .render_scope_header(ix, shared_string.clone(), window, cx)
-                            .into_any_element(),
-                        PreviewEntry::AllComponents => div().w_full().h_0().into_any_element(),
-                        PreviewEntry::ActiveThread => div().w_full().h_0().into_any_element(),
-                        PreviewEntry::Separator => div().w_full().h_0().into_any_element(),
-                    })
-                    .unwrap()
-            },
-        );
-
-        self.component_list = new_list;
-        cx.emit(ItemEvent::UpdateTab);
-    }
-
    fn render_sidebar_entry(
        &self,
        ix: usize,
@@ -577,6 +480,88 @@ impl ComponentPreview {
        }
    }

+    fn update_component_list(&mut self, cx: &mut Context<Self>) {
+        let entries = self.scope_ordered_entries();
+        let new_len = entries.len();
+        let weak_entity = cx.entity().downgrade();
+
+        if new_len > 0 {
+            self.nav_scroll_handle
+                .scroll_to_item(0, ScrollStrategy::Top);
+        }
+
+        let filtered_components = self.filtered_components();
+
+        if !self.filter_text.is_empty() && !matches!(self.active_page, PreviewPage::AllComponents) {
+            if let PreviewPage::Component(ref component_id) = self.active_page {
+                let component_still_visible = filtered_components
+                    .iter()
+                    .any(|component| component.id() == *component_id);
+
+                if !component_still_visible {
+                    if !filtered_components.is_empty() {
+                        let first_component = &filtered_components[0];
+                        self.set_active_page(PreviewPage::Component(first_component.id()), cx);
+                    } else {
+                        self.set_active_page(PreviewPage::AllComponents, cx);
+                    }
+                }
+            }
+        }
+
+        self.component_list = ListState::new(
+            filtered_components.len(),
+            gpui::ListAlignment::Top,
+            px(1500.0),
+            {
+                let components = filtered_components.clone();
+                let this = cx.entity().downgrade();
+                move |ix, window: &mut Window, cx: &mut App| {
+                    if ix >= components.len() {
+                        return div().w_full().h_0().into_any_element();
+                    }
+
+                    this.update(cx, |this, cx| {
+                        let component = &components[ix];
+                        this.render_preview(component, window, cx)
+                            .into_any_element()
+                    })
+                    .unwrap()
+                }
+            },
+        );
+
+        let new_list = ListState::new(
+            new_len,
+            gpui::ListAlignment::Top,
+            px(1500.0),
+            move |ix, window, cx| {
+                if ix >= entries.len() {
+                    return div().w_full().h_0().into_any_element();
+                }
+
+                let entry = &entries[ix];
+
+                weak_entity
+                    .update(cx, |this, cx| match entry {
+                        PreviewEntry::Component(component, _) => this
+                            .render_preview(component, window, cx)
+                            .into_any_element(),
+                        PreviewEntry::SectionHeader(shared_string) => this
+                            .render_scope_header(ix, shared_string.clone(), window, cx)
+                            .into_any_element(),
+                        PreviewEntry::AllComponents => div().w_full().h_0().into_any_element(),
+                        PreviewEntry::ActiveThread => div().w_full().h_0().into_any_element(),
+                        PreviewEntry::Separator => div().w_full().h_0().into_any_element(),
+                    })
+                    .unwrap()
+            },
+        );
+
+        self.component_list = new_list;
+        cx.emit(ItemEvent::UpdateTab);
+    }
+
    fn render_scope_header(
        &self,
        _ix: usize,
@@ -640,11 +625,15 @@ impl ComponentPreview {

        // Check if the component's scope is Agent
        if scope == ComponentScope::Agent {
-            if let Some(active_thread) = self.active_thread.clone() {
+            if let (Some(thread_store), Some(active_thread)) = (
+                self.thread_store.as_ref().map(|ts| ts.downgrade()),
+                self.active_thread.clone(),
+            ) {
                if let Some(element) = agent::get_agent_preview(
                    &component.id(),
                    self.workspace.clone(),
                    active_thread,
+                    thread_store,
                    window,
                    cx,
                ) {
@@ -695,10 +684,11 @@ impl ComponentPreview {
        if let Some(component) = component {
            v_flex()
                .id("render-component-page")
-                .flex_1()
+                .size_full()
                .child(ComponentPreviewPage::new(
                    component.clone(),
                    self.workspace.clone(),
+                    self.thread_store.as_ref().map(|ts| ts.downgrade()),
                    self.active_thread.clone(),
                ))
                .into_any_element()
@@ -971,7 +961,7 @@ impl SerializableItem for ComponentPreview {
        } else {
            let component_str = deserialized_active_page.0;
            let component_registry = components();
-            let all_components = component_registry.components();
+            let all_components = component_registry.all();
            let found_component = all_components.iter().find(|c| c.id().0 == component_str);

            if let Some(component) = found_component {
@@ -1047,6 +1037,7 @@ pub struct ComponentPreviewPage {
    // languages: Arc<LanguageRegistry>,
    component: ComponentMetadata,
    workspace: WeakEntity<Workspace>,
+    thread_store: Option<WeakEntity<ThreadStore>>,
    active_thread: Option<Entity<ActiveThread>>,
 }

@@ -1054,6 +1045,7 @@ impl ComponentPreviewPage {
    pub fn new(
        component: ComponentMetadata,
        workspace: WeakEntity<Workspace>,
+        thread_store: Option<WeakEntity<ThreadStore>>,
        active_thread: Option<Entity<ActiveThread>>,
        // languages: Arc<LanguageRegistry>
    ) -> Self {
@@ -1061,47 +1053,11 @@ impl ComponentPreviewPage {
            // languages,
            component,
            workspace,
+            thread_store,
            active_thread,
        }
    }

-    /// Renders the component status when it would be useful
-    ///
-    /// Doesn't render if the component is `ComponentStatus::Live`
-    /// as that is the default state
-    fn render_component_status(&self, cx: &App) -> Option<impl IntoElement> {
-        let status = self.component.status();
-        let status_description = status.description().to_string();
-
-        let color = match status {
-            ComponentStatus::Deprecated => Color::Error,
-            ComponentStatus::EngineeringReady => Color::Info,
-            ComponentStatus::Live => Color::Success,
-            ComponentStatus::WorkInProgress => Color::Warning,
-        };
-
-        if status != ComponentStatus::Live {
-            Some(
-                ButtonLike::new("component_status")
-                    .child(
-                        div()
-                            .px_1p5()
-                            .rounded_sm()
-                            .bg(color.color(cx).alpha(0.12))
-                            .child(
-                                Label::new(status.clone().to_string())
-                                    .size(LabelSize::Small)
-                                    .color(color),
-                            ),
-                    )
-                    .tooltip(Tooltip::text(status_description))
-                    .disabled(true),
-            )
-        } else {
-            None
-        }
-    }
-
    fn render_header(&self, _: &Window, cx: &App) -> impl IntoElement {
        v_flex()
            .px_12()
@@ -1120,14 +1076,7 @@ impl ComponentPreviewPage {
                            .color(Color::Muted),
                    )
                    .child(
-                        h_flex()
-                            .items_center()
-                            .gap_2()
-                            .child(
-                                Headline::new(self.component.scopeless_name())
-                                    .size(HeadlineSize::XLarge),
-                            )
-                            .children(self.render_component_status(cx)),
+                        Headline::new(self.component.scopeless_name()).size(HeadlineSize::XLarge),
                    ),
            )
            .when_some(self.component.description(), |this, description| {
@@ -1137,11 +1086,14 @@ impl ComponentPreviewPage {

    fn render_preview(&self, window: &mut Window, cx: &mut App) -> impl IntoElement {
        // Try to get agent preview first if we have an active thread
-        let maybe_agent_preview = if let Some(active_thread) = self.active_thread.as_ref() {
+        let maybe_agent_preview = if let (Some(thread_store), Some(active_thread)) =
+            (self.thread_store.as_ref(), self.active_thread.as_ref())
+        {
            agent::get_agent_preview(
                &self.component.id(),
                self.workspace.clone(),
                active_thread.clone(),
+                thread_store.clone(),
                window,
                cx,
            )
--- a/crates/component_preview/src/preview_support/active_thread.rs
+++ b/crates/component_preview/src/preview_support/active_thread.rs
@@ -2,47 +2,31 @@ use languages::LanguageRegistry;
 use project::Project;
 use std::sync::Arc;

-use agent::{ActiveThread, ContextStore, MessageSegment, TextThreadStore, ThreadStore};
-use anyhow::{Result, anyhow};
+use agent::{ActiveThread, ContextStore, MessageSegment, ThreadStore};
 use assistant_tool::ToolWorkingSet;
 use gpui::{AppContext, AsyncApp, Entity, Task, WeakEntity};
 use prompt_store::PromptBuilder;
 use ui::{App, Window};
 use workspace::Workspace;

-pub fn load_preview_thread_store(
+pub async fn load_preview_thread_store(
    workspace: WeakEntity<Workspace>,
    project: Entity<Project>,
    cx: &mut AsyncApp,
-) -> Task<Result<Entity<ThreadStore>>> {
-    workspace
-        .update(cx, |_, cx| {
-            ThreadStore::load(
-                project.clone(),
-                cx.new(|_| ToolWorkingSet::default()),
-                None,
-                Arc::new(PromptBuilder::new(None).unwrap()),
-                cx,
-            )
-        })
-        .unwrap_or(Task::ready(Err(anyhow!("workspace dropped"))))
-}
-
-pub fn load_preview_text_thread_store(
-    workspace: WeakEntity<Workspace>,
-    project: Entity<Project>,
-    cx: &mut AsyncApp,
-) -> Task<Result<Entity<TextThreadStore>>> {
-    workspace
-        .update(cx, |_, cx| {
-            TextThreadStore::new(
-                project.clone(),
-                Arc::new(PromptBuilder::new(None).unwrap()),
-                Default::default(),
-                cx,
-            )
-        })
-        .unwrap_or(Task::ready(Err(anyhow!("workspace dropped"))))
+) -> Task<anyhow::Result<Entity<ThreadStore>>> {
+    cx.spawn(async move |cx| {
+        workspace
+            .update(cx, |_, cx| {
+                ThreadStore::load(
+                    project.clone(),
+                    cx.new(|_| ToolWorkingSet::default()),
+                    None,
+                    Arc::new(PromptBuilder::new(None).unwrap()),
+                    cx,
+                )
+            })?
+            .await
+    })
 }

 pub fn static_active_thread(
@@ -50,7 +34,6 @@ pub fn static_active_thread(
    project: Entity<Project>,
    language_registry: Arc<LanguageRegistry>,
    thread_store: Entity<ThreadStore>,
-    text_thread_store: Entity<TextThreadStore>,
    window: &mut Window,
    cx: &mut App,
 ) -> Entity<ActiveThread> {
@@ -76,7 +59,6 @@ pub fn static_active_thread(
        ActiveThread::new(
            thread,
            thread_store,
-            text_thread_store,
            context_store,
            language_registry,
            workspace.clone(),
--- a/crates/context_server/Cargo.toml
+++ b/crates/context_server/Cargo.toml
@@ -13,17 +13,28 @@ path = "src/context_server.rs"

 [dependencies]
 anyhow.workspace = true
+assistant_tool.workspace = true
 async-trait.workspace = true
 collections.workspace = true
+command_palette_hooks.workspace = true
+context_server_settings.workspace = true
+extension.workspace = true
 futures.workspace = true
 gpui.workspace = true
+icons.workspace = true
+language_model.workspace = true
 log.workspace = true
 parking_lot.workspace = true
 postage.workspace = true
-schemars.workspace = true
+project.workspace = true
 serde.workspace = true
 serde_json.workspace = true
+settings.workspace = true
 smol.workspace = true
 url = { workspace = true, features = ["serde"] }
 util.workspace = true
 workspace-hack.workspace = true
+
+[dev-dependencies]
+gpui = { workspace = true, features = ["test-support"] }
+project = { workspace = true, features = ["test-support"] }
--- a/crates/context_server/src/client.rs
+++ b/crates/context_server/src/client.rs
@@ -40,7 +40,7 @@ pub enum RequestId {
    Str(String),
 }

-pub(crate) struct Client {
+pub struct Client {
    server_id: ContextServerId,
    next_id: AtomicI32,
    outbound_tx: channel::Sender<String>,
@@ -59,7 +59,7 @@ pub(crate) struct Client {

 #[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
 #[repr(transparent)]
-pub(crate) struct ContextServerId(pub Arc<str>);
+pub struct ContextServerId(pub Arc<str>);

 fn is_null_value<T: Serialize>(value: &T) -> bool {
    if let Ok(Value::Null) = serde_json::to_value(value) {
@@ -367,7 +367,6 @@ impl Client {
        Ok(())
    }

-    #[allow(unused)]
    pub fn on_notification<F>(&self, method: &'static str, f: F)
    where
        F: 'static + Send + FnMut(Value, AsyncApp),
@@ -376,6 +375,14 @@ impl Client {
            .lock()
            .insert(method, Box::new(f));
    }
+
+    pub fn name(&self) -> &str {
+        &self.name
+    }
+
+    pub fn server_id(&self) -> ContextServerId {
+        self.server_id.clone()
+    }
 }

 impl fmt::Display for ContextServerId {
--- a/crates/context_server/src/context_server.rs
+++ b/crates/context_server/src/context_server.rs
@@ -1,117 +1,30 @@
 pub mod client;
+mod context_server_tool;
+mod extension_context_server;
+pub mod manager;
 pub mod protocol;
-pub mod transport;
+mod registry;
+mod transport;
 pub mod types;

-use std::fmt::Display;
-use std::path::Path;
-use std::sync::Arc;
+use command_palette_hooks::CommandPaletteFilter;
+pub use context_server_settings::{ContextServerSettings, ServerCommand, ServerConfig};
+use gpui::{App, actions};

-use anyhow::Result;
-use client::Client;
-use collections::HashMap;
-use gpui::AsyncApp;
-use parking_lot::RwLock;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
+pub use crate::context_server_tool::ContextServerTool;
+pub use crate::registry::ContextServerDescriptorRegistry;

-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct ContextServerId(pub Arc<str>);
+actions!(context_servers, [Restart]);

-impl Display for ContextServerId {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", self.0)
-    }
-}
-
-#[derive(Deserialize, Serialize, Clone, PartialEq, Eq, JsonSchema, Debug)]
-pub struct ContextServerCommand {
-    pub path: String,
-    pub args: Vec<String>,
-    pub env: Option<HashMap<String, String>>,
-}
-
-enum ContextServerTransport {
-    Stdio(ContextServerCommand),
-    Custom(Arc<dyn crate::transport::Transport>),
-}
-
-pub struct ContextServer {
-    id: ContextServerId,
-    client: RwLock<Option<Arc<crate::protocol::InitializedContextServerProtocol>>>,
-    configuration: ContextServerTransport,
-}
-
-impl ContextServer {
-    pub fn stdio(id: ContextServerId, command: ContextServerCommand) -> Self {
-        Self {
-            id,
-            client: RwLock::new(None),
-            configuration: ContextServerTransport::Stdio(command),
-        }
-    }
-
-    pub fn new(id: ContextServerId, transport: Arc<dyn crate::transport::Transport>) -> Self {
-        Self {
-            id,
-            client: RwLock::new(None),
-            configuration: ContextServerTransport::Custom(transport),
-        }
-    }
-
-    pub fn id(&self) -> ContextServerId {
-        self.id.clone()
-    }
-
-    pub fn client(&self) -> Option<Arc<crate::protocol::InitializedContextServerProtocol>> {
-        self.client.read().clone()
-    }
-
-    pub async fn start(self: Arc<Self>, cx: &AsyncApp) -> Result<()> {
-        let client = match &self.configuration {
-            ContextServerTransport::Stdio(command) => Client::stdio(
-                client::ContextServerId(self.id.0.clone()),
-                client::ModelContextServerBinary {
-                    executable: Path::new(&command.path).to_path_buf(),
-                    args: command.args.clone(),
-                    env: command.env.clone(),
-                },
-                cx.clone(),
-            )?,
-            ContextServerTransport::Custom(transport) => Client::new(
-                client::ContextServerId(self.id.0.clone()),
-                self.id().0,
-                transport.clone(),
-                cx.clone(),
-            )?,
-        };
-        self.initialize(client).await
-    }
-
-    async fn initialize(&self, client: Client) -> Result<()> {
-        log::info!("starting context server {}", self.id);
-        let protocol = crate::protocol::ModelContextProtocol::new(client);
-        let client_info = types::Implementation {
-            name: "Zed".to_string(),
-            version: env!("CARGO_PKG_VERSION").to_string(),
-        };
-        let initialized_protocol = protocol.initialize(client_info).await?;
-
-        log::debug!(
-            "context server {} initialized: {:?}",
-            self.id,
-            initialized_protocol.initialize,
-        );
-
-        *self.client.write() = Some(Arc::new(initialized_protocol));
-        Ok(())
-    }
-
-    pub fn stop(&self) -> Result<()> {
-        let mut client = self.client.write();
-        if let Some(protocol) = client.take() {
-            drop(protocol);
-        }
-        Ok(())
-    }
+/// The namespace for the context servers actions.
+pub const CONTEXT_SERVERS_NAMESPACE: &'static str = "context_servers";
+
+pub fn init(cx: &mut App) {
+    context_server_settings::init(cx);
+    ContextServerDescriptorRegistry::default_global(cx);
+    extension_context_server::init(cx);
+
+    CommandPaletteFilter::update_global(cx, |filter, _cx| {
+        filter.hide_namespace(CONTEXT_SERVERS_NAMESPACE);
+    });
 }
--- a/crates/context_server/src/context_server_tool.rs
+++ b/crates/context_server/src/context_server_tool.rs
@@ -2,27 +2,29 @@ use std::sync::Arc;

 use anyhow::{Result, anyhow, bail};
 use assistant_tool::{ActionLog, Tool, ToolResult, ToolSource};
-use context_server::{ContextServerId, types};
 use gpui::{AnyWindowHandle, App, Entity, Task};
+use icons::IconName;
 use language_model::{LanguageModelRequestMessage, LanguageModelToolSchemaFormat};
-use project::{Project, context_server_store::ContextServerStore};
-use ui::IconName;
+use project::Project;
+
+use crate::manager::ContextServerManager;
+use crate::types;

 pub struct ContextServerTool {
-    store: Entity<ContextServerStore>,
-    server_id: ContextServerId,
+    server_manager: Entity<ContextServerManager>,
+    server_id: Arc<str>,
    tool: types::Tool,
 }

 impl ContextServerTool {
    pub fn new(
-        store: Entity<ContextServerStore>,
-        server_id: ContextServerId,
+        server_manager: Entity<ContextServerManager>,
+        server_id: impl Into<Arc<str>>,
        tool: types::Tool,
    ) -> Self {
        Self {
-            store,
-            server_id,
+            server_manager,
+            server_id: server_id.into(),
            tool,
        }
    }
@@ -43,7 +45,7 @@ impl Tool for ContextServerTool {

    fn source(&self) -> ToolSource {
        ToolSource::ContextServer {
-            id: self.server_id.clone().0.into(),
+            id: self.server_id.clone().into(),
        }
    }

@@ -78,7 +80,7 @@ impl Tool for ContextServerTool {
        _window: Option<AnyWindowHandle>,
        cx: &mut App,
    ) -> ToolResult {
-        if let Some(server) = self.store.read(cx).get_running_server(&self.server_id) {
+        if let Some(server) = self.server_manager.read(cx).get_server(&self.server_id) {
            let tool_name = self.tool.name.clone();
            let server_clone = server.clone();
            let input_clone = input.clone();
--- a/crates/context_server/src/extension_context_server.rs
+++ b/crates/context_server/src/extension_context_server.rs
@@ -1,21 +1,19 @@
 use std::sync::Arc;

 use anyhow::Result;
-use context_server::ContextServerCommand;
 use extension::{
    ContextServerConfiguration, Extension, ExtensionContextServerProxy, ExtensionHostProxy,
    ProjectDelegate,
 };
 use gpui::{App, AsyncApp, Entity, Task};
+use project::Project;

-use crate::worktree_store::WorktreeStore;
-
-use super::registry::{self, ContextServerDescriptorRegistry};
+use crate::{ContextServerDescriptorRegistry, ServerCommand, registry};

 pub fn init(cx: &mut App) {
    let proxy = ExtensionHostProxy::default_global(cx);
    proxy.register_context_server_proxy(ContextServerDescriptorRegistryProxy {
-        context_server_factory_registry: ContextServerDescriptorRegistry::default_global(cx),
+        context_server_factory_registry: ContextServerDescriptorRegistry::global(cx),
    });
 }

@@ -34,13 +32,10 @@ struct ContextServerDescriptor {
    extension: Arc<dyn Extension>,
 }

-fn extension_project(
-    worktree_store: Entity<WorktreeStore>,
-    cx: &mut AsyncApp,
-) -> Result<Arc<ExtensionProject>> {
-    worktree_store.update(cx, |worktree_store, cx| {
+fn extension_project(project: Entity<Project>, cx: &mut AsyncApp) -> Result<Arc<ExtensionProject>> {
+    project.update(cx, |project, cx| {
        Arc::new(ExtensionProject {
-            worktree_ids: worktree_store
+            worktree_ids: project
                .visible_worktrees(cx)
                .map(|worktree| worktree.read(cx).id().to_proto())
                .collect(),
@@ -49,15 +44,11 @@ fn extension_project(
 }

 impl registry::ContextServerDescriptor for ContextServerDescriptor {
-    fn command(
-        &self,
-        worktree_store: Entity<WorktreeStore>,
-        cx: &AsyncApp,
-    ) -> Task<Result<ContextServerCommand>> {
+    fn command(&self, project: Entity<Project>, cx: &AsyncApp) -> Task<Result<ServerCommand>> {
        let id = self.id.clone();
        let extension = self.extension.clone();
        cx.spawn(async move |cx| {
-            let extension_project = extension_project(worktree_store, cx)?;
+            let extension_project = extension_project(project, cx)?;
            let mut command = extension
                .context_server_command(id.clone(), extension_project.clone())
                .await?;
@@ -68,7 +59,7 @@ impl registry::ContextServerDescriptor for ContextServerDescriptor {

            log::info!("loaded command for context server {id}: {command:?}");

-            Ok(ContextServerCommand {
+            Ok(ServerCommand {
                path: command.command,
                args: command.args,
                env: Some(command.env.into_iter().collect()),
@@ -78,13 +69,13 @@ impl registry::ContextServerDescriptor for ContextServerDescriptor {

    fn configuration(
        &self,
-        worktree_store: Entity<WorktreeStore>,
+        project: Entity<Project>,
        cx: &AsyncApp,
    ) -> Task<Result<Option<ContextServerConfiguration>>> {
        let id = self.id.clone();
        let extension = self.extension.clone();
        cx.spawn(async move |cx| {
-            let extension_project = extension_project(worktree_store, cx)?;
+            let extension_project = extension_project(project, cx)?;
            let configuration = extension
                .context_server_configuration(id.clone(), extension_project)
                .await?;
@@ -111,11 +102,4 @@ impl ExtensionContextServerProxy for ContextServerDescriptorRegistryProxy {
                )
            });
    }
-
-    fn unregister_context_server(&self, server_id: Arc<str>, cx: &mut App) {
-        self.context_server_factory_registry
-            .update(cx, |registry, _| {
-                registry.unregister_context_server_descriptor_by_id(&server_id)
-            });
-    }
 }
--- a/crates/context_server/src/manager.rs
+++ b/crates/context_server/src/manager.rs
@@ -0,0 +1,584 @@
+//! This module implements a context server management system for Zed.
+//!
+//! It provides functionality to:
+//! - Define and load context server settings
+//! - Manage individual context servers (start, stop, restart)
+//! - Maintain a global manager for all context servers
+//!
+//! Key components:
+//! - `ContextServerSettings`: Defines the structure for server configurations
+//! - `ContextServer`: Represents an individual context server
+//! - `ContextServerManager`: Manages multiple context servers
+//! - `GlobalContextServerManager`: Provides global access to the ContextServerManager
+//!
+//! The module also includes initialization logic to set up the context server system
+//! and react to changes in settings.
+
+use std::path::Path;
+use std::sync::Arc;
+
+use anyhow::{Result, bail};
+use collections::HashMap;
+use command_palette_hooks::CommandPaletteFilter;
+use gpui::{AsyncApp, Context, Entity, EventEmitter, Subscription, Task, WeakEntity};
+use log;
+use parking_lot::RwLock;
+use project::Project;
+use settings::{Settings, SettingsStore};
+use util::ResultExt as _;
+
+use crate::transport::Transport;
+use crate::{ContextServerSettings, ServerConfig};
+
+use crate::{
+    CONTEXT_SERVERS_NAMESPACE, ContextServerDescriptorRegistry,
+    client::{self, Client},
+    types,
+};
+
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub enum ContextServerStatus {
+    Starting,
+    Running,
+    Error(Arc<str>),
+}
+
+pub struct ContextServer {
+    pub id: Arc<str>,
+    pub config: Arc<ServerConfig>,
+    pub client: RwLock<Option<Arc<crate::protocol::InitializedContextServerProtocol>>>,
+    transport: Option<Arc<dyn Transport>>,
+}
+
+impl ContextServer {
+    pub fn new(id: Arc<str>, config: Arc<ServerConfig>) -> Self {
+        Self {
+            id,
+            config,
+            client: RwLock::new(None),
+            transport: None,
+        }
+    }
+
+    #[cfg(any(test, feature = "test-support"))]
+    pub fn test(id: Arc<str>, transport: Arc<dyn crate::transport::Transport>) -> Arc<Self> {
+        Arc::new(Self {
+            id,
+            client: RwLock::new(None),
+            config: Arc::new(ServerConfig::default()),
+            transport: Some(transport),
+        })
+    }
+
+    pub fn id(&self) -> Arc<str> {
+        self.id.clone()
+    }
+
+    pub fn config(&self) -> Arc<ServerConfig> {
+        self.config.clone()
+    }
+
+    pub fn client(&self) -> Option<Arc<crate::protocol::InitializedContextServerProtocol>> {
+        self.client.read().clone()
+    }
+
+    pub async fn start(self: Arc<Self>, cx: &AsyncApp) -> Result<()> {
+        let client = if let Some(transport) = self.transport.clone() {
+            Client::new(
+                client::ContextServerId(self.id.clone()),
+                self.id(),
+                transport,
+                cx.clone(),
+            )?
+        } else {
+            let Some(command) = &self.config.command else {
+                bail!("no command specified for server {}", self.id);
+            };
+            Client::stdio(
+                client::ContextServerId(self.id.clone()),
+                client::ModelContextServerBinary {
+                    executable: Path::new(&command.path).to_path_buf(),
+                    args: command.args.clone(),
+                    env: command.env.clone(),
+                },
+                cx.clone(),
+            )?
+        };
+        self.initialize(client).await
+    }
+
+    async fn initialize(&self, client: Client) -> Result<()> {
+        log::info!("starting context server {}", self.id);
+        let protocol = crate::protocol::ModelContextProtocol::new(client);
+        let client_info = types::Implementation {
+            name: "Zed".to_string(),
+            version: env!("CARGO_PKG_VERSION").to_string(),
+        };
+        let initialized_protocol = protocol.initialize(client_info).await?;
+
+        log::debug!(
+            "context server {} initialized: {:?}",
+            self.id,
+            initialized_protocol.initialize,
+        );
+
+        *self.client.write() = Some(Arc::new(initialized_protocol));
+        Ok(())
+    }
+
+    pub fn stop(&self) -> Result<()> {
+        let mut client = self.client.write();
+        if let Some(protocol) = client.take() {
+            drop(protocol);
+        }
+        Ok(())
+    }
+}
+
+pub struct ContextServerManager {
+    servers: HashMap<Arc<str>, Arc<ContextServer>>,
+    server_status: HashMap<Arc<str>, ContextServerStatus>,
+    project: Entity<Project>,
+    registry: Entity<ContextServerDescriptorRegistry>,
+    update_servers_task: Option<Task<Result<()>>>,
+    needs_server_update: bool,
+    _subscriptions: Vec<Subscription>,
+}
+
+pub enum Event {
+    ServerStatusChanged {
+        server_id: Arc<str>,
+        status: Option<ContextServerStatus>,
+    },
+}
+
+impl EventEmitter<Event> for ContextServerManager {}
+
+impl ContextServerManager {
+    pub fn new(
+        registry: Entity<ContextServerDescriptorRegistry>,
+        project: Entity<Project>,
+        cx: &mut Context<Self>,
+    ) -> Self {
+        let mut this = Self {
+            _subscriptions: vec![
+                cx.observe(&registry, |this, _registry, cx| {
+                    this.available_context_servers_changed(cx);
+                }),
+                cx.observe_global::<SettingsStore>(|this, cx| {
+                    this.available_context_servers_changed(cx);
+                }),
+            ],
+            project,
+            registry,
+            needs_server_update: false,
+            servers: HashMap::default(),
+            server_status: HashMap::default(),
+            update_servers_task: None,
+        };
+        this.available_context_servers_changed(cx);
+        this
+    }
+
+    fn available_context_servers_changed(&mut self, cx: &mut Context<Self>) {
+        if self.update_servers_task.is_some() {
+            self.needs_server_update = true;
+        } else {
+            self.update_servers_task = Some(cx.spawn(async move |this, cx| {
+                this.update(cx, |this, _| {
+                    this.needs_server_update = false;
+                })?;
+
+                if let Err(err) = Self::maintain_servers(this.clone(), cx).await {
+                    log::error!("Error maintaining context servers: {}", err);
+                }
+
+                this.update(cx, |this, cx| {
+                    let has_any_context_servers = !this.running_servers().is_empty();
+                    if has_any_context_servers {
+                        CommandPaletteFilter::update_global(cx, |filter, _cx| {
+                            filter.show_namespace(CONTEXT_SERVERS_NAMESPACE);
+                        });
+                    }
+
+                    this.update_servers_task.take();
+                    if this.needs_server_update {
+                        this.available_context_servers_changed(cx);
+                    }
+                })?;
+
+                Ok(())
+            }));
+        }
+    }
+
+    pub fn get_server(&self, id: &str) -> Option<Arc<ContextServer>> {
+        self.servers
+            .get(id)
+            .filter(|server| server.client().is_some())
+            .cloned()
+    }
+
+    pub fn status_for_server(&self, id: &str) -> Option<ContextServerStatus> {
+        self.server_status.get(id).cloned()
+    }
+
+    pub fn start_server(
+        &self,
+        server: Arc<ContextServer>,
+        cx: &mut Context<Self>,
+    ) -> Task<Result<()>> {
+        cx.spawn(async move |this, cx| Self::run_server(this, server, cx).await)
+    }
+
+    pub fn stop_server(
+        &mut self,
+        server: Arc<ContextServer>,
+        cx: &mut Context<Self>,
+    ) -> Result<()> {
+        server.stop().log_err();
+        self.update_server_status(server.id().clone(), None, cx);
+        Ok(())
+    }
+
+    pub fn restart_server(&mut self, id: &Arc<str>, cx: &mut Context<Self>) -> Task<Result<()>> {
+        let id = id.clone();
+        cx.spawn(async move |this, cx| {
+            if let Some(server) = this.update(cx, |this, _cx| this.servers.remove(&id))? {
+                let config = server.config();
+
+                this.update(cx, |this, cx| this.stop_server(server, cx))??;
+                let new_server = Arc::new(ContextServer::new(id.clone(), config));
+                Self::run_server(this, new_server, cx).await?;
+            }
+            Ok(())
+        })
+    }
+
+    pub fn all_servers(&self) -> Vec<Arc<ContextServer>> {
+        self.servers.values().cloned().collect()
+    }
+
+    pub fn running_servers(&self) -> Vec<Arc<ContextServer>> {
+        self.servers
+            .values()
+            .filter(|server| server.client().is_some())
+            .cloned()
+            .collect()
+    }
+
+    async fn maintain_servers(this: WeakEntity<Self>, cx: &mut AsyncApp) -> Result<()> {
+        let mut desired_servers = HashMap::default();
+
+        let (registry, project) = this.update(cx, |this, cx| {
+            let location = this
+                .project
+                .read(cx)
+                .visible_worktrees(cx)
+                .next()
+                .map(|worktree| settings::SettingsLocation {
+                    worktree_id: worktree.read(cx).id(),
+                    path: Path::new(""),
+                });
+            let settings = ContextServerSettings::get(location, cx);
+            desired_servers = settings.context_servers.clone();
+
+            (this.registry.clone(), this.project.clone())
+        })?;
+
+        for (id, descriptor) in
+            registry.read_with(cx, |registry, _| registry.context_server_descriptors())?
+        {
+            let config = desired_servers.entry(id).or_default();
+            if config.command.is_none() {
+                if let Some(extension_command) =
+                    descriptor.command(project.clone(), &cx).await.log_err()
+                {
+                    config.command = Some(extension_command);
+                }
+            }
+        }
+
+        let mut servers_to_start = HashMap::default();
+        let mut servers_to_stop = HashMap::default();
+
+        this.update(cx, |this, _cx| {
+            this.servers.retain(|id, server| {
+                if desired_servers.contains_key(id) {
+                    true
+                } else {
+                    servers_to_stop.insert(id.clone(), server.clone());
+                    false
+                }
+            });
+
+            for (id, config) in desired_servers {
+                let existing_config = this.servers.get(&id).map(|server| server.config());
+                if existing_config.as_deref() != Some(&config) {
+                    let server = Arc::new(ContextServer::new(id.clone(), Arc::new(config)));
+                    servers_to_start.insert(id.clone(), server.clone());
+                    if let Some(old_server) = this.servers.remove(&id) {
+                        servers_to_stop.insert(id, old_server);
+                    }
+                }
+            }
+        })?;
+
+        for (_, server) in servers_to_stop {
+            this.update(cx, |this, cx| this.stop_server(server, cx).ok())?;
+        }
+
+        for (_, server) in servers_to_start {
+            Self::run_server(this.clone(), server, cx).await.ok();
+        }
+
+        Ok(())
+    }
+
+    async fn run_server(
+        this: WeakEntity<Self>,
+        server: Arc<ContextServer>,
+        cx: &mut AsyncApp,
+    ) -> Result<()> {
+        let id = server.id();
+
+        this.update(cx, |this, cx| {
+            this.update_server_status(id.clone(), Some(ContextServerStatus::Starting), cx);
+            this.servers.insert(id.clone(), server.clone());
+        })?;
+
+        match server.start(&cx).await {
+            Ok(_) => {
+                log::debug!("`{}` context server started", id);
+                this.update(cx, |this, cx| {
+                    this.update_server_status(id.clone(), Some(ContextServerStatus::Running), cx)
+                })?;
+                Ok(())
+            }
+            Err(err) => {
+                log::error!("`{}` context server failed to start\n{}", id, err);
+                this.update(cx, |this, cx| {
+                    this.update_server_status(
+                        id.clone(),
+                        Some(ContextServerStatus::Error(err.to_string().into())),
+                        cx,
+                    )
+                })?;
+                Err(err)
+            }
+        }
+    }
+
+    fn update_server_status(
+        &mut self,
+        id: Arc<str>,
+        status: Option<ContextServerStatus>,
+        cx: &mut Context<Self>,
+    ) {
+        if let Some(status) = status.clone() {
+            self.server_status.insert(id.clone(), status);
+        } else {
+            self.server_status.remove(&id);
+        }
+
+        cx.emit(Event::ServerStatusChanged {
+            server_id: id,
+            status,
+        });
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use std::pin::Pin;
+
+    use crate::types::{
+        Implementation, InitializeResponse, ProtocolVersion, RequestType, ServerCapabilities,
+    };
+
+    use super::*;
+    use futures::{Stream, StreamExt as _, lock::Mutex};
+    use gpui::{AppContext as _, TestAppContext};
+    use project::FakeFs;
+    use serde_json::json;
+    use util::path;
+
+    #[gpui::test]
+    async fn test_context_server_status(cx: &mut TestAppContext) {
+        init_test_settings(cx);
+        let project = create_test_project(cx, json!({"code.rs": ""})).await;
+
+        let registry = cx.new(|_| ContextServerDescriptorRegistry::new());
+        let manager = cx.new(|cx| ContextServerManager::new(registry.clone(), project, cx));
+
+        let server_1_id: Arc<str> = "mcp-1".into();
+        let server_2_id: Arc<str> = "mcp-2".into();
+
+        let transport_1 = Arc::new(FakeTransport::new(
+            |_, request_type, _| match request_type {
+                Some(RequestType::Initialize) => {
+                    Some(create_initialize_response("mcp-1".to_string()))
+                }
+                _ => None,
+            },
+        ));
+
+        let transport_2 = Arc::new(FakeTransport::new(
+            |_, request_type, _| match request_type {
+                Some(RequestType::Initialize) => {
+                    Some(create_initialize_response("mcp-2".to_string()))
+                }
+                _ => None,
+            },
+        ));
+
+        let server_1 = ContextServer::test(server_1_id.clone(), transport_1.clone());
+        let server_2 = ContextServer::test(server_2_id.clone(), transport_2.clone());
+
+        manager
+            .update(cx, |manager, cx| manager.start_server(server_1, cx))
+            .await
+            .unwrap();
+
+        cx.update(|cx| {
+            assert_eq!(
+                manager.read(cx).status_for_server(&server_1_id),
+                Some(ContextServerStatus::Running)
+            );
+            assert_eq!(manager.read(cx).status_for_server(&server_2_id), None);
+        });
+
+        manager
+            .update(cx, |manager, cx| manager.start_server(server_2.clone(), cx))
+            .await
+            .unwrap();
+
+        cx.update(|cx| {
+            assert_eq!(
+                manager.read(cx).status_for_server(&server_1_id),
+                Some(ContextServerStatus::Running)
+            );
+            assert_eq!(
+                manager.read(cx).status_for_server(&server_2_id),
+                Some(ContextServerStatus::Running)
+            );
+        });
+
+        manager
+            .update(cx, |manager, cx| manager.stop_server(server_2, cx))
+            .unwrap();
+
+        cx.update(|cx| {
+            assert_eq!(
+                manager.read(cx).status_for_server(&server_1_id),
+                Some(ContextServerStatus::Running)
+            );
+            assert_eq!(manager.read(cx).status_for_server(&server_2_id), None);
+        });
+    }
+
+    async fn create_test_project(
+        cx: &mut TestAppContext,
+        files: serde_json::Value,
+    ) -> Entity<Project> {
+        let fs = FakeFs::new(cx.executor());
+        fs.insert_tree(path!("/test"), files).await;
+        Project::test(fs, [path!("/test").as_ref()], cx).await
+    }
+
+    fn init_test_settings(cx: &mut TestAppContext) {
+        cx.update(|cx| {
+            let settings_store = SettingsStore::test(cx);
+            cx.set_global(settings_store);
+            Project::init_settings(cx);
+            ContextServerSettings::register(cx);
+        });
+    }
+
+    fn create_initialize_response(server_name: String) -> serde_json::Value {
+        serde_json::to_value(&InitializeResponse {
+            protocol_version: ProtocolVersion(types::LATEST_PROTOCOL_VERSION.to_string()),
+            server_info: Implementation {
+                name: server_name,
+                version: "1.0.0".to_string(),
+            },
+            capabilities: ServerCapabilities::default(),
+            meta: None,
+        })
+        .unwrap()
+    }
+
+    struct FakeTransport {
+        on_request: Arc<
+            dyn Fn(u64, Option<RequestType>, serde_json::Value) -> Option<serde_json::Value>
+                + Send
+                + Sync,
+        >,
+        tx: futures::channel::mpsc::UnboundedSender<String>,
+        rx: Arc<Mutex<futures::channel::mpsc::UnboundedReceiver<String>>>,
+    }
+
+    impl FakeTransport {
+        fn new(
+            on_request: impl Fn(
+                u64,
+                Option<RequestType>,
+                serde_json::Value,
+            ) -> Option<serde_json::Value>
+            + 'static
+            + Send
+            + Sync,
+        ) -> Self {
+            let (tx, rx) = futures::channel::mpsc::unbounded();
+            Self {
+                on_request: Arc::new(on_request),
+                tx,
+                rx: Arc::new(Mutex::new(rx)),
+            }
+        }
+    }
+
+    #[async_trait::async_trait]
+    impl Transport for FakeTransport {
+        async fn send(&self, message: String) -> Result<()> {
+            if let Ok(msg) = serde_json::from_str::<serde_json::Value>(&message) {
+                let id = msg.get("id").and_then(|id| id.as_u64()).unwrap_or(0);
+
+                if let Some(method) = msg.get("method") {
+                    let request_type = method
+                        .as_str()
+                        .and_then(|method| types::RequestType::try_from(method).ok());
+                    if let Some(payload) = (self.on_request.as_ref())(id, request_type, msg) {
+                        let response = serde_json::json!({
+                            "jsonrpc": "2.0",
+                            "id": id,
+                            "result": payload
+                        });
+
+                        self.tx
+                            .unbounded_send(response.to_string())
+                            .map_err(|e| anyhow::anyhow!("Failed to send message: {}", e))?;
+                    }
+                }
+            }
+            Ok(())
+        }
+
+        fn receive(&self) -> Pin<Box<dyn Stream<Item = String> + Send>> {
+            let rx = self.rx.clone();
+            Box::pin(futures::stream::unfold(rx, |rx| async move {
+                let mut rx_guard = rx.lock().await;
+                if let Some(message) = rx_guard.next().await {
+                    drop(rx_guard);
+                    Some((message, rx))
+                } else {
+                    None
+                }
+            }))
+        }
+
+        fn receive_err(&self) -> Pin<Box<dyn Stream<Item = String> + Send>> {
+            Box::pin(futures::stream::empty())
+        }
+    }
+}
--- a/crates/context_server/src/protocol.rs
+++ b/crates/context_server/src/protocol.rs
@@ -16,7 +16,7 @@ pub struct ModelContextProtocol {
 }

 impl ModelContextProtocol {
-    pub(crate) fn new(inner: Client) -> Self {
+    pub fn new(inner: Client) -> Self {
        Self { inner }
    }

--- a/crates/project/src/context_server_store/registry.rs
+++ b/crates/project/src/context_server_store/registry.rs
@@ -2,21 +2,17 @@ use std::sync::Arc;

 use anyhow::Result;
 use collections::HashMap;
-use context_server::ContextServerCommand;
 use extension::ContextServerConfiguration;
-use gpui::{App, AppContext as _, AsyncApp, Entity, Global, Task};
+use gpui::{App, AppContext as _, AsyncApp, Entity, Global, ReadGlobal, Task};
+use project::Project;

-use crate::worktree_store::WorktreeStore;
+use crate::ServerCommand;

 pub trait ContextServerDescriptor {
-    fn command(
-        &self,
-        worktree_store: Entity<WorktreeStore>,
-        cx: &AsyncApp,
-    ) -> Task<Result<ContextServerCommand>>;
+    fn command(&self, project: Entity<Project>, cx: &AsyncApp) -> Task<Result<ServerCommand>>;
    fn configuration(
        &self,
-        worktree_store: Entity<WorktreeStore>,
+        project: Entity<Project>,
        cx: &AsyncApp,
    ) -> Task<Result<Option<ContextServerConfiguration>>>;
 }
@@ -31,6 +27,11 @@ pub struct ContextServerDescriptorRegistry {
 }

 impl ContextServerDescriptorRegistry {
+    /// Returns the global [`ContextServerDescriptorRegistry`].
+    pub fn global(cx: &App) -> Entity<Self> {
+        GlobalContextServerDescriptorRegistry::global(cx).0.clone()
+    }
+
    /// Returns the global [`ContextServerDescriptorRegistry`].
    ///
    /// Inserts a default [`ContextServerDescriptorRegistry`] if one does not yet exist.
--- a/crates/context_server/src/types.rs
+++ b/crates/context_server/src/types.rs
@@ -610,7 +610,7 @@ pub enum ToolResponseContent {
    Resource { resource: ResourceContents },
 }

-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct ListToolsResponse {
    pub tools: Vec<Tool>,
--- a/crates/context_server_settings/Cargo.toml
+++ b/crates/context_server_settings/Cargo.toml
@@ -0,0 +1,22 @@
+[package]
+name = "context_server_settings"
+version = "0.1.0"
+edition.workspace = true
+publish.workspace = true
+license = "GPL-3.0-or-later"
+
+[lints]
+workspace = true
+
+[lib]
+path = "src/context_server_settings.rs"
+
+[dependencies]
+anyhow.workspace = true
+collections.workspace = true
+gpui.workspace = true
+schemars.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+settings.workspace = true
+workspace-hack.workspace = true
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Richard Feldman	140f8bed3c	clippy	2025-05-05 12:03:38 -04:00
Richard Feldman	0fe271586a	Delete agent-stream-edits feature flag	2025-05-05 11:59:52 -04:00
Richard Feldman	97a9152f3c	Delete old create_file and edit_file tools.	2025-05-05 11:59:48 -04:00