Bump to 0.192.7 for @SomeoneToIgnore

Respect server capabilities on queries (#33538 )
Closes https://github.com/zed-industries/zed/issues/33522 Turns out a bunch of Zed requests were not checking their capabilities correctly, due to odd copy-paste and due to default that assumed that the capabilities are met. Adjust the code, which includes the document colors, add the test on the colors case. Release Notes: - Fixed excessive document colors requests for unrelated files
2025-06-27 16:44:45 +00:00 · 2025-06-27 19:41:03 +03:00 · 2025-06-27 12:56:25 +03:00 · 2025-06-26 15:02:45 -04:00 · 2025-06-26 07:59:31 +00:00 · 2025-06-26 13:17:26 +05:30
420 changed files with 14792 additions and 23317 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -29,7 +29,6 @@ jobs:
    outputs:
      run_tests: ${{ steps.filter.outputs.run_tests }}
      run_license: ${{ steps.filter.outputs.run_license }}
-      run_docs: ${{ steps.filter.outputs.run_docs }}
    runs-on:
      - ubuntu-latest
    steps:
@@ -59,11 +58,6 @@ jobs:
          else
            echo "run_tests=false" >> $GITHUB_OUTPUT
          fi
-          if [[ $(git diff --name-only $COMPARE_REV ${{ github.sha }} | grep '^docs/') ]]; then
-            echo "run_docs=true" >> $GITHUB_OUTPUT
-          else
-            echo "run_docs=false" >> $GITHUB_OUTPUT
-          fi
          if [[ $(git diff --name-only $COMPARE_REV ${{ github.sha }} | grep '^Cargo.lock') ]]; then
            echo "run_license=true" >> $GITHUB_OUTPUT
          else
@@ -204,9 +198,7 @@ jobs:
    timeout-minutes: 60
    name: Check docs
    needs: [job_spec]
-    if: |
-      github.repository_owner == 'zed-industries' &&
-      (needs.job_spec.outputs.run_tests == 'true' || needs.job_spec.outputs.run_docs == 'true')
+    if: github.repository_owner == 'zed-industries'
    runs-on:
      - buildjet-8vcpu-ubuntu-2204
    steps:
@@ -460,10 +452,8 @@ jobs:
          RET_CODE=0
          # Always check style
          [[ "${{ needs.style.result }}"      != 'success' ]] && { RET_CODE=1; echo "style tests failed"; }
+          [[ "${{ needs.check_docs.result }}" != 'success' ]] && { RET_CODE=1; echo "docs checks failed"; }

-          if [[ "${{ needs.job_spec.outputs.run_docs }}" == "true" ]]; then
-            [[ "${{ needs.check_docs.result }}" != 'success' ]] && { RET_CODE=1; echo "docs checks failed"; }
-          fi
          # Only check test jobs if they were supposed to run
          if [[ "${{ needs.job_spec.outputs.run_tests }}" == "true" ]]; then
            [[ "${{ needs.workspace_hack.result }}"       != 'success' ]] && { RET_CODE=1; echo "Workspace Hack failed"; }
--- a/.github/workflows/community_delete_comments.yml
+++ b/.github/workflows/community_delete_comments.yml
@@ -0,0 +1,34 @@
+name: Delete Mediafire Comments
+
+on:
+  issue_comment:
+    types: [created]
+
+permissions:
+  issues: write
+
+jobs:
+  delete_comment:
+    if: github.repository_owner == 'zed-industries'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check for specific strings in comment
+        id: check_comment
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
+        with:
+          script: |
+            const comment = context.payload.comment.body;
+            const triggerStrings = ['www.mediafire.com'];
+            return triggerStrings.some(triggerString => comment.includes(triggerString));
+
+      - name: Delete comment if it contains any of the specific strings
+        if: steps.check_comment.outputs.result == 'true'
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
+        with:
+          script: |
+            const commentId = context.payload.comment.id;
+            await github.rest.issues.deleteComment({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              comment_id: commentId
+            });
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -7,7 +7,7 @@ on:
  pull_request:
    branches:
      - "**"
-    types: [synchronize, reopened, labeled]
+    types: [opened, synchronize, reopened, labeled]

  workflow_dispatch:

@@ -25,6 +25,16 @@ env:
  ZED_EVAL_TELEMETRY: 1

 jobs:
+  # This is a no-op job that we run to prevent GitHub from marking the workflow
+  # as failed for PRs that don't have the `run-eval` label.
+  noop:
+    name: No-op
+    runs-on: ubuntu-latest
+    if: github.repository_owner == 'zed-industries'
+    steps:
+      - name: No-op
+        run: echo "Nothing to do"
+
  run_eval:
    timeout-minutes: 60
    name: Run Agent Eval
--- a/.gitignore
+++ b/.gitignore
@@ -12,7 +12,6 @@
 .flatpak-builder
 .idea
 .netrc
-*.pyc
 .pytest_cache
 .swiftpm
 .swiftpm/config/registries.json
--- a/.rules
+++ b/.rules
@@ -100,7 +100,9 @@ Often event handlers will want to update the entity that's in the current `Conte

 Actions are dispatched via user keyboard interaction or in code via `window.dispatch_action(SomeAction.boxed_clone(), cx)` or `focus_handle.dispatch_action(&SomeAction, window, cx)`.

-Actions with no data defined with the `actions!(some_namespace, [SomeAction, AnotherAction])` macro call. Otherwise the `Action` derive macro is used. Doc comments on actions are displayed to the user.
+Actions which have no data inside are created and registered with the `actions!(some_namespace, [SomeAction, AnotherAction])` macro call.
+
+Actions that do have data must implement `Clone, Default, PartialEq, Deserialize, JsonSchema` and can be registered with an `impl_actions!(some_namespace, [SomeActionWithData])` macro call.

 Action handlers can be registered on an element via the event handler `.on_action(|action, window, cx| ...)`. Like other event handlers, this is often used with `cx.listener`.

--- a/.zed/debug.json
+++ b/.zed/debug.json
@@ -2,23 +2,11 @@
  {
    "label": "Debug Zed (CodeLLDB)",
    "adapter": "CodeLLDB",
-    "build": {
-      "label": "Build Zed",
-      "command": "cargo",
-      "args": [
-        "build"
-      ]
-    }
+    "build": { "label": "Build Zed", "command": "cargo", "args": ["build"] }
  },
  {
    "label": "Debug Zed (GDB)",
    "adapter": "GDB",
-    "build": {
-      "label": "Build Zed",
-      "command": "cargo",
-      "args": [
-        "build"
-      ]
-    }
-  },
+    "build": { "label": "Build Zed", "command": "cargo", "args": ["build"] }
+  }
 ]
--- a/.zed/settings.json
+++ b/.zed/settings.json
@@ -40,7 +40,6 @@
  },
  "file_types": {
    "Dockerfile": ["Dockerfile*[!dockerignore]"],
-    "JSONC": ["assets/**/*.json", "renovate.json"],
    "Git Ignore": ["dockerignore"]
  },
  "hard_tabs": false,
@@ -48,7 +47,7 @@
  "remove_trailing_whitespace_on_save": true,
  "ensure_final_newline_on_save": true,
  "file_scan_exclusions": [
-    "crates/assistant_tools/src/edit_agent/evals/fixtures",
+    "crates/assistant_tools/src/evals/fixtures",
    "crates/eval/worktrees/",
    "crates/eval/repos/",
    "**/.git",
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -14,7 +14,6 @@ dependencies = [
 "gpui",
 "language",
 "project",
- "proto",
 "release_channel",
 "smallvec",
 "ui",
@@ -56,85 +55,7 @@ version = "0.1.0"
 dependencies = [
 "agent_settings",
 "anyhow",
- "assistant_context",
- "assistant_tool",
- "assistant_tools",
- "chrono",
- "client",
- "collections",
- "component",
- "context_server",
- "convert_case 0.8.0",
- "feature_flags",
- "fs",
- "futures 0.3.31",
- "git",
- "gpui",
- "heed",
- "http_client",
- "icons",
- "indoc",
- "itertools 0.14.0",
- "language",
- "language_model",
- "log",
- "markdown",
- "parking_lot",
- "paths",
- "postage",
- "pretty_assertions",
- "project",
- "prompt_store",
- "proto",
- "rand 0.8.5",
- "ref-cast",
- "rope",
- "schemars",
- "serde",
- "serde_json",
- "settings",
- "smol",
- "sqlez",
- "telemetry",
- "text",
- "theme",
- "thiserror 2.0.12",
- "time",
- "util",
- "uuid",
- "workspace",
- "workspace-hack",
- "zed_llm_client",
- "zstd",
-]
-
-[[package]]
-name = "agent_settings"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "collections",
- "fs",
- "gpui",
- "language_model",
- "paths",
- "schemars",
- "serde",
- "serde_json",
- "serde_json_lenient",
- "settings",
- "workspace-hack",
- "zed_llm_client",
-]
-
-[[package]]
-name = "agent_ui"
-version = "0.1.0"
-dependencies = [
- "agent",
- "agent_settings",
- "anyhow",
- "assistant_context",
+ "assistant_context_editor",
 "assistant_slash_command",
 "assistant_slash_commands",
 "assistant_tool",
@@ -146,16 +67,18 @@ dependencies = [
 "collections",
 "component",
 "context_server",
+ "convert_case 0.8.0",
 "db",
 "editor",
 "extension",
- "extension_host",
 "feature_flags",
 "file_icons",
 "fs",
 "futures 0.3.31",
 "fuzzy",
+ "git",
 "gpui",
+ "heed",
 "html_to_markdown",
 "http_client",
 "indexed_docs",
@@ -165,7 +88,6 @@ dependencies = [
 "jsonschema",
 "language",
 "language_model",
- "languages",
 "log",
 "lsp",
 "markdown",
@@ -176,11 +98,13 @@ dependencies = [
 "parking_lot",
 "paths",
 "picker",
+ "postage",
 "pretty_assertions",
 "project",
 "prompt_store",
 "proto",
 "rand 0.8.5",
+ "ref-cast",
 "release_channel",
 "rope",
 "rules_library",
@@ -191,6 +115,7 @@ dependencies = [
 "serde_json_lenient",
 "settings",
 "smol",
+ "sqlez",
 "streaming_diff",
 "telemetry",
 "telemetry_events",
@@ -198,11 +123,11 @@ dependencies = [
 "terminal_view",
 "text",
 "theme",
+ "thiserror 2.0.12",
 "time",
 "time_format",
- "tree-sitter-md",
 "ui",
- "unindent",
+ "ui_input",
 "urlencoding",
 "util",
 "uuid",
@@ -211,6 +136,33 @@ dependencies = [
 "workspace-hack",
 "zed_actions",
 "zed_llm_client",
+ "zstd",
+]
+
+[[package]]
+name = "agent_settings"
+version = "0.1.0"
+dependencies = [
+ "anthropic",
+ "anyhow",
+ "collections",
+ "deepseek",
+ "fs",
+ "gpui",
+ "language_model",
+ "lmstudio",
+ "log",
+ "mistral",
+ "ollama",
+ "open_ai",
+ "paths",
+ "schemars",
+ "serde",
+ "serde_json",
+ "serde_json_lenient",
+ "settings",
+ "workspace-hack",
+ "zed_llm_client",
 ]

 [[package]]
@@ -556,7 +508,7 @@ dependencies = [
 ]

 [[package]]
-name = "assistant_context"
+name = "assistant_context_editor"
 version = "0.1.0"
 dependencies = [
 "agent_settings",
@@ -568,23 +520,31 @@ dependencies = [
 "clock",
 "collections",
 "context_server",
+ "editor",
+ "feature_flags",
 "fs",
 "futures 0.3.31",
 "fuzzy",
 "gpui",
+ "indexed_docs",
 "indoc",
 "language",
 "language_model",
+ "languages",
 "log",
+ "multi_buffer",
 "open_ai",
+ "ordered-float 2.10.1",
 "parking_lot",
 "paths",
+ "picker",
 "pretty_assertions",
 "project",
 "prompt_store",
 "proto",
 "rand 0.8.5",
 "regex",
+ "rope",
 "rpc",
 "serde",
 "serde_json",
@@ -593,12 +553,15 @@ dependencies = [
 "smol",
 "telemetry_events",
 "text",
+ "theme",
+ "tree-sitter-md",
 "ui",
 "unindent",
 "util",
 "uuid",
 "workspace",
 "workspace-hack",
+ "zed_actions",
 "zed_llm_client",
 ]

@@ -2685,7 +2648,6 @@ dependencies = [
 "http_client",
 "language",
 "log",
- "postage",
 "rand 0.8.5",
 "release_channel",
 "rpc",
@@ -2859,7 +2821,6 @@ dependencies = [
 "cocoa 0.26.0",
 "collections",
 "credentials_provider",
- "derive_more",
 "feature_flags",
 "fs",
 "futures 0.3.31",
@@ -2898,7 +2859,6 @@ dependencies = [
 "windows 0.61.1",
 "workspace-hack",
 "worktree",
- "zed_llm_client",
 ]

 [[package]]
@@ -3019,7 +2979,7 @@ version = "0.44.0"
 dependencies = [
 "agent_settings",
 "anyhow",
- "assistant_context",
+ "assistant_context_editor",
 "assistant_slash_command",
 "async-stripe",
 "async-trait",
@@ -4311,7 +4271,6 @@ version = "0.1.0"
 dependencies = [
 "alacritty_terminal",
 "anyhow",
- "bitflags 2.9.0",
 "client",
 "collections",
 "command_palette_hooks",
@@ -4346,7 +4305,6 @@ dependencies = [
 "terminal_view",
 "theme",
 "tree-sitter",
- "tree-sitter-go",
 "tree-sitter-json",
 "ui",
 "unindent",
@@ -5103,7 +5061,6 @@ version = "0.1.0"
 dependencies = [
 "agent",
 "agent_settings",
- "agent_ui",
 "anyhow",
 "assistant_tool",
 "assistant_tools",
@@ -8202,11 +8159,12 @@ dependencies = [
 name = "inline_completion"
 version = "0.1.0"
 dependencies = [
- "client",
+ "anyhow",
 "gpui",
 "language",
 "project",
 "workspace-hack",
+ "zed_llm_client",
 ]

 [[package]]
@@ -9018,13 +8976,11 @@ dependencies = [
 "collections",
 "copilot",
 "editor",
- "feature_flags",
 "futures 0.3.31",
 "gpui",
 "itertools 0.14.0",
 "language",
 "lsp",
- "picker",
 "project",
 "release_channel",
 "serde_json",
@@ -9242,7 +9198,7 @@ dependencies = [
 [[package]]
 name = "libwebrtc"
 version = "0.3.10"
-source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=d2eade7a6b15d6dbdb38ba12a1ff7bf07fcebba4#d2eade7a6b15d6dbdb38ba12a1ff7bf07fcebba4"
+source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=80bb8f4c9112789f7c24cc98d8423010977806a6#80bb8f4c9112789f7c24cc98d8423010977806a6"
 dependencies = [
 "cxx",
 "jni",
@@ -9322,7 +9278,7 @@ checksum = "23fb14cb19457329c82206317a5663005a4d404783dc74f4252769b0d5f42856"
 [[package]]
 name = "livekit"
 version = "0.7.8"
-source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=d2eade7a6b15d6dbdb38ba12a1ff7bf07fcebba4#d2eade7a6b15d6dbdb38ba12a1ff7bf07fcebba4"
+source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=80bb8f4c9112789f7c24cc98d8423010977806a6#80bb8f4c9112789f7c24cc98d8423010977806a6"
 dependencies = [
 "chrono",
 "futures-util",
@@ -9345,7 +9301,7 @@ dependencies = [
 [[package]]
 name = "livekit-api"
 version = "0.4.2"
-source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=d2eade7a6b15d6dbdb38ba12a1ff7bf07fcebba4#d2eade7a6b15d6dbdb38ba12a1ff7bf07fcebba4"
+source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=80bb8f4c9112789f7c24cc98d8423010977806a6#80bb8f4c9112789f7c24cc98d8423010977806a6"
 dependencies = [
 "futures-util",
 "http 0.2.12",
@@ -9369,7 +9325,7 @@ dependencies = [
 [[package]]
 name = "livekit-protocol"
 version = "0.3.9"
-source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=d2eade7a6b15d6dbdb38ba12a1ff7bf07fcebba4#d2eade7a6b15d6dbdb38ba12a1ff7bf07fcebba4"
+source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=80bb8f4c9112789f7c24cc98d8423010977806a6#80bb8f4c9112789f7c24cc98d8423010977806a6"
 dependencies = [
 "futures-util",
 "livekit-runtime",
@@ -9386,7 +9342,7 @@ dependencies = [
 [[package]]
 name = "livekit-runtime"
 version = "0.4.0"
-source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=d2eade7a6b15d6dbdb38ba12a1ff7bf07fcebba4#d2eade7a6b15d6dbdb38ba12a1ff7bf07fcebba4"
+source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=80bb8f4c9112789f7c24cc98d8423010977806a6#80bb8f4c9112789f7c24cc98d8423010977806a6"
 dependencies = [
 "tokio",
 "tokio-stream",
@@ -11236,9 +11192,9 @@ dependencies = [

 [[package]]
 name = "pathfinder_simd"
-version = "0.5.5"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf9027960355bf3afff9841918474a81a5f972ac6d226d518060bba758b5ad57"
+checksum = "5cf07ef4804cfa9aea3b04a7bbdd5a40031dbb6b4f2cbaf2b011666c80c5b4f2"
 dependencies = [
 "rustc_version",
 ]
@@ -13168,7 +13124,6 @@ dependencies = [
 "thiserror 2.0.12",
 "urlencoding",
 "util",
- "which 6.0.3",
 "workspace-hack",
 ]

@@ -13655,7 +13610,6 @@ dependencies = [
 "serde",
 "settings",
 "theme",
- "title_bar",
 "ui",
 "util",
 "workspace",
@@ -14556,12 +14510,12 @@ dependencies = [
 "serde_json",
 "serde_json_lenient",
 "smallvec",
+ "streaming-iterator",
 "tree-sitter",
 "tree-sitter-json",
 "unindent",
 "util",
 "workspace-hack",
- "zlog",
 ]

 [[package]]
@@ -15528,18 +15482,6 @@ version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0193cc4331cfd2f3d2011ef287590868599a2f33c3e69bc22c1a3d3acf9e02fb"

-[[package]]
-name = "svg_preview"
-version = "0.1.0"
-dependencies = [
- "editor",
- "file_icons",
- "gpui",
- "ui",
- "workspace",
- "workspace-hack",
-]
-
 [[package]]
 name = "svgtypes"
 version = "0.15.3"
@@ -16051,6 +15993,7 @@ dependencies = [
 "indexmap",
 "log",
 "palette",
+ "rust-embed",
 "serde",
 "serde_json",
 "serde_json_lenient",
@@ -16881,7 +16824,8 @@ dependencies = [
 [[package]]
 name = "tree-sitter-python"
 version = "0.23.6"
-source = "git+https://github.com/zed-industries/tree-sitter-python?rev=218fcbf3fda3d029225f3dec005cb497d111b35e#218fcbf3fda3d029225f3dec005cb497d111b35e"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d065aaa27f3aaceaf60c1f0e0ac09e1cb9eb8ed28e7bcdaa52129cffc7f4b04"
 dependencies = [
 "cc",
 "tree-sitter-language",
@@ -18297,7 +18241,7 @@ dependencies = [
 [[package]]
 name = "webrtc-sys"
 version = "0.3.7"
-source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=d2eade7a6b15d6dbdb38ba12a1ff7bf07fcebba4#d2eade7a6b15d6dbdb38ba12a1ff7bf07fcebba4"
+source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=80bb8f4c9112789f7c24cc98d8423010977806a6#80bb8f4c9112789f7c24cc98d8423010977806a6"
 dependencies = [
 "cc",
 "cxx",
@@ -18310,7 +18254,7 @@ dependencies = [
 [[package]]
 name = "webrtc-sys-build"
 version = "0.3.6"
-source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=d2eade7a6b15d6dbdb38ba12a1ff7bf07fcebba4#d2eade7a6b15d6dbdb38ba12a1ff7bf07fcebba4"
+source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=80bb8f4c9112789f7c24cc98d8423010977806a6#80bb8f4c9112789f7c24cc98d8423010977806a6"
 dependencies = [
 "fs2",
 "regex",
@@ -19930,16 +19874,16 @@ dependencies = [

 [[package]]
 name = "zed"
-version = "0.194.0"
+version = "0.192.7"
 dependencies = [
 "activity_indicator",
 "agent",
 "agent_settings",
- "agent_ui",
 "anyhow",
 "ashpd",
 "askpass",
 "assets",
+ "assistant_context_editor",
 "assistant_tool",
 "assistant_tools",
 "audio",
@@ -19986,7 +19930,6 @@ dependencies = [
 "inline_completion_button",
 "inspector_ui",
 "install_cli",
- "itertools 0.14.0",
 "jj_ui",
 "journal",
 "language",
@@ -20011,7 +19954,6 @@ dependencies = [
 "parking_lot",
 "paths",
 "picker",
- "pretty_assertions",
 "profiling",
 "project",
 "project_panel",
@@ -20035,7 +19977,6 @@ dependencies = [
 "snippet_provider",
 "snippets_ui",
 "supermaven",
- "svg_preview",
 "sysinfo",
 "tab_switcher",
 "task",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,13 +2,12 @@
 resolver = "2"
 members = [
    "crates/activity_indicator",
-    "crates/agent_ui",
    "crates/agent",
    "crates/agent_settings",
    "crates/anthropic",
    "crates/askpass",
    "crates/assets",
-    "crates/assistant_context",
+    "crates/assistant_context_editor",
    "crates/assistant_slash_command",
    "crates/assistant_slash_commands",
    "crates/assistant_tool",
@@ -66,7 +65,6 @@ members = [
    "crates/gpui",
    "crates/gpui_macros",
    "crates/gpui_tokio",
-
    "crates/html_to_markdown",
    "crates/http_client",
    "crates/http_client_tls",
@@ -95,7 +93,6 @@ members = [
    "crates/markdown_preview",
    "crates/media",
    "crates/menu",
-    "crates/svg_preview",
    "crates/migrator",
    "crates/mistral",
    "crates/multi_buffer",
@@ -217,13 +214,12 @@ edition = "2024"

 activity_indicator = { path = "crates/activity_indicator" }
 agent = { path = "crates/agent" }
-agent_ui = { path = "crates/agent_ui" }
 agent_settings = { path = "crates/agent_settings" }
 ai = { path = "crates/ai" }
 anthropic = { path = "crates/anthropic" }
 askpass = { path = "crates/askpass" }
 assets = { path = "crates/assets" }
-assistant_context = { path = "crates/assistant_context" }
+assistant_context_editor = { path = "crates/assistant_context_editor" }
 assistant_slash_command = { path = "crates/assistant_slash_command" }
 assistant_slash_commands = { path = "crates/assistant_slash_commands" }
 assistant_tool = { path = "crates/assistant_tool" }
@@ -305,7 +301,6 @@ lmstudio = { path = "crates/lmstudio" }
 lsp = { path = "crates/lsp" }
 markdown = { path = "crates/markdown" }
 markdown_preview = { path = "crates/markdown_preview" }
-svg_preview = { path = "crates/svg_preview" }
 media = { path = "crates/media" }
 menu = { path = "crates/menu" }
 migrator = { path = "crates/migrator" }
@@ -381,7 +376,6 @@ util_macros = { path = "crates/util_macros" }
 vercel = { path = "crates/vercel" }
 vim = { path = "crates/vim" }
 vim_mode_setting = { path = "crates/vim_mode_setting" }
-
 watch = { path = "crates/watch" }
 web_search = { path = "crates/web_search" }
 web_search_providers = { path = "crates/web_search_providers" }
@@ -461,6 +455,7 @@ futures-batch = "0.6.1"
 futures-lite = "1.13"
 git2 = { version = "0.20.1", default-features = false }
 globset = "0.4"
+hashbrown = "0.15.3"
 handlebars = "4.3"
 heck = "0.5"
 heed = { version = "0.21.0", features = ["read-txn-no-tls"] }
@@ -488,6 +483,7 @@ log = { version = "0.4.16", features = ["kv_unstable_serde", "serde"] }
 lsp-types = { git = "https://github.com/zed-industries/lsp-types", rev = "c9c189f1c5dd53c624a419ce35bc77ad6a908d18" }
 markup5ever_rcdom = "0.3.0"
 metal = "0.29"
+mlua = { version = "0.10", features = ["lua54", "vendored", "async", "send"] }
 moka = { version = "0.12.10", features = ["sync"] }
 naga = { version = "25.0", features = ["wgsl-in"] }
 nanoid = "0.4"
@@ -522,6 +518,7 @@ rand = "0.8.5"
 rayon = "1.8"
 ref-cast = "1.0.24"
 regex = "1.5"
+repair_json = "0.1.0"
 reqwest = { git = "https://github.com/zed-industries/reqwest.git", rev = "951c770a32f1998d6e999cef3e59e0013e6c4415", default-features = false, features = [
    "charset",
    "http2",
@@ -553,6 +550,7 @@ serde_repr = "0.1"
 sha2 = "0.10"
 shellexpand = "2.1.0"
 shlex = "1.3.0"
+signal-hook = "0.3.17"
 simplelog = "0.12.2"
 smallvec = { version = "1.6", features = ["union"] }
 smol = "2.0"
@@ -597,7 +595,7 @@ tree-sitter-html = "0.23"
 tree-sitter-jsdoc = "0.23"
 tree-sitter-json = "0.24"
 tree-sitter-md = { git = "https://github.com/tree-sitter-grammars/tree-sitter-markdown", rev = "9a23c1a96c0513d8fc6520972beedd419a973539" }
-tree-sitter-python = { git = "https://github.com/zed-industries/tree-sitter-python", rev = "218fcbf3fda3d029225f3dec005cb497d111b35e" }
+tree-sitter-python = "0.23"
 tree-sitter-regex = "0.24"
 tree-sitter-ruby = "0.23"
 tree-sitter-rust = "0.24"
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 # syntax = docker/dockerfile:1.2

-FROM rust:1.88-bookworm as builder
+FROM rust:1.87-bookworm as builder
 WORKDIR app
 COPY . .

--- a/assets/icons/arrow_down10.svg
+++ b/assets/icons/arrow_down10.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-arrow-down10-icon lucide-arrow-down-1-0"><path d="m3 16 4 4 4-4"/><path d="M7 20V4"/><path d="M17 10V4h-2"/><path d="M15 10h4"/><rect x="15" y="14" width="4" height="6" ry="2"/></svg>
--- a/assets/icons/arrow_up_alt.svg
+++ b/assets/icons/arrow_up_alt.svg
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8 3.5L12.5 8M8 3.5L3.5 8M8 3.5V12.5" stroke="black" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
--- a/assets/icons/bolt_filled_alt.svg
+++ b/assets/icons/bolt_filled_alt.svg
@@ -1,3 +0,0 @@
-<svg width="12" height="12" viewBox="0 0 12 12" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6.75776 5.50003H8.49988C8.70769 5.50003 8.89518 5.62971 8.95455 5.82346C9.04049 6.01876 8.9858 6.23906 8.82956 6.37656L4.82971 9.87643C4.65315 10.0295 4.39488 10.042 4.20614 9.90455C4.01724 9.76705 3.94849 9.51706 4.04052 9.30301L5.24219 6.49999H3.48601C3.2918 6.49999 3.10524 6.37031 3.03197 6.17657C2.9587 5.98126 3.014 5.76096 3.1708 5.62346L7.17018 2.12375C7.34674 1.97001 7.60454 1.95829 7.7936 2.09547C7.98265 2.23275 8.0514 2.48218 7.95922 2.69695L6.75776 5.50003Z" fill="black"/>
-</svg>
--- a/assets/icons/file_icons/cairo.svg
+++ b/assets/icons/file_icons/cairo.svg
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8.51298 2C5.19374 2 2.5 4.6945 2.5 8.01298C2.5 9.41828 2.99491 10.7205 3.80143 11.7485C4.45214 10.8243 5.15479 9.95214 6.03997 9.23651C6.06594 9.21054 6.13086 9.17159 6.20876 9.11965C6.57307 8.84623 6.8335 8.44297 6.89842 7.98702V7.97403C7.11991 6.50306 7.71869 5.99593 9.3974 5.99593C9.54099 5.99593 9.70978 5.99593 9.86558 6.00891C10.7248 6.04786 11.2189 6.29532 11.2709 6.42515C11.3098 6.49007 11.2968 6.56874 11.2839 6.64664L11.2189 6.63366C10.6851 6.56874 9.87856 6.72454 9.76171 7.31034C9.69679 7.63569 9.77469 8 9.80066 8.32536C9.83961 8.6637 9.86558 9.01502 9.86558 9.35336C9.86558 9.37933 9.83961 9.50916 9.86558 9.52215C8.95443 8.64995 6.84572 9.74364 6.18203 10.2248C6.24695 10.1988 6.31263 10.1729 6.39053 10.1469C7.02826 9.92541 8.94145 9.35336 9.68304 9.99109C10.3078 10.7587 9.74796 12.1777 9.27979 12.8803C9.00636 13.2966 8.66802 13.6739 8.29073 14H8.51222C11.8315 14 14.5252 11.3055 14.5252 7.98702C14.5252 4.66853 11.8452 2 8.51298 2ZM9.20265 5.25356C8.55193 5.25356 8.01808 4.7197 8.01808 4.06899C8.01808 3.41828 8.55193 2.88442 9.20265 2.88442C9.85336 2.88442 10.3872 3.41828 10.3872 4.06899C10.3872 4.7197 9.86634 5.25356 9.20265 5.25356Z" fill="black"/>
-</svg>
--- a/assets/icons/lsp_debug.svg
+++ b/assets/icons/lsp_debug.svg
@@ -1,12 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6 3L7 4" stroke="black" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9 4L10 3" stroke="black" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M6.002 6V5.51658C5.98992 5.32067 6.03266 5.12502 6.12762 4.94143C6.22259 4.75784 6.36781 4.59012 6.55453 4.44839C6.74125 4.30666 6.9656 4.19386 7.21403 4.1168C7.46246 4.03973 7.72983 4 8 4C8.27017 4 8.53754 4.03973 8.78597 4.1168C9.0344 4.19386 9.25875 4.30666 9.44547 4.44839C9.63219 4.59012 9.77741 4.75784 9.87238 4.94143C9.96734 5.12502 10.0101 5.32067 9.998 5.51658V6" stroke="black" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8 13C6.35 13 5 11.5462 5 9.76923V8.15385C5 7.58261 5.21071 7.03477 5.58579 6.63085C5.96086 6.22692 6.46957 6 7 6H9C9.53043 6 10.0391 6.22692 10.4142 6.63085C10.7893 7.03477 11 7.58261 11 8.15385V9.76923C11 11.5462 9.65 13 8 13Z" stroke="black" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5 6.16663C3.90652 6.06663 3 5.21663 3 4.16663" stroke="black" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5 9H3" stroke="black" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M3 13C3 11.95 3.89474 11.05 5 11" stroke="black" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M13 4C13 5.05 12.0857 5.9 11 6" stroke="black" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M13 9H11" stroke="black" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M11 11C12.1053 11.05 13 11.95 13 13" stroke="black" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
--- a/assets/icons/lsp_restart.svg
+++ b/assets/icons/lsp_restart.svg
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.84265 10.7778C4.39206 11.6001 5.17295 12.241 6.08658 12.6194C7.00021 12.9978 8.00555 13.0969 8.97545 12.9039C9.94535 12.711 10.8363 12.2348 11.5355 11.5355C12.2348 10.8363 12.711 9.94535 12.9039 8.97545C13.0969 8.00555 12.9978 7.00021 12.6194 6.08658C12.241 5.17295 11.6001 4.39206 10.7778 3.84265C9.9556 3.29324 8.9889 3 8 3C6.60219 3.00526 5.26054 3.55068 4.25556 4.52222L3 5.77778" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M3 3V6H6" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
--- a/assets/icons/lsp_stop.svg
+++ b/assets/icons/lsp_stop.svg
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8 13C10.7614 13 13 10.7614 13 8C13 5.23858 10.7614 3 8 3C5.23858 3 3 5.23858 3 8C3 10.7614 5.23858 13 8 13Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5 5L11 11" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
--- a/assets/icons/scroll_text.svg
+++ b/assets/icons/scroll_text.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-scroll-text-icon lucide-scroll-text"><path d="M15 12h-5"/><path d="M15 8h-5"/><path d="M19 17V5a2 2 0 0 0-2-2H4"/><path d="M8 21h12a2 2 0 0 0 2-2v-1a1 1 0 0 0-1-1H11a1 1 0 0 0-1 1v1a2 2 0 1 1-4 0V5a2 2 0 1 0-4 0v2a1 1 0 0 0 1 1h3"/></svg>
--- a/assets/icons/split_alt.svg
+++ b/assets/icons/split_alt.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-split-icon lucide-split"><path d="M16 3h5v5"/><path d="M8 3H3v5"/><path d="M12 22v-8.3a4 4 0 0 0-1.172-2.872L3 3"/><path d="m15 9 6-6"/></svg>
--- a/assets/icons/zed_mcp_custom.svg
+++ b/assets/icons/zed_mcp_custom.svg
--- a/assets/icons/zed_mcp_extension.svg
+++ b/assets/icons/zed_mcp_extension.svg
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect opacity="0.3" x="2" y="2" width="12" height="12" rx="2" stroke="black" stroke-width="1.5"/>
-<path d="M9.62109 4.65039C9.80393 4.65039 9.98678 4.70637 10.1279 4.83203C10.2722 4.96055 10.3496 5.14167 10.3496 5.33691C10.3496 5.53215 10.2723 5.71329 10.1279 5.8418C9.98678 5.96744 9.80392 6.02344 9.62109 6.02344H7.1416V7.24902H9.46289C9.6423 7.24902 9.82303 7.30362 9.96387 7.42773C10.1085 7.55531 10.1875 7.73591 10.1875 7.93164C10.1874 8.12674 10.1072 8.30592 9.96484 8.43262C9.82536 8.55656 9.64499 8.61426 9.46289 8.61426H7.1416V9.97656H9.62109C9.80392 9.97656 9.98678 10.0326 10.1279 10.1582C10.2723 10.2867 10.3496 10.4678 10.3496 10.6631C10.3496 10.8583 10.2722 11.0394 10.1279 11.168C9.98678 11.2936 9.80393 11.3496 9.62109 11.3496H6.39648C6.20308 11.3496 6.00965 11.289 5.86328 11.1465C5.7159 11.0028 5.65039 10.8095 5.65039 10.6133V5.38672C5.65039 5.19054 5.7159 4.99723 5.86328 4.85352C6.00965 4.71101 6.20308 4.65039 6.39648 4.65039H9.62109ZM9.70215 10.9941C9.72618 10.9903 9.74882 10.9838 9.77051 10.9766C9.74884 10.9838 9.72616 10.9903 9.70215 10.9941ZM9.78809 10.9688C9.80381 10.9626 9.81877 10.9561 9.83301 10.9482C9.81877 10.9561 9.80381 10.9626 9.78809 10.9688ZM9.85059 10.9375C9.86364 10.9292 9.87617 10.9209 9.8877 10.9111C9.87616 10.9209 9.86365 10.9293 9.85059 10.9375ZM6.1123 10.8994C6.12346 10.9099 6.1358 10.9188 6.14844 10.9277C6.1358 10.9188 6.12346 10.9099 6.1123 10.8994ZM9.90039 10.8984C9.91122 10.8882 9.92149 10.8778 9.93066 10.8662C9.92147 10.8778 9.91123 10.8882 9.90039 10.8984ZM6.07129 10.8516C6.0792 10.8626 6.08754 10.8729 6.09668 10.8828C6.08754 10.8729 6.0792 10.8626 6.07129 10.8516ZM9.94434 10.8477C9.95104 10.8377 9.95638 10.8272 9.96191 10.8164C9.95637 10.8271 9.95106 10.8377 9.94434 10.8477ZM6.03418 10.7842C6.04066 10.7995 6.04735 10.8143 6.05566 10.8281C6.04735 10.8143 6.04066 10.7995 6.03418 10.7842ZM9.97559 10.7891C9.97984 10.7783 9.98321 10.7673 9.98633 10.7559C9.98321 10.7673 9.97984 10.7783 9.97559 10.7891ZM6.01367 10.7236C6.0173 10.7388 6.02121 10.7535 6.02637 10.7676C6.02121 10.7535 6.0173 10.7388 6.01367 10.7236ZM9.62109 10.3262C9.67716 10.3262 9.72942 10.3346 9.77539 10.3506C9.72927 10.3345 9.67733 10.3262 9.62109 10.3262ZM9.56641 8.25098C9.5802 8.24792 9.59348 8.24449 9.60645 8.24023C9.59348 8.2445 9.58021 8.24792 9.56641 8.25098ZM9.625 8.2334C9.64073 8.22735 9.65566 8.2207 9.66992 8.21289C9.65565 8.22072 9.64074 8.22733 9.625 8.2334ZM9.68848 8.20117C9.69832 8.19495 9.70781 8.18872 9.7168 8.18164C9.70781 8.18874 9.69832 8.19493 9.68848 8.20117ZM9.74121 8.16016C9.7511 8.15059 9.76008 8.14059 9.76855 8.12988C9.76009 8.1406 9.75109 8.15057 9.74121 8.16016ZM9.77734 8.11914C9.78753 8.10499 9.79605 8.09004 9.80371 8.07422C9.79606 8.09005 9.78751 8.10498 9.77734 8.11914ZM9.79883 5.6377C9.80686 5.6343 9.81463 5.63082 9.82227 5.62695C9.81463 5.63084 9.80687 5.63429 9.79883 5.6377ZM9.93457 5.53516C9.91124 5.56582 9.88273 5.59214 9.84863 5.61328C9.88277 5.5922 9.91121 5.56576 9.93457 5.53516ZM9.94434 5.52246C9.95363 5.50886 9.96171 5.4946 9.96875 5.47949C9.96172 5.4946 9.9536 5.50885 9.94434 5.52246ZM6.02637 5.23145C6.02118 5.24552 6.01733 5.26024 6.01367 5.27539C6.01734 5.26023 6.02118 5.24552 6.02637 5.23145ZM6.05566 5.17188C6.04766 5.18525 6.04049 5.19914 6.03418 5.21387C6.04049 5.19914 6.04765 5.18525 6.05566 5.17188ZM6.09961 5.11328C6.08938 5.124 6.08003 5.13538 6.07129 5.14746C6.08003 5.13538 6.08938 5.12399 6.09961 5.11328ZM6.14844 5.07129C6.13601 5.08003 6.12428 5.08938 6.11328 5.09961C6.12428 5.08938 6.13601 5.08003 6.14844 5.07129ZM6.23242 5.02637C6.21195 5.03382 6.19287 5.04334 6.1748 5.05371C6.19287 5.04335 6.21195 5.03382 6.23242 5.02637ZM6.1748 10.9453C6.19195 10.9552 6.21017 10.9635 6.22949 10.9707C6.21017 10.9635 6.19195 10.9552 6.1748 10.9453ZM6.30957 5.00684C6.28239 5.01136 6.25651 5.01759 6.23242 5.02637C6.25651 5.01759 6.28239 5.01136 6.30957 5.00684Z" fill="black"/>
-</svg>
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -41,8 +41,7 @@
      "shift-f11": "debugger::StepOut",
      "f11": "zed::ToggleFullScreen",
      "ctrl-alt-z": "edit_prediction::RateCompletions",
-      "ctrl-shift-i": "edit_prediction::ToggleMenu",
-      "ctrl-alt-l": "lsp_tool::ToggleMenu"
+      "ctrl-shift-i": "edit_prediction::ToggleMenu"
    }
  },
  {
@@ -244,8 +243,8 @@
      "ctrl-alt-e": "agent::RemoveAllContext",
      "ctrl-shift-e": "project_panel::ToggleFocus",
      "ctrl-shift-enter": "agent::ContinueThread",
-      "super-ctrl-b": "agent::ToggleBurnMode",
-      "alt-enter": "agent::ContinueWithBurnMode"
+      "alt-enter": "agent::ContinueWithBurnMode",
+      "ctrl-alt-b": "agent::ToggleBurnMode"
    }
  },
  {
@@ -491,27 +490,13 @@
      "ctrl-k r": "editor::RevealInFileManager",
      "ctrl-k p": "editor::CopyPath",
      "ctrl-\\": "pane::SplitRight",
+      "ctrl-k v": "markdown::OpenPreviewToTheSide",
+      "ctrl-shift-v": "markdown::OpenPreview",
      "ctrl-alt-shift-c": "editor::DisplayCursorNames",
      "alt-.": "editor::GoToHunk",
      "alt-,": "editor::GoToPreviousHunk"
    }
  },
-  {
-    "context": "Editor && extension == md",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-k v": "markdown::OpenPreviewToTheSide",
-      "ctrl-shift-v": "markdown::OpenPreview"
-    }
-  },
-  {
-    "context": "Editor && extension == svg",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-k v": "svg::OpenPreviewToTheSide",
-      "ctrl-shift-v": "svg::OpenPreview"
-    }
-  },
  {
    "context": "Editor && mode == full",
    "bindings": {
@@ -909,19 +894,14 @@
      "right": "variable_list::ExpandSelectedEntry",
      "enter": "variable_list::EditVariable",
      "ctrl-c": "variable_list::CopyVariableValue",
-      "ctrl-alt-c": "variable_list::CopyVariableName",
-      "delete": "variable_list::RemoveWatch",
-      "backspace": "variable_list::RemoveWatch",
-      "alt-enter": "variable_list::AddWatch"
+      "ctrl-alt-c": "variable_list::CopyVariableName"
    }
  },
  {
    "context": "BreakpointList",
    "bindings": {
      "space": "debugger::ToggleEnableBreakpoint",
-      "backspace": "debugger::UnsetBreakpoint",
-      "left": "debugger::PreviousBreakpointProperty",
-      "right": "debugger::NextBreakpointProperty"
+      "backspace": "debugger::UnsetBreakpoint"
    }
  },
  {
@@ -962,7 +942,7 @@
    }
  },
  {
-    "context": "FileFinder || (FileFinder > Picker > Editor)",
+    "context": "FileFinder",
    "bindings": {
      "ctrl-shift-a": "file_finder::ToggleSplitMenu",
      "ctrl-shift-i": "file_finder::ToggleFilterMenu"
@@ -1057,8 +1037,7 @@
    "context": "DebugConsole > Editor",
    "use_key_equivalents": true,
    "bindings": {
-      "enter": "menu::Confirm",
-      "alt-enter": "console::WatchExpression"
+      "enter": "menu::Confirm"
    }
  },
  {
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -47,8 +47,7 @@
      "fn-f": "zed::ToggleFullScreen",
      "ctrl-cmd-f": "zed::ToggleFullScreen",
      "ctrl-cmd-z": "edit_prediction::RateCompletions",
-      "ctrl-cmd-i": "edit_prediction::ToggleMenu",
-      "ctrl-cmd-l": "lsp_tool::ToggleMenu"
+      "ctrl-cmd-i": "edit_prediction::ToggleMenu"
    }
  },
  {
@@ -283,9 +282,9 @@
      "cmd->": "assistant::QuoteSelection",
      "cmd-alt-e": "agent::RemoveAllContext",
      "cmd-shift-e": "project_panel::ToggleFocus",
-      "cmd-ctrl-b": "agent::ToggleBurnMode",
      "cmd-shift-enter": "agent::ContinueThread",
-      "alt-enter": "agent::ContinueWithBurnMode"
+      "alt-enter": "agent::ContinueWithBurnMode",
+      "cmd-alt-b": "agent::ToggleBurnMode"
    }
  },
  {
@@ -545,23 +544,9 @@
      "cmd-k r": "editor::RevealInFileManager",
      "cmd-k p": "editor::CopyPath",
      "cmd-\\": "pane::SplitRight",
-      "ctrl-cmd-c": "editor::DisplayCursorNames"
-    }
-  },
-  {
-    "context": "Editor && extension == md",
-    "use_key_equivalents": true,
-    "bindings": {
      "cmd-k v": "markdown::OpenPreviewToTheSide",
-      "cmd-shift-v": "markdown::OpenPreview"
-    }
-  },
-  {
-    "context": "Editor && extension == svg",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd-k v": "svg::OpenPreviewToTheSide",
-      "cmd-shift-v": "svg::OpenPreview"
+      "cmd-shift-v": "markdown::OpenPreview",
+      "ctrl-cmd-c": "editor::DisplayCursorNames"
    }
  },
  {
@@ -602,7 +587,7 @@
      "alt-cmd-o": ["projects::OpenRecent", { "create_new_window": false }],
      "ctrl-cmd-o": ["projects::OpenRemote", { "from_existing_connection": false, "create_new_window": false }],
      "ctrl-cmd-shift-o": ["projects::OpenRemote", { "from_existing_connection": true, "create_new_window": false }],
-      "cmd-ctrl-b": "branches::OpenRecent",
+      "alt-cmd-b": "branches::OpenRecent",
      "ctrl-~": "workspace::NewTerminal",
      "cmd-s": "workspace::Save",
      "cmd-k s": "workspace::SaveWithoutFormat",
@@ -620,7 +605,6 @@
      "cmd-8": ["workspace::ActivatePane", 7],
      "cmd-9": ["workspace::ActivatePane", 8],
      "cmd-b": "workspace::ToggleLeftDock",
-      "cmd-alt-b": "workspace::ToggleRightDock",
      "cmd-r": "workspace::ToggleRightDock",
      "cmd-j": "workspace::ToggleBottomDock",
      "alt-cmd-y": "workspace::CloseAllDocks",
@@ -880,10 +864,7 @@
      "right": "variable_list::ExpandSelectedEntry",
      "enter": "variable_list::EditVariable",
      "cmd-c": "variable_list::CopyVariableValue",
-      "cmd-alt-c": "variable_list::CopyVariableName",
-      "delete": "variable_list::RemoveWatch",
-      "backspace": "variable_list::RemoveWatch",
-      "alt-enter": "variable_list::AddWatch"
+      "cmd-alt-c": "variable_list::CopyVariableName"
    }
  },
  {
@@ -980,9 +961,7 @@
    "context": "BreakpointList",
    "bindings": {
      "space": "debugger::ToggleEnableBreakpoint",
-      "backspace": "debugger::UnsetBreakpoint",
-      "left": "debugger::PreviousBreakpointProperty",
-      "right": "debugger::NextBreakpointProperty"
+      "backspace": "debugger::UnsetBreakpoint"
    }
  },
  {
@@ -1029,7 +1008,7 @@
    }
  },
  {
-    "context": "FileFinder || (FileFinder > Picker > Editor)",
+    "context": "FileFinder",
    "use_key_equivalents": true,
    "bindings": {
      "cmd-shift-a": "file_finder::ToggleSplitMenu",
@@ -1156,8 +1135,7 @@
    "context": "DebugConsole > Editor",
    "use_key_equivalents": true,
    "bindings": {
-      "enter": "menu::Confirm",
-      "alt-enter": "console::WatchExpression"
+      "enter": "menu::Confirm"
    }
  },
  {
--- a/assets/keymaps/linux/atom.json
+++ b/assets/keymaps/linux/atom.json
@@ -9,13 +9,6 @@
  },
  {
    "context": "Editor",
-    "bindings": {
-      "ctrl-k ctrl-u": "editor::ConvertToUpperCase", // editor:upper-case
-      "ctrl-k ctrl-l": "editor::ConvertToLowerCase" // editor:lower-case
-    }
-  },
-  {
-    "context": "Editor && mode == full",
    "bindings": {
      "ctrl-shift-l": "language_selector::Toggle", // grammar-selector:show
      "ctrl-|": "pane::RevealInProjectPanel", // tree-view:reveal-active-file
@@ -26,20 +19,25 @@
      "shift-f3": ["editor::SelectPrevious", { "replace_newest": true }], //find-and-replace:find-previous
      "alt-shift-down": "editor::AddSelectionBelow", // editor:add-selection-below
      "alt-shift-up": "editor::AddSelectionAbove", // editor:add-selection-above
+      "ctrl-k ctrl-u": "editor::ConvertToUpperCase", // editor:upper-case
+      "ctrl-k ctrl-l": "editor::ConvertToLowerCase", // editor:lower-case
      "ctrl-j": "editor::JoinLines", // editor:join-lines
      "ctrl-shift-d": "editor::DuplicateLineDown", // editor:duplicate-lines
      "ctrl-up": "editor::MoveLineUp", // editor:move-line-up
      "ctrl-down": "editor::MoveLineDown", // editor:move-line-down
      "ctrl-\\": "workspace::ToggleLeftDock", // tree-view:toggle
-      "ctrl-shift-m": "markdown::OpenPreviewToTheSide", // markdown-preview:toggle
+      "ctrl-shift-m": "markdown::OpenPreviewToTheSide" // markdown-preview:toggle
+    }
+  },
+  {
+    "context": "Editor && mode == full",
+    "bindings": {
      "ctrl-r": "outline::Toggle" // symbols-view:toggle-project-symbols
    }
  },
  {
    "context": "BufferSearchBar",
    "bindings": {
-      "f3": ["editor::SelectNext", { "replace_newest": true }], // find-and-replace:find-next
-      "shift-f3": ["editor::SelectPrevious", { "replace_newest": true }], //find-and-replace:find-previous
      "ctrl-f3": "search::SelectNextMatch", // find-and-replace:find-next-selected
      "ctrl-shift-f3": "search::SelectPreviousMatch" // find-and-replace:find-previous-selected
    }
--- a/assets/keymaps/linux/cursor.json
+++ b/assets/keymaps/linux/cursor.json
@@ -8,6 +8,7 @@
      "ctrl-shift-i": "agent::ToggleFocus",
      "ctrl-l": "agent::ToggleFocus",
      "ctrl-shift-l": "agent::ToggleFocus",
+      "ctrl-alt-b": "agent::ToggleFocus",
      "ctrl-shift-j": "agent::OpenConfiguration"
    }
  },
@@ -41,6 +42,7 @@
      "ctrl-shift-i": "workspace::ToggleRightDock",
      "ctrl-l": "workspace::ToggleRightDock",
      "ctrl-shift-l": "workspace::ToggleRightDock",
+      "ctrl-alt-b": "workspace::ToggleRightDock",
      "ctrl-w": "workspace::ToggleRightDock", // technically should close chat
      "ctrl-.": "agent::ToggleProfileSelector",
      "ctrl-/": "agent::ToggleModelSelector",
--- a/assets/keymaps/linux/emacs.json
+++ b/assets/keymaps/linux/emacs.json
@@ -59,8 +59,7 @@
      "alt->": "editor::MoveToEnd", // end-of-buffer
      "ctrl-l": "editor::ScrollCursorCenterTopBottom", // recenter-top-bottom
      "ctrl-s": "buffer_search::Deploy", // isearch-forward
-      "alt-^": "editor::JoinLines", // join-line
-      "alt-q": "editor::Rewrap" // fill-paragraph
+      "alt-^": "editor::JoinLines" // join-line
    }
  },
  {
@@ -91,13 +90,6 @@
      "ctrl-g": "editor::Cancel"
    }
  },
-  {
-    "context": "Editor && (showing_code_actions || showing_completions)",
-    "bindings": {
-      "ctrl-p": "editor::ContextMenuPrevious",
-      "ctrl-n": "editor::ContextMenuNext"
-    }
-  },
  {
    "context": "Workspace",
    "bindings": {
--- a/assets/keymaps/macos/atom.json
+++ b/assets/keymaps/macos/atom.json
@@ -9,14 +9,6 @@
  },
  {
    "context": "Editor",
-    "bindings": {
-      "cmd-shift-backspace": "editor::DeleteToBeginningOfLine",
-      "cmd-k cmd-u": "editor::ConvertToUpperCase",
-      "cmd-k cmd-l": "editor::ConvertToLowerCase"
-    }
-  },
-  {
-    "context": "Editor && mode == full",
    "bindings": {
      "ctrl-shift-l": "language_selector::Toggle",
      "cmd-|": "pane::RevealInProjectPanel",
@@ -27,20 +19,26 @@
      "cmd-shift-g": ["editor::SelectPrevious", { "replace_newest": true }],
      "ctrl-shift-down": "editor::AddSelectionBelow",
      "ctrl-shift-up": "editor::AddSelectionAbove",
+      "cmd-shift-backspace": "editor::DeleteToBeginningOfLine",
+      "cmd-k cmd-u": "editor::ConvertToUpperCase",
+      "cmd-k cmd-l": "editor::ConvertToLowerCase",
      "alt-enter": "editor::Newline",
      "cmd-shift-d": "editor::DuplicateLineDown",
      "ctrl-cmd-up": "editor::MoveLineUp",
      "ctrl-cmd-down": "editor::MoveLineDown",
      "cmd-\\": "workspace::ToggleLeftDock",
-      "ctrl-shift-m": "markdown::OpenPreviewToTheSide",
+      "ctrl-shift-m": "markdown::OpenPreviewToTheSide"
+    }
+  },
+  {
+    "context": "Editor && mode == full",
+    "bindings": {
      "cmd-r": "outline::Toggle"
    }
  },
  {
    "context": "BufferSearchBar",
    "bindings": {
-      "cmd-g": ["editor::SelectNext", { "replace_newest": true }],
-      "cmd-shift-g": ["editor::SelectPrevious", { "replace_newest": true }],
      "cmd-f3": "search::SelectNextMatch",
      "cmd-shift-f3": "search::SelectPreviousMatch"
    }
--- a/assets/keymaps/macos/cursor.json
+++ b/assets/keymaps/macos/cursor.json
@@ -8,6 +8,7 @@
      "cmd-shift-i": "agent::ToggleFocus",
      "cmd-l": "agent::ToggleFocus",
      "cmd-shift-l": "agent::ToggleFocus",
+      "cmd-alt-b": "agent::ToggleFocus",
      "cmd-shift-j": "agent::OpenConfiguration"
    }
  },
@@ -42,6 +43,7 @@
      "cmd-shift-i": "workspace::ToggleRightDock",
      "cmd-l": "workspace::ToggleRightDock",
      "cmd-shift-l": "workspace::ToggleRightDock",
+      "cmd-alt-b": "workspace::ToggleRightDock",
      "cmd-w": "workspace::ToggleRightDock", // technically should close chat
      "cmd-.": "agent::ToggleProfileSelector",
      "cmd-/": "agent::ToggleModelSelector",
--- a/assets/keymaps/macos/emacs.json
+++ b/assets/keymaps/macos/emacs.json
@@ -59,8 +59,7 @@
      "alt->": "editor::MoveToEnd", // end-of-buffer
      "ctrl-l": "editor::ScrollCursorCenterTopBottom", // recenter-top-bottom
      "ctrl-s": "buffer_search::Deploy", // isearch-forward
-      "alt-^": "editor::JoinLines", // join-line
-      "alt-q": "editor::Rewrap" // fill-paragraph
+      "alt-^": "editor::JoinLines" // join-line
    }
  },
  {
@@ -91,13 +90,6 @@
      "ctrl-g": "editor::Cancel"
    }
  },
-  {
-    "context": "Editor && (showing_code_actions || showing_completions)",
-    "bindings": {
-      "ctrl-p": "editor::ContextMenuPrevious",
-      "ctrl-n": "editor::ContextMenuNext"
-    }
-  },
  {
    "context": "Workspace",
    "bindings": {
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -85,10 +85,10 @@
      "[ {": ["vim::UnmatchedBackward", { "char": "{" }],
      "] )": ["vim::UnmatchedForward", { "char": ")" }],
      "[ (": ["vim::UnmatchedBackward", { "char": "(" }],
-      "f": ["vim::PushFindForward", { "before": false, "multiline": false }],
-      "t": ["vim::PushFindForward", { "before": true, "multiline": false }],
-      "shift-f": ["vim::PushFindBackward", { "after": false, "multiline": false }],
-      "shift-t": ["vim::PushFindBackward", { "after": true, "multiline": false }],
+      "f": ["vim::PushFindForward", { "before": false }],
+      "t": ["vim::PushFindForward", { "before": true }],
+      "shift-f": ["vim::PushFindBackward", { "after": false }],
+      "shift-t": ["vim::PushFindBackward", { "after": true }],
      "m": "vim::PushMark",
      "'": ["vim::PushJump", { "line": true }],
      "`": ["vim::PushJump", { "line": false }],
@@ -368,10 +368,6 @@
      "escape": "editor::Cancel",
      "ctrl-[": "editor::Cancel",
      ":": "command_palette::Toggle",
-      "left": "vim::WrappingLeft",
-      "right": "vim::WrappingRight",
-      "h": "vim::WrappingLeft",
-      "l": "vim::WrappingRight",
      "shift-d": "vim::DeleteToEndOfLine",
      "shift-j": "vim::JoinLines",
      "y": "editor::Copy",
@@ -389,10 +385,6 @@
      "shift-p": ["vim::Paste", { "before": true }],
      "u": "vim::Undo",
      "ctrl-r": "vim::Redo",
-      "f": ["vim::PushFindForward", { "before": false, "multiline": true }],
-      "t": ["vim::PushFindForward", { "before": true, "multiline": true }],
-      "shift-f": ["vim::PushFindBackward", { "after": false, "multiline": true }],
-      "shift-t": ["vim::PushFindBackward", { "after": true, "multiline": true }],
      "r": "vim::PushReplace",
      "s": "vim::Substitute",
      "shift-s": "vim::SubstituteLine",
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -80,7 +80,6 @@
    "inactive_opacity": 1.0
  },
  // Layout mode of the bottom dock. Defaults to "contained"
-  //   choices: contained, full, left_aligned, right_aligned
  "bottom_dock_layout": "contained",
  // The direction that you want to split panes horizontally. Defaults to "up"
  "pane_split_direction_horizontal": "up",
@@ -95,9 +94,11 @@
    // workspace when the centered layout is used.
    "right_padding": 0.2
  },
-  // Image viewer settings
+  // All settings related to the image viewer.
  "image_viewer": {
-    // The unit for image file sizes: "binary" (KiB, MiB) or decimal (KB, MB)
+    // The unit for image file sizes.
+    // By default we're setting it to binary.
+    // The second option is decimal.
    "unit": "binary"
  },
  // Determines the modifier to be used to add multiple cursors with the mouse. The open hover link mouse gestures will adapt such that it do not conflict with the multicursor modifier.
@@ -109,8 +110,6 @@
  "multi_cursor_modifier": "alt",
  // Whether to enable vim modes and key bindings.
  "vim_mode": false,
-  // Whether to enable helix mode and key bindings.
-  "helix_mode": false,
  // Whether to show the informational hover box when moving the mouse
  // over symbols in the editor.
  "hover_popover_enabled": true,
@@ -118,14 +117,7 @@
  "hover_popover_delay": 300,
  // Whether to confirm before quitting Zed.
  "confirm_quit": false,
-  // Whether to restore last closed project when fresh Zed instance is opened
-  // May take 3 values:
-  //  1. All workspaces open during last session
-  //         "restore_on_startup": "last_session"
-  //  2. The workspace opened
-  //         "restore_on_startup": "last_workspace",
-  //  3. Do not restore previous workspaces
-  //         "restore_on_startup": "none",
+  // Whether to restore last closed project when fresh Zed instance is opened.
  "restore_on_startup": "last_session",
  // Whether to attempt to restore previous file's state when opening it again.
  // The state is stored per pane.
@@ -138,9 +130,7 @@
  "restore_on_file_reopen": true,
  // Whether to automatically close files that have been deleted on disk.
  "close_on_file_delete": false,
-  // Relative size of the drop target in the editor that will open dropped file as a split pane (0-0.5)
-  // E.g. 0.25 == If you drop onto the top/bottom quarter of the pane a new vertical split will be used
-  //              If you drop onto the left/right quarter of the pane a new horizontal split will be used
+  // Size of the drop target in the editor.
  "drop_target_size": 0.2,
  // Whether the window should be closed when using 'close active item' on a window with no tabs.
  // May take 3 values:
@@ -443,9 +433,7 @@
    // 1. `null` to inherit the editor `current_line_highlight` setting (default)
    // 2. "line" or "all" to highlight the current line in the minimap.
    // 3. "gutter" or "none" to not highlight the current line in the minimap.
-    "current_line_highlight": null,
-    // Maximum number of columns to display in the minimap.
-    "max_width_columns": 80
+    "current_line_highlight": null
  },
  // Enable middle-click paste on Linux.
  "middle_click_paste": true,
@@ -493,7 +481,7 @@
  },
  // Whether the editor will scroll beyond the last line.
  "scroll_beyond_last_line": "one_page",
-  // The number of lines to keep above/below the cursor when scrolling with the keyboard
+  // The number of lines to keep above/below the cursor when scrolling.
  "vertical_scroll_margin": 3,
  // Whether to scroll when clicking near the edge of the visible text area.
  "autoscroll_on_clicks": false,
@@ -709,27 +697,23 @@
    "default_width": 360,
    // Style of the git status indicator in the panel.
    //
-    // Choices: label_color, icon
    // Default: icon
    "status_style": "icon",
-    // What branch name to use if `init.defaultBranch` is not set
+    // What branch name to use if init.defaultBranch
+    // is not set
    //
    // Default: main
    "fallback_branch_name": "main",
-    // Whether to sort entries in the panel by path or by status (the default).
+    // Whether to sort entries in the panel by path
+    // or by status (the default).
    //
    // Default: false
    "sort_by_path": false,
-    // Whether to collapse untracked files in the diff panel.
-    //
-    // Default: false
-    "collapse_untracked_diff": false,
    "scrollbar": {
      // When to show the scrollbar in the git panel.
      //
-      // Choices: always, auto, never, system
      // Default: inherits editor scrollbar settings
-      // "show": null
+      "show": null
    }
  },
  "message_editor": {
@@ -1007,7 +991,8 @@
  // Removes any lines containing only whitespace at the end of the file and
  // ensures just one newline at the end.
  "ensure_final_newline_on_save": true,
-  // Whether or not to perform a buffer format before saving: [on, off, prettier, language_server]
+  // Whether or not to perform a buffer format before saving
+  //
  // Keep in mind, if the autosave with delay is enabled, format_on_save will be ignored
  "format_on_save": "on",
  // How to perform a buffer format. This setting can take 4 values:
@@ -1188,12 +1173,6 @@
    // 2. Display predictions inline only when holding a modifier key (alt by default).
    //     "mode": "subtle"
    "mode": "eager",
-    // Copilot-specific settings
-    // "copilot": {
-    //   "enterprise_uri": "",
-    //   "proxy": "",
-    //   "proxy_no_verify": false
-    // },
    // Whether edit predictions are enabled when editing text threads.
    // This setting has no effect if globally disabled.
    "enabled_in_text_threads": true
@@ -1359,8 +1338,6 @@
    // the terminal will default to matching the buffer's font fallbacks.
    // This will be merged with the platform's default font fallbacks
    // "font_fallbacks": ["FiraCode Nerd Fonts"],
-    // The weight of the editor font in standard CSS units from 100 to 900.
-    // "font_weight": 400
    // Sets the maximum number of lines in the terminal's scrollback buffer.
    // Default: 10_000, maximum: 100_000 (all bigger values set will be treated as 100_000), 0 disables the scrolling.
    // Existing terminals will not pick up this change until they are recreated.
@@ -1720,11 +1697,6 @@
    //     }
    // }
  },
-  // Common language server settings.
-  "global_lsp_settings": {
-    // Whether to show the LSP servers button in the status bar.
-    "button": true
-  },
  // Jupyter settings
  "jupyter": {
    "enabled": true
@@ -1739,6 +1711,7 @@
    "default_mode": "normal",
    "toggle_relative_line_numbers": false,
    "use_system_clipboard": "always",
+    "use_multiline_find": false,
    "use_smartcase_find": false,
    "highlight_on_yank_duration": 200,
    "custom_digraphs": {},
@@ -1821,7 +1794,6 @@
  "debugger": {
    "stepping_granularity": "line",
    "save_breakpoints": true,
-    "dock": "bottom",
    "button": true
  }
 }
--- a/assets/themes/one/one.json
+++ b/assets/themes/one/one.json
@@ -601,7 +601,7 @@
            "font_weight": null
          },
          "constant": {
-            "color": "#c18401ff",
+            "color": "#669f59ff",
            "font_style": null,
            "font_weight": null
          },
--- a/crates/activity_indicator/Cargo.toml
+++ b/crates/activity_indicator/Cargo.toml
@@ -21,7 +21,6 @@ futures.workspace = true
 gpui.workspace = true
 language.workspace = true
 project.workspace = true
-proto.workspace = true
 smallvec.workspace = true
 ui.workspace = true
 util.workspace = true
--- a/crates/activity_indicator/src/activity_indicator.rs
+++ b/crates/activity_indicator/src/activity_indicator.rs
@@ -80,13 +80,10 @@ impl ActivityIndicator {
        let this = cx.new(|cx| {
            let mut status_events = languages.language_server_binary_statuses();
            cx.spawn(async move |this, cx| {
-                while let Some((name, binary_status)) = status_events.next().await {
+                while let Some((name, status)) = status_events.next().await {
                    this.update(cx, |this: &mut ActivityIndicator, cx| {
                        this.statuses.retain(|s| s.name != name);
-                        this.statuses.push(ServerStatus {
-                            name,
-                            status: LanguageServerStatusUpdate::Binary(binary_status),
-                        });
+                        this.statuses.push(ServerStatus { name, status });
                        cx.notify();
                    })?;
                }
@@ -115,76 +112,8 @@ impl ActivityIndicator {

            cx.subscribe(
                &project.read(cx).lsp_store(),
-                |activity_indicator, _, event, cx| match event {
-                    LspStoreEvent::LanguageServerUpdate { name, message, .. } => {
-                        if let proto::update_language_server::Variant::StatusUpdate(status_update) =
-                            message
-                        {
-                            let Some(name) = name.clone() else {
-                                return;
-                            };
-                            let status = match &status_update.status {
-                                Some(proto::status_update::Status::Binary(binary_status)) => {
-                                    if let Some(binary_status) =
-                                        proto::ServerBinaryStatus::from_i32(*binary_status)
-                                    {
-                                        let binary_status = match binary_status {
-                                            proto::ServerBinaryStatus::None => BinaryStatus::None,
-                                            proto::ServerBinaryStatus::CheckingForUpdate => {
-                                                BinaryStatus::CheckingForUpdate
-                                            }
-                                            proto::ServerBinaryStatus::Downloading => {
-                                                BinaryStatus::Downloading
-                                            }
-                                            proto::ServerBinaryStatus::Starting => {
-                                                BinaryStatus::Starting
-                                            }
-                                            proto::ServerBinaryStatus::Stopping => {
-                                                BinaryStatus::Stopping
-                                            }
-                                            proto::ServerBinaryStatus::Stopped => {
-                                                BinaryStatus::Stopped
-                                            }
-                                            proto::ServerBinaryStatus::Failed => {
-                                                let Some(error) = status_update.message.clone()
-                                                else {
-                                                    return;
-                                                };
-                                                BinaryStatus::Failed { error }
-                                            }
-                                        };
-                                        LanguageServerStatusUpdate::Binary(binary_status)
-                                    } else {
-                                        return;
-                                    }
-                                }
-                                Some(proto::status_update::Status::Health(health_status)) => {
-                                    if let Some(health) =
-                                        proto::ServerHealth::from_i32(*health_status)
-                                    {
-                                        let health = match health {
-                                            proto::ServerHealth::Ok => ServerHealth::Ok,
-                                            proto::ServerHealth::Warning => ServerHealth::Warning,
-                                            proto::ServerHealth::Error => ServerHealth::Error,
-                                        };
-                                        LanguageServerStatusUpdate::Health(
-                                            health,
-                                            status_update.message.clone().map(SharedString::from),
-                                        )
-                                    } else {
-                                        return;
-                                    }
-                                }
-                                None => return,
-                            };
-
-                            activity_indicator.statuses.retain(|s| s.name != name);
-                            activity_indicator
-                                .statuses
-                                .push(ServerStatus { name, status });
-                        }
-                        cx.notify()
-                    }
+                |_, _, event, cx| match event {
+                    LspStoreEvent::LanguageServerUpdate { .. } => cx.notify(),
                    _ => {}
                },
            )
@@ -299,23 +228,9 @@ impl ActivityIndicator {
        _: &mut Window,
        cx: &mut Context<Self>,
    ) {
-        let error_dismissed = if let Some(updater) = &self.auto_updater {
-            updater.update(cx, |updater, cx| updater.dismiss_error(cx))
-        } else {
-            false
-        };
-        if error_dismissed {
-            return;
+        if let Some(updater) = &self.auto_updater {
+            updater.update(cx, |updater, cx| updater.dismiss_error(cx));
        }
-
-        self.project.update(cx, |project, cx| {
-            if project.last_formatting_failure(cx).is_some() {
-                project.reset_last_formatting_failure(cx);
-                true
-            } else {
-                false
-            }
-        });
    }

    fn pending_language_server_work<'a>(
@@ -484,12 +399,6 @@ impl ActivityIndicator {
        let mut servers_to_clear_statuses = HashSet::<LanguageServerName>::default();
        for status in &self.statuses {
            match &status.status {
-                LanguageServerStatusUpdate::Binary(
-                    BinaryStatus::Starting | BinaryStatus::Stopping,
-                ) => {}
-                LanguageServerStatusUpdate::Binary(BinaryStatus::Stopped) => {
-                    servers_to_clear_statuses.insert(status.name.clone());
-                }
                LanguageServerStatusUpdate::Binary(BinaryStatus::CheckingForUpdate) => {
                    checking_for_update.push(status.name.clone());
                }
--- a/crates/agent/Cargo.toml
+++ b/crates/agent/Cargo.toml
@@ -21,60 +21,94 @@ test-support = [
 [dependencies]
 agent_settings.workspace = true
 anyhow.workspace = true
-assistant_context.workspace = true
+assistant_context_editor.workspace = true
+assistant_slash_command.workspace = true
+assistant_slash_commands.workspace = true
 assistant_tool.workspace = true
+audio.workspace = true
+buffer_diff.workspace = true
 chrono.workspace = true
 client.workspace = true
 collections.workspace = true
 component.workspace = true
 context_server.workspace = true
 convert_case.workspace = true
+db.workspace = true
+editor.workspace = true
+extension.workspace = true
 feature_flags.workspace = true
+file_icons.workspace = true
 fs.workspace = true
 futures.workspace = true
+fuzzy.workspace = true
 git.workspace = true
 gpui.workspace = true
 heed.workspace = true
-icons.workspace = true
+html_to_markdown.workspace = true
 indoc.workspace = true
 http_client.workspace = true
+indexed_docs.workspace = true
+inventory.workspace = true
 itertools.workspace = true
+jsonschema.workspace = true
 language.workspace = true
 language_model.workspace = true
 log.workspace = true
+lsp.workspace = true
 markdown.workspace = true
+menu.workspace = true
+multi_buffer.workspace = true
+notifications.workspace = true
+ordered-float.workspace = true
+parking_lot.workspace = true
 paths.workspace = true
+picker.workspace = true
 postage.workspace = true
 project.workspace = true
 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
 settings.workspace = true
 smol.workspace = true
 sqlez.workspace = true
+streaming_diff.workspace = true
 telemetry.workspace = true
+telemetry_events.workspace = true
+terminal.workspace = true
+terminal_view.workspace = true
 text.workspace = true
 theme.workspace = true
 thiserror.workspace = true
 time.workspace = true
+time_format.workspace = true
+ui.workspace = true
+ui_input.workspace = true
+urlencoding.workspace = true
 util.workspace = true
 uuid.workspace = true
+watch.workspace = true
 workspace-hack.workspace = true
+workspace.workspace = true
+zed_actions.workspace = true
 zed_llm_client.workspace = true
 zstd.workspace = true

 [dev-dependencies]
 assistant_tools.workspace = true
+buffer_diff = { workspace = true, features = ["test-support"] }
+editor = { workspace = true, features = ["test-support"] }
 gpui = { workspace = true, "features" = ["test-support"] }
 indoc.workspace = true
 language = { workspace = true, "features" = ["test-support"] }
 language_model = { workspace = true, "features" = ["test-support"] }
-parking_lot.workspace = true
 pretty_assertions.workspace = true
 project = { workspace = true, features = ["test-support"] }
-workspace = { workspace = true, features = ["test-support"] }
 rand.workspace = true
--- a/crates/agent_ui/src/active_thread.rs
+++ b/crates/agent_ui/src/active_thread.rs
--- a/crates/agent/src/agent.rs
+++ b/crates/agent/src/agent.rs
@@ -1,23 +1,294 @@
-mod agent2;
-pub mod agent_profile;
-pub mod context;
-pub mod context_server_tool;
-pub mod context_store;
-pub mod history_store;
-pub mod thread;
-pub mod thread_store;
-mod zed_agent;
+mod active_thread;
+mod agent_configuration;
+mod agent_diff;
+mod agent_model_selector;
+mod agent_panel;
+mod agent_profile;
+mod buffer_codegen;
+mod context;
+mod context_picker;
+mod context_server_configuration;
+mod context_server_tool;
+mod context_store;
+mod context_strip;
+mod debug;
+mod history_store;
+mod inline_assistant;
+mod inline_prompt_editor;
+mod message_editor;
+mod profile_selector;
+mod slash_command_settings;
+mod terminal_codegen;
+mod terminal_inline_assistant;
+mod thread;
+mod thread_history;
+mod thread_store;
+mod tool_compatibility;
+mod tool_use;
+mod ui;

-pub use agent2::*;
-pub use context::{AgentContext, ContextId, ContextLoadResult};
-pub use context_store::ContextStore;
-pub use thread::{
-    LastRestoreCheckpoint, Message, MessageCrease, MessageSegment, Thread, ThreadError,
-    ThreadEvent, ThreadFeedback, ThreadTitle, TokenUsageRatio,
+use std::sync::Arc;
+
+use agent_settings::{AgentProfileId, AgentSettings, LanguageModelSelection};
+use assistant_slash_command::SlashCommandRegistry;
+use client::Client;
+use feature_flags::FeatureFlagAppExt as _;
+use fs::Fs;
+use gpui::{App, Entity, actions, impl_actions};
+use language::LanguageRegistry;
+use language_model::{
+    ConfiguredModel, LanguageModel, LanguageModelId, LanguageModelProviderId, LanguageModelRegistry,
 };
-pub use thread_store::{SerializedThread, TextThreadStore, ThreadStore};
-pub use zed_agent::*;
+use prompt_store::PromptBuilder;
+use schemars::JsonSchema;
+use serde::Deserialize;
+use settings::{Settings as _, SettingsStore};
+use thread::ThreadId;

-pub fn init(cx: &mut gpui::App) {
-    thread_store::init(cx);
+pub use crate::active_thread::ActiveThread;
+use crate::agent_configuration::{AddContextServerModal, ManageProfilesModal};
+pub use crate::agent_panel::{AgentPanel, ConcreteAssistantPanelDelegate};
+pub use crate::context::{ContextLoadResult, LoadedContext};
+pub use crate::inline_assistant::InlineAssistant;
+use crate::slash_command_settings::SlashCommandSettings;
+pub use crate::thread::{Message, MessageSegment, Thread, ThreadEvent};
+pub use crate::thread_store::{SerializedThread, TextThreadStore, ThreadStore};
+pub use agent_diff::{AgentDiffPane, AgentDiffToolbar};
+pub use context_store::ContextStore;
+pub use ui::preview::{all_agent_previews, get_agent_preview};
+
+actions!(
+    agent,
+    [
+        NewTextThread,
+        ToggleContextPicker,
+        ToggleNavigationMenu,
+        ToggleOptionsMenu,
+        DeleteRecentlyOpenThread,
+        ToggleProfileSelector,
+        RemoveAllContext,
+        ExpandMessageEditor,
+        OpenHistory,
+        AddContextServer,
+        RemoveSelectedThread,
+        Chat,
+        ChatWithFollow,
+        CycleNextInlineAssist,
+        CyclePreviousInlineAssist,
+        FocusUp,
+        FocusDown,
+        FocusLeft,
+        FocusRight,
+        RemoveFocusedContext,
+        AcceptSuggestedContext,
+        OpenActiveThreadAsMarkdown,
+        OpenAgentDiff,
+        Keep,
+        Reject,
+        RejectAll,
+        KeepAll,
+        Follow,
+        ResetTrialUpsell,
+        ResetTrialEndUpsell,
+        ContinueThread,
+        ContinueWithBurnMode,
+        ToggleBurnMode,
+    ]
+);
+
+#[derive(Default, Clone, PartialEq, Deserialize, JsonSchema)]
+pub struct NewThread {
+    #[serde(default)]
+    from_thread_id: Option<ThreadId>,
+}
+
+#[derive(PartialEq, Clone, Default, Debug, Deserialize, JsonSchema)]
+pub struct ManageProfiles {
+    #[serde(default)]
+    pub customize_tools: Option<AgentProfileId>,
+}
+
+impl ManageProfiles {
+    pub fn customize_tools(profile_id: AgentProfileId) -> Self {
+        Self {
+            customize_tools: Some(profile_id),
+        }
+    }
+}
+
+impl_actions!(agent, [NewThread, ManageProfiles]);
+
+#[derive(Clone)]
+pub(crate) enum ModelUsageContext {
+    Thread(Entity<Thread>),
+    InlineAssistant,
+}
+
+impl ModelUsageContext {
+    pub fn configured_model(&self, cx: &App) -> Option<ConfiguredModel> {
+        match self {
+            Self::Thread(thread) => thread.read(cx).configured_model(),
+            Self::InlineAssistant => {
+                LanguageModelRegistry::read_global(cx).inline_assistant_model()
+            }
+        }
+    }
+
+    pub fn language_model(&self, cx: &App) -> Option<Arc<dyn LanguageModel>> {
+        self.configured_model(cx)
+            .map(|configured_model| configured_model.model)
+    }
+}
+
+/// Initializes the `agent` crate.
+pub fn init(
+    fs: Arc<dyn Fs>,
+    client: Arc<Client>,
+    prompt_builder: Arc<PromptBuilder>,
+    language_registry: Arc<LanguageRegistry>,
+    is_eval: bool,
+    cx: &mut App,
+) {
+    AgentSettings::register(cx);
+    SlashCommandSettings::register(cx);
+
+    assistant_context_editor::init(client.clone(), cx);
+    rules_library::init(cx);
+    if !is_eval {
+        // Initializing the language model from the user settings messes with the eval, so we only initialize them when
+        // we're not running inside of the eval.
+        init_language_model_settings(cx);
+    }
+    assistant_slash_command::init(cx);
+    thread_store::init(cx);
+    agent_panel::init(cx);
+    context_server_configuration::init(language_registry, fs.clone(), cx);
+
+    register_slash_commands(cx);
+    inline_assistant::init(
+        fs.clone(),
+        prompt_builder.clone(),
+        client.telemetry().clone(),
+        cx,
+    );
+    terminal_inline_assistant::init(
+        fs.clone(),
+        prompt_builder.clone(),
+        client.telemetry().clone(),
+        cx,
+    );
+    indexed_docs::init(cx);
+    cx.observe_new(AddContextServerModal::register).detach();
+    cx.observe_new(ManageProfilesModal::register).detach();
+}
+
+fn init_language_model_settings(cx: &mut App) {
+    update_active_language_model_from_settings(cx);
+
+    cx.observe_global::<SettingsStore>(update_active_language_model_from_settings)
+        .detach();
+    cx.subscribe(
+        &LanguageModelRegistry::global(cx),
+        |_, event: &language_model::Event, cx| match event {
+            language_model::Event::ProviderStateChanged
+            | language_model::Event::AddedProvider(_)
+            | language_model::Event::RemovedProvider(_) => {
+                update_active_language_model_from_settings(cx);
+            }
+            _ => {}
+        },
+    )
+    .detach();
+}
+
+fn update_active_language_model_from_settings(cx: &mut App) {
+    let settings = AgentSettings::get_global(cx);
+
+    fn to_selected_model(selection: &LanguageModelSelection) -> language_model::SelectedModel {
+        language_model::SelectedModel {
+            provider: LanguageModelProviderId::from(selection.provider.0.clone()),
+            model: LanguageModelId::from(selection.model.clone()),
+        }
+    }
+
+    let default = to_selected_model(&settings.default_model);
+    let inline_assistant = settings
+        .inline_assistant_model
+        .as_ref()
+        .map(to_selected_model);
+    let commit_message = settings
+        .commit_message_model
+        .as_ref()
+        .map(to_selected_model);
+    let thread_summary = settings
+        .thread_summary_model
+        .as_ref()
+        .map(to_selected_model);
+    let inline_alternatives = settings
+        .inline_alternatives
+        .iter()
+        .map(to_selected_model)
+        .collect::<Vec<_>>();
+
+    LanguageModelRegistry::global(cx).update(cx, |registry, cx| {
+        registry.select_default_model(Some(&default), cx);
+        registry.select_inline_assistant_model(inline_assistant.as_ref(), cx);
+        registry.select_commit_message_model(commit_message.as_ref(), cx);
+        registry.select_thread_summary_model(thread_summary.as_ref(), cx);
+        registry.select_inline_alternative_models(inline_alternatives, cx);
+    });
+}
+
+fn register_slash_commands(cx: &mut App) {
+    let slash_command_registry = SlashCommandRegistry::global(cx);
+
+    slash_command_registry.register_command(assistant_slash_commands::FileSlashCommand, true);
+    slash_command_registry.register_command(assistant_slash_commands::DeltaSlashCommand, true);
+    slash_command_registry.register_command(assistant_slash_commands::OutlineSlashCommand, true);
+    slash_command_registry.register_command(assistant_slash_commands::TabSlashCommand, true);
+    slash_command_registry
+        .register_command(assistant_slash_commands::CargoWorkspaceSlashCommand, true);
+    slash_command_registry.register_command(assistant_slash_commands::PromptSlashCommand, true);
+    slash_command_registry.register_command(assistant_slash_commands::SelectionCommand, true);
+    slash_command_registry.register_command(assistant_slash_commands::DefaultSlashCommand, false);
+    slash_command_registry.register_command(assistant_slash_commands::NowSlashCommand, false);
+    slash_command_registry
+        .register_command(assistant_slash_commands::DiagnosticsSlashCommand, true);
+    slash_command_registry.register_command(assistant_slash_commands::FetchSlashCommand, true);
+
+    cx.observe_flag::<assistant_slash_commands::StreamingExampleSlashCommandFeatureFlag, _>({
+        let slash_command_registry = slash_command_registry.clone();
+        move |is_enabled, _cx| {
+            if is_enabled {
+                slash_command_registry.register_command(
+                    assistant_slash_commands::StreamingExampleSlashCommand,
+                    false,
+                );
+            }
+        }
+    })
+    .detach();
+
+    update_slash_commands_from_settings(cx);
+    cx.observe_global::<SettingsStore>(update_slash_commands_from_settings)
+        .detach();
+}
+
+fn update_slash_commands_from_settings(cx: &mut App) {
+    let slash_command_registry = SlashCommandRegistry::global(cx);
+    let settings = SlashCommandSettings::get_global(cx);
+
+    if settings.docs.enabled {
+        slash_command_registry.register_command(assistant_slash_commands::DocsSlashCommand, true);
+    } else {
+        slash_command_registry.unregister_command(assistant_slash_commands::DocsSlashCommand);
+    }
+
+    if settings.cargo_workspace.enabled {
+        slash_command_registry
+            .register_command(assistant_slash_commands::CargoWorkspaceSlashCommand, true);
+    } else {
+        slash_command_registry
+            .unregister_command(assistant_slash_commands::CargoWorkspaceSlashCommand);
+    }
 }
--- a/crates/agent/src/agent2.rs
+++ b/crates/agent/src/agent2.rs
@@ -1,117 +0,0 @@
-use anyhow::Result;
-use assistant_tool::{Tool, ToolResultOutput};
-use futures::{channel::oneshot, future::BoxFuture, stream::BoxStream};
-use gpui::SharedString;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use std::{
-    fmt::{self, Display},
-    sync::Arc,
-};
-
-#[derive(
-    Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize, JsonSchema,
-)]
-pub struct ThreadId(SharedString);
-
-impl ThreadId {
-    pub fn as_str(&self) -> &str {
-        &self.0
-    }
-
-    pub fn to_string(&self) -> String {
-        self.0.to_string()
-    }
-}
-
-impl From<&str> for ThreadId {
-    fn from(value: &str) -> Self {
-        ThreadId(SharedString::from(value.to_string()))
-    }
-}
-
-impl Display for ThreadId {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{}", self.0)
-    }
-}
-
-#[derive(Debug, Clone, Copy, Ord, PartialOrd, Eq, PartialEq, Hash, Serialize, Deserialize)]
-pub struct MessageId(pub usize);
-
-#[derive(Debug, Clone)]
-pub struct AgentThreadToolCallId(SharedString);
-
-pub enum AgentThreadResponseEvent {
-    Text(String),
-    Thinking(String),
-    ToolCallChunk {
-        id: AgentThreadToolCallId,
-        tool: Arc<dyn Tool>,
-        input: serde_json::Value,
-    },
-    ToolCall {
-        id: AgentThreadToolCallId,
-        tool: Arc<dyn Tool>,
-        input: serde_json::Value,
-        response_tx: oneshot::Sender<Result<ToolResultOutput>>,
-    },
-}
-
-pub enum AgentThreadMessage {
-    User {
-        id: MessageId,
-        chunks: Vec<AgentThreadUserMessageChunk>,
-    },
-    Assistant {
-        id: MessageId,
-        chunks: Vec<AgentThreadAssistantMessageChunk>,
-    },
-}
-
-pub enum AgentThreadUserMessageChunk {
-    Text(String),
-    // here's where we would put mentions, etc.
-}
-
-pub enum AgentThreadAssistantMessageChunk {
-    Text(String),
-    Thinking(String),
-    ToolResult {
-        id: AgentThreadToolCallId,
-        tool: Arc<dyn Tool>,
-        input: serde_json::Value,
-        output: Result<ToolResultOutput>,
-    },
-}
-
-pub struct AgentThreadResponse {
-    pub user_message_id: MessageId,
-    pub assistant_message_id: MessageId,
-    pub events: BoxStream<'static, Result<AgentThreadResponseEvent>>,
-}
-
-pub trait Agent {
-    fn create_thread() -> BoxFuture<'static, Result<Arc<dyn AgentThread>>>;
-    fn list_threads();
-    fn load_thread(&self, thread_id: ThreadId) -> BoxFuture<'static, Result<Arc<dyn AgentThread>>>;
-}
-
-pub trait AgentThread {
-    fn id(&self) -> ThreadId;
-    fn title(&self) -> BoxFuture<'static, Result<String>>;
-    fn summary(&self) -> BoxFuture<'static, Result<String>>;
-    fn messages(&self) -> BoxFuture<'static, Result<Vec<AgentThreadMessage>>>;
-    fn truncate(&self, message_id: MessageId) -> BoxFuture<'static, Result<()>>;
-    fn edit(
-        &self,
-        message_id: MessageId,
-        content: Vec<AgentThreadUserMessageChunk>,
-        max_iterations: usize,
-    ) -> BoxFuture<'static, Result<AgentThreadResponse>>;
-    fn send(
-        &self,
-        content: Vec<AgentThreadUserMessageChunk>,
-        max_iterations: usize,
-    ) -> BoxFuture<'static, Result<AgentThreadResponse>>;
-}
--- a/crates/agent_ui/src/agent_configuration.rs
+++ b/crates/agent_ui/src/agent_configuration.rs
@@ -1,3 +1,4 @@
+mod add_context_server_modal;
 mod configure_context_server_modal;
 mod manage_profiles_modal;
 mod tool_picker;
@@ -8,29 +9,22 @@ use agent_settings::AgentSettings;
 use assistant_tool::{ToolSource, ToolWorkingSet};
 use collections::HashMap;
 use context_server::ContextServerId;
-use extension::ExtensionManifest;
-use extension_host::ExtensionStore;
 use fs::Fs;
 use gpui::{
-    Action, Animation, AnimationExt as _, AnyView, App, Corner, Entity, EventEmitter, FocusHandle,
-    Focusable, ScrollHandle, Subscription, Task, Transformation, WeakEntity, percentage,
+    Action, Animation, AnimationExt as _, AnyView, App, Entity, EventEmitter, FocusHandle,
+    Focusable, ScrollHandle, Subscription, Transformation, percentage,
 };
-use language::LanguageRegistry;
 use language_model::{LanguageModelProvider, LanguageModelProviderId, LanguageModelRegistry};
-use notifications::status_toast::{StatusToast, ToastIcon};
-use project::{
-    context_server_store::{ContextServerConfiguration, ContextServerStatus, ContextServerStore},
-    project_settings::{ContextServerSettings, ProjectSettings},
-};
+use project::context_server_store::{ContextServerStatus, ContextServerStore};
 use settings::{Settings, update_settings_file};
 use ui::{
-    ContextMenu, Disclosure, ElevationIndex, Indicator, PopoverMenu, Scrollbar, ScrollbarState,
-    Switch, SwitchColor, Tooltip, prelude::*,
+    Disclosure, ElevationIndex, Indicator, Scrollbar, ScrollbarState, Switch, SwitchColor, Tooltip,
+    prelude::*,
 };
 use util::ResultExt as _;
-use workspace::Workspace;
 use zed_actions::ExtensionCategoryFilter;

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

@@ -38,8 +32,6 @@ use crate::AddContextServer;

 pub struct AgentConfiguration {
    fs: Arc<dyn Fs>,
-    language_registry: Arc<LanguageRegistry>,
-    workspace: WeakEntity<Workspace>,
    focus_handle: FocusHandle,
    configuration_views_by_provider: HashMap<LanguageModelProviderId, AnyView>,
    context_server_store: Entity<ContextServerStore>,
@@ -56,8 +48,6 @@ impl AgentConfiguration {
        fs: Arc<dyn Fs>,
        context_server_store: Entity<ContextServerStore>,
        tools: Entity<ToolWorkingSet>,
-        language_registry: Arc<LanguageRegistry>,
-        workspace: WeakEntity<Workspace>,
        window: &mut Window,
        cx: &mut Context<Self>,
    ) -> Self {
@@ -80,16 +70,11 @@ impl AgentConfiguration {
            },
        );

-        cx.subscribe(&context_server_store, |_, _, _, cx| cx.notify())
-            .detach();
-
        let scroll_handle = ScrollHandle::new();
        let scrollbar_state = ScrollbarState::new(scroll_handle.clone());

        let mut this = Self {
            fs,
-            language_registry,
-            workspace,
            focus_handle,
            configuration_views_by_provider: HashMap::default(),
            context_server_store,
@@ -148,8 +133,6 @@ impl AgentConfiguration {
    ) -> impl IntoElement + use<> {
        let provider_id = provider.id().0.clone();
        let provider_name = provider.name().0.clone();
-        let provider_id_string = SharedString::from(format!("provider-disclosure-{provider_id}"));
-
        let configuration_view = self
            .configuration_views_by_provider
            .get(&provider.id())
@@ -162,80 +145,72 @@ impl AgentConfiguration {
            .unwrap_or(false);

        v_flex()
-            .py_2()
+            .pt_3()
            .gap_1p5()
            .border_t_1()
            .border_color(cx.theme().colors().border.opacity(0.6))
            .child(
                h_flex()
-                    .w_full()
-                    .gap_1()
                    .justify_between()
                    .child(
                        h_flex()
-                            .id(provider_id_string.clone())
-                            .cursor_pointer()
-                            .py_0p5()
-                            .w_full()
-                            .justify_between()
-                            .rounded_sm()
-                            .hover(|hover| hover.bg(cx.theme().colors().element_hover))
+                            .gap_2()
                            .child(
-                                h_flex()
-                                    .gap_2()
-                                    .child(
-                                        Icon::new(provider.icon())
-                                            .size(IconSize::Small)
-                                            .color(Color::Muted),
-                                    )
-                                    .child(Label::new(provider_name.clone()).size(LabelSize::Large))
-                                    .when(
-                                        provider.is_authenticated(cx) && !is_expanded,
-                                        |parent| {
-                                            parent.child(
-                                                Icon::new(IconName::Check).color(Color::Success),
-                                            )
-                                        },
-                                    ),
+                                Icon::new(provider.icon())
+                                    .size(IconSize::Small)
+                                    .color(Color::Muted),
                            )
-                            .child(
-                                Disclosure::new(provider_id_string, is_expanded)
-                                    .opened_icon(IconName::ChevronUp)
-                                    .closed_icon(IconName::ChevronDown),
-                            )
-                            .on_click(cx.listener({
-                                let provider_id = provider.id().clone();
-                                move |this, _event, _window, _cx| {
-                                    let is_expanded = this
-                                        .expanded_provider_configurations
-                                        .entry(provider_id.clone())
-                                        .or_insert(false);
-
-                                    *is_expanded = !*is_expanded;
-                                }
-                            })),
+                            .child(Label::new(provider_name.clone()).size(LabelSize::Large))
+                            .when(provider.is_authenticated(cx) && !is_expanded, |parent| {
+                                parent.child(Icon::new(IconName::Check).color(Color::Success))
+                            }),
                    )
-                    .when(provider.is_authenticated(cx), |parent| {
-                        parent.child(
-                            Button::new(
-                                SharedString::from(format!("new-thread-{provider_id}")),
-                                "Start New Thread",
-                            )
-                            .icon_position(IconPosition::Start)
-                            .icon(IconName::Plus)
-                            .icon_size(IconSize::Small)
-                            .icon_color(Color::Muted)
-                            .label_size(LabelSize::Small)
-                            .on_click(cx.listener({
-                                let provider = provider.clone();
-                                move |_this, _event, _window, cx| {
-                                    cx.emit(AssistantConfigurationEvent::NewThread(
-                                        provider.clone(),
-                                    ))
-                                }
-                            })),
-                        )
-                    }),
+                    .child(
+                        h_flex()
+                            .gap_1()
+                            .when(provider.is_authenticated(cx), |parent| {
+                                parent.child(
+                                    Button::new(
+                                        SharedString::from(format!("new-thread-{provider_id}")),
+                                        "Start New Thread",
+                                    )
+                                    .icon_position(IconPosition::Start)
+                                    .icon(IconName::Plus)
+                                    .icon_size(IconSize::Small)
+                                    .layer(ElevationIndex::ModalSurface)
+                                    .label_size(LabelSize::Small)
+                                    .on_click(cx.listener({
+                                        let provider = provider.clone();
+                                        move |_this, _event, _window, cx| {
+                                            cx.emit(AssistantConfigurationEvent::NewThread(
+                                                provider.clone(),
+                                            ))
+                                        }
+                                    })),
+                                )
+                            })
+                            .child(
+                                Disclosure::new(
+                                    SharedString::from(format!(
+                                        "provider-disclosure-{provider_id}"
+                                    )),
+                                    is_expanded,
+                                )
+                                .opened_icon(IconName::ChevronUp)
+                                .closed_icon(IconName::ChevronDown)
+                                .on_click(cx.listener({
+                                    let provider_id = provider.id().clone();
+                                    move |this, _event, _window, _cx| {
+                                        let is_expanded = this
+                                            .expanded_provider_configurations
+                                            .entry(provider_id.clone())
+                                            .or_insert(false);
+
+                                        *is_expanded = !*is_expanded;
+                                    }
+                                })),
+                            ),
+                    ),
            )
            .when(is_expanded, |parent| match configuration_view {
                Some(configuration_view) => parent.child(configuration_view),
@@ -254,11 +229,11 @@ impl AgentConfiguration {
        v_flex()
            .p(DynamicSpacing::Base16.rems(cx))
            .pr(DynamicSpacing::Base20.rems(cx))
+            .gap_4()
            .border_b_1()
            .border_color(cx.theme().colors().border)
            .child(
                v_flex()
-                    .mb_2p5()
                    .gap_0p5()
                    .child(Headline::new("LLM Providers"))
                    .child(
@@ -485,22 +460,9 @@ impl AgentConfiguration {
            .read(cx)
            .status_for_server(&context_server_id)
            .unwrap_or(ContextServerStatus::Stopped);
-        let server_configuration = self
-            .context_server_store
-            .read(cx)
-            .configuration_for_server(&context_server_id);

        let is_running = matches!(server_status, ContextServerStatus::Running);
        let item_id = SharedString::from(context_server_id.0.clone());
-        let is_from_extension = server_configuration
-            .as_ref()
-            .map(|config| {
-                matches!(
-                    config.as_ref(),
-                    ContextServerConfiguration::Extension { .. }
-                )
-            })
-            .unwrap_or(false);

        let error = if let ContextServerStatus::Error(error) = server_status.clone() {
            Some(error)
@@ -522,18 +484,6 @@ impl AgentConfiguration {

        let border_color = cx.theme().colors().border.opacity(0.6);

-        let (source_icon, source_tooltip) = if is_from_extension {
-            (
-                IconName::ZedMcpExtension,
-                "This MCP server was installed from an extension.",
-            )
-        } else {
-            (
-                IconName::ZedMcpCustom,
-                "This custom MCP server was installed directly.",
-            )
-        };
-
        let (status_indicator, tooltip_text) = match server_status {
            ContextServerStatus::Starting => (
                Icon::new(IconName::LoadCircle)
@@ -561,105 +511,6 @@ impl AgentConfiguration {
            ),
        };

-        let context_server_configuration_menu = PopoverMenu::new("context-server-config-menu")
-            .trigger_with_tooltip(
-                IconButton::new("context-server-config-menu", IconName::Settings)
-                    .icon_color(Color::Muted)
-                    .icon_size(IconSize::Small),
-                Tooltip::text("Open MCP server options"),
-            )
-            .anchor(Corner::TopRight)
-            .menu({
-                let fs = self.fs.clone();
-                let context_server_id = context_server_id.clone();
-                let language_registry = self.language_registry.clone();
-                let context_server_store = self.context_server_store.clone();
-                let workspace = self.workspace.clone();
-                move |window, cx| {
-                    Some(ContextMenu::build(window, cx, |menu, _window, _cx| {
-                        menu.entry("Configure Server", None, {
-                            let context_server_id = context_server_id.clone();
-                            let language_registry = language_registry.clone();
-                            let workspace = workspace.clone();
-                            move |window, cx| {
-                                ConfigureContextServerModal::show_modal_for_existing_server(
-                                    context_server_id.clone(),
-                                    language_registry.clone(),
-                                    workspace.clone(),
-                                    window,
-                                    cx,
-                                )
-                                .detach_and_log_err(cx);
-                            }
-                        })
-                        .separator()
-                        .entry("Uninstall", None, {
-                            let fs = fs.clone();
-                            let context_server_id = context_server_id.clone();
-                            let context_server_store = context_server_store.clone();
-                            let workspace = workspace.clone();
-                            move |_, cx| {
-                                let is_provided_by_extension = context_server_store
-                                    .read(cx)
-                                    .configuration_for_server(&context_server_id)
-                                    .as_ref()
-                                    .map(|config| {
-                                        matches!(
-                                            config.as_ref(),
-                                            ContextServerConfiguration::Extension { .. }
-                                        )
-                                    })
-                                    .unwrap_or(false);
-
-                                let uninstall_extension_task = match (
-                                    is_provided_by_extension,
-                                    resolve_extension_for_context_server(&context_server_id, cx),
-                                ) {
-                                    (true, Some((id, manifest))) => {
-                                        if extension_only_provides_context_server(manifest.as_ref())
-                                        {
-                                            ExtensionStore::global(cx).update(cx, |store, cx| {
-                                                store.uninstall_extension(id, cx)
-                                            })
-                                        } else {
-                                            workspace.update(cx, |workspace, cx| {
-                                                show_unable_to_uninstall_extension_with_context_server(workspace, context_server_id.clone(), cx);
-                                            }).log_err();
-                                            Task::ready(Ok(()))
-                                        }
-                                    }
-                                    _ => Task::ready(Ok(())),
-                                };
-
-                                cx.spawn({
-                                    let fs = fs.clone();
-                                    let context_server_id = context_server_id.clone();
-                                    async move |cx| {
-                                        uninstall_extension_task.await?;
-                                        cx.update(|cx| {
-                                            update_settings_file::<ProjectSettings>(
-                                                fs.clone(),
-                                                cx,
-                                                {
-                                                    let context_server_id =
-                                                        context_server_id.clone();
-                                                    move |settings, _| {
-                                                        settings
-                                                            .context_servers
-                                                            .remove(&context_server_id.0);
-                                                    }
-                                                },
-                                            )
-                                        })
-                                    }
-                                })
-                                .detach_and_log_err(cx);
-                            }
-                        })
-                    }))
-                }
-            });
-
        v_flex()
            .id(item_id.clone())
            .border_1()
@@ -705,19 +556,7 @@ impl AgentConfiguration {
                                    .tooltip(Tooltip::text(tooltip_text))
                                    .child(status_indicator),
                            )
-                            .child(Label::new(item_id).ml_0p5())
-                            .child(
-                                div()
-                                    .id("extension-source")
-                                    .mt_0p5()
-                                    .mx_1()
-                                    .tooltip(Tooltip::text(source_tooltip))
-                                    .child(
-                                        Icon::new(source_icon)
-                                            .size(IconSize::Small)
-                                            .color(Color::Muted),
-                                    ),
-                            )
+                            .child(Label::new(item_id).ml_0p5().mr_1p5())
                            .when(is_running, |this| {
                                this.child(
                                    Label::new(if tool_count == 1 {
@@ -731,72 +570,28 @@ impl AgentConfiguration {
                            }),
                    )
                    .child(
-                        h_flex()
-                            .gap_1()
-                            .child(context_server_configuration_menu)
-                            .child(
-                                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 fs = self.fs.clone();
-
-                                        move |state, _window, cx| {
-                                            let is_enabled = match state {
-                                                ToggleState::Unselected
-                                                | ToggleState::Indeterminate => {
-                                                    context_server_manager.update(
-                                                        cx,
-                                                        |this, cx| {
-                                                            this.stop_server(
-                                                                &context_server_id,
-                                                                cx,
-                                                            )
-                                                            .log_err();
-                                                        },
-                                                    );
-                                                    false
-                                                }
-                                                ToggleState::Selected => {
-                                                    context_server_manager.update(
-                                                        cx,
-                                                        |this, cx| {
-                                                            if let Some(server) =
-                                                                this.get_server(&context_server_id)
-                                                            {
-                                                                this.start_server(server, cx);
-                                                            }
-                                                        },
-                                                    );
-                                                    true
-                                                }
-                                            };
-                                            update_settings_file::<ProjectSettings>(
-                                                fs.clone(),
-                                                cx,
-                                                {
-                                                    let context_server_id =
-                                                        context_server_id.clone();
-
-                                                    move |settings, _| {
-                                                        settings
-                                                            .context_servers
-                                                            .entry(context_server_id.0)
-                                                            .or_insert_with(|| {
-                                                                ContextServerSettings::Extension {
-                                                                    enabled: is_enabled,
-                                                                    settings: serde_json::json!({}),
-                                                                }
-                                                            })
-                                                            .set_enabled(is_enabled);
-                                                    }
-                                                },
-                                            );
-                                        }
-                                    }),
-                            ),
+                        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();
+                                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();
+                                        });
+                                    }
+                                    ToggleState::Selected => {
+                                        context_server_manager.update(cx, |this, cx| {
+                                            if let Some(server) =
+                                                this.get_server(&context_server_id)
+                                            {
+                                                this.start_server(server, cx);
+                                            }
+                                        })
+                                    }
+                                }
+                            }),
                    ),
            )
            .map(|parent| {
@@ -906,92 +701,3 @@ impl Render for AgentConfiguration {
            )
    }
 }
-
-fn extension_only_provides_context_server(manifest: &ExtensionManifest) -> bool {
-    manifest.context_servers.len() == 1
-        && manifest.themes.is_empty()
-        && manifest.icon_themes.is_empty()
-        && manifest.languages.is_empty()
-        && manifest.grammars.is_empty()
-        && manifest.language_servers.is_empty()
-        && manifest.slash_commands.is_empty()
-        && manifest.indexed_docs_providers.is_empty()
-        && manifest.snippets.is_none()
-        && manifest.debug_locators.is_empty()
-}
-
-pub(crate) fn resolve_extension_for_context_server(
-    id: &ContextServerId,
-    cx: &App,
-) -> Option<(Arc<str>, Arc<ExtensionManifest>)> {
-    ExtensionStore::global(cx)
-        .read(cx)
-        .installed_extensions()
-        .iter()
-        .find(|(_, entry)| entry.manifest.context_servers.contains_key(&id.0))
-        .map(|(id, entry)| (id.clone(), entry.manifest.clone()))
-}
-
-// This notification appears when trying to delete
-// an MCP server extension that not only provides
-// the server, but other things, too, like language servers and more.
-fn show_unable_to_uninstall_extension_with_context_server(
-    workspace: &mut Workspace,
-    id: ContextServerId,
-    cx: &mut App,
-) {
-    let workspace_handle = workspace.weak_handle();
-    let context_server_id = id.clone();
-
-    let status_toast = StatusToast::new(
-        format!(
-            "The {} extension provides more than just the MCP server. Proceed to uninstall anyway?",
-            id.0
-        ),
-        cx,
-        move |this, _cx| {
-            let workspace_handle = workspace_handle.clone();
-            let context_server_id = context_server_id.clone();
-
-            this.icon(ToastIcon::new(IconName::Warning).color(Color::Warning))
-                .dismiss_button(true)
-                .action("Uninstall", move |_, _cx| {
-                    if let Some((extension_id, _)) =
-                        resolve_extension_for_context_server(&context_server_id, _cx)
-                    {
-                        ExtensionStore::global(_cx).update(_cx, |store, cx| {
-                            store
-                                .uninstall_extension(extension_id, cx)
-                                .detach_and_log_err(cx);
-                        });
-
-                        workspace_handle
-                            .update(_cx, |workspace, cx| {
-                                let fs = workspace.app_state().fs.clone();
-                                cx.spawn({
-                                    let context_server_id = context_server_id.clone();
-                                    async move |_workspace_handle, cx| {
-                                        cx.update(|cx| {
-                                            update_settings_file::<ProjectSettings>(
-                                                fs,
-                                                cx,
-                                                move |settings, _| {
-                                                    settings
-                                                        .context_servers
-                                                        .remove(&context_server_id.0);
-                                                },
-                                            );
-                                        })?;
-                                        anyhow::Ok(())
-                                    }
-                                })
-                                .detach_and_log_err(cx);
-                            })
-                            .log_err();
-                    }
-                })
-        },
-    );
-
-    workspace.toggle_status_toast(status_toast, cx);
-}
--- a/crates/agent/src/agent_configuration/add_context_server_modal.rs
+++ b/crates/agent/src/agent_configuration/add_context_server_modal.rs
@@ -0,0 +1,195 @@
+use context_server::ContextServerCommand;
+use gpui::{DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, WeakEntity, prelude::*};
+use project::project_settings::{ContextServerSettings, ProjectSettings};
+use settings::update_settings_file;
+use ui::{KeyBinding, Modal, ModalFooter, ModalHeader, Section, Tooltip, prelude::*};
+use ui_input::SingleLineInput;
+use workspace::{ModalView, Workspace};
+
+use crate::AddContextServer;
+
+pub struct AddContextServerModal {
+    workspace: WeakEntity<Workspace>,
+    name_editor: Entity<SingleLineInput>,
+    command_editor: Entity<SingleLineInput>,
+}
+
+impl AddContextServerModal {
+    pub fn register(
+        workspace: &mut Workspace,
+        _window: Option<&mut Window>,
+        _cx: &mut Context<Workspace>,
+    ) {
+        workspace.register_action(|workspace, _: &AddContextServer, window, cx| {
+            let workspace_handle = cx.entity().downgrade();
+            workspace.toggle_modal(window, cx, |window, cx| {
+                Self::new(workspace_handle, window, cx)
+            })
+        });
+    }
+
+    pub fn new(
+        workspace: WeakEntity<Workspace>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Self {
+        let name_editor =
+            cx.new(|cx| SingleLineInput::new(window, cx, "my-custom-server").label("Name"));
+        let command_editor = cx.new(|cx| {
+            SingleLineInput::new(window, cx, "Command").label("Command to run the MCP server")
+        });
+
+        Self {
+            name_editor,
+            command_editor,
+            workspace,
+        }
+    }
+
+    fn confirm(&mut self, _: &menu::Confirm, cx: &mut Context<Self>) {
+        let name = self
+            .name_editor
+            .read(cx)
+            .editor()
+            .read(cx)
+            .text(cx)
+            .trim()
+            .to_string();
+        let command = self
+            .command_editor
+            .read(cx)
+            .editor()
+            .read(cx)
+            .text(cx)
+            .trim()
+            .to_string();
+
+        if name.is_empty() || command.is_empty() {
+            return;
+        }
+
+        let mut command_parts = command.split(' ').map(|part| part.trim().to_string());
+        let Some(path) = command_parts.next() else {
+            return;
+        };
+        let args = command_parts.collect::<Vec<_>>();
+
+        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, _| {
+                    settings.context_servers.insert(
+                        name.into(),
+                        ContextServerSettings::Custom {
+                            command: ContextServerCommand {
+                                path,
+                                args,
+                                env: None,
+                            },
+                        },
+                    );
+                });
+            });
+        }
+
+        cx.emit(DismissEvent);
+    }
+
+    fn cancel(&mut self, _: &menu::Cancel, cx: &mut Context<Self>) {
+        cx.emit(DismissEvent);
+    }
+}
+
+impl ModalView for AddContextServerModal {}
+
+impl Focusable for AddContextServerModal {
+    fn focus_handle(&self, cx: &App) -> FocusHandle {
+        self.name_editor.focus_handle(cx).clone()
+    }
+}
+
+impl EventEmitter<DismissEvent> for AddContextServerModal {}
+
+impl Render for AddContextServerModal {
+    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let is_name_empty = self.name_editor.read(cx).is_empty(cx);
+        let is_command_empty = self.command_editor.read(cx).is_empty(cx);
+
+        let focus_handle = self.focus_handle(cx);
+
+        div()
+            .elevation_3(cx)
+            .w(rems(34.))
+            .key_context("AddContextServerModal")
+            .on_action(
+                cx.listener(|this, _: &menu::Cancel, _window, cx| this.cancel(&menu::Cancel, cx)),
+            )
+            .on_action(
+                cx.listener(|this, _: &menu::Confirm, _window, cx| {
+                    this.confirm(&menu::Confirm, cx)
+                }),
+            )
+            .capture_any_mouse_down(cx.listener(|this, _, window, cx| {
+                this.focus_handle(cx).focus(window);
+            }))
+            .on_mouse_down_out(cx.listener(|_this, _, _, cx| cx.emit(DismissEvent)))
+            .child(
+                Modal::new("add-context-server", None)
+                    .header(ModalHeader::new().headline("Add MCP Server"))
+                    .section(
+                        Section::new().child(
+                            v_flex()
+                                .gap_2()
+                                .child(self.name_editor.clone())
+                                .child(self.command_editor.clone()),
+                        ),
+                    )
+                    .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.))),
+                                        )
+                                        .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(|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/agent_configuration/configure_context_server_modal.rs
+++ b/crates/agent/src/agent_configuration/configure_context_server_modal.rs
@@ -0,0 +1,549 @@
+use std::{
+    sync::{Arc, Mutex},
+    time::Duration,
+};
+
+use anyhow::Context as _;
+use context_server::ContextServerId;
+use editor::{Editor, EditorElement, EditorStyle};
+use gpui::{
+    Animation, AnimationExt, App, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, Task,
+    TextStyle, TextStyleRefinement, Transformation, UnderlineStyle, WeakEntity, percentage,
+};
+use language::{Language, LanguageRegistry};
+use markdown::{Markdown, MarkdownElement, MarkdownStyle};
+use notifications::status_toast::{StatusToast, ToastIcon};
+use project::{
+    context_server_store::{ContextServerStatus, ContextServerStore},
+    project_settings::{ContextServerSettings, ProjectSettings},
+};
+use settings::{Settings as _, update_settings_file};
+use theme::ThemeSettings;
+use ui::{KeyBinding, Modal, ModalFooter, ModalHeader, Section, Tooltip, 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>,
+}
+
+enum Configuration {
+    NotAvailable,
+    Required(ConfigurationRequiredState),
+}
+
+struct ConfigurationRequiredState {
+    installation_instructions: Entity<markdown::Markdown>,
+    settings_validator: Option<jsonschema::Validator>,
+    settings_editor: Entity<Editor>,
+    last_error: Option<SharedString>,
+    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>,
+        jsonc_language: Option<Arc<Language>>,
+        language_registry: Arc<LanguageRegistry>,
+        workspace: WeakEntity<Workspace>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> 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(1, 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),
+                    }
+                }
+            })
+            .collect::<Vec<_>>();
+
+        Self {
+            workspace,
+            focus_handle: cx.focus_handle(),
+            context_servers_to_setup,
+            context_server_store,
+        }
+    }
+}
+
+impl ConfigureContextServerModal {
+    pub fn confirm(&mut self, cx: &mut Context<Self>) {
+        if self.context_servers_to_setup.is_empty() {
+            self.dismiss(cx);
+            return;
+        }
+
+        let Some(workspace) = self.workspace.upgrade() else {
+            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,
+        };
+
+        configuration.last_error.take();
+        if configuration.waiting_for_context_server {
+            return;
+        }
+
+        let settings_value = match serde_json_lenient::from_str::<serde_json::Value>(
+            &configuration.settings_editor.read(cx).text(cx),
+        ) {
+            Ok(value) => value,
+            Err(error) => {
+                configuration.last_error = Some(error.to_string().into());
+                cx.notify();
+                return;
+            }
+        };
+
+        if let Some(validator) = configuration.settings_validator.as_ref() {
+            if let Err(error) = validator.validate(&settings_value) {
+                configuration.last_error = Some(error.to_string().into());
+                cx.notify();
+                return;
+            }
+        }
+        let id = id.clone();
+
+        let settings_changed = ProjectSettings::get_global(cx)
+            .context_servers
+            .get(&id.0)
+            .map_or(true, |settings| match settings {
+                ContextServerSettings::Custom { .. } => false,
+                ContextServerSettings::Extension { settings } => settings != &settings_value,
+            });
+
+        let is_running = self.context_server_store.read(cx).status_for_server(&id)
+            == Some(ContextServerStatus::Running);
+
+        if !settings_changed && is_running {
+            self.complete_setup(id, cx);
+            return;
+        }
+
+        configuration.waiting_for_context_server = true;
+
+        let task = wait_for_context_server(&self.context_server_store, id.clone(), cx);
+        cx.spawn({
+            let id = id.clone();
+            async move |this, cx| {
+                let result = task.await;
+                this.update(cx, |this, cx| match result {
+                    Ok(_) => {
+                        this.complete_setup(id, cx);
+                    }
+                    Err(err) => {
+                        if let Some(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;
+                                }
+                            }
+                        } else {
+                            this.dismiss(cx);
+                        }
+                        cx.notify();
+                    }
+                })
+            }
+        })
+        .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, _| {
+                settings.context_servers.insert(
+                    id.0,
+                    ContextServerSettings::Extension {
+                        settings: settings_value,
+                    },
+                );
+            }
+        });
+    }
+
+    fn complete_setup(&mut self, id: ContextServerId, cx: &mut Context<Self>) {
+        self.context_servers_to_setup.remove(0);
+        cx.notify();
+
+        if !self.context_servers_to_setup.is_empty() {
+            return;
+        }
+
+        self.workspace
+            .update(cx, {
+                |workspace, cx| {
+                    let status_toast = StatusToast::new(
+                        format!("{} configured successfully.", id),
+                        cx,
+                        |this, _cx| {
+                            this.icon(ToastIcon::new(IconName::Hammer).color(Color::Muted))
+                                .action("Dismiss", |_, _| {})
+                        },
+                    );
+
+                    workspace.toggle_status_toast(status_toast, cx);
+                }
+            })
+            .log_err();
+
+        self.dismiss(cx);
+    }
+
+    fn dismiss(&self, cx: &mut Context<Self>) {
+        cx.emit(DismissEvent);
+    }
+}
+
+fn wait_for_context_server(
+    context_server_store: &Entity<ContextServerStore>,
+    context_server_id: ContextServerId,
+    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(()));
+                        }
+                    }
+                }
+                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()));
+                        }
+                    }
+                }
+                _ => {}
+            }
+        }
+    });
+
+    cx.spawn(async move |_cx| {
+        let result = rx.await.unwrap();
+        drop(subscription);
+        result
+    })
+}
+
+impl Render for ConfigureContextServerModal {
+    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let Some(setup) = self.context_servers_to_setup.first() else {
+            return div().into_any_element();
+        };
+
+        let focus_handle = self.focus_handle(cx);
+
+        div()
+            .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| {
+                this.focus_handle(cx).focus(window);
+            }))
+            .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()
+                            .child(div().pb_2().text_sm().child(MarkdownElement::new(
+                                configuration.installation_instructions.clone(),
+                                default_markdown_style(window, cx),
+                            )))
+                            .child(
+                                div()
+                                    .p_2()
+                                    .rounded_md()
+                                    .border_1()
+                                    .border_color(cx.theme().colors().border_variant)
+                                    .bg(cx.theme().colors().editor_background)
+                                    .gap_1()
+                                    .child({
+                                        let settings = ThemeSettings::get_global(cx);
+                                        let text_style = TextStyle {
+                                            color: cx.theme().colors().text,
+                                            font_family: settings.buffer_font.family.clone(),
+                                            font_fallbacks: settings.buffer_font.fallbacks.clone(),
+                                            font_size: settings.buffer_font_size(cx).into(),
+                                            font_weight: settings.buffer_font.weight,
+                                            line_height: relative(
+                                                settings.buffer_line_height.value(),
+                                            ),
+                                            ..Default::default()
+                                        };
+                                        EditorElement::new(
+                                            &configuration.settings_editor,
+                                            EditorStyle {
+                                                background: cx.theme().colors().editor_background,
+                                                local_player: cx.theme().players().local(),
+                                                text: text_style,
+                                                syntax: cx.theme().syntax().clone(),
+                                                ..Default::default()
+                                            },
+                                        )
+                                    })
+                                    .when_some(configuration.last_error.clone(), |this, error| {
+                                        this.child(
+                                            h_flex()
+                                                .gap_2()
+                                                .px_2()
+                                                .py_1()
+                                                .child(
+                                                    Icon::new(IconName::Warning)
+                                                        .size(IconSize::XSmall)
+                                                        .color(Color::Warning),
+                                                )
+                                                .child(
+                                                    div().w_full().child(
+                                                        Label::new(error)
+                                                            .size(LabelSize::Small)
+                                                            .color(Color::Muted),
+                                                    ),
+                                                ),
+                                        )
+                                    }),
+                            )
+                            .when(configuration.waiting_for_context_server, |this| {
+                                this.child(
+                                    h_flex()
+                                        .gap_1p5()
+                                        .child(
+                                            Icon::new(IconName::ArrowCircle)
+                                                .size(IconSize::XSmall)
+                                                .color(Color::Info)
+                                                .with_animation(
+                                                    "arrow-circle",
+                                                    Animation::new(Duration::from_secs(2)).repeat(),
+                                                    |icon, delta| {
+                                                        icon.transform(Transformation::rotate(
+                                                            percentage(delta),
+                                                        ))
+                                                    },
+                                                )
+                                                .into_any_element(),
+                                        )
+                                        .child(
+                                            Label::new("Waiting for Context Server")
+                                                .size(LabelSize::Small)
+                                                .color(Color::Muted),
+                                        ),
+                                )
+                            }),
+                    })
+                    .footer(
+                        ModalFooter::new()
+                            .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,
+                                        )
+                                        .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(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(),
+                            }),
+                    ),
+            ).into_any_element()
+    }
+}
+
+pub(crate) fn default_markdown_style(window: &Window, cx: &App) -> MarkdownStyle {
+    let theme_settings = ThemeSettings::get_global(cx);
+    let colors = cx.theme().colors();
+    let mut text_style = window.text_style();
+    text_style.refine(&TextStyleRefinement {
+        font_family: Some(theme_settings.ui_font.family.clone()),
+        font_fallbacks: theme_settings.ui_font.fallbacks.clone(),
+        font_features: Some(theme_settings.ui_font.features.clone()),
+        font_size: Some(TextSize::XSmall.rems(cx).into()),
+        color: Some(colors.text_muted),
+        ..Default::default()
+    });
+
+    MarkdownStyle {
+        base_text_style: text_style.clone(),
+        selection_background_color: cx.theme().players().local().selection,
+        link: TextStyleRefinement {
+            background_color: Some(colors.editor_foreground.opacity(0.025)),
+            underline: Some(UnderlineStyle {
+                color: Some(colors.text_accent.opacity(0.5)),
+                thickness: px(1.),
+                ..Default::default()
+            }),
+            ..Default::default()
+        },
+        ..Default::default()
+    }
+}
+
+impl ModalView for ConfigureContextServerModal {}
+impl EventEmitter<DismissEvent> for ConfigureContextServerModal {}
+impl Focusable for ConfigureContextServerModal {
+    fn focus_handle(&self, cx: &App) -> FocusHandle {
+        if let Some(current) = self.context_servers_to_setup.first() {
+            match &current.configuration {
+                Configuration::NotAvailable => self.focus_handle.clone(),
+                Configuration::Required(configuration) => {
+                    configuration.settings_editor.read(cx).focus_handle(cx)
+                }
+            }
+        } else {
+            self.focus_handle.clone()
+        }
+    }
+}
--- a/crates/agent_ui/src/agent_configuration/manage_profiles_modal.rs
+++ b/crates/agent_ui/src/agent_configuration/manage_profiles_modal.rs
@@ -15,8 +15,8 @@ use workspace::{ModalView, Workspace};

 use crate::agent_configuration::manage_profiles_modal::profile_modal_header::ProfileModalHeader;
 use crate::agent_configuration::tool_picker::{ToolPicker, ToolPickerDelegate};
+use crate::agent_profile::AgentProfile;
 use crate::{AgentPanel, ManageProfiles};
-use agent::agent_profile::AgentProfile;

 use super::tool_picker::ToolPickerMode;

--- a/crates/agent_ui/src/agent_configuration/manage_profiles_modal/profile_modal_header.rs
+++ b/crates/agent_ui/src/agent_configuration/manage_profiles_modal/profile_modal_header.rs
--- a/crates/agent_ui/src/agent_configuration/tool_picker.rs
+++ b/crates/agent_ui/src/agent_configuration/tool_picker.rs
@@ -272,35 +272,42 @@ impl PickerDelegate for ToolPickerDelegate {
            let server_id = server_id.clone();
            let tool_name = tool_name.clone();
            move |settings: &mut AgentSettingsContent, _cx| {
-                let profiles = settings.profiles.get_or_insert_default();
-                let profile = profiles
-                    .entry(profile_id)
-                    .or_insert_with(|| AgentProfileContent {
-                        name: default_profile.name.into(),
-                        tools: default_profile.tools,
-                        enable_all_context_servers: Some(
-                            default_profile.enable_all_context_servers,
-                        ),
-                        context_servers: default_profile
-                            .context_servers
-                            .into_iter()
-                            .map(|(server_id, preset)| {
-                                (
-                                    server_id,
-                                    ContextServerPresetContent {
-                                        tools: preset.tools,
-                                    },
-                                )
-                            })
-                            .collect(),
-                    });
+                settings
+                    .v2_setting(|v2_settings| {
+                        let profiles = v2_settings.profiles.get_or_insert_default();
+                        let profile =
+                            profiles
+                                .entry(profile_id)
+                                .or_insert_with(|| AgentProfileContent {
+                                    name: default_profile.name.into(),
+                                    tools: default_profile.tools,
+                                    enable_all_context_servers: Some(
+                                        default_profile.enable_all_context_servers,
+                                    ),
+                                    context_servers: default_profile
+                                        .context_servers
+                                        .into_iter()
+                                        .map(|(server_id, preset)| {
+                                            (
+                                                server_id,
+                                                ContextServerPresetContent {
+                                                    tools: preset.tools,
+                                                },
+                                            )
+                                        })
+                                        .collect(),
+                                });

-                if let Some(server_id) = server_id {
-                    let preset = profile.context_servers.entry(server_id).or_default();
-                    *preset.tools.entry(tool_name).or_default() = !is_currently_enabled;
-                } else {
-                    *profile.tools.entry(tool_name).or_default() = !is_currently_enabled;
-                }
+                        if let Some(server_id) = server_id {
+                            let preset = profile.context_servers.entry(server_id).or_default();
+                            *preset.tools.entry(tool_name).or_default() = !is_currently_enabled;
+                        } else {
+                            *profile.tools.entry(tool_name).or_default() = !is_currently_enabled;
+                        }
+
+                        Ok(())
+                    })
+                    .ok();
            }
        });
    }
--- a/crates/agent_ui/src/agent_diff.rs
+++ b/crates/agent_ui/src/agent_diff.rs
@@ -1,12 +1,10 @@
-use crate::{Keep, KeepAll, OpenAgentDiff, Reject, RejectAll};
-use agent::{Thread, ThreadEvent};
+use crate::{Keep, KeepAll, OpenAgentDiff, Reject, RejectAll, Thread, ThreadEvent};
 use agent_settings::AgentSettings;
 use anyhow::Result;
 use buffer_diff::DiffHunkStatus;
 use collections::{HashMap, HashSet};
 use editor::{
-    Direction, Editor, EditorEvent, EditorSettings, MultiBuffer, MultiBufferSnapshot,
-    SelectionEffects, ToPoint,
+    Direction, Editor, EditorEvent, EditorSettings, MultiBuffer, MultiBufferSnapshot, ToPoint,
    actions::{GoToHunk, GoToPreviousHunk},
    scroll::Autoscroll,
 };
@@ -172,9 +170,15 @@ impl AgentDiffPane {

                    if let Some(first_hunk) = first_hunk {
                        let first_hunk_start = first_hunk.multi_buffer_range().start;
-                        editor.change_selections(Default::default(), window, cx, |selections| {
-                            selections.select_anchor_ranges([first_hunk_start..first_hunk_start]);
-                        })
+                        editor.change_selections(
+                            Some(Autoscroll::fit()),
+                            window,
+                            cx,
+                            |selections| {
+                                selections
+                                    .select_anchor_ranges([first_hunk_start..first_hunk_start]);
+                            },
+                        )
                    }
                }

@@ -211,7 +215,7 @@ impl AgentDiffPane {
    }

    fn update_title(&mut self, cx: &mut Context<Self>) {
-        let new_title = self.thread.read(cx).title().unwrap_or("Agent Changes");
+        let new_title = self.thread.read(cx).summary().unwrap_or("Agent Changes");
        if new_title != self.title {
            self.title = new_title;
            cx.emit(EditorEvent::TitleChanged);
@@ -237,7 +241,7 @@ impl AgentDiffPane {

                if let Some(first_hunk) = first_hunk {
                    let first_hunk_start = first_hunk.multi_buffer_range().start;
-                    editor.change_selections(Default::default(), window, cx, |selections| {
+                    editor.change_selections(Some(Autoscroll::fit()), window, cx, |selections| {
                        selections.select_anchor_ranges([first_hunk_start..first_hunk_start]);
                    })
                }
@@ -411,7 +415,7 @@ fn update_editor_selection(
    };

    if let Some(target_hunk) = target_hunk {
-        editor.change_selections(Default::default(), window, cx, |selections| {
+        editor.change_selections(Some(Autoscroll::fit()), window, cx, |selections| {
            let next_hunk_start = target_hunk.multi_buffer_range().start;
            selections.select_anchor_ranges([next_hunk_start..next_hunk_start]);
        })
@@ -461,7 +465,7 @@ impl Item for AgentDiffPane {
    }

    fn tab_content(&self, params: TabContentParams, _window: &Window, cx: &App) -> AnyElement {
-        let summary = self.thread.read(cx).title().unwrap_or("Agent Changes");
+        let summary = self.thread.read(cx).summary().unwrap_or("Agent Changes");
        Label::new(format!("Review: {}", summary))
            .color(if params.selected {
                Color::Default
@@ -1369,11 +1373,12 @@ impl AgentDiff {
            | ThreadEvent::MessageDeleted(_)
            | ThreadEvent::SummaryGenerated
            | ThreadEvent::SummaryChanged
+            | ThreadEvent::UsePendingTools { .. }
+            | ThreadEvent::ToolFinished { .. }
            | ThreadEvent::CheckpointChanged
            | ThreadEvent::ToolConfirmationNeeded
            | ThreadEvent::ToolUseLimitReached
            | ThreadEvent::CancelEditing
-            | ThreadEvent::RetriesFailed { .. }
            | ThreadEvent::ProfileChanged => {}
        }
    }
@@ -1537,7 +1542,7 @@ impl AgentDiff {
                            let first_hunk_start = first_hunk.multi_buffer_range().start;

                            editor.change_selections(
-                                SelectionEffects::scroll(Autoscroll::center()),
+                                Some(Autoscroll::center()),
                                window,
                                cx,
                                |selections| {
@@ -1743,8 +1748,7 @@ impl editor::Addon for EditorAgentDiffAddon {
 #[cfg(test)]
 mod tests {
    use super::*;
-    use crate::Keep;
-    use agent::thread_store::{self, ThreadStore};
+    use crate::{Keep, ThreadStore, thread_store};
    use agent_settings::AgentSettings;
    use assistant_tool::ToolWorkingSet;
    use editor::EditorSettings;
@@ -1799,10 +1803,7 @@ mod tests {
            })
            .await
            .unwrap();
-        let thread = thread_store
-            .update(cx, |store, cx| store.create_thread(cx))
-            .await
-            .unwrap();
+        let thread = thread_store.update(cx, |store, cx| store.create_thread(cx));
        let action_log = thread.read_with(cx, |thread, _| thread.action_log().clone());

        let (workspace, cx) =
@@ -1864,7 +1865,7 @@ mod tests {

        // Rejecting a hunk also moves the cursor to the next hunk, possibly cycling if it's at the end.
        editor.update_in(cx, |editor, window, cx| {
-            editor.change_selections(SelectionEffects::no_scroll(), window, cx, |selections| {
+            editor.change_selections(None, window, cx, |selections| {
                selections.select_ranges([Point::new(10, 0)..Point::new(10, 0)])
            });
        });
@@ -1967,10 +1968,7 @@ mod tests {
            })
            .await
            .unwrap();
-        let thread = thread_store
-            .update(cx, |store, cx| store.create_thread(cx))
-            .await
-            .unwrap();
+        let thread = thread_store.update(cx, |store, cx| store.create_thread(cx));
        let action_log = thread.read_with(cx, |thread, _| thread.action_log().clone());

        let (workspace, cx) =
@@ -2123,7 +2121,7 @@ mod tests {

        // Rejecting a hunk also moves the cursor to the next hunk, possibly cycling if it's at the end.
        editor1.update_in(cx, |editor, window, cx| {
-            editor.change_selections(SelectionEffects::no_scroll(), window, cx, |selections| {
+            editor.change_selections(None, window, cx, |selections| {
                selections.select_ranges([Point::new(10, 0)..Point::new(10, 0)])
            });
        });
--- a/crates/agent_ui/src/agent_model_selector.rs
+++ b/crates/agent_ui/src/agent_model_selector.rs
@@ -1,17 +1,16 @@
-use crate::{
-    ModelUsageContext,
-    language_model_selector::{
-        LanguageModelSelector, ToggleModelSelector, language_model_selector,
-    },
-};
 use agent_settings::AgentSettings;
 use fs::Fs;
 use gpui::{Entity, FocusHandle, SharedString};
-use language_model::{ConfiguredModel, LanguageModelRegistry};
 use picker::popover_menu::PickerPopoverMenu;
+
+use crate::ModelUsageContext;
+use assistant_context_editor::language_model_selector::{
+    LanguageModelSelector, ToggleModelSelector, language_model_selector,
+};
+use language_model::{ConfiguredModel, LanguageModelRegistry};
 use settings::update_settings_file;
 use std::sync::Arc;
-use ui::{ButtonLike, PopoverMenuHandle, Tooltip, prelude::*};
+use ui::{PopoverMenuHandle, Tooltip, prelude::*};

 pub struct AgentModelSelector {
    selector: Entity<LanguageModelSelector>,
@@ -45,7 +44,7 @@ impl AgentModelSelector {
                                    let registry = LanguageModelRegistry::read_global(cx);
                                    if let Some(provider) = registry.provider(&model.provider_id())
                                    {
-                                        thread.set_model(
+                                        thread.set_configured_model(
                                            Some(ConfiguredModel {
                                                provider,
                                                model: model.clone(),
@@ -94,35 +93,20 @@ impl Render for AgentModelSelector {
    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
        let model = self.selector.read(cx).delegate.active_model(cx);
        let model_name = model
-            .as_ref()
            .map(|model| model.model.name().0)
            .unwrap_or_else(|| SharedString::from("No model selected"));
-        let provider_icon = model
-            .as_ref()
-            .map(|model| model.provider.icon())
-            .unwrap_or_else(|| IconName::Ai);

        let focus_handle = self.focus_handle.clone();

        PickerPopoverMenu::new(
            self.selector.clone(),
-            ButtonLike::new("active-model")
-                .child(
-                    Icon::new(provider_icon)
-                        .color(Color::Muted)
-                        .size(IconSize::XSmall),
-                )
-                .child(
-                    Label::new(model_name)
-                        .color(Color::Muted)
-                        .size(LabelSize::Small)
-                        .ml_0p5(),
-                )
-                .child(
-                    Icon::new(IconName::ChevronDown)
-                        .color(Color::Muted)
-                        .size(IconSize::XSmall),
-                ),
+            Button::new("active-model", model_name)
+                .label_size(LabelSize::Small)
+                .color(Color::Muted)
+                .icon(IconName::ChevronDown)
+                .icon_size(IconSize::XSmall)
+                .icon_position(IconPosition::End)
+                .icon_color(Color::Muted),
            move |window, cx| {
                Tooltip::for_action_in(
                    "Change Model",
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
--- a/crates/agent/src/agent_profile.rs
+++ b/crates/agent/src/agent_profile.rs
@@ -5,8 +5,9 @@ use assistant_tool::{Tool, ToolSource, ToolWorkingSet};
 use collections::IndexMap;
 use convert_case::{Case, Casing};
 use fs::Fs;
-use gpui::{App, Entity, SharedString};
+use gpui::{App, Entity};
 use settings::{Settings, update_settings_file};
+use ui::SharedString;
 use util::ResultExt;

 #[derive(Clone, Debug, Eq, PartialEq)]
@@ -85,14 +86,6 @@ impl AgentProfile {
            .collect()
    }

-    pub fn is_tool_enabled(&self, source: ToolSource, tool_name: String, cx: &App) -> bool {
-        let Some(settings) = AgentSettings::get_global(cx).profiles.get(&self.id) else {
-            return false;
-        };
-
-        return Self::is_enabled(settings, source, tool_name);
-    }
-
    fn is_enabled(settings: &AgentProfileSettings, source: ToolSource, name: String) -> bool {
        match source {
            ToolSource::Native => *settings.tools.get(name.as_str()).unwrap_or(&false),
@@ -115,11 +108,11 @@ mod tests {
    use agent_settings::ContextServerPreset;
    use assistant_tool::ToolRegistry;
    use collections::IndexMap;
-    use gpui::SharedString;
    use gpui::{AppContext, TestAppContext};
    use http_client::FakeHttpClient;
    use project::Project;
    use settings::{Settings, SettingsStore};
+    use ui::SharedString;

    use super::*;

@@ -309,7 +302,7 @@ mod tests {
            unimplemented!()
        }

-        fn icon(&self) -> icons::IconName {
+        fn icon(&self) -> ui::IconName {
            unimplemented!()
        }

--- a/crates/agent_ui/src/buffer_codegen.rs
+++ b/crates/agent_ui/src/buffer_codegen.rs
@@ -1,8 +1,6 @@
+use crate::context::ContextLoadResult;
 use crate::inline_prompt_editor::CodegenStatus;
-use agent::{
-    ContextStore,
-    context::{ContextLoadResult, load_context},
-};
+use crate::{context::load_context, context_store::ContextStore};
 use agent_settings::AgentSettings;
 use anyhow::{Context as _, Result};
 use client::telemetry::Telemetry;
@@ -20,7 +18,8 @@ use language_model::{
 use multi_buffer::MultiBufferRow;
 use parking_lot::Mutex;
 use project::Project;
-use prompt_store::{PromptBuilder, PromptStore};
+use prompt_store::PromptBuilder;
+use prompt_store::PromptStore;
 use rope::Rope;
 use smol::future::FutureExt;
 use std::{
@@ -1094,9 +1093,15 @@ mod tests {
    };
    use language_model::{LanguageModelRegistry, TokenUsage};
    use rand::prelude::*;
+    use serde::Serialize;
    use settings::SettingsStore;
    use std::{future, sync::Arc};

+    #[derive(Serialize)]
+    pub struct DummyCompletionRequest {
+        pub name: String,
+    }
+
    #[gpui::test(iterations = 10)]
    async fn test_transform_autoindent(cx: &mut TestAppContext, mut rng: StdRng) {
        init_test(cx);
--- a/crates/agent/src/context.rs
+++ b/crates/agent/src/context.rs
@@ -1,25 +1,30 @@
-use crate::thread::Thread;
-use assistant_context::AssistantContext;
+use std::fmt::{self, Display, Formatter, Write as _};
+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::HashSet;
+use collections::{HashMap, HashSet};
+use editor::display_map::CreaseId;
+use editor::{Addon, Editor};
 use futures::future;
 use futures::{FutureExt, future::Shared};
-use gpui::{App, AppContext as _, ElementId, Entity, SharedString, Task};
-use icons::IconName;
+use gpui::{App, AppContext as _, Entity, SharedString, Subscription, Task};
 use language::{Buffer, ParseStatus};
 use language_model::{LanguageModelImage, LanguageModelRequestMessage, MessageContent};
 use project::{Project, ProjectEntryId, ProjectPath, Worktree};
 use prompt_store::{PromptStore, UserPromptId};
 use ref_cast::RefCast;
 use rope::Point;
-use std::fmt::{self, Display, Formatter, Write as _};
-use std::hash::{Hash, Hasher};
-use std::path::PathBuf;
-use std::{ops::Range, path::Path, sync::Arc};
 use text::{Anchor, OffsetRangeExt as _};
+use ui::{Context, ElementId, IconName};
 use util::markdown::MarkdownCodeBlock;
 use util::{ResultExt as _, post_inc};

+use crate::context_store::{ContextStore, ContextStoreEvent};
+use crate::thread::Thread;
+
 pub const RULES_ICON: IconName = IconName::Context;

 pub enum ContextKind {
@@ -581,7 +586,7 @@ impl ThreadContextHandle {
    }

    pub fn title(&self, cx: &App) -> SharedString {
-        self.thread.read(cx).title().or_default()
+        self.thread.read(cx).summary().or_default()
    }

    fn load(self, cx: &App) -> Task<Option<(AgentContext, Vec<Entity<Buffer>>)>> {
@@ -589,7 +594,7 @@ impl ThreadContextHandle {
            let text = Thread::wait_for_detailed_summary_or_text(&self.thread, cx).await?;
            let title = self
                .thread
-                .read_with(cx, |thread, _cx| thread.title().or_default())
+                .read_with(cx, |thread, _cx| thread.summary().or_default())
                .ok()?;
            let context = AgentContext::Thread(ThreadContext {
                title,
@@ -1112,6 +1117,69 @@ impl Hash for AgentContextKey {
    }
 }

+#[derive(Default)]
+pub struct ContextCreasesAddon {
+    creases: HashMap<AgentContextKey, Vec<(CreaseId, SharedString)>>,
+    _subscription: Option<Subscription>,
+}
+
+impl Addon for ContextCreasesAddon {
+    fn to_any(&self) -> &dyn std::any::Any {
+        self
+    }
+
+    fn to_any_mut(&mut self) -> Option<&mut dyn std::any::Any> {
+        Some(self)
+    }
+}
+
+impl ContextCreasesAddon {
+    pub fn new() -> Self {
+        Self {
+            creases: HashMap::default(),
+            _subscription: None,
+        }
+    }
+
+    pub fn add_creases(
+        &mut self,
+        context_store: &Entity<ContextStore>,
+        key: AgentContextKey,
+        creases: impl IntoIterator<Item = (CreaseId, SharedString)>,
+        cx: &mut Context<Editor>,
+    ) {
+        self.creases.entry(key).or_default().extend(creases);
+        self._subscription = Some(cx.subscribe(
+            &context_store,
+            |editor, _, event, cx| match event {
+                ContextStoreEvent::ContextRemoved(key) => {
+                    let Some(this) = editor.addon_mut::<Self>() else {
+                        return;
+                    };
+                    let (crease_ids, replacement_texts): (Vec<_>, Vec<_>) = this
+                        .creases
+                        .remove(key)
+                        .unwrap_or_default()
+                        .into_iter()
+                        .unzip();
+                    let ranges = editor
+                        .remove_creases(crease_ids, cx)
+                        .into_iter()
+                        .map(|(_, range)| range)
+                        .collect::<Vec<_>>();
+                    editor.unfold_ranges(&ranges, false, false, cx);
+                    editor.edit(ranges.into_iter().zip(replacement_texts), cx);
+                    cx.notify();
+                }
+            },
+        ))
+    }
+
+    pub fn into_inner(self) -> HashMap<AgentContextKey, Vec<(CreaseId, SharedString)>> {
+        self.creases
+    }
+}
+
 #[cfg(test)]
 mod tests {
    use super::*;
--- a/crates/agent_ui/src/context_picker.rs
+++ b/crates/agent_ui/src/context_picker.rs
@@ -37,12 +37,10 @@ use uuid::Uuid;
 use workspace::{Workspace, notifications::NotifyResultExt};

 use crate::AgentPanel;
-use agent::{
-    ThreadId,
-    context::RULES_ICON,
-    context_store::ContextStore,
-    thread_store::{TextThreadStore, ThreadStore},
-};
+use crate::context::RULES_ICON;
+use crate::context_store::ContextStore;
+use crate::thread::ThreadId;
+use crate::thread_store::{TextThreadStore, ThreadStore};

 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 enum ContextPickerEntry {
@@ -661,7 +659,7 @@ fn recent_context_picker_entries(

    let active_thread_id = workspace
        .panel::<AgentPanel>(cx)
-        .and_then(|panel| Some(panel.read(cx).active_thread(cx)?.read(cx).id()));
+        .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())
@@ -670,7 +668,7 @@ fn recent_context_picker_entries(
        let mut threads = unordered_thread_entries(thread_store, text_thread_store, cx)
            .filter(|(_, thread)| match thread {
                ThreadContextEntry::Thread { id, .. } => {
-                    Some(id) != active_thread_id.as_ref() && !current_threads.contains(id)
+                    Some(id) != active_thread_id && !current_threads.contains(id)
                }
                ThreadContextEntry::Context { .. } => true,
            })
@@ -930,8 +928,8 @@ impl MentionLink {
        format!(
            "[@{} ({}-{})]({}:{}:{}-{})",
            file_name,
-            line_range.start + 1,
-            line_range.end + 1,
+            line_range.start,
+            line_range.end,
            Self::SELECTION,
            full_path,
            line_range.start,
--- a/crates/agent_ui/src/context_picker/completion_provider.rs
+++ b/crates/agent_ui/src/context_picker/completion_provider.rs
@@ -3,7 +3,6 @@ use std::path::{Path, PathBuf};
 use std::sync::Arc;
 use std::sync::atomic::AtomicBool;

-use agent::context_store::ContextStore;
 use anyhow::Result;
 use editor::{CompletionProvider, Editor, ExcerptId, ToOffset as _};
 use file_icons::FileIcons;
@@ -21,11 +20,10 @@ use ui::prelude::*;
 use util::ResultExt as _;
 use workspace::Workspace;

-use agent::{
-    Thread,
-    context::{AgentContextHandle, AgentContextKey, RULES_ICON},
-    thread_store::{TextThreadStore, ThreadStore},
-};
+use crate::Thread;
+use crate::context::{AgentContextHandle, AgentContextKey, ContextCreasesAddon, RULES_ICON};
+use crate::context_store::ContextStore;
+use crate::thread_store::{TextThreadStore, ThreadStore};

 use super::fetch_context_picker::fetch_url_content;
 use super::file_context_picker::{FileMatch, search_files};
@@ -37,7 +35,6 @@ use super::{
    ContextPickerAction, ContextPickerEntry, ContextPickerMode, MentionLink, RecentEntry,
    available_context_picker_entries, recent_context_picker_entries, selection_ranges,
 };
-use crate::message_editor::ContextCreasesAddon;

 pub(crate) enum Match {
    File(FileMatch),
@@ -73,7 +70,7 @@ fn search(
    recent_entries: Vec<RecentEntry>,
    prompt_store: Option<Entity<PromptStore>>,
    thread_store: Option<WeakEntity<ThreadStore>>,
-    text_thread_context_store: Option<WeakEntity<assistant_context::ContextStore>>,
+    text_thread_context_store: Option<WeakEntity<assistant_context_editor::ContextStore>>,
    workspace: Entity<Workspace>,
    cx: &mut App,
 ) -> Task<Vec<Match>> {
--- a/crates/agent_ui/src/context_picker/fetch_context_picker.rs
+++ b/crates/agent_ui/src/context_picker/fetch_context_picker.rs
@@ -2,7 +2,6 @@ use std::cell::RefCell;
 use std::rc::Rc;
 use std::sync::Arc;

-use agent::context_store::ContextStore;
 use anyhow::{Context as _, Result, bail};
 use futures::AsyncReadExt as _;
 use gpui::{App, DismissEvent, Entity, FocusHandle, Focusable, Task, WeakEntity};
@@ -13,6 +12,7 @@ use ui::{Context, ListItem, Window, prelude::*};
 use workspace::Workspace;

 use crate::context_picker::ContextPicker;
+use crate::context_store::ContextStore;

 pub struct FetchContextPicker {
    picker: Entity<Picker<FetchContextPickerDelegate>>,
--- a/crates/agent_ui/src/context_picker/file_context_picker.rs
+++ b/crates/agent_ui/src/context_picker/file_context_picker.rs
@@ -14,7 +14,7 @@ use util::ResultExt as _;
 use workspace::Workspace;

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

 pub struct FileContextPicker {
    picker: Entity<Picker<FileContextPickerDelegate>>,
--- a/crates/agent_ui/src/context_picker/rules_context_picker.rs
+++ b/crates/agent_ui/src/context_picker/rules_context_picker.rs
@@ -7,9 +7,9 @@ use prompt_store::{PromptId, PromptStore, UserPromptId};
 use ui::{ListItem, prelude::*};
 use util::ResultExt as _;

+use crate::context::RULES_ICON;
 use crate::context_picker::ContextPicker;
-use agent::context::RULES_ICON;
-use agent::context_store::{self, ContextStore};
+use crate::context_store::{self, ContextStore};

 pub struct RulesContextPicker {
    picker: Entity<Picker<RulesContextPickerDelegate>>,
--- a/crates/agent_ui/src/context_picker/symbol_context_picker.rs
+++ b/crates/agent_ui/src/context_picker/symbol_context_picker.rs
@@ -14,9 +14,9 @@ use ui::{ListItem, prelude::*};
 use util::ResultExt as _;
 use workspace::Workspace;

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

 pub struct SymbolContextPicker {
    picker: Entity<Picker<SymbolContextPickerDelegate>>,
--- a/crates/agent_ui/src/context_picker/thread_context_picker.rs
+++ b/crates/agent_ui/src/context_picker/thread_context_picker.rs
@@ -9,11 +9,9 @@ use picker::{Picker, PickerDelegate};
 use ui::{ListItem, prelude::*};

 use crate::context_picker::ContextPicker;
-use agent::{
-    ThreadId,
-    context_store::{self, ContextStore},
-    thread_store::{TextThreadStore, ThreadStore},
-};
+use crate::context_store::{self, ContextStore};
+use crate::thread::ThreadId;
+use crate::thread_store::{TextThreadStore, ThreadStore};

 pub struct ThreadContextPicker {
    picker: Entity<Picker<ThreadContextPickerDelegate>>,
--- a/crates/agent/src/context_server_configuration.rs
+++ b/crates/agent/src/context_server_configuration.rs
@@ -0,0 +1,169 @@
+use std::sync::Arc;
+
+use anyhow::Context as _;
+use context_server::ContextServerId;
+use extension::{ContextServerConfiguration, ExtensionManifest};
+use fs::Fs;
+use gpui::Task;
+use language::LanguageRegistry;
+use project::{
+    context_server_store::registry::ContextServerDescriptorRegistry,
+    project_settings::ProjectSettings,
+};
+use settings::update_settings_file;
+use ui::prelude::*;
+use util::ResultExt;
+use workspace::Workspace;
+
+use crate::agent_configuration::ConfigureContextServerModal;
+
+pub(crate) fn init(language_registry: Arc<LanguageRegistry>, fs: Arc<dyn Fs>, cx: &mut App) {
+    cx.observe_new(move |_: &mut Workspace, window, cx| {
+        let Some(window) = window else {
+            return;
+        };
+
+        if let Some(extension_events) = extension::ExtensionEvents::try_global(cx).as_ref() {
+            cx.subscribe_in(extension_events, window, {
+                let language_registry = language_registry.clone();
+                let fs = fs.clone();
+                move |workspace, _, event, window, cx| match event {
+                    extension::Event::ExtensionInstalled(manifest) => {
+                        show_configure_mcp_modal(
+                            language_registry.clone(),
+                            manifest,
+                            workspace,
+                            window,
+                            cx,
+                        );
+                    }
+                    extension::Event::ExtensionUninstalled(manifest) => {
+                        remove_context_server_settings(
+                            manifest.context_servers.keys().cloned().collect(),
+                            fs.clone(),
+                            cx,
+                        );
+                    }
+                    extension::Event::ConfigureExtensionRequested(manifest) => {
+                        if !manifest.context_servers.is_empty() {
+                            show_configure_mcp_modal(
+                                language_registry.clone(),
+                                manifest,
+                                workspace,
+                                window,
+                                cx,
+                            );
+                        }
+                    }
+                    _ => {}
+                }
+            })
+            .detach();
+        } else {
+            log::info!(
+                "No extension events global found. Skipping context server configuration wizard"
+            );
+        }
+    })
+    .detach();
+}
+
+fn remove_context_server_settings(
+    context_server_ids: Vec<Arc<str>>,
+    fs: Arc<dyn Fs>,
+    cx: &mut App,
+) {
+    update_settings_file::<ProjectSettings>(fs, cx, move |settings, _| {
+        settings
+            .context_servers
+            .retain(|server_id, _| !context_server_ids.contains(server_id));
+    });
+}
+
+pub enum Configuration {
+    NotAvailable(ContextServerId, Option<SharedString>),
+    Required(
+        ContextServerId,
+        Option<SharedString>,
+        ContextServerConfiguration,
+    ),
+}
+
+fn show_configure_mcp_modal(
+    language_registry: Arc<LanguageRegistry>,
+    manifest: &Arc<ExtensionManifest>,
+    workspace: &mut Workspace,
+    window: &mut Window,
+    cx: &mut Context<'_, Workspace>,
+) {
+    if !window.is_window_active() {
+        return;
+    }
+
+    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 registry = ContextServerDescriptorRegistry::default_global(cx).read(cx);
+    let worktree_store = workspace.project().read(cx).worktree_store();
+    let configuration_tasks = manifest
+        .context_servers
+        .keys()
+        .cloned()
+        .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();
+                    async move |_, cx| {
+                        let configuration = descriptor
+                            .configuration(worktree_store.clone(), &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)
+                            }
+                        }
+                    }
+                })
+            }
+        })
+        .collect::<Vec<_>>();
+
+    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 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,
+                )
+            });
+        })
+    })
+    .detach();
+}
--- a/crates/agent/src/context_server_tool.rs
+++ b/crates/agent/src/context_server_tool.rs
@@ -4,9 +4,9 @@ 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::{LanguageModel, LanguageModelRequest, LanguageModelToolSchemaFormat};
 use project::{Project, context_server_store::ContextServerStore};
+use ui::IconName;

 pub struct ContextServerTool {
    store: Entity<ContextServerStore>,
--- a/crates/agent/src/context_store.rs
+++ b/crates/agent/src/context_store.rs
@@ -1,30 +1,29 @@
-use crate::{
-    MessageId, ThreadId,
-    context::{
-        AgentContextHandle, AgentContextKey, ContextId, ContextKind, DirectoryContextHandle,
-        FetchedUrlContext, FileContextHandle, ImageContext, RulesContextHandle,
-        SelectionContextHandle, SymbolContextHandle, TextThreadContextHandle, ThreadContextHandle,
-    },
-    thread::Thread,
-    thread_store::ThreadStore,
-};
+use std::ops::Range;
+use std::path::{Path, PathBuf};
+use std::sync::Arc;
+
 use anyhow::{Context as _, Result, anyhow};
-use assistant_context::AssistantContext;
+use assistant_context_editor::AssistantContext;
 use collections::{HashSet, IndexSet};
 use futures::{self, FutureExt};
 use gpui::{App, Context, Entity, EventEmitter, Image, SharedString, Task, WeakEntity};
 use language::{Buffer, File as _};
 use language_model::LanguageModelImage;
-use project::{Project, ProjectItem, ProjectPath, Symbol, image_store::is_image_file};
+use project::image_store::is_image_file;
+use project::{Project, ProjectItem, ProjectPath, Symbol};
 use prompt_store::UserPromptId;
 use ref_cast::RefCast as _;
-use std::{
-    ops::Range,
-    path::{Path, PathBuf},
-    sync::Arc,
-};
 use text::{Anchor, OffsetRangeExt};

+use crate::ThreadStore;
+use crate::context::{
+    AgentContextHandle, AgentContextKey, ContextId, DirectoryContextHandle, FetchedUrlContext,
+    FileContextHandle, ImageContext, RulesContextHandle, SelectionContextHandle,
+    SymbolContextHandle, TextThreadContextHandle, ThreadContextHandle,
+};
+use crate::context_strip::SuggestedContext;
+use crate::thread::{MessageId, Thread, ThreadId};
+
 pub struct ContextStore {
    project: WeakEntity<Project>,
    thread_store: Option<WeakEntity<ThreadStore>>,
@@ -72,8 +71,7 @@ impl ContextStore {
    ) -> Vec<AgentContextHandle> {
        let existing_context = thread
            .messages()
-            .iter()
-            .take_while(|message| exclude_messages_from_id.is_none_or(|id| message.id() != id))
+            .take_while(|message| exclude_messages_from_id.is_none_or(|id| message.id != id))
            .flat_map(|message| {
                message
                    .loaded_context
@@ -443,7 +441,7 @@ impl ContextStore {
            match context {
                AgentContextHandle::Thread(thread_context) => {
                    self.context_thread_ids
-                        .remove(&thread_context.thread.read(cx).id());
+                        .remove(thread_context.thread.read(cx).id());
                }
                AgentContextHandle::TextThread(text_thread_context) => {
                    if let Some(path) = text_thread_context.context.read(cx).path() {
@@ -563,49 +561,6 @@ impl ContextStore {
    }
 }

-#[derive(Clone)]
-pub enum SuggestedContext {
-    File {
-        name: SharedString,
-        icon_path: Option<SharedString>,
-        buffer: WeakEntity<Buffer>,
-    },
-    Thread {
-        name: SharedString,
-        thread: WeakEntity<Thread>,
-    },
-    TextThread {
-        name: SharedString,
-        context: WeakEntity<AssistantContext>,
-    },
-}
-
-impl SuggestedContext {
-    pub fn name(&self) -> &SharedString {
-        match self {
-            Self::File { name, .. } => name,
-            Self::Thread { name, .. } => name,
-            Self::TextThread { name, .. } => name,
-        }
-    }
-
-    pub fn icon_path(&self) -> Option<SharedString> {
-        match self {
-            Self::File { icon_path, .. } => icon_path.clone(),
-            Self::Thread { .. } => None,
-            Self::TextThread { .. } => None,
-        }
-    }
-
-    pub fn kind(&self) -> ContextKind {
-        match self {
-            Self::File { .. } => ContextKind::File,
-            Self::Thread { .. } => ContextKind::Thread,
-            Self::TextThread { .. } => ContextKind::TextThread,
-        }
-    }
-}
-
 pub enum FileInclusion {
    Direct,
    InDirectory { full_path: PathBuf },
--- a/crates/agent_ui/src/context_strip.rs
+++ b/crates/agent_ui/src/context_strip.rs
@@ -1,15 +1,7 @@
-use crate::{
-    AcceptSuggestedContext, AgentPanel, FocusDown, FocusLeft, FocusRight, FocusUp,
-    ModelUsageContext, RemoveAllContext, RemoveFocusedContext, ToggleContextPicker,
-    context_picker::ContextPicker,
-    ui::{AddedContext, ContextPill},
-};
-use agent::context_store::SuggestedContext;
-use agent::{
-    context::AgentContextHandle,
-    context_store::ContextStore,
-    thread_store::{TextThreadStore, ThreadStore},
-};
+use std::path::Path;
+use std::rc::Rc;
+
+use assistant_context_editor::AssistantContext;
 use collections::HashSet;
 use editor::Editor;
 use file_icons::FileIcons;
@@ -18,11 +10,22 @@ use gpui::{
    Subscription, WeakEntity,
 };
 use itertools::Itertools;
+use language::Buffer;
 use project::ProjectItem;
-use std::{path::Path, rc::Rc};
 use ui::{PopoverMenu, PopoverMenuHandle, Tooltip, prelude::*};
 use workspace::Workspace;

+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::ui::{AddedContext, ContextPill};
+use crate::{
+    AcceptSuggestedContext, AgentPanel, FocusDown, FocusLeft, FocusRight, FocusUp,
+    ModelUsageContext, RemoveAllContext, RemoveFocusedContext, ToggleContextPicker,
+};
+
 pub struct ContextStrip {
    context_store: Entity<ContextStore>,
    context_picker: Entity<ContextPicker>,
@@ -161,7 +164,7 @@ impl ContextStrip {
        let workspace = self.workspace.upgrade()?;
        let panel = workspace.read(cx).panel::<AgentPanel>(cx)?.read(cx);

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

            let active_thread = active_thread.read(cx);
@@ -169,13 +172,13 @@ impl ContextStrip {
            if self
                .context_store
                .read(cx)
-                .includes_thread(&active_thread.id())
+                .includes_thread(active_thread.id())
            {
                return None;
            }

            Some(SuggestedContext::Thread {
-                name: active_thread.title().or_default(),
+                name: active_thread.summary().or_default(),
                thread: weak_active_thread,
            })
        } else if let Some(active_context_editor) = panel.active_context_editor() {
@@ -572,3 +575,46 @@ pub enum SuggestContextKind {
    File,
    Thread,
 }
+
+#[derive(Clone)]
+pub enum SuggestedContext {
+    File {
+        name: SharedString,
+        icon_path: Option<SharedString>,
+        buffer: WeakEntity<Buffer>,
+    },
+    Thread {
+        name: SharedString,
+        thread: WeakEntity<Thread>,
+    },
+    TextThread {
+        name: SharedString,
+        context: WeakEntity<AssistantContext>,
+    },
+}
+
+impl SuggestedContext {
+    pub fn name(&self) -> &SharedString {
+        match self {
+            Self::File { name, .. } => name,
+            Self::Thread { name, .. } => name,
+            Self::TextThread { name, .. } => name,
+        }
+    }
+
+    pub fn icon_path(&self) -> Option<SharedString> {
+        match self {
+            Self::File { icon_path, .. } => icon_path.clone(),
+            Self::Thread { .. } => None,
+            Self::TextThread { .. } => None,
+        }
+    }
+
+    pub fn kind(&self) -> ContextKind {
+        match self {
+            Self::File { .. } => ContextKind::File,
+            Self::Thread { .. } => ContextKind::Thread,
+            Self::TextThread { .. } => ContextKind::TextThread,
+        }
+    }
+}
--- a/crates/agent_ui/src/debug.rs
+++ b/crates/agent_ui/src/debug.rs
@@ -1,7 +1,7 @@
 #![allow(unused, dead_code)]

-use client::{ModelRequestUsage, RequestUsage};
 use gpui::Global;
+use language_model::RequestUsage;
 use std::ops::{Deref, DerefMut};
 use ui::prelude::*;
 use zed_llm_client::{Plan, UsageLimit};
@@ -17,7 +17,7 @@ pub struct DebugAccountState {
    pub enabled: bool,
    pub trial_expired: bool,
    pub plan: Plan,
-    pub custom_prompt_usage: ModelRequestUsage,
+    pub custom_prompt_usage: RequestUsage,
    pub usage_based_billing_enabled: bool,
    pub monthly_spending_cap: i32,
    pub custom_edit_prediction_usage: UsageLimit,
@@ -43,7 +43,7 @@ impl DebugAccountState {
        self
    }

-    pub fn set_custom_prompt_usage(&mut self, custom_prompt_usage: ModelRequestUsage) -> &mut Self {
+    pub fn set_custom_prompt_usage(&mut self, custom_prompt_usage: RequestUsage) -> &mut Self {
        self.custom_prompt_usage = custom_prompt_usage;
        self
    }
@@ -76,10 +76,10 @@ impl Default for DebugAccountState {
            enabled: false,
            trial_expired: false,
            plan: Plan::ZedFree,
-            custom_prompt_usage: ModelRequestUsage(RequestUsage {
+            custom_prompt_usage: RequestUsage {
                limit: UsageLimit::Unlimited,
                amount: 0,
-            }),
+            },
            usage_based_billing_enabled: false,
            // $50.00
            monthly_spending_cap: 5000,
--- a/crates/agent/src/history_store.rs
+++ b/crates/agent/src/history_store.rs
@@ -1,17 +1,21 @@
-use crate::{
-    ThreadId,
-    thread_store::{SerializedThreadMetadata, ThreadStore},
-};
+use std::{collections::VecDeque, path::Path, sync::Arc};
+
 use anyhow::{Context as _, Result};
-use assistant_context::SavedContextMetadata;
+use assistant_context_editor::SavedContextMetadata;
 use chrono::{DateTime, Utc};
-use gpui::{App, AsyncApp, Entity, SharedString, Task, prelude::*};
+use gpui::{AsyncApp, Entity, SharedString, Task, prelude::*};
 use itertools::Itertools;
 use paths::contexts_dir;
 use serde::{Deserialize, Serialize};
-use std::{collections::VecDeque, path::Path, sync::Arc, time::Duration};
+use std::time::Duration;
+use ui::App;
 use util::ResultExt as _;

+use crate::{
+    thread::ThreadId,
+    thread_store::{SerializedThreadMetadata, ThreadStore},
+};
+
 const MAX_RECENTLY_OPENED_ENTRIES: usize = 6;
 const NAVIGATION_HISTORY_PATH: &str = "agent-navigation-history.json";
 const SAVE_RECENTLY_OPENED_ENTRIES_DEBOUNCE: Duration = Duration::from_millis(50);
@@ -62,7 +66,7 @@ enum SerializedRecentOpen {

 pub struct HistoryStore {
    thread_store: Entity<ThreadStore>,
-    context_store: Entity<assistant_context::ContextStore>,
+    context_store: Entity<assistant_context_editor::ContextStore>,
    recently_opened_entries: VecDeque<HistoryEntryId>,
    _subscriptions: Vec<gpui::Subscription>,
    _save_recently_opened_entries_task: Task<()>,
@@ -71,7 +75,7 @@ pub struct HistoryStore {
 impl HistoryStore {
    pub fn new(
        thread_store: Entity<ThreadStore>,
-        context_store: Entity<assistant_context::ContextStore>,
+        context_store: Entity<assistant_context_editor::ContextStore>,
        initial_recent_entries: impl IntoIterator<Item = HistoryEntryId>,
        cx: &mut Context<Self>,
    ) -> Self {
--- a/crates/agent_ui/src/inline_assistant.rs
+++ b/crates/agent_ui/src/inline_assistant.rs
@@ -4,28 +4,18 @@ use std::ops::Range;
 use std::rc::Rc;
 use std::sync::Arc;

-use crate::{
-    AgentPanel,
-    buffer_codegen::{BufferCodegen, CodegenAlternative, CodegenEvent},
-    inline_prompt_editor::{CodegenStatus, InlineAssistId, PromptEditor, PromptEditorEvent},
-    terminal_inline_assistant::TerminalInlineAssistant,
-};
-use agent::{
-    context_store::ContextStore,
-    thread_store::{TextThreadStore, ThreadStore},
-};
 use agent_settings::AgentSettings;
 use anyhow::{Context as _, Result};
 use client::telemetry::Telemetry;
 use collections::{HashMap, HashSet, VecDeque, hash_map};
-use editor::SelectionEffects;
+use editor::display_map::EditorMargins;
 use editor::{
    Anchor, AnchorRangeExt, CodeActionProvider, Editor, EditorEvent, ExcerptId, ExcerptRange,
    MultiBuffer, MultiBufferSnapshot, ToOffset as _, ToPoint,
    actions::SelectAll,
    display_map::{
-        BlockContext, BlockPlacement, BlockProperties, BlockStyle, CustomBlockId, EditorMargins,
-        RenderBlock, ToDisplayPoint,
+        BlockContext, BlockPlacement, BlockProperties, BlockStyle, CustomBlockId, RenderBlock,
+        ToDisplayPoint,
    },
 };
 use fs::Fs;
@@ -34,13 +24,16 @@ use gpui::{
    WeakEntity, Window, point,
 };
 use language::{Buffer, Point, Selection, TransactionId};
-use language_model::{
-    ConfigurationError, ConfiguredModel, LanguageModelRegistry, report_assistant_event,
-};
+use language_model::ConfigurationError;
+use language_model::ConfiguredModel;
+use language_model::{LanguageModelRegistry, report_assistant_event};
 use multi_buffer::MultiBufferRow;
 use parking_lot::Mutex;
-use project::{CodeAction, LspAction, Project, ProjectTransaction};
-use prompt_store::{PromptBuilder, PromptStore};
+use project::LspAction;
+use project::Project;
+use project::{CodeAction, ProjectTransaction};
+use prompt_store::PromptBuilder;
+use prompt_store::PromptStore;
 use settings::{Settings, SettingsStore};
 use telemetry_events::{AssistantEventData, AssistantKind, AssistantPhase};
 use terminal_view::{TerminalView, terminal_panel::TerminalPanel};
@@ -50,6 +43,14 @@ use util::{RangeExt, ResultExt, maybe};
 use workspace::{ItemHandle, Toast, Workspace, dock::Panel, notifications::NotificationId};
 use zed_actions::agent::OpenConfiguration;

+use crate::AgentPanel;
+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(
    fs: Arc<dyn Fs>,
    prompt_builder: Arc<PromptBuilder>,
@@ -1160,7 +1161,7 @@ impl InlineAssistant {

        let position = assist.range.start;
        editor.update(cx, |editor, cx| {
-            editor.change_selections(SelectionEffects::no_scroll(), window, cx, |selections| {
+            editor.change_selections(None, window, cx, |selections| {
                selections.select_anchor_ranges([position..position])
            });

--- a/crates/agent_ui/src/inline_prompt_editor.rs
+++ b/crates/agent_ui/src/inline_prompt_editor.rs
@@ -1,16 +1,15 @@
 use crate::agent_model_selector::AgentModelSelector;
 use crate::buffer_codegen::BufferCodegen;
+use crate::context::ContextCreasesAddon;
 use crate::context_picker::{ContextPicker, ContextPickerCompletionProvider};
+use crate::context_store::ContextStore;
 use crate::context_strip::{ContextStrip, ContextStripEvent, SuggestContextKind};
-use crate::language_model_selector::ToggleModelSelector;
-use crate::message_editor::{ContextCreasesAddon, extract_message_creases, insert_message_creases};
+use crate::message_editor::{extract_message_creases, insert_message_creases};
 use crate::terminal_codegen::TerminalCodegen;
+use crate::thread_store::{TextThreadStore, ThreadStore};
 use crate::{CycleNextInlineAssist, CyclePreviousInlineAssist, ModelUsageContext};
 use crate::{RemoveAllContext, ToggleContextPicker};
-use agent::{
-    context_store::ContextStore,
-    thread_store::{TextThreadStore, ThreadStore},
-};
+use assistant_context_editor::language_model_selector::ToggleModelSelector;
 use client::ErrorExt;
 use collections::VecDeque;
 use db::kvp::Dismissable;
@@ -871,7 +870,7 @@ impl PromptEditor<BufferCodegen> {
            let mut editor = Editor::new(
                EditorMode::AutoHeight {
                    min_lines: 1,
-                    max_lines: Some(Self::MAX_LINES as usize),
+                    max_lines: Self::MAX_LINES as usize,
                },
                prompt_buffer,
                None,
@@ -1050,7 +1049,7 @@ impl PromptEditor<TerminalCodegen> {
            let mut editor = Editor::new(
                EditorMode::AutoHeight {
                    min_lines: 1,
-                    max_lines: Some(Self::MAX_LINES as usize),
+                    max_lines: Self::MAX_LINES as usize,
                },
                prompt_buffer,
                None,
--- a/crates/agent_ui/src/message_editor.rs
+++ b/crates/agent_ui/src/message_editor.rs
@@ -3,25 +3,21 @@ use std::rc::Rc;
 use std::sync::Arc;

 use crate::agent_model_selector::AgentModelSelector;
-use crate::language_model_selector::ToggleModelSelector;
+use crate::context::{AgentContextKey, ContextCreasesAddon, ContextLoadResult, load_context};
 use crate::tool_compatibility::{IncompatibleToolsState, IncompatibleToolsTooltip};
 use crate::ui::{
    MaxModeTooltip,
    preview::{AgentPreview, UsageCallout},
 };
-use agent::{
-    context::{AgentContextKey, ContextLoadResult, load_context},
-    context_store::ContextStoreEvent,
-};
 use agent_settings::{AgentSettings, CompletionMode};
+use assistant_context_editor::language_model_selector::ToggleModelSelector;
 use buffer_diff::BufferDiff;
 use client::UserStore;
 use collections::{HashMap, HashSet};
 use editor::actions::{MoveUp, Paste};
-use editor::display_map::CreaseId;
 use editor::{
-    Addon, AnchorRangeExt, ContextMenuOptions, ContextMenuPlacement, Editor, EditorElement,
-    EditorEvent, EditorMode, EditorStyle, MultiBuffer,
+    AnchorRangeExt, ContextMenuOptions, ContextMenuPlacement, Editor, EditorElement, EditorEvent,
+    EditorMode, EditorStyle, MultiBuffer,
 };
 use file_icons::FileIcons;
 use fs::Fs;
@@ -33,7 +29,8 @@ use gpui::{
 };
 use language::{Buffer, Language, Point};
 use language_model::{
-    ConfiguredModel, LanguageModelRequestMessage, MessageContent, ZED_CLOUD_PROVIDER_ID,
+    ConfiguredModel, LanguageModelRequestMessage, MessageContent, RequestUsage,
+    ZED_CLOUD_PROVIDER_ID,
 };
 use multi_buffer;
 use project::Project;
@@ -45,23 +42,21 @@ use theme::ThemeSettings;
 use ui::{
    Callout, Disclosure, Divider, DividerColor, KeyBinding, PopoverMenuHandle, Tooltip, prelude::*,
 };
-use util::ResultExt as _;
+use util::{ResultExt as _, maybe};
 use workspace::{CollaboratorId, Workspace};
 use zed_llm_client::CompletionIntent;

 use crate::context_picker::{ContextPicker, ContextPickerCompletionProvider, crease_for_mention};
+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::{
    ActiveThread, AgentDiffPane, Chat, ChatWithFollow, ExpandMessageEditor, Follow, KeepAll,
    ModelUsageContext, NewThread, OpenAgentDiff, RejectAll, RemoveAllContext, ToggleBurnMode,
    ToggleContextPicker, ToggleProfileSelector, register_agent_preview,
 };
-use agent::{
-    MessageCrease, Thread, TokenUsageRatio,
-    context_store::ContextStore,
-    thread_store::{TextThreadStore, ThreadStore},
-};

 #[derive(RegisterComponent)]
 pub struct MessageEditor {
@@ -94,8 +89,6 @@ pub(crate) fn create_editor(
    context_store: WeakEntity<ContextStore>,
    thread_store: WeakEntity<ThreadStore>,
    text_thread_store: WeakEntity<TextThreadStore>,
-    min_lines: usize,
-    max_lines: Option<usize>,
    window: &mut Window,
    cx: &mut App,
 ) -> Entity<Editor> {
@@ -112,8 +105,8 @@ pub(crate) fn create_editor(
        let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
        let mut editor = Editor::new(
            editor::EditorMode::AutoHeight {
-                min_lines,
-                max_lines: max_lines,
+                min_lines: MIN_EDITOR_LINES,
+                max_lines: MAX_EDITOR_LINES,
            },
            buffer,
            None,
@@ -168,8 +161,6 @@ impl MessageEditor {
            context_store.downgrade(),
            thread_store.clone(),
            text_thread_store.clone(),
-            MIN_EDITOR_LINES,
-            Some(MAX_EDITOR_LINES),
            window,
            cx,
        );
@@ -246,21 +237,6 @@ impl MessageEditor {
        &self.context_store
    }

-    pub fn get_text(&self, cx: &App) -> String {
-        self.editor.read(cx).text(cx)
-    }
-
-    pub fn set_text(
-        &mut self,
-        text: impl Into<Arc<str>>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.editor.update(cx, |editor, cx| {
-            editor.set_text(text, window, cx);
-        });
-    }
-
    pub fn expand_message_editor(
        &mut self,
        _: &ExpandMessageEditor,
@@ -282,7 +258,7 @@ impl MessageEditor {
            } else {
                editor.set_mode(EditorMode::AutoHeight {
                    min_lines: MIN_EDITOR_LINES,
-                    max_lines: Some(MAX_EDITOR_LINES),
+                    max_lines: MAX_EDITOR_LINES,
                })
            }
        });
@@ -387,14 +363,25 @@ impl MessageEditor {

            thread
                .update(cx, |thread, cx| {
-                    todo!();
-                    // thread.send(
-                    // user_message,
-                    // loaded_context,
-                    // checkpoint.ok(),
-                    // user_message_creases,
-                    // cx,
-                    // );
+                    thread.insert_user_message(
+                        user_message,
+                        loaded_context,
+                        checkpoint.ok(),
+                        user_message_creases,
+                        cx,
+                    );
+                })
+                .log_err();
+
+            thread
+                .update(cx, |thread, cx| {
+                    thread.advance_prompt_id();
+                    thread.send_to_model(
+                        model,
+                        CompletionIntent::UserPrompt,
+                        Some(window_handle),
+                        cx,
+                    );
                })
                .log_err();
        })
@@ -564,7 +551,7 @@ impl MessageEditor {
    fn render_burn_mode_toggle(&self, cx: &mut Context<Self>) -> Option<AnyElement> {
        let thread = self.thread.read(cx);
        let model = thread.configured_model();
-        if !model?.model.supports_burn_mode() {
+        if !model?.model.supports_max_mode() {
            return None;
        }

@@ -1235,17 +1222,16 @@ impl MessageEditor {
            })
    }

-    fn is_using_zed_provider(&self, cx: &App) -> bool {
-        self.thread
+    fn render_usage_callout(&self, line_height: Pixels, cx: &mut Context<Self>) -> Option<Div> {
+        let is_using_zed_provider = self
+            .thread
            .read(cx)
            .configured_model()
            .map_or(false, |model| {
                model.provider.id().0 == ZED_CLOUD_PROVIDER_ID
-            })
-    }
+            });

-    fn render_usage_callout(&self, line_height: Pixels, cx: &mut Context<Self>) -> Option<Div> {
-        if !self.is_using_zed_provider(cx) {
+        if !is_using_zed_provider {
            return None;
        }

@@ -1267,8 +1253,24 @@ impl MessageEditor {
                Plan::ZedProTrial => zed_llm_client::Plan::ZedProTrial,
            })
            .unwrap_or(zed_llm_client::Plan::ZedFree);
+        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?;

-        let usage = user_store.model_request_usage()?;
+                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
+                        }
+                    },
+                })
+            })
+        })?;

        Some(
            div()
@@ -1299,41 +1301,37 @@ impl MessageEditor {
            "Thread reaching the token limit soon"
        };

-        let description = if self.is_using_zed_provider(cx) {
-            "To continue, start a new thread from a summary or turn burn mode on."
-        } else {
-            "To continue, start a new thread from a summary."
-        };
-
-        let mut callout = Callout::new()
-            .line_height(line_height)
-            .icon(icon)
-            .title(title)
-            .description(description)
-            .primary_action(
-                Button::new("start-new-thread", "Start New Thread")
-                    .label_size(LabelSize::Small)
-                    .on_click(cx.listener(|this, _, window, cx| {
-                        let from_thread_id = Some(this.thread.read(cx).id().clone());
-                        window.dispatch_action(Box::new(NewThread { from_thread_id }), cx);
-                    })),
-            );
-
-        if self.is_using_zed_provider(cx) {
-            callout = callout.secondary_action(
-                IconButton::new("burn-mode-callout", IconName::ZedBurnMode)
-                    .icon_size(IconSize::XSmall)
-                    .on_click(cx.listener(|this, _event, window, cx| {
-                        this.toggle_burn_mode(&ToggleBurnMode, window, cx);
-                    })),
-            );
-        }
-
        Some(
            div()
                .border_t_1()
                .border_color(cx.theme().colors().border)
-                .child(callout),
+                .child(
+                    Callout::new()
+                        .line_height(line_height)
+                        .icon(icon)
+                        .title(title)
+                        .description(
+                            "To continue, start a new thread from a summary or turn burn mode on.",
+                        )
+                        .primary_action(
+                            Button::new("start-new-thread", "Start New Thread")
+                                .label_size(LabelSize::Small)
+                                .on_click(cx.listener(|this, _, window, cx| {
+                                    let from_thread_id = Some(this.thread.read(cx).id().clone());
+                                    window.dispatch_action(
+                                        Box::new(NewThread { from_thread_id }),
+                                        cx,
+                                    );
+                                })),
+                        )
+                        .secondary_action(
+                            IconButton::new("burn-mode-callout", IconName::ZedBurnMode)
+                                .icon_size(IconSize::XSmall)
+                                .on_click(cx.listener(|this, _event, window, cx| {
+                                    this.toggle_burn_mode(&ToggleBurnMode, window, cx);
+                                })),
+                        ),
+                ),
        )
    }

@@ -1461,69 +1459,6 @@ impl MessageEditor {
    }
 }

-#[derive(Default)]
-pub struct ContextCreasesAddon {
-    creases: HashMap<AgentContextKey, Vec<(CreaseId, SharedString)>>,
-    _subscription: Option<Subscription>,
-}
-
-impl Addon for ContextCreasesAddon {
-    fn to_any(&self) -> &dyn std::any::Any {
-        self
-    }
-
-    fn to_any_mut(&mut self) -> Option<&mut dyn std::any::Any> {
-        Some(self)
-    }
-}
-
-impl ContextCreasesAddon {
-    pub fn new() -> Self {
-        Self {
-            creases: HashMap::default(),
-            _subscription: None,
-        }
-    }
-
-    pub fn add_creases(
-        &mut self,
-        context_store: &Entity<ContextStore>,
-        key: AgentContextKey,
-        creases: impl IntoIterator<Item = (CreaseId, SharedString)>,
-        cx: &mut Context<Editor>,
-    ) {
-        self.creases.entry(key).or_default().extend(creases);
-        self._subscription = Some(cx.subscribe(
-            &context_store,
-            |editor, _, event, cx| match event {
-                ContextStoreEvent::ContextRemoved(key) => {
-                    let Some(this) = editor.addon_mut::<Self>() else {
-                        return;
-                    };
-                    let (crease_ids, replacement_texts): (Vec<_>, Vec<_>) = this
-                        .creases
-                        .remove(key)
-                        .unwrap_or_default()
-                        .into_iter()
-                        .unzip();
-                    let ranges = editor
-                        .remove_creases(crease_ids, cx)
-                        .into_iter()
-                        .map(|(_, range)| range)
-                        .collect::<Vec<_>>();
-                    editor.unfold_ranges(&ranges, false, false, cx);
-                    editor.edit(ranges.into_iter().zip(replacement_texts), cx);
-                    cx.notify();
-                }
-            },
-        ))
-    }
-
-    pub fn into_inner(self) -> HashMap<AgentContextKey, Vec<(CreaseId, SharedString)>> {
-        self.creases
-    }
-}
-
 pub fn extract_message_creases(
    editor: &mut Editor,
    cx: &mut Context<'_, Editor>,
@@ -1562,9 +1497,8 @@ pub fn extract_message_creases(
                let context = contexts_by_crease_id.remove(&id);
                MessageCrease {
                    range,
+                    metadata,
                    context,
-                    label: metadata.label,
-                    icon_path: metadata.icon_path,
                }
            })
            .collect()
@@ -1636,8 +1570,8 @@ pub fn insert_message_creases(
            let start = buffer_snapshot.anchor_after(crease.range.start);
            let end = buffer_snapshot.anchor_before(crease.range.end);
            crease_for_mention(
-                crease.label.clone(),
-                crease.icon_path.clone(),
+                crease.metadata.label.clone(),
+                crease.metadata.icon_path.clone(),
                start..end,
                cx.weak_entity(),
            )
@@ -1649,7 +1583,12 @@ pub fn insert_message_creases(
        for (crease, id) in message_creases.iter().zip(ids) {
            if let Some(context) = crease.context.as_ref() {
                let key = AgentContextKey(context.clone());
-                addon.add_creases(context_store, key, vec![(id, crease.label.clone())], cx);
+                addon.add_creases(
+                    context_store,
+                    key,
+                    vec![(id, crease.metadata.label.clone())],
+                    cx,
+                );
            }
        }
    }
--- a/crates/agent_ui/src/profile_selector.rs
+++ b/crates/agent_ui/src/profile_selector.rs
@@ -1,19 +1,20 @@
-use crate::{ManageProfiles, ToggleProfileSelector};
-use agent::{
-    Thread,
-    agent_profile::{AgentProfile, AvailableProfiles},
-};
+use std::sync::Arc;
+
 use agent_settings::{AgentDockPosition, AgentProfileId, AgentSettings, builtin_profiles};
 use fs::Fs;
 use gpui::{Action, Empty, Entity, FocusHandle, Subscription, prelude::*};
 use language_model::LanguageModelRegistry;
 use settings::{Settings as _, SettingsStore, update_settings_file};
-use std::sync::Arc;
 use ui::{
    ContextMenu, ContextMenuEntry, DocumentationSide, PopoverMenu, PopoverMenuHandle, Tooltip,
    prelude::*,
 };

+use crate::{
+    ManageProfiles, Thread, ToggleProfileSelector,
+    agent_profile::{AgentProfile, AvailableProfiles},
+};
+
 pub struct ProfileSelector {
    profiles: AvailableProfiles,
    fs: Arc<dyn Fs>,
@@ -156,7 +157,7 @@ impl Render for ProfileSelector {
            .map(|profile| profile.name.clone())
            .unwrap_or_else(|| "Unknown".into());

-        let configured_model = self.thread.read(cx).model().or_else(|| {
+        let configured_model = self.thread.read(cx).configured_model().or_else(|| {
            let model_registry = LanguageModelRegistry::read_global(cx);
            model_registry.default_model()
        });
--- a/crates/agent_ui/src/slash_command_settings.rs
+++ b/crates/agent_ui/src/slash_command_settings.rs
--- a/crates/agent_ui/src/terminal_codegen.rs
+++ b/crates/agent_ui/src/terminal_codegen.rs
--- a/crates/agent_ui/src/terminal_inline_assistant.rs
+++ b/crates/agent_ui/src/terminal_inline_assistant.rs
@@ -1,12 +1,10 @@
+use crate::context::load_context;
+use crate::context_store::ContextStore;
 use crate::inline_prompt_editor::{
    CodegenStatus, PromptEditor, PromptEditorEvent, TerminalInlineAssistId,
 };
 use crate::terminal_codegen::{CLEAR_INPUT, CodegenEvent, TerminalCodegen};
-use agent::{
-    context::load_context,
-    context_store::ContextStore,
-    thread_store::{TextThreadStore, ThreadStore},
-};
+use crate::thread_store::{TextThreadStore, ThreadStore};
 use agent_settings::AgentSettings;
 use anyhow::{Context as _, Result};
 use client::telemetry::Telemetry;
--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
--- a/crates/agent_ui/src/thread_history.rs
+++ b/crates/agent_ui/src/thread_history.rs
@@ -1,5 +1,7 @@
-use crate::{AgentPanel, RemoveSelectedThread};
-use agent::history_store::{HistoryEntry, HistoryStore};
+use std::fmt::Display;
+use std::ops::Range;
+use std::sync::Arc;
+
 use chrono::{Datelike as _, Local, NaiveDate, TimeDelta};
 use editor::{Editor, EditorEvent};
 use fuzzy::{StringMatch, StringMatchCandidate};
@@ -7,7 +9,6 @@ use gpui::{
    App, ClickEvent, Empty, Entity, FocusHandle, Focusable, ScrollStrategy, Stateful, Task,
    UniformListScrollHandle, WeakEntity, Window, uniform_list,
 };
-use std::{fmt::Display, ops::Range, sync::Arc};
 use time::{OffsetDateTime, UtcOffset};
 use ui::{
    HighlightedLabel, IconButtonShape, ListItem, ListItemSpacing, Scrollbar, ScrollbarState,
@@ -15,6 +16,9 @@ use ui::{
 };
 use util::ResultExt;

+use crate::history_store::{HistoryEntry, HistoryStore};
+use crate::{AgentPanel, RemoveSelectedThread};
+
 pub struct ThreadHistory {
    agent_panel: WeakEntity<AgentPanel>,
    history_store: Entity<HistoryStore>,
--- a/crates/agent/src/thread_store.rs
+++ b/crates/agent/src/thread_store.rs
@@ -1,24 +1,22 @@
-use crate::{
-    MessageId, ThreadId,
-    context_server_tool::ContextServerTool,
-    thread::{DetailedSummaryState, ExceededWindowError, ProjectSnapshot, Thread},
-};
+use std::cell::{Ref, RefCell};
+use std::path::{Path, PathBuf};
+use std::rc::Rc;
+use std::sync::{Arc, Mutex};
+
 use agent_settings::{AgentProfileId, CompletionMode};
 use anyhow::{Context as _, Result, anyhow};
 use assistant_tool::{ToolId, ToolWorkingSet};
 use chrono::{DateTime, Utc};
 use collections::HashMap;
 use context_server::ContextServerId;
-use futures::{
-    FutureExt as _, StreamExt as _,
-    channel::{mpsc, oneshot},
-    future::{self, BoxFuture, Shared},
-};
+use futures::channel::{mpsc, oneshot};
+use futures::future::{self, BoxFuture, Shared};
+use futures::{FutureExt as _, StreamExt as _};
 use gpui::{
    App, BackgroundExecutor, Context, Entity, EventEmitter, Global, ReadGlobal, SharedString,
-    Subscription, Task, Window, prelude::*,
+    Subscription, Task, prelude::*,
 };
-use indoc::indoc;
+
 use language_model::{LanguageModelToolResultContent, LanguageModelToolUseId, Role, TokenUsage};
 use project::context_server_store::{ContextServerStatus, ContextServerStore};
 use project::{Project, ProjectItem, ProjectPath, Worktree};
@@ -27,18 +25,19 @@ use prompt_store::{
    UserRulesContext, WorktreeContext,
 };
 use serde::{Deserialize, Serialize};
+use ui::Window;
+use util::ResultExt as _;
+
+use crate::context_server_tool::ContextServerTool;
+use crate::thread::{
+    DetailedSummaryState, ExceededWindowError, MessageId, ProjectSnapshot, Thread, ThreadId,
+};
+use indoc::indoc;
 use sqlez::{
    bindable::{Bind, Column},
    connection::Connection,
    statement::Statement,
 };
-use std::{
-    cell::{Ref, RefCell},
-    path::{Path, PathBuf},
-    rc::Rc,
-    sync::{Arc, Mutex},
-};
-use util::ResultExt as _;

 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub enum DataType {
@@ -70,7 +69,7 @@ impl Column for DataType {
    }
 }

-const RULES_FILE_NAMES: [&'static str; 9] = [
+const RULES_FILE_NAMES: [&'static str; 8] = [
    ".rules",
    ".cursorrules",
    ".windsurfrules",
@@ -79,7 +78,6 @@ const RULES_FILE_NAMES: [&'static str; 9] = [
    "CLAUDE.md",
    "AGENT.md",
    "AGENTS.md",
-    "GEMINI.md",
 ];

 pub fn init(cx: &mut App) {
@@ -96,7 +94,7 @@ impl SharedProjectContext {
    }
 }

-pub type TextThreadStore = assistant_context::ContextStore;
+pub type TextThreadStore = assistant_context_editor::ContextStore;

 pub struct ThreadStore {
    project: Entity<Project>,
@@ -399,17 +397,35 @@ impl ThreadStore {
        self.threads.iter()
    }

-    pub fn create_thread(&mut self, cx: &mut Context<Self>) -> Task<Result<Entity<Thread>>> {
-        todo!()
-        // cx.new(|cx| {
-        //     Thread::new(
-        //         self.project.clone(),
-        //         self.tools.clone(),
-        //         self.prompt_builder.clone(),
-        //         self.project_context.clone(),
-        //         cx,
-        //     )
-        // })
+    pub fn create_thread(&mut self, cx: &mut Context<Self>) -> Entity<Thread> {
+        cx.new(|cx| {
+            Thread::new(
+                self.project.clone(),
+                self.tools.clone(),
+                self.prompt_builder.clone(),
+                self.project_context.clone(),
+                cx,
+            )
+        })
+    }
+
+    pub fn create_thread_from_serialized(
+        &mut self,
+        serialized: SerializedThread,
+        cx: &mut Context<Self>,
+    ) -> Entity<Thread> {
+        cx.new(|cx| {
+            Thread::deserialize(
+                ThreadId::new(),
+                serialized,
+                self.project.clone(),
+                self.tools.clone(),
+                self.prompt_builder.clone(),
+                self.project_context.clone(),
+                None,
+                cx,
+            )
+        })
    }

    pub fn open_thread(
@@ -428,53 +444,51 @@ impl ThreadStore {
                .await?
                .with_context(|| format!("no thread found with ID: {id:?}"))?;

-            todo!();
-            // let thread = this.update_in(cx, |this, window, cx| {
-            //     cx.new(|cx| {
-            //         Thread::deserialize(
-            //             id.clone(),
-            //             thread,
-            //             this.project.clone(),
-            //             this.tools.clone(),
-            //             this.prompt_builder.clone(),
-            //             this.project_context.clone(),
-            //             Some(window),
-            //             cx,
-            //         )
-            //     })
-            // })?;
-            // Ok(thread)
+            let thread = this.update_in(cx, |this, window, cx| {
+                cx.new(|cx| {
+                    Thread::deserialize(
+                        id.clone(),
+                        thread,
+                        this.project.clone(),
+                        this.tools.clone(),
+                        this.prompt_builder.clone(),
+                        this.project_context.clone(),
+                        Some(window),
+                        cx,
+                    )
+                })
+            })?;
+
+            Ok(thread)
        })
    }

    pub fn save_thread(&self, thread: &Entity<Thread>, cx: &mut Context<Self>) -> Task<Result<()>> {
-        todo!()
-        // let (metadata, serialized_thread) =
-        //     thread.update(cx, |thread, cx| (thread.id().clone(), thread.serialize(cx)));
+        let (metadata, serialized_thread) =
+            thread.update(cx, |thread, cx| (thread.id().clone(), thread.serialize(cx)));

-        // let database_future = ThreadsDatabase::global_future(cx);
-        // cx.spawn(async move |this, cx| {
-        //     let serialized_thread = serialized_thread.await?;
-        //     let database = database_future.await.map_err(|err| anyhow!(err))?;
-        //     database.save_thread(metadata, serialized_thread).await?;
+        let database_future = ThreadsDatabase::global_future(cx);
+        cx.spawn(async move |this, cx| {
+            let serialized_thread = serialized_thread.await?;
+            let database = database_future.await.map_err(|err| anyhow!(err))?;
+            database.save_thread(metadata, serialized_thread).await?;

-        //     this.update(cx, |this, cx| this.reload(cx))?.await
-        // })
+            this.update(cx, |this, cx| this.reload(cx))?.await
+        })
    }

    pub fn delete_thread(&mut self, id: &ThreadId, cx: &mut Context<Self>) -> Task<Result<()>> {
-        todo!()
-        // let id = id.clone();
-        // let database_future = ThreadsDatabase::global_future(cx);
-        // cx.spawn(async move |this, cx| {
-        //     let database = database_future.await.map_err(|err| anyhow!(err))?;
-        //     database.delete_thread(id.clone()).await?;
+        let id = id.clone();
+        let database_future = ThreadsDatabase::global_future(cx);
+        cx.spawn(async move |this, cx| {
+            let database = database_future.await.map_err(|err| anyhow!(err))?;
+            database.delete_thread(id.clone()).await?;

-        //     this.update(cx, |this, cx| {
-        //         this.threads.retain(|thread| thread.id != id);
-        //         cx.notify();
-        //     })
-        // })
+            this.update(cx, |this, cx| {
+                this.threads.retain(|thread| thread.id != id);
+                cx.notify();
+            })
+        })
    }

    pub fn reload(&self, cx: &mut Context<Self>) -> Task<Result<()>> {
@@ -1050,7 +1064,7 @@ impl ThreadsDatabase {
 #[cfg(test)]
 mod tests {
    use super::*;
-    use crate::{MessageId, thread::DetailedSummaryState};
+    use crate::thread::{DetailedSummaryState, MessageId};
    use chrono::Utc;
    use language_model::{Role, TokenUsage};
    use pretty_assertions::assert_eq;
--- a/crates/agent_ui/src/tool_compatibility.rs
+++ b/crates/agent_ui/src/tool_compatibility.rs
@@ -1,11 +1,13 @@
-use agent::{Thread, ThreadEvent};
+use std::sync::Arc;
+
 use assistant_tool::{Tool, ToolSource};
 use collections::HashMap;
 use gpui::{App, Context, Entity, IntoElement, Render, Subscription, Window};
 use language_model::{LanguageModel, LanguageModelToolSchemaFormat};
-use std::sync::Arc;
 use ui::prelude::*;

+use crate::{Thread, ThreadEvent};
+
 pub struct IncompatibleToolsState {
    cache: HashMap<LanguageModelToolSchemaFormat, Vec<Arc<dyn Tool>>>,
    thread: Entity<Thread>,
--- a/crates/agent/src/tool_use.rs
+++ b/crates/agent/src/tool_use.rs
@@ -0,0 +1,568 @@
+use std::sync::Arc;
+
+use anyhow::Result;
+use assistant_tool::{
+    AnyToolCard, Tool, ToolResultContent, ToolResultOutput, ToolUseStatus, ToolWorkingSet,
+};
+use collections::HashMap;
+use futures::FutureExt as _;
+use futures::future::Shared;
+use gpui::{App, Entity, SharedString, Task};
+use language_model::{
+    ConfiguredModel, LanguageModel, LanguageModelRequest, LanguageModelToolResult,
+    LanguageModelToolResultContent, LanguageModelToolUse, LanguageModelToolUseId, Role,
+};
+use project::Project;
+use ui::{IconName, Window};
+use util::truncate_lines_to_byte_limit;
+
+use crate::thread::{MessageId, PromptId, ThreadId};
+use crate::thread_store::SerializedMessage;
+
+#[derive(Debug)]
+pub struct ToolUse {
+    pub id: LanguageModelToolUseId,
+    pub name: SharedString,
+    pub ui_text: SharedString,
+    pub status: ToolUseStatus,
+    pub input: serde_json::Value,
+    pub icon: ui::IconName,
+    pub needs_confirmation: bool,
+}
+
+pub struct ToolUseState {
+    tools: Entity<ToolWorkingSet>,
+    tool_uses_by_assistant_message: HashMap<MessageId, Vec<LanguageModelToolUse>>,
+    tool_results: HashMap<LanguageModelToolUseId, LanguageModelToolResult>,
+    pending_tool_uses_by_id: HashMap<LanguageModelToolUseId, PendingToolUse>,
+    tool_result_cards: HashMap<LanguageModelToolUseId, AnyToolCard>,
+    tool_use_metadata_by_id: HashMap<LanguageModelToolUseId, ToolUseMetadata>,
+}
+
+impl ToolUseState {
+    pub fn new(tools: Entity<ToolWorkingSet>) -> Self {
+        Self {
+            tools,
+            tool_uses_by_assistant_message: HashMap::default(),
+            tool_results: HashMap::default(),
+            pending_tool_uses_by_id: HashMap::default(),
+            tool_result_cards: HashMap::default(),
+            tool_use_metadata_by_id: HashMap::default(),
+        }
+    }
+
+    /// Constructs a [`ToolUseState`] from the given list of [`SerializedMessage`]s.
+    ///
+    /// Accepts a function to filter the tools that should be used to populate the state.
+    ///
+    /// If `window` is `None` (e.g., when in headless mode or when running evals),
+    /// tool cards won't be deserialized
+    pub fn from_serialized_messages(
+        tools: Entity<ToolWorkingSet>,
+        messages: &[SerializedMessage],
+        project: Entity<Project>,
+        window: Option<&mut Window>, // None in headless mode
+        cx: &mut App,
+    ) -> Self {
+        let mut this = Self::new(tools);
+        let mut tool_names_by_id = HashMap::default();
+        let mut window = window;
+
+        for message in messages {
+            match message.role {
+                Role::Assistant => {
+                    if !message.tool_uses.is_empty() {
+                        let tool_uses = message
+                            .tool_uses
+                            .iter()
+                            .map(|tool_use| LanguageModelToolUse {
+                                id: tool_use.id.clone(),
+                                name: tool_use.name.clone().into(),
+                                raw_input: tool_use.input.to_string(),
+                                input: tool_use.input.clone(),
+                                is_input_complete: true,
+                            })
+                            .collect::<Vec<_>>();
+
+                        tool_names_by_id.extend(
+                            tool_uses
+                                .iter()
+                                .map(|tool_use| (tool_use.id.clone(), tool_use.name.clone())),
+                        );
+
+                        this.tool_uses_by_assistant_message
+                            .insert(message.id, tool_uses);
+
+                        for tool_result in &message.tool_results {
+                            let tool_use_id = tool_result.tool_use_id.clone();
+                            let Some(tool_use) = tool_names_by_id.get(&tool_use_id) else {
+                                log::warn!("no tool name found for tool use: {tool_use_id:?}");
+                                continue;
+                            };
+
+                            this.tool_results.insert(
+                                tool_use_id.clone(),
+                                LanguageModelToolResult {
+                                    tool_use_id: tool_use_id.clone(),
+                                    tool_name: tool_use.clone(),
+                                    is_error: tool_result.is_error,
+                                    content: tool_result.content.clone(),
+                                    output: tool_result.output.clone(),
+                                },
+                            );
+
+                            if let Some(window) = &mut window {
+                                if let Some(tool) = this.tools.read(cx).tool(tool_use, cx) {
+                                    if let Some(output) = tool_result.output.clone() {
+                                        if let Some(card) = tool.deserialize_card(
+                                            output,
+                                            project.clone(),
+                                            window,
+                                            cx,
+                                        ) {
+                                            this.tool_result_cards.insert(tool_use_id, card);
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+                Role::System | Role::User => {}
+            }
+        }
+
+        this
+    }
+
+    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,
+                        output: None,
+                        is_error: true,
+                    },
+                );
+                cancelled_tool_uses.push(tool_use.clone());
+                false
+            });
+        cancelled_tool_uses
+    }
+
+    pub fn pending_tool_uses(&self) -> Vec<&PendingToolUse> {
+        self.pending_tool_uses_by_id.values().collect()
+    }
+
+    pub fn tool_uses_for_message(&self, id: MessageId, cx: &App) -> Vec<ToolUse> {
+        let Some(tool_uses_for_message) = &self.tool_uses_by_assistant_message.get(&id) else {
+            return Vec::new();
+        };
+
+        let mut tool_uses = Vec::new();
+
+        for tool_use in tool_uses_for_message.iter() {
+            let tool_result = self.tool_results.get(&tool_use.id);
+
+            let status = (|| {
+                if let Some(tool_result) = tool_result {
+                    let content = tool_result
+                        .content
+                        .to_str()
+                        .map(|str| str.to_owned().into())
+                        .unwrap_or_default();
+
+                    return if tool_result.is_error {
+                        ToolUseStatus::Error(content)
+                    } else {
+                        ToolUseStatus::Finished(content)
+                    };
+                }
+
+                if let Some(pending_tool_use) = self.pending_tool_uses_by_id.get(&tool_use.id) {
+                    match pending_tool_use.status {
+                        PendingToolUseStatus::Idle => ToolUseStatus::Pending,
+                        PendingToolUseStatus::NeedsConfirmation { .. } => {
+                            ToolUseStatus::NeedsConfirmation
+                        }
+                        PendingToolUseStatus::Running { .. } => ToolUseStatus::Running,
+                        PendingToolUseStatus::Error(ref err) => {
+                            ToolUseStatus::Error(err.clone().into())
+                        }
+                        PendingToolUseStatus::InputStillStreaming => {
+                            ToolUseStatus::InputStillStreaming
+                        }
+                    }
+                } else {
+                    ToolUseStatus::Pending
+                }
+            })();
+
+            let (icon, needs_confirmation) =
+                if let Some(tool) = self.tools.read(cx).tool(&tool_use.name, cx) {
+                    (tool.icon(), tool.needs_confirmation(&tool_use.input, cx))
+                } else {
+                    (IconName::Cog, false)
+                };
+
+            tool_uses.push(ToolUse {
+                id: tool_use.id.clone(),
+                name: tool_use.name.clone().into(),
+                ui_text: self.tool_ui_label(
+                    &tool_use.name,
+                    &tool_use.input,
+                    tool_use.is_input_complete,
+                    cx,
+                ),
+                input: tool_use.input.clone(),
+                status,
+                icon,
+                needs_confirmation,
+            })
+        }
+
+        tool_uses
+    }
+
+    pub fn tool_ui_label(
+        &self,
+        tool_name: &str,
+        input: &serde_json::Value,
+        is_input_complete: bool,
+        cx: &App,
+    ) -> SharedString {
+        if let Some(tool) = self.tools.read(cx).tool(tool_name, cx) {
+            if is_input_complete {
+                tool.ui_text(input).into()
+            } else {
+                tool.still_streaming_ui_text(input).into()
+            }
+        } else {
+            format!("Unknown tool {tool_name:?}").into()
+        }
+    }
+
+    pub fn tool_results_for_message(
+        &self,
+        assistant_message_id: MessageId,
+    ) -> Vec<&LanguageModelToolResult> {
+        let Some(tool_uses) = self
+            .tool_uses_by_assistant_message
+            .get(&assistant_message_id)
+        else {
+            return Vec::new();
+        };
+
+        tool_uses
+            .iter()
+            .filter_map(|tool_use| self.tool_results.get(&tool_use.id))
+            .collect()
+    }
+
+    pub fn message_has_tool_results(&self, assistant_message_id: MessageId) -> bool {
+        self.tool_uses_by_assistant_message
+            .get(&assistant_message_id)
+            .map_or(false, |results| !results.is_empty())
+    }
+
+    pub fn tool_result(
+        &self,
+        tool_use_id: &LanguageModelToolUseId,
+    ) -> Option<&LanguageModelToolResult> {
+        self.tool_results.get(tool_use_id)
+    }
+
+    pub fn tool_result_card(&self, tool_use_id: &LanguageModelToolUseId) -> Option<&AnyToolCard> {
+        self.tool_result_cards.get(tool_use_id)
+    }
+
+    pub fn insert_tool_result_card(
+        &mut self,
+        tool_use_id: LanguageModelToolUseId,
+        card: AnyToolCard,
+    ) {
+        self.tool_result_cards.insert(tool_use_id, card);
+    }
+
+    pub fn request_tool_use(
+        &mut self,
+        assistant_message_id: MessageId,
+        tool_use: LanguageModelToolUse,
+        metadata: ToolUseMetadata,
+        cx: &App,
+    ) -> Arc<str> {
+        let tool_uses = self
+            .tool_uses_by_assistant_message
+            .entry(assistant_message_id)
+            .or_default();
+
+        let mut existing_tool_use_found = false;
+
+        for existing_tool_use in tool_uses.iter_mut() {
+            if existing_tool_use.id == tool_use.id {
+                *existing_tool_use = tool_use.clone();
+                existing_tool_use_found = true;
+            }
+        }
+
+        if !existing_tool_use_found {
+            tool_uses.push(tool_use.clone());
+        }
+
+        let status = if tool_use.is_input_complete {
+            self.tool_use_metadata_by_id
+                .insert(tool_use.id.clone(), metadata);
+
+            PendingToolUseStatus::Idle
+        } else {
+            PendingToolUseStatus::InputStillStreaming
+        };
+
+        let ui_text: Arc<str> = self
+            .tool_ui_label(
+                &tool_use.name,
+                &tool_use.input,
+                tool_use.is_input_complete,
+                cx,
+            )
+            .into();
+
+        let may_perform_edits = self
+            .tools
+            .read(cx)
+            .tool(&tool_use.name, cx)
+            .is_some_and(|tool| tool.may_perform_edits());
+
+        self.pending_tool_uses_by_id.insert(
+            tool_use.id.clone(),
+            PendingToolUse {
+                assistant_message_id,
+                id: tool_use.id,
+                name: tool_use.name.clone(),
+                ui_text: ui_text.clone(),
+                input: tool_use.input,
+                may_perform_edits,
+                status,
+            },
+        );
+
+        ui_text
+    }
+
+    pub fn run_pending_tool(
+        &mut self,
+        tool_use_id: LanguageModelToolUseId,
+        ui_text: SharedString,
+        task: Task<()>,
+    ) {
+        if let Some(tool_use) = self.pending_tool_uses_by_id.get_mut(&tool_use_id) {
+            tool_use.ui_text = ui_text.into();
+            tool_use.status = PendingToolUseStatus::Running {
+                _task: task.shared(),
+            };
+        }
+    }
+
+    pub fn confirm_tool_use(
+        &mut self,
+        tool_use_id: LanguageModelToolUseId,
+        ui_text: impl Into<Arc<str>>,
+        input: serde_json::Value,
+        request: Arc<LanguageModelRequest>,
+        tool: Arc<dyn Tool>,
+    ) {
+        if let Some(tool_use) = self.pending_tool_uses_by_id.get_mut(&tool_use_id) {
+            let ui_text = ui_text.into();
+            tool_use.ui_text = ui_text.clone();
+            let confirmation = Confirmation {
+                tool_use_id,
+                input,
+                request,
+                tool,
+                ui_text,
+            };
+            tool_use.status = PendingToolUseStatus::NeedsConfirmation(Arc::new(confirmation));
+        }
+    }
+
+    pub fn insert_tool_output(
+        &mut self,
+        tool_use_id: LanguageModelToolUseId,
+        tool_name: Arc<str>,
+        output: Result<ToolResultOutput>,
+        configured_model: Option<&ConfiguredModel>,
+    ) -> Option<PendingToolUse> {
+        let metadata = self.tool_use_metadata_by_id.remove(&tool_use_id);
+
+        telemetry::event!(
+            "Agent Tool Finished",
+            model = metadata
+                .as_ref()
+                .map(|metadata| metadata.model.telemetry_id()),
+            model_provider = metadata
+                .as_ref()
+                .map(|metadata| metadata.model.provider_id().to_string()),
+            thread_id = metadata.as_ref().map(|metadata| metadata.thread_id.clone()),
+            prompt_id = metadata.as_ref().map(|metadata| metadata.prompt_id.clone()),
+            tool_name,
+            success = output.is_ok()
+        );
+
+        match output {
+            Ok(output) => {
+                let tool_result = output.content;
+                const BYTES_PER_TOKEN_ESTIMATE: usize = 3;
+
+                let old_use = self.pending_tool_uses_by_id.remove(&tool_use_id);
+
+                // Protect from overly large output
+                let tool_output_limit = configured_model
+                    .map(|model| model.model.max_token_count() as usize * BYTES_PER_TOKEN_ESTIMATE)
+                    .unwrap_or(usize::MAX);
+
+                let content = match tool_result {
+                    ToolResultContent::Text(text) => {
+                        let text = if text.len() < tool_output_limit {
+                            text
+                        } else {
+                            let truncated = truncate_lines_to_byte_limit(&text, tool_output_limit);
+                            format!(
+                                "Tool result too long. The first {} bytes:\n\n{}",
+                                truncated.len(),
+                                truncated
+                            )
+                        };
+                        LanguageModelToolResultContent::Text(text.into())
+                    }
+                    ToolResultContent::Image(language_model_image) => {
+                        if language_model_image.estimate_tokens() < tool_output_limit {
+                            LanguageModelToolResultContent::Image(language_model_image)
+                        } else {
+                            self.tool_results.insert(
+                                tool_use_id.clone(),
+                                LanguageModelToolResult {
+                                    tool_use_id: tool_use_id.clone(),
+                                    tool_name,
+                                    content: "Tool responded with an image that would exceeded the remaining tokens".into(),
+                                    is_error: true,
+                                    output: None,
+                                },
+                            );
+
+                            return old_use;
+                        }
+                    }
+                };
+
+                self.tool_results.insert(
+                    tool_use_id.clone(),
+                    LanguageModelToolResult {
+                        tool_use_id: tool_use_id.clone(),
+                        tool_name,
+                        content,
+                        is_error: false,
+                        output: output.output,
+                    },
+                );
+
+                old_use
+            }
+            Err(err) => {
+                self.tool_results.insert(
+                    tool_use_id.clone(),
+                    LanguageModelToolResult {
+                        tool_use_id: tool_use_id.clone(),
+                        tool_name,
+                        content: LanguageModelToolResultContent::Text(err.to_string().into()),
+                        is_error: true,
+                        output: None,
+                    },
+                );
+
+                if let Some(tool_use) = self.pending_tool_uses_by_id.get_mut(&tool_use_id) {
+                    tool_use.status = PendingToolUseStatus::Error(err.to_string().into());
+                }
+
+                self.pending_tool_uses_by_id.get(&tool_use_id).cloned()
+            }
+        }
+    }
+
+    pub fn has_tool_results(&self, assistant_message_id: MessageId) -> bool {
+        self.tool_uses_by_assistant_message
+            .contains_key(&assistant_message_id)
+    }
+
+    pub fn tool_results(
+        &self,
+        assistant_message_id: MessageId,
+    ) -> impl Iterator<Item = (&LanguageModelToolUse, Option<&LanguageModelToolResult>)> {
+        self.tool_uses_by_assistant_message
+            .get(&assistant_message_id)
+            .into_iter()
+            .flatten()
+            .map(|tool_use| (tool_use, self.tool_results.get(&tool_use.id)))
+    }
+}
+
+#[derive(Debug, Clone)]
+pub struct PendingToolUse {
+    pub id: LanguageModelToolUseId,
+    /// The ID of the Assistant message in which the tool use was requested.
+    #[allow(unused)]
+    pub assistant_message_id: MessageId,
+    pub name: Arc<str>,
+    pub ui_text: Arc<str>,
+    pub input: serde_json::Value,
+    pub status: PendingToolUseStatus,
+    pub may_perform_edits: bool,
+}
+
+#[derive(Debug, Clone)]
+pub struct Confirmation {
+    pub tool_use_id: LanguageModelToolUseId,
+    pub input: serde_json::Value,
+    pub ui_text: Arc<str>,
+    pub request: Arc<LanguageModelRequest>,
+    pub tool: Arc<dyn Tool>,
+}
+
+#[derive(Debug, Clone)]
+pub enum PendingToolUseStatus {
+    InputStillStreaming,
+    Idle,
+    NeedsConfirmation(Arc<Confirmation>),
+    Running { _task: Shared<Task<()>> },
+    Error(#[allow(unused)] Arc<str>),
+}
+
+impl PendingToolUseStatus {
+    pub fn is_idle(&self) -> bool {
+        matches!(self, PendingToolUseStatus::Idle)
+    }
+
+    pub fn is_error(&self) -> bool {
+        matches!(self, PendingToolUseStatus::Error(_))
+    }
+
+    pub fn needs_confirmation(&self) -> bool {
+        matches!(self, PendingToolUseStatus::NeedsConfirmation { .. })
+    }
+}
+
+#[derive(Clone)]
+pub struct ToolUseMetadata {
+    pub model: Arc<dyn LanguageModel>,
+    pub thread_id: ThreadId,
+    pub prompt_id: PromptId,
+}
--- a/crates/agent_ui/src/ui.rs
+++ b/crates/agent_ui/src/ui.rs
@@ -1,13 +1,13 @@
 mod agent_notification;
 mod animated_label;
-mod burn_mode_tooltip;
 mod context_pill;
+mod max_mode_tooltip;
 mod onboarding_modal;
 pub mod preview;
 mod upsell;

 pub use agent_notification::*;
 pub use animated_label::*;
-pub use burn_mode_tooltip::*;
 pub use context_pill::*;
+pub use max_mode_tooltip::*;
 pub use onboarding_modal::*;
--- a/crates/agent_ui/src/ui/agent_notification.rs
+++ b/crates/agent_ui/src/ui/agent_notification.rs
--- a/crates/agent_ui/src/ui/animated_label.rs
+++ b/crates/agent_ui/src/ui/animated_label.rs
--- a/crates/agent_ui/src/ui/context_pill.rs
+++ b/crates/agent_ui/src/ui/context_pill.rs
@@ -12,7 +12,7 @@ use prompt_store::PromptStore;
 use rope::Point;
 use ui::{IconButtonShape, Tooltip, prelude::*, tooltip_container};

-use agent::context::{
+use crate::context::{
    AgentContext, AgentContextHandle, ContextId, ContextKind, DirectoryContext,
    DirectoryContextHandle, FetchedUrlContext, FileContext, FileContextHandle, ImageContext,
    ImageStatus, RulesContext, RulesContextHandle, SelectionContext, SelectionContextHandle,
@@ -498,7 +498,7 @@ impl AddedContext {
            render_hover: {
                let thread = handle.thread.clone();
                Some(Rc::new(move |_, cx| {
-                    let text = thread.read(cx).latest_detailed_summary_or_text(cx);
+                    let text = thread.read(cx).latest_detailed_summary_or_text();
                    ContextPillHover::new_text(text.clone(), cx).into()
                }))
            },
--- a/crates/agent_ui/src/ui/burn_mode_tooltip.rs
+++ b/crates/agent_ui/src/ui/burn_mode_tooltip.rs
--- a/crates/agent_ui/src/ui/onboarding_modal.rs
+++ b/crates/agent_ui/src/ui/onboarding_modal.rs
--- a/crates/agent_ui/src/ui/preview.rs
+++ b/crates/agent_ui/src/ui/preview.rs
--- a/crates/agent_ui/src/ui/preview/agent_preview.rs
+++ b/crates/agent_ui/src/ui/preview/agent_preview.rs
--- a/crates/agent_ui/src/ui/preview/usage_callouts.rs
+++ b/crates/agent_ui/src/ui/preview/usage_callouts.rs
@@ -1,17 +1,18 @@
-use client::{ModelRequestUsage, RequestUsage, zed_urls};
+use client::zed_urls;
 use component::{empty_example, example_group_with_title, single_example};
 use gpui::{AnyElement, App, IntoElement, RenderOnce, Window};
+use language_model::RequestUsage;
 use ui::{Callout, prelude::*};
 use zed_llm_client::{Plan, UsageLimit};

 #[derive(IntoElement, RegisterComponent)]
 pub struct UsageCallout {
    plan: Plan,
-    usage: ModelRequestUsage,
+    usage: RequestUsage,
 }

 impl UsageCallout {
-    pub fn new(plan: Plan, usage: ModelRequestUsage) -> Self {
+    pub fn new(plan: Plan, usage: RequestUsage) -> Self {
        Self { plan, usage }
    }
 }
@@ -127,10 +128,10 @@ impl Component for UsageCallout {
                    "Approaching limit (90%)",
                    UsageCallout::new(
                        Plan::ZedFree,
-                        ModelRequestUsage(RequestUsage {
+                        RequestUsage {
                            limit: UsageLimit::Limited(50),
                            amount: 45, // 90% of limit
-                        }),
+                        },
                    )
                    .into_any_element(),
                ),
@@ -138,10 +139,10 @@ impl Component for UsageCallout {
                    "Limit reached (100%)",
                    UsageCallout::new(
                        Plan::ZedFree,
-                        ModelRequestUsage(RequestUsage {
+                        RequestUsage {
                            limit: UsageLimit::Limited(50),
                            amount: 50, // 100% of limit
-                        }),
+                        },
                    )
                    .into_any_element(),
                ),
@@ -155,10 +156,10 @@ impl Component for UsageCallout {
                    "Approaching limit (90%)",
                    UsageCallout::new(
                        Plan::ZedProTrial,
-                        ModelRequestUsage(RequestUsage {
+                        RequestUsage {
                            limit: UsageLimit::Limited(150),
                            amount: 135, // 90% of limit
-                        }),
+                        },
                    )
                    .into_any_element(),
                ),
@@ -166,10 +167,10 @@ impl Component for UsageCallout {
                    "Limit reached (100%)",
                    UsageCallout::new(
                        Plan::ZedProTrial,
-                        ModelRequestUsage(RequestUsage {
+                        RequestUsage {
                            limit: UsageLimit::Limited(150),
                            amount: 150, // 100% of limit
-                        }),
+                        },
                    )
                    .into_any_element(),
                ),
@@ -183,10 +184,10 @@ impl Component for UsageCallout {
                    "Limit reached (100%)",
                    UsageCallout::new(
                        Plan::ZedPro,
-                        ModelRequestUsage(RequestUsage {
+                        RequestUsage {
                            limit: UsageLimit::Limited(500),
                            amount: 500, // 100% of limit
-                        }),
+                        },
                    )
                    .into_any_element(),
                ),
--- a/crates/agent_ui/src/ui/upsell.rs
+++ b/crates/agent_ui/src/ui/upsell.rs
--- a/crates/agent/src/zed_agent.rs
+++ b/crates/agent/src/zed_agent.rs
@@ -1 +0,0 @@
-pub struct ZedAgentThread {}
--- a/crates/agent_settings/Cargo.toml
+++ b/crates/agent_settings/Cargo.toml
@@ -12,10 +12,17 @@ workspace = true
 path = "src/agent_settings.rs"

 [dependencies]
+anthropic = { workspace = true, features = ["schemars"] }
 anyhow.workspace = true
 collections.workspace = true
 gpui.workspace = true
 language_model.workspace = true
+lmstudio = { workspace = true, features = ["schemars"] }
+log.workspace = true
+ollama = { workspace = true, features = ["schemars"] }
+open_ai = { workspace = true, features = ["schemars"] }
+deepseek = { workspace = true, features = ["schemars"] }
+mistral = { workspace = true, features = ["schemars"] }
 schemars.workspace = true
 serde.workspace = true
 settings.workspace = true
--- a/crates/agent_settings/src/agent_settings.rs
+++ b/crates/agent_settings/src/agent_settings.rs
@@ -2,10 +2,16 @@ mod agent_profile;

 use std::sync::Arc;

+use ::open_ai::Model as OpenAiModel;
+use anthropic::Model as AnthropicModel;
 use anyhow::{Result, bail};
 use collections::IndexMap;
+use deepseek::Model as DeepseekModel;
 use gpui::{App, Pixels, SharedString};
 use language_model::LanguageModel;
+use lmstudio::Model as LmStudioModel;
+use mistral::Model as MistralModel;
+use ollama::Model as OllamaModel;
 use schemars::{JsonSchema, schema::Schema};
 use serde::{Deserialize, Serialize};
 use settings::{Settings, SettingsSources};
@@ -42,6 +48,45 @@ pub enum NotifyWhenAgentWaiting {
    Never,
 }

+#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq)]
+#[serde(tag = "name", rename_all = "snake_case")]
+#[schemars(deny_unknown_fields)]
+pub enum AgentProviderContentV1 {
+    #[serde(rename = "zed.dev")]
+    ZedDotDev { default_model: Option<String> },
+    #[serde(rename = "openai")]
+    OpenAi {
+        default_model: Option<OpenAiModel>,
+        api_url: Option<String>,
+        available_models: Option<Vec<OpenAiModel>>,
+    },
+    #[serde(rename = "anthropic")]
+    Anthropic {
+        default_model: Option<AnthropicModel>,
+        api_url: Option<String>,
+    },
+    #[serde(rename = "ollama")]
+    Ollama {
+        default_model: Option<OllamaModel>,
+        api_url: Option<String>,
+    },
+    #[serde(rename = "lmstudio")]
+    LmStudio {
+        default_model: Option<LmStudioModel>,
+        api_url: Option<String>,
+    },
+    #[serde(rename = "deepseek")]
+    DeepSeek {
+        default_model: Option<DeepseekModel>,
+        api_url: Option<String>,
+    },
+    #[serde(rename = "mistral")]
+    Mistral {
+        default_model: Option<MistralModel>,
+        api_url: Option<String>,
+    },
+}
+
 #[derive(Default, Clone, Debug)]
 pub struct AgentSettings {
    pub enabled: bool,
@@ -123,56 +168,366 @@ impl LanguageModelParameters {
    }
 }

+/// Agent panel settings
+#[derive(Clone, Serialize, Deserialize, Debug, Default)]
+pub struct AgentSettingsContent {
+    #[serde(flatten)]
+    pub inner: Option<AgentSettingsContentInner>,
+}
+
+#[derive(Clone, Serialize, Deserialize, Debug)]
+#[serde(untagged)]
+pub enum AgentSettingsContentInner {
+    Versioned(Box<VersionedAgentSettingsContent>),
+    Legacy(LegacyAgentSettingsContent),
+}
+
+impl AgentSettingsContentInner {
+    fn for_v2(content: AgentSettingsContentV2) -> Self {
+        AgentSettingsContentInner::Versioned(Box::new(VersionedAgentSettingsContent::V2(content)))
+    }
+}
+
+impl JsonSchema for AgentSettingsContent {
+    fn schema_name() -> String {
+        VersionedAgentSettingsContent::schema_name()
+    }
+
+    fn json_schema(r#gen: &mut schemars::r#gen::SchemaGenerator) -> Schema {
+        VersionedAgentSettingsContent::json_schema(r#gen)
+    }
+
+    fn is_referenceable() -> bool {
+        VersionedAgentSettingsContent::is_referenceable()
+    }
+}
+
 impl AgentSettingsContent {
+    pub fn is_version_outdated(&self) -> bool {
+        match &self.inner {
+            Some(AgentSettingsContentInner::Versioned(settings)) => match **settings {
+                VersionedAgentSettingsContent::V1(_) => true,
+                VersionedAgentSettingsContent::V2(_) => false,
+            },
+            Some(AgentSettingsContentInner::Legacy(_)) => true,
+            None => false,
+        }
+    }
+
+    fn upgrade(&self) -> AgentSettingsContentV2 {
+        match &self.inner {
+            Some(AgentSettingsContentInner::Versioned(settings)) => match **settings {
+                VersionedAgentSettingsContent::V1(ref settings) => AgentSettingsContentV2 {
+                    enabled: settings.enabled,
+                    button: settings.button,
+                    dock: settings.dock,
+                    default_width: settings.default_width,
+                    default_height: settings.default_width,
+                    default_model: settings
+                        .provider
+                        .clone()
+                        .and_then(|provider| match provider {
+                            AgentProviderContentV1::ZedDotDev { default_model } => default_model
+                                .map(|model| LanguageModelSelection {
+                                    provider: "zed.dev".into(),
+                                    model,
+                                }),
+                            AgentProviderContentV1::OpenAi { default_model, .. } => default_model
+                                .map(|model| LanguageModelSelection {
+                                    provider: "openai".into(),
+                                    model: model.id().to_string(),
+                                }),
+                            AgentProviderContentV1::Anthropic { default_model, .. } => {
+                                default_model.map(|model| LanguageModelSelection {
+                                    provider: "anthropic".into(),
+                                    model: model.id().to_string(),
+                                })
+                            }
+                            AgentProviderContentV1::Ollama { default_model, .. } => default_model
+                                .map(|model| LanguageModelSelection {
+                                    provider: "ollama".into(),
+                                    model: model.id().to_string(),
+                                }),
+                            AgentProviderContentV1::LmStudio { default_model, .. } => default_model
+                                .map(|model| LanguageModelSelection {
+                                    provider: "lmstudio".into(),
+                                    model: model.id().to_string(),
+                                }),
+                            AgentProviderContentV1::DeepSeek { default_model, .. } => default_model
+                                .map(|model| LanguageModelSelection {
+                                    provider: "deepseek".into(),
+                                    model: model.id().to_string(),
+                                }),
+                            AgentProviderContentV1::Mistral { default_model, .. } => default_model
+                                .map(|model| LanguageModelSelection {
+                                    provider: "mistral".into(),
+                                    model: model.id().to_string(),
+                                }),
+                        }),
+                    inline_assistant_model: None,
+                    commit_message_model: None,
+                    thread_summary_model: None,
+                    inline_alternatives: None,
+                    default_profile: None,
+                    default_view: None,
+                    profiles: None,
+                    always_allow_tool_actions: None,
+                    notify_when_agent_waiting: None,
+                    stream_edits: None,
+                    single_file_review: None,
+                    model_parameters: Vec::new(),
+                    preferred_completion_mode: None,
+                    enable_feedback: None,
+                    play_sound_when_agent_done: None,
+                },
+                VersionedAgentSettingsContent::V2(ref settings) => settings.clone(),
+            },
+            Some(AgentSettingsContentInner::Legacy(settings)) => AgentSettingsContentV2 {
+                enabled: None,
+                button: settings.button,
+                dock: settings.dock,
+                default_width: settings.default_width,
+                default_height: settings.default_height,
+                default_model: Some(LanguageModelSelection {
+                    provider: "openai".into(),
+                    model: settings
+                        .default_open_ai_model
+                        .clone()
+                        .unwrap_or_default()
+                        .id()
+                        .to_string(),
+                }),
+                inline_assistant_model: None,
+                commit_message_model: None,
+                thread_summary_model: None,
+                inline_alternatives: None,
+                default_profile: None,
+                default_view: None,
+                profiles: None,
+                always_allow_tool_actions: None,
+                notify_when_agent_waiting: None,
+                stream_edits: None,
+                single_file_review: None,
+                model_parameters: Vec::new(),
+                preferred_completion_mode: None,
+                enable_feedback: None,
+                play_sound_when_agent_done: None,
+            },
+            None => AgentSettingsContentV2::default(),
+        }
+    }
+
    pub fn set_dock(&mut self, dock: AgentDockPosition) {
-        self.dock = Some(dock);
+        match &mut self.inner {
+            Some(AgentSettingsContentInner::Versioned(settings)) => match **settings {
+                VersionedAgentSettingsContent::V1(ref mut settings) => {
+                    settings.dock = Some(dock);
+                }
+                VersionedAgentSettingsContent::V2(ref mut settings) => {
+                    settings.dock = Some(dock);
+                }
+            },
+            Some(AgentSettingsContentInner::Legacy(settings)) => {
+                settings.dock = Some(dock);
+            }
+            None => {
+                self.inner = Some(AgentSettingsContentInner::for_v2(AgentSettingsContentV2 {
+                    dock: Some(dock),
+                    ..Default::default()
+                }))
+            }
+        }
    }

    pub fn set_model(&mut self, language_model: Arc<dyn LanguageModel>) {
        let model = language_model.id().0.to_string();
        let provider = language_model.provider_id().0.to_string();

-        self.default_model = Some(LanguageModelSelection {
-            provider: provider.into(),
-            model,
-        });
+        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(AgentProviderContentV1::Anthropic { api_url, .. }) => {
+                                api_url.clone()
+                            }
+                            _ => None,
+                        };
+                        settings.provider = Some(AgentProviderContentV1::Anthropic {
+                            default_model: AnthropicModel::from_id(&model).ok(),
+                            api_url,
+                        });
+                    }
+                    "ollama" => {
+                        let api_url = match &settings.provider {
+                            Some(AgentProviderContentV1::Ollama { api_url, .. }) => api_url.clone(),
+                            _ => None,
+                        };
+                        settings.provider = Some(AgentProviderContentV1::Ollama {
+                            default_model: Some(ollama::Model::new(
+                                &model,
+                                None,
+                                None,
+                                Some(language_model.supports_tools()),
+                                Some(language_model.supports_images()),
+                                None,
+                            )),
+                            api_url,
+                        });
+                    }
+                    "lmstudio" => {
+                        let api_url = match &settings.provider {
+                            Some(AgentProviderContentV1::LmStudio { api_url, .. }) => {
+                                api_url.clone()
+                            }
+                            _ => None,
+                        };
+                        settings.provider = Some(AgentProviderContentV1::LmStudio {
+                            default_model: Some(lmstudio::Model::new(
+                                &model, None, None, false, false,
+                            )),
+                            api_url,
+                        });
+                    }
+                    "openai" => {
+                        let (api_url, available_models) = match &settings.provider {
+                            Some(AgentProviderContentV1::OpenAi {
+                                api_url,
+                                available_models,
+                                ..
+                            }) => (api_url.clone(), available_models.clone()),
+                            _ => (None, None),
+                        };
+                        settings.provider = Some(AgentProviderContentV1::OpenAi {
+                            default_model: OpenAiModel::from_id(&model).ok(),
+                            api_url,
+                            available_models,
+                        });
+                    }
+                    "deepseek" => {
+                        let api_url = match &settings.provider {
+                            Some(AgentProviderContentV1::DeepSeek { api_url, .. }) => {
+                                api_url.clone()
+                            }
+                            _ => None,
+                        };
+                        settings.provider = Some(AgentProviderContentV1::DeepSeek {
+                            default_model: DeepseekModel::from_id(&model).ok(),
+                            api_url,
+                        });
+                    }
+                    _ => {}
+                },
+                VersionedAgentSettingsContent::V2(ref mut settings) => {
+                    settings.default_model = Some(LanguageModelSelection {
+                        provider: provider.into(),
+                        model,
+                    });
+                }
+            },
+            Some(AgentSettingsContentInner::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: provider.into(),
+                        model,
+                    }),
+                    ..Default::default()
+                }));
+            }
+        }
    }

    pub fn set_inline_assistant_model(&mut self, provider: String, model: String) {
-        self.inline_assistant_model = Some(LanguageModelSelection {
-            provider: provider.into(),
-            model,
-        });
+        self.v2_setting(|setting| {
+            setting.inline_assistant_model = Some(LanguageModelSelection {
+                provider: provider.into(),
+                model,
+            });
+            Ok(())
+        })
+        .ok();
    }

    pub fn set_commit_message_model(&mut self, provider: String, model: String) {
-        self.commit_message_model = Some(LanguageModelSelection {
-            provider: provider.into(),
-            model,
-        });
+        self.v2_setting(|setting| {
+            setting.commit_message_model = Some(LanguageModelSelection {
+                provider: provider.into(),
+                model,
+            });
+            Ok(())
+        })
+        .ok();
+    }
+
+    pub fn v2_setting(
+        &mut self,
+        f: impl FnOnce(&mut AgentSettingsContentV2) -> anyhow::Result<()>,
+    ) -> anyhow::Result<()> {
+        match self.inner.get_or_insert_with(|| {
+            AgentSettingsContentInner::for_v2(AgentSettingsContentV2 {
+                ..Default::default()
+            })
+        }) {
+            AgentSettingsContentInner::Versioned(boxed) => {
+                if let VersionedAgentSettingsContent::V2(ref mut settings) = **boxed {
+                    f(settings)
+                } else {
+                    Ok(())
+                }
+            }
+            _ => Ok(()),
+        }
    }

    pub fn set_thread_summary_model(&mut self, provider: String, model: String) {
-        self.thread_summary_model = Some(LanguageModelSelection {
-            provider: provider.into(),
-            model,
-        });
+        self.v2_setting(|setting| {
+            setting.thread_summary_model = Some(LanguageModelSelection {
+                provider: provider.into(),
+                model,
+            });
+            Ok(())
+        })
+        .ok();
    }

    pub fn set_always_allow_tool_actions(&mut self, allow: bool) {
-        self.always_allow_tool_actions = Some(allow);
+        self.v2_setting(|setting| {
+            setting.always_allow_tool_actions = Some(allow);
+            Ok(())
+        })
+        .ok();
    }

    pub fn set_play_sound_when_agent_done(&mut self, allow: bool) {
-        self.play_sound_when_agent_done = Some(allow);
+        self.v2_setting(|setting| {
+            setting.play_sound_when_agent_done = Some(allow);
+            Ok(())
+        })
+        .ok();
    }

    pub fn set_single_file_review(&mut self, allow: bool) {
-        self.single_file_review = Some(allow);
+        self.v2_setting(|setting| {
+            setting.single_file_review = Some(allow);
+            Ok(())
+        })
+        .ok();
    }

    pub fn set_profile(&mut self, profile_id: AgentProfileId) {
-        self.default_profile = Some(profile_id);
+        self.v2_setting(|setting| {
+            setting.default_profile = Some(profile_id);
+            Ok(())
+        })
+        .ok();
    }

    pub fn create_profile(
@@ -180,39 +535,79 @@ impl AgentSettingsContent {
        profile_id: AgentProfileId,
        profile_settings: AgentProfileSettings,
    ) -> Result<()> {
-        let profiles = self.profiles.get_or_insert_default();
-        if profiles.contains_key(&profile_id) {
-            bail!("profile with ID '{profile_id}' already exists");
-        }
+        self.v2_setting(|settings| {
+            let profiles = settings.profiles.get_or_insert_default();
+            if profiles.contains_key(&profile_id) {
+                bail!("profile with ID '{profile_id}' already exists");
+            }

-        profiles.insert(
-            profile_id,
-            AgentProfileContent {
-                name: profile_settings.name.into(),
-                tools: profile_settings.tools,
-                enable_all_context_servers: Some(profile_settings.enable_all_context_servers),
-                context_servers: profile_settings
-                    .context_servers
-                    .into_iter()
-                    .map(|(server_id, preset)| {
-                        (
-                            server_id,
-                            ContextServerPresetContent {
-                                tools: preset.tools,
-                            },
-                        )
-                    })
-                    .collect(),
-            },
-        );
+            profiles.insert(
+                profile_id,
+                AgentProfileContent {
+                    name: profile_settings.name.into(),
+                    tools: profile_settings.tools,
+                    enable_all_context_servers: Some(profile_settings.enable_all_context_servers),
+                    context_servers: profile_settings
+                        .context_servers
+                        .into_iter()
+                        .map(|(server_id, preset)| {
+                            (
+                                server_id,
+                                ContextServerPresetContent {
+                                    tools: preset.tools,
+                                },
+                            )
+                        })
+                        .collect(),
+                },
+            );

-        Ok(())
+            Ok(())
+        })
+    }
+}
+
+#[derive(Clone, Serialize, Deserialize, JsonSchema, Debug)]
+#[serde(tag = "version")]
+#[schemars(deny_unknown_fields)]
+pub enum VersionedAgentSettingsContent {
+    #[serde(rename = "1")]
+    V1(AgentSettingsContentV1),
+    #[serde(rename = "2")]
+    V2(AgentSettingsContentV2),
+}
+
+impl Default for VersionedAgentSettingsContent {
+    fn default() -> Self {
+        Self::V2(AgentSettingsContentV2 {
+            enabled: None,
+            button: None,
+            dock: None,
+            default_width: None,
+            default_height: None,
+            default_model: None,
+            inline_assistant_model: None,
+            commit_message_model: None,
+            thread_summary_model: None,
+            inline_alternatives: None,
+            default_profile: None,
+            default_view: None,
+            profiles: None,
+            always_allow_tool_actions: None,
+            notify_when_agent_waiting: None,
+            stream_edits: None,
+            single_file_review: None,
+            model_parameters: Vec::new(),
+            preferred_completion_mode: None,
+            enable_feedback: None,
+            play_sound_when_agent_done: None,
+        })
    }
 }

 #[derive(Clone, Serialize, Deserialize, JsonSchema, Debug, Default)]
 #[schemars(deny_unknown_fields)]
-pub struct AgentSettingsContent {
+pub struct AgentSettingsContentV2 {
    /// Whether the Agent is enabled.
    ///
    /// Default: true
@@ -384,6 +779,65 @@ pub struct ContextServerPresetContent {
    pub tools: IndexMap<Arc<str>, bool>,
 }

+#[derive(Clone, Serialize, Deserialize, JsonSchema, Debug)]
+#[schemars(deny_unknown_fields)]
+pub struct AgentSettingsContentV1 {
+    /// Whether the Agent is enabled.
+    ///
+    /// Default: true
+    enabled: Option<bool>,
+    /// Whether to show the Agent panel button in the status bar.
+    ///
+    /// Default: true
+    button: Option<bool>,
+    /// Where to dock the Agent.
+    ///
+    /// Default: right
+    dock: Option<AgentDockPosition>,
+    /// Default width in pixels when the Agent 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: 320
+    default_height: Option<f32>,
+    /// The provider of the Agent service.
+    ///
+    /// This can be "openai", "anthropic", "ollama", "lmstudio", "deepseek", "zed.dev"
+    /// each with their respective default models and configurations.
+    provider: Option<AgentProviderContentV1>,
+}
+
+#[derive(Clone, Serialize, Deserialize, JsonSchema, Debug)]
+#[schemars(deny_unknown_fields)]
+pub struct LegacyAgentSettingsContent {
+    /// Whether to show the Agent panel button in the status bar.
+    ///
+    /// Default: true
+    pub button: Option<bool>,
+    /// Where to dock the Agent.
+    ///
+    /// Default: right
+    pub dock: Option<AgentDockPosition>,
+    /// Default width in pixels when the Agent is docked to the left or right.
+    ///
+    /// Default: 640
+    pub default_width: Option<f32>,
+    /// Default height in pixels when the Agent is docked to the bottom.
+    ///
+    /// Default: 320
+    pub default_height: Option<f32>,
+    /// The default OpenAI model to use when creating new chats.
+    ///
+    /// Default: gpt-4-1106-preview
+    pub default_open_ai_model: Option<OpenAiModel>,
+    /// OpenAI API base URL to use when creating new chats.
+    ///
+    /// Default: <https://api.openai.com/v1>
+    pub openai_api_url: Option<String>,
+}
+
 impl Settings for AgentSettings {
    const KEY: Option<&'static str> = Some("agent");

@@ -400,6 +854,11 @@ impl Settings for AgentSettings {
        let mut settings = AgentSettings::default();

        for value in sources.defaults_and_customizations() {
+            if value.is_version_outdated() {
+                settings.using_outdated_settings_version = true;
+            }
+
+            let value = value.upgrade();
            merge(&mut settings.enabled, value.enabled);
            merge(&mut settings.button, value.button);
            merge(&mut settings.dock, value.dock);
@@ -411,23 +870,17 @@ impl Settings for AgentSettings {
                &mut settings.default_height,
                value.default_height.map(Into::into),
            );
-            merge(&mut settings.default_model, value.default_model.clone());
+            merge(&mut settings.default_model, value.default_model);
            settings.inline_assistant_model = value
                .inline_assistant_model
-                .clone()
                .or(settings.inline_assistant_model.take());
            settings.commit_message_model = value
-                .clone()
                .commit_message_model
                .or(settings.commit_message_model.take());
            settings.thread_summary_model = value
-                .clone()
                .thread_summary_model
                .or(settings.thread_summary_model.take());
-            merge(
-                &mut settings.inline_alternatives,
-                value.inline_alternatives.clone(),
-            );
+            merge(&mut settings.inline_alternatives, value.inline_alternatives);
            merge(
                &mut settings.always_allow_tool_actions,
                value.always_allow_tool_actions,
@@ -442,7 +895,7 @@ impl Settings for AgentSettings {
            );
            merge(&mut settings.stream_edits, value.stream_edits);
            merge(&mut settings.single_file_review, value.single_file_review);
-            merge(&mut settings.default_profile, value.default_profile.clone());
+            merge(&mut settings.default_profile, value.default_profile);
            merge(&mut settings.default_view, value.default_view);
            merge(
                &mut settings.preferred_completion_mode,
@@ -454,24 +907,24 @@ impl Settings for AgentSettings {
                .model_parameters
                .extend_from_slice(&value.model_parameters);

-            if let Some(profiles) = value.profiles.as_ref() {
+            if let Some(profiles) = value.profiles {
                settings
                    .profiles
                    .extend(profiles.into_iter().map(|(id, profile)| {
                        (
-                            id.clone(),
+                            id,
                            AgentProfileSettings {
-                                name: profile.name.clone().into(),
-                                tools: profile.tools.clone(),
+                                name: profile.name.into(),
+                                tools: profile.tools,
                                enable_all_context_servers: profile
                                    .enable_all_context_servers
                                    .unwrap_or_default(),
                                context_servers: profile
                                    .context_servers
-                                    .iter()
+                                    .into_iter()
                                    .map(|(context_server_id, preset)| {
                                        (
-                                            context_server_id.clone(),
+                                            context_server_id,
                                            ContextServerPreset {
                                                tools: preset.tools.clone(),
                                            },
@@ -492,8 +945,28 @@ impl Settings for AgentSettings {
            .read_value("chat.agent.enabled")
            .and_then(|b| b.as_bool())
        {
-            current.enabled = Some(b);
-            current.button = Some(b);
+            match &mut current.inner {
+                Some(AgentSettingsContentInner::Versioned(versioned)) => match versioned.as_mut() {
+                    VersionedAgentSettingsContent::V1(setting) => {
+                        setting.enabled = Some(b);
+                        setting.button = Some(b);
+                    }
+
+                    VersionedAgentSettingsContent::V2(setting) => {
+                        setting.enabled = Some(b);
+                        setting.button = Some(b);
+                    }
+                },
+                Some(AgentSettingsContentInner::Legacy(setting)) => setting.button = Some(b),
+                None => {
+                    current.inner =
+                        Some(AgentSettingsContentInner::for_v2(AgentSettingsContentV2 {
+                            enabled: Some(b),
+                            button: Some(b),
+                            ..Default::default()
+                        }));
+                }
+            }
        }
    }
 }
@@ -503,3 +976,149 @@ fn merge<T>(target: &mut T, value: Option<T>) {
        *target = value;
    }
 }
+
+#[cfg(test)]
+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) {
+        let fs = fs::FakeFs::new(cx.executor().clone());
+        fs.create_dir(paths::settings_file().parent().unwrap())
+            .await
+            .unwrap();
+
+        cx.update(|cx| {
+            let test_settings = settings::SettingsStore::test(cx);
+            cx.set_global(test_settings);
+            AgentSettings::register(cx);
+        });
+
+        cx.update(|cx| {
+            assert!(!AgentSettings::get_global(cx).using_outdated_settings_version);
+            assert_eq!(
+                AgentSettings::get_global(cx).default_model,
+                LanguageModelSelection {
+                    provider: "zed.dev".into(),
+                    model: "claude-sonnet-4".into(),
+                }
+            );
+        });
+
+        cx.update(|cx| {
+            settings::SettingsStore::global(cx).update_settings_file::<AgentSettings>(
+                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,
+                            default_profile: None,
+                            default_view: None,
+                            profiles: None,
+                            always_allow_tool_actions: None,
+                            play_sound_when_agent_done: None,
+                            notify_when_agent_waiting: None,
+                            stream_edits: None,
+                            single_file_review: None,
+                            enable_feedback: None,
+                            model_parameters: Vec::new(),
+                            preferred_completion_mode: None,
+                        })),
+                    }
+                },
+            );
+        });
+
+        cx.run_until_parked();
+
+        let raw_settings_value = fs.load(paths::settings_file()).await.unwrap();
+        assert!(raw_settings_value.contains(r#""version": "2""#));
+
+        #[derive(Debug, Deserialize)]
+        struct AgentSettingsTest {
+            agent: AgentSettingsContent,
+        }
+
+        let agent_settings: AgentSettingsTest =
+            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().into(),
+                            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());
+    }
+}
--- a/crates/agent_ui/Cargo.toml
+++ b/crates/agent_ui/Cargo.toml
@@ -1,110 +0,0 @@
-[package]
-name = "agent_ui"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/agent_ui.rs"
-doctest = false
-
-[features]
-test-support = [
-    "gpui/test-support",
-    "language/test-support",
-]
-
-[dependencies]
-agent.workspace = true
-agent_settings.workspace = true
-anyhow.workspace = true
-assistant_context.workspace = true
-assistant_slash_command.workspace = true
-assistant_slash_commands.workspace = true
-assistant_tool.workspace = true
-audio.workspace = true
-buffer_diff.workspace = true
-chrono.workspace = true
-client.workspace = true
-collections.workspace = true
-component.workspace = true
-context_server.workspace = true
-db.workspace = true
-editor.workspace = true
-extension.workspace = true
-extension_host.workspace = true
-feature_flags.workspace = true
-file_icons.workspace = true
-fs.workspace = true
-futures.workspace = true
-fuzzy.workspace = true
-gpui.workspace = true
-html_to_markdown.workspace = true
-indoc.workspace = true
-http_client.workspace = true
-indexed_docs.workspace = true
-inventory.workspace = true
-itertools.workspace = true
-jsonschema.workspace = true
-language.workspace = true
-language_model.workspace = true
-log.workspace = true
-lsp.workspace = true
-markdown.workspace = true
-menu.workspace = true
-multi_buffer.workspace = true
-notifications.workspace = true
-ordered-float.workspace = true
-parking_lot.workspace = true
-paths.workspace = true
-picker.workspace = true
-project.workspace = true
-prompt_store.workspace = true
-proto.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
-settings.workspace = true
-smol.workspace = true
-streaming_diff.workspace = true
-telemetry.workspace = true
-telemetry_events.workspace = true
-terminal.workspace = true
-terminal_view.workspace = true
-text.workspace = true
-theme.workspace = true
-time.workspace = true
-time_format.workspace = true
-ui.workspace = true
-urlencoding.workspace = true
-util.workspace = true
-uuid.workspace = true
-watch.workspace = true
-workspace-hack.workspace = true
-workspace.workspace = true
-zed_actions.workspace = true
-zed_llm_client.workspace = true
-
-[dev-dependencies]
-assistant_tools.workspace = true
-buffer_diff = { workspace = true, features = ["test-support"] }
-editor = { workspace = true, features = ["test-support"] }
-gpui = { workspace = true, "features" = ["test-support"] }
-indoc.workspace = true
-language = { workspace = true, "features" = ["test-support"] }
-languages = { workspace = true, features = ["test-support"] }
-language_model = { workspace = true, "features" = ["test-support"] }
-pretty_assertions.workspace = true
-project = { workspace = true, features = ["test-support"] }
-rand.workspace = true
-tree-sitter-md.workspace = true
-unindent.workspace = true
--- a/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs
+++ b/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs
@@ -1,763 +0,0 @@
-use std::{
-    sync::{Arc, Mutex},
-    time::Duration,
-};
-
-use anyhow::{Context as _, Result};
-use context_server::{ContextServerCommand, ContextServerId};
-use editor::{Editor, EditorElement, EditorStyle};
-use gpui::{
-    Animation, AnimationExt as _, AsyncWindowContext, DismissEvent, Entity, EventEmitter,
-    FocusHandle, Focusable, Task, TextStyle, TextStyleRefinement, Transformation, UnderlineStyle,
-    WeakEntity, percentage, prelude::*,
-};
-use language::{Language, LanguageRegistry};
-use markdown::{Markdown, MarkdownElement, MarkdownStyle};
-use notifications::status_toast::{StatusToast, ToastIcon};
-use project::{
-    context_server_store::{
-        ContextServerStatus, ContextServerStore, registry::ContextServerDescriptorRegistry,
-    },
-    project_settings::{ContextServerSettings, ProjectSettings},
-    worktree_store::WorktreeStore,
-};
-use settings::{Settings as _, update_settings_file};
-use theme::ThemeSettings;
-use ui::{KeyBinding, Modal, ModalFooter, ModalHeader, Section, Tooltip, prelude::*};
-use util::ResultExt as _;
-use workspace::{ModalView, Workspace};
-
-use crate::AddContextServer;
-
-enum ConfigurationTarget {
-    New,
-    Existing {
-        id: ContextServerId,
-        command: ContextServerCommand,
-    },
-    Extension {
-        id: ContextServerId,
-        repository_url: Option<SharedString>,
-        installation: Option<extension::ContextServerConfiguration>,
-    },
-}
-
-enum ConfigurationSource {
-    New {
-        editor: Entity<Editor>,
-    },
-    Existing {
-        editor: Entity<Editor>,
-    },
-    Extension {
-        id: ContextServerId,
-        editor: Option<Entity<Editor>>,
-        repository_url: Option<SharedString>,
-        installation_instructions: Option<Entity<markdown::Markdown>>,
-        settings_validator: Option<jsonschema::Validator>,
-    },
-}
-
-impl ConfigurationSource {
-    fn has_configuration_options(&self) -> bool {
-        !matches!(self, ConfigurationSource::Extension { editor: None, .. })
-    }
-
-    fn is_new(&self) -> bool {
-        matches!(self, ConfigurationSource::New { .. })
-    }
-
-    fn from_target(
-        target: ConfigurationTarget,
-        language_registry: Arc<LanguageRegistry>,
-        jsonc_language: Option<Arc<Language>>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Self {
-        fn create_editor(
-            json: String,
-            jsonc_language: Option<Arc<Language>>,
-            window: &mut Window,
-            cx: &mut App,
-        ) -> Entity<Editor> {
-            cx.new(|cx| {
-                let mut editor = Editor::auto_height(4, 16, window, cx);
-                editor.set_text(json, 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
-            })
-        }
-
-        match target {
-            ConfigurationTarget::New => ConfigurationSource::New {
-                editor: create_editor(context_server_input(None), jsonc_language, window, cx),
-            },
-            ConfigurationTarget::Existing { id, command } => ConfigurationSource::Existing {
-                editor: create_editor(
-                    context_server_input(Some((id, command))),
-                    jsonc_language,
-                    window,
-                    cx,
-                ),
-            },
-            ConfigurationTarget::Extension {
-                id,
-                repository_url,
-                installation,
-            } => {
-                let settings_validator = installation.as_ref().and_then(|installation| {
-                    jsonschema::validator_for(&installation.settings_schema)
-                        .context("Failed to load JSON schema for context server settings")
-                        .log_err()
-                });
-                let installation_instructions = installation.as_ref().map(|installation| {
-                    cx.new(|cx| {
-                        Markdown::new(
-                            installation.installation_instructions.clone().into(),
-                            Some(language_registry.clone()),
-                            None,
-                            cx,
-                        )
-                    })
-                });
-                ConfigurationSource::Extension {
-                    id,
-                    repository_url,
-                    installation_instructions,
-                    settings_validator,
-                    editor: installation.map(|installation| {
-                        create_editor(installation.default_settings, jsonc_language, window, cx)
-                    }),
-                }
-            }
-        }
-    }
-
-    fn output(&self, cx: &mut App) -> Result<(ContextServerId, ContextServerSettings)> {
-        match self {
-            ConfigurationSource::New { editor } | ConfigurationSource::Existing { editor } => {
-                parse_input(&editor.read(cx).text(cx)).map(|(id, command)| {
-                    (
-                        id,
-                        ContextServerSettings::Custom {
-                            enabled: true,
-                            command,
-                        },
-                    )
-                })
-            }
-            ConfigurationSource::Extension {
-                id,
-                editor,
-                settings_validator,
-                ..
-            } => {
-                let text = editor
-                    .as_ref()
-                    .context("No output available")?
-                    .read(cx)
-                    .text(cx);
-                let settings = serde_json_lenient::from_str::<serde_json::Value>(&text)?;
-                if let Some(settings_validator) = settings_validator {
-                    if let Err(error) = settings_validator.validate(&settings) {
-                        return Err(anyhow::anyhow!(error.to_string()));
-                    }
-                }
-                Ok((
-                    id.clone(),
-                    ContextServerSettings::Extension {
-                        enabled: true,
-                        settings,
-                    },
-                ))
-            }
-        }
-    }
-}
-
-fn context_server_input(existing: Option<(ContextServerId, ContextServerCommand)>) -> String {
-    let (name, path, args, env) = match existing {
-        Some((id, cmd)) => {
-            let args = serde_json::to_string(&cmd.args).unwrap();
-            let env = serde_json::to_string(&cmd.env.unwrap_or_default()).unwrap();
-            (id.0.to_string(), cmd.path, args, env)
-        }
-        None => (
-            "some-mcp-server".to_string(),
-            "".to_string(),
-            "[]".to_string(),
-            "{}".to_string(),
-        ),
-    };
-
-    format!(
-        r#"{{
-  /// The name of your MCP server
-  "{name}": {{
-    "command": {{
-      /// The path to the executable
-      "path": "{path}",
-      /// The arguments to pass to the executable
-      "args": {args},
-      /// The environment variables to set for the executable
-      "env": {env}
-    }}
-  }}
-}}"#
-    )
-}
-
-fn resolve_context_server_extension(
-    id: ContextServerId,
-    worktree_store: Entity<WorktreeStore>,
-    cx: &mut App,
-) -> Task<Option<ConfigurationTarget>> {
-    let registry = ContextServerDescriptorRegistry::default_global(cx).read(cx);
-
-    let Some(descriptor) = registry.context_server_descriptor(&id.0) else {
-        return Task::ready(None);
-    };
-
-    let extension = crate::agent_configuration::resolve_extension_for_context_server(&id, cx);
-    cx.spawn(async move |cx| {
-        let installation = descriptor
-            .configuration(worktree_store, cx)
-            .await
-            .context("Failed to resolve context server configuration")
-            .log_err()
-            .flatten();
-
-        Some(ConfigurationTarget::Extension {
-            id,
-            repository_url: extension
-                .and_then(|(_, manifest)| manifest.repository.clone().map(SharedString::from)),
-            installation,
-        })
-    })
-}
-
-enum State {
-    Idle,
-    Waiting,
-    Error(SharedString),
-}
-
-pub struct ConfigureContextServerModal {
-    context_server_store: Entity<ContextServerStore>,
-    workspace: WeakEntity<Workspace>,
-    source: ConfigurationSource,
-    state: State,
-}
-
-impl ConfigureContextServerModal {
-    pub fn register(
-        workspace: &mut Workspace,
-        language_registry: Arc<LanguageRegistry>,
-        _window: Option<&mut Window>,
-        _cx: &mut Context<Workspace>,
-    ) {
-        workspace.register_action({
-            let language_registry = language_registry.clone();
-            move |_workspace, _: &AddContextServer, window, cx| {
-                let workspace_handle = cx.weak_entity();
-                let language_registry = language_registry.clone();
-                window
-                    .spawn(cx, async move |cx| {
-                        Self::show_modal(
-                            ConfigurationTarget::New,
-                            language_registry,
-                            workspace_handle,
-                            cx,
-                        )
-                        .await
-                    })
-                    .detach_and_log_err(cx);
-            }
-        });
-    }
-
-    pub fn show_modal_for_existing_server(
-        server_id: ContextServerId,
-        language_registry: Arc<LanguageRegistry>,
-        workspace: WeakEntity<Workspace>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Task<Result<()>> {
-        let Some(settings) = ProjectSettings::get_global(cx)
-            .context_servers
-            .get(&server_id.0)
-            .cloned()
-            .or_else(|| {
-                ContextServerDescriptorRegistry::default_global(cx)
-                    .read(cx)
-                    .context_server_descriptor(&server_id.0)
-                    .map(|_| ContextServerSettings::default_extension())
-            })
-        else {
-            return Task::ready(Err(anyhow::anyhow!("Context server not found")));
-        };
-
-        window.spawn(cx, async move |cx| {
-            let target = match settings {
-                ContextServerSettings::Custom {
-                    enabled: _,
-                    command,
-                } => Some(ConfigurationTarget::Existing {
-                    id: server_id,
-                    command,
-                }),
-                ContextServerSettings::Extension { .. } => {
-                    match workspace
-                        .update(cx, |workspace, cx| {
-                            resolve_context_server_extension(
-                                server_id,
-                                workspace.project().read(cx).worktree_store(),
-                                cx,
-                            )
-                        })
-                        .ok()
-                    {
-                        Some(task) => task.await,
-                        None => None,
-                    }
-                }
-            };
-
-            match target {
-                Some(target) => Self::show_modal(target, language_registry, workspace, cx).await,
-                None => Err(anyhow::anyhow!("Failed to resolve context server")),
-            }
-        })
-    }
-
-    fn show_modal(
-        target: ConfigurationTarget,
-        language_registry: Arc<LanguageRegistry>,
-        workspace: WeakEntity<Workspace>,
-        cx: &mut AsyncWindowContext,
-    ) -> Task<Result<()>> {
-        cx.spawn(async move |cx| {
-            let jsonc_language = language_registry.language_for_name("jsonc").await.ok();
-            workspace.update_in(cx, |workspace, window, cx| {
-                let workspace_handle = cx.weak_entity();
-                let context_server_store = workspace.project().read(cx).context_server_store();
-                workspace.toggle_modal(window, cx, |window, cx| Self {
-                    context_server_store,
-                    workspace: workspace_handle,
-                    state: State::Idle,
-                    source: ConfigurationSource::from_target(
-                        target,
-                        language_registry,
-                        jsonc_language,
-                        window,
-                        cx,
-                    ),
-                })
-            })
-        })
-    }
-
-    fn set_error(&mut self, err: impl Into<SharedString>, cx: &mut Context<Self>) {
-        self.state = State::Error(err.into());
-        cx.notify();
-    }
-
-    fn confirm(&mut self, _: &menu::Confirm, cx: &mut Context<Self>) {
-        self.state = State::Idle;
-        let Some(workspace) = self.workspace.upgrade() else {
-            return;
-        };
-
-        let (id, settings) = match self.source.output(cx) {
-            Ok(val) => val,
-            Err(error) => {
-                self.set_error(error.to_string(), cx);
-                return;
-            }
-        };
-
-        self.state = State::Waiting;
-        let wait_for_context_server_task =
-            wait_for_context_server(&self.context_server_store, id.clone(), cx);
-        cx.spawn({
-            let id = id.clone();
-            async move |this, cx| {
-                let result = wait_for_context_server_task.await;
-                this.update(cx, |this, cx| match result {
-                    Ok(_) => {
-                        this.state = State::Idle;
-                        this.show_configured_context_server_toast(id, cx);
-                        cx.emit(DismissEvent);
-                    }
-                    Err(err) => {
-                        this.set_error(err, cx);
-                    }
-                })
-            }
-        })
-        .detach();
-
-        // When we write the settings to the file, the context server will be restarted.
-        workspace.update(cx, |workspace, cx| {
-            let fs = workspace.app_state().fs.clone();
-            update_settings_file::<ProjectSettings>(fs.clone(), cx, |project_settings, _| {
-                project_settings.context_servers.insert(id.0, settings);
-            });
-        });
-    }
-
-    fn cancel(&mut self, _: &menu::Cancel, cx: &mut Context<Self>) {
-        cx.emit(DismissEvent);
-    }
-
-    fn show_configured_context_server_toast(&self, id: ContextServerId, cx: &mut App) {
-        self.workspace
-            .update(cx, {
-                |workspace, cx| {
-                    let status_toast = StatusToast::new(
-                        format!("{} configured successfully.", id.0),
-                        cx,
-                        |this, _cx| {
-                            this.icon(ToastIcon::new(IconName::Hammer).color(Color::Muted))
-                                .action("Dismiss", |_, _| {})
-                        },
-                    );
-
-                    workspace.toggle_status_toast(status_toast, cx);
-                }
-            })
-            .log_err();
-    }
-}
-
-fn parse_input(text: &str) -> Result<(ContextServerId, ContextServerCommand)> {
-    let value: serde_json::Value = serde_json_lenient::from_str(text)?;
-    let object = value.as_object().context("Expected object")?;
-    anyhow::ensure!(object.len() == 1, "Expected exactly one key-value pair");
-    let (context_server_name, value) = object.into_iter().next().unwrap();
-    let command = value.get("command").context("Expected command")?;
-    let command: ContextServerCommand = serde_json::from_value(command.clone())?;
-    Ok((ContextServerId(context_server_name.clone().into()), command))
-}
-
-impl ModalView for ConfigureContextServerModal {}
-
-impl Focusable for ConfigureContextServerModal {
-    fn focus_handle(&self, cx: &App) -> FocusHandle {
-        match &self.source {
-            ConfigurationSource::New { editor } => editor.focus_handle(cx),
-            ConfigurationSource::Existing { editor, .. } => editor.focus_handle(cx),
-            ConfigurationSource::Extension { editor, .. } => editor
-                .as_ref()
-                .map(|editor| editor.focus_handle(cx))
-                .unwrap_or_else(|| cx.focus_handle()),
-        }
-    }
-}
-
-impl EventEmitter<DismissEvent> for ConfigureContextServerModal {}
-
-impl ConfigureContextServerModal {
-    fn render_modal_header(&self) -> ModalHeader {
-        let text: SharedString = match &self.source {
-            ConfigurationSource::New { .. } => "Add MCP Server".into(),
-            ConfigurationSource::Existing { .. } => "Configure MCP Server".into(),
-            ConfigurationSource::Extension { id, .. } => format!("Configure {}", id.0).into(),
-        };
-        ModalHeader::new().headline(text)
-    }
-
-    fn render_modal_description(&self, window: &mut Window, cx: &mut Context<Self>) -> AnyElement {
-        const MODAL_DESCRIPTION: &'static str = "Visit the MCP server configuration docs to find all necessary arguments and environment variables.";
-
-        if let ConfigurationSource::Extension {
-            installation_instructions: Some(installation_instructions),
-            ..
-        } = &self.source
-        {
-            div()
-                .pb_2()
-                .text_sm()
-                .child(MarkdownElement::new(
-                    installation_instructions.clone(),
-                    default_markdown_style(window, cx),
-                ))
-                .into_any_element()
-        } else {
-            Label::new(MODAL_DESCRIPTION)
-                .color(Color::Muted)
-                .into_any_element()
-        }
-    }
-
-    fn render_modal_content(&self, cx: &App) -> AnyElement {
-        let editor = match &self.source {
-            ConfigurationSource::New { editor } => editor,
-            ConfigurationSource::Existing { editor } => editor,
-            ConfigurationSource::Extension { editor, .. } => {
-                let Some(editor) = editor else {
-                    return div().into_any_element();
-                };
-                editor
-            }
-        };
-
-        div()
-            .p_2()
-            .rounded_md()
-            .border_1()
-            .border_color(cx.theme().colors().border_variant)
-            .bg(cx.theme().colors().editor_background)
-            .child({
-                let settings = ThemeSettings::get_global(cx);
-                let text_style = TextStyle {
-                    color: cx.theme().colors().text,
-                    font_family: settings.buffer_font.family.clone(),
-                    font_fallbacks: settings.buffer_font.fallbacks.clone(),
-                    font_size: settings.buffer_font_size(cx).into(),
-                    font_weight: settings.buffer_font.weight,
-                    line_height: relative(settings.buffer_line_height.value()),
-                    ..Default::default()
-                };
-                EditorElement::new(
-                    editor,
-                    EditorStyle {
-                        background: cx.theme().colors().editor_background,
-                        local_player: cx.theme().players().local(),
-                        text: text_style,
-                        syntax: cx.theme().syntax().clone(),
-                        ..Default::default()
-                    },
-                )
-            })
-            .into_any_element()
-    }
-
-    fn render_modal_footer(&self, window: &mut Window, cx: &mut Context<Self>) -> ModalFooter {
-        let focus_handle = self.focus_handle(cx);
-        let is_connecting = matches!(self.state, State::Waiting);
-
-        ModalFooter::new()
-            .start_slot::<Button>(
-                if let ConfigurationSource::Extension {
-                    repository_url: Some(repository_url),
-                    ..
-                } = &self.source
-                {
-                    Some(
-                        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({
-                                let repository_url = repository_url.clone();
-                                move |_, _, cx| cx.open_url(&repository_url)
-                            }),
-                    )
-                } else {
-                    None
-                },
-            )
-            .end_slot(
-                h_flex()
-                    .gap_2()
-                    .child(
-                        Button::new(
-                            "cancel",
-                            if self.source.has_configuration_options() {
-                                "Cancel"
-                            } else {
-                                "Dismiss"
-                            },
-                        )
-                        .key_binding(
-                            KeyBinding::for_action_in(&menu::Cancel, &focus_handle, window, cx)
-                                .map(|kb| kb.size(rems_from_px(12.))),
-                        )
-                        .on_click(
-                            cx.listener(|this, _event, _window, cx| this.cancel(&menu::Cancel, cx)),
-                        ),
-                    )
-                    .children(self.source.has_configuration_options().then(|| {
-                        Button::new(
-                            "add-server",
-                            if self.source.is_new() {
-                                "Add Server"
-                            } else {
-                                "Configure Server"
-                            },
-                        )
-                        .disabled(is_connecting)
-                        .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(&menu::Confirm, cx)
-                            }),
-                        )
-                    })),
-            )
-    }
-
-    fn render_waiting_for_context_server() -> Div {
-        h_flex()
-            .gap_2()
-            .child(
-                Icon::new(IconName::ArrowCircle)
-                    .size(IconSize::XSmall)
-                    .color(Color::Info)
-                    .with_animation(
-                        "arrow-circle",
-                        Animation::new(Duration::from_secs(2)).repeat(),
-                        |icon, delta| icon.transform(Transformation::rotate(percentage(delta))),
-                    )
-                    .into_any_element(),
-            )
-            .child(
-                Label::new("Waiting for Context Server")
-                    .size(LabelSize::Small)
-                    .color(Color::Muted),
-            )
-    }
-
-    fn render_modal_error(error: SharedString) -> Div {
-        h_flex()
-            .gap_2()
-            .child(
-                Icon::new(IconName::Warning)
-                    .size(IconSize::XSmall)
-                    .color(Color::Warning),
-            )
-            .child(
-                div()
-                    .w_full()
-                    .child(Label::new(error).size(LabelSize::Small).color(Color::Muted)),
-            )
-    }
-}
-
-impl Render for ConfigureContextServerModal {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        div()
-            .elevation_3(cx)
-            .w(rems(34.))
-            .key_context("ConfigureContextServerModal")
-            .on_action(
-                cx.listener(|this, _: &menu::Cancel, _window, cx| this.cancel(&menu::Cancel, cx)),
-            )
-            .on_action(
-                cx.listener(|this, _: &menu::Confirm, _window, cx| {
-                    this.confirm(&menu::Confirm, cx)
-                }),
-            )
-            .capture_any_mouse_down(cx.listener(|this, _, window, cx| {
-                this.focus_handle(cx).focus(window);
-            }))
-            .child(
-                Modal::new("configure-context-server", None)
-                    .header(self.render_modal_header())
-                    .section(
-                        Section::new()
-                            .child(self.render_modal_description(window, cx))
-                            .child(self.render_modal_content(cx))
-                            .child(match &self.state {
-                                State::Idle => div(),
-                                State::Waiting => Self::render_waiting_for_context_server(),
-                                State::Error(error) => Self::render_modal_error(error.clone()),
-                            }),
-                    )
-                    .footer(self.render_modal_footer(window, cx)),
-            )
-    }
-}
-
-fn wait_for_context_server(
-    context_server_store: &Entity<ContextServerStore>,
-    context_server_id: ContextServerId,
-    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(()));
-                        }
-                    }
-                }
-                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()));
-                        }
-                    }
-                }
-                _ => {}
-            }
-        }
-    });
-
-    cx.spawn(async move |_cx| {
-        let result = rx.await.unwrap();
-        drop(subscription);
-        result
-    })
-}
-
-pub(crate) fn default_markdown_style(window: &Window, cx: &App) -> MarkdownStyle {
-    let theme_settings = ThemeSettings::get_global(cx);
-    let colors = cx.theme().colors();
-    let mut text_style = window.text_style();
-    text_style.refine(&TextStyleRefinement {
-        font_family: Some(theme_settings.ui_font.family.clone()),
-        font_fallbacks: theme_settings.ui_font.fallbacks.clone(),
-        font_features: Some(theme_settings.ui_font.features.clone()),
-        font_size: Some(TextSize::XSmall.rems(cx).into()),
-        color: Some(colors.text_muted),
-        ..Default::default()
-    });
-
-    MarkdownStyle {
-        base_text_style: text_style.clone(),
-        selection_background_color: colors.element_selection_background,
-        link: TextStyleRefinement {
-            background_color: Some(colors.editor_foreground.opacity(0.025)),
-            underline: Some(UnderlineStyle {
-                color: Some(colors.text_accent.opacity(0.5)),
-                thickness: px(1.),
-                ..Default::default()
-            }),
-            ..Default::default()
-        },
-        ..Default::default()
-    }
-}
--- a/crates/agent_ui/src/agent_ui.rs
+++ b/crates/agent_ui/src/agent_ui.rs
@@ -1,292 +0,0 @@
-mod active_thread;
-mod agent_configuration;
-mod agent_diff;
-mod agent_model_selector;
-mod agent_panel;
-mod buffer_codegen;
-mod burn_mode_tooltip;
-mod context_picker;
-mod context_server_configuration;
-mod context_strip;
-mod debug;
-mod inline_assistant;
-mod inline_prompt_editor;
-mod language_model_selector;
-mod message_editor;
-mod profile_selector;
-mod slash_command;
-mod slash_command_picker;
-mod slash_command_settings;
-mod terminal_codegen;
-mod terminal_inline_assistant;
-mod text_thread_editor;
-mod thread_history;
-mod tool_compatibility;
-mod ui;
-
-use std::sync::Arc;
-
-use agent::{Thread, ThreadId};
-use agent_settings::{AgentProfileId, AgentSettings, LanguageModelSelection};
-use assistant_slash_command::SlashCommandRegistry;
-use client::Client;
-use feature_flags::FeatureFlagAppExt as _;
-use fs::Fs;
-use gpui::{Action, App, Entity, actions};
-use language::LanguageRegistry;
-use language_model::{
-    ConfiguredModel, LanguageModel, LanguageModelId, LanguageModelProviderId, LanguageModelRegistry,
-};
-use prompt_store::PromptBuilder;
-use schemars::JsonSchema;
-use serde::Deserialize;
-use settings::{Settings as _, SettingsStore};
-
-pub use crate::active_thread::ActiveThread;
-use crate::agent_configuration::{ConfigureContextServerModal, ManageProfilesModal};
-pub use crate::agent_panel::{AgentPanel, ConcreteAssistantPanelDelegate};
-pub use crate::inline_assistant::InlineAssistant;
-use crate::slash_command_settings::SlashCommandSettings;
-pub use agent_diff::{AgentDiffPane, AgentDiffToolbar};
-pub use text_thread_editor::{AgentPanelDelegate, TextThreadEditor};
-pub use ui::preview::{all_agent_previews, get_agent_preview};
-
-actions!(
-    agent,
-    [
-        NewTextThread,
-        ToggleContextPicker,
-        ToggleNavigationMenu,
-        ToggleOptionsMenu,
-        DeleteRecentlyOpenThread,
-        ToggleProfileSelector,
-        RemoveAllContext,
-        ExpandMessageEditor,
-        OpenHistory,
-        AddContextServer,
-        RemoveSelectedThread,
-        Chat,
-        ChatWithFollow,
-        CycleNextInlineAssist,
-        CyclePreviousInlineAssist,
-        FocusUp,
-        FocusDown,
-        FocusLeft,
-        FocusRight,
-        RemoveFocusedContext,
-        AcceptSuggestedContext,
-        OpenActiveThreadAsMarkdown,
-        OpenAgentDiff,
-        Keep,
-        Reject,
-        RejectAll,
-        KeepAll,
-        Follow,
-        ResetTrialUpsell,
-        ResetTrialEndUpsell,
-        ContinueThread,
-        ContinueWithBurnMode,
-        ToggleBurnMode,
-    ]
-);
-
-#[derive(Default, Clone, PartialEq, Deserialize, JsonSchema, Action)]
-#[action(namespace = agent)]
-pub struct NewThread {
-    #[serde(default)]
-    from_thread_id: Option<ThreadId>,
-}
-
-#[derive(PartialEq, Clone, Default, Debug, Deserialize, JsonSchema, Action)]
-#[action(namespace = agent)]
-pub struct ManageProfiles {
-    #[serde(default)]
-    pub customize_tools: Option<AgentProfileId>,
-}
-
-impl ManageProfiles {
-    pub fn customize_tools(profile_id: AgentProfileId) -> Self {
-        Self {
-            customize_tools: Some(profile_id),
-        }
-    }
-}
-
-#[derive(Clone)]
-pub(crate) enum ModelUsageContext {
-    Thread(Entity<Thread>),
-    InlineAssistant,
-}
-
-impl ModelUsageContext {
-    pub fn configured_model(&self, cx: &App) -> Option<ConfiguredModel> {
-        match self {
-            Self::Thread(thread) => thread.read(cx).model(),
-            Self::InlineAssistant => {
-                LanguageModelRegistry::read_global(cx).inline_assistant_model()
-            }
-        }
-    }
-
-    pub fn language_model(&self, cx: &App) -> Option<Arc<dyn LanguageModel>> {
-        self.configured_model(cx)
-            .map(|configured_model| configured_model.model)
-    }
-}
-
-/// Initializes the `agent` crate.
-pub fn init(
-    fs: Arc<dyn Fs>,
-    client: Arc<Client>,
-    prompt_builder: Arc<PromptBuilder>,
-    language_registry: Arc<LanguageRegistry>,
-    is_eval: bool,
-    cx: &mut App,
-) {
-    AgentSettings::register(cx);
-    SlashCommandSettings::register(cx);
-
-    assistant_context::init(client.clone(), cx);
-    rules_library::init(cx);
-    if !is_eval {
-        // Initializing the language model from the user settings messes with the eval, so we only initialize them when
-        // we're not running inside of the eval.
-        init_language_model_settings(cx);
-    }
-    assistant_slash_command::init(cx);
-    agent::init(cx);
-    agent_panel::init(cx);
-    context_server_configuration::init(language_registry.clone(), fs.clone(), cx);
-    TextThreadEditor::init(cx);
-
-    register_slash_commands(cx);
-    inline_assistant::init(
-        fs.clone(),
-        prompt_builder.clone(),
-        client.telemetry().clone(),
-        cx,
-    );
-    terminal_inline_assistant::init(
-        fs.clone(),
-        prompt_builder.clone(),
-        client.telemetry().clone(),
-        cx,
-    );
-    indexed_docs::init(cx);
-    cx.observe_new(move |workspace, window, cx| {
-        ConfigureContextServerModal::register(workspace, language_registry.clone(), window, cx)
-    })
-    .detach();
-    cx.observe_new(ManageProfilesModal::register).detach();
-}
-
-fn init_language_model_settings(cx: &mut App) {
-    update_active_language_model_from_settings(cx);
-
-    cx.observe_global::<SettingsStore>(update_active_language_model_from_settings)
-        .detach();
-    cx.subscribe(
-        &LanguageModelRegistry::global(cx),
-        |_, event: &language_model::Event, cx| match event {
-            language_model::Event::ProviderStateChanged
-            | language_model::Event::AddedProvider(_)
-            | language_model::Event::RemovedProvider(_) => {
-                update_active_language_model_from_settings(cx);
-            }
-            _ => {}
-        },
-    )
-    .detach();
-}
-
-fn update_active_language_model_from_settings(cx: &mut App) {
-    let settings = AgentSettings::get_global(cx);
-
-    fn to_selected_model(selection: &LanguageModelSelection) -> language_model::SelectedModel {
-        language_model::SelectedModel {
-            provider: LanguageModelProviderId::from(selection.provider.0.clone()),
-            model: LanguageModelId::from(selection.model.clone()),
-        }
-    }
-
-    let default = to_selected_model(&settings.default_model);
-    let inline_assistant = settings
-        .inline_assistant_model
-        .as_ref()
-        .map(to_selected_model);
-    let commit_message = settings
-        .commit_message_model
-        .as_ref()
-        .map(to_selected_model);
-    let thread_summary = settings
-        .thread_summary_model
-        .as_ref()
-        .map(to_selected_model);
-    let inline_alternatives = settings
-        .inline_alternatives
-        .iter()
-        .map(to_selected_model)
-        .collect::<Vec<_>>();
-
-    LanguageModelRegistry::global(cx).update(cx, |registry, cx| {
-        registry.select_default_model(Some(&default), cx);
-        registry.select_inline_assistant_model(inline_assistant.as_ref(), cx);
-        registry.select_commit_message_model(commit_message.as_ref(), cx);
-        registry.select_thread_summary_model(thread_summary.as_ref(), cx);
-        registry.select_inline_alternative_models(inline_alternatives, cx);
-    });
-}
-
-fn register_slash_commands(cx: &mut App) {
-    let slash_command_registry = SlashCommandRegistry::global(cx);
-
-    slash_command_registry.register_command(assistant_slash_commands::FileSlashCommand, true);
-    slash_command_registry.register_command(assistant_slash_commands::DeltaSlashCommand, true);
-    slash_command_registry.register_command(assistant_slash_commands::OutlineSlashCommand, true);
-    slash_command_registry.register_command(assistant_slash_commands::TabSlashCommand, true);
-    slash_command_registry
-        .register_command(assistant_slash_commands::CargoWorkspaceSlashCommand, true);
-    slash_command_registry.register_command(assistant_slash_commands::PromptSlashCommand, true);
-    slash_command_registry.register_command(assistant_slash_commands::SelectionCommand, true);
-    slash_command_registry.register_command(assistant_slash_commands::DefaultSlashCommand, false);
-    slash_command_registry.register_command(assistant_slash_commands::NowSlashCommand, false);
-    slash_command_registry
-        .register_command(assistant_slash_commands::DiagnosticsSlashCommand, true);
-    slash_command_registry.register_command(assistant_slash_commands::FetchSlashCommand, true);
-
-    cx.observe_flag::<assistant_slash_commands::StreamingExampleSlashCommandFeatureFlag, _>({
-        let slash_command_registry = slash_command_registry.clone();
-        move |is_enabled, _cx| {
-            if is_enabled {
-                slash_command_registry.register_command(
-                    assistant_slash_commands::StreamingExampleSlashCommand,
-                    false,
-                );
-            }
-        }
-    })
-    .detach();
-
-    update_slash_commands_from_settings(cx);
-    cx.observe_global::<SettingsStore>(update_slash_commands_from_settings)
-        .detach();
-}
-
-fn update_slash_commands_from_settings(cx: &mut App) {
-    let slash_command_registry = SlashCommandRegistry::global(cx);
-    let settings = SlashCommandSettings::get_global(cx);
-
-    if settings.docs.enabled {
-        slash_command_registry.register_command(assistant_slash_commands::DocsSlashCommand, true);
-    } else {
-        slash_command_registry.unregister_command(assistant_slash_commands::DocsSlashCommand);
-    }
-
-    if settings.cargo_workspace.enabled {
-        slash_command_registry
-            .register_command(assistant_slash_commands::CargoWorkspaceSlashCommand, true);
-    } else {
-        slash_command_registry
-            .unregister_command(assistant_slash_commands::CargoWorkspaceSlashCommand);
-    }
-}
--- a/crates/agent_ui/src/context_server_configuration.rs
+++ b/crates/agent_ui/src/context_server_configuration.rs
@@ -1,116 +0,0 @@
-use std::sync::Arc;
-
-use context_server::ContextServerId;
-use extension::ExtensionManifest;
-use fs::Fs;
-use gpui::WeakEntity;
-use language::LanguageRegistry;
-use project::project_settings::ProjectSettings;
-use settings::update_settings_file;
-use ui::prelude::*;
-use util::ResultExt;
-use workspace::Workspace;
-
-use crate::agent_configuration::ConfigureContextServerModal;
-
-pub(crate) fn init(language_registry: Arc<LanguageRegistry>, fs: Arc<dyn Fs>, cx: &mut App) {
-    cx.observe_new(move |_: &mut Workspace, window, cx| {
-        let Some(window) = window else {
-            return;
-        };
-
-        if let Some(extension_events) = extension::ExtensionEvents::try_global(cx).as_ref() {
-            cx.subscribe_in(extension_events, window, {
-                let language_registry = language_registry.clone();
-                let fs = fs.clone();
-                move |_, _, event, window, cx| match event {
-                    extension::Event::ExtensionInstalled(manifest) => {
-                        show_configure_mcp_modal(
-                            language_registry.clone(),
-                            manifest,
-                            cx.weak_entity(),
-                            window,
-                            cx,
-                        );
-                    }
-                    extension::Event::ExtensionUninstalled(manifest) => {
-                        remove_context_server_settings(
-                            manifest.context_servers.keys().cloned().collect(),
-                            fs.clone(),
-                            cx,
-                        );
-                    }
-                    extension::Event::ConfigureExtensionRequested(manifest) => {
-                        if !manifest.context_servers.is_empty() {
-                            show_configure_mcp_modal(
-                                language_registry.clone(),
-                                manifest,
-                                cx.weak_entity(),
-                                window,
-                                cx,
-                            );
-                        }
-                    }
-                    _ => {}
-                }
-            })
-            .detach();
-        } else {
-            log::info!(
-                "No extension events global found. Skipping context server configuration wizard"
-            );
-        }
-    })
-    .detach();
-}
-
-fn remove_context_server_settings(
-    context_server_ids: Vec<Arc<str>>,
-    fs: Arc<dyn Fs>,
-    cx: &mut App,
-) {
-    update_settings_file::<ProjectSettings>(fs, cx, move |settings, _| {
-        settings
-            .context_servers
-            .retain(|server_id, _| !context_server_ids.contains(server_id));
-    });
-}
-
-fn show_configure_mcp_modal(
-    language_registry: Arc<LanguageRegistry>,
-    manifest: &Arc<ExtensionManifest>,
-    workspace: WeakEntity<Workspace>,
-    window: &mut Window,
-    cx: &mut Context<'_, Workspace>,
-) {
-    if !window.is_window_active() {
-        return;
-    }
-
-    let ids = manifest.context_servers.keys().cloned().collect::<Vec<_>>();
-    if ids.is_empty() {
-        return;
-    }
-
-    window
-        .spawn(cx, async move |cx| {
-            for id in ids {
-                let Some(task) = cx
-                    .update(|window, cx| {
-                        ConfigureContextServerModal::show_modal_for_existing_server(
-                            ContextServerId(id.clone()),
-                            language_registry.clone(),
-                            workspace.clone(),
-                            window,
-                            cx,
-                        )
-                    })
-                    .ok()
-                else {
-                    continue;
-                };
-                task.await.log_err();
-            }
-        })
-        .detach();
-}
--- a/crates/anthropic/src/anthropic.rs
+++ b/crates/anthropic/src/anthropic.rs
@@ -1,11 +1,10 @@
-use std::io;
 use std::str::FromStr;
 use std::time::Duration;

 use anyhow::{Context as _, Result, anyhow};
 use chrono::{DateTime, Utc};
 use futures::{AsyncBufReadExt, AsyncReadExt, StreamExt, io::BufReader, stream::BoxStream};
-use http_client::http::{self, HeaderMap, HeaderValue};
+use http_client::http::{HeaderMap, HeaderValue};
 use http_client::{AsyncBody, HttpClient, Method, Request as HttpRequest};
 use serde::{Deserialize, Serialize};
 use strum::{EnumIter, EnumString};
@@ -337,7 +336,7 @@ pub async fn complete(
    let uri = format!("{api_url}/v1/messages");
    let beta_headers = Model::from_id(&request.model)
        .map(|model| model.beta_headers())
-        .unwrap_or_else(|_| Model::DEFAULT_BETA_HEADERS.join(","));
+        .unwrap_or_else(|_err| Model::DEFAULT_BETA_HEADERS.join(","));
    let request_builder = HttpRequest::builder()
        .method(Method::POST)
        .uri(uri)
@@ -347,30 +346,39 @@ pub async fn complete(
        .header("Content-Type", "application/json");

    let serialized_request =
-        serde_json::to_string(&request).map_err(AnthropicError::SerializeRequest)?;
+        serde_json::to_string(&request).context("failed to serialize request")?;
    let request = request_builder
        .body(AsyncBody::from(serialized_request))
-        .map_err(AnthropicError::BuildRequestBody)?;
+        .context("failed to construct request body")?;

    let mut response = client
        .send(request)
        .await
-        .map_err(AnthropicError::HttpSend)?;
-    let status = response.status();
-    let mut body = String::new();
-    response
-        .body_mut()
-        .read_to_string(&mut body)
-        .await
-        .map_err(AnthropicError::ReadResponse)?;
-
-    if status.is_success() {
-        Ok(serde_json::from_str(&body).map_err(AnthropicError::DeserializeResponse)?)
+        .context("failed to send request to Anthropic")?;
+    if response.status().is_success() {
+        let mut body = Vec::new();
+        response
+            .body_mut()
+            .read_to_end(&mut body)
+            .await
+            .context("failed to read response body")?;
+        let response_message: Response =
+            serde_json::from_slice(&body).context("failed to deserialize response body")?;
+        Ok(response_message)
    } else {
-        Err(AnthropicError::HttpResponseError {
-            status: status.as_u16(),
-            body,
-        })
+        let mut body = Vec::new();
+        response
+            .body_mut()
+            .read_to_end(&mut body)
+            .await
+            .context("failed to read response body")?;
+        let body_str =
+            std::str::from_utf8(&body).context("failed to parse response body as UTF-8")?;
+        Err(AnthropicError::Other(anyhow!(
+            "Failed to connect to API: {} {}",
+            response.status(),
+            body_str
+        )))
    }
 }

@@ -483,7 +491,7 @@ pub async fn stream_completion_with_rate_limit_info(
    let uri = format!("{api_url}/v1/messages");
    let beta_headers = Model::from_id(&request.base.model)
        .map(|model| model.beta_headers())
-        .unwrap_or_else(|_| Model::DEFAULT_BETA_HEADERS.join(","));
+        .unwrap_or_else(|_err| Model::DEFAULT_BETA_HEADERS.join(","));
    let request_builder = HttpRequest::builder()
        .method(Method::POST)
        .uri(uri)
@@ -492,15 +500,15 @@ pub async fn stream_completion_with_rate_limit_info(
        .header("X-Api-Key", api_key)
        .header("Content-Type", "application/json");
    let serialized_request =
-        serde_json::to_string(&request).map_err(AnthropicError::SerializeRequest)?;
+        serde_json::to_string(&request).context("failed to serialize request")?;
    let request = request_builder
        .body(AsyncBody::from(serialized_request))
-        .map_err(AnthropicError::BuildRequestBody)?;
+        .context("failed to construct request body")?;

    let mut response = client
        .send(request)
        .await
-        .map_err(AnthropicError::HttpSend)?;
+        .context("failed to send request to Anthropic")?;
    let rate_limits = RateLimitInfo::from_headers(response.headers());
    if response.status().is_success() {
        let reader = BufReader::new(response.into_body());
@@ -512,31 +520,37 @@ pub async fn stream_completion_with_rate_limit_info(
                        let line = line.strip_prefix("data: ")?;
                        match serde_json::from_str(line) {
                            Ok(response) => Some(Ok(response)),
-                            Err(error) => Some(Err(AnthropicError::DeserializeResponse(error))),
+                            Err(error) => Some(Err(AnthropicError::Other(anyhow!(error)))),
                        }
                    }
-                    Err(error) => Some(Err(AnthropicError::ReadResponse(error))),
+                    Err(error) => Some(Err(AnthropicError::Other(anyhow!(error)))),
                }
            })
            .boxed();
        Ok((stream, Some(rate_limits)))
    } else if let Some(retry_after) = rate_limits.retry_after {
-        Err(AnthropicError::RateLimit { retry_after })
+        Err(AnthropicError::RateLimit(retry_after))
    } else {
-        let mut body = String::new();
+        let mut body = Vec::new();
        response
            .body_mut()
-            .read_to_string(&mut body)
+            .read_to_end(&mut body)
            .await
-            .map_err(AnthropicError::ReadResponse)?;
+            .context("failed to read response body")?;

-        match serde_json::from_str::<Event>(&body) {
+        let body_str =
+            std::str::from_utf8(&body).context("failed to parse response body as UTF-8")?;
+
+        match serde_json::from_str::<Event>(body_str) {
            Ok(Event::Error { error }) => Err(AnthropicError::ApiError(error)),
-            Ok(_) => Err(AnthropicError::UnexpectedResponseFormat(body)),
-            Err(_) => Err(AnthropicError::HttpResponseError {
-                status: response.status().as_u16(),
-                body: body,
-            }),
+            Ok(_) => Err(AnthropicError::Other(anyhow!(
+                "Unexpected success response while expecting an error: '{body_str}'",
+            ))),
+            Err(_) => Err(AnthropicError::Other(anyhow!(
+                "Failed to connect to API: {} {}",
+                response.status(),
+                body_str,
+            ))),
        }
    }
 }
@@ -783,38 +797,17 @@ pub struct MessageDelta {
    pub stop_sequence: Option<String>,
 }

-#[derive(Debug)]
+#[derive(Error, Debug)]
 pub enum AnthropicError {
-    /// Failed to serialize the HTTP request body to JSON
-    SerializeRequest(serde_json::Error),
-
-    /// Failed to construct the HTTP request body
-    BuildRequestBody(http::Error),
-
-    /// Failed to send the HTTP request
-    HttpSend(anyhow::Error),
-
-    /// Failed to deserialize the response from JSON
-    DeserializeResponse(serde_json::Error),
-
-    /// Failed to read from response stream
-    ReadResponse(io::Error),
-
-    /// HTTP error response from the API
-    HttpResponseError { status: u16, body: String },
-
-    /// Rate limit exceeded
-    RateLimit { retry_after: Duration },
-
-    /// API returned an error response
+    #[error("rate limit exceeded, retry after {0:?}")]
+    RateLimit(Duration),
+    #[error("an error occurred while interacting with the Anthropic API: {error_type}: {message}", error_type = .0.error_type, message = .0.message)]
    ApiError(ApiError),
-
-    /// Unexpected response format
-    UnexpectedResponseFormat(String),
+    #[error("{0}")]
+    Other(#[from] anyhow::Error),
 }

-#[derive(Debug, Serialize, Deserialize, Error)]
-#[error("Anthropic API Error: {error_type}: {message}")]
+#[derive(Debug, Serialize, Deserialize)]
 pub struct ApiError {
    #[serde(rename = "type")]
    pub error_type: String,
--- a/crates/assistant_context/LICENSE-GPL
+++ b/crates/assistant_context/LICENSE-GPL
@@ -1 +0,0 @@
-../../LICENSE-GPL
--- a/crates/assistant_context_editor/Cargo.toml
+++ b/crates/assistant_context_editor/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "assistant_context"
+name = "assistant_context_editor"
 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/assistant_context.rs"
+path = "src/assistant_context_editor.rs"

 [dependencies]
 agent_settings.workspace = true
@@ -21,20 +21,27 @@ client.workspace = true
 clock.workspace = true
 collections.workspace = true
 context_server.workspace = true
+editor.workspace = true
+feature_flags.workspace = true
 fs.workspace = true
 futures.workspace = true
 fuzzy.workspace = true
 gpui.workspace = true
+indexed_docs.workspace = true
 language.workspace = true
 language_model.workspace = true
 log.workspace = true
+multi_buffer.workspace = true
 open_ai.workspace = true
+ordered-float.workspace = true
 parking_lot.workspace = true
 paths.workspace = true
+picker.workspace = true
 project.workspace = true
 prompt_store.workspace = true
 proto.workspace = true
 regex.workspace = true
+rope.workspace = true
 rpc.workspace = true
 serde.workspace = true
 serde_json.workspace = true
@@ -43,17 +50,21 @@ smallvec.workspace = true
 smol.workspace = true
 telemetry_events.workspace = true
 text.workspace = true
+theme.workspace = true
 ui.workspace = true
 util.workspace = true
 uuid.workspace = true
 workspace-hack.workspace = true
 workspace.workspace = true
+zed_actions.workspace = true
 zed_llm_client.workspace = true

 [dev-dependencies]
 indoc.workspace = true
 language_model = { workspace = true, features = ["test-support"] }
+languages = { workspace = true, features = ["test-support"] }
 pretty_assertions.workspace = true
 rand.workspace = true
+tree-sitter-md.workspace = true
 unindent.workspace = true
 workspace = { workspace = true, features = ["test-support"] }
--- a/crates/assistant_context_editor/LICENSE-GPL
+++ b/crates/assistant_context_editor/LICENSE-GPL
--- a/crates/assistant_context_editor/src/assistant_context_editor.rs
+++ b/crates/assistant_context_editor/src/assistant_context_editor.rs
@@ -0,0 +1,36 @@
+mod context;
+mod context_editor;
+mod context_history;
+mod context_store;
+pub mod language_model_selector;
+mod max_mode_tooltip;
+mod slash_command;
+mod slash_command_picker;
+
+use std::sync::Arc;
+
+use client::Client;
+use gpui::{App, Context};
+use workspace::Workspace;
+
+pub use crate::context::*;
+pub use crate::context_editor::*;
+pub use crate::context_history::*;
+pub use crate::context_store::*;
+pub use crate::slash_command::*;
+
+pub fn init(client: Arc<Client>, cx: &mut App) {
+    context_store::init(&client.into());
+    workspace::FollowableViewRegistry::register::<ContextEditor>(cx);
+
+    cx.observe_new(
+        |workspace: &mut Workspace, _window, _cx: &mut Context<Workspace>| {
+            workspace
+                .register_action(ContextEditor::quote_selection)
+                .register_action(ContextEditor::insert_selection)
+                .register_action(ContextEditor::copy_code)
+                .register_action(ContextEditor::handle_insert_dragged_files);
+        },
+    )
+    .detach();
+}
--- a/crates/assistant_context/src/assistant_context.rs
+++ b/crates/assistant_context/src/assistant_context.rs
@@ -1,6 +1,5 @@
 #[cfg(test)]
-mod assistant_context_tests;
-mod context_store;
+mod context_tests;

 use agent_settings::AgentSettings;
 use anyhow::{Context as _, Result, bail};
@@ -9,7 +8,7 @@ use assistant_slash_command::{
    SlashCommandResult, SlashCommandWorkingSet,
 };
 use assistant_slash_commands::FileCommandMetadata;
-use client::{self, Client, proto, telemetry::Telemetry};
+use client::{self, proto, telemetry::Telemetry};
 use clock::ReplicaId;
 use collections::{HashMap, HashSet};
 use fs::{Fs, RenameOptions};
@@ -48,12 +47,6 @@ use util::{ResultExt, TryFutureExt, post_inc};
 use uuid::Uuid;
 use zed_llm_client::CompletionIntent;

-pub use crate::context_store::*;
-
-pub fn init(client: Arc<Client>, _: &mut App) {
-    context_store::init(&client.into());
-}
-
 #[derive(Clone, Debug, Eq, PartialEq, Hash, PartialOrd, Ord, Serialize, Deserialize)]
 pub struct ContextId(String);

@@ -2346,13 +2339,13 @@ impl AssistantContext {
                completion_request.messages.push(request_message);
            }
        }
-        let supports_burn_mode = if let Some(model) = model {
-            model.supports_burn_mode()
+        let supports_max_mode = if let Some(model) = model {
+            model.supports_max_mode()
        } else {
            false
        };

-        if supports_burn_mode {
+        if supports_max_mode {
            completion_request.mode = Some(self.completion_mode.into());
        }
        completion_request
@@ -2523,12 +2516,6 @@ impl AssistantContext {
            }

            let message = start_message;
-            let at_end = range.end >= message.offset_range.end.saturating_sub(1);
-            let role_after = if range.start == range.end || at_end {
-                Role::User
-            } else {
-                message.role
-            };
            let role = message.role;
            let mut edited_buffer = false;

@@ -2563,7 +2550,7 @@ impl AssistantContext {
            };

            let suffix_metadata = MessageMetadata {
-                role: role_after,
+                role,
                status: MessageStatus::Done,
                timestamp: suffix.id.0,
                cache: None,
--- a/crates/assistant_context_editor/src/context/context_tests.rs
+++ b/crates/assistant_context_editor/src/context/context_tests.rs
--- a/crates/assistant_context_editor/src/context_editor.rs
+++ b/crates/assistant_context_editor/src/context_editor.rs
@@ -1,8 +1,8 @@
 use crate::{
-    burn_mode_tooltip::BurnModeTooltip,
    language_model_selector::{
        LanguageModelSelector, ToggleModelSelector, language_model_selector,
    },
+    max_mode_tooltip::MaxModeTooltip,
 };
 use agent_settings::{AgentSettings, CompletionMode};
 use anyhow::Result;
@@ -21,16 +21,17 @@ use editor::{
        BlockPlacement, BlockProperties, BlockStyle, Crease, CreaseMetadata, CustomBlockId, FoldId,
        RenderBlock, ToDisplayPoint,
    },
+    scroll::Autoscroll,
 };
 use editor::{FoldPlaceholder, display_map::CreaseId};
 use fs::Fs;
 use futures::FutureExt;
 use gpui::{
-    Action, Animation, AnimationExt, AnyElement, AnyView, App, ClipboardEntry, ClipboardItem,
-    Empty, Entity, EventEmitter, FocusHandle, Focusable, FontWeight, Global, InteractiveElement,
+    Animation, AnimationExt, AnyElement, AnyView, App, ClipboardEntry, ClipboardItem, Empty,
+    Entity, EventEmitter, FocusHandle, Focusable, FontWeight, Global, InteractiveElement,
    IntoElement, ParentElement, Pixels, Render, RenderImage, SharedString, Size,
    StatefulInteractiveElement, Styled, Subscription, Task, Transformation, WeakEntity, actions,
-    div, img, percentage, point, prelude::*, pulsating_between, size,
+    div, img, impl_internal_actions, percentage, point, prelude::*, pulsating_between, size,
 };
 use indexed_docs::IndexedDocsStore;
 use language::{
@@ -68,18 +69,21 @@ use workspace::{
    searchable::{Direction, SearchableItemHandle},
 };
 use workspace::{
-    Save, Toast, Workspace,
+    Save, Toast, ToolbarItemEvent, ToolbarItemLocation, ToolbarItemView, Workspace,
    item::{self, FollowableItem, Item, ItemHandle},
    notifications::NotificationId,
    pane,
    searchable::{SearchEvent, SearchableItem},
 };

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

 actions!(
@@ -95,13 +99,14 @@ actions!(
    ]
 );

-#[derive(PartialEq, Clone, Action)]
-#[action(namespace = assistant, no_json, no_register)]
+#[derive(PartialEq, Clone)]
 pub enum InsertDraggedFiles {
    ProjectPaths(Vec<ProjectPath>),
    ExternalFiles(Vec<PathBuf>),
 }

+impl_internal_actions!(assistant, [InsertDraggedFiles]);
+
 #[derive(Copy, Clone, Debug, PartialEq)]
 struct ScrollPosition {
    offset_before_cursor: gpui::Point<f32>,
@@ -127,7 +132,7 @@ pub trait AgentPanelDelegate {
        workspace: &mut Workspace,
        window: &mut Window,
        cx: &mut Context<Workspace>,
-    ) -> Option<Entity<TextThreadEditor>>;
+    ) -> Option<Entity<ContextEditor>>;

    fn open_saved_context(
        &self,
@@ -143,7 +148,7 @@ pub trait AgentPanelDelegate {
        context_id: ContextId,
        window: &mut Window,
        cx: &mut Context<Workspace>,
-    ) -> Task<Result<Entity<TextThreadEditor>>>;
+    ) -> Task<Result<Entity<ContextEditor>>>;

    fn quote_selection(
        &self,
@@ -172,7 +177,7 @@ struct GlobalAssistantPanelDelegate(Arc<dyn AgentPanelDelegate>);

 impl Global for GlobalAssistantPanelDelegate {}

-pub struct TextThreadEditor {
+pub struct ContextEditor {
    context: Entity<AssistantContext>,
    fs: Arc<dyn Fs>,
    slash_commands: Arc<SlashCommandWorkingSet>,
@@ -202,24 +207,10 @@ pub struct TextThreadEditor {
    language_model_selector_menu_handle: PopoverMenuHandle<LanguageModelSelector>,
 }

+pub const DEFAULT_TAB_TITLE: &str = "New Chat";
 const MAX_TAB_TITLE_LEN: usize = 16;

-impl TextThreadEditor {
-    pub fn init(cx: &mut App) {
-        workspace::FollowableViewRegistry::register::<TextThreadEditor>(cx);
-
-        cx.observe_new(
-            |workspace: &mut Workspace, _window, _cx: &mut Context<Workspace>| {
-                workspace
-                    .register_action(TextThreadEditor::quote_selection)
-                    .register_action(TextThreadEditor::insert_selection)
-                    .register_action(TextThreadEditor::copy_code)
-                    .register_action(TextThreadEditor::handle_insert_dragged_files);
-            },
-        )
-        .detach();
-    }
-
+impl ContextEditor {
    pub fn for_context(
        context: Entity<AssistantContext>,
        fs: Arc<dyn Fs>,
@@ -388,7 +379,7 @@ impl TextThreadEditor {
                cursor..cursor
            };
            self.editor.update(cx, |editor, cx| {
-                editor.change_selections(Default::default(), window, cx, |selections| {
+                editor.change_selections(Some(Autoscroll::fit()), window, cx, |selections| {
                    selections.select_ranges([new_selection])
                });
            });
@@ -448,7 +439,8 @@ impl TextThreadEditor {
        if let Some(command) = self.slash_commands.command(name, cx) {
            self.editor.update(cx, |editor, cx| {
                editor.transact(window, cx, |editor, window, cx| {
-                    editor.change_selections(Default::default(), window, cx, |s| s.try_cancel());
+                    editor
+                        .change_selections(Some(Autoscroll::fit()), window, cx, |s| s.try_cancel());
                    let snapshot = editor.buffer().read(cx).snapshot(cx);
                    let newest_cursor = editor.selections.newest::<Point>(cx).head();
                    if newest_cursor.column > 0
@@ -1288,7 +1280,7 @@ impl TextThreadEditor {
    /// Returns either the selected text, or the content of the Markdown code
    /// block surrounding the cursor.
    fn get_selection_or_code_block(
-        context_editor_view: &Entity<TextThreadEditor>,
+        context_editor_view: &Entity<ContextEditor>,
        cx: &mut Context<Workspace>,
    ) -> Option<(String, bool)> {
        const CODE_FENCE_DELIMITER: &'static str = "```";
@@ -1581,7 +1573,7 @@ impl TextThreadEditor {

            self.editor.update(cx, |editor, cx| {
                editor.transact(window, cx, |this, window, cx| {
-                    this.change_selections(Default::default(), window, cx, |s| {
+                    this.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
                        s.select(selections);
                    });
                    this.insert("", window, cx);
@@ -2038,7 +2030,7 @@ impl TextThreadEditor {
    /// Whether or not we should allow messages to be sent.
    /// Will return false if the selected provided has a configuration error or
    /// if the user has not accepted the terms of service for this provider.
-    fn sending_disabled(&self, cx: &mut Context<'_, TextThreadEditor>) -> bool {
+    fn sending_disabled(&self, cx: &mut Context<'_, ContextEditor>) -> bool {
        let model_registry = LanguageModelRegistry::read_global(cx);
        let Some(configuration_error) =
            model_registry.configuration_error(model_registry.default_model(), cx)
@@ -2073,12 +2065,12 @@ impl TextThreadEditor {
        )
    }

-    fn render_burn_mode_toggle(&self, cx: &mut Context<Self>) -> Option<AnyElement> {
+    fn render_max_mode_toggle(&self, cx: &mut Context<Self>) -> Option<AnyElement> {
        let context = self.context().read(cx);
        let active_model = LanguageModelRegistry::read_global(cx)
            .default_model()
            .map(|default| default.model)?;
-        if !active_model.supports_burn_mode() {
+        if !active_model.supports_max_mode() {
            return None;
        }

@@ -2105,7 +2097,7 @@ impl TextThreadEditor {
                    });
                }))
                .tooltip(move |_window, cx| {
-                    cx.new(|_| BurnModeTooltip::new().selected(burn_mode_enabled))
+                    cx.new(|_| MaxModeTooltip::new().selected(burn_mode_enabled))
                        .into()
                })
                .into_any_element(),
@@ -2120,21 +2112,12 @@ impl TextThreadEditor {
        let active_model = LanguageModelRegistry::read_global(cx)
            .default_model()
            .map(|default| default.model);
+        let focus_handle = self.editor().focus_handle(cx).clone();
        let model_name = match active_model {
            Some(model) => model.name().0,
            None => SharedString::from("No model selected"),
        };

-        let active_provider = LanguageModelRegistry::read_global(cx)
-            .default_model()
-            .map(|default| default.provider);
-        let provider_icon = match active_provider {
-            Some(provider) => provider.icon(),
-            None => IconName::Ai,
-        };
-
-        let focus_handle = self.editor().focus_handle(cx).clone();
-
        PickerPopoverMenu::new(
            self.language_model_selector.clone(),
            ButtonLike::new("active-model")
@@ -2142,16 +2125,10 @@ impl TextThreadEditor {
                .child(
                    h_flex()
                        .gap_0p5()
-                        .child(
-                            Icon::new(provider_icon)
-                                .color(Color::Muted)
-                                .size(IconSize::XSmall),
-                        )
                        .child(
                            Label::new(model_name)
-                                .color(Color::Muted)
                                .size(LabelSize::Small)
-                                .ml_0p5(),
+                                .color(Color::Muted),
                        )
                        .child(
                            Icon::new(IconName::ChevronDown)
@@ -2570,10 +2547,10 @@ struct SelectedCreaseMetadata {
    crease: CreaseMetadata,
 }

-impl EventEmitter<EditorEvent> for TextThreadEditor {}
-impl EventEmitter<SearchEvent> for TextThreadEditor {}
+impl EventEmitter<EditorEvent> for ContextEditor {}
+impl EventEmitter<SearchEvent> for ContextEditor {}

-impl Render for TextThreadEditor {
+impl Render for ContextEditor {
    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
        let provider = LanguageModelRegistry::read_global(cx)
            .default_model()
@@ -2588,19 +2565,19 @@ impl Render for TextThreadEditor {
        };

        let language_model_selector = self.language_model_selector_menu_handle.clone();
-        let burn_mode_toggle = self.render_burn_mode_toggle(cx);
+        let max_mode_toggle = self.render_max_mode_toggle(cx);

        v_flex()
            .key_context("ContextEditor")
-            .capture_action(cx.listener(TextThreadEditor::cancel))
-            .capture_action(cx.listener(TextThreadEditor::save))
-            .capture_action(cx.listener(TextThreadEditor::copy))
-            .capture_action(cx.listener(TextThreadEditor::cut))
-            .capture_action(cx.listener(TextThreadEditor::paste))
-            .capture_action(cx.listener(TextThreadEditor::cycle_message_role))
-            .capture_action(cx.listener(TextThreadEditor::confirm_command))
-            .on_action(cx.listener(TextThreadEditor::assist))
-            .on_action(cx.listener(TextThreadEditor::split))
+            .capture_action(cx.listener(ContextEditor::cancel))
+            .capture_action(cx.listener(ContextEditor::save))
+            .capture_action(cx.listener(ContextEditor::copy))
+            .capture_action(cx.listener(ContextEditor::cut))
+            .capture_action(cx.listener(ContextEditor::paste))
+            .capture_action(cx.listener(ContextEditor::cycle_message_role))
+            .capture_action(cx.listener(ContextEditor::confirm_command))
+            .on_action(cx.listener(ContextEditor::assist))
+            .on_action(cx.listener(ContextEditor::split))
            .on_action(move |_: &ToggleModelSelector, window, cx| {
                language_model_selector.toggle(window, cx);
            })
@@ -2643,7 +2620,7 @@ impl Render for TextThreadEditor {
                        h_flex()
                            .gap_0p5()
                            .child(self.render_inject_context_menu(cx))
-                            .when_some(burn_mode_toggle, |this, element| this.child(element)),
+                            .when_some(max_mode_toggle, |this, element| this.child(element)),
                    )
                    .child(
                        h_flex()
@@ -2655,13 +2632,13 @@ impl Render for TextThreadEditor {
    }
 }

-impl Focusable for TextThreadEditor {
+impl Focusable for ContextEditor {
    fn focus_handle(&self, cx: &App) -> FocusHandle {
        self.editor.focus_handle(cx)
    }
 }

-impl Item for TextThreadEditor {
+impl Item for ContextEditor {
    type Event = editor::EditorEvent;

    fn tab_content_text(&self, _detail: usize, cx: &App) -> SharedString {
@@ -2734,7 +2711,7 @@ impl Item for TextThreadEditor {
    }
 }

-impl SearchableItem for TextThreadEditor {
+impl SearchableItem for ContextEditor {
    type Match = <Editor as SearchableItem>::Match;

    fn clear_matches(&mut self, window: &mut Window, cx: &mut Context<Self>) {
@@ -2815,7 +2792,7 @@ impl SearchableItem for TextThreadEditor {
    }
 }

-impl FollowableItem for TextThreadEditor {
+impl FollowableItem for ContextEditor {
    fn remote_id(&self) -> Option<workspace::ViewId> {
        self.remote_id
    }
@@ -2937,8 +2914,22 @@ impl FollowableItem for TextThreadEditor {
    }
 }

+pub struct ContextEditorToolbarItem {
+    active_context_editor: Option<WeakEntity<ContextEditor>>,
+    model_summary_editor: Entity<Editor>,
+}
+
+impl ContextEditorToolbarItem {
+    pub fn new(model_summary_editor: Entity<Editor>) -> Self {
+        Self {
+            active_context_editor: None,
+            model_summary_editor,
+        }
+    }
+}
+
 pub fn render_remaining_tokens(
-    context_editor: &Entity<TextThreadEditor>,
+    context_editor: &Entity<ContextEditor>,
    cx: &App,
 ) -> Option<impl IntoElement + use<>> {
    let context = &context_editor.read(cx).context;
@@ -2989,6 +2980,98 @@ pub fn render_remaining_tokens(
    )
 }

+impl Render for ContextEditorToolbarItem {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let left_side = h_flex()
+            .group("chat-title-group")
+            .gap_1()
+            .items_center()
+            .flex_grow()
+            .child(
+                div()
+                    .w_full()
+                    .when(self.active_context_editor.is_some(), |left_side| {
+                        left_side.child(self.model_summary_editor.clone())
+                    }),
+            )
+            .child(
+                div().visible_on_hover("chat-title-group").child(
+                    IconButton::new("regenerate-context", IconName::RefreshTitle)
+                        .shape(ui::IconButtonShape::Square)
+                        .tooltip(Tooltip::text("Regenerate Title"))
+                        .on_click(cx.listener(move |_, _, _window, cx| {
+                            cx.emit(ContextEditorToolbarItemEvent::RegenerateSummary)
+                        })),
+                ),
+            );
+
+        let right_side = h_flex()
+            .gap_2()
+            // TODO display this in a nicer way, once we have a design for it.
+            // .children({
+            //     let project = self
+            //         .workspace
+            //         .upgrade()
+            //         .map(|workspace| workspace.read(cx).project().downgrade());
+            //
+            //     let scan_items_remaining = cx.update_global(|db: &mut SemanticDb, cx| {
+            //         project.and_then(|project| db.remaining_summaries(&project, cx))
+            //     });
+            //     scan_items_remaining
+            //         .map(|remaining_items| format!("Files to scan: {}", remaining_items))
+            // })
+            .children(
+                self.active_context_editor
+                    .as_ref()
+                    .and_then(|editor| editor.upgrade())
+                    .and_then(|editor| render_remaining_tokens(&editor, cx)),
+            );
+
+        h_flex()
+            .px_0p5()
+            .size_full()
+            .gap_2()
+            .justify_between()
+            .child(left_side)
+            .child(right_side)
+    }
+}
+
+impl ToolbarItemView for ContextEditorToolbarItem {
+    fn set_active_pane_item(
+        &mut self,
+        active_pane_item: Option<&dyn ItemHandle>,
+        _window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> ToolbarItemLocation {
+        self.active_context_editor = active_pane_item
+            .and_then(|item| item.act_as::<ContextEditor>(cx))
+            .map(|editor| editor.downgrade());
+        cx.notify();
+        if self.active_context_editor.is_none() {
+            ToolbarItemLocation::Hidden
+        } else {
+            ToolbarItemLocation::PrimaryRight
+        }
+    }
+
+    fn pane_focus_update(
+        &mut self,
+        _pane_focused: bool,
+        _window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        cx.notify();
+    }
+}
+
+impl EventEmitter<ToolbarItemEvent> for ContextEditorToolbarItem {}
+
+pub enum ContextEditorToolbarItemEvent {
+    RegenerateSummary,
+}
+impl EventEmitter<ContextEditorToolbarItemEvent> for ContextEditorToolbarItem {}
+
 enum PendingSlashCommand {}

 fn invoked_slash_command_fold_placeholder(
@@ -3154,7 +3237,6 @@ pub fn make_lsp_adapter_delegate(
 #[cfg(test)]
 mod tests {
    use super::*;
-    use editor::SelectionEffects;
    use fs::FakeFs;
    use gpui::{App, TestAppContext, VisualTestContext};
    use indoc::indoc;
@@ -3324,7 +3406,7 @@ mod tests {
        cx: &mut TestAppContext,
    ) -> (
        Entity<AssistantContext>,
-        Entity<TextThreadEditor>,
+        Entity<ContextEditor>,
        VisualTestContext,
    ) {
        cx.update(init_test);
@@ -3340,7 +3422,7 @@ mod tests {
        let context_editor = window
            .update(&mut cx, |_, window, cx| {
                cx.new(|cx| {
-                    let editor = TextThreadEditor::for_context(
+                    let editor = ContextEditor::for_context(
                        context.clone(),
                        fs,
                        workspace.downgrade(),
@@ -3373,16 +3455,14 @@ mod tests {
    }

    fn assert_copy_paste_context_editor<T: editor::ToOffset>(
-        context_editor: &Entity<TextThreadEditor>,
+        context_editor: &Entity<ContextEditor>,
        range: Range<T>,
        expected_text: &str,
        cx: &mut VisualTestContext,
    ) {
        context_editor.update_in(cx, |context_editor, window, cx| {
            context_editor.editor.update(cx, |editor, cx| {
-                editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                    s.select_ranges([range])
-                });
+                editor.change_selections(None, window, cx, |s| s.select_ranges([range]));
            });

            context_editor.copy(&Default::default(), window, cx);
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Zed Bot	ab5a291e6f	Bump to 0.192.7 for @SomeoneToIgnore	2025-06-27 16:44:45 +00:00
Kirill Bulatov	e3ea0fa018	Respect server capabilities on queries (#33538 ) Closes https://github.com/zed-industries/zed/issues/33522 Turns out a bunch of Zed requests were not checking their capabilities correctly, due to odd copy-paste and due to default that assumed that the capabilities are met. Adjust the code, which includes the document colors, add the test on the colors case. Release Notes: - Fixed excessive document colors requests for unrelated files	2025-06-27 19:41:03 +03:00
gcp-cherry-pick-bot[bot]	3e847472f6	Fix blend alpha colors with editor background in inline preview (cherry-pick #33513 ) (#33516 ) Cherry-picked Fix blend alpha colors with editor background in inline preview (#33513) Closes #33505 ## Before <img width="434" alt="Screenshot 2025-06-27 at 12 22 57" src="https://github.com/user-attachments/assets/ac215a39-b3fe-4c9e-bd7d-0d7568d5fd1f" /> ## After <img width="441" alt="Screenshot 2025-06-27 at 12 22 47" src="https://github.com/user-attachments/assets/28218ed6-c1aa-4d3f-a268-def2fa9f0340" /> Release Notes: - Fixed inline color previews not correctly blending alpha/transparency values with the editor background Co-authored-by: ddoemonn <109994179+ddoemonn@users.noreply.github.com>	2025-06-27 12:56:25 +03:00
gcp-cherry-pick-bot[bot]	2cbdc22018	debugger: Fix treatment of node-terminal scenarios (cherry-pick #33432 ) (#33468 ) Cherry-picked debugger: Fix treatment of node-terminal scenarios (#33432) - Normalize `node-terminal` to `pwa-node` before sending to DAP - Split `command` into `program` and `args` - Run in external console Release Notes: - debugger: Fixed debugging JavaScript tasks that used `"type": "node-terminal"`. Co-authored-by: Cole Miller <cole@zed.dev>	2025-06-26 15:02:45 -04:00
Zed Bot	dcca5514e8	Bump to 0.192.6 for @smitbarmase	2025-06-26 07:59:31 +00:00
gcp-cherry-pick-bot[bot]	4d73569ed7	editor: Utilize `filter_text` from language server for `filter_range` (cherry-pick #33155 ) (#33436 ) Cherry-picked editor: Utilize `filter_text` from language server for `filter_range` (#33155) Closes #33106 Instead of directly using `filter_text` in `StringMatchCandidate`, which yields better results for fuzzy matching but messes up with highlighting letters in bold, as `positions` list generated by fuzzy crate are now of `filter_text` and not `label` shown to the user. This PR fixes it by keeping use of `filter_range` in `StringMatchCandidate`, which is range w.r.t to `label` shown to user. And actually generating this `filter_range` at source by using `filter_range` if exists. - [x] Tests Release Notes: - Fixed issue where incorrect letters are marked as bold in completions. Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com>	2025-06-26 13:17:26 +05:30
vipex	17f3ff1231	pane: Update pinned tab count when it exceeds actual tab count (#33405 ) ## Summary This PR improves the workaround introduced in #33335 that handles cases where the pinned tab count exceeds the actual tab count during workspace deserialization. ## Problem The original workaround in #33335 successfully prevented the panic but had two issues: 1. Console spam: The warning message was logged repeatedly because `self.pinned_tab_count` wasn't updated to match the actual tab count 2. Auto-pinning behavior: New tabs up until you exceed the old safe tab count were automatically pinned after the workaround was triggered. ## Solution Updates the defensive code to set `self.pinned_tab_count = tab_count` when the mismatch is detected, ensuring: - The warning is only logged once when encountered. - New tabs behave normally (aren't auto-pinned) - The workspace remains in a consistent state This is an immediate fix for the workaround. I'll attempt to open up a follow-up PR when i get the chance that will address the root cause by implementing serialization for empty untitled tabs, as discussed in #33342. Release Notes: - N/A	2025-06-26 02:05:07 -04:00
Peter Tripp	bf9b2a3ace	Fix empty code actions menu trapping cursor (#33386 ) Closes: https://github.com/zed-industries/zed/issues/33382 Follow-up to: https://github.com/zed-industries/zed/pull/32579 CC: @ConradIrwin @Anthony-Eid Release Notes: - Fixed an issue with empty code actions menu locking the cursor (Preview Only)	2025-06-25 13:28:22 -04:00
Joseph T. Lyons	161ccf8e38	v0.192.x stable	2025-06-25 11:35:00 -04:00
gcp-cherry-pick-bot[bot]	81212b62fb	Add up and down global bindings for `menu::SelectNext` and `menu::SelectPrevious` (cherry-pick #32981 ) (#33388 ) Cherry-picked Add up and down global bindings for `menu::SelectNext` and `menu::SelectPrevious` (#32981) Closes https://github.com/zed-industries/zed/discussions/32587 Release Notes: - Fixed Linux keybindings not having up/down keys bound for menu navigation Co-authored-by: Kirill Bulatov <kirill@zed.dev>	2025-06-25 11:06:40 -04:00
gcp-cherry-pick-bot[bot]	d63d49f84e	debugger: Support passing custom arguments to debug adapters (cherry-pick #33251 ) (#33379 ) Cherry-picked debugger: Support passing custom arguments to debug adapters (#33251) Custom arguments replace any arguments that we normally pass to the DAP. For interpreted languages, they are passed to the interpreter after the DAP path or module. They can be combined with a custom binary, or you can omit `dap.binary` and just customize the arguments to the DAPs we download. This doesn't take care of updating the extension API to support custom arguments. Release Notes: - debugger: Implemented support for passing custom arguments to a debug adapter binary using the `dap.args` setting. - debugger: Fixed not being able to use the `dap` setting in `.zed/settings.json`. Co-authored-by: Cole Miller <cole@zed.dev>	2025-06-25 10:32:24 -04:00
Bennet Bo Fenner	182ec4f3e8	agent: Fix issue where unconfigured MCP extensions would not start server (backport #33365)	2025-06-25 15:46:07 +02:00
Bennet Bo Fenner	d5b7ca180b	vercel: Use proper model identifiers and add image support (#33377 ) Follow up to previous PRs: - Return `true` in `supports_images` - v0 supports images already - Rename model id to match the exact version of the model `v0-1.5-md` (For now we do not expose `sm`/`lg` variants since they seem not to be available via the API) - Provide autocompletion in settings for using `vercel` as a `provider` Release Notes: - N/A	2025-06-25 15:30:49 +02:00
Bennet Bo Fenner	e5752e42ad	vercel: Reuse existing OpenAI code (#33362 ) Follow up to #33292 Since Vercel's API is OpenAI compatible, we can reuse a bunch of code. Release Notes: - N/A	2025-06-25 15:30:45 +02:00
Danilo Leal	e09dbfc4cf	Add support for Vercel as a language model provider (#33292 ) Vercel v0 is an OpenAI-compatible model, so this is mostly a dupe of the OpenAI provider files with some adaptations for v0, including going ahead and using the custom endpoint for the API URL field. Release Notes: - Added support for Vercel as a language model provider.	2025-06-25 15:30:41 +02:00
gcp-cherry-pick-bot[bot]	948dbba28e	agent: Do not send stale files notifications (cherry-pick #32974 ) (#33309 ) Cherry-picked agent: Do not send stale files notifications (#32974) Removing it for two reasons: 1. We need a better implementation that doesn't hurt caching and doesn't distracts the agent too much (see https://github.com/zed-industries/zed/pull/32876 for more context) 2. Current insertion point of notifications doesn't play well with Claude Thinking models (see https://github.com/zed-industries/zed/issues/33000#issuecomment-2991709484) I think we should get this code back in a form of a tool. But for now, I'm dropping it to resolve recent issues. Closes #33000 Release Notes: - N/A Co-authored-by: Oleksiy Syvokon <oleksiy@zed.dev>	2025-06-25 14:32:19 +03:00
Joseph T. Lyons	975cd9e93e	Patch panic around pinned tab count (#33335 ) After much investigation, I have not been able to track down what is causing [this panic](https://github.com/zed-industries/zed/issues/33342). I'm clamping the value for now, because a bug is better than a crash. Hopefully someone finds reproduction steps, and I will implement a proper fix. Release Notes: - N/A	2025-06-24 16:26:53 -04:00
gcp-cherry-pick-bot[bot]	5f598004be	Fix being unable to input a whitespace character in collab channels filter (cherry-pick #33318 ) (#33324 ) Cherry-picked Fix being unable to input a whitespace character in collab channels filter (#33318) Before, `space` was always causing a channel join. Now it's less fluent, one has to press `ESC` to get the focus out of the filter editor and then `space` starts joining the channel. Release Notes: - Fixed being unable to input a whitespace character in collab channels filter Co-authored-by: Kirill Bulatov <kirill@zed.dev>	2025-06-24 19:59:15 +03:00
Zed Bot	62a10605cb	Bump to 0.192.5 for @bennetbo	2025-06-24 16:29:14 +00:00
Bennet Bo Fenner	4d6cd504e7	agent: Fix issue with Anthropic thinking models (#33317 ) cc @osyvokon We were seeing a bunch of errors in our backend when people were using Claude models with thinking enabled. In the logs we would see > an error occurred while interacting with the Anthropic API: invalid_request_error: messages.x.content.0.type: Expected `thinking` or `redacted_thinking`, but found `text`. When `thinking` is enabled, a final `assistant` message must start with a thinking block (preceeding the lastmost set of `tool_use` and `tool_result` blocks). We recommend you include thinking blocks from previous turns. To avoid this requirement, disable `thinking`. Please consult our documentation at https://docs.anthropic.com/en/docs/build-with-claude/extended-thinking However, this issue did not occur frequently and was not easily reproducible. Turns out it was triggered by us not correctly handling [Redacted Thinking Blocks](https://docs.anthropic.com/en/docs/build-with-claude/extended-thinking#thinking-redaction). I could constantly reproduce this issue by including this magic string: `ANTHROPIC_MAGIC_STRING_TRIGGER_REDACTED_THINKING_46C9A13E193C177646C7398A98432ECCCE4C1253D5E2D82641AC0E52CC2876CB ` in the request, which forces `claude-3-7-sonnet` to emit redacted thinking blocks (confusingly the magic string does not seem to be working for `claude-sonnet-4`). As soon as we hit a tool call Anthropic would return an error. Thanks to @osyvokon for pointing me in the right direction 😄! Release Notes: - agent: Fixed an issue where Anthropic models would sometimes return an error when thinking was enabled	2025-06-24 18:25:06 +02:00
Zed Bot	ca92dfc843	Bump to 0.192.4 for @bennetbo	2025-06-24 14:15:13 +00:00
Bennet Bo Fenner	d4d4512bd7	agent: Ensure tool names are unique (#33237 ) Closes #31903 Release Notes: - agent: Fix an issue where an error would occur when MCP servers specified tools with the same name --------- Co-authored-by: Ben Brandt <benjamin.j.brandt@gmail.com>	2025-06-24 15:58:36 +02:00
gcp-cherry-pick-bot[bot]	f219b4e19d	Implement save functionality for diff view (cherry-pick #33298 ) (#33302 ) Cherry-picked Implement save functionality for diff view (#33298) Add `can_save` and `save` methods to `DiffView`, enabling users to save changes made within the diff view. Release Notes: - Allow saving changes in the `zed --diff` view Co-authored-by: Ben Brandt <benjamin.j.brandt@gmail.com>	2025-06-24 13:23:18 +02:00
gcp-cherry-pick-bot[bot]	4f69449f47	copilot: Remove PromptTokensDetails from Usage struct (cherry-pick #33029 ) (#33108 ) Cherry-picked copilot: Remove PromptTokensDetails from Usage struct (#33029) Closes #33024 Release Notes: - Removed `PromptTokensDetails` from `Usage` as Gemini no longer supplies cached token data for copilot. Co-authored-by: Umesh Yadav <23421535+imumesh18@users.noreply.github.com>	2025-06-22 00:51:53 +03:00
gcp-cherry-pick-bot[bot]	7fde6d109e	copilot: Fix config dir logic to support Flatpak environments (cherry-pick #32901 ) (#33158 ) Cherry-picked copilot: Fix config dir logic to support Flatpak environments (#32901) Closes #30784 In github copilot we were not handling the config path correctly for FLATPAK. * Only tested on mac don't have access to other platform. But this should work on other platform as well. It follows the similar pattern seen in zed config path resolution. - [x] Macos - [ ] Linux - [ ] Linux with Flatpak - [ ] Windows Release Notes: - Fix copilot config detection for flatpack Co-authored-by: Umesh Yadav <23421535+imumesh18@users.noreply.github.com>	2025-06-21 17:35:37 +02:00
Joseph T. Lyons	8771862c2b	zed 0.192.3	2025-06-20 10:59:46 -04:00
Piotr Osiewicz	c8d71d6526	docs: Update manifest keys in debugger extension docs (#33085 ) This is silly and caused at least one of our users a lot of confusion. Closes #33040 Release Notes: - N/A	2025-06-20 10:53:44 -04:00
Anthony Eid	a2c5507373	debugger: Refresh variable list on set variable value response (#33078 ) Variable list wasn't notified when a set variable value request was successfully. This caused the variable list and inline values to show stale data in some cases, which this PR fixes. Release Notes: - debugger: Fix bug where setting a variable's value wouldn't update the variable list or inline values	2025-06-20 10:53:32 -04:00
Anthony Eid	950c36aaa0	docs: Update development debugger guide to include Zed's debugger (#33080 ) Closes #33069 Release Notes: - N/A	2025-06-20 10:53:16 -04:00
Piotr Osiewicz	23d89e6b4b	debugger: Move breakpoint management to the pane strip (#33062 ) Closes #ISSUE Release Notes: - debugger: Moved "remove breakpoint" button to the top of a breakpoint list"	2025-06-20 10:53:02 -04:00
Max Brunsfeld	ebae894774	Fix handling of `--diff` flag (#33094 ) * Restore the ability to combine --diff with other path arguments * Restore combining --diff with --wait There is still one defect in the current handling of `--diff`: when Zed is already open, we'll open the diff view in your current active zed window. It would be better to search all of the open zed windows for any window containing the diffed paths, but implementing that is a bit complex. Currently, the logic for picking an existing zed window is coupled to the logic for opening buffers in that window. I'd like to decouple it, but I wanted to keep this change small, so that we hotfix it to stable without too much risk. Release Notes: - Fixed a bug where the `--diff` CLI flag did not work with `--wait` Co-authored-by: Ben Brandt <benjamin.j.brandt@gmail.com>	2025-06-20 13:03:27 +01:00
gcp-cherry-pick-bot[bot]	0df68f8cb7	Fix pull diagnostics on the remote clients (cherry-pick #33028 ) (#33030 ) Cherry-picked Fix pull diagnostics on the remote clients (#33028) Also add a test. Release Notes: - Fixed pull diagnostics on the remote clients --------- Co-authored-by: Kirill Bulatov <kirill@zed.dev>	2025-06-19 22:45:40 +03:00
gcp-cherry-pick-bot[bot]	793e1823a4	debugger: Fix issues with debugging scripts from package.json (cherry-pick #32995 ) (#33044 ) Cherry-picked debugger: Fix issues with debugging scripts from package.json (#32995) - [x] Pass in cwd - [x] Use the appropriate package manager - [x] Don't mix up package.json and composer.json Release Notes: - debugger: Fixed wrong arguments being passed to the DAP when debugging scripts from package.json. Co-authored-by: Cole Miller <cole@zed.dev>	2025-06-19 14:25:32 -04:00
Joseph T. Lyons	4319bc498f	zed 0.192.2	2025-06-19 13:48:14 -04:00
Cole Miller	ce5cc0d15e	debugger: Fix issues with debugging scripts from package.json (#32995 ) - [x] Pass in cwd - [x] Use the appropriate package manager - [x] Don't mix up package.json and composer.json Release Notes: - debugger: Fixed wrong arguments being passed to the DAP when debugging scripts from package.json.	2025-06-19 13:43:19 -04:00
Danilo Leal	13a26bce52	debugger: Refine session modal design (#33004 ) This PR makes all footer elements in the debugger session modal more consistent, as well as fixes some weird UI quirks with leaking borders and whatnot. Took the opportunity to do some light style clean up and use `prelude::*` for UI imports. Release Notes: - N/A	2025-06-19 13:43:10 -04:00
Jeff Bonhag	506bfb59e7	docs: Ruby debug configuration should be an array (#32991 ) Closes #ISSUE Small correction for something I noticed while setting up the debugger today. Release Notes: - N/A	2025-06-19 13:42:45 -04:00
Mikayla Maki	c51141647c	Add a small script to make debugging the CLI easier (#32971 ) Release Notes: - N/A	2025-06-19 13:42:31 -04:00
Danilo Leal	11bd3b3c37	docs: Remove beta tag from Debugger (#32950 ) Release Notes: - N/A	2025-06-19 13:38:30 -04:00
gcp-cherry-pick-bot[bot]	96595aa807	Revert "client: Fix an issue where non-IP proxy URLs didn’t resolve c… (cherry-pick #33013 ) (#33016 ) Cherry-picked Revert "client: Fix an issue where non-IP proxy URLs didn’t resolve c… (#33013) This reverts commit `bc68455320`. More bugs... Closes #32838 Release Notes: - N/A Co-authored-by: 张小白 <364772080@qq.com>	2025-06-19 17:27:10 +08:00
gcp-cherry-pick-bot[bot]	8c38ed8e37	Fix document colors not showing on file reopen (cherry-pick #33009 ) (#33010 ) Cherry-picked Fix document colors not showing on file reopen (#33009) Closes https://github.com/zed-industries/zed/issues/32989 Release Notes: - Fixed document colors not showing on file reopen Co-authored-by: Kirill Bulatov <kirill@zed.dev>	2025-06-19 10:34:11 +03:00
Bennet Bo Fenner	ec3807e09f	open_ai: Fix issues with OpenAI compatible APIs (#32982 ) Ran into this while adding support for Vercel v0s models: - The timestamp seems to be returned in Milliseconds instead of seconds so it breaks the bounds of `created: u32`. We did not use this field anywhere so just decided to remove it - Sometimes the `choices` field can be empty when the last chunk comes in because it only contains `usage` Release Notes: - N/A	2025-06-18 19:06:24 -04:00
Danilo Leal	819b5d8e3f	agent: Add ability to change the API base URL for OpenAI via the UI (#32979 ) The `api_url` setting is one that most providers already support and can be changed via the `settings.json`. We're adding the ability to change it via the UI for OpenAI specifically so it can be more easily connected to v0. Release Notes: - agent: Added ability to change the API base URL for OpenAI via the UI --------- Co-authored-by: Bennet Bo Fenner <53836821+bennetbo@users.noreply.github.com>	2025-06-18 19:06:14 -04:00
Joseph T. Lyons	bcb7c52081	zed 0.192.1	2025-06-18 15:14:19 -04:00
Piotr Osiewicz	d032653510	debugger: Run debug scenarios from package.json (#32958 ) Release Notes: - New session modal for a debugger will now show tasks from package.json as debuggable scenarios --------- Co-authored-by: Remco Smits <djsmits12@gmail.com> Co-authored-by: Anthony Eid <hello@anthonyeid.me>	2025-06-18 15:06:33 -04:00
Mikayla Maki	d736e3c766	Fix a bug where --diff wouldn't open the diff (#32962 ) Release Notes: - Fixed a bug where `zed --diff A B` wouldn't open a diff	2025-06-18 15:05:14 -04:00
Piotr Osiewicz	817b1d6eb3	debugger: Add onboarding modal (#32961 ) - debugger: Add debugger onboarding modal (wip) - woops Release Notes: - debugger: Added the onboarding modal. --------- Co-authored-by: Danilo Leal <daniloleal09@gmail.com> Co-authored-by: Julia Ryan <p1n3appl3@users.noreply.github.com>	2025-06-18 14:54:04 -04:00
Conrad Irwin	b25d19cc2a	Wait for source maps when setting TypeScript breakpoints (#32954 ) Closes #ISSUE Release Notes: - debugger: Fix setting breakpoints in typescript code when debugging compiled javascript	2025-06-18 14:14:57 -04:00
Joseph T. Lyons	b3f31286d4	v0.192.x preview	2025-06-18 10:51:49 -04:00
				`@@ -1 +0,0 @@`
				`<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-arrow-down10-icon lucide-arrow-down-1-0"><path d="m3 16 4 4 4-4"/><path d="M7 20V4"/><path d="M17 10V4h-2"/><path d="M15 10h4"/><rect x="15" y="14" width="4" height="6" ry="2"/></svg>`