Build on every run. 1.9s

Serious vibes
Only do this in test, not in release
2025-06-21 16:52:19 -04:00 · 2025-06-21 16:42:02 -04:00 · 2025-06-21 15:57:01 -04:00 · 2025-06-21 15:56:33 -04:00 · 2025-06-21 15:39:30 -04:00 · 2025-06-21 15:37:06 -04:00
428 changed files with 13303 additions and 21854 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/.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
@@ -2,6 +2,20 @@
 # It is not intended for manual editing.
 version = 4

+[[package]]
+name = "actions"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "command_palette",
+ "gpui",
+ "serde",
+ "serde_json",
+ "util",
+ "workspace-hack",
+ "zed",
+]
+
 [[package]]
 name = "activity_indicator"
 version = "0.1.0"
@@ -14,7 +28,6 @@ dependencies = [
 "gpui",
 "language",
 "project",
- "proto",
 "release_channel",
 "smallvec",
 "ui",
@@ -56,84 +69,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",
- "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",
@@ -145,6 +81,7 @@ dependencies = [
 "collections",
 "component",
 "context_server",
+ "convert_case 0.8.0",
 "db",
 "editor",
 "extension",
@@ -154,7 +91,9 @@ dependencies = [
 "fs",
 "futures 0.3.31",
 "fuzzy",
+ "git",
 "gpui",
+ "heed",
 "html_to_markdown",
 "http_client",
 "indexed_docs",
@@ -164,7 +103,6 @@ dependencies = [
 "jsonschema",
 "language",
 "language_model",
- "languages",
 "log",
 "lsp",
 "markdown",
@@ -175,11 +113,13 @@ dependencies = [
 "parking_lot",
 "paths",
 "picker",
+ "postage",
 "pretty_assertions",
 "project",
 "prompt_store",
 "proto",
 "rand 0.8.5",
+ "ref-cast",
 "release_channel",
 "rope",
 "rules_library",
@@ -190,6 +130,7 @@ dependencies = [
 "serde_json_lenient",
 "settings",
 "smol",
+ "sqlez",
 "streaming_diff",
 "telemetry",
 "telemetry_events",
@@ -197,11 +138,10 @@ dependencies = [
 "terminal_view",
 "text",
 "theme",
+ "thiserror 2.0.12",
 "time",
 "time_format",
- "tree-sitter-md",
 "ui",
- "unindent",
 "urlencoding",
 "util",
 "uuid",
@@ -210,6 +150,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]]
@@ -555,7 +522,7 @@ dependencies = [
 ]

 [[package]]
-name = "assistant_context"
+name = "assistant_context_editor"
 version = "0.1.0"
 dependencies = [
 "agent_settings",
@@ -567,23 +534,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",
@@ -592,12 +567,15 @@ dependencies = [
 "smol",
 "telemetry_events",
 "text",
+ "theme",
+ "tree-sitter-md",
 "ui",
 "unindent",
 "util",
 "uuid",
 "workspace",
 "workspace-hack",
+ "zed_actions",
 "zed_llm_client",
 ]

@@ -2684,7 +2662,6 @@ dependencies = [
 "http_client",
 "language",
 "log",
- "postage",
 "rand 0.8.5",
 "release_channel",
 "rpc",
@@ -3018,7 +2995,7 @@ version = "0.44.0"
 dependencies = [
 "agent_settings",
 "anyhow",
- "assistant_context",
+ "assistant_context_editor",
 "assistant_slash_command",
 "async-stripe",
 "async-trait",
@@ -4156,7 +4133,6 @@ dependencies = [
 "paths",
 "serde",
 "serde_json",
- "shlex",
 "task",
 "util",
 "workspace-hack",
@@ -4310,7 +4286,6 @@ version = "0.1.0"
 dependencies = [
 "alacritty_terminal",
 "anyhow",
- "bitflags 2.9.0",
 "client",
 "collections",
 "command_palette_hooks",
@@ -4345,7 +4320,6 @@ dependencies = [
 "terminal_view",
 "theme",
 "tree-sitter",
- "tree-sitter-go",
 "tree-sitter-json",
 "ui",
 "unindent",
@@ -4636,18 +4610,17 @@ dependencies = [
 name = "docs_preprocessor"
 version = "0.1.0"
 dependencies = [
+ "actions",
 "anyhow",
 "clap",
- "command_palette",
- "gpui",
 "mdbook",
 "regex",
+ "rust-embed",
 "serde",
 "serde_json",
 "settings",
 "util",
 "workspace-hack",
- "zed",
 ]

 [[package]]
@@ -5102,7 +5075,6 @@ version = "0.1.0"
 dependencies = [
 "agent",
 "agent_settings",
- "agent_ui",
 "anyhow",
 "assistant_tool",
 "assistant_tools",
@@ -8983,7 +8955,6 @@ dependencies = [
 "ui",
 "ui_input",
 "util",
- "vercel",
 "workspace-hack",
 "zed_llm_client",
 ]
@@ -9017,13 +8988,11 @@ dependencies = [
 "collections",
 "copilot",
 "editor",
- "feature_flags",
 "futures 0.3.31",
 "gpui",
 "itertools 0.14.0",
 "language",
 "lsp",
- "picker",
 "project",
 "release_channel",
 "serde_json",
@@ -9241,7 +9210,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",
@@ -9321,7 +9290,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",
@@ -9344,7 +9313,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",
@@ -9368,7 +9337,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",
@@ -9385,7 +9354,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",
@@ -13167,7 +13136,6 @@ dependencies = [
 "thiserror 2.0.12",
 "urlencoding",
 "util",
- "which 6.0.3",
 "workspace-hack",
 ]

@@ -14555,12 +14523,12 @@ dependencies = [
 "serde_json",
 "serde_json_lenient",
 "smallvec",
+ "streaming-iterator",
 "tree-sitter",
 "tree-sitter-json",
 "unindent",
 "util",
 "workspace-hack",
- "zlog",
 ]

 [[package]]
@@ -15527,18 +15495,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"
@@ -16050,6 +16006,7 @@ dependencies = [
 "indexmap",
 "log",
 "palette",
+ "rust-embed",
 "serde",
 "serde_json",
 "serde_json_lenient",
@@ -16880,7 +16837,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",
@@ -17436,17 +17394,6 @@ version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"

-[[package]]
-name = "vercel"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "schemars",
- "serde",
- "strum 0.27.1",
- "workspace-hack",
-]
-
 [[package]]
 name = "version-compare"
 version = "0.2.0"
@@ -18296,7 +18243,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",
@@ -18309,7 +18256,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",
@@ -19929,16 +19876,16 @@ dependencies = [

 [[package]]
 name = "zed"
-version = "0.194.0"
+version = "0.193.0"
 dependencies = [
 "activity_indicator",
 "agent",
 "agent_settings",
- "agent_ui",
 "anyhow",
 "ashpd",
 "askpass",
 "assets",
+ "assistant_context_editor",
 "assistant_tool",
 "assistant_tools",
 "audio",
@@ -19985,7 +19932,6 @@ dependencies = [
 "inline_completion_button",
 "inspector_ui",
 "install_cli",
- "itertools 0.14.0",
 "jj_ui",
 "journal",
 "language",
@@ -20010,7 +19956,6 @@ dependencies = [
 "parking_lot",
 "paths",
 "picker",
- "pretty_assertions",
 "profiling",
 "project",
 "project_panel",
@@ -20034,7 +19979,6 @@ dependencies = [
 "snippet_provider",
 "snippets_ui",
 "supermaven",
- "svg_preview",
 "sysinfo",
 "tab_switcher",
 "task",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,14 +1,14 @@
 [workspace]
 resolver = "2"
 members = [
+    "crates/actions",
    "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",
@@ -95,7 +95,6 @@ members = [
    "crates/markdown_preview",
    "crates/media",
    "crates/menu",
-    "crates/svg_preview",
    "crates/migrator",
    "crates/mistral",
    "crates/multi_buffer",
@@ -166,7 +165,6 @@ members = [
    "crates/ui_prompt",
    "crates/util",
    "crates/util_macros",
-    "crates/vercel",
    "crates/vim",
    "crates/vim_mode_setting",
    "crates/watch",
@@ -203,7 +201,7 @@ members = [
    "tooling/workspace-hack",
    "tooling/xtask",
 ]
-default-members = ["crates/zed"]
+default-members = ["crates/zed", "crates/actions"]

 [workspace.package]
 publish = false
@@ -215,15 +213,15 @@ edition = "2024"
 # Workspace member crates
 #

+actions = { path = "crates/actions" }
 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 +303,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" }
@@ -378,7 +375,6 @@ ui_macros = { path = "crates/ui_macros" }
 ui_prompt = { path = "crates/ui_prompt" }
 util = { path = "crates/util" }
 util_macros = { path = "crates/util_macros" }
-vercel = { path = "crates/vercel" }
 vim = { path = "crates/vim" }
 vim_mode_setting = { path = "crates/vim_mode_setting" }

@@ -461,6 +457,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 +485,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 +520,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 +552,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 +597,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/actions/actions.json
+++ b/assets/actions/actions.json
--- a/assets/icons/ai_v_zero.svg
+++ b/assets/icons/ai_v_zero.svg
@@ -1,16 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_2639_570)">
-<g clip-path="url(#clip1_2639_570)">
-<path d="M9.85676 4H13.6675C15.2128 4 16.4654 5.25266 16.4654 6.7979V10.4322H14.9002V6.7979C14.9002 6.76067 14.8988 6.7237 14.8959 6.68706L11.0851 10.4316C11.098 10.432 11.1109 10.4322 11.1238 10.4322H14.9002V11.9105H11.1238C9.57856 11.9105 8.29152 10.6456 8.29152 9.10032V5.47569H9.85676V9.10032C9.85676 9.17012 9.86216 9.23908 9.87264 9.30672L13.7673 5.4798C13.7344 5.47708 13.7012 5.47569 13.6675 5.47569H9.85676V4Z" fill="black"/>
-<path d="M6.00752 11.6382L0.5 5.47504H2.71573L5.94924 9.09348V5.47504H7.6014V11.0298C7.6014 11.8682 6.56616 12.2634 6.00752 11.6382Z" fill="black"/>
-</g>
-</g>
-<defs>
-<clipPath id="clip0_2639_570">
-<rect width="16" height="16" fill="white" transform="translate(0.5)"/>
-</clipPath>
-<clipPath id="clip1_2639_570">
-<rect width="16" height="8" fill="white" transform="translate(0.5 4)"/>
-</clipPath>
-</defs>
-</svg>
--- 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/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/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": {
@@ -919,9 +904,7 @@
    "context": "BreakpointList",
    "bindings": {
      "space": "debugger::ToggleEnableBreakpoint",
-      "backspace": "debugger::UnsetBreakpoint",
-      "left": "debugger::PreviousBreakpointProperty",
-      "right": "debugger::NextBreakpointProperty"
+      "backspace": "debugger::UnsetBreakpoint"
    }
  },
  {
@@ -962,7 +945,7 @@
    }
  },
  {
-    "context": "FileFinder || (FileFinder > Picker > Editor)",
+    "context": "FileFinder",
    "bindings": {
      "ctrl-shift-a": "file_finder::ToggleSplitMenu",
      "ctrl-shift-i": "file_finder::ToggleFilterMenu"
--- 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",
@@ -980,9 +964,7 @@
    "context": "BreakpointList",
    "bindings": {
      "space": "debugger::ToggleEnableBreakpoint",
-      "backspace": "debugger::UnsetBreakpoint",
-      "left": "debugger::PreviousBreakpointProperty",
-      "right": "debugger::NextBreakpointProperty"
+      "backspace": "debugger::UnsetBreakpoint"
    }
  },
  {
@@ -1029,7 +1011,7 @@
    }
  },
  {
-    "context": "FileFinder || (FileFinder > Picker > Editor)",
+    "context": "FileFinder",
    "use_key_equivalents": true,
    "bindings": {
      "cmd-shift-a": "file_finder::ToggleSplitMenu",
--- 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 }],
@@ -210,8 +210,7 @@
      "ctrl-w space": "editor::OpenExcerptsSplit",
      "ctrl-w g space": "editor::OpenExcerptsSplit",
      "ctrl-6": "pane::AlternateFile",
-      "ctrl-^": "pane::AlternateFile",
-      ".": "vim::Repeat"
+      "ctrl-^": "pane::AlternateFile"
    }
  },
  {
@@ -220,6 +219,7 @@
      "ctrl-[": "editor::Cancel",
      "escape": "editor::Cancel",
      ":": "command_palette::Toggle",
+      ".": "vim::Repeat",
      "c": "vim::PushChange",
      "shift-c": "vim::ChangeToEndOfLine",
      "d": "vim::PushDelete",
@@ -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",
@@ -849,25 +841,6 @@
      "shift-u": "git::UnstageAll"
    }
  },
-  {
-    "context": "Editor && mode == auto_height && VimControl",
-    "bindings": {
-      // TODO: Implement search
-      "/": null,
-      "?": null,
-      "#": null,
-      "*": null,
-      "n": null,
-      "shift-n": null
-    }
-  },
-  {
-    "context": "GitCommit > Editor && VimControl && vim_mode == normal",
-    "bindings": {
-      "ctrl-c": "menu::Cancel",
-      "escape": "menu::Cancel"
-    }
-  },
  {
    "context": "Editor && edit_prediction",
    "bindings": {
@@ -879,7 +852,14 @@
  {
    "context": "MessageEditor > Editor && VimControl",
    "bindings": {
-      "enter": "agent::Chat"
+      "enter": "agent::Chat",
+      // TODO: Implement search
+      "/": null,
+      "?": null,
+      "#": null,
+      "*": null,
+      "n": null,
+      "shift-n": null
    }
  },
  {
--- 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.
@@ -118,14 +119,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 +132,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:
@@ -493,7 +485,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 +701,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 +995,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 +1177,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 +1342,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 +1701,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 +1715,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 +1798,6 @@
  "debugger": {
    "stepping_granularity": "line",
    "save_breakpoints": true,
-    "dock": "bottom",
    "button": true
  }
 }
--- a/crates/actions/Cargo.toml
+++ b/crates/actions/Cargo.toml
@@ -0,0 +1,28 @@
+[package]
+name = "actions"
+version = "0.1.0"
+edition.workspace = true
+publish.workspace = true
+license = "GPL-3.0-or-later"
+
+[dependencies]
+anyhow.workspace = true
+command_palette.workspace = true
+gpui.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+util.workspace = true
+workspace-hack.workspace = true
+zed.workspace = true
+
+[build-dependencies]
+anyhow.workspace = true
+command_palette.workspace = true
+gpui.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+util.workspace = true
+zed.workspace = true
+
+[lints]
+workspace = true
--- a/crates/actions/build.rs
+++ b/crates/actions/build.rs
@@ -0,0 +1,59 @@
+use anyhow::Result;
+use serde::Serialize;
+use std::env;
+use std::fs;
+use std::path::Path;
+
+#[derive(Debug, Serialize)]
+struct ActionDef {
+    name: String,
+    human_name: String,
+    #[serde(skip_serializing_if = "Vec::is_empty")]
+    deprecated_aliases: Vec<String>,
+}
+
+fn main() -> Result<()> {
+    // call a zed:: function so everything in `zed` crate is linked and
+    // all actions in the actual app are registered
+    zed::stdout_is_a_pty();
+
+    let actions = dump_all_gpui_actions();
+
+    let out_dir = env::var("CARGO_MANIFEST_DIR")?;
+    let assets_path = Path::new(&out_dir)
+        .parent()
+        .unwrap()
+        .parent()
+        .unwrap()
+        .join("assets/actions");
+
+    // Create the actions directory if it doesn't exist
+    fs::create_dir_all(&assets_path)?;
+
+    let json_path = assets_path.join("actions.json");
+    let json_content = serde_json::to_string_pretty(&actions)?;
+    fs::write(&json_path, json_content)?;
+
+    println!("cargo:rerun-if-changed=build.rs");
+    println!("cargo:rerun-if-changed=../../assets/actions/actions.json");
+
+    // This sucks. We regenerate actions.json on every cargo invocation
+    println!("cargo:rerun-if-changed=*");
+
+    Ok(())
+}
+
+fn dump_all_gpui_actions() -> Vec<ActionDef> {
+    let mut actions = gpui::generate_list_of_all_registered_actions()
+        .into_iter()
+        .map(|action| ActionDef {
+            name: action.name.to_string(),
+            human_name: command_palette::humanize_action_name(action.name),
+            deprecated_aliases: action.aliases.iter().map(|s| s.to_string()).collect(),
+        })
+        .collect::<Vec<ActionDef>>();
+
+    actions.sort_by_key(|a| a.name.clone());
+
+    actions
+}
--- a/crates/actions/src/lib.rs
+++ b/crates/actions/src/lib.rs
@@ -0,0 +1,18 @@
+//! Actions crate that generates actions.json at build time.
+//!
+//! This crate uses build.rs to automatically regenerate the actions.json file
+//! whenever the crate is built, eliminating the need for manual updates.
+
+use serde::{Deserialize, Serialize};
+
+/// Represents an action definition that can be serialized to/from JSON.
+/// This struct is shared between the build script that generates actions.json
+/// and other crates that need to read action definitions.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct ActionDef {
+    pub name: String,
+    pub human_name: String,
+    #[serde(default)]
+    #[serde(skip_serializing_if = "Vec::is_empty")]
+    pub deprecated_aliases: Vec<String>,
+}
--- 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,59 +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
+extension_host.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
+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
@@ -1,17 +1,18 @@
+use crate::context::{AgentContextHandle, RULES_ICON};
 use crate::context_picker::{ContextPicker, MentionLink};
+use crate::context_store::ContextStore;
 use crate::context_strip::{ContextStrip, ContextStripEvent, SuggestContextKind};
 use crate::message_editor::{extract_message_creases, insert_message_creases};
+use crate::thread::{
+    LastRestoreCheckpoint, MessageCrease, MessageId, MessageSegment, Thread, ThreadError,
+    ThreadEvent, ThreadFeedback, ThreadSummary,
+};
+use crate::thread_store::{RulesLoadingError, TextThreadStore, ThreadStore};
+use crate::tool_use::{PendingToolUseStatus, ToolUse};
 use crate::ui::{
    AddedContext, AgentNotification, AgentNotificationEvent, AnimatedLabel, ContextPill,
 };
 use crate::{AgentPanel, ModelUsageContext};
-use agent::{
-    ContextStore, LastRestoreCheckpoint, MessageCrease, MessageId, MessageSegment, TextThreadStore,
-    Thread, ThreadError, ThreadEvent, ThreadFeedback, ThreadStore, ThreadSummary,
-    context::{self, AgentContextHandle, RULES_ICON},
-    thread_store::RulesLoadingError,
-    tool_use::{PendingToolUseStatus, ToolUse},
-};
 use agent_settings::{AgentSettings, NotifyWhenAgentWaiting};
 use anyhow::Context as _;
 use assistant_tool::ToolUseStatus;
@@ -19,7 +20,7 @@ use audio::{Audio, Sound};
 use collections::{HashMap, HashSet};
 use editor::actions::{MoveUp, Paste};
 use editor::scroll::Autoscroll;
-use editor::{Editor, EditorElement, EditorEvent, EditorStyle, MultiBuffer, SelectionEffects};
+use editor::{Editor, EditorElement, EditorEvent, EditorStyle, MultiBuffer};
 use gpui::{
    AbsoluteLength, Animation, AnimationExt, AnyElement, App, ClickEvent, ClipboardEntry,
    ClipboardItem, DefiniteLength, EdgesRefinement, Empty, Entity, EventEmitter, Focusable, Hsla,
@@ -47,8 +48,8 @@ use std::time::Duration;
 use text::ToPoint;
 use theme::ThemeSettings;
 use ui::{
-    Banner, Disclosure, KeyBinding, PopoverMenuHandle, Scrollbar, ScrollbarState, TextSize,
-    Tooltip, prelude::*,
+    Disclosure, KeyBinding, PopoverMenuHandle, Scrollbar, ScrollbarState, TextSize, Tooltip,
+    prelude::*,
 };
 use util::ResultExt as _;
 use util::markdown::MarkdownCodeBlock;
@@ -58,7 +59,7 @@ use zed_llm_client::CompletionIntent;

 const CODEBLOCK_CONTAINER_GROUP: &str = "codeblock_container";
 const EDIT_PREVIOUS_MESSAGE_MIN_LINES: usize = 1;
-const RESPONSE_PADDING_X: Pixels = px(19.);
+const EDIT_PREVIOUS_MESSAGE_MAX_LINES: usize = 6;

 pub struct ActiveThread {
    context_store: Entity<ContextStore>,
@@ -205,7 +206,7 @@ pub(crate) fn default_markdown_style(window: &Window, cx: &App) -> MarkdownStyle
    MarkdownStyle {
        base_text_style: text_style.clone(),
        syntax: cx.theme().syntax().clone(),
-        selection_background_color: cx.theme().colors().element_selection_background,
+        selection_background_color: cx.theme().players().local().selection,
        code_block_overflow_x_scroll: true,
        table_overflow_x_scroll: true,
        heading_level_styles: Some(HeadingLevelStyles {
@@ -302,8 +303,8 @@ fn tool_use_markdown_style(window: &Window, cx: &mut App) -> MarkdownStyle {
    MarkdownStyle {
        base_text_style: text_style,
        syntax: cx.theme().syntax().clone(),
-        selection_background_color: cx.theme().colors().element_selection_background,
-        code_block_overflow_x_scroll: false,
+        selection_background_color: cx.theme().players().local().selection,
+        code_block_overflow_x_scroll: true,
        code_block: StyleRefinement {
            margin: EdgesRefinement::default(),
            padding: EdgesRefinement::default(),
@@ -690,12 +691,9 @@ fn open_markdown_link(
                            })
                            .context("Could not find matching symbol")?;

-                        editor.change_selections(
-                            SelectionEffects::scroll(Autoscroll::center()),
-                            window,
-                            cx,
-                            |s| s.select_anchor_ranges([symbol_range.start..symbol_range.start]),
-                        );
+                        editor.change_selections(Some(Autoscroll::center()), window, cx, |s| {
+                            s.select_anchor_ranges([symbol_range.start..symbol_range.start])
+                        });
                        anyhow::Ok(())
                    })
                })
@@ -712,15 +710,10 @@ fn open_markdown_link(
                        .downcast::<Editor>()
                        .context("Item is not an editor")?;
                    active_editor.update_in(cx, |editor, window, cx| {
-                        editor.change_selections(
-                            SelectionEffects::scroll(Autoscroll::center()),
-                            window,
-                            cx,
-                            |s| {
-                                s.select_ranges([Point::new(line_range.start as u32, 0)
-                                    ..Point::new(line_range.start as u32, 0)])
-                            },
-                        );
+                        editor.change_selections(Some(Autoscroll::center()), window, cx, |s| {
+                            s.select_ranges([Point::new(line_range.start as u32, 0)
+                                ..Point::new(line_range.start as u32, 0)])
+                        });
                        anyhow::Ok(())
                    })
                })
@@ -818,12 +811,7 @@ impl ActiveThread {
        };

        for message in thread.read(cx).messages().cloned().collect::<Vec<_>>() {
-            let rendered_message = RenderedMessage::from_segments(
-                &message.segments,
-                this.language_registry.clone(),
-                cx,
-            );
-            this.push_rendered_message(message.id, rendered_message);
+            this.push_message(&message.id, &message.segments, window, cx);

            for tool_use in thread.read(cx).tool_uses_for_message(message.id, cx) {
                this.render_tool_use_markdown(
@@ -889,51 +877,36 @@ impl ActiveThread {
        &self.text_thread_store
    }

-    pub fn validate_image(&self, image: &Arc<gpui::Image>, cx: &App) -> Result<(), String> {
-        let image_size = image.bytes().len() as u64;
+    fn push_message(
+        &mut self,
+        id: &MessageId,
+        segments: &[MessageSegment],
+        _window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let old_len = self.messages.len();
+        self.messages.push(*id);
+        self.list_state.splice(old_len..old_len, 1);

-        if let Some(model) = self.thread.read(cx).configured_model() {
-            let max_size = model.model.max_image_size();
-
-            if image_size > max_size {
-                if max_size == 0 {
-                    Err(format!(
-                        "{} does not support image attachments",
-                        model.model.name().0
-                    ))
-                } else {
-                    let size_mb = image_size as f64 / 1_048_576.0;
-                    let max_size_mb = max_size as f64 / 1_048_576.0;
-                    Err(format!(
-                        "Image ({:.1} MB) exceeds {}'s {:.1} MB size limit",
-                        size_mb,
-                        model.model.name().0,
-                        max_size_mb
-                    ))
-                }
-            } else {
-                Ok(())
-            }
-        } else {
-            // No model configured, use default 10MB limit
-            const DEFAULT_MAX_SIZE: u64 = 10 * 1024 * 1024;
-            if image_size > DEFAULT_MAX_SIZE {
-                let size_mb = image_size as f64 / 1_048_576.0;
-                Err(format!(
-                    "Image ({:.1} MB) exceeds the 10 MB size limit",
-                    size_mb
-                ))
-            } else {
-                Ok(())
-            }
-        }
+        let rendered_message =
+            RenderedMessage::from_segments(segments, self.language_registry.clone(), cx);
+        self.rendered_messages_by_id.insert(*id, rendered_message);
    }

-    fn push_rendered_message(&mut self, id: MessageId, rendered_message: RenderedMessage) {
-        let old_len = self.messages.len();
-        self.messages.push(id);
-        self.list_state.splice(old_len..old_len, 1);
-        self.rendered_messages_by_id.insert(id, rendered_message);
+    fn edited_message(
+        &mut self,
+        id: &MessageId,
+        segments: &[MessageSegment],
+        _window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let Some(index) = self.messages.iter().position(|message_id| message_id == id) else {
+            return;
+        };
+        self.list_state.splice(index..index + 1, 1);
+        let rendered_message =
+            RenderedMessage::from_segments(segments, self.language_registry.clone(), cx);
+        self.rendered_messages_by_id.insert(*id, rendered_message);
    }

    fn deleted_message(&mut self, id: &MessageId) {
@@ -1066,43 +1039,31 @@ impl ActiveThread {
                }
            }
            ThreadEvent::MessageAdded(message_id) => {
-                if let Some(rendered_message) = self.thread.update(cx, |thread, cx| {
-                    thread.message(*message_id).map(|message| {
-                        RenderedMessage::from_segments(
-                            &message.segments,
-                            self.language_registry.clone(),
-                            cx,
-                        )
-                    })
-                }) {
-                    self.push_rendered_message(*message_id, rendered_message);
+                if let Some(message_segments) = self
+                    .thread
+                    .read(cx)
+                    .message(*message_id)
+                    .map(|message| message.segments.clone())
+                {
+                    self.push_message(message_id, &message_segments, window, cx);
                }

                self.save_thread(cx);
                cx.notify();
            }
            ThreadEvent::MessageEdited(message_id) => {
-                if let Some(index) = self.messages.iter().position(|id| id == message_id) {
-                    if let Some(rendered_message) = self.thread.update(cx, |thread, cx| {
-                        thread.message(*message_id).map(|message| {
-                            let mut rendered_message = RenderedMessage {
-                                language_registry: self.language_registry.clone(),
-                                segments: Vec::with_capacity(message.segments.len()),
-                            };
-                            for segment in &message.segments {
-                                rendered_message.push_segment(segment, cx);
-                            }
-                            rendered_message
-                        })
-                    }) {
-                        self.list_state.splice(index..index + 1, 1);
-                        self.rendered_messages_by_id
-                            .insert(*message_id, rendered_message);
-                        self.scroll_to_bottom(cx);
-                        self.save_thread(cx);
-                        cx.notify();
-                    }
+                if let Some(message_segments) = self
+                    .thread
+                    .read(cx)
+                    .message(*message_id)
+                    .map(|message| message.segments.clone())
+                {
+                    self.edited_message(message_id, &message_segments, window, cx);
                }
+
+                self.scroll_to_bottom(cx);
+                self.save_thread(cx);
+                cx.notify();
            }
            ThreadEvent::MessageDeleted(message_id) => {
                self.deleted_message(message_id);
@@ -1189,9 +1150,6 @@ impl ActiveThread {
                self.save_thread(cx);
                cx.notify();
            }
-            ThreadEvent::RetriesFailed { message } => {
-                self.show_notification(message, ui::IconName::Warning, window, cx);
-            }
        }
    }

@@ -1355,23 +1313,29 @@ impl ActiveThread {
    fn start_editing_message(
        &mut self,
        message_id: MessageId,
-        message_text: impl Into<Arc<str>>,
+        message_segments: &[MessageSegment],
        message_creases: &[MessageCrease],
        window: &mut Window,
        cx: &mut Context<Self>,
    ) {
+        // User message should always consist of a single text segment,
+        // therefore we can skip returning early if it's not a text segment.
+        let Some(MessageSegment::Text(message_text)) = message_segments.first() else {
+            return;
+        };
+
        let editor = crate::message_editor::create_editor(
            self.workspace.clone(),
            self.context_store.downgrade(),
            self.thread_store.downgrade(),
            self.text_thread_store.downgrade(),
            EDIT_PREVIOUS_MESSAGE_MIN_LINES,
-            None,
+            EDIT_PREVIOUS_MESSAGE_MAX_LINES,
            window,
            cx,
        );
        editor.update(cx, |editor, cx| {
-            editor.set_text(message_text, window, cx);
+            editor.set_text(message_text.clone(), window, cx);
            insert_message_creases(editor, message_creases, &self.context_store, window, cx);
            editor.focus_handle(cx).focus(window);
            editor.move_to_end(&editor::actions::MoveToEnd, window, cx);
@@ -1562,7 +1526,7 @@ impl ActiveThread {
    }

    fn paste(&mut self, _: &Paste, _window: &mut Window, cx: &mut Context<Self>) {
-        attach_pasted_images_as_context_with_validation(&self.context_store, Some(self), cx);
+        attach_pasted_images_as_context(&self.context_store, cx);
    }

    fn cancel_editing_message(
@@ -1620,7 +1584,8 @@ impl ActiveThread {
        let git_store = project.read(cx).git_store().clone();
        let checkpoint = git_store.update(cx, |git_store, cx| git_store.checkpoint(cx));

-        let load_context_task = context::load_context(new_context, &project, &prompt_store, cx);
+        let load_context_task =
+            crate::context::load_context(new_context, &project, &prompt_store, cx);
        self._load_edited_message_context_task =
            Some(cx.spawn_in(window, async move |this, cx| {
                let (context, checkpoint) =
@@ -1730,7 +1695,7 @@ impl ActiveThread {
            let mut editor = Editor::new(
                editor::EditorMode::AutoHeight {
                    min_lines: 1,
-                    max_lines: Some(4),
+                    max_lines: 4,
                },
                buffer,
                None,
@@ -1773,7 +1738,7 @@ impl ActiveThread {
            telemetry::event!(
                "Assistant Thread Feedback Comments",
                thread_id,
-                message_id = message_id.as_usize(),
+                message_id = message_id.0,
                message_content,
                comments = comments_value
            );
@@ -1866,6 +1831,8 @@ impl ActiveThread {
            return div().children(loading_dots).into_any();
        }

+        let message_creases = message.creases.clone();
+
        let Some(rendered_message) = self.rendered_messages_by_id.get(&message_id) else {
            return Empty.into_any();
        };
@@ -1887,10 +1854,9 @@ impl ActiveThread {
            .filter(|(id, _)| *id == message_id)
            .map(|(_, state)| state);

-        let (editor_bg_color, panel_bg) = {
-            let colors = cx.theme().colors();
-            (colors.editor_background, colors.panel_background)
-        };
+        let colors = cx.theme().colors();
+        let editor_bg_color = colors.editor_background;
+        let panel_bg = colors.panel_background;

        let open_as_markdown = IconButton::new(("open-as-markdown", ix), IconName::DocumentText)
            .icon_size(IconSize::XSmall)
@@ -1915,6 +1881,9 @@ impl ActiveThread {
                this.scroll_to_top(cx);
            }));

+        // For all items that should be aligned with the LLM's response.
+        const RESPONSE_PADDING_X: Pixels = px(19.);
+
        let show_feedback = thread.is_turn_end(ix);
        let feedback_container = h_flex()
            .group("feedback_container")
@@ -2075,162 +2044,137 @@ impl ActiveThread {
            }
        });

-        let styled_message = if message.ui_only {
-            self.render_ui_notification(message_content, ix, cx)
-        } else {
-            match message.role {
-                Role::User => {
-                    let colors = cx.theme().colors();
+        let styled_message = match message.role {
+            Role::User => v_flex()
+                .id(("message-container", ix))
+                .pt_2()
+                .pl_2()
+                .pr_2p5()
+                .pb_4()
+                .child(
                    v_flex()
-                        .id(("message-container", ix))
-                        .pt_2()
-                        .pl_2()
-                        .pr_2p5()
-                        .pb_4()
+                        .id(("user-message", ix))
+                        .bg(editor_bg_color)
+                        .rounded_lg()
+                        .shadow_md()
+                        .border_1()
+                        .border_color(colors.border)
+                        .hover(|hover| hover.border_color(colors.text_accent.opacity(0.5)))
                        .child(
                            v_flex()
-                                .id(("user-message", ix))
-                                .bg(editor_bg_color)
-                                .rounded_lg()
-                                .shadow_md()
-                                .border_1()
-                                .border_color(colors.border)
-                                .hover(|hover| hover.border_color(colors.text_accent.opacity(0.5)))
-                                .child(
-                                    v_flex()
-                                        .p_2p5()
-                                        .gap_1()
-                                        .children(message_content)
-                                        .when_some(editing_message_state, |this, state| {
-                                            let focus_handle = state.editor.focus_handle(cx).clone();
+                                .p_2p5()
+                                .gap_1()
+                                .children(message_content)
+                                .when_some(editing_message_state, |this, state| {
+                                    let focus_handle = state.editor.focus_handle(cx).clone();

-                                            this.child(
+                                    this.child(
+                                        h_flex()
+                                            .w_full()
+                                            .gap_1()
+                                            .justify_between()
+                                            .flex_wrap()
+                                            .child(
                                                h_flex()
-                                                    .w_full()
-                                                    .gap_1()
-                                                    .justify_between()
-                                                    .flex_wrap()
+                                                    .gap_1p5()
                                                    .child(
-                                                        h_flex()
-                                                            .gap_1p5()
+                                                        div()
+                                                            .opacity(0.8)
                                                            .child(
-                                                                div()
-                                                                    .opacity(0.8)
-                                                                    .child(
-                                                                        Icon::new(IconName::Warning)
-                                                                            .size(IconSize::Indicator)
-                                                                            .color(Color::Warning)
-                                                                    ),
-                                                            )
-                                                            .child(
-                                                                Label::new("Editing will restart the thread from this point.")
-                                                                    .color(Color::Muted)
-                                                                    .size(LabelSize::XSmall),
+                                                                Icon::new(IconName::Warning)
+                                                                    .size(IconSize::Indicator)
+                                                                    .color(Color::Warning)
                                                            ),
                                                    )
                                                    .child(
-                                                        h_flex()
-                                                            .gap_0p5()
-                                                            .child(
-                                                                IconButton::new(
-                                                                    "cancel-edit-message",
-                                                                    IconName::Close,
-                                                                )
-                                                                .shape(ui::IconButtonShape::Square)
-                                                                .icon_color(Color::Error)
-                                                                .icon_size(IconSize::Small)
-                                                                .tooltip({
-                                                                    let focus_handle = focus_handle.clone();
-                                                                    move |window, cx| {
-                                                                        Tooltip::for_action_in(
-                                                                            "Cancel Edit",
-                                                                            &menu::Cancel,
-                                                                            &focus_handle,
-                                                                            window,
-                                                                            cx,
-                                                                        )
-                                                                    }
-                                                                })
-                                                                .on_click(cx.listener(Self::handle_cancel_click)),
-                                                            )
-                                                            .child(
-                                                                IconButton::new(
-                                                                    "confirm-edit-message",
-                                                                    IconName::Return,
-                                                                )
-                                                                .disabled(state.editor.read(cx).is_empty(cx))
-                                                                .shape(ui::IconButtonShape::Square)
-                                                                .icon_color(Color::Muted)
-                                                                .icon_size(IconSize::Small)
-                                                                .tooltip({
-                                                                    let focus_handle = focus_handle.clone();
-                                                                    move |window, cx| {
-                                                                        Tooltip::for_action_in(
-                                                                            "Regenerate",
-                                                                            &menu::Confirm,
-                                                                            &focus_handle,
-                                                                            window,
-                                                                            cx,
-                                                                        )
-                                                                    }
-                                                                })
-                                                                .on_click(
-                                                                    cx.listener(Self::handle_regenerate_click),
-                                                                ),
-                                                            ),
-                                                    )
+                                                        Label::new("Editing will restart the thread from this point.")
+                                                            .color(Color::Muted)
+                                                            .size(LabelSize::XSmall),
+                                                    ),
                                            )
-                                        }),
-                                )
-                                .on_click(cx.listener({
-                                    let message_creases = message.creases.clone();
-                                    move |this, _, window, cx| {
-                                        if let Some(message_text) =
-                                            this.thread.read(cx).message(message_id).and_then(|message| {
-                                                message.segments.first().and_then(|segment| {
-                                                    match segment {
-                                                        MessageSegment::Text(message_text) => {
-                                                            Some(Into::<Arc<str>>::into(message_text.as_str()))
-                                                        }
-                                                        _ => {
-                                                            None
-                                                        }
-                                                    }
-                                                })
-                                            })
-                                        {
-                                            this.start_editing_message(
-                                                message_id,
-                                                message_text,
-                                                &message_creases,
-                                                window,
-                                                cx,
-                                            );
-                                        }
-                                    }
-                                })),
+                                            .child(
+                                                h_flex()
+                                                    .gap_0p5()
+                                                    .child(
+                                                        IconButton::new(
+                                                            "cancel-edit-message",
+                                                            IconName::Close,
+                                                        )
+                                                        .shape(ui::IconButtonShape::Square)
+                                                        .icon_color(Color::Error)
+                                                        .icon_size(IconSize::Small)
+                                                        .tooltip({
+                                                            let focus_handle = focus_handle.clone();
+                                                            move |window, cx| {
+                                                                Tooltip::for_action_in(
+                                                                    "Cancel Edit",
+                                                                    &menu::Cancel,
+                                                                    &focus_handle,
+                                                                    window,
+                                                                    cx,
+                                                                )
+                                                            }
+                                                        })
+                                                        .on_click(cx.listener(Self::handle_cancel_click)),
+                                                    )
+                                                    .child(
+                                                        IconButton::new(
+                                                            "confirm-edit-message",
+                                                            IconName::Return,
+                                                        )
+                                                        .disabled(state.editor.read(cx).is_empty(cx))
+                                                        .shape(ui::IconButtonShape::Square)
+                                                        .icon_color(Color::Muted)
+                                                        .icon_size(IconSize::Small)
+                                                        .tooltip({
+                                                            let focus_handle = focus_handle.clone();
+                                                            move |window, cx| {
+                                                                Tooltip::for_action_in(
+                                                                    "Regenerate",
+                                                                    &menu::Confirm,
+                                                                    &focus_handle,
+                                                                    window,
+                                                                    cx,
+                                                                )
+                                                            }
+                                                        })
+                                                        .on_click(
+                                                            cx.listener(Self::handle_regenerate_click),
+                                                        ),
+                                                    ),
+                                            )
+                                    )
+                                }),
                        )
-                }
-                Role::Assistant => v_flex()
-                    .id(("message-container", ix))
-                    .px(RESPONSE_PADDING_X)
-                    .gap_2()
-                    .children(message_content)
-                    .when(has_tool_uses, |parent| {
-                        parent.children(tool_uses.into_iter().map(|tool_use| {
-                            self.render_tool_use(tool_use, window, workspace.clone(), cx)
-                        }))
-                    }),
-                Role::System => {
-                    let colors = cx.theme().colors();
-                    div().id(("message-container", ix)).py_1().px_2().child(
-                        v_flex()
-                            .bg(colors.editor_background)
-                            .rounded_sm()
-                            .child(div().p_4().children(message_content)),
-                    )
-                }
-            }
+                        .on_click(cx.listener({
+                            let message_segments = message.segments.clone();
+                            move |this, _, window, cx| {
+                                this.start_editing_message(
+                                    message_id,
+                                    &message_segments,
+                                    &message_creases,
+                                    window,
+                                    cx,
+                                );
+                            }
+                        })),
+                ),
+            Role::Assistant => v_flex()
+                .id(("message-container", ix))
+                .px(RESPONSE_PADDING_X)
+                .gap_2()
+                .children(message_content)
+                .when(has_tool_uses, |parent| {
+                    parent.children(tool_uses.into_iter().map(|tool_use| {
+                        self.render_tool_use(tool_use, window, workspace.clone(), cx)
+                    }))
+                }),
+            Role::System => div().id(("message-container", ix)).py_1().px_2().child(
+                v_flex()
+                    .bg(colors.editor_background)
+                    .rounded_sm()
+                    .child(div().p_4().children(message_content)),
+            ),
        };

        let after_editing_message = self
@@ -2569,26 +2513,6 @@ impl ActiveThread {
            .blend(cx.theme().colors().editor_foreground.opacity(0.025))
    }

-    fn render_ui_notification(
-        &self,
-        message_content: impl IntoIterator<Item = impl IntoElement>,
-        ix: usize,
-        cx: &mut Context<Self>,
-    ) -> Stateful<Div> {
-        let message = div()
-            .flex_1()
-            .min_w_0()
-            .text_size(TextSize::XSmall.rems(cx))
-            .text_color(cx.theme().colors().text_muted)
-            .children(message_content);
-
-        div()
-            .id(("message-container", ix))
-            .py_1()
-            .px_2p5()
-            .child(Banner::new().severity(ui::Severity::Warning).child(message))
-    }
-
    fn render_message_thinking_segment(
        &self,
        message_id: MessageId,
@@ -3743,14 +3667,6 @@ pub(crate) fn open_context(
 pub(crate) fn attach_pasted_images_as_context(
    context_store: &Entity<ContextStore>,
    cx: &mut App,
-) -> bool {
-    attach_pasted_images_as_context_with_validation(context_store, None, cx)
-}
-
-pub(crate) fn attach_pasted_images_as_context_with_validation(
-    context_store: &Entity<ContextStore>,
-    active_thread: Option<&ActiveThread>,
-    cx: &mut App,
 ) -> bool {
    let images = cx
        .read_from_clipboard()
@@ -3772,67 +3688,9 @@ pub(crate) fn attach_pasted_images_as_context_with_validation(
    }
    cx.stop_propagation();

-    // Try to find the workspace for showing toasts
-    let workspace = cx
-        .active_window()
-        .and_then(|window| window.downcast::<Workspace>());
-
    context_store.update(cx, |store, cx| {
        for image in images {
-            let image_arc = Arc::new(image);
-
-            // Validate image if we have an active thread
-            let should_add = if let Some(thread) = active_thread {
-                match thread.validate_image(&image_arc, cx) {
-                    Ok(()) => true,
-                    Err(err) => {
-                        // Show error toast if we have a workspace
-                        if let Some(workspace) = workspace {
-                            let _ = workspace.update(cx, |workspace, _, cx| {
-                                use workspace::{Toast, notifications::NotificationId};
-
-                                struct ImageRejectionToast;
-                                workspace.show_toast(
-                                    Toast::new(
-                                        NotificationId::unique::<ImageRejectionToast>(),
-                                        err,
-                                    ),
-                                    cx,
-                                );
-                            });
-                        }
-                        false
-                    }
-                }
-            } else {
-                // No active thread, check against default limit
-                let image_size = image_arc.bytes().len() as u64;
-                const DEFAULT_MAX_SIZE: u64 = 10 * 1024 * 1024; // 10MB
-
-                if image_size > DEFAULT_MAX_SIZE {
-                    let size_mb = image_size as f64 / 1_048_576.0;
-                    let err = format!("Image ({:.1} MB) exceeds the 10 MB size limit", size_mb);
-
-                    if let Some(workspace) = workspace {
-                        let _ = workspace.update(cx, |workspace, _, cx| {
-                            use workspace::{Toast, notifications::NotificationId};
-
-                            struct ImageRejectionToast;
-                            workspace.show_toast(
-                                Toast::new(NotificationId::unique::<ImageRejectionToast>(), err),
-                                cx,
-                            );
-                        });
-                    }
-                    false
-                } else {
-                    true
-                }
-            };
-
-            if should_add {
-                store.add_image_instance(image_arc, cx);
-            }
+            store.add_image_instance(Arc::new(image), cx);
        }
    });
    true
@@ -3866,10 +3724,8 @@ fn open_editor_at_position(

 #[cfg(test)]
 mod tests {
-    use super::*;
-    use agent::{MessageSegment, context::ContextLoadResult, thread_store};
    use assistant_tool::{ToolRegistry, ToolWorkingSet};
-    use editor::EditorSettings;
+    use editor::{EditorSettings, display_map::CreaseMetadata};
    use fs::FakeFs;
    use gpui::{AppContext, TestAppContext, VisualTestContext};
    use language_model::{
@@ -3883,6 +3739,10 @@ mod tests {
    use util::path;
    use workspace::CollaboratorId;

+    use crate::{ContextLoadResult, thread::MessageSegment, thread_store};
+
+    use super::*;
+
    #[gpui::test]
    async fn test_agent_is_unfollowed_after_cancelling_completion(cx: &mut TestAppContext) {
        init_test_settings(cx);
@@ -3909,9 +3769,9 @@ mod tests {

        // Stream response to user message
        thread.update(cx, |thread, cx| {
-            let intent = CompletionIntent::UserPrompt;
-            let request = thread.to_completion_request(model.clone(), intent, cx);
-            thread.stream_completion(request, model, intent, cx.active_window(), cx)
+            let request =
+                thread.to_completion_request(model.clone(), CompletionIntent::UserPrompt, cx);
+            thread.stream_completion(request, model, cx.active_window(), cx)
        });
        // Follow the agent
        cx.update(|window, cx| {
@@ -3954,8 +3814,10 @@ mod tests {

        let creases = vec![MessageCrease {
            range: 14..22,
-            icon_path: "icon".into(),
-            label: "foo.txt".into(),
+            metadata: CreaseMetadata {
+                icon_path: "icon".into(),
+                label: "foo.txt".into(),
+            },
            context: None,
        }];

@@ -3971,15 +3833,13 @@ mod tests {
        });

        active_thread.update_in(cx, |active_thread, window, cx| {
-            if let Some(message_text) = message.segments.first().and_then(MessageSegment::text) {
-                active_thread.start_editing_message(
-                    message.id,
-                    message_text,
-                    message.creases.as_slice(),
-                    window,
-                    cx,
-                );
-            }
+            active_thread.start_editing_message(
+                message.id,
+                message.segments.as_slice(),
+                message.creases.as_slice(),
+                window,
+                cx,
+            );
            let editor = active_thread
                .editing_message
                .as_ref()
@@ -3994,15 +3854,13 @@ mod tests {

        let message = thread.update(cx, |thread, _| thread.message(message.id).cloned().unwrap());
        active_thread.update_in(cx, |active_thread, window, cx| {
-            if let Some(message_text) = message.segments.first().and_then(MessageSegment::text) {
-                active_thread.start_editing_message(
-                    message.id,
-                    message_text,
-                    message.creases.as_slice(),
-                    window,
-                    cx,
-                );
-            }
+            active_thread.start_editing_message(
+                message.id,
+                message.segments.as_slice(),
+                message.creases.as_slice(),
+                window,
+                cx,
+            );
            let editor = active_thread
                .editing_message
                .as_ref()
@@ -4084,15 +3942,13 @@ mod tests {

        // Edit the message while the completion is still running
        active_thread.update_in(cx, |active_thread, window, cx| {
-            if let Some(message_text) = message.segments.first().and_then(MessageSegment::text) {
-                active_thread.start_editing_message(
-                    message.id,
-                    message_text,
-                    message.creases.as_slice(),
-                    window,
-                    cx,
-                );
-            }
+            active_thread.start_editing_message(
+                message.id,
+                message.segments.as_slice(),
+                message.creases.as_slice(),
+                window,
+                cx,
+            );
            let editor = active_thread
                .editing_message
                .as_ref()
--- a/crates/agent/src/agent.rs
+++ b/crates/agent/src/agent.rs
@@ -1,20 +1,297 @@
-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;
-pub mod tool_use;
+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 context::{AgentContext, ContextId, ContextLoadResult};
-pub use context_store::ContextStore;
-pub use thread::{
-    LastRestoreCheckpoint, Message, MessageCrease, MessageId, MessageSegment, Thread, ThreadError,
-    ThreadEvent, ThreadFeedback, ThreadId, ThreadSummary, 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};
+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::{ConfigureContextServerModal, 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.clone(), 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(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/agent_configuration.rs
+++ b/crates/agent_ui/src/agent_configuration.rs
@@ -593,7 +593,7 @@ impl AgentConfiguration {
                            }
                        })
                        .separator()
-                        .entry("Uninstall", None, {
+                        .entry("Delete", None, {
                            let fs = fs.clone();
                            let context_server_id = context_server_id.clone();
                            let context_server_store = context_server_store.clone();
@@ -940,56 +940,15 @@ fn show_unable_to_uninstall_extension_with_context_server(
    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?",
+            "Unable to uninstall the {} extension, as it provides more than just the MCP server.",
            id.0
        ),
        cx,
-        move |this, _cx| {
-            let workspace_handle = workspace_handle.clone();
-            let context_server_id = context_server_id.clone();
-
+        |this, _cx| {
            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();
-                    }
-                })
+                .action("Dismiss", |_, _| {})
        },
    );

--- a/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs
+++ b/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs
@@ -180,7 +180,7 @@ impl ConfigurationSource {
 }

 fn context_server_input(existing: Option<(ContextServerId, ContextServerCommand)>) -> String {
-    let (name, command, args, env) = match existing {
+    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();
@@ -198,12 +198,14 @@ fn context_server_input(existing: Option<(ContextServerId, ContextServerCommand)
        r#"{{
  /// The name of your MCP server
  "{name}": {{
-    /// The command which runs the MCP server
-    "command": "{command}",
-    /// The arguments to pass to the MCP server
-    "args": {args},
-    /// The environment variables to set
-    "env": {env}
+    "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}
+    }}
  }}
 }}"#
    )
@@ -293,7 +295,10 @@ impl ConfigureContextServerModal {
                ContextServerDescriptorRegistry::default_global(cx)
                    .read(cx)
                    .context_server_descriptor(&server_id.0)
-                    .map(|_| ContextServerSettings::default_extension())
+                    .map(|_| ContextServerSettings::Extension {
+                        enabled: true,
+                        settings: serde_json::json!({}),
+                    })
            })
        else {
            return Task::ready(Err(anyhow::anyhow!("Context server not found")));
@@ -437,7 +442,8 @@ fn parse_input(text: &str) -> Result<(ContextServerId, ContextServerCommand)> {
    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: ContextServerCommand = serde_json::from_value(value.clone())?;
+    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))
 }

@@ -497,7 +503,10 @@ impl ConfigureContextServerModal {
            ConfigurationSource::Existing { editor } => editor,
            ConfigurationSource::Extension { editor, .. } => {
                let Some(editor) = editor else {
-                    return div().into_any_element();
+                    return Label::new(
+                        "No configuration options available for this context server. Visit the Repository for any further instructions.",
+                    )
+                    .color(Color::Muted).into_any_element();
                };
                editor
            }
@@ -745,7 +754,7 @@ pub(crate) fn default_markdown_style(window: &Window, cx: &App) -> MarkdownStyle

    MarkdownStyle {
        base_text_style: text_style.clone(),
-        selection_background_color: colors.element_selection_background,
+        selection_background_color: cx.theme().players().local().selection,
        link: TextStyleRefinement {
            background_color: Some(colors.editor_foreground.opacity(0.025)),
            underline: Some(UnderlineStyle {
--- 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]);
+                            },
+                        )
                    }
                }

@@ -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]);
        })
@@ -1375,7 +1379,6 @@ impl AgentDiff {
            | ThreadEvent::ToolConfirmationNeeded
            | ThreadEvent::ToolUseLimitReached
            | ThreadEvent::CancelEditing
-            | ThreadEvent::RetriesFailed { .. }
            | ThreadEvent::ProfileChanged => {}
        }
    }
@@ -1539,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| {
@@ -1745,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;
@@ -1863,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)])
            });
        });
@@ -2119,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>,
@@ -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,22 +86,19 @@ 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),
-            ToolSource::ContextServer { id } => settings
-                .context_servers
-                .get(id.as_ref())
-                .and_then(|preset| preset.tools.get(name.as_str()).copied())
-                .unwrap_or(settings.enable_all_context_servers),
+            ToolSource::ContextServer { id } => {
+                if settings.enable_all_context_servers {
+                    return true;
+                }
+
+                let Some(preset) = settings.context_servers.get(id.as_ref()) else {
+                    return false;
+                };
+                *preset.tools.get(name.as_str()).unwrap_or(&false)
+            }
        }
    }
 }
@@ -110,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::*;

@@ -304,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 {
@@ -819,134 +824,6 @@ impl LoadedContext {
            }
        }
    }
-
-    pub fn add_to_request_message_with_model(
-        &self,
-        request_message: &mut LanguageModelRequestMessage,
-        model: &Arc<dyn language_model::LanguageModel>,
-    ) {
-        if !self.text.is_empty() {
-            request_message
-                .content
-                .push(MessageContent::Text(self.text.to_string()));
-        }
-
-        if !self.images.is_empty() {
-            let max_image_size = model.max_image_size();
-            let mut images_added = false;
-
-            for image in &self.images {
-                let image_size = image.len() as u64;
-                if image_size > max_image_size {
-                    if max_image_size == 0 {
-                        log::warn!(
-                            "Skipping image attachment: model {:?} does not support images",
-                            model.name()
-                        );
-                    } else {
-                        log::warn!(
-                            "Skipping image attachment: size {} bytes exceeds model {:?} limit of {} bytes",
-                            image_size,
-                            model.name(),
-                            max_image_size
-                        );
-                    }
-                    continue;
-                }
-
-                // Some providers only support image parts after an initial text part
-                if !images_added && request_message.content.is_empty() {
-                    request_message
-                        .content
-                        .push(MessageContent::Text("Images attached by user:".to_string()));
-                }
-
-                request_message
-                    .content
-                    .push(MessageContent::Image(image.clone()));
-                images_added = true;
-            }
-        }
-    }
-
-    /// Checks images against model size limits and returns information about rejected images
-    pub fn check_image_size_limits(
-        &self,
-        model: &Arc<dyn language_model::LanguageModel>,
-    ) -> Vec<RejectedImage> {
-        let mut rejected_images = Vec::new();
-
-        if !self.images.is_empty() {
-            let max_image_size = model.max_image_size();
-
-            for image in &self.images {
-                let image_size = image.len() as u64;
-                if image_size > max_image_size {
-                    rejected_images.push(RejectedImage {
-                        size: image_size,
-                        max_size: max_image_size,
-                        model_name: model.name().0.to_string(),
-                    });
-                }
-            }
-        }
-
-        rejected_images
-    }
-
-    pub fn add_to_request_message_with_validation<F>(
-        &self,
-        request_message: &mut LanguageModelRequestMessage,
-        model: &Arc<dyn language_model::LanguageModel>,
-        mut on_image_rejected: F,
-    ) where
-        F: FnMut(u64, u64, &str),
-    {
-        if !self.text.is_empty() {
-            request_message
-                .content
-                .push(MessageContent::Text(self.text.to_string()));
-        }
-
-        if !self.images.is_empty() {
-            let max_image_size = model.max_image_size();
-            let mut images_added = false;
-
-            for image in &self.images {
-                let image_size = image.len() as u64;
-                if image_size > max_image_size {
-                    on_image_rejected(image_size, max_image_size, &model.name().0);
-
-                    if max_image_size == 0 {
-                        log::warn!(
-                            "Skipping image attachment: model {:?} does not support images",
-                            model.name()
-                        );
-                    } else {
-                        log::warn!(
-                            "Skipping image attachment: size {} bytes exceeds model {:?} limit of {} bytes",
-                            image_size,
-                            model.name(),
-                            max_image_size
-                        );
-                    }
-                    continue;
-                }
-
-                // Some providers only support image parts after an initial text part
-                if !images_added && request_message.content.is_empty() {
-                    request_message
-                        .content
-                        .push(MessageContent::Text("Images attached by user:".to_string()));
-                }
-
-                request_message
-                    .content
-                    .push(MessageContent::Image(image.clone()));
-                images_added = true;
-            }
-        }
-    }
 }

 /// Loads and formats a collection of contexts.
@@ -1240,18 +1117,73 @@ impl Hash for AgentContextKey {
    }
 }

-#[derive(Debug, Clone)]
-pub struct RejectedImage {
-    pub size: u64,
-    pub max_size: u64,
-    pub model_name: String,
+#[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::*;
-    use gpui::{AsyncApp, TestAppContext};
-    use language_model::{LanguageModelCacheConfiguration, LanguageModelId, LanguageModelName};
+    use gpui::TestAppContext;
    use project::{FakeFs, Project};
    use serde_json::json;
    use settings::SettingsStore;
@@ -1358,484 +1290,4 @@ mod tests {
            })
            .expect("Should have found a file context")
    }
-
-    #[gpui::test]
-    async fn test_image_size_limit_filtering(_cx: &mut TestAppContext) {
-        use futures::stream::BoxStream;
-        use gpui::{AsyncApp, DevicePixels, SharedString};
-        use language_model::{
-            LanguageModelId, LanguageModelImage, LanguageModelName, LanguageModelProviderId,
-            LanguageModelProviderName, Role,
-        };
-        use std::sync::Arc;
-
-        // Create a mock image that's 10 bytes
-        let small_image = LanguageModelImage {
-            source: "small_data".into(),
-            size: gpui::size(DevicePixels(10), DevicePixels(10)),
-        };
-
-        // Create a mock image that's 1MB
-        let large_image_source = "x".repeat(1_048_576);
-        let large_image = LanguageModelImage {
-            source: large_image_source.into(),
-            size: gpui::size(DevicePixels(1024), DevicePixels(1024)),
-        };
-
-        let loaded_context = LoadedContext {
-            contexts: vec![],
-            text: "Some text".to_string(),
-            images: vec![small_image.clone(), large_image.clone()],
-        };
-
-        // Test with a model that supports images with 500KB limit
-        struct TestModel500KB;
-        impl language_model::LanguageModel for TestModel500KB {
-            fn id(&self) -> LanguageModelId {
-                LanguageModelId(SharedString::from("test-500kb"))
-            }
-            fn name(&self) -> LanguageModelName {
-                LanguageModelName(SharedString::from("Test Model 500KB"))
-            }
-            fn provider_id(&self) -> LanguageModelProviderId {
-                LanguageModelProviderId(SharedString::from("test"))
-            }
-            fn provider_name(&self) -> LanguageModelProviderName {
-                LanguageModelProviderName(SharedString::from("Test Provider"))
-            }
-            fn supports_tools(&self) -> bool {
-                false
-            }
-            fn supports_tool_choice(&self, _: language_model::LanguageModelToolChoice) -> bool {
-                false
-            }
-            fn max_image_size(&self) -> u64 {
-                512_000
-            } // 500KB
-            fn telemetry_id(&self) -> String {
-                "test-500kb".to_string()
-            }
-            fn max_token_count(&self) -> u64 {
-                100_000
-            }
-            fn count_tokens(
-                &self,
-                _request: language_model::LanguageModelRequest,
-                _cx: &App,
-            ) -> futures::future::BoxFuture<'static, anyhow::Result<u64>> {
-                Box::pin(async { Ok(0) })
-            }
-            fn stream_completion(
-                &self,
-                _request: language_model::LanguageModelRequest,
-                _cx: &AsyncApp,
-            ) -> futures::future::BoxFuture<
-                'static,
-                Result<
-                    BoxStream<
-                        'static,
-                        Result<
-                            language_model::LanguageModelCompletionEvent,
-                            language_model::LanguageModelCompletionError,
-                        >,
-                    >,
-                    language_model::LanguageModelCompletionError,
-                >,
-            > {
-                use language_model::LanguageModelCompletionError;
-                Box::pin(async {
-                    Err(LanguageModelCompletionError::Other(anyhow::anyhow!(
-                        "Not implemented"
-                    )))
-                })
-            }
-        }
-
-        let model_500kb: Arc<dyn language_model::LanguageModel> = Arc::new(TestModel500KB);
-        let mut request_message = LanguageModelRequestMessage {
-            role: Role::User,
-            content: vec![],
-            cache: false,
-        };
-
-        loaded_context.add_to_request_message_with_model(&mut request_message, &model_500kb);
-
-        // Should have text and only the small image
-        assert_eq!(request_message.content.len(), 2); // text + small image
-        assert!(
-            matches!(&request_message.content[0], MessageContent::Text(text) if text == "Some text")
-        );
-        assert!(matches!(
-            &request_message.content[1],
-            MessageContent::Image(_)
-        ));
-
-        // Test with a model that doesn't support images
-        struct TestModelNoImages;
-        impl language_model::LanguageModel for TestModelNoImages {
-            fn id(&self) -> LanguageModelId {
-                LanguageModelId(SharedString::from("test-no-images"))
-            }
-            fn name(&self) -> LanguageModelName {
-                LanguageModelName(SharedString::from("Test Model No Images"))
-            }
-            fn provider_id(&self) -> LanguageModelProviderId {
-                LanguageModelProviderId(SharedString::from("test"))
-            }
-            fn provider_name(&self) -> LanguageModelProviderName {
-                LanguageModelProviderName(SharedString::from("Test Provider"))
-            }
-            fn supports_tools(&self) -> bool {
-                false
-            }
-            fn supports_tool_choice(&self, _: language_model::LanguageModelToolChoice) -> bool {
-                false
-            }
-            fn max_image_size(&self) -> u64 {
-                0
-            } // No image support
-            fn telemetry_id(&self) -> String {
-                "test-no-images".to_string()
-            }
-            fn max_token_count(&self) -> u64 {
-                100_000
-            }
-            fn count_tokens(
-                &self,
-                _request: language_model::LanguageModelRequest,
-                _cx: &App,
-            ) -> futures::future::BoxFuture<'static, anyhow::Result<u64>> {
-                Box::pin(async { Ok(0) })
-            }
-            fn stream_completion(
-                &self,
-                _request: language_model::LanguageModelRequest,
-                _cx: &AsyncApp,
-            ) -> futures::future::BoxFuture<
-                'static,
-                Result<
-                    BoxStream<
-                        'static,
-                        Result<
-                            language_model::LanguageModelCompletionEvent,
-                            language_model::LanguageModelCompletionError,
-                        >,
-                    >,
-                    language_model::LanguageModelCompletionError,
-                >,
-            > {
-                use language_model::LanguageModelCompletionError;
-                Box::pin(async {
-                    Err(LanguageModelCompletionError::Other(anyhow::anyhow!(
-                        "Not implemented"
-                    )))
-                })
-            }
-        }
-
-        let model_no_images: Arc<dyn language_model::LanguageModel> = Arc::new(TestModelNoImages);
-        let mut request_message_no_images = LanguageModelRequestMessage {
-            role: Role::User,
-            content: vec![],
-            cache: false,
-        };
-
-        loaded_context
-            .add_to_request_message_with_model(&mut request_message_no_images, &model_no_images);
-
-        // Should have only text, no images
-        assert_eq!(request_message_no_images.content.len(), 1);
-        assert!(
-            matches!(&request_message_no_images.content[0], MessageContent::Text(text) if text == "Some text")
-        );
-    }
-
-    #[gpui::test]
-    async fn test_check_image_size_limits() {
-        use gpui::DevicePixels;
-        use language_model::LanguageModelImage;
-
-        // Create test images of various sizes
-        let tiny_image = LanguageModelImage {
-            source: "tiny".into(),
-            size: gpui::size(DevicePixels(10), DevicePixels(10)),
-        };
-
-        let small_image = LanguageModelImage {
-            source: "x".repeat(100_000).into(), // 100KB
-            size: gpui::size(DevicePixels(100), DevicePixels(100)),
-        };
-
-        let medium_image = LanguageModelImage {
-            source: "x".repeat(500_000).into(), // 500KB
-            size: gpui::size(DevicePixels(500), DevicePixels(500)),
-        };
-
-        let large_image = LanguageModelImage {
-            source: "x".repeat(1_048_576).into(), // 1MB
-            size: gpui::size(DevicePixels(1024), DevicePixels(1024)),
-        };
-
-        let huge_image = LanguageModelImage {
-            source: "x".repeat(5_242_880).into(), // 5MB
-            size: gpui::size(DevicePixels(2048), DevicePixels(2048)),
-        };
-
-        // Test with model that has 1MB limit
-        let model_1mb = Arc::new(TestModel1MB);
-        let loaded_context = LoadedContext {
-            contexts: vec![],
-            text: String::new(),
-            images: vec![
-                tiny_image.clone(),
-                small_image.clone(),
-                medium_image.clone(),
-                large_image.clone(),
-                huge_image.clone(),
-            ],
-        };
-
-        let rejected = loaded_context.check_image_size_limits(
-            &(model_1mb.clone() as Arc<dyn language_model::LanguageModel>),
-        );
-        assert_eq!(rejected.len(), 1);
-        assert_eq!(rejected[0].size, 5_242_880);
-        assert_eq!(rejected[0].max_size, 1_048_576);
-        assert_eq!(rejected[0].model_name, "Test Model 1MB");
-
-        // Test with model that doesn't support images
-        let model_no_images = Arc::new(TestModelNoImages);
-        let rejected = loaded_context.check_image_size_limits(
-            &(model_no_images.clone() as Arc<dyn language_model::LanguageModel>),
-        );
-        assert_eq!(rejected.len(), 5); // All images rejected
-        for (_i, rejected_image) in rejected.iter().enumerate() {
-            assert_eq!(rejected_image.max_size, 0);
-            assert_eq!(rejected_image.model_name, "Test Model No Images");
-        }
-
-        // Test with empty image list
-        let empty_context = LoadedContext {
-            contexts: vec![],
-            text: String::new(),
-            images: vec![],
-        };
-        let rejected = empty_context.check_image_size_limits(
-            &(model_1mb.clone() as Arc<dyn language_model::LanguageModel>),
-        );
-        assert!(rejected.is_empty());
-
-        // Test with all images within limit
-        let small_context = LoadedContext {
-            contexts: vec![],
-            text: String::new(),
-            images: vec![tiny_image.clone(), small_image.clone()],
-        };
-        let rejected = small_context
-            .check_image_size_limits(&(model_1mb as Arc<dyn language_model::LanguageModel>));
-        assert!(rejected.is_empty());
-    }
-
-    #[gpui::test]
-    async fn test_add_to_request_message_with_validation() {
-        use gpui::DevicePixels;
-        use language_model::{LanguageModelImage, MessageContent, Role};
-
-        let small_image = LanguageModelImage {
-            source: "small".into(),
-            size: gpui::size(DevicePixels(10), DevicePixels(10)),
-        };
-
-        let large_image = LanguageModelImage {
-            source: "x".repeat(2_097_152).into(), // 2MB
-            size: gpui::size(DevicePixels(1024), DevicePixels(1024)),
-        };
-
-        let loaded_context = LoadedContext {
-            contexts: vec![],
-            text: "Test message".to_string(),
-            images: vec![small_image.clone(), large_image.clone()],
-        };
-
-        let model = Arc::new(TestModel1MB);
-        let mut request_message = LanguageModelRequestMessage {
-            role: Role::User,
-            content: Vec::new(),
-            cache: false,
-        };
-
-        let mut rejected_count = 0;
-        let mut rejected_sizes = Vec::new();
-        let mut rejected_model_names = Vec::new();
-
-        loaded_context.add_to_request_message_with_validation(
-            &mut request_message,
-            &(model.clone() as Arc<dyn language_model::LanguageModel>),
-            |size, max_size, model_name| {
-                rejected_count += 1;
-                rejected_sizes.push((size, max_size));
-                rejected_model_names.push(model_name.to_string());
-            },
-        );
-
-        // Verify callback was called for the large image
-        assert_eq!(rejected_count, 1);
-        assert_eq!(rejected_sizes[0], (2_097_152, 1_048_576));
-        assert_eq!(rejected_model_names[0], "Test Model 1MB");
-
-        // Verify the request message contains text and only the small image
-        assert_eq!(request_message.content.len(), 2); // text + small image
-        assert!(
-            matches!(&request_message.content[0], MessageContent::Text(text) if text == "Test message")
-        );
-        assert!(matches!(
-            &request_message.content[1],
-            MessageContent::Image(_)
-        ));
-    }
-
-    // Helper test models
-    struct TestModel1MB;
-    impl language_model::LanguageModel for TestModel1MB {
-        fn id(&self) -> LanguageModelId {
-            LanguageModelId(SharedString::from("test-1mb"))
-        }
-        fn name(&self) -> LanguageModelName {
-            LanguageModelName(SharedString::from("Test Model 1MB"))
-        }
-        fn provider_id(&self) -> language_model::LanguageModelProviderId {
-            language_model::LanguageModelProviderId(SharedString::from("test"))
-        }
-        fn provider_name(&self) -> language_model::LanguageModelProviderName {
-            language_model::LanguageModelProviderName(SharedString::from("Test Provider"))
-        }
-        fn supports_tools(&self) -> bool {
-            false
-        }
-        fn supports_tool_choice(&self, _: language_model::LanguageModelToolChoice) -> bool {
-            false
-        }
-        fn max_image_size(&self) -> u64 {
-            1_048_576 // 1MB
-        }
-        fn telemetry_id(&self) -> String {
-            "test-1mb".to_string()
-        }
-        fn max_token_count(&self) -> u64 {
-            100_000
-        }
-        fn max_output_tokens(&self) -> Option<u64> {
-            Some(4096)
-        }
-        fn cache_configuration(&self) -> Option<LanguageModelCacheConfiguration> {
-            Some(LanguageModelCacheConfiguration {
-                max_cache_anchors: 0,
-                should_speculate: false,
-                min_total_token: 1024,
-            })
-        }
-        fn count_tokens(
-            &self,
-            _request: language_model::LanguageModelRequest,
-            _cx: &App,
-        ) -> futures::future::BoxFuture<'static, anyhow::Result<u64>> {
-            Box::pin(async { Ok(0) })
-        }
-        fn stream_completion(
-            &self,
-            _request: language_model::LanguageModelRequest,
-            _cx: &AsyncApp,
-        ) -> futures::future::BoxFuture<
-            'static,
-            Result<
-                futures::stream::BoxStream<
-                    'static,
-                    Result<
-                        language_model::LanguageModelCompletionEvent,
-                        language_model::LanguageModelCompletionError,
-                    >,
-                >,
-                language_model::LanguageModelCompletionError,
-            >,
-        > {
-            use language_model::LanguageModelCompletionError;
-            Box::pin(async {
-                Err(LanguageModelCompletionError::Other(anyhow::anyhow!(
-                    "Not implemented"
-                )))
-            })
-        }
-    }
-
-    struct TestModelNoImages;
-    impl language_model::LanguageModel for TestModelNoImages {
-        fn id(&self) -> LanguageModelId {
-            LanguageModelId(SharedString::from("test-no-images"))
-        }
-        fn name(&self) -> LanguageModelName {
-            LanguageModelName(SharedString::from("Test Model No Images"))
-        }
-        fn provider_id(&self) -> language_model::LanguageModelProviderId {
-            language_model::LanguageModelProviderId(SharedString::from("test"))
-        }
-        fn provider_name(&self) -> language_model::LanguageModelProviderName {
-            language_model::LanguageModelProviderName(SharedString::from("Test Provider"))
-        }
-        fn supports_tools(&self) -> bool {
-            false
-        }
-        fn supports_tool_choice(&self, _: language_model::LanguageModelToolChoice) -> bool {
-            false
-        }
-        fn max_image_size(&self) -> u64 {
-            0 // No image support
-        }
-        fn telemetry_id(&self) -> String {
-            "test-no-images".to_string()
-        }
-        fn max_token_count(&self) -> u64 {
-            100_000
-        }
-        fn max_output_tokens(&self) -> Option<u64> {
-            Some(4096)
-        }
-        fn cache_configuration(&self) -> Option<LanguageModelCacheConfiguration> {
-            Some(LanguageModelCacheConfiguration {
-                max_cache_anchors: 0,
-                should_speculate: false,
-                min_total_token: 1024,
-            })
-        }
-        fn count_tokens(
-            &self,
-            _request: language_model::LanguageModelRequest,
-            _cx: &App,
-        ) -> futures::future::BoxFuture<'static, anyhow::Result<u64>> {
-            Box::pin(async { Ok(0) })
-        }
-        fn stream_completion(
-            &self,
-            _request: language_model::LanguageModelRequest,
-            _cx: &AsyncApp,
-        ) -> futures::future::BoxFuture<
-            'static,
-            Result<
-                futures::stream::BoxStream<
-                    'static,
-                    Result<
-                        language_model::LanguageModelCompletionEvent,
-                        language_model::LanguageModelCompletionError,
-                    >,
-                >,
-                language_model::LanguageModelCompletionError,
-            >,
-        > {
-            use language_model::LanguageModelCompletionError;
-            Box::pin(async {
-                Err(LanguageModelCompletionError::Other(anyhow::anyhow!(
-                    "Not implemented"
-                )))
-            })
-        }
-    }
 }
--- 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())
@@ -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_ui/src/context_server_configuration.rs
+++ b/crates/agent_ui/src/context_server_configuration.rs
--- 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,29 +1,29 @@
-use crate::{
-    context::{
-        AgentContextHandle, AgentContextKey, ContextId, ContextKind, DirectoryContextHandle,
-        FetchedUrlContext, FileContextHandle, ImageContext, RulesContextHandle,
-        SelectionContextHandle, SymbolContextHandle, TextThreadContextHandle, ThreadContextHandle,
-    },
-    thread::{MessageId, Thread, ThreadId},
-    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>>,
@@ -561,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);
@@ -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
--- 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,31 +3,26 @@ 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;
 use futures::future::Shared;
 use futures::{FutureExt as _, future};
-use gpui::AsyncApp;
 use gpui::{
    Animation, AnimationExt, App, Entity, EventEmitter, Focusable, Subscription, Task, TextStyle,
    WeakEntity, linear_color_stop, linear_gradient, point, pulsating_between,
@@ -51,19 +46,16 @@ 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},
-};
-use workspace::{Toast, notifications::NotificationId};

 #[derive(RegisterComponent)]
 pub struct MessageEditor {
@@ -97,7 +89,7 @@ pub(crate) fn create_editor(
    thread_store: WeakEntity<ThreadStore>,
    text_thread_store: WeakEntity<TextThreadStore>,
    min_lines: usize,
-    max_lines: Option<usize>,
+    max_lines: usize,
    window: &mut Window,
    cx: &mut App,
 ) -> Entity<Editor> {
@@ -115,7 +107,7 @@ pub(crate) fn create_editor(
        let mut editor = Editor::new(
            editor::EditorMode::AutoHeight {
                min_lines,
-                max_lines: max_lines,
+                max_lines,
            },
            buffer,
            None,
@@ -171,7 +163,7 @@ impl MessageEditor {
            thread_store.clone(),
            text_thread_store.clone(),
            MIN_EDITOR_LINES,
-            Some(MAX_EDITOR_LINES),
+            MAX_EDITOR_LINES,
            window,
            cx,
        );
@@ -248,21 +240,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,
@@ -284,7 +261,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,
                })
            }
        });
@@ -382,15 +359,11 @@ impl MessageEditor {
        let checkpoint = git_store.update(cx, |git_store, cx| git_store.checkpoint(cx));
        let context_task = self.reload_context(cx);
        let window_handle = window.window_handle();
-        let workspace = self.workspace.clone();

        cx.spawn(async move |_this, cx| {
            let (checkpoint, loaded_context) = future::join(checkpoint, context_task).await;
            let loaded_context = loaded_context.unwrap_or_default();

-            // Check for rejected images and show notifications
-            Self::notify_rejected_images(&loaded_context, &model, &workspace, &cx);
-
            thread
                .update(cx, |thread, cx| {
                    thread.insert_user_message(
@@ -418,80 +391,6 @@ impl MessageEditor {
        .detach();
    }

-    fn notify_rejected_images(
-        loaded_context: &agent::context::ContextLoadResult,
-        model: &Arc<dyn language_model::LanguageModel>,
-        workspace: &WeakEntity<Workspace>,
-        cx: &AsyncApp,
-    ) {
-        let rejected_images = loaded_context.loaded_context.check_image_size_limits(model);
-        if rejected_images.is_empty() {
-            return;
-        }
-
-        let workspace = workspace.clone();
-        let model_name = rejected_images[0].model_name.clone();
-        let max_size = model.max_image_size();
-        let count = rejected_images.len();
-        let rejected_images = rejected_images.clone();
-
-        cx.update(|cx| {
-            if let Some(workspace) = workspace.upgrade() {
-                workspace.update(cx, |workspace, cx| {
-                    let message = if max_size == 0 {
-                        Self::format_unsupported_images_message(&model_name, count)
-                    } else {
-                        Self::format_size_limit_message(
-                            &model_name,
-                            count,
-                            max_size,
-                            &rejected_images,
-                        )
-                    };
-
-                    struct ImageRejectionToast;
-                    workspace.show_toast(
-                        Toast::new(NotificationId::unique::<ImageRejectionToast>(), message),
-                        cx,
-                    );
-                });
-            }
-        })
-        .log_err();
-    }
-
-    fn format_unsupported_images_message(model_name: &str, count: usize) -> String {
-        let plural = if count > 1 { "s" } else { "" };
-        format!(
-            "{} does not support image attachments. {} image{} will be excluded from your message.",
-            model_name, count, plural
-        )
-    }
-
-    fn format_size_limit_message(
-        model_name: &str,
-        count: usize,
-        max_size: u64,
-        rejected_images: &[agent::context::RejectedImage],
-    ) -> String {
-        let plural = if count > 1 { "s" } else { "" };
-        let max_size_mb = max_size as f64 / 1_048_576.0;
-
-        // If only one image, show its specific size
-        if count == 1 {
-            let image_size_mb = rejected_images[0].size as f64 / 1_048_576.0;
-            format!(
-                "Image ({:.1} MB) exceeds {}'s {:.1} MB size limit and will be excluded.",
-                image_size_mb, model_name, max_size_mb
-            )
-        } else {
-            format!(
-                "{} image{} exceeded {}'s {:.1} MB size limit and will be excluded.",
-                count, plural, model_name, max_size_mb
-            )
-        }
-    }
-
    fn stop_current_and_send_new_message(&mut self, window: &mut Window, cx: &mut Context<Self>) {
        self.thread.update(cx, |thread, cx| {
            thread.cancel_editing(cx);
@@ -655,7 +554,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;
        }

@@ -1326,17 +1225,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;
        }

@@ -1390,41 +1288,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);
+                                })),
+                        ),
+                ),
        )
    }

@@ -1552,69 +1446,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>,
@@ -1653,9 +1484,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()
@@ -1727,8 +1557,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(),
            )
@@ -1740,7 +1570,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>,
--- 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,25 +1,22 @@
-use crate::{
-    context_server_tool::ContextServerTool,
-    thread::{
-        DetailedSummaryState, ExceededWindowError, MessageId, ProjectSnapshot, Thread, ThreadId,
-    },
-};
+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};
@@ -28,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 {
@@ -71,7 +69,7 @@ impl Column for DataType {
    }
 }

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

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

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

 pub struct ThreadStore {
    project: Entity<Project>,
@@ -732,7 +729,7 @@ pub enum SerializedMessageSegment {
        signature: Option<String>,
    },
    RedactedThinking {
-        data: String,
+        data: Vec<u8>,
    },
 }

--- 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
@@ -1,23 +1,24 @@
-use crate::{
-    thread::{MessageId, PromptId, ThreadId},
-    thread_store::SerializedMessage,
-};
+use std::sync::Arc;
+
 use anyhow::Result;
 use assistant_tool::{
    AnyToolCard, Tool, ToolResultContent, ToolResultOutput, ToolUseStatus, ToolWorkingSet,
 };
 use collections::HashMap;
-use futures::{FutureExt as _, future::Shared};
-use gpui::{App, Entity, SharedString, Task, Window};
-use icons::IconName;
+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 std::sync::Arc;
+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,
@@ -25,7 +26,7 @@ pub struct ToolUse {
    pub ui_text: SharedString,
    pub status: ToolUseStatus,
    pub input: serde_json::Value,
-    pub icon: icons::IconName,
+    pub icon: ui::IconName,
    pub needs_confirmation: bool,
 }

--- 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,
--- 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
--- a/crates/agent_ui/src/ui/upsell.rs
+++ b/crates/agent_ui/src/ui/upsell.rs
--- 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
@@ -339,7 +734,6 @@ impl JsonSchema for LanguageModelProviderSetting {
                "deepseek".into(),
                "openrouter".into(),
                "mistral".into(),
-                "vercel".into(),
            ]),
            ..Default::default()
        }
@@ -384,6 +778,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 +853,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 +869,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 +894,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 +906,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 +944,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 +975,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_ui.rs
+++ b/crates/agent_ui/src/agent_ui.rs
@@ -1,293 +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).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::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/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);

@@ -2117,7 +2110,6 @@ impl AssistantContext {
                                            );
                                        }
                                    }
-                                    LanguageModelCompletionEvent::RedactedThinking { .. } => {},
                                    LanguageModelCompletionEvent::Text(mut chunk) => {
                                        if let Some(start) = thought_process_stack.pop() {
                                            let end = buffer.anchor_before(message_old_end_offset);
@@ -2346,13 +2338,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 +2515,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 +2549,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/crates/assistant_context_editor/src/context_history.rs
+++ b/crates/assistant_context_editor/src/context_history.rs
@@ -0,0 +1,271 @@
+use std::sync::Arc;
+
+use gpui::{App, Entity, EventEmitter, FocusHandle, Focusable, Subscription, Task, WeakEntity};
+use picker::{Picker, PickerDelegate};
+use project::Project;
+use ui::utils::{DateTimeType, format_distance_from_now};
+use ui::{Avatar, ListItem, ListItemSpacing, prelude::*};
+use workspace::{Item, Workspace};
+
+use crate::{
+    AgentPanelDelegate, ContextStore, DEFAULT_TAB_TITLE, RemoteContextMetadata,
+    SavedContextMetadata,
+};
+
+#[derive(Clone)]
+pub enum ContextMetadata {
+    Remote(RemoteContextMetadata),
+    Saved(SavedContextMetadata),
+}
+
+enum SavedContextPickerEvent {
+    Confirmed(ContextMetadata),
+}
+
+pub struct ContextHistory {
+    picker: Entity<Picker<SavedContextPickerDelegate>>,
+    _subscriptions: Vec<Subscription>,
+    workspace: WeakEntity<Workspace>,
+}
+
+impl ContextHistory {
+    pub fn new(
+        project: Entity<Project>,
+        context_store: Entity<ContextStore>,
+        workspace: WeakEntity<Workspace>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Self {
+        let picker = cx.new(|cx| {
+            Picker::uniform_list(
+                SavedContextPickerDelegate::new(project, context_store.clone()),
+                window,
+                cx,
+            )
+            .modal(false)
+            .max_height(None)
+        });
+
+        let subscriptions = vec![
+            cx.observe_in(&context_store, window, |this, _, window, cx| {
+                this.picker
+                    .update(cx, |picker, cx| picker.refresh(window, cx));
+            }),
+            cx.subscribe_in(&picker, window, Self::handle_picker_event),
+        ];
+
+        Self {
+            picker,
+            _subscriptions: subscriptions,
+            workspace,
+        }
+    }
+
+    fn handle_picker_event(
+        &mut self,
+        _: &Entity<Picker<SavedContextPickerDelegate>>,
+        event: &SavedContextPickerEvent,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let SavedContextPickerEvent::Confirmed(context) = event;
+
+        let Some(agent_panel_delegate) = <dyn AgentPanelDelegate>::try_global(cx) else {
+            return;
+        };
+
+        self.workspace
+            .update(cx, |workspace, cx| match context {
+                ContextMetadata::Remote(metadata) => {
+                    agent_panel_delegate
+                        .open_remote_context(workspace, metadata.id.clone(), window, cx)
+                        .detach_and_log_err(cx);
+                }
+                ContextMetadata::Saved(metadata) => {
+                    agent_panel_delegate
+                        .open_saved_context(workspace, metadata.path.clone(), window, cx)
+                        .detach_and_log_err(cx);
+                }
+            })
+            .ok();
+    }
+}
+
+impl Render for ContextHistory {
+    fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
+        div().size_full().child(self.picker.clone())
+    }
+}
+
+impl Focusable for ContextHistory {
+    fn focus_handle(&self, cx: &App) -> FocusHandle {
+        self.picker.focus_handle(cx)
+    }
+}
+
+impl EventEmitter<()> for ContextHistory {}
+
+impl Item for ContextHistory {
+    type Event = ();
+
+    fn tab_content_text(&self, _detail: usize, _cx: &App) -> SharedString {
+        "History".into()
+    }
+}
+
+struct SavedContextPickerDelegate {
+    store: Entity<ContextStore>,
+    project: Entity<Project>,
+    matches: Vec<ContextMetadata>,
+    selected_index: usize,
+}
+
+impl EventEmitter<SavedContextPickerEvent> for Picker<SavedContextPickerDelegate> {}
+
+impl SavedContextPickerDelegate {
+    fn new(project: Entity<Project>, store: Entity<ContextStore>) -> Self {
+        Self {
+            project,
+            store,
+            matches: Vec::new(),
+            selected_index: 0,
+        }
+    }
+}
+
+impl PickerDelegate for SavedContextPickerDelegate {
+    type ListItem = ListItem;
+
+    fn match_count(&self) -> usize {
+        self.matches.len()
+    }
+
+    fn selected_index(&self) -> usize {
+        self.selected_index
+    }
+
+    fn set_selected_index(
+        &mut self,
+        ix: usize,
+        _window: &mut Window,
+        _cx: &mut Context<Picker<Self>>,
+    ) {
+        self.selected_index = ix;
+    }
+
+    fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
+        "Search...".into()
+    }
+
+    fn update_matches(
+        &mut self,
+        query: String,
+        _window: &mut Window,
+        cx: &mut Context<Picker<Self>>,
+    ) -> Task<()> {
+        let search = self.store.read(cx).search(query, cx);
+        cx.spawn(async move |this, cx| {
+            let matches = search.await;
+            this.update(cx, |this, cx| {
+                let host_contexts = this.delegate.store.read(cx).host_contexts();
+                this.delegate.matches = host_contexts
+                    .iter()
+                    .cloned()
+                    .map(ContextMetadata::Remote)
+                    .chain(matches.into_iter().map(ContextMetadata::Saved))
+                    .collect();
+                this.delegate.selected_index = 0;
+                cx.notify();
+            })
+            .ok();
+        })
+    }
+
+    fn confirm(&mut self, _secondary: bool, _window: &mut Window, cx: &mut Context<Picker<Self>>) {
+        if let Some(metadata) = self.matches.get(self.selected_index) {
+            cx.emit(SavedContextPickerEvent::Confirmed(metadata.clone()));
+        }
+    }
+
+    fn dismissed(&mut self, _window: &mut Window, _cx: &mut Context<Picker<Self>>) {}
+
+    fn render_match(
+        &self,
+        ix: usize,
+        selected: bool,
+        _window: &mut Window,
+        cx: &mut Context<Picker<Self>>,
+    ) -> Option<Self::ListItem> {
+        let context = self.matches.get(ix)?;
+        let item = match context {
+            ContextMetadata::Remote(context) => {
+                let host_user = self.project.read(cx).host().and_then(|collaborator| {
+                    self.project
+                        .read(cx)
+                        .user_store()
+                        .read(cx)
+                        .get_cached_user(collaborator.user_id)
+                });
+                div()
+                    .flex()
+                    .w_full()
+                    .justify_between()
+                    .gap_2()
+                    .child(
+                        h_flex().flex_1().overflow_x_hidden().child(
+                            Label::new(context.summary.clone().unwrap_or(DEFAULT_TAB_TITLE.into()))
+                                .size(LabelSize::Small),
+                        ),
+                    )
+                    .child(
+                        h_flex()
+                            .gap_2()
+                            .children(if let Some(host_user) = host_user {
+                                vec![
+                                    Avatar::new(host_user.avatar_uri.clone()).into_any_element(),
+                                    Label::new(format!("Shared by @{}", host_user.github_login))
+                                        .color(Color::Muted)
+                                        .size(LabelSize::Small)
+                                        .into_any_element(),
+                                ]
+                            } else {
+                                vec![
+                                    Label::new("Shared by host")
+                                        .color(Color::Muted)
+                                        .size(LabelSize::Small)
+                                        .into_any_element(),
+                                ]
+                            }),
+                    )
+            }
+            ContextMetadata::Saved(context) => div()
+                .flex()
+                .w_full()
+                .justify_between()
+                .gap_2()
+                .child(
+                    h_flex()
+                        .flex_1()
+                        .child(Label::new(context.title.clone()).size(LabelSize::Small))
+                        .overflow_x_hidden(),
+                )
+                .child(
+                    Label::new(format_distance_from_now(
+                        DateTimeType::Local(context.mtime),
+                        false,
+                        true,
+                        true,
+                    ))
+                    .color(Color::Muted)
+                    .size(LabelSize::Small),
+                ),
+        };
+        Some(
+            ListItem::new(ix)
+                .inset(true)
+                .spacing(ListItemSpacing::Sparse)
+                .toggle_state(selected)
+                .child(item),
+        )
+    }
+}
--- a/crates/assistant_context_editor/src/context_store.rs
+++ b/crates/assistant_context_editor/src/context_store.rs
--- a/crates/assistant_context_editor/src/language_model_selector.rs
+++ b/crates/assistant_context_editor/src/language_model_selector.rs
@@ -4,7 +4,8 @@ use collections::{HashSet, IndexMap};
 use feature_flags::ZedProFeatureFlag;
 use fuzzy::{StringMatch, StringMatchCandidate, match_strings};
 use gpui::{
-    Action, AnyElement, App, BackgroundExecutor, DismissEvent, Subscription, Task, actions,
+    Action, AnyElement, App, BackgroundExecutor, DismissEvent, Subscription, Task,
+    action_with_deprecated_aliases,
 };
 use language_model::{
    AuthenticateError, ConfiguredModel, LanguageModel, LanguageModelProviderId,
@@ -15,11 +16,12 @@ use picker::{Picker, PickerDelegate};
 use proto::Plan;
 use ui::{ListItem, ListItemSpacing, prelude::*};

-actions!(
+action_with_deprecated_aliases!(
    agent,
+    ToggleModelSelector,
    [
-        #[action(deprecated_aliases = ["assistant::ToggleModelSelector", "assistant2::ToggleModelSelector"])]
-        ToggleModelSelector
+        "assistant::ToggleModelSelector",
+        "assistant2::ToggleModelSelector"
    ]
 );

@@ -399,7 +401,7 @@ impl PickerDelegate for LanguageModelPickerDelegate {
        cx: &mut Context<Picker<Self>>,
    ) -> Task<()> {
        let all_models = self.all_models.clone();
-        let active_model = (self.get_active_model)(cx);
+        let current_index = self.selected_index;
        let bg_executor = cx.background_executor();

        let language_model_registry = LanguageModelRegistry::global(cx);
@@ -441,9 +443,12 @@ impl PickerDelegate for LanguageModelPickerDelegate {
        cx.spawn_in(window, async move |this, cx| {
            this.update_in(cx, |this, window, cx| {
                this.delegate.filtered_entries = filtered_models.entries();
-                // Finds the currently selected model in the list
-                let new_index =
-                    Self::get_active_model_index(&this.delegate.filtered_entries, active_model);
+                // Preserve selection focus
+                let new_index = if current_index >= this.delegate.filtered_entries.len() {
+                    0
+                } else {
+                    current_index
+                };
                this.set_selected_index(new_index, Some(picker::Direction::Down), true, window, cx);
                cx.notify();
            })
@@ -656,10 +661,6 @@ mod tests {
            false
        }

-        fn max_image_size(&self) -> u64 {
-            0
-        }
-
        fn telemetry_id(&self) -> String {
            format!("{}/{}", self.provider_id.0, self.name.0)
        }
--- a/crates/assistant_context_editor/src/max_mode_tooltip.rs
+++ b/crates/assistant_context_editor/src/max_mode_tooltip.rs
@@ -1,11 +1,11 @@
 use gpui::{Context, FontWeight, IntoElement, Render, Window};
 use ui::{prelude::*, tooltip_container};

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

-impl BurnModeTooltip {
+impl MaxModeTooltip {
    pub fn new() -> Self {
        Self { selected: false }
    }
@@ -16,7 +16,7 @@ impl BurnModeTooltip {
    }
 }

-impl Render for BurnModeTooltip {
+impl Render for MaxModeTooltip {
    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
        let (icon, color) = if self.selected {
            (IconName::ZedBurnModeOn, Color::Error)
--- a/crates/assistant_context_editor/src/slash_command.rs
+++ b/crates/assistant_context_editor/src/slash_command.rs
@@ -1,4 +1,4 @@
-use crate::text_thread_editor::TextThreadEditor;
+use crate::context_editor::ContextEditor;
 use anyhow::Result;
 pub use assistant_slash_command::SlashCommand;
 use assistant_slash_command::{AfterCompletion, SlashCommandLine, SlashCommandWorkingSet};
@@ -21,14 +21,14 @@ use workspace::Workspace;
 pub struct SlashCommandCompletionProvider {
    cancel_flag: Mutex<Arc<AtomicBool>>,
    slash_commands: Arc<SlashCommandWorkingSet>,
-    editor: Option<WeakEntity<TextThreadEditor>>,
+    editor: Option<WeakEntity<ContextEditor>>,
    workspace: Option<WeakEntity<Workspace>>,
 }

 impl SlashCommandCompletionProvider {
    pub fn new(
        slash_commands: Arc<SlashCommandWorkingSet>,
-        editor: Option<WeakEntity<TextThreadEditor>>,
+        editor: Option<WeakEntity<ContextEditor>>,
        workspace: Option<WeakEntity<Workspace>>,
    ) -> Self {
        Self {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Peter Tripp	73f7061b1d	Build on every run. 1.9s	2025-06-21 16:52:19 -04:00
Peter Tripp	332660d888	Serious vibes	2025-06-21 16:42:02 -04:00
Peter Tripp	a85915486b	Only do this in test, not in release	2025-06-21 15:57:01 -04:00
Peter Tripp	1b73741d6d	Build with build.rs	2025-06-21 15:56:33 -04:00
Peter Tripp	b595445e6a	Include actions.json	2025-06-21 15:39:30 -04:00
Peter Tripp	33e4300647	add dump	2025-06-21 15:37:06 -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>`