Fix panic in git conflict parsing

assistant_tools: Disallow extra tool parameters by default (#32081 )
This prevents models from hallucinating tool parameters. Release Notes: - Prevent models from hallucinating tool parameters
2025-06-04 16:59:58 -06:00 · 2025-06-04 16:11:40 +00:00 · 2025-06-04 11:51:53 -04:00 · 2025-06-04 09:48:20 -06:00 · 2025-06-04 09:47:42 -06:00 · 2025-06-04 09:46:06 -06:00
277 changed files with 12384 additions and 7585 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -73,7 +73,7 @@ jobs:
    timeout-minutes: 60
    runs-on:
      - self-hosted
-      - test
+      - macOS
    steps:
      - name: Checkout repo
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -200,7 +200,7 @@ jobs:
      needs.job_spec.outputs.run_tests == 'true'
    runs-on:
      - self-hosted
-      - test
+      - macOS
    steps:
      - name: Checkout repo
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -482,7 +482,9 @@ jobs:
      - macos_tests
      - windows_clippy
      - windows_tests
-    if: always()
+    if: |
+      github.repository_owner == 'zed-industries' &&
+      always()
    steps:
      - name: Check all tests passed
        run: |
--- a/.github/workflows/deploy_collab.yml
+++ b/.github/workflows/deploy_collab.yml
@@ -15,7 +15,7 @@ jobs:
    if: github.repository_owner == 'zed-industries'
    runs-on:
      - self-hosted
-      - test
+      - macOS
    steps:
      - name: Checkout repo
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -33,7 +33,7 @@ jobs:
    name: Run tests
    runs-on:
      - self-hosted
-      - test
+      - macOS
    needs: style
    steps:
      - name: Checkout repo
--- a/.github/workflows/release_nightly.yml
+++ b/.github/workflows/release_nightly.yml
@@ -20,7 +20,7 @@ jobs:
    if: github.repository_owner == 'zed-industries'
    runs-on:
      - self-hosted
-      - test
+      - macOS
    steps:
      - name: Checkout repo
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -40,7 +40,7 @@ jobs:
    if: github.repository_owner == 'zed-industries'
    runs-on:
      - self-hosted
-      - test
+      - macOS
    needs: style
    steps:
      - name: Checkout repo
--- a/.rules
+++ b/.rules
@@ -5,12 +5,6 @@
 * Prefer implementing functionality in existing files unless it is a new logical component. Avoid creating many small files.
 * Avoid using functions that panic like `unwrap()`, instead use mechanisms like `?` to propagate errors.
 * Be careful with operations like indexing which may panic if the indexes are out of bounds.
-* Never silently discard errors with `let _ =` on fallible operations. Always handle errors appropriately:
-  - Propagate errors with `?` when the calling function should handle them
-  - Use `.log_err()` or similar when you need to ignore errors but want visibility
-  - Use explicit error handling with `match` or `if let Err(...)` when you need custom logic
-  - Example: avoid `let _ = client.request(...).await?;` - use `client.request(...).await?;` instead
-* When implementing async operations that may fail, ensure errors propagate to the UI layer so users get meaningful feedback.
 * Never create files with `mod.rs` paths - prefer `src/some_module.rs` instead of `src/some_module/mod.rs`.

 # GPUI
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -114,6 +114,7 @@ dependencies = [
 "serde_json_lenient",
 "settings",
 "smol",
+ "sqlez",
 "streaming_diff",
 "telemetry",
 "telemetry_events",
@@ -133,6 +134,7 @@ dependencies = [
 "workspace-hack",
 "zed_actions",
 "zed_llm_client",
+ "zstd",
 ]

 [[package]]
@@ -525,6 +527,7 @@ dependencies = [
 "fuzzy",
 "gpui",
 "indexed_docs",
+ "indoc",
 "language",
 "language_model",
 "languages",
@@ -678,7 +681,6 @@ dependencies = [
 "handlebars 4.5.0",
 "html_to_markdown",
 "http_client",
- "icons",
 "indoc",
 "itertools 0.14.0",
 "language",
@@ -687,7 +689,6 @@ dependencies = [
 "log",
 "lsp",
 "markdown",
- "node_runtime",
 "open",
 "paths",
 "portable-pty",
@@ -696,9 +697,7 @@ dependencies = [
 "prompt_store",
 "rand 0.8.5",
 "regex",
- "release_channel",
 "reqwest_client",
- "rpc",
 "rust-embed",
 "schemars",
 "serde",
@@ -711,7 +710,6 @@ dependencies = [
 "tempfile",
 "terminal",
 "terminal_view",
- "text",
 "theme",
 "tree-sitter-rust",
 "ui",
@@ -1285,9 +1283,9 @@ dependencies = [

 [[package]]
 name = "aws-lc-rs"
-version = "1.13.0"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19b756939cb2f8dc900aa6dcd505e6e2428e9cae7ff7b028c49e3946efa70878"
+checksum = "93fcc8f365936c834db5514fc45aee5b1202d677e6b40e48468aaaa8183ca8c7"
 dependencies = [
 "aws-lc-sys",
 "zeroize",
@@ -1295,9 +1293,9 @@ dependencies = [

 [[package]]
 name = "aws-lc-sys"
-version = "0.28.2"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa9b6986f250236c27e5a204062434a773a13243d2ffc2955f37bdba4c5c6a1"
+checksum = "61b1d86e7705efe1be1b569bab41d4fa1e14e220b60a160f78de2db687add079"
 dependencies = [
 "bindgen 0.69.5",
 "cc",
@@ -2668,40 +2666,6 @@ dependencies = [
 "workspace-hack",
 ]

-[[package]]
-name = "channel_tools"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "assistant_tool",
- "assistant_tools",
- "channel",
- "client",
- "clock",
- "collections",
- "editor",
- "fs",
- "futures 0.3.31",
- "gpui",
- "http_client",
- "icons",
- "language",
- "language_model",
- "log",
- "node_runtime",
- "project",
- "release_channel",
- "rpc",
- "schemars",
- "serde",
- "serde_json",
- "settings",
- "tempfile",
- "text",
- "util",
- "workspace",
-]
-
 [[package]]
 name = "chrono"
 version = "0.4.41"
@@ -3584,9 +3548,9 @@ dependencies = [

 [[package]]
 name = "cosmic-text"
-version = "0.14.2"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da46a9d5a8905cc538a4a5bceb6a4510de7a51049c5588c0114efce102bcbbe8"
+checksum = "3e1ecbb5db9a4c2ee642df67bcfa8f044dd867dbbaa21bfab139cbc204ffbf67"
 dependencies = [
 "bitflags 2.9.0",
 "fontdb 0.16.2",
@@ -7109,6 +7073,7 @@ dependencies = [
 "image",
 "inventory",
 "itertools 0.14.0",
+ "libc",
 "log",
 "lyon",
 "media",
@@ -8797,6 +8762,7 @@ dependencies = [
 "serde",
 "serde_json",
 "settings",
+ "shellexpand 2.1.2",
 "smallvec",
 "smol",
 "streaming-iterator",
@@ -8898,6 +8864,7 @@ dependencies = [
 "mistral",
 "ollama",
 "open_ai",
+ "open_router",
 "partial-json-fixer",
 "project",
 "proto",
@@ -10742,6 +10709,19 @@ dependencies = [
 "workspace-hack",
 ]

+[[package]]
+name = "open_router"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "futures 0.3.31",
+ "http_client",
+ "schemars",
+ "serde",
+ "serde_json",
+ "workspace-hack",
+]
+
 [[package]]
 name = "opener"
 version = "0.7.2"
@@ -12133,6 +12113,7 @@ dependencies = [
 "unindent",
 "url",
 "util",
+ "uuid",
 "which 6.0.3",
 "workspace-hack",
 "worktree",
@@ -17149,6 +17130,7 @@ dependencies = [
 "futures-lite 1.13.0",
 "git2",
 "globset",
+ "indoc",
 "itertools 0.14.0",
 "libc",
 "log",
@@ -19726,7 +19708,7 @@ dependencies = [

 [[package]]
 name = "zed"
-version = "0.190.0"
+version = "0.191.0"
 dependencies = [
 "activity_indicator",
 "agent",
@@ -19746,7 +19728,6 @@ dependencies = [
 "breadcrumbs",
 "call",
 "channel",
- "channel_tools",
 "chrono",
 "clap",
 "cli",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -22,7 +22,6 @@ members = [
    "crates/buffer_diff",
    "crates/call",
    "crates/channel",
-    "crates/channel_tools",
    "crates/cli",
    "crates/client",
    "crates/clock",
@@ -101,6 +100,7 @@ members = [
    "crates/notifications",
    "crates/ollama",
    "crates/open_ai",
+    "crates/open_router",
    "crates/outline",
    "crates/outline_panel",
    "crates/panel",
@@ -232,7 +232,6 @@ breadcrumbs = { path = "crates/breadcrumbs" }
 buffer_diff = { path = "crates/buffer_diff" }
 call = { path = "crates/call" }
 channel = { path = "crates/channel" }
-channel_tools = { path = "crates/channel_tools" }
 cli = { path = "crates/cli" }
 client = { path = "crates/client" }
 clock = { path = "crates/clock" }
@@ -309,6 +308,7 @@ node_runtime = { path = "crates/node_runtime" }
 notifications = { path = "crates/notifications" }
 ollama = { path = "crates/ollama" }
 open_ai = { path = "crates/open_ai" }
+open_router = { path = "crates/open_router", features = ["schemars"] }
 outline = { path = "crates/outline" }
 outline_panel = { path = "crates/outline_panel" }
 panel = { path = "crates/panel" }
--- a/assets/icons/ai_open_router.svg
+++ b/assets/icons/ai_open_router.svg
@@ -0,0 +1,8 @@
+<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg" fill="currentColor" stroke="currentColor">
+  <g clip-path="url(#clip0_205_3)">
+    <path d="M0.094 7.78c0.469 0 2.281 -0.405 3.219 -0.936s0.938 -0.531 2.875 -1.906c2.453 -1.741 4.188 -1.158 7.031 -1.158" stroke-width="2.8125" />
+    <path d="m15.969 3.797 -4.805 2.774V1.023z" />
+    <path d="M0 7.781c0.469 0 2.281 0.405 3.219 0.936s0.938 0.531 2.875 1.906C8.547 12.364 10.281 11.781 13.125 11.781" stroke-width="2.8125" />
+    <path d="m15.875 11.764 -4.805 -2.774v5.548z" />
+  </g>
+</svg>
--- a/assets/icons/cursor_i_beam.svg
+++ b/assets/icons/cursor_i_beam.svg
@@ -1,5 +1,4 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M17 20H16C14.9391 20 13.9217 19.6629 13.1716 19.0627C12.4214 18.4626 12 17.6487 12 16.8V7.2C12 6.35131 12.4214 5.53737 13.1716 4.93726C13.9217 4.33714 14.9391 4 16 4H17" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M7 20H8C9.06087 20 10.0783 19.5786 10.8284 18.8284C11.5786 18.0783 12 17.0609 12 16V15" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M7 4H8C9.06087 4 10.0783 4.42143 10.8284 5.17157C11.5786 5.92172 12 6.93913 12 8V9" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11 13H10.4C9.76346 13 9.15302 12.7893 8.70296 12.4142C8.25284 12.0391 8 11.5304 8 11V5C8 4.46957 8.25284 3.96086 8.70296 3.58579C9.15302 3.21071 9.76346 3 10.4 3H11" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M5 13H5.6C6.23654 13 6.84698 12.7893 7.29704 12.4142C7.74716 12.0391 8 11.5304 8 11V5C8 4.46957 7.74716 3.96086 7.29704 3.58579C6.84698 3.21071 6.23654 3 5.6 3H5" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
--- a/assets/icons/list_todo.svg
+++ b/assets/icons/list_todo.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-list-todo-icon lucide-list-todo"><rect x="3" y="5" width="6" height="6" rx="1"/><path d="m3 17 2 2 4-4"/><path d="M13 6h8"/><path d="M13 12h8"/><path d="M13 18h8"/></svg>
--- a/assets/icons/play_alt.svg
+++ b/assets/icons/play_alt.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4 3L13 8L4 13V3Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
--- a/assets/icons/play_bug.svg
+++ b/assets/icons/play_bug.svg
@@ -0,0 +1,8 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4 12C2.35977 11.85 1 10.575 1 9" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M1.00875 15.2C1.00875 13.625 0.683456 12.275 4.00001 12.2" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7 9C7 10.575 5.62857 11.85 4 12" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M4 12.2C6.98117 12.2 7 13.625 7 15.2" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<rect x="2.5" y="9" width="3" height="6" rx="1.5" fill="black"/>
+<path d="M9 10L13 8L4 3V7.5" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
--- a/assets/icons/sliders.svg
+++ b/assets/icons/sliders.svg
@@ -1,3 +1,8 @@
-<svg width="17" height="17" viewBox="0 0 17 17" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M6.36667 3.79167C5.53364 3.79167 4.85833 4.46697 4.85833 5.3C4.85833 6.13303 5.53364 6.80833 6.36667 6.80833C7.1997 6.80833 7.875 6.13303 7.875 5.3C7.875 4.46697 7.1997 3.79167 6.36667 3.79167ZM2.1 5.925H3.67944C3.9626 7.14732 5.05824 8.05833 6.36667 8.05833C7.67509 8.05833 8.77073 7.14732 9.05389 5.925H14.9C15.2452 5.925 15.525 5.64518 15.525 5.3C15.525 4.95482 15.2452 4.675 14.9 4.675H9.05389C8.77073 3.45268 7.67509 2.54167 6.36667 2.54167C5.05824 2.54167 3.9626 3.45268 3.67944 4.675H2.1C1.75482 4.675 1.475 4.95482 1.475 5.3C1.475 5.64518 1.75482 5.925 2.1 5.925ZM13.3206 12.325C13.0374 13.5473 11.9418 14.4583 10.6333 14.4583C9.32491 14.4583 8.22927 13.5473 7.94611 12.325H2.1C1.75482 12.325 1.475 12.0452 1.475 11.7C1.475 11.3548 1.75482 11.075 2.1 11.075H7.94611C8.22927 9.85268 9.32491 8.94167 10.6333 8.94167C11.9418 8.94167 13.0374 9.85268 13.3206 11.075H14.9C15.2452 11.075 15.525 11.3548 15.525 11.7C15.525 12.0452 15.2452 12.325 14.9 12.325H13.3206ZM9.125 11.7C9.125 10.867 9.8003 10.1917 10.6333 10.1917C11.4664 10.1917 12.1417 10.867 12.1417 11.7C12.1417 12.533 11.4664 13.2083 10.6333 13.2083C9.8003 13.2083 9.125 12.533 9.125 11.7Z" fill="black"/>
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2 5H4" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
+<path d="M8 5L14 5" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
+<path d="M12 11L14 11" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
+<path d="M2 11H8" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
+<circle cx="6" cy="5" r="2" fill="black" fill-opacity="0.1" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
+<circle cx="10" cy="11" r="2" fill="black" fill-opacity="0.1" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
 </svg>
--- a/assets/icons/star.svg
+++ b/assets/icons/star.svg
@@ -1 +1,3 @@
-<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M6.97942 1.25171L6.9585 1.30199L5.58662 4.60039C5.54342 4.70426 5.44573 4.77523 5.3336 4.78422L1.7727 5.0697L1.71841 5.07405L1.38687 5.10063L1.08608 5.12475C0.820085 5.14607 0.712228 5.47802 0.914889 5.65162L1.14406 5.84793L1.39666 6.06431L1.43802 6.09974L4.15105 8.42374C4.23648 8.49692 4.2738 8.61176 4.24769 8.72118L3.41882 12.196L3.40618 12.249L3.32901 12.5725L3.25899 12.866C3.19708 13.1256 3.47945 13.3308 3.70718 13.1917L3.9647 13.0344L4.24854 12.861L4.29502 12.8326L7.34365 10.9705C7.43965 10.9119 7.5604 10.9119 7.6564 10.9705L10.705 12.8326L10.7515 12.861L11.0354 13.0344L11.2929 13.1917C11.5206 13.3308 11.803 13.1256 11.7411 12.866L11.671 12.5725L11.5939 12.249L11.5812 12.196L10.7524 8.72118C10.7263 8.61176 10.7636 8.49692 10.849 8.42374L13.562 6.09974L13.6034 6.06431L13.856 5.84793L14.0852 5.65162C14.2878 5.47802 14.18 5.14607 13.914 5.12475L13.6132 5.10063L13.2816 5.07405L13.2274 5.0697L9.66645 4.78422C9.55432 4.77523 9.45663 4.70426 9.41343 4.60039L8.04155 1.30199L8.02064 1.25171L7.89291 0.944609L7.77702 0.665992C7.67454 0.419604 7.32551 0.419604 7.22303 0.665992L7.10715 0.944609L6.97942 1.25171ZM7.50003 2.60397L6.50994 4.98442C6.32273 5.43453 5.89944 5.74207 5.41351 5.78103L2.84361 5.98705L4.8016 7.66428C5.17183 7.98142 5.33351 8.47903 5.2204 8.95321L4.62221 11.461L6.8224 10.1171C7.23842 9.86302 7.76164 9.86302 8.17766 10.1171L10.3778 11.461L9.77965 8.95321C9.66654 8.47903 9.82822 7.98142 10.1984 7.66428L12.1564 5.98705L9.58654 5.78103C9.10061 5.74207 8.67732 5.43453 8.49011 4.98442L7.50003 2.60397Z" fill="currentColor" fill-rule="evenodd" clip-rule="evenodd"></path></svg>
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.68323 1.53C7.71245 1.47097 7.75758 1.42129 7.81353 1.38655C7.86949 1.35181 7.93404 1.3334 7.9999 1.3334C8.06576 1.3334 8.13031 1.35181 8.18626 1.38655C8.24222 1.42129 8.28735 1.47097 8.31656 1.53L9.85656 4.64933C9.95802 4.85465 10.1078 5.03227 10.293 5.16697C10.4782 5.30167 10.6933 5.38941 10.9199 5.42267L14.3639 5.92667C14.4292 5.93612 14.4905 5.96365 14.5409 6.00613C14.5913 6.04862 14.6289 6.10437 14.6492 6.16707C14.6696 6.22978 14.6721 6.29694 14.6563 6.36096C14.6405 6.42498 14.6071 6.4833 14.5599 6.52933L12.0692 8.95467C11.905 9.11473 11.7821 9.31232 11.7111 9.53042C11.6402 9.74852 11.6233 9.98059 11.6619 10.2067L12.2499 13.6333C12.2614 13.6986 12.2544 13.7657 12.2296 13.8271C12.2048 13.8885 12.1632 13.9417 12.1096 13.9807C12.056 14.0196 11.9926 14.0427 11.9265 14.0473C11.8604 14.0519 11.7944 14.0378 11.7359 14.0067L8.65723 12.388C8.45438 12.2815 8.22868 12.2258 7.99956 12.2258C7.77044 12.2258 7.54475 12.2815 7.3419 12.388L4.2639 14.0067C4.20545 14.0376 4.1395 14.0515 4.07353 14.0468C4.00757 14.0421 3.94424 14.019 3.89076 13.9801C3.83728 13.9413 3.79579 13.8881 3.771 13.8268C3.74622 13.7655 3.73914 13.6985 3.75056 13.6333L4.3379 10.2073C4.3767 9.98116 4.35989 9.74893 4.28892 9.5307C4.21796 9.31246 4.09497 9.11477 3.93056 8.95467L1.4399 6.53C1.39229 6.48402 1.35856 6.4256 1.34254 6.36138C1.32652 6.29717 1.32886 6.22975 1.34928 6.16679C1.36971 6.10384 1.40741 6.04789 1.45808 6.00532C1.50876 5.96275 1.57037 5.93527 1.6359 5.926L5.07923 5.42267C5.30607 5.38967 5.52149 5.30204 5.70695 5.16733C5.89242 5.03261 6.04237 4.85485 6.1439 4.64933L7.68323 1.53Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
--- a/assets/icons/star_filled.svg
+++ b/assets/icons/star_filled.svg
@@ -1 +1,3 @@
-<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M7.22303 0.665992C7.32551 0.419604 7.67454 0.419604 7.77702 0.665992L9.41343 4.60039C9.45663 4.70426 9.55432 4.77523 9.66645 4.78422L13.914 5.12475C14.18 5.14607 14.2878 5.47802 14.0852 5.65162L10.849 8.42374C10.7636 8.49692 10.7263 8.61176 10.7524 8.72118L11.7411 12.866C11.803 13.1256 11.5206 13.3308 11.2929 13.1917L7.6564 10.9705C7.5604 10.9119 7.43965 10.9119 7.34365 10.9705L3.70718 13.1917C3.47945 13.3308 3.19708 13.1256 3.25899 12.866L4.24769 8.72118C4.2738 8.61176 4.23648 8.49692 4.15105 8.42374L0.914889 5.65162C0.712228 5.47802 0.820086 5.14607 1.08608 5.12475L5.3336 4.78422C5.44573 4.77523 5.54342 4.70426 5.58662 4.60039L7.22303 0.665992Z" fill="currentColor"></path></svg>
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.68323 1.53C7.71245 1.47097 7.75758 1.42129 7.81353 1.38655C7.86949 1.35181 7.93404 1.3334 7.9999 1.3334C8.06576 1.3334 8.13031 1.35181 8.18626 1.38655C8.24222 1.42129 8.28735 1.47097 8.31656 1.53L9.85656 4.64933C9.95802 4.85465 10.1078 5.03227 10.293 5.16697C10.4782 5.30167 10.6933 5.38941 10.9199 5.42267L14.3639 5.92667C14.4292 5.93612 14.4905 5.96365 14.5409 6.00613C14.5913 6.04862 14.6289 6.10437 14.6492 6.16707C14.6696 6.22978 14.6721 6.29694 14.6563 6.36096C14.6405 6.42498 14.6071 6.4833 14.5599 6.52933L12.0692 8.95467C11.905 9.11473 11.7821 9.31232 11.7111 9.53042C11.6402 9.74852 11.6233 9.98059 11.6619 10.2067L12.2499 13.6333C12.2614 13.6986 12.2544 13.7657 12.2296 13.8271C12.2048 13.8885 12.1632 13.9417 12.1096 13.9807C12.056 14.0196 11.9926 14.0427 11.9265 14.0473C11.8604 14.0519 11.7944 14.0378 11.7359 14.0067L8.65723 12.388C8.45438 12.2815 8.22868 12.2258 7.99956 12.2258C7.77044 12.2258 7.54475 12.2815 7.3419 12.388L4.2639 14.0067C4.20545 14.0376 4.1395 14.0515 4.07353 14.0468C4.00757 14.0421 3.94424 14.019 3.89076 13.9801C3.83728 13.9413 3.79579 13.8881 3.771 13.8268C3.74622 13.7655 3.73914 13.6985 3.75056 13.6333L4.3379 10.2073C4.3767 9.98116 4.35989 9.74893 4.28892 9.5307C4.21796 9.31246 4.09497 9.11477 3.93056 8.95467L1.4399 6.53C1.39229 6.48402 1.35856 6.4256 1.34254 6.36138C1.32652 6.29717 1.32886 6.22975 1.34928 6.16679C1.36971 6.10384 1.40741 6.04789 1.45808 6.00532C1.50876 5.96275 1.57037 5.93527 1.6359 5.926L5.07923 5.42267C5.30607 5.38967 5.52149 5.30204 5.70695 5.16733C5.89242 5.03261 6.04237 4.85485 6.1439 4.64933L7.68323 1.53Z" fill="black" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
--- a/assets/icons/zed_assistant.svg
+++ b/assets/icons/zed_assistant.svg
@@ -1,5 +1,5 @@
-<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7 1.75L5.88467 5.14092C5.82759 5.31446 5.73055 5.47218 5.60136 5.60136C5.47218 5.73055 5.31446 5.82759 5.14092 5.88467L1.75 7L5.14092 8.11533C5.31446 8.17241 5.47218 8.26945 5.60136 8.39864C5.73055 8.52782 5.82759 8.68554 5.88467 8.85908L7 12.25L8.11533 8.85908C8.17241 8.68554 8.26945 8.52782 8.39864 8.39864C8.52782 8.26945 8.68554 8.17241 8.85908 8.11533L12.25 7L8.85908 5.88467C8.68554 5.82759 8.52782 5.73055 8.39864 5.60136C8.26945 5.47218 8.17241 5.31446 8.11533 5.14092L7 1.75Z" fill="black" fill-opacity="0.15" stroke="black" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M2.91667 1.75V4.08333M1.75 2.91667H4.08333" stroke="black" stroke-opacity="0.75" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M11.0833 9.91667V12.25M9.91667 11.0833H12.25" stroke="black" stroke-opacity="0.75" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 2L6.72534 5.87534C6.6601 6.07367 6.5492 6.25392 6.40155 6.40155C6.25392 6.5492 6.07367 6.6601 5.87534 6.72534L2 8L5.87534 9.27466C6.07367 9.3399 6.25392 9.4508 6.40155 9.59845C6.5492 9.74608 6.6601 9.92633 6.72534 10.1247L8 14L9.27466 10.1247C9.3399 9.92633 9.4508 9.74608 9.59845 9.59845C9.74608 9.4508 9.92633 9.3399 10.1247 9.27466L14 8L10.1247 6.72534C9.92633 6.6601 9.74608 6.5492 9.59845 6.40155C9.4508 6.25392 9.3399 6.07367 9.27466 5.87534L8 2Z" fill="black" fill-opacity="0.15" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M3.33334 2V4.66666M2 3.33334H4.66666" stroke="black" stroke-opacity="0.75" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12.6665 11.3333V14M11.3333 12.6666H13.9999" stroke="black" stroke-opacity="0.75" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -31,8 +31,6 @@
      "ctrl-,": "zed::OpenSettings",
      "ctrl-q": "zed::Quit",
      "f4": "debugger::Start",
-      "alt-f4": "debugger::RerunLastSession",
-      "f5": "debugger::Continue",
      "shift-f5": "debugger::Stop",
      "ctrl-shift-f5": "debugger::Restart",
      "f6": "debugger::Pause",
@@ -280,7 +278,9 @@
      "enter": "agent::Chat",
      "ctrl-enter": "agent::ChatWithFollow",
      "ctrl-i": "agent::ToggleProfileSelector",
-      "shift-ctrl-r": "agent::OpenAgentDiff"
+      "shift-ctrl-r": "agent::OpenAgentDiff",
+      "ctrl-shift-y": "agent::KeepAll",
+      "ctrl-shift-n": "agent::RejectAll"
    }
  },
  {
@@ -583,11 +583,24 @@
      "ctrl-alt-r": "task::Rerun",
      "alt-t": "task::Rerun",
      "alt-shift-t": "task::Spawn",
-      "alt-shift-r": ["task::Spawn", { "reveal_target": "center" }]
+      "alt-shift-r": ["task::Spawn", { "reveal_target": "center" }],
      // also possible to spawn tasks by name:
      // "foo-bar": ["task::Spawn", { "task_name": "MyTask", "reveal_target": "dock" }]
      // or by tag:
      // "foo-bar": ["task::Spawn", { "task_tag": "MyTag" }],
+      "f5": "debugger::RerunLastSession"
+    }
+  },
+  {
+    "context": "Workspace && debugger_running",
+    "bindings": {
+      "f5": "zed::NoAction"
+    }
+  },
+  {
+    "context": "Workspace && debugger_stopped",
+    "bindings": {
+      "f5": "debugger::Continue"
    }
  },
  {
@@ -873,7 +886,8 @@
    "context": "DebugPanel",
    "bindings": {
      "ctrl-t": "debugger::ToggleThreadPicker",
-      "ctrl-i": "debugger::ToggleSessionPicker"
+      "ctrl-i": "debugger::ToggleSessionPicker",
+      "shift-alt-escape": "debugger::ToggleExpandItem"
    }
  },
  {
@@ -897,9 +911,7 @@
    "context": "CollabPanel && not_editing",
    "bindings": {
      "ctrl-backspace": "collab_panel::Remove",
-      "space": "menu::Confirm",
-      "ctrl-up": "collab_panel::MoveChannelUp",
-      "ctrl-down": "collab_panel::MoveChannelDown"
+      "space": "menu::Confirm"
    }
  },
  {
@@ -930,6 +942,13 @@
      "tab": "channel_modal::ToggleMode"
    }
  },
+  {
+    "context": "FileFinder",
+    "bindings": {
+      "ctrl-shift-a": "file_finder::ToggleSplitMenu",
+      "ctrl-shift-i": "file_finder::ToggleFilterMenu"
+    }
+  },
  {
    "context": "FileFinder || (FileFinder > Picker > Editor) || (FileFinder > Picker > menu)",
    "bindings": {
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -4,8 +4,6 @@
    "use_key_equivalents": true,
    "bindings": {
      "f4": "debugger::Start",
-      "alt-f4": "debugger::RerunLastSession",
-      "f5": "debugger::Continue",
      "shift-f5": "debugger::Stop",
      "shift-cmd-f5": "debugger::Restart",
      "f6": "debugger::Pause",
@@ -317,7 +315,9 @@
      "enter": "agent::Chat",
      "cmd-enter": "agent::ChatWithFollow",
      "cmd-i": "agent::ToggleProfileSelector",
-      "shift-ctrl-r": "agent::OpenAgentDiff"
+      "shift-ctrl-r": "agent::OpenAgentDiff",
+      "cmd-shift-y": "agent::KeepAll",
+      "cmd-shift-n": "agent::RejectAll"
    }
  },
  {
@@ -635,7 +635,8 @@
      "cmd-k shift-right": "workspace::SwapPaneRight",
      "cmd-k shift-up": "workspace::SwapPaneUp",
      "cmd-k shift-down": "workspace::SwapPaneDown",
-      "cmd-shift-x": "zed::Extensions"
+      "cmd-shift-x": "zed::Extensions",
+      "f5": "debugger::RerunLastSession"
    }
  },
  {
@@ -652,6 +653,20 @@
      // "foo-bar": ["task::Spawn", { "task_tag": "MyTag" }],
    }
  },
+  {
+    "context": "Workspace && debugger_running",
+    "use_key_equivalents": true,
+    "bindings": {
+      "f5": "zed::NoAction"
+    }
+  },
+  {
+    "context": "Workspace && debugger_stopped",
+    "use_key_equivalents": true,
+    "bindings": {
+      "f5": "debugger::Continue"
+    }
+  },
  // Bindings from Sublime Text
  {
    "context": "Editor",
@@ -936,7 +951,8 @@
    "context": "DebugPanel",
    "bindings": {
      "cmd-t": "debugger::ToggleThreadPicker",
-      "cmd-i": "debugger::ToggleSessionPicker"
+      "cmd-i": "debugger::ToggleSessionPicker",
+      "shift-alt-escape": "debugger::ToggleExpandItem"
    }
  },
  {
@@ -951,9 +967,7 @@
    "use_key_equivalents": true,
    "bindings": {
      "ctrl-backspace": "collab_panel::Remove",
-      "space": "menu::Confirm",
-      "cmd-up": "collab_panel::MoveChannelUp",
-      "cmd-down": "collab_panel::MoveChannelDown"
+      "space": "menu::Confirm"
    }
  },
  {
@@ -989,6 +1003,14 @@
      "tab": "channel_modal::ToggleMode"
    }
  },
+  {
+    "context": "FileFinder",
+    "use_key_equivalents": true,
+    "bindings": {
+      "cmd-shift-a": "file_finder::ToggleSplitMenu",
+      "cmd-shift-i": "file_finder::ToggleFilterMenu"
+    }
+  },
  {
    "context": "FileFinder || (FileFinder > Picker > Editor) || (FileFinder > Picker > menu)",
    "use_key_equivalents": true,
--- a/assets/keymaps/linux/sublime_text.json
+++ b/assets/keymaps/linux/sublime_text.json
@@ -51,7 +51,11 @@
      "ctrl-k ctrl-l": "editor::ConvertToLowerCase",
      "shift-alt-m": "markdown::OpenPreviewToTheSide",
      "ctrl-backspace": "editor::DeleteToPreviousWordStart",
-      "ctrl-delete": "editor::DeleteToNextWordEnd"
+      "ctrl-delete": "editor::DeleteToNextWordEnd",
+      "alt-right": "editor::MoveToNextSubwordEnd",
+      "alt-left": "editor::MoveToPreviousSubwordStart",
+      "alt-shift-right": "editor::SelectToNextSubwordEnd",
+      "alt-shift-left": "editor::SelectToPreviousSubwordStart"
    }
  },
  {
--- a/assets/keymaps/macos/sublime_text.json
+++ b/assets/keymaps/macos/sublime_text.json
@@ -53,7 +53,11 @@
      "cmd-shift-j": "editor::JoinLines",
      "shift-alt-m": "markdown::OpenPreviewToTheSide",
      "ctrl-backspace": "editor::DeleteToPreviousWordStart",
-      "ctrl-delete": "editor::DeleteToNextWordEnd"
+      "ctrl-delete": "editor::DeleteToNextWordEnd",
+      "ctrl-right": "editor::MoveToNextSubwordEnd",
+      "ctrl-left": "editor::MoveToPreviousSubwordStart",
+      "ctrl-shift-right": "editor::SelectToNextSubwordEnd",
+      "ctrl-shift-left": "editor::SelectToPreviousSubwordStart"
    }
  },
  {
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -198,6 +198,8 @@
      "9": ["vim::Number", 9],
      "ctrl-w d": "editor::GoToDefinitionSplit",
      "ctrl-w g d": "editor::GoToDefinitionSplit",
+      "ctrl-w ]": "editor::GoToDefinitionSplit",
+      "ctrl-w ctrl-]": "editor::GoToDefinitionSplit",
      "ctrl-w shift-d": "editor::GoToTypeDefinitionSplit",
      "ctrl-w g shift-d": "editor::GoToTypeDefinitionSplit",
      "ctrl-w space": "editor::OpenExcerptsSplit",
@@ -838,6 +840,19 @@
      "tab": "editor::AcceptEditPrediction"
    }
  },
+  {
+    "context": "MessageEditor > Editor && VimControl",
+    "bindings": {
+      "enter": "agent::Chat",
+      // TODO: Implement search
+      "/": null,
+      "?": null,
+      "#": null,
+      "*": null,
+      "n": null,
+      "shift-n": null
+    }
+  },
  {
    "context": "os != macos && Editor && edit_prediction_conflict",
    "bindings": {
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -73,9 +73,6 @@
  "unnecessary_code_fade": 0.3,
  // Active pane styling settings.
  "active_pane_modifiers": {
-    // The factor to grow the active pane by. Defaults to 1.0
-    // which gives the same size as all other panes.
-    "magnification": 1.0,
    // Inset border size of the active pane, in pixels.
    "border_size": 0.0,
    // Opacity of the inactive panes. 0 means transparent, 1 means opaque.
@@ -128,6 +125,8 @@
  //
  // Default: true
  "restore_on_file_reopen": true,
+  // Whether to automatically close files that have been deleted on disk.
+  "close_on_file_delete": false,
  // 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.
@@ -731,13 +730,6 @@
      // The model to use.
      "model": "claude-sonnet-4"
    },
-    // The model to use when applying edits from the agent.
-    "editor_model": {
-      // The provider to use.
-      "provider": "zed.dev",
-      // The model to use.
-      "model": "claude-sonnet-4"
-    },
    // Additional parameters for language model requests. When making a request to a model, parameters will be taken
    // from the last entry in this list that matches the model's provider and name. In each entry, both provider
    // and model are optional, so that you can specify parameters for either one.
@@ -1505,11 +1497,11 @@
      }
    },
    "LaTeX": {
-      "format_on_save": "on",
      "formatter": "language_server",
      "language_servers": ["texlab", "..."],
      "prettier": {
-        "allowed": false
+        "allowed": true,
+        "plugins": ["prettier-plugin-latex"]
      }
    },
    "Markdown": {
@@ -1533,7 +1525,7 @@
      "allow_rewrap": "anywhere"
    },
    "Ruby": {
-      "language_servers": ["solargraph", "!ruby-lsp", "!rubocop", "..."]
+      "language_servers": ["solargraph", "!ruby-lsp", "!rubocop", "!sorbet", "!steep", "..."]
    },
    "SCSS": {
      "prettier": {
@@ -1610,6 +1602,9 @@
      "version": "1",
      "api_url": "https://api.openai.com/v1"
    },
+    "open_router": {
+      "api_url": "https://openrouter.ai/api/v1"
+    },
    "lmstudio": {
      "api_url": "http://localhost:1234/api/v0"
    },
--- a/assets/settings/initial_debug_tasks.json
+++ b/assets/settings/initial_debug_tasks.json
@@ -1,3 +1,7 @@
+// Some example tasks for common languages.
+//
+// For more documentation on how to configure debug tasks,
+// see: https://zed.dev/docs/debugger
 [
  {
    "label": "Debug active PHP file",
--- a/assets/settings/initial_local_debug_tasks.json
+++ b/assets/settings/initial_local_debug_tasks.json
@@ -0,0 +1,5 @@
+// Project-local debug tasks
+//
+// For more documentation on how to configure debug tasks,
+// see: https://zed.dev/docs/debugger
+[]
--- a/crates/agent/Cargo.toml
+++ b/crates/agent/Cargo.toml
@@ -46,6 +46,7 @@ git.workspace = true
 gpui.workspace = true
 heed.workspace = true
 html_to_markdown.workspace = true
+indoc.workspace = true
 http_client.workspace = true
 indexed_docs.workspace = true
 inventory.workspace = true
@@ -78,6 +79,7 @@ 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
@@ -97,6 +99,7 @@ workspace-hack.workspace = true
 workspace.workspace = true
 zed_actions.workspace = true
 zed_llm_client.workspace = true
+zstd.workspace = true

 [dev-dependencies]
 buffer_diff = { workspace = true, features = ["test-support"] }
--- a/crates/agent/src/active_thread.rs
+++ b/crates/agent/src/active_thread.rs
@@ -3,7 +3,7 @@ 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::insert_message_creases;
+use crate::message_editor::{extract_message_creases, insert_message_creases};
 use crate::thread::{
    LastRestoreCheckpoint, MessageCrease, MessageId, MessageSegment, Thread, ThreadError,
    ThreadEvent, ThreadFeedback, ThreadSummary,
@@ -999,7 +999,7 @@ impl ActiveThread {
            ThreadEvent::Stopped(reason) => match reason {
                Ok(StopReason::EndTurn | StopReason::MaxTokens) => {
                    let used_tools = self.thread.read(cx).used_tools_since_last_user_message();
-                    self.play_notification_sound(cx);
+                    self.play_notification_sound(window, cx);
                    self.show_notification(
                        if used_tools {
                            "Finished running tools"
@@ -1014,9 +1014,18 @@ impl ActiveThread {
                _ => {}
            },
            ThreadEvent::ToolConfirmationNeeded => {
-                self.play_notification_sound(cx);
+                self.play_notification_sound(window, cx);
                self.show_notification("Waiting for tool confirmation", IconName::Info, window, cx);
            }
+            ThreadEvent::ToolUseLimitReached => {
+                self.play_notification_sound(window, cx);
+                self.show_notification(
+                    "Consecutive tool use limit reached.",
+                    IconName::Warning,
+                    window,
+                    cx,
+                );
+            }
            ThreadEvent::StreamedAssistantText(message_id, text) => {
                if let Some(rendered_message) = self.rendered_messages_by_id.get_mut(&message_id) {
                    rendered_message.append_text(text, cx);
@@ -1151,9 +1160,9 @@ impl ActiveThread {
        cx.notify();
    }

-    fn play_notification_sound(&self, cx: &mut App) {
+    fn play_notification_sound(&self, window: &Window, cx: &mut App) {
        let settings = AgentSettings::get_global(cx);
-        if settings.play_sound_when_agent_done {
+        if settings.play_sound_when_agent_done && !window.is_window_active() {
            Audio::play_sound(Sound::AgentDone, cx);
        }
    }
@@ -1577,6 +1586,8 @@ impl ActiveThread {

        let edited_text = state.editor.read(cx).text(cx);

+        let creases = state.editor.update(cx, extract_message_creases);
+
        let new_context = self
            .context_store
            .read(cx)
@@ -1601,6 +1612,7 @@ impl ActiveThread {
                                message_id,
                                Role::User,
                                vec![MessageSegment::Text(edited_text)],
+                                creases,
                                Some(context.loaded_context),
                                checkpoint.ok(),
                                cx,
@@ -3668,10 +3680,13 @@ fn open_editor_at_position(
 #[cfg(test)]
 mod tests {
    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::{LanguageModel, fake_provider::FakeLanguageModel};
+    use language_model::{
+        ConfiguredModel, LanguageModel, LanguageModelRegistry,
+        fake_provider::{FakeLanguageModel, FakeLanguageModelProvider},
+    };
    use project::Project;
    use prompt_store::PromptBuilder;
    use serde_json::json;
@@ -3732,6 +3747,87 @@ mod tests {
        assert!(!cx.read(|cx| workspace.read(cx).is_being_followed(CollaboratorId::Agent)));
    }

+    #[gpui::test]
+    async fn test_reinserting_creases_for_edited_message(cx: &mut TestAppContext) {
+        init_test_settings(cx);
+
+        let project = create_test_project(cx, json!({})).await;
+
+        let (cx, active_thread, _, thread, model) =
+            setup_test_environment(cx, project.clone()).await;
+        cx.update(|_, cx| {
+            LanguageModelRegistry::global(cx).update(cx, |registry, cx| {
+                registry.set_default_model(
+                    Some(ConfiguredModel {
+                        provider: Arc::new(FakeLanguageModelProvider),
+                        model,
+                    }),
+                    cx,
+                );
+            });
+        });
+
+        let creases = vec![MessageCrease {
+            range: 14..22,
+            metadata: CreaseMetadata {
+                icon_path: "icon".into(),
+                label: "foo.txt".into(),
+            },
+            context: None,
+        }];
+
+        let message = thread.update(cx, |thread, cx| {
+            let message_id = thread.insert_user_message(
+                "Tell me about @foo.txt",
+                ContextLoadResult::default(),
+                None,
+                creases,
+                cx,
+            );
+            thread.message(message_id).cloned().unwrap()
+        });
+
+        active_thread.update_in(cx, |active_thread, 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()
+                .unwrap()
+                .1
+                .editor
+                .clone();
+            editor.update(cx, |editor, cx| editor.edit([(0..13, "modified")], cx));
+            active_thread.confirm_editing_message(&Default::default(), window, cx);
+        });
+        cx.run_until_parked();
+
+        let message = thread.update(cx, |thread, _| thread.message(message.id).cloned().unwrap());
+        active_thread.update_in(cx, |active_thread, 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()
+                .unwrap()
+                .1
+                .editor
+                .clone();
+            let text = editor.update(cx, |editor, cx| editor.text(cx));
+            assert_eq!(text, "modified @foo.txt");
+        });
+    }
+
    fn init_test_settings(cx: &mut TestAppContext) {
        cx.update(|cx| {
            let settings_store = SettingsStore::test(cx);
--- a/crates/agent/src/agent.rs
+++ b/crates/agent/src/agent.rs
@@ -33,9 +33,11 @@ use assistant_slash_command::SlashCommandRegistry;
 use client::Client;
 use feature_flags::FeatureFlagAppExt as _;
 use fs::Fs;
-use gpui::{App, actions, impl_actions};
+use gpui::{App, Entity, actions, impl_actions};
 use language::LanguageRegistry;
-use language_model::{LanguageModelId, LanguageModelProviderId, LanguageModelRegistry};
+use language_model::{
+    ConfiguredModel, LanguageModelId, LanguageModelProviderId, LanguageModelRegistry,
+};
 use prompt_store::PromptBuilder;
 use schemars::JsonSchema;
 use serde::Deserialize;
@@ -115,6 +117,23 @@ impl ManageProfiles {

 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()
+            }
+        }
+    }
+}
+
 /// Initializes the `agent` crate.
 pub fn init(
    fs: Arc<dyn Fs>,
--- a/crates/agent/src/agent_diff.rs
+++ b/crates/agent/src/agent_diff.rs
@@ -1086,7 +1086,7 @@ impl Render for AgentDiffToolbar {
                    .child(vertical_divider())
                    .when_some(editor.read(cx).workspace(), |this, _workspace| {
                        this.child(
-                            IconButton::new("review", IconName::ListCollapse)
+                            IconButton::new("review", IconName::ListTodo)
                                .icon_size(IconSize::Small)
                                .tooltip(Tooltip::for_action_title_in(
                                    "Review All Files",
@@ -1116,8 +1116,13 @@ impl Render for AgentDiffToolbar {
                    return Empty.into_any();
                };

-                let is_generating = agent_diff.read(cx).thread.read(cx).is_generating();
-                if is_generating {
+                let has_pending_edit_tool_use = agent_diff
+                    .read(cx)
+                    .thread
+                    .read(cx)
+                    .has_pending_edit_tool_uses();
+
+                if has_pending_edit_tool_use {
                    return div().px_2().child(spinner_icon).into_any();
                }

@@ -1372,6 +1377,7 @@ impl AgentDiff {
            | ThreadEvent::ToolFinished { .. }
            | ThreadEvent::CheckpointChanged
            | ThreadEvent::ToolConfirmationNeeded
+            | ThreadEvent::ToolUseLimitReached
            | ThreadEvent::CancelEditing => {}
        }
    }
@@ -1464,7 +1470,10 @@ impl AgentDiff {
        if !AgentSettings::get_global(cx).single_file_review {
            for (editor, _) in self.reviewing_editors.drain() {
                editor
-                    .update(cx, |editor, cx| editor.end_temporary_diff_override(cx))
+                    .update(cx, |editor, cx| {
+                        editor.end_temporary_diff_override(cx);
+                        editor.unregister_addon::<EditorAgentDiffAddon>();
+                    })
                    .ok();
            }
            return;
@@ -1503,7 +1512,7 @@ impl AgentDiff {
                    multibuffer.add_diff(diff_handle.clone(), cx);
                });

-                let new_state = if thread.read(cx).is_generating() {
+                let new_state = if thread.read(cx).has_pending_edit_tool_uses() {
                    EditorState::Generating
                } else {
                    EditorState::Reviewing
@@ -1560,7 +1569,10 @@ impl AgentDiff {

            if in_workspace {
                editor
-                    .update(cx, |editor, cx| editor.end_temporary_diff_override(cx))
+                    .update(cx, |editor, cx| {
+                        editor.end_temporary_diff_override(cx);
+                        editor.unregister_addon::<EditorAgentDiffAddon>();
+                    })
                    .ok();
                self.reviewing_editors.remove(&editor);
            }
--- a/crates/agent/src/agent_model_selector.rs
+++ b/crates/agent/src/agent_model_selector.rs
@@ -3,7 +3,7 @@ use fs::Fs;
 use gpui::{Entity, FocusHandle, SharedString};
 use picker::popover_menu::PickerPopoverMenu;

-use crate::Thread;
+use crate::ModelUsageContext;
 use assistant_context_editor::language_model_selector::{
    LanguageModelSelector, ToggleModelSelector, language_model_selector,
 };
@@ -12,12 +12,6 @@ use settings::update_settings_file;
 use std::sync::Arc;
 use ui::{PopoverMenuHandle, Tooltip, prelude::*};

-#[derive(Clone)]
-pub enum ModelType {
-    Default(Entity<Thread>),
-    InlineAssistant,
-}
-
 pub struct AgentModelSelector {
    selector: Entity<LanguageModelSelector>,
    menu_handle: PopoverMenuHandle<LanguageModelSelector>,
@@ -29,7 +23,7 @@ impl AgentModelSelector {
        fs: Arc<dyn Fs>,
        menu_handle: PopoverMenuHandle<LanguageModelSelector>,
        focus_handle: FocusHandle,
-        model_type: ModelType,
+        model_usage_context: ModelUsageContext,
        window: &mut Window,
        cx: &mut Context<Self>,
    ) -> Self {
@@ -38,19 +32,14 @@ impl AgentModelSelector {
                let fs = fs.clone();
                language_model_selector(
                    {
-                        let model_type = model_type.clone();
-                        move |cx| match &model_type {
-                            ModelType::Default(thread) => thread.read(cx).configured_model(),
-                            ModelType::InlineAssistant => {
-                                LanguageModelRegistry::read_global(cx).inline_assistant_model()
-                            }
-                        }
+                        let model_context = model_usage_context.clone();
+                        move |cx| model_context.configured_model(cx)
                    },
                    move |model, cx| {
                        let provider = model.provider_id().0.to_string();
                        let model_id = model.id().0.to_string();
-                        match &model_type {
-                            ModelType::Default(thread) => {
+                        match &model_usage_context {
+                            ModelUsageContext::Thread(thread) => {
                                thread.update(cx, |thread, cx| {
                                    let registry = LanguageModelRegistry::read_global(cx);
                                    if let Some(provider) = registry.provider(&model.provider_id())
@@ -72,7 +61,7 @@ impl AgentModelSelector {
                                    },
                                );
                            }
-                            ModelType::InlineAssistant => {
+                            ModelUsageContext::InlineAssistant => {
                                update_settings_file::<AgentSettings>(
                                    fs.clone(),
                                    cx,
--- a/crates/agent/src/context.rs
+++ b/crates/agent/src/context.rs
@@ -734,6 +734,7 @@ impl Display for RulesContext {
 #[derive(Debug, Clone)]
 pub struct ImageContext {
    pub project_path: Option<ProjectPath>,
+    pub full_path: Option<Arc<Path>>,
    pub original_image: Arc<gpui::Image>,
    // TODO: handle this elsewhere and remove `ignore-interior-mutability` opt-out in clippy.toml
    // needed due to a false positive of `clippy::mutable_key_type`.
--- a/crates/agent/src/context_picker/completion_provider.rs
+++ b/crates/agent/src/context_picker/completion_provider.rs
@@ -14,7 +14,7 @@ use http_client::HttpClientWithUrl;
 use itertools::Itertools;
 use language::{Buffer, CodeLabel, HighlightId};
 use lsp::CompletionContext;
-use project::{Completion, CompletionIntent, ProjectPath, Symbol, WorktreeId};
+use project::{Completion, CompletionIntent, CompletionResponse, ProjectPath, Symbol, WorktreeId};
 use prompt_store::PromptStore;
 use rope::Point;
 use text::{Anchor, OffsetRangeExt, ToPoint};
@@ -746,7 +746,7 @@ impl CompletionProvider for ContextPickerCompletionProvider {
        _trigger: CompletionContext,
        _window: &mut Window,
        cx: &mut Context<Editor>,
-    ) -> Task<Result<Option<Vec<Completion>>>> {
+    ) -> Task<Result<Vec<CompletionResponse>>> {
        let state = buffer.update(cx, |buffer, _cx| {
            let position = buffer_position.to_point(buffer);
            let line_start = Point::new(position.row, 0);
@@ -756,13 +756,13 @@ impl CompletionProvider for ContextPickerCompletionProvider {
            MentionCompletion::try_parse(line, offset_to_line)
        });
        let Some(state) = state else {
-            return Task::ready(Ok(None));
+            return Task::ready(Ok(Vec::new()));
        };

        let Some((workspace, context_store)) =
            self.workspace.upgrade().zip(self.context_store.upgrade())
        else {
-            return Task::ready(Ok(None));
+            return Task::ready(Ok(Vec::new()));
        };

        let snapshot = buffer.read(cx).snapshot();
@@ -815,10 +815,10 @@ impl CompletionProvider for ContextPickerCompletionProvider {
        cx.spawn(async move |_, cx| {
            let matches = search_task.await;
            let Some(editor) = editor.upgrade() else {
-                return Ok(None);
+                return Ok(Vec::new());
            };

-            Ok(Some(cx.update(|cx| {
+            let completions = cx.update(|cx| {
                matches
                    .into_iter()
                    .filter_map(|mat| match mat {
@@ -901,7 +901,14 @@ impl CompletionProvider for ContextPickerCompletionProvider {
                        ),
                    })
                    .collect()
-            })?))
+            })?;
+
+            Ok(vec![CompletionResponse {
+                completions,
+                // Since this does its own filtering (see `filter_completions()` returns false),
+                // there is no benefit to computing whether this set of completions is incomplete.
+                is_incomplete: true,
+            }])
        })
    }

@@ -919,8 +926,9 @@ impl CompletionProvider for ContextPickerCompletionProvider {
        &self,
        buffer: &Entity<language::Buffer>,
        position: language::Anchor,
-        _: &str,
-        _: bool,
+        _text: &str,
+        _trigger_in_words: bool,
+        _menu_is_open: bool,
        cx: &mut Context<Editor>,
    ) -> bool {
        let buffer = buffer.read(cx);
--- a/crates/agent/src/context_server_tool.rs
+++ b/crates/agent/src/context_server_tool.rs
@@ -51,6 +51,10 @@ impl Tool for ContextServerTool {
        true
    }

+    fn may_perform_edits(&self) -> bool {
+        true
+    }
+
    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
        let mut schema = self.tool.input_schema.clone();
        assistant_tool::adapt_schema_to_format(&mut schema, format)?;
--- a/crates/agent/src/context_store.rs
+++ b/crates/agent/src/context_store.rs
@@ -7,7 +7,7 @@ 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;
+use language::{Buffer, File as _};
 use language_model::LanguageModelImage;
 use project::image_store::is_image_file;
 use project::{Project, ProjectItem, ProjectPath, Symbol};
@@ -304,11 +304,13 @@ impl ContextStore {
                project.open_image(project_path.clone(), cx)
            })?;
            let image_item = open_image_task.await?;
-            let image = image_item.read_with(cx, |image_item, _| image_item.image.clone())?;
+
            this.update(cx, |this, cx| {
+                let item = image_item.read(cx);
                this.insert_image(
-                    Some(image_item.read(cx).project_path(cx)),
-                    image,
+                    Some(item.project_path(cx)),
+                    Some(item.file.full_path(cx).into()),
+                    item.image.clone(),
                    remove_if_exists,
                    cx,
                )
@@ -317,12 +319,13 @@ impl ContextStore {
    }

    pub fn add_image_instance(&mut self, image: Arc<Image>, cx: &mut Context<ContextStore>) {
-        self.insert_image(None, image, false, cx);
+        self.insert_image(None, None, image, false, cx);
    }

    fn insert_image(
        &mut self,
        project_path: Option<ProjectPath>,
+        full_path: Option<Arc<Path>>,
        image: Arc<Image>,
        remove_if_exists: bool,
        cx: &mut Context<ContextStore>,
@@ -330,6 +333,7 @@ impl ContextStore {
        let image_task = LanguageModelImage::from_image(image.clone(), cx).shared();
        let context = AgentContextHandle::Image(ImageContext {
            project_path,
+            full_path,
            original_image: image,
            image_task,
            context_id: self.next_context_id.post_inc(),
--- a/crates/agent/src/history_store.rs
+++ b/crates/agent/src/history_store.rs
@@ -152,7 +152,7 @@ impl HistoryStore {
                    let entries = join_all(entries)
                        .await
                        .into_iter()
-                        .filter_map(|result| result.log_err())
+                        .filter_map(|result| result.log_with_level(log::Level::Debug))
                        .collect::<VecDeque<_>>();

                    this.update(cx, |this, _| {
--- a/crates/agent/src/inline_prompt_editor.rs
+++ b/crates/agent/src/inline_prompt_editor.rs
@@ -1,4 +1,4 @@
-use crate::agent_model_selector::{AgentModelSelector, ModelType};
+use crate::agent_model_selector::AgentModelSelector;
 use crate::buffer_codegen::BufferCodegen;
 use crate::context::ContextCreasesAddon;
 use crate::context_picker::{ContextPicker, ContextPickerCompletionProvider};
@@ -7,7 +7,7 @@ use crate::context_strip::{ContextStrip, ContextStripEvent, SuggestContextKind};
 use crate::message_editor::{extract_message_creases, insert_message_creases};
 use crate::terminal_codegen::TerminalCodegen;
 use crate::thread_store::{TextThreadStore, ThreadStore};
-use crate::{CycleNextInlineAssist, CyclePreviousInlineAssist};
+use crate::{CycleNextInlineAssist, CyclePreviousInlineAssist, ModelUsageContext};
 use crate::{RemoveAllContext, ToggleContextPicker};
 use assistant_context_editor::language_model_selector::ToggleModelSelector;
 use client::ErrorExt;
@@ -930,7 +930,7 @@ impl PromptEditor<BufferCodegen> {
                    fs,
                    model_selector_menu_handle,
                    prompt_editor.focus_handle(cx),
-                    ModelType::InlineAssistant,
+                    ModelUsageContext::InlineAssistant,
                    window,
                    cx,
                )
@@ -1101,7 +1101,7 @@ impl PromptEditor<TerminalCodegen> {
                    fs,
                    model_selector_menu_handle.clone(),
                    prompt_editor.focus_handle(cx),
-                    ModelType::InlineAssistant,
+                    ModelUsageContext::InlineAssistant,
                    window,
                    cx,
                )
--- a/crates/agent/src/message_editor.rs
+++ b/crates/agent/src/message_editor.rs
@@ -2,11 +2,11 @@ use std::collections::BTreeMap;
 use std::rc::Rc;
 use std::sync::Arc;

-use crate::agent_model_selector::{AgentModelSelector, ModelType};
+use crate::agent_model_selector::AgentModelSelector;
 use crate::context::{AgentContextKey, ContextCreasesAddon, ContextLoadResult, load_context};
 use crate::tool_compatibility::{IncompatibleToolsState, IncompatibleToolsTooltip};
 use crate::ui::{
-    AnimatedLabel, MaxModeTooltip,
+    MaxModeTooltip,
    preview::{AgentPreview, UsageCallout},
 };
 use agent_settings::{AgentSettings, CompletionMode};
@@ -27,7 +27,7 @@ use gpui::{
    Animation, AnimationExt, App, ClipboardEntry, Entity, EventEmitter, Focusable, Subscription,
    Task, TextStyle, WeakEntity, linear_color_stop, linear_gradient, point, pulsating_between,
 };
-use language::{Buffer, Language};
+use language::{Buffer, Language, Point};
 use language_model::{
    ConfiguredModel, LanguageModelRequestMessage, MessageContent, RequestUsage,
    ZED_CLOUD_PROVIDER_ID,
@@ -51,9 +51,9 @@ 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, NewThread,
-    OpenAgentDiff, RemoveAllContext, ToggleBurnMode, ToggleContextPicker, ToggleProfileSelector,
-    register_agent_preview,
+    ActiveThread, AgentDiffPane, Chat, ChatWithFollow, ExpandMessageEditor, Follow, KeepAll,
+    ModelUsageContext, NewThread, OpenAgentDiff, RejectAll, RemoveAllContext, ToggleBurnMode,
+    ToggleContextPicker, ToggleProfileSelector, register_agent_preview,
 };

 #[derive(RegisterComponent)]
@@ -112,6 +112,7 @@ pub(crate) fn create_editor(
        editor.set_placeholder_text("Message the agent – @ to include context", cx);
        editor.set_show_indent_guides(false, cx);
        editor.set_soft_wrap();
+        editor.set_use_modal_editing(true);
        editor.set_context_menu_options(ContextMenuOptions {
            min_entries_visible: 12,
            max_entries_visible: 12,
@@ -196,7 +197,7 @@ impl MessageEditor {
                fs.clone(),
                model_selector_menu_handle,
                editor.focus_handle(cx),
-                ModelType::Default(thread.clone()),
+                ModelUsageContext::Thread(thread.clone()),
                window,
                cx,
            )
@@ -458,11 +459,20 @@ impl MessageEditor {
    }

    fn handle_review_click(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        if self.thread.read(cx).has_pending_edit_tool_uses() {
+            return;
+        }
+
        self.edits_expanded = true;
        AgentDiffPane::deploy(self.thread.clone(), self.workspace.clone(), window, cx).log_err();
        cx.notify();
    }

+    fn handle_edit_bar_expand(&mut self, cx: &mut Context<Self>) {
+        self.edits_expanded = !self.edits_expanded;
+        cx.notify();
+    }
+
    fn handle_file_click(
        &self,
        buffer: Entity<Buffer>,
@@ -493,6 +503,40 @@ impl MessageEditor {
        });
    }

+    fn handle_accept_all(&mut self, _window: &mut Window, cx: &mut Context<Self>) {
+        if self.thread.read(cx).has_pending_edit_tool_uses() {
+            return;
+        }
+
+        self.thread.update(cx, |thread, cx| {
+            thread.keep_all_edits(cx);
+        });
+        cx.notify();
+    }
+
+    fn handle_reject_all(&mut self, _window: &mut Window, cx: &mut Context<Self>) {
+        if self.thread.read(cx).has_pending_edit_tool_uses() {
+            return;
+        }
+
+        // Since there's no reject_all_edits method in the thread API,
+        // we need to iterate through all buffers and reject their edits
+        let action_log = self.thread.read(cx).action_log().clone();
+        let changed_buffers = action_log.read(cx).changed_buffers(cx);
+
+        for (buffer, _) in changed_buffers {
+            self.thread.update(cx, |thread, cx| {
+                let buffer_snapshot = buffer.read(cx);
+                let start = buffer_snapshot.anchor_before(Point::new(0, 0));
+                let end = buffer_snapshot.anchor_after(buffer_snapshot.max_point());
+                thread
+                    .reject_edits_in_ranges(buffer, vec![start..end], cx)
+                    .detach();
+            });
+        }
+        cx.notify();
+    }
+
    fn render_max_mode_toggle(&self, cx: &mut Context<Self>) -> Option<AnyElement> {
        let thread = self.thread.read(cx);
        let model = thread.configured_model();
@@ -614,6 +658,12 @@ impl MessageEditor {
            .on_action(cx.listener(Self::move_up))
            .on_action(cx.listener(Self::expand_message_editor))
            .on_action(cx.listener(Self::toggle_burn_mode))
+            .on_action(
+                cx.listener(|this, _: &KeepAll, window, cx| this.handle_accept_all(window, cx)),
+            )
+            .on_action(
+                cx.listener(|this, _: &RejectAll, window, cx| this.handle_reject_all(window, cx)),
+            )
            .capture_action(cx.listener(Self::paste))
            .gap_2()
            .p_2()
@@ -869,7 +919,10 @@ impl MessageEditor {
        let bg_edit_files_disclosure = editor_bg_color.blend(active_color.opacity(0.3));

        let is_edit_changes_expanded = self.edits_expanded;
-        let is_generating = self.thread.read(cx).is_generating();
+        let thread = self.thread.read(cx);
+        let pending_edits = thread.has_pending_edit_tool_uses();
+
+        const EDIT_NOT_READY_TOOLTIP_LABEL: &str = "Wait until file edits are complete.";

        v_flex()
            .mt_1()
@@ -887,31 +940,28 @@ impl MessageEditor {
            }])
            .child(
                h_flex()
-                    .id("edits-container")
-                    .cursor_pointer()
-                    .p_1p5()
+                    .p_1()
                    .justify_between()
                    .when(is_edit_changes_expanded, |this| {
                        this.border_b_1().border_color(border_color)
                    })
-                    .on_click(
-                        cx.listener(|this, _, window, cx| this.handle_review_click(window, cx)),
-                    )
                    .child(
                        h_flex()
+                            .id("edits-container")
+                            .cursor_pointer()
+                            .w_full()
                            .gap_1()
                            .child(
                                Disclosure::new("edits-disclosure", is_edit_changes_expanded)
-                                    .on_click(cx.listener(|this, _ev, _window, cx| {
-                                        this.edits_expanded = !this.edits_expanded;
-                                        cx.notify();
+                                    .on_click(cx.listener(|this, _, _, cx| {
+                                        this.handle_edit_bar_expand(cx)
                                    })),
                            )
                            .map(|this| {
-                                if is_generating {
+                                if pending_edits {
                                    this.child(
-                                        AnimatedLabel::new(format!(
-                                            "Editing {} {}",
+                                        Label::new(format!(
+                                            "Editing {} {}…",
                                            changed_buffers.len(),
                                            if changed_buffers.len() == 1 {
                                                "file"
@@ -919,7 +969,15 @@ impl MessageEditor {
                                                "files"
                                            }
                                        ))
-                                        .size(LabelSize::Small),
+                                        .color(Color::Muted)
+                                        .size(LabelSize::Small)
+                                        .with_animation(
+                                            "edit-label",
+                                            Animation::new(Duration::from_secs(2))
+                                                .repeat()
+                                                .with_easing(pulsating_between(0.3, 0.7)),
+                                            |label, delta| label.alpha(delta),
+                                        ),
                                    )
                                } else {
                                    this.child(
@@ -944,23 +1002,74 @@ impl MessageEditor {
                                        .color(Color::Muted),
                                    )
                                }
-                            }),
+                            })
+                            .on_click(
+                                cx.listener(|this, _, _, cx| this.handle_edit_bar_expand(cx)),
+                            ),
                    )
                    .child(
-                        Button::new("review", "Review Changes")
-                            .label_size(LabelSize::Small)
-                            .key_binding(
-                                KeyBinding::for_action_in(
-                                    &OpenAgentDiff,
-                                    &focus_handle,
-                                    window,
-                                    cx,
-                                )
-                                .map(|kb| kb.size(rems_from_px(12.))),
+                        h_flex()
+                            .gap_1()
+                            .child(
+                                IconButton::new("review-changes", IconName::ListTodo)
+                                    .icon_size(IconSize::Small)
+                                    .tooltip({
+                                        let focus_handle = focus_handle.clone();
+                                        move |window, cx| {
+                                            Tooltip::for_action_in(
+                                                "Review Changes",
+                                                &OpenAgentDiff,
+                                                &focus_handle,
+                                                window,
+                                                cx,
+                                            )
+                                        }
+                                    })
+                                    .on_click(cx.listener(|this, _, window, cx| {
+                                        this.handle_review_click(window, cx)
+                                    })),
                            )
-                            .on_click(cx.listener(|this, _, window, cx| {
-                                this.handle_review_click(window, cx)
-                            })),
+                            .child(ui::Divider::vertical().color(ui::DividerColor::Border))
+                            .child(
+                                Button::new("reject-all-changes", "Reject All")
+                                    .label_size(LabelSize::Small)
+                                    .disabled(pending_edits)
+                                    .when(pending_edits, |this| {
+                                        this.tooltip(Tooltip::text(EDIT_NOT_READY_TOOLTIP_LABEL))
+                                    })
+                                    .key_binding(
+                                        KeyBinding::for_action_in(
+                                            &RejectAll,
+                                            &focus_handle.clone(),
+                                            window,
+                                            cx,
+                                        )
+                                        .map(|kb| kb.size(rems_from_px(10.))),
+                                    )
+                                    .on_click(cx.listener(|this, _, window, cx| {
+                                        this.handle_reject_all(window, cx)
+                                    })),
+                            )
+                            .child(
+                                Button::new("accept-all-changes", "Accept All")
+                                    .label_size(LabelSize::Small)
+                                    .disabled(pending_edits)
+                                    .when(pending_edits, |this| {
+                                        this.tooltip(Tooltip::text(EDIT_NOT_READY_TOOLTIP_LABEL))
+                                    })
+                                    .key_binding(
+                                        KeyBinding::for_action_in(
+                                            &KeepAll,
+                                            &focus_handle,
+                                            window,
+                                            cx,
+                                        )
+                                        .map(|kb| kb.size(rems_from_px(10.))),
+                                    )
+                                    .on_click(cx.listener(|this, _, window, cx| {
+                                        this.handle_accept_all(window, cx)
+                                    })),
+                            ),
                    ),
            )
            .when(is_edit_changes_expanded, |parent| {
--- a/crates/agent/src/terminal_codegen.rs
+++ b/crates/agent/src/terminal_codegen.rs
@@ -179,18 +179,17 @@ impl TerminalTransaction {
        // Ensure that the assistant cannot accidentally execute commands that are streamed into the terminal
        let input = Self::sanitize_input(hunk);
        self.terminal
-            .update(cx, |terminal, _| terminal.input(input));
+            .update(cx, |terminal, _| terminal.input(input.into_bytes()));
    }

    pub fn undo(&self, cx: &mut App) {
        self.terminal
-            .update(cx, |terminal, _| terminal.input(CLEAR_INPUT.to_string()));
+            .update(cx, |terminal, _| terminal.input(CLEAR_INPUT.as_bytes()));
    }

    pub fn complete(&self, cx: &mut App) {
-        self.terminal.update(cx, |terminal, _| {
-            terminal.input(CARRIAGE_RETURN.to_string())
-        });
+        self.terminal
+            .update(cx, |terminal, _| terminal.input(CARRIAGE_RETURN.as_bytes()));
    }

    fn sanitize_input(mut input: String) -> String {
--- a/crates/agent/src/terminal_inline_assistant.rs
+++ b/crates/agent/src/terminal_inline_assistant.rs
@@ -106,7 +106,7 @@ impl TerminalInlineAssistant {
        });
        let prompt_editor_render = prompt_editor.clone();
        let block = terminal_view::BlockProperties {
-            height: 2,
+            height: 4,
            render: Box::new(move |_| prompt_editor_render.clone().into_any_element()),
        };
        terminal_view.update(cx, |terminal_view, cx| {
@@ -202,7 +202,7 @@ impl TerminalInlineAssistant {
            .update(cx, |terminal, cx| {
                terminal
                    .terminal()
-                    .update(cx, |terminal, _| terminal.input(CLEAR_INPUT.to_string()));
+                    .update(cx, |terminal, _| terminal.input(CLEAR_INPUT.as_bytes()));
            })
            .log_err();

--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
@@ -871,7 +871,16 @@ impl Thread {
        self.tool_use
            .pending_tool_uses()
            .iter()
-            .all(|tool_use| tool_use.status.is_error())
+            .all(|pending_tool_use| pending_tool_use.status.is_error())
+    }
+
+    /// Returns whether any pending tool uses may perform edits
+    pub fn has_pending_edit_tool_uses(&self) -> bool {
+        self.tool_use
+            .pending_tool_uses()
+            .iter()
+            .filter(|pending_tool_use| !pending_tool_use.status.is_error())
+            .any(|pending_tool_use| pending_tool_use.may_perform_edits)
    }

    pub fn tool_uses_for_message(&self, id: MessageId, cx: &App) -> Vec<ToolUse> {
@@ -1023,6 +1032,7 @@ impl Thread {
        id: MessageId,
        new_role: Role,
        new_segments: Vec<MessageSegment>,
+        creases: Vec<MessageCrease>,
        loaded_context: Option<LoadedContext>,
        checkpoint: Option<GitStoreCheckpoint>,
        cx: &mut Context<Self>,
@@ -1032,6 +1042,7 @@ impl Thread {
        };
        message.role = new_role;
        message.segments = new_segments;
+        message.creases = creases;
        if let Some(context) = loaded_context {
            message.loaded_context = context;
        }
@@ -1673,6 +1684,7 @@ impl Thread {
                                        }
                                        CompletionRequestStatus::ToolUseLimitReached => {
                                            thread.tool_use_limit_reached = true;
+                                            cx.emit(ThreadEvent::ToolUseLimitReached);
                                        }
                                    }
                                }
@@ -2843,6 +2855,7 @@ pub enum ThreadEvent {
    },
    CheckpointChanged,
    ToolConfirmationNeeded,
+    ToolUseLimitReached,
    CancelEditing,
    CompletionCanceled,
 }
--- a/crates/agent/src/thread_store.rs
+++ b/crates/agent/src/thread_store.rs
@@ -1,8 +1,7 @@
-use std::borrow::Cow;
 use std::cell::{Ref, RefCell};
 use std::path::{Path, PathBuf};
 use std::rc::Rc;
-use std::sync::Arc;
+use std::sync::{Arc, Mutex};

 use agent_settings::{AgentProfile, AgentProfileId, AgentSettings, CompletionMode};
 use anyhow::{Context as _, Result, anyhow};
@@ -17,8 +16,7 @@ use gpui::{
    App, BackgroundExecutor, Context, Entity, EventEmitter, Global, ReadGlobal, SharedString,
    Subscription, Task, prelude::*,
 };
-use heed::Database;
-use heed::types::SerdeBincode;
+
 use language_model::{LanguageModelToolResultContent, LanguageModelToolUseId, Role, TokenUsage};
 use project::context_server_store::{ContextServerStatus, ContextServerStore};
 use project::{Project, ProjectItem, ProjectPath, Worktree};
@@ -35,14 +33,52 @@ 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,
+};

-const RULES_FILE_NAMES: [&'static str; 6] = [
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+pub enum DataType {
+    #[serde(rename = "json")]
+    Json,
+    #[serde(rename = "zstd")]
+    Zstd,
+}
+
+impl Bind for DataType {
+    fn bind(&self, statement: &Statement, start_index: i32) -> Result<i32> {
+        let value = match self {
+            DataType::Json => "json",
+            DataType::Zstd => "zstd",
+        };
+        value.bind(statement, start_index)
+    }
+}
+
+impl Column for DataType {
+    fn column(statement: &mut Statement, start_index: i32) -> Result<(Self, i32)> {
+        let (value, next_index) = String::column(statement, start_index)?;
+        let data_type = match value.as_str() {
+            "json" => DataType::Json,
+            "zstd" => DataType::Zstd,
+            _ => anyhow::bail!("Unknown data type: {}", value),
+        };
+        Ok((data_type, next_index))
+    }
+}
+
+const RULES_FILE_NAMES: [&'static str; 8] = [
    ".rules",
    ".cursorrules",
    ".windsurfrules",
    ".clinerules",
    ".github/copilot-instructions.md",
    "CLAUDE.md",
+    "AGENT.md",
+    "AGENTS.md",
 ];

 pub fn init(cx: &mut App) {
@@ -866,25 +902,27 @@ impl Global for GlobalThreadsDatabase {}

 pub(crate) struct ThreadsDatabase {
    executor: BackgroundExecutor,
-    env: heed::Env,
-    threads: Database<SerdeBincode<ThreadId>, SerializedThread>,
+    connection: Arc<Mutex<Connection>>,
 }

-impl heed::BytesEncode<'_> for SerializedThread {
-    type EItem = SerializedThread;
+impl ThreadsDatabase {
+    fn connection(&self) -> Arc<Mutex<Connection>> {
+        self.connection.clone()
+    }

-    fn bytes_encode(item: &Self::EItem) -> Result<Cow<[u8]>, heed::BoxedError> {
-        serde_json::to_vec(item).map(Cow::Owned).map_err(Into::into)
+    const COMPRESSION_LEVEL: i32 = 3;
+}
+
+impl Bind for ThreadId {
+    fn bind(&self, statement: &Statement, start_index: i32) -> Result<i32> {
+        self.to_string().bind(statement, start_index)
    }
 }

-impl<'a> heed::BytesDecode<'a> for SerializedThread {
-    type DItem = SerializedThread;
-
-    fn bytes_decode(bytes: &'a [u8]) -> Result<Self::DItem, heed::BoxedError> {
-        // We implement this type manually because we want to call `SerializedThread::from_json`,
-        // instead of the Deserialize trait implementation for `SerializedThread`.
-        SerializedThread::from_json(bytes).map_err(Into::into)
+impl Column for ThreadId {
+    fn column(statement: &mut Statement, start_index: i32) -> Result<(Self, i32)> {
+        let (id_str, next_index) = String::column(statement, start_index)?;
+        Ok((ThreadId::from(id_str.as_str()), next_index))
    }
 }

@@ -900,8 +938,8 @@ impl ThreadsDatabase {
        let database_future = executor
            .spawn({
                let executor = executor.clone();
-                let database_path = paths::data_dir().join("threads/threads-db.1.mdb");
-                async move { ThreadsDatabase::new(database_path, executor) }
+                let threads_dir = paths::data_dir().join("threads");
+                async move { ThreadsDatabase::new(threads_dir, executor) }
            })
            .then(|result| future::ready(result.map(Arc::new).map_err(Arc::new)))
            .boxed()
@@ -910,41 +948,144 @@ impl ThreadsDatabase {
        cx.set_global(GlobalThreadsDatabase(database_future));
    }

-    pub fn new(path: PathBuf, executor: BackgroundExecutor) -> Result<Self> {
-        std::fs::create_dir_all(&path)?;
+    pub fn new(threads_dir: PathBuf, executor: BackgroundExecutor) -> Result<Self> {
+        std::fs::create_dir_all(&threads_dir)?;
+
+        let sqlite_path = threads_dir.join("threads.db");
+        let mdb_path = threads_dir.join("threads-db.1.mdb");
+
+        let needs_migration_from_heed = mdb_path.exists();
+
+        let connection = Connection::open_file(&sqlite_path.to_string_lossy());
+
+        connection.exec(indoc! {"
+                CREATE TABLE IF NOT EXISTS threads (
+                    id TEXT PRIMARY KEY,
+                    summary TEXT NOT NULL,
+                    updated_at TEXT NOT NULL,
+                    data_type TEXT NOT NULL,
+                    data BLOB NOT NULL
+                )
+            "})?()
+        .map_err(|e| anyhow!("Failed to create threads table: {}", e))?;
+
+        let db = Self {
+            executor: executor.clone(),
+            connection: Arc::new(Mutex::new(connection)),
+        };
+
+        if needs_migration_from_heed {
+            let db_connection = db.connection();
+            let executor_clone = executor.clone();
+            executor
+                .spawn(async move {
+                    log::info!("Starting threads.db migration");
+                    Self::migrate_from_heed(&mdb_path, db_connection, executor_clone)?;
+                    std::fs::remove_dir_all(mdb_path)?;
+                    log::info!("threads.db migrated to sqlite");
+                    Ok::<(), anyhow::Error>(())
+                })
+                .detach();
+        }
+
+        Ok(db)
+    }
+
+    // Remove this migration after 2025-09-01
+    fn migrate_from_heed(
+        mdb_path: &Path,
+        connection: Arc<Mutex<Connection>>,
+        _executor: BackgroundExecutor,
+    ) -> Result<()> {
+        use heed::types::SerdeBincode;
+        struct SerializedThreadHeed(SerializedThread);
+
+        impl heed::BytesEncode<'_> for SerializedThreadHeed {
+            type EItem = SerializedThreadHeed;
+
+            fn bytes_encode(
+                item: &Self::EItem,
+            ) -> Result<std::borrow::Cow<[u8]>, heed::BoxedError> {
+                serde_json::to_vec(&item.0)
+                    .map(std::borrow::Cow::Owned)
+                    .map_err(Into::into)
+            }
+        }
+
+        impl<'a> heed::BytesDecode<'a> for SerializedThreadHeed {
+            type DItem = SerializedThreadHeed;
+
+            fn bytes_decode(bytes: &'a [u8]) -> Result<Self::DItem, heed::BoxedError> {
+                SerializedThread::from_json(bytes)
+                    .map(SerializedThreadHeed)
+                    .map_err(Into::into)
+            }
+        }

        const ONE_GB_IN_BYTES: usize = 1024 * 1024 * 1024;
+
        let env = unsafe {
            heed::EnvOpenOptions::new()
                .map_size(ONE_GB_IN_BYTES)
                .max_dbs(1)
-                .open(path)?
+                .open(mdb_path)?
        };

-        let mut txn = env.write_txn()?;
-        let threads = env.create_database(&mut txn, Some("threads"))?;
-        txn.commit()?;
+        let txn = env.write_txn()?;
+        let threads: heed::Database<SerdeBincode<ThreadId>, SerializedThreadHeed> = env
+            .open_database(&txn, Some("threads"))?
+            .ok_or_else(|| anyhow!("threads database not found"))?;

-        Ok(Self {
-            executor,
-            env,
-            threads,
-        })
+        for result in threads.iter(&txn)? {
+            let (thread_id, thread_heed) = result?;
+            Self::save_thread_sync(&connection, thread_id, thread_heed.0)?;
+        }
+
+        Ok(())
+    }
+
+    fn save_thread_sync(
+        connection: &Arc<Mutex<Connection>>,
+        id: ThreadId,
+        thread: SerializedThread,
+    ) -> Result<()> {
+        let json_data = serde_json::to_string(&thread)?;
+        let summary = thread.summary.to_string();
+        let updated_at = thread.updated_at.to_rfc3339();
+
+        let connection = connection.lock().unwrap();
+
+        let compressed = zstd::encode_all(json_data.as_bytes(), Self::COMPRESSION_LEVEL)?;
+        let data_type = DataType::Zstd;
+        let data = compressed;
+
+        let mut insert = connection.exec_bound::<(ThreadId, String, String, DataType, Vec<u8>)>(indoc! {"
+            INSERT OR REPLACE INTO threads (id, summary, updated_at, data_type, data) VALUES (?, ?, ?, ?, ?)
+        "})?;
+
+        insert((id, summary, updated_at, data_type, data))?;
+
+        Ok(())
    }

    pub fn list_threads(&self) -> Task<Result<Vec<SerializedThreadMetadata>>> {
-        let env = self.env.clone();
-        let threads = self.threads;
+        let connection = self.connection.clone();

        self.executor.spawn(async move {
-            let txn = env.read_txn()?;
-            let mut iter = threads.iter(&txn)?;
+            let connection = connection.lock().unwrap();
+            let mut select =
+                connection.select_bound::<(), (ThreadId, String, String)>(indoc! {"
+                SELECT id, summary, updated_at FROM threads ORDER BY updated_at DESC
+            "})?;
+
+            let rows = select(())?;
            let mut threads = Vec::new();
-            while let Some((key, value)) = iter.next().transpose()? {
+
+            for (id, summary, updated_at) in rows {
                threads.push(SerializedThreadMetadata {
-                    id: key,
-                    summary: value.summary,
-                    updated_at: value.updated_at,
+                    id,
+                    summary: summary.into(),
+                    updated_at: DateTime::parse_from_rfc3339(&updated_at)?.with_timezone(&Utc),
                });
            }

@@ -953,36 +1094,51 @@ impl ThreadsDatabase {
    }

    pub fn try_find_thread(&self, id: ThreadId) -> Task<Result<Option<SerializedThread>>> {
-        let env = self.env.clone();
-        let threads = self.threads;
+        let connection = self.connection.clone();

        self.executor.spawn(async move {
-            let txn = env.read_txn()?;
-            let thread = threads.get(&txn, &id)?;
-            Ok(thread)
+            let connection = connection.lock().unwrap();
+            let mut select = connection.select_bound::<ThreadId, (DataType, Vec<u8>)>(indoc! {"
+                SELECT data_type, data FROM threads WHERE id = ? LIMIT 1
+            "})?;
+
+            let rows = select(id)?;
+            if let Some((data_type, data)) = rows.into_iter().next() {
+                let json_data = match data_type {
+                    DataType::Zstd => {
+                        let decompressed = zstd::decode_all(&data[..])?;
+                        String::from_utf8(decompressed)?
+                    }
+                    DataType::Json => String::from_utf8(data)?,
+                };
+
+                let thread = SerializedThread::from_json(json_data.as_bytes())?;
+                Ok(Some(thread))
+            } else {
+                Ok(None)
+            }
        })
    }

    pub fn save_thread(&self, id: ThreadId, thread: SerializedThread) -> Task<Result<()>> {
-        let env = self.env.clone();
-        let threads = self.threads;
+        let connection = self.connection.clone();

-        self.executor.spawn(async move {
-            let mut txn = env.write_txn()?;
-            threads.put(&mut txn, &id, &thread)?;
-            txn.commit()?;
-            Ok(())
-        })
+        self.executor
+            .spawn(async move { Self::save_thread_sync(&connection, id, thread) })
    }

    pub fn delete_thread(&self, id: ThreadId) -> Task<Result<()>> {
-        let env = self.env.clone();
-        let threads = self.threads;
+        let connection = self.connection.clone();

        self.executor.spawn(async move {
-            let mut txn = env.write_txn()?;
-            threads.delete(&mut txn, &id)?;
-            txn.commit()?;
+            let connection = connection.lock().unwrap();
+
+            let mut delete = connection.exec_bound::<ThreadId>(indoc! {"
+                DELETE FROM threads WHERE id = ?
+            "})?;
+
+            delete(id)?;
+
            Ok(())
        })
    }
--- a/crates/agent/src/tool_use.rs
+++ b/crates/agent/src/tool_use.rs
@@ -337,6 +337,12 @@ impl ToolUseState {
            )
            .into();

+        let may_perform_edits = self
+            .tools
+            .read(cx)
+            .tool(&tool_use.name, cx)
+            .is_some_and(|tool| tool.may_perform_edits());
+
        self.pending_tool_uses_by_id.insert(
            tool_use.id.clone(),
            PendingToolUse {
@@ -345,6 +351,7 @@ impl ToolUseState {
                name: tool_use.name.clone(),
                ui_text: ui_text.clone(),
                input: tool_use.input,
+                may_perform_edits,
                status,
            },
        );
@@ -518,6 +525,7 @@ pub struct PendingToolUse {
    pub ui_text: Arc<str>,
    pub input: serde_json::Value,
    pub status: PendingToolUseStatus,
+    pub may_perform_edits: bool,
 }

 #[derive(Debug, Clone)]
--- a/crates/agent/src/ui/context_pill.rs
+++ b/crates/agent/src/ui/context_pill.rs
@@ -304,7 +304,7 @@ impl AddedContext {
            AgentContextHandle::Thread(handle) => Some(Self::pending_thread(handle, cx)),
            AgentContextHandle::TextThread(handle) => Some(Self::pending_text_thread(handle, cx)),
            AgentContextHandle::Rules(handle) => Self::pending_rules(handle, prompt_store, cx),
-            AgentContextHandle::Image(handle) => Some(Self::image(handle)),
+            AgentContextHandle::Image(handle) => Some(Self::image(handle, cx)),
        }
    }

@@ -318,7 +318,7 @@ impl AddedContext {
            AgentContext::Thread(context) => Self::attached_thread(context),
            AgentContext::TextThread(context) => Self::attached_text_thread(context),
            AgentContext::Rules(context) => Self::attached_rules(context),
-            AgentContext::Image(context) => Self::image(context.clone()),
+            AgentContext::Image(context) => Self::image(context.clone(), cx),
        }
    }

@@ -333,14 +333,8 @@ impl AddedContext {

    fn file(handle: FileContextHandle, full_path: &Path, cx: &App) -> AddedContext {
        let full_path_string: SharedString = full_path.to_string_lossy().into_owned().into();
-        let name = full_path
-            .file_name()
-            .map(|n| n.to_string_lossy().into_owned().into())
-            .unwrap_or_else(|| full_path_string.clone());
-        let parent = full_path
-            .parent()
-            .and_then(|p| p.file_name())
-            .map(|n| n.to_string_lossy().into_owned().into());
+        let (name, parent) =
+            extract_file_name_and_directory_from_full_path(full_path, &full_path_string);
        AddedContext {
            kind: ContextKind::File,
            name,
@@ -370,14 +364,8 @@ impl AddedContext {

    fn directory(handle: DirectoryContextHandle, full_path: &Path) -> AddedContext {
        let full_path_string: SharedString = full_path.to_string_lossy().into_owned().into();
-        let name = full_path
-            .file_name()
-            .map(|n| n.to_string_lossy().into_owned().into())
-            .unwrap_or_else(|| full_path_string.clone());
-        let parent = full_path
-            .parent()
-            .and_then(|p| p.file_name())
-            .map(|n| n.to_string_lossy().into_owned().into());
+        let (name, parent) =
+            extract_file_name_and_directory_from_full_path(full_path, &full_path_string);
        AddedContext {
            kind: ContextKind::Directory,
            name,
@@ -605,13 +593,23 @@ impl AddedContext {
        }
    }

-    fn image(context: ImageContext) -> AddedContext {
+    fn image(context: ImageContext, cx: &App) -> AddedContext {
+        let (name, parent, icon_path) = if let Some(full_path) = context.full_path.as_ref() {
+            let full_path_string: SharedString = full_path.to_string_lossy().into_owned().into();
+            let (name, parent) =
+                extract_file_name_and_directory_from_full_path(full_path, &full_path_string);
+            let icon_path = FileIcons::get_icon(&full_path, cx);
+            (name, parent, icon_path)
+        } else {
+            ("Image".into(), None, None)
+        };
+
        AddedContext {
            kind: ContextKind::Image,
-            name: "Image".into(),
-            parent: None,
+            name,
+            parent,
            tooltip: None,
-            icon_path: None,
+            icon_path,
            status: match context.status() {
                ImageStatus::Loading => ContextStatus::Loading {
                    message: "Loading…".into(),
@@ -639,6 +637,22 @@ impl AddedContext {
    }
 }

+fn extract_file_name_and_directory_from_full_path(
+    path: &Path,
+    name_fallback: &SharedString,
+) -> (SharedString, Option<SharedString>) {
+    let name = path
+        .file_name()
+        .map(|n| n.to_string_lossy().into_owned().into())
+        .unwrap_or_else(|| name_fallback.clone());
+    let parent = path
+        .parent()
+        .and_then(|p| p.file_name())
+        .map(|n| n.to_string_lossy().into_owned().into());
+
+    (name, parent)
+}
+
 #[derive(Debug, Clone)]
 struct ContextFileExcerpt {
    pub file_name_and_range: SharedString,
@@ -765,37 +779,49 @@ impl Component for AddedContext {
        let mut next_context_id = ContextId::zero();
        let image_ready = (
            "Ready",
-            AddedContext::image(ImageContext {
-                context_id: next_context_id.post_inc(),
-                project_path: None,
-                original_image: Arc::new(Image::empty()),
-                image_task: Task::ready(Some(LanguageModelImage::empty())).shared(),
-            }),
+            AddedContext::image(
+                ImageContext {
+                    context_id: next_context_id.post_inc(),
+                    project_path: None,
+                    full_path: None,
+                    original_image: Arc::new(Image::empty()),
+                    image_task: Task::ready(Some(LanguageModelImage::empty())).shared(),
+                },
+                cx,
+            ),
        );

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

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

        Some(
--- a/crates/agent_settings/src/agent_settings.rs
+++ b/crates/agent_settings/src/agent_settings.rs
@@ -372,6 +372,8 @@ impl AgentSettingsContent {
                                None,
                                None,
                                Some(language_model.supports_tools()),
+                                Some(language_model.supports_images()),
+                                None,
                            )),
                            api_url,
                        });
@@ -689,6 +691,7 @@ pub struct AgentSettingsContentV2 {
 pub enum CompletionMode {
    #[default]
    Normal,
+    #[serde(alias = "max")]
    Burn,
 }

@@ -727,6 +730,7 @@ impl JsonSchema for LanguageModelProviderSetting {
                "zed.dev".into(),
                "copilot_chat".into(),
                "deepseek".into(),
+                "openrouter".into(),
                "mistral".into(),
            ]),
            ..Default::default()
--- a/crates/assistant_context_editor/Cargo.toml
+++ b/crates/assistant_context_editor/Cargo.toml
@@ -60,6 +60,7 @@ 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
--- a/crates/assistant_context_editor/src/context_editor.rs
+++ b/crates/assistant_context_editor/src/context_editor.rs
@@ -1646,34 +1646,35 @@ impl ContextEditor {
        let context = self.context.read(cx);

        let mut text = String::new();
-        for message in context.messages(cx) {
-            if message.offset_range.start >= selection.range().end {
-                break;
-            } else if message.offset_range.end >= selection.range().start {
-                let range = cmp::max(message.offset_range.start, selection.range().start)
-                    ..cmp::min(message.offset_range.end, selection.range().end);
-                if range.is_empty() {
-                    let snapshot = context.buffer().read(cx).snapshot();
-                    let point = snapshot.offset_to_point(range.start);
-                    selection.start = snapshot.point_to_offset(Point::new(point.row, 0));
-                    selection.end = snapshot.point_to_offset(cmp::min(
-                        Point::new(point.row + 1, 0),
-                        snapshot.max_point(),
-                    ));
-                    for chunk in context.buffer().read(cx).text_for_range(selection.range()) {
-                        text.push_str(chunk);
-                    }
-                } else {
-                    for chunk in context.buffer().read(cx).text_for_range(range) {
-                        text.push_str(chunk);
-                    }
-                    if message.offset_range.end < selection.range().end {
-                        text.push('\n');
+
+        // If selection is empty, we want to copy the entire line
+        if selection.range().is_empty() {
+            let snapshot = context.buffer().read(cx).snapshot();
+            let point = snapshot.offset_to_point(selection.range().start);
+            selection.start = snapshot.point_to_offset(Point::new(point.row, 0));
+            selection.end = snapshot
+                .point_to_offset(cmp::min(Point::new(point.row + 1, 0), snapshot.max_point()));
+            for chunk in context.buffer().read(cx).text_for_range(selection.range()) {
+                text.push_str(chunk);
+            }
+        } else {
+            for message in context.messages(cx) {
+                if message.offset_range.start >= selection.range().end {
+                    break;
+                } else if message.offset_range.end >= selection.range().start {
+                    let range = cmp::max(message.offset_range.start, selection.range().start)
+                        ..cmp::min(message.offset_range.end, selection.range().end);
+                    if !range.is_empty() {
+                        for chunk in context.buffer().read(cx).text_for_range(range) {
+                            text.push_str(chunk);
+                        }
+                        if message.offset_range.end < selection.range().end {
+                            text.push('\n');
+                        }
                    }
                }
            }
        }
-
        (text, CopyMetadata { creases }, vec![selection])
    }

@@ -3264,74 +3265,92 @@ mod tests {
    use super::*;
    use fs::FakeFs;
    use gpui::{App, TestAppContext, VisualTestContext};
+    use indoc::indoc;
    use language::{Buffer, LanguageRegistry};
+    use pretty_assertions::assert_eq;
    use prompt_store::PromptBuilder;
+    use text::OffsetRangeExt;
    use unindent::Unindent;
    use util::path;

+    #[gpui::test]
+    async fn test_copy_paste_whole_message(cx: &mut TestAppContext) {
+        let (context, context_editor, mut cx) = setup_context_editor_text(vec![
+            (Role::User, "What is the Zed editor?"),
+            (
+                Role::Assistant,
+                "Zed is a modern, high-performance code editor designed from the ground up for speed and collaboration.",
+            ),
+            (Role::User, ""),
+        ],cx).await;
+
+        // Select & Copy whole user message
+        assert_copy_paste_context_editor(
+            &context_editor,
+            message_range(&context, 0, &mut cx),
+            indoc! {"
+                What is the Zed editor?
+                Zed is a modern, high-performance code editor designed from the ground up for speed and collaboration.
+                What is the Zed editor?
+            "},
+            &mut cx,
+        );
+
+        // Select & Copy whole assistant message
+        assert_copy_paste_context_editor(
+            &context_editor,
+            message_range(&context, 1, &mut cx),
+            indoc! {"
+                What is the Zed editor?
+                Zed is a modern, high-performance code editor designed from the ground up for speed and collaboration.
+                What is the Zed editor?
+                Zed is a modern, high-performance code editor designed from the ground up for speed and collaboration.
+            "},
+            &mut cx,
+        );
+    }
+
    #[gpui::test]
    async fn test_copy_paste_no_selection(cx: &mut TestAppContext) {
-        cx.update(init_test);
+        let (context, context_editor, mut cx) = setup_context_editor_text(
+            vec![
+                (Role::User, "user1"),
+                (Role::Assistant, "assistant1"),
+                (Role::Assistant, "assistant2"),
+                (Role::User, ""),
+            ],
+            cx,
+        )
+        .await;

-        let fs = FakeFs::new(cx.executor());
-        let registry = Arc::new(LanguageRegistry::test(cx.executor()));
-        let prompt_builder = Arc::new(PromptBuilder::new(None).unwrap());
-        let context = cx.new(|cx| {
-            AssistantContext::local(
-                registry,
-                None,
-                None,
-                prompt_builder.clone(),
-                Arc::new(SlashCommandWorkingSet::default()),
-                cx,
-            )
-        });
-        let project = Project::test(fs.clone(), [path!("/test").as_ref()], cx).await;
-        let window = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
-        let workspace = window.root(cx).unwrap();
-        let cx = &mut VisualTestContext::from_window(*window, cx);
+        // Copy and paste first assistant message
+        let message_2_range = message_range(&context, 1, &mut cx);
+        assert_copy_paste_context_editor(
+            &context_editor,
+            message_2_range.start..message_2_range.start,
+            indoc! {"
+                user1
+                assistant1
+                assistant2
+                assistant1
+            "},
+            &mut cx,
+        );

-        let context_editor = window
-            .update(cx, |_, window, cx| {
-                cx.new(|cx| {
-                    ContextEditor::for_context(
-                        context,
-                        fs,
-                        workspace.downgrade(),
-                        project,
-                        None,
-                        window,
-                        cx,
-                    )
-                })
-            })
-            .unwrap();
-
-        context_editor.update_in(cx, |context_editor, window, cx| {
-            context_editor.editor.update(cx, |editor, cx| {
-                editor.set_text("abc\ndef\nghi", window, cx);
-                editor.move_to_beginning(&Default::default(), window, cx);
-            })
-        });
-
-        context_editor.update_in(cx, |context_editor, window, cx| {
-            context_editor.editor.update(cx, |editor, cx| {
-                editor.copy(&Default::default(), window, cx);
-                editor.paste(&Default::default(), window, cx);
-
-                assert_eq!(editor.text(cx), "abc\nabc\ndef\nghi");
-            })
-        });
-
-        context_editor.update_in(cx, |context_editor, window, cx| {
-            context_editor.editor.update(cx, |editor, cx| {
-                editor.cut(&Default::default(), window, cx);
-                assert_eq!(editor.text(cx), "abc\ndef\nghi");
-
-                editor.paste(&Default::default(), window, cx);
-                assert_eq!(editor.text(cx), "abc\nabc\ndef\nghi");
-            })
-        });
+        // Copy and cut second assistant message
+        let message_3_range = message_range(&context, 2, &mut cx);
+        assert_copy_paste_context_editor(
+            &context_editor,
+            message_3_range.start..message_3_range.start,
+            indoc! {"
+                user1
+                assistant1
+                assistant2
+                assistant1
+                assistant2
+            "},
+            &mut cx,
+        );
    }

    #[gpui::test]
@@ -3408,6 +3427,129 @@ mod tests {
        }
    }

+    async fn setup_context_editor_text(
+        messages: Vec<(Role, &str)>,
+        cx: &mut TestAppContext,
+    ) -> (
+        Entity<AssistantContext>,
+        Entity<ContextEditor>,
+        VisualTestContext,
+    ) {
+        cx.update(init_test);
+
+        let fs = FakeFs::new(cx.executor());
+        let context = create_context_with_messages(messages, cx);
+
+        let project = Project::test(fs.clone(), [path!("/test").as_ref()], cx).await;
+        let window = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
+        let workspace = window.root(cx).unwrap();
+        let mut cx = VisualTestContext::from_window(*window, cx);
+
+        let context_editor = window
+            .update(&mut cx, |_, window, cx| {
+                cx.new(|cx| {
+                    let editor = ContextEditor::for_context(
+                        context.clone(),
+                        fs,
+                        workspace.downgrade(),
+                        project,
+                        None,
+                        window,
+                        cx,
+                    );
+                    editor
+                })
+            })
+            .unwrap();
+
+        (context, context_editor, cx)
+    }
+
+    fn message_range(
+        context: &Entity<AssistantContext>,
+        message_ix: usize,
+        cx: &mut TestAppContext,
+    ) -> Range<usize> {
+        context.update(cx, |context, cx| {
+            context
+                .messages(cx)
+                .nth(message_ix)
+                .unwrap()
+                .anchor_range
+                .to_offset(&context.buffer().read(cx).snapshot())
+        })
+    }
+
+    fn assert_copy_paste_context_editor<T: editor::ToOffset>(
+        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(None, window, cx, |s| s.select_ranges([range]));
+            });
+
+            context_editor.copy(&Default::default(), window, cx);
+
+            context_editor.editor.update(cx, |editor, cx| {
+                editor.move_to_end(&Default::default(), window, cx);
+            });
+
+            context_editor.paste(&Default::default(), window, cx);
+
+            context_editor.editor.update(cx, |editor, cx| {
+                assert_eq!(editor.text(cx), expected_text);
+            });
+        });
+    }
+
+    fn create_context_with_messages(
+        mut messages: Vec<(Role, &str)>,
+        cx: &mut TestAppContext,
+    ) -> Entity<AssistantContext> {
+        let registry = Arc::new(LanguageRegistry::test(cx.executor()));
+        let prompt_builder = Arc::new(PromptBuilder::new(None).unwrap());
+        cx.new(|cx| {
+            let mut context = AssistantContext::local(
+                registry,
+                None,
+                None,
+                prompt_builder.clone(),
+                Arc::new(SlashCommandWorkingSet::default()),
+                cx,
+            );
+            let mut message_1 = context.messages(cx).next().unwrap();
+            let (role, text) = messages.remove(0);
+
+            loop {
+                if role == message_1.role {
+                    context.buffer().update(cx, |buffer, cx| {
+                        buffer.edit([(message_1.offset_range, text)], None, cx);
+                    });
+                    break;
+                }
+                let mut ids = HashSet::default();
+                ids.insert(message_1.id);
+                context.cycle_message_roles(ids, cx);
+                message_1 = context.messages(cx).next().unwrap();
+            }
+
+            let mut last_message_id = message_1.id;
+            for (role, text) in messages {
+                context.insert_message_after(last_message_id, role, MessageStatus::Done, cx);
+                let message = context.messages(cx).last().unwrap();
+                last_message_id = message.id;
+                context.buffer().update(cx, |buffer, cx| {
+                    buffer.edit([(message.offset_range, text)], None, cx);
+                })
+            }
+
+            context
+        })
+    }
+
    fn init_test(cx: &mut App) {
        let settings_store = SettingsStore::test(cx);
        prompt_store::init(cx);
--- a/crates/assistant_context_editor/src/slash_command.rs
+++ b/crates/assistant_context_editor/src/slash_command.rs
@@ -48,7 +48,7 @@ impl SlashCommandCompletionProvider {
        name_range: Range<Anchor>,
        window: &mut Window,
        cx: &mut App,
-    ) -> Task<Result<Option<Vec<project::Completion>>>> {
+    ) -> Task<Result<Vec<project::CompletionResponse>>> {
        let slash_commands = self.slash_commands.clone();
        let candidates = slash_commands
            .command_names(cx)
@@ -71,28 +71,27 @@ impl SlashCommandCompletionProvider {
            .await;

            cx.update(|_, cx| {
-                Some(
-                    matches
-                        .into_iter()
-                        .filter_map(|mat| {
-                            let command = slash_commands.command(&mat.string, cx)?;
-                            let mut new_text = mat.string.clone();
-                            let requires_argument = command.requires_argument();
-                            let accepts_arguments = command.accepts_arguments();
-                            if requires_argument || accepts_arguments {
-                                new_text.push(' ');
-                            }
+                let completions = matches
+                    .into_iter()
+                    .filter_map(|mat| {
+                        let command = slash_commands.command(&mat.string, cx)?;
+                        let mut new_text = mat.string.clone();
+                        let requires_argument = command.requires_argument();
+                        let accepts_arguments = command.accepts_arguments();
+                        if requires_argument || accepts_arguments {
+                            new_text.push(' ');
+                        }

-                            let confirm =
-                                editor
-                                    .clone()
-                                    .zip(workspace.clone())
-                                    .map(|(editor, workspace)| {
-                                        let command_name = mat.string.clone();
-                                        let command_range = command_range.clone();
-                                        let editor = editor.clone();
-                                        let workspace = workspace.clone();
-                                        Arc::new(
+                        let confirm =
+                            editor
+                                .clone()
+                                .zip(workspace.clone())
+                                .map(|(editor, workspace)| {
+                                    let command_name = mat.string.clone();
+                                    let command_range = command_range.clone();
+                                    let editor = editor.clone();
+                                    let workspace = workspace.clone();
+                                    Arc::new(
                                            move |intent: CompletionIntent,
                                            window: &mut Window,
                                            cx: &mut App| {
@@ -118,22 +117,27 @@ impl SlashCommandCompletionProvider {
                                                }
                                            },
                                        ) as Arc<_>
-                                    });
-                            Some(project::Completion {
-                                replace_range: name_range.clone(),
-                                documentation: Some(CompletionDocumentation::SingleLine(
-                                    command.description().into(),
-                                )),
-                                new_text,
-                                label: command.label(cx),
-                                icon_path: None,
-                                insert_text_mode: None,
-                                confirm,
-                                source: CompletionSource::Custom,
-                            })
+                                });
+
+                        Some(project::Completion {
+                            replace_range: name_range.clone(),
+                            documentation: Some(CompletionDocumentation::SingleLine(
+                                command.description().into(),
+                            )),
+                            new_text,
+                            label: command.label(cx),
+                            icon_path: None,
+                            insert_text_mode: None,
+                            confirm,
+                            source: CompletionSource::Custom,
                        })
-                        .collect(),
-                )
+                    })
+                    .collect();
+
+                vec![project::CompletionResponse {
+                    completions,
+                    is_incomplete: false,
+                }]
            })
        })
    }
@@ -147,7 +151,7 @@ impl SlashCommandCompletionProvider {
        last_argument_range: Range<Anchor>,
        window: &mut Window,
        cx: &mut App,
-    ) -> Task<Result<Option<Vec<project::Completion>>>> {
+    ) -> Task<Result<Vec<project::CompletionResponse>>> {
        let new_cancel_flag = Arc::new(AtomicBool::new(false));
        let mut flag = self.cancel_flag.lock();
        flag.store(true, SeqCst);
@@ -165,28 +169,27 @@ impl SlashCommandCompletionProvider {
            let workspace = self.workspace.clone();
            let arguments = arguments.to_vec();
            cx.background_spawn(async move {
-                Ok(Some(
-                    completions
-                        .await?
-                        .into_iter()
-                        .map(|new_argument| {
-                            let confirm =
-                                editor
-                                    .clone()
-                                    .zip(workspace.clone())
-                                    .map(|(editor, workspace)| {
-                                        Arc::new({
-                                            let mut completed_arguments = arguments.clone();
-                                            if new_argument.replace_previous_arguments {
-                                                completed_arguments.clear();
-                                            } else {
-                                                completed_arguments.pop();
-                                            }
-                                            completed_arguments.push(new_argument.new_text.clone());
+                let completions = completions
+                    .await?
+                    .into_iter()
+                    .map(|new_argument| {
+                        let confirm =
+                            editor
+                                .clone()
+                                .zip(workspace.clone())
+                                .map(|(editor, workspace)| {
+                                    Arc::new({
+                                        let mut completed_arguments = arguments.clone();
+                                        if new_argument.replace_previous_arguments {
+                                            completed_arguments.clear();
+                                        } else {
+                                            completed_arguments.pop();
+                                        }
+                                        completed_arguments.push(new_argument.new_text.clone());

-                                            let command_range = command_range.clone();
-                                            let command_name = command_name.clone();
-                                            move |intent: CompletionIntent,
+                                        let command_range = command_range.clone();
+                                        let command_name = command_name.clone();
+                                        move |intent: CompletionIntent,
                                              window: &mut Window,
                                              cx: &mut App| {
                                            if new_argument.after_completion.run()
@@ -210,34 +213,41 @@ impl SlashCommandCompletionProvider {
                                                !new_argument.after_completion.run()
                                            }
                                        }
-                                        }) as Arc<_>
-                                    });
+                                    }) as Arc<_>
+                                });

-                            let mut new_text = new_argument.new_text.clone();
-                            if new_argument.after_completion == AfterCompletion::Continue {
-                                new_text.push(' ');
-                            }
+                        let mut new_text = new_argument.new_text.clone();
+                        if new_argument.after_completion == AfterCompletion::Continue {
+                            new_text.push(' ');
+                        }

-                            project::Completion {
-                                replace_range: if new_argument.replace_previous_arguments {
-                                    argument_range.clone()
-                                } else {
-                                    last_argument_range.clone()
-                                },
-                                label: new_argument.label,
-                                icon_path: None,
-                                new_text,
-                                documentation: None,
-                                confirm,
-                                insert_text_mode: None,
-                                source: CompletionSource::Custom,
-                            }
-                        })
-                        .collect(),
-                ))
+                        project::Completion {
+                            replace_range: if new_argument.replace_previous_arguments {
+                                argument_range.clone()
+                            } else {
+                                last_argument_range.clone()
+                            },
+                            label: new_argument.label,
+                            icon_path: None,
+                            new_text,
+                            documentation: None,
+                            confirm,
+                            insert_text_mode: None,
+                            source: CompletionSource::Custom,
+                        }
+                    })
+                    .collect();
+
+                Ok(vec![project::CompletionResponse {
+                    completions,
+                    is_incomplete: false,
+                }])
            })
        } else {
-            Task::ready(Ok(Some(Vec::new())))
+            Task::ready(Ok(vec![project::CompletionResponse {
+                completions: Vec::new(),
+                is_incomplete: false,
+            }]))
        }
    }
 }
@@ -251,7 +261,7 @@ impl CompletionProvider for SlashCommandCompletionProvider {
        _: editor::CompletionContext,
        window: &mut Window,
        cx: &mut Context<Editor>,
-    ) -> Task<Result<Option<Vec<project::Completion>>>> {
+    ) -> Task<Result<Vec<project::CompletionResponse>>> {
        let Some((name, arguments, command_range, last_argument_range)) =
            buffer.update(cx, |buffer, _cx| {
                let position = buffer_position.to_point(buffer);
@@ -295,7 +305,10 @@ impl CompletionProvider for SlashCommandCompletionProvider {
                Some((name, arguments, command_range, last_argument_range))
            })
        else {
-            return Task::ready(Ok(Some(Vec::new())));
+            return Task::ready(Ok(vec![project::CompletionResponse {
+                completions: Vec::new(),
+                is_incomplete: false,
+            }]));
        };

        if let Some((arguments, argument_range)) = arguments {
@@ -329,6 +342,7 @@ impl CompletionProvider for SlashCommandCompletionProvider {
        position: language::Anchor,
        _text: &str,
        _trigger_in_words: bool,
+        _menu_is_open: bool,
        cx: &mut Context<Editor>,
    ) -> bool {
        let buffer = buffer.read(cx);
--- a/crates/assistant_tool/src/assistant_tool.rs
+++ b/crates/assistant_tool/src/assistant_tool.rs
@@ -218,6 +218,9 @@ pub trait Tool: 'static + Send + Sync {
    /// before having permission to run.
    fn needs_confirmation(&self, input: &serde_json::Value, cx: &App) -> bool;

+    /// Returns true if the tool may perform edits.
+    fn may_perform_edits(&self) -> bool;
+
    /// Returns the JSON schema that describes the tool's input.
    fn input_schema(&self, _: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
        Ok(serde_json::Value::Object(serde_json::Map::default()))
--- a/crates/assistant_tool/src/tool_schema.rs
+++ b/crates/assistant_tool/src/tool_schema.rs
@@ -16,11 +16,24 @@ pub fn adapt_schema_to_format(
    }

    match format {
-        LanguageModelToolSchemaFormat::JsonSchema => Ok(()),
+        LanguageModelToolSchemaFormat::JsonSchema => preprocess_json_schema(json),
        LanguageModelToolSchemaFormat::JsonSchemaSubset => adapt_to_json_schema_subset(json),
    }
 }

+fn preprocess_json_schema(json: &mut Value) -> Result<()> {
+    // `additionalProperties` defaults to `false` unless explicitly specified.
+    // This prevents models from hallucinating tool parameters.
+    if let Value::Object(obj) = json {
+        if let Some(Value::String(type_str)) = obj.get("type") {
+            if type_str == "object" && !obj.contains_key("additionalProperties") {
+                obj.insert("additionalProperties".to_string(), Value::Bool(false));
+            }
+        }
+    }
+    Ok(())
+}
+
 /// Tries to adapt the json schema so that it is compatible with https://ai.google.dev/api/caching#Schema
 fn adapt_to_json_schema_subset(json: &mut Value) -> Result<()> {
    if let Value::Object(obj) = json {
@@ -237,4 +250,59 @@ mod tests {

        assert!(adapt_to_json_schema_subset(&mut json).is_err());
    }
+
+    #[test]
+    fn test_preprocess_json_schema_adds_additional_properties() {
+        let mut json = json!({
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                }
+            }
+        });
+
+        preprocess_json_schema(&mut json).unwrap();
+
+        assert_eq!(
+            json,
+            json!({
+                "type": "object",
+                "properties": {
+                    "name": {
+                        "type": "string"
+                    }
+                },
+                "additionalProperties": false
+            })
+        );
+    }
+
+    #[test]
+    fn test_preprocess_json_schema_preserves_additional_properties() {
+        let mut json = json!({
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                }
+            },
+            "additionalProperties": true
+        });
+
+        preprocess_json_schema(&mut json).unwrap();
+
+        assert_eq!(
+            json,
+            json!({
+                "type": "object",
+                "properties": {
+                    "name": {
+                        "type": "string"
+                    }
+                },
+                "additionalProperties": true
+            })
+        );
+    }
 }
--- a/crates/assistant_tools/Cargo.toml
+++ b/crates/assistant_tools/Cargo.toml
@@ -21,7 +21,6 @@ assistant_tool.workspace = true
 async-watch.workspace = true
 buffer_diff.workspace = true
 chrono.workspace = true
-client.workspace = true
 collections.workspace = true
 component.workspace = true
 derive_more.workspace = true
@@ -32,7 +31,6 @@ gpui.workspace = true
 handlebars = { workspace = true, features = ["rust-embed"] }
 html_to_markdown.workspace = true
 http_client.workspace = true
-icons.workspace = true
 indoc.workspace = true
 itertools.workspace = true
 language.workspace = true
@@ -46,8 +44,6 @@ portable-pty.workspace = true
 project.workspace = true
 prompt_store.workspace = true
 regex.workspace = true
-release_channel.workspace = true
-rpc.workspace = true
 rust-embed.workspace = true
 schemars.workspace = true
 serde.workspace = true
@@ -59,7 +55,6 @@ strsim.workspace = true
 task.workspace = true
 terminal.workspace = true
 terminal_view.workspace = true
-text.workspace = true
 theme.workspace = true
 ui.workspace = true
 util.workspace = true
@@ -77,16 +72,13 @@ collections = { workspace = true, features = ["test-support"] }
 gpui = { workspace = true, features = ["test-support"] }
 gpui_tokio.workspace = true
 fs = { workspace = true, features = ["test-support"] }
-http_client = { workspace = true, features = ["test-support"] }
 language = { workspace = true, features = ["test-support"] }
 language_model = { workspace = true, features = ["test-support"] }
 language_models.workspace = true
-node_runtime = { workspace = true, features = ["test-support"] }
 project = { workspace = true, features = ["test-support"] }
 rand.workspace = true
 pretty_assertions.workspace = true
 reqwest_client.workspace = true
-rpc = { workspace = true, features = ["test-support"] }
 settings = { workspace = true, features = ["test-support"] }
 task = { workspace = true, features = ["test-support"]}
 tempfile.workspace = true
--- a/crates/assistant_tools/src/assistant_tools.rs
+++ b/crates/assistant_tools/src/assistant_tools.rs
@@ -2,7 +2,7 @@ mod copy_path_tool;
 mod create_directory_tool;
 mod delete_path_tool;
 mod diagnostics_tool;
-pub mod edit_agent;
+mod edit_agent;
 mod edit_file_tool;
 mod fetch_tool;
 mod find_path_tool;
@@ -29,7 +29,7 @@ use language_model::LanguageModelRegistry;
 use move_path_tool::MovePathTool;
 use web_search_tool::WebSearchTool;

-pub use templates::*;
+pub(crate) use templates::*;

 use crate::create_directory_tool::CreateDirectoryTool;
 use crate::delete_path_tool::DeletePathTool;
@@ -42,7 +42,6 @@ use crate::list_directory_tool::ListDirectoryTool;
 use crate::now_tool::NowTool;
 use crate::thinking_tool::ThinkingTool;

-pub use edit_agent::{EditAgent, EditAgentOutputEvent};
 pub use edit_file_tool::{EditFileMode, EditFileToolInput};
 pub use find_path_tool::FindPathToolInput;
 pub use open_tool::OpenTool;
@@ -127,6 +126,7 @@ mod tests {
                    }
                },
                "required": ["location"],
+                "additionalProperties": false
            })
        );
    }
--- a/crates/assistant_tools/src/copy_path_tool.rs
+++ b/crates/assistant_tools/src/copy_path_tool.rs
@@ -48,6 +48,10 @@ impl Tool for CopyPathTool {
        false
    }

+    fn may_perform_edits(&self) -> bool {
+        true
+    }
+
    fn description(&self) -> String {
        include_str!("./copy_path_tool/description.md").into()
    }
--- a/crates/assistant_tools/src/create_directory_tool.rs
+++ b/crates/assistant_tools/src/create_directory_tool.rs
@@ -33,12 +33,16 @@ impl Tool for CreateDirectoryTool {
        "create_directory".into()
    }

+    fn description(&self) -> String {
+        include_str!("./create_directory_tool/description.md").into()
+    }
+
    fn needs_confirmation(&self, _: &serde_json::Value, _: &App) -> bool {
        false
    }

-    fn description(&self) -> String {
-        include_str!("./create_directory_tool/description.md").into()
+    fn may_perform_edits(&self) -> bool {
+        false
    }

    fn icon(&self) -> IconName {
--- a/crates/assistant_tools/src/delete_path_tool.rs
+++ b/crates/assistant_tools/src/delete_path_tool.rs
@@ -37,6 +37,10 @@ impl Tool for DeletePathTool {
        false
    }

+    fn may_perform_edits(&self) -> bool {
+        true
+    }
+
    fn description(&self) -> String {
        include_str!("./delete_path_tool/description.md").into()
    }
--- a/crates/assistant_tools/src/diagnostics_tool.rs
+++ b/crates/assistant_tools/src/diagnostics_tool.rs
@@ -50,6 +50,10 @@ impl Tool for DiagnosticsTool {
        false
    }

+    fn may_perform_edits(&self) -> bool {
+        false
+    }
+
    fn description(&self) -> String {
        include_str!("./diagnostics_tool/description.md").into()
    }
--- a/crates/assistant_tools/src/edit_agent.rs
+++ b/crates/assistant_tools/src/edit_agent.rs
@@ -54,6 +54,7 @@ impl Template for EditFilePromptTemplate {
 pub enum EditAgentOutputEvent {
    ResolvingEditRange(Range<Anchor>),
    UnresolvedEditRange,
+    AmbiguousEditRange(Vec<Range<usize>>),
    Edited,
 }

@@ -269,16 +270,29 @@ impl EditAgent {
                }
            }

-            let (edit_events_, resolved_old_text) = resolve_old_text.await?;
+            let (edit_events_, mut resolved_old_text) = resolve_old_text.await?;
            edit_events = edit_events_;

            // If we can't resolve the old text, restart the loop waiting for a
            // new edit (or for the stream to end).
-            let Some(resolved_old_text) = resolved_old_text else {
-                output_events
-                    .unbounded_send(EditAgentOutputEvent::UnresolvedEditRange)
-                    .ok();
-                continue;
+            let resolved_old_text = match resolved_old_text.len() {
+                1 => resolved_old_text.pop().unwrap(),
+                0 => {
+                    output_events
+                        .unbounded_send(EditAgentOutputEvent::UnresolvedEditRange)
+                        .ok();
+                    continue;
+                }
+                _ => {
+                    let ranges = resolved_old_text
+                        .into_iter()
+                        .map(|text| text.range)
+                        .collect();
+                    output_events
+                        .unbounded_send(EditAgentOutputEvent::AmbiguousEditRange(ranges))
+                        .ok();
+                    continue;
+                }
            };

            // Compute edits in the background and apply them as they become
@@ -405,7 +419,7 @@ impl EditAgent {
        mut edit_events: T,
        cx: &mut AsyncApp,
    ) -> (
-        Task<Result<(T, Option<ResolvedOldText>)>>,
+        Task<Result<(T, Vec<ResolvedOldText>)>>,
        async_watch::Receiver<Option<Range<usize>>>,
    )
    where
@@ -425,21 +439,29 @@ impl EditAgent {
                }
            }

-            let old_range = matcher.finish();
-            old_range_tx.send(old_range.clone())?;
-            if let Some(old_range) = old_range {
-                let line_indent =
-                    LineIndent::from_iter(matcher.query_lines().first().unwrap().chars());
-                Ok((
-                    edit_events,
-                    Some(ResolvedOldText {
-                        range: old_range,
-                        indent: line_indent,
-                    }),
-                ))
+            let matches = matcher.finish();
+
+            let old_range = if matches.len() == 1 {
+                matches.first()
            } else {
-                Ok((edit_events, None))
-            }
+                // No matches or multiple ambiguous matches
+                None
+            };
+            old_range_tx.send(old_range.cloned())?;
+
+            let indent = LineIndent::from_iter(
+                matcher
+                    .query_lines()
+                    .first()
+                    .unwrap_or(&String::new())
+                    .chars(),
+            );
+            let resolved_old_texts = matches
+                .into_iter()
+                .map(|range| ResolvedOldText { range, indent })
+                .collect::<Vec<_>>();
+
+            Ok((edit_events, resolved_old_texts))
        });

        (task, old_range_rx)
@@ -1322,6 +1344,76 @@ mod tests {
        EditAgent::new(model, project, action_log, Templates::new())
    }

+    #[gpui::test(iterations = 10)]
+    async fn test_non_unique_text_error(cx: &mut TestAppContext, mut rng: StdRng) {
+        let agent = init_test(cx).await;
+        let original_text = indoc! {"
+                function foo() {
+                    return 42;
+                }
+
+                function bar() {
+                    return 42;
+                }
+
+                function baz() {
+                    return 42;
+                }
+            "};
+        let buffer = cx.new(|cx| Buffer::local(original_text, cx));
+        let (apply, mut events) = agent.edit(
+            buffer.clone(),
+            String::new(),
+            &LanguageModelRequest::default(),
+            &mut cx.to_async(),
+        );
+        cx.run_until_parked();
+
+        // When <old_text> matches text in more than one place
+        simulate_llm_output(
+            &agent,
+            indoc! {"
+                <old_text>
+                return 42;
+                </old_text>
+                <new_text>
+                return 100;
+                </new_text>
+            "},
+            &mut rng,
+            cx,
+        );
+        apply.await.unwrap();
+
+        // Then the text should remain unchanged
+        let result_text = buffer.read_with(cx, |buffer, _| buffer.snapshot().text());
+        assert_eq!(
+            result_text,
+            indoc! {"
+                function foo() {
+                    return 42;
+                }
+
+                function bar() {
+                    return 42;
+                }
+
+                function baz() {
+                    return 42;
+                }
+            "},
+            "Text should remain unchanged when there are multiple matches"
+        );
+
+        // And AmbiguousEditRange even should be emitted
+        let events = drain_events(&mut events);
+        let ambiguous_ranges = vec![17..31, 52..66, 87..101];
+        assert!(
+            events.contains(&EditAgentOutputEvent::AmbiguousEditRange(ambiguous_ranges)),
+            "Should emit AmbiguousEditRange for non-unique text"
+        );
+    }
+
    fn drain_events(
        stream: &mut UnboundedReceiver<EditAgentOutputEvent>,
    ) -> Vec<EditAgentOutputEvent> {
--- a/crates/assistant_tools/src/edit_agent/streaming_fuzzy_matcher.rs
+++ b/crates/assistant_tools/src/edit_agent/streaming_fuzzy_matcher.rs
@@ -11,7 +11,7 @@ pub struct StreamingFuzzyMatcher {
    snapshot: TextBufferSnapshot,
    query_lines: Vec<String>,
    incomplete_line: String,
-    best_match: Option<Range<usize>>,
+    best_matches: Vec<Range<usize>>,
    matrix: SearchMatrix,
 }

@@ -22,7 +22,7 @@ impl StreamingFuzzyMatcher {
            snapshot,
            query_lines: Vec::new(),
            incomplete_line: String::new(),
-            best_match: None,
+            best_matches: Vec::new(),
            matrix: SearchMatrix::new(buffer_line_count + 1),
        }
    }
@@ -55,31 +55,41 @@ impl StreamingFuzzyMatcher {

            self.incomplete_line.replace_range(..last_pos + 1, "");

-            self.best_match = self.resolve_location_fuzzy();
-        }
+            self.best_matches = self.resolve_location_fuzzy();

-        self.best_match.clone()
+            if let Some(first_match) = self.best_matches.first() {
+                Some(first_match.clone())
+            } else {
+                None
+            }
+        } else {
+            if let Some(first_match) = self.best_matches.first() {
+                Some(first_match.clone())
+            } else {
+                None
+            }
+        }
    }

-    /// Finish processing and return the final best match.
+    /// Finish processing and return the final best match(es).
    ///
    /// This processes any remaining incomplete line before returning the final
    /// match result.
-    pub fn finish(&mut self) -> Option<Range<usize>> {
+    pub fn finish(&mut self) -> Vec<Range<usize>> {
        // Process any remaining incomplete line
        if !self.incomplete_line.is_empty() {
            self.query_lines.push(self.incomplete_line.clone());
-            self.best_match = self.resolve_location_fuzzy();
+            self.incomplete_line.clear();
+            self.best_matches = self.resolve_location_fuzzy();
        }
-
-        self.best_match.clone()
+        self.best_matches.clone()
    }

-    fn resolve_location_fuzzy(&mut self) -> Option<Range<usize>> {
+    fn resolve_location_fuzzy(&mut self) -> Vec<Range<usize>> {
        let new_query_line_count = self.query_lines.len();
        let old_query_line_count = self.matrix.rows.saturating_sub(1);
        if new_query_line_count == old_query_line_count {
-            return None;
+            return Vec::new();
        }

        self.matrix.resize_rows(new_query_line_count + 1);
@@ -132,53 +142,61 @@ impl StreamingFuzzyMatcher {
            }
        }

-        // Traceback to find the best match
+        // Find all matches with the best cost
        let buffer_line_count = self.snapshot.max_point().row as usize + 1;
-        let mut buffer_row_end = buffer_line_count as u32;
        let mut best_cost = u32::MAX;
+        let mut matches_with_best_cost = Vec::new();
+
        for col in 1..=buffer_line_count {
            let cost = self.matrix.get(new_query_line_count, col).cost;
            if cost < best_cost {
                best_cost = cost;
-                buffer_row_end = col as u32;
+                matches_with_best_cost.clear();
+                matches_with_best_cost.push(col as u32);
+            } else if cost == best_cost {
+                matches_with_best_cost.push(col as u32);
            }
        }

-        let mut matched_lines = 0;
-        let mut query_row = new_query_line_count;
-        let mut buffer_row_start = buffer_row_end;
-        while query_row > 0 && buffer_row_start > 0 {
-            let current = self.matrix.get(query_row, buffer_row_start as usize);
-            match current.direction {
-                SearchDirection::Diagonal => {
-                    query_row -= 1;
-                    buffer_row_start -= 1;
-                    matched_lines += 1;
-                }
-                SearchDirection::Up => {
-                    query_row -= 1;
-                }
-                SearchDirection::Left => {
-                    buffer_row_start -= 1;
+        // Find ranges for the matches
+        let mut valid_matches = Vec::new();
+        for &buffer_row_end in &matches_with_best_cost {
+            let mut matched_lines = 0;
+            let mut query_row = new_query_line_count;
+            let mut buffer_row_start = buffer_row_end;
+            while query_row > 0 && buffer_row_start > 0 {
+                let current = self.matrix.get(query_row, buffer_row_start as usize);
+                match current.direction {
+                    SearchDirection::Diagonal => {
+                        query_row -= 1;
+                        buffer_row_start -= 1;
+                        matched_lines += 1;
+                    }
+                    SearchDirection::Up => {
+                        query_row -= 1;
+                    }
+                    SearchDirection::Left => {
+                        buffer_row_start -= 1;
+                    }
                }
            }
+
+            let matched_buffer_row_count = buffer_row_end - buffer_row_start;
+            let matched_ratio = matched_lines as f32
+                / (matched_buffer_row_count as f32).max(new_query_line_count as f32);
+            if matched_ratio >= 0.8 {
+                let buffer_start_ix = self
+                    .snapshot
+                    .point_to_offset(Point::new(buffer_row_start, 0));
+                let buffer_end_ix = self.snapshot.point_to_offset(Point::new(
+                    buffer_row_end - 1,
+                    self.snapshot.line_len(buffer_row_end - 1),
+                ));
+                valid_matches.push((buffer_row_start, buffer_start_ix..buffer_end_ix));
+            }
        }

-        let matched_buffer_row_count = buffer_row_end - buffer_row_start;
-        let matched_ratio = matched_lines as f32
-            / (matched_buffer_row_count as f32).max(new_query_line_count as f32);
-        if matched_ratio >= 0.8 {
-            let buffer_start_ix = self
-                .snapshot
-                .point_to_offset(Point::new(buffer_row_start, 0));
-            let buffer_end_ix = self.snapshot.point_to_offset(Point::new(
-                buffer_row_end - 1,
-                self.snapshot.line_len(buffer_row_end - 1),
-            ));
-            Some(buffer_start_ix..buffer_end_ix)
-        } else {
-            None
-        }
+        valid_matches.into_iter().map(|(_, range)| range).collect()
    }
 }

@@ -638,28 +656,35 @@ mod tests {
            matcher.push(chunk);
        }

-        let result = matcher.finish();
+        let actual_ranges = matcher.finish();

        // If no expected ranges, we expect no match
        if expected_ranges.is_empty() {
-            assert_eq!(
-                result, None,
+            assert!(
+                actual_ranges.is_empty(),
                "Expected no match for query: {:?}, but found: {:?}",
-                query, result
+                query,
+                actual_ranges
            );
        } else {
-            let mut actual_ranges = Vec::new();
-            if let Some(range) = result {
-                actual_ranges.push(range);
-            }
-
            let text_with_actual_range = generate_marked_text(&text, &actual_ranges, false);
            pretty_assertions::assert_eq!(
                text_with_actual_range,
                text_with_expected_range,
-                "Query: {:?}, Chunks: {:?}",
+                indoc! {"
+                    Query: {:?}
+                    Chunks: {:?}
+                    Expected marked text: {}
+                    Actual marked text: {}
+                    Expected ranges: {:?}
+                    Actual ranges: {:?}"
+                },
                query,
-                chunks
+                chunks,
+                text_with_expected_range,
+                text_with_actual_range,
+                expected_ranges,
+                actual_ranges
            );
        }
    }
@@ -687,8 +712,11 @@ mod tests {

    fn finish(mut finder: StreamingFuzzyMatcher) -> Option<String> {
        let snapshot = finder.snapshot.clone();
-        finder
-            .finish()
-            .map(|range| snapshot.text_for_range(range).collect::<String>())
+        let matches = finder.finish();
+        if let Some(range) = matches.first() {
+            Some(snapshot.text_for_range(range.clone()).collect::<String>())
+        } else {
+            None
+        }
    }
 }
--- a/crates/assistant_tools/src/edit_file_tool.rs
+++ b/crates/assistant_tools/src/edit_file_tool.rs
@@ -2,6 +2,7 @@ use crate::{
    Templates,
    edit_agent::{EditAgent, EditAgentOutput, EditAgentOutputEvent},
    schema::json_schema_for,
+    ui::{COLLAPSED_LINES, ToolOutputPreview},
 };
 use anyhow::{Context as _, Result, anyhow};
 use assistant_tool::{
@@ -13,7 +14,7 @@ use editor::{Editor, EditorMode, MinimapVisibility, MultiBuffer, PathKey};
 use futures::StreamExt;
 use gpui::{
    Animation, AnimationExt, AnyWindowHandle, App, AppContext, AsyncApp, Entity, Task,
-    TextStyleRefinement, WeakEntity, pulsating_between,
+    TextStyleRefinement, WeakEntity, pulsating_between, px,
 };
 use indoc::formatdoc;
 use language::{
@@ -128,6 +129,10 @@ impl Tool for EditFileTool {
        false
    }

+    fn may_perform_edits(&self) -> bool {
+        true
+    }
+
    fn description(&self) -> String {
        include_str!("edit_file_tool/description.md").to_string()
    }
@@ -234,6 +239,7 @@ impl Tool for EditFileTool {
            };

            let mut hallucinated_old_text = false;
+            let mut ambiguous_ranges = Vec::new();
            while let Some(event) = events.next().await {
                match event {
                    EditAgentOutputEvent::Edited => {
@@ -242,6 +248,7 @@ impl Tool for EditFileTool {
                        }
                    }
                    EditAgentOutputEvent::UnresolvedEditRange => hallucinated_old_text = true,
+                    EditAgentOutputEvent::AmbiguousEditRange(ranges) => ambiguous_ranges = ranges,
                    EditAgentOutputEvent::ResolvingEditRange(range) => {
                        if let Some(card) = card_clone.as_ref() {
                            card.update(cx, |card, cx| card.reveal_range(range, cx))?;
@@ -324,6 +331,17 @@ impl Tool for EditFileTool {
                        I can perform the requested edits.
                    "}
                );
+                anyhow::ensure!(
+                    ambiguous_ranges.is_empty(),
+                    // TODO: Include ambiguous_ranges, converted to line numbers.
+                    //       This would work best if we add `line_hint` parameter
+                    //       to edit_file_tool
+                    formatdoc! {"
+                        <old_text> matches more than one position in the file. Read the
+                        relevant sections of {input_path} again and extend <old_text> so
+                        that I can perform the requested edits.
+                    "}
+                );
                Ok(ToolResultOutput {
                    content: ToolResultContent::Text("No edits were made.".into()),
                    output: serde_json::to_value(output).ok(),
@@ -884,30 +902,8 @@ impl ToolCard for EditFileToolCard {
            (element.into_any_element(), line_height)
        });

-        let (full_height_icon, full_height_tooltip_label) = if self.full_height_expanded {
-            (IconName::ChevronUp, "Collapse Code Block")
-        } else {
-            (IconName::ChevronDown, "Expand Code Block")
-        };
-
-        let gradient_overlay =
-            div()
-                .absolute()
-                .bottom_0()
-                .left_0()
-                .w_full()
-                .h_2_5()
-                .bg(gpui::linear_gradient(
-                    0.,
-                    gpui::linear_color_stop(cx.theme().colors().editor_background, 0.),
-                    gpui::linear_color_stop(cx.theme().colors().editor_background.opacity(0.), 1.),
-                ));
-
        let border_color = cx.theme().colors().border.opacity(0.6);

-        const DEFAULT_COLLAPSED_LINES: u32 = 10;
-        let is_collapsible = self.total_lines.unwrap_or(0) > DEFAULT_COLLAPSED_LINES;
-
        let waiting_for_diff = {
            let styles = [
                ("w_4_5", (0.1, 0.85), 2000),
@@ -992,48 +988,34 @@ impl ToolCard for EditFileToolCard {
                card.child(waiting_for_diff)
            })
            .when(self.preview_expanded && !self.is_loading(), |card| {
+                let editor_view = v_flex()
+                    .relative()
+                    .h_full()
+                    .when(!self.full_height_expanded, |editor_container| {
+                        editor_container.max_h(px(COLLAPSED_LINES as f32 * editor_line_height.0))
+                    })
+                    .overflow_hidden()
+                    .border_t_1()
+                    .border_color(border_color)
+                    .bg(cx.theme().colors().editor_background)
+                    .child(editor);
+
                card.child(
-                    v_flex()
-                        .relative()
-                        .h_full()
-                        .when(!self.full_height_expanded, |editor_container| {
-                            editor_container
-                                .max_h(DEFAULT_COLLAPSED_LINES as f32 * editor_line_height)
-                        })
-                        .overflow_hidden()
-                        .border_t_1()
-                        .border_color(border_color)
-                        .bg(cx.theme().colors().editor_background)
-                        .child(editor)
-                        .when(
-                            !self.full_height_expanded && is_collapsible,
-                            |editor_container| editor_container.child(gradient_overlay),
-                        ),
+                    ToolOutputPreview::new(editor_view.into_any_element(), self.editor.entity_id())
+                        .with_total_lines(self.total_lines.unwrap_or(0) as usize)
+                        .toggle_state(self.full_height_expanded)
+                        .with_collapsed_fade()
+                        .on_toggle({
+                            let this = cx.entity().downgrade();
+                            move |is_expanded, _window, cx| {
+                                if let Some(this) = this.upgrade() {
+                                    this.update(cx, |this, _cx| {
+                                        this.full_height_expanded = is_expanded;
+                                    });
+                                }
+                            }
+                        }),
                )
-                .when(is_collapsible, |card| {
-                    card.child(
-                        h_flex()
-                            .id(("expand-button", self.editor.entity_id()))
-                            .flex_none()
-                            .cursor_pointer()
-                            .h_5()
-                            .justify_center()
-                            .border_t_1()
-                            .rounded_b_md()
-                            .border_color(border_color)
-                            .bg(cx.theme().colors().editor_background)
-                            .hover(|style| style.bg(cx.theme().colors().element_hover.opacity(0.1)))
-                            .child(
-                                Icon::new(full_height_icon)
-                                    .size(IconSize::Small)
-                                    .color(Color::Muted),
-                            )
-                            .tooltip(Tooltip::text(full_height_tooltip_label))
-                            .on_click(cx.listener(move |this, _event, _window, _cx| {
-                                this.full_height_expanded = !this.full_height_expanded;
-                            })),
-                    )
-                })
            })
    }
 }
--- a/crates/assistant_tools/src/fetch_tool.rs
+++ b/crates/assistant_tools/src/fetch_tool.rs
@@ -118,7 +118,11 @@ impl Tool for FetchTool {
    }

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

    fn description(&self) -> String {
--- a/crates/assistant_tools/src/find_path_tool.rs
+++ b/crates/assistant_tools/src/find_path_tool.rs
@@ -59,6 +59,10 @@ impl Tool for FindPathTool {
        false
    }

+    fn may_perform_edits(&self) -> bool {
+        false
+    }
+
    fn description(&self) -> String {
        include_str!("./find_path_tool/description.md").into()
    }
--- a/crates/assistant_tools/src/grep_tool.rs
+++ b/crates/assistant_tools/src/grep_tool.rs
@@ -60,6 +60,10 @@ impl Tool for GrepTool {
        false
    }

+    fn may_perform_edits(&self) -> bool {
+        false
+    }
+
    fn description(&self) -> String {
        include_str!("./grep_tool/description.md").into()
    }
--- a/crates/assistant_tools/src/list_directory_tool.rs
+++ b/crates/assistant_tools/src/list_directory_tool.rs
@@ -48,6 +48,10 @@ impl Tool for ListDirectoryTool {
        false
    }

+    fn may_perform_edits(&self) -> bool {
+        false
+    }
+
    fn description(&self) -> String {
        include_str!("./list_directory_tool/description.md").into()
    }
--- a/crates/assistant_tools/src/move_path_tool.rs
+++ b/crates/assistant_tools/src/move_path_tool.rs
@@ -46,6 +46,10 @@ impl Tool for MovePathTool {
        false
    }

+    fn may_perform_edits(&self) -> bool {
+        true
+    }
+
    fn description(&self) -> String {
        include_str!("./move_path_tool/description.md").into()
    }
--- a/crates/assistant_tools/src/now_tool.rs
+++ b/crates/assistant_tools/src/now_tool.rs
@@ -37,6 +37,10 @@ impl Tool for NowTool {
        false
    }

+    fn may_perform_edits(&self) -> bool {
+        false
+    }
+
    fn description(&self) -> String {
        "Returns the current datetime in RFC 3339 format. Only use this tool when the user specifically asks for it or the current task would benefit from knowing the current datetime.".into()
    }
--- a/crates/assistant_tools/src/open_tool.rs
+++ b/crates/assistant_tools/src/open_tool.rs
@@ -26,7 +26,9 @@ impl Tool for OpenTool {
    fn needs_confirmation(&self, _: &serde_json::Value, _: &App) -> bool {
        true
    }
-
+    fn may_perform_edits(&self) -> bool {
+        false
+    }
    fn description(&self) -> String {
        include_str!("./open_tool/description.md").to_string()
    }
--- a/crates/assistant_tools/src/read_file_tool.rs
+++ b/crates/assistant_tools/src/read_file_tool.rs
@@ -58,6 +58,10 @@ impl Tool for ReadFileTool {
        false
    }

+    fn may_perform_edits(&self) -> bool {
+        false
+    }
+
    fn description(&self) -> String {
        include_str!("./read_file_tool/description.md").into()
    }
--- a/crates/assistant_tools/src/terminal_tool.rs
+++ b/crates/assistant_tools/src/terminal_tool.rs
@@ -1,4 +1,7 @@
-use crate::schema::json_schema_for;
+use crate::{
+    schema::json_schema_for,
+    ui::{COLLAPSED_LINES, ToolOutputPreview},
+};
 use anyhow::{Context as _, Result, anyhow};
 use assistant_tool::{ActionLog, Tool, ToolCard, ToolResult, ToolUseStatus};
 use futures::{FutureExt as _, future::Shared};
@@ -25,7 +28,7 @@ use terminal_view::TerminalView;
 use theme::ThemeSettings;
 use ui::{Disclosure, Tooltip, prelude::*};
 use util::{
-    get_system_shell, markdown::MarkdownInlineCode, size::format_file_size,
+    ResultExt, get_system_shell, markdown::MarkdownInlineCode, size::format_file_size,
    time::duration_alt_display,
 };
 use workspace::Workspace;
@@ -77,6 +80,10 @@ impl Tool for TerminalTool {
        true
    }

+    fn may_perform_edits(&self) -> bool {
+        false
+    }
+
    fn description(&self) -> String {
        include_str!("./terminal_tool/description.md").to_string()
    }
@@ -254,22 +261,24 @@ impl Tool for TerminalTool {

                let terminal_view = window.update(cx, |_, window, cx| {
                    cx.new(|cx| {
-                        TerminalView::new(
+                        let mut view = TerminalView::new(
                            terminal.clone(),
                            workspace.downgrade(),
                            None,
                            project.downgrade(),
-                            true,
                            window,
                            cx,
-                        )
+                        );
+                        view.set_embedded_mode(None, cx);
+                        view
                    })
                })?;

-                let _ = card.update(cx, |card, _| {
+                card.update(cx, |card, _| {
                    card.terminal = Some(terminal_view.clone());
                    card.start_instant = Instant::now();
-                });
+                })
+                .log_err();

                let exit_status = terminal
                    .update(cx, |terminal, cx| terminal.wait_for_completed_task(cx))?
@@ -285,7 +294,7 @@ impl Tool for TerminalTool {
                    exit_status.map(portable_pty::ExitStatus::from),
                );

-                let _ = card.update(cx, |card, _| {
+                card.update(cx, |card, _| {
                    card.command_finished = true;
                    card.exit_status = exit_status;
                    card.was_content_truncated = processed_content.len() < previous_len;
@@ -293,7 +302,8 @@ impl Tool for TerminalTool {
                    card.content_line_count = content_line_count;
                    card.finished_with_empty_output = finished_with_empty_output;
                    card.elapsed_time = Some(card.start_instant.elapsed());
-                });
+                })
+                .log_err();

                Ok(processed_content.into())
            }
@@ -473,7 +483,6 @@ impl ToolCard for TerminalToolCard {
        let time_elapsed = self
            .elapsed_time
            .unwrap_or_else(|| self.start_instant.elapsed());
-        let should_hide_terminal = tool_failed || self.finished_with_empty_output;

        let header_bg = cx
            .theme()
@@ -574,7 +583,7 @@ impl ToolCard for TerminalToolCard {
                        ),
                )
            })
-            .when(!should_hide_terminal, |header| {
+            .when(!self.finished_with_empty_output, |header| {
                header.child(
                    Disclosure::new(
                        ("terminal-tool-disclosure", self.entity_id),
@@ -618,19 +627,43 @@ impl ToolCard for TerminalToolCard {
                        ),
                    ),
            )
-            .when(self.preview_expanded && !should_hide_terminal, |this| {
-                this.child(
-                    div()
-                        .pt_2()
-                        .min_h_72()
-                        .border_t_1()
-                        .border_color(border_color)
-                        .bg(cx.theme().colors().editor_background)
-                        .rounded_b_md()
-                        .text_ui_sm(cx)
-                        .child(terminal.clone()),
-                )
-            })
+            .when(
+                self.preview_expanded && !self.finished_with_empty_output,
+                |this| {
+                    this.child(
+                        div()
+                            .pt_2()
+                            .border_t_1()
+                            .border_color(border_color)
+                            .bg(cx.theme().colors().editor_background)
+                            .rounded_b_md()
+                            .text_ui_sm(cx)
+                            .child(
+                                ToolOutputPreview::new(
+                                    terminal.clone().into_any_element(),
+                                    terminal.entity_id(),
+                                )
+                                .with_total_lines(self.content_line_count)
+                                .toggle_state(!terminal.read(cx).is_content_limited(window))
+                                .on_toggle({
+                                    let terminal = terminal.clone();
+                                    move |is_expanded, _, cx| {
+                                        terminal.update(cx, |terminal, cx| {
+                                            terminal.set_embedded_mode(
+                                                if is_expanded {
+                                                    None
+                                                } else {
+                                                    Some(COLLAPSED_LINES)
+                                                },
+                                                cx,
+                                            );
+                                        });
+                                    }
+                                }),
+                            ),
+                    )
+                },
+            )
            .into_any()
    }
 }
--- a/crates/assistant_tools/src/thinking_tool.rs
+++ b/crates/assistant_tools/src/thinking_tool.rs
@@ -28,6 +28,10 @@ impl Tool for ThinkingTool {
        false
    }

+    fn may_perform_edits(&self) -> bool {
+        false
+    }
+
    fn description(&self) -> String {
        include_str!("./thinking_tool/description.md").to_string()
    }
--- a/crates/assistant_tools/src/ui.rs
+++ b/crates/assistant_tools/src/ui.rs
@@ -1,3 +1,5 @@
 mod tool_call_card_header;
+mod tool_output_preview;

 pub use tool_call_card_header::*;
+pub use tool_output_preview::*;
--- a/crates/assistant_tools/src/ui/tool_output_preview.rs
+++ b/crates/assistant_tools/src/ui/tool_output_preview.rs
@@ -0,0 +1,115 @@
+use gpui::{AnyElement, EntityId, prelude::*};
+use ui::{Tooltip, prelude::*};
+
+#[derive(IntoElement)]
+pub struct ToolOutputPreview<F>
+where
+    F: Fn(bool, &mut Window, &mut App) + 'static,
+{
+    content: AnyElement,
+    entity_id: EntityId,
+    full_height: bool,
+    total_lines: usize,
+    collapsed_fade: bool,
+    on_toggle: Option<F>,
+}
+
+pub const COLLAPSED_LINES: usize = 10;
+
+impl<F> ToolOutputPreview<F>
+where
+    F: Fn(bool, &mut Window, &mut App) + 'static,
+{
+    pub fn new(content: AnyElement, entity_id: EntityId) -> Self {
+        Self {
+            content,
+            entity_id,
+            full_height: true,
+            total_lines: 0,
+            collapsed_fade: false,
+            on_toggle: None,
+        }
+    }
+
+    pub fn with_total_lines(mut self, total_lines: usize) -> Self {
+        self.total_lines = total_lines;
+        self
+    }
+
+    pub fn toggle_state(mut self, full_height: bool) -> Self {
+        self.full_height = full_height;
+        self
+    }
+
+    pub fn with_collapsed_fade(mut self) -> Self {
+        self.collapsed_fade = true;
+        self
+    }
+
+    pub fn on_toggle(mut self, listener: F) -> Self {
+        self.on_toggle = Some(listener);
+        self
+    }
+}
+
+impl<F> RenderOnce for ToolOutputPreview<F>
+where
+    F: Fn(bool, &mut Window, &mut App) + 'static,
+{
+    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
+        if self.total_lines <= COLLAPSED_LINES {
+            return self.content;
+        }
+        let border_color = cx.theme().colors().border.opacity(0.6);
+
+        let (icon, tooltip_label) = if self.full_height {
+            (IconName::ChevronUp, "Collapse")
+        } else {
+            (IconName::ChevronDown, "Expand")
+        };
+
+        let gradient_overlay =
+            if self.collapsed_fade && !self.full_height {
+                Some(div().absolute().bottom_5().left_0().w_full().h_2_5().bg(
+                    gpui::linear_gradient(
+                        0.,
+                        gpui::linear_color_stop(cx.theme().colors().editor_background, 0.),
+                        gpui::linear_color_stop(
+                            cx.theme().colors().editor_background.opacity(0.),
+                            1.,
+                        ),
+                    ),
+                ))
+            } else {
+                None
+            };
+
+        v_flex()
+            .relative()
+            .child(self.content)
+            .children(gradient_overlay)
+            .child(
+                h_flex()
+                    .id(("expand-button", self.entity_id))
+                    .flex_none()
+                    .cursor_pointer()
+                    .h_5()
+                    .justify_center()
+                    .border_t_1()
+                    .rounded_b_md()
+                    .border_color(border_color)
+                    .bg(cx.theme().colors().editor_background)
+                    .hover(|style| style.bg(cx.theme().colors().element_hover.opacity(0.1)))
+                    .child(Icon::new(icon).size(IconSize::Small).color(Color::Muted))
+                    .tooltip(Tooltip::text(tooltip_label))
+                    .when_some(self.on_toggle, |this, on_toggle| {
+                        this.on_click({
+                            move |_, window, cx| {
+                                on_toggle(!self.full_height, window, cx);
+                            }
+                        })
+                    }),
+            )
+            .into_any()
+    }
+}
--- a/crates/assistant_tools/src/web_search_tool.rs
+++ b/crates/assistant_tools/src/web_search_tool.rs
@@ -36,6 +36,10 @@ impl Tool for WebSearchTool {
        false
    }

+    fn may_perform_edits(&self) -> bool {
+        false
+    }
+
    fn description(&self) -> String {
        "Search the web for information using your query. Use this when you need real-time information, facts, or data that might not be in your training. Results will include snippets and links from relevant web pages.".into()
    }
--- a/crates/bedrock/src/models.rs
+++ b/crates/bedrock/src/models.rs
@@ -77,10 +77,16 @@ pub enum Model {
    MetaLlama318BInstructV1,
    MetaLlama3170BInstructV1_128k,
    MetaLlama3170BInstructV1,
-    MetaLlama3211BInstructV1,
-    MetaLlama3290BInstructV1,
+    MetaLlama31405BInstructV1,
    MetaLlama321BInstructV1,
    MetaLlama323BInstructV1,
+    MetaLlama3211BInstructV1,
+    MetaLlama3290BInstructV1,
+    MetaLlama3370BInstructV1,
+    #[allow(non_camel_case_types)]
+    MetaLlama4Scout17BInstructV1,
+    #[allow(non_camel_case_types)]
+    MetaLlama4Maverick17BInstructV1,
    // Mistral models
    MistralMistral7BInstructV0,
    MistralMixtral8x7BInstructV0,
@@ -125,6 +131,64 @@ impl Model {
    }

    pub fn id(&self) -> &str {
+        match self {
+            Model::ClaudeSonnet4 => "claude-4-sonnet",
+            Model::ClaudeSonnet4Thinking => "claude-4-sonnet-thinking",
+            Model::ClaudeOpus4 => "claude-4-opus",
+            Model::ClaudeOpus4Thinking => "claude-4-opus-thinking",
+            Model::Claude3_5SonnetV2 => "claude-3-5-sonnet-v2",
+            Model::Claude3_5Sonnet => "claude-3-5-sonnet",
+            Model::Claude3Opus => "claude-3-opus",
+            Model::Claude3Sonnet => "claude-3-sonnet",
+            Model::Claude3Haiku => "claude-3-haiku",
+            Model::Claude3_5Haiku => "claude-3-5-haiku",
+            Model::Claude3_7Sonnet => "claude-3-7-sonnet",
+            Model::Claude3_7SonnetThinking => "claude-3-7-sonnet-thinking",
+            Model::AmazonNovaLite => "amazon-nova-lite",
+            Model::AmazonNovaMicro => "amazon-nova-micro",
+            Model::AmazonNovaPro => "amazon-nova-pro",
+            Model::AmazonNovaPremier => "amazon-nova-premier",
+            Model::DeepSeekR1 => "deepseek-r1",
+            Model::AI21J2GrandeInstruct => "ai21-j2-grande-instruct",
+            Model::AI21J2JumboInstruct => "ai21-j2-jumbo-instruct",
+            Model::AI21J2Mid => "ai21-j2-mid",
+            Model::AI21J2MidV1 => "ai21-j2-mid-v1",
+            Model::AI21J2Ultra => "ai21-j2-ultra",
+            Model::AI21J2UltraV1_8k => "ai21-j2-ultra-v1-8k",
+            Model::AI21J2UltraV1 => "ai21-j2-ultra-v1",
+            Model::AI21JambaInstructV1 => "ai21-jamba-instruct-v1",
+            Model::AI21Jamba15LargeV1 => "ai21-jamba-1-5-large-v1",
+            Model::AI21Jamba15MiniV1 => "ai21-jamba-1-5-mini-v1",
+            Model::CohereCommandTextV14_4k => "cohere-command-text-v14-4k",
+            Model::CohereCommandRV1 => "cohere-command-r-v1",
+            Model::CohereCommandRPlusV1 => "cohere-command-r-plus-v1",
+            Model::CohereCommandLightTextV14_4k => "cohere-command-light-text-v14-4k",
+            Model::MetaLlama38BInstructV1 => "meta-llama3-8b-instruct-v1",
+            Model::MetaLlama370BInstructV1 => "meta-llama3-70b-instruct-v1",
+            Model::MetaLlama318BInstructV1_128k => "meta-llama3-1-8b-instruct-v1-128k",
+            Model::MetaLlama318BInstructV1 => "meta-llama3-1-8b-instruct-v1",
+            Model::MetaLlama3170BInstructV1_128k => "meta-llama3-1-70b-instruct-v1-128k",
+            Model::MetaLlama3170BInstructV1 => "meta-llama3-1-70b-instruct-v1",
+            Model::MetaLlama31405BInstructV1 => "meta-llama3-1-405b-instruct-v1",
+            Model::MetaLlama321BInstructV1 => "meta-llama3-2-1b-instruct-v1",
+            Model::MetaLlama323BInstructV1 => "meta-llama3-2-3b-instruct-v1",
+            Model::MetaLlama3211BInstructV1 => "meta-llama3-2-11b-instruct-v1",
+            Model::MetaLlama3290BInstructV1 => "meta-llama3-2-90b-instruct-v1",
+            Model::MetaLlama3370BInstructV1 => "meta-llama3-3-70b-instruct-v1",
+            Model::MetaLlama4Scout17BInstructV1 => "meta-llama4-scout-17b-instruct-v1",
+            Model::MetaLlama4Maverick17BInstructV1 => "meta-llama4-maverick-17b-instruct-v1",
+            Model::MistralMistral7BInstructV0 => "mistral-7b-instruct-v0",
+            Model::MistralMixtral8x7BInstructV0 => "mistral-mixtral-8x7b-instruct-v0",
+            Model::MistralMistralLarge2402V1 => "mistral-large-2402-v1",
+            Model::MistralMistralSmall2402V1 => "mistral-small-2402-v1",
+            Model::MistralPixtralLarge2502V1 => "mistral-pixtral-large-2502-v1",
+            Model::PalmyraWriterX4 => "palmyra-writer-x4",
+            Model::PalmyraWriterX5 => "palmyra-writer-x5",
+            Self::Custom { name, .. } => name,
+        }
+    }
+
+    pub fn request_id(&self) -> &str {
        match self {
            Model::ClaudeSonnet4 | Model::ClaudeSonnet4Thinking => {
                "anthropic.claude-sonnet-4-20250514-v1:0"
@@ -145,7 +209,7 @@ impl Model {
            Model::AmazonNovaMicro => "amazon.nova-micro-v1:0",
            Model::AmazonNovaPro => "amazon.nova-pro-v1:0",
            Model::AmazonNovaPremier => "amazon.nova-premier-v1:0",
-            Model::DeepSeekR1 => "us.deepseek.r1-v1:0",
+            Model::DeepSeekR1 => "deepseek.r1-v1:0",
            Model::AI21J2GrandeInstruct => "ai21.j2-grande-instruct",
            Model::AI21J2JumboInstruct => "ai21.j2-jumbo-instruct",
            Model::AI21J2Mid => "ai21.j2-mid",
@@ -162,14 +226,18 @@ impl Model {
            Model::CohereCommandLightTextV14_4k => "cohere.command-light-text-v14:7:4k",
            Model::MetaLlama38BInstructV1 => "meta.llama3-8b-instruct-v1:0",
            Model::MetaLlama370BInstructV1 => "meta.llama3-70b-instruct-v1:0",
-            Model::MetaLlama318BInstructV1_128k => "meta.llama3-1-8b-instruct-v1:0:128k",
+            Model::MetaLlama318BInstructV1_128k => "meta.llama3-1-8b-instruct-v1:0",
            Model::MetaLlama318BInstructV1 => "meta.llama3-1-8b-instruct-v1:0",
-            Model::MetaLlama3170BInstructV1_128k => "meta.llama3-1-70b-instruct-v1:0:128k",
+            Model::MetaLlama3170BInstructV1_128k => "meta.llama3-1-70b-instruct-v1:0",
            Model::MetaLlama3170BInstructV1 => "meta.llama3-1-70b-instruct-v1:0",
+            Model::MetaLlama31405BInstructV1 => "meta.llama3-1-405b-instruct-v1:0",
            Model::MetaLlama3211BInstructV1 => "meta.llama3-2-11b-instruct-v1:0",
            Model::MetaLlama3290BInstructV1 => "meta.llama3-2-90b-instruct-v1:0",
            Model::MetaLlama321BInstructV1 => "meta.llama3-2-1b-instruct-v1:0",
            Model::MetaLlama323BInstructV1 => "meta.llama3-2-3b-instruct-v1:0",
+            Model::MetaLlama3370BInstructV1 => "meta.llama3-3-70b-instruct-v1:0",
+            Model::MetaLlama4Scout17BInstructV1 => "meta.llama4-scout-17b-instruct-v1:0",
+            Model::MetaLlama4Maverick17BInstructV1 => "meta.llama4-maverick-17b-instruct-v1:0",
            Model::MistralMistral7BInstructV0 => "mistral.mistral-7b-instruct-v0:2",
            Model::MistralMixtral8x7BInstructV0 => "mistral.mixtral-8x7b-instruct-v0:1",
            Model::MistralMistralLarge2402V1 => "mistral.mistral-large-2402-v1:0",
@@ -214,16 +282,20 @@ impl Model {
            Self::CohereCommandRV1 => "Cohere Command R V1",
            Self::CohereCommandRPlusV1 => "Cohere Command R Plus V1",
            Self::CohereCommandLightTextV14_4k => "Cohere Command Light Text V14 4K",
-            Self::MetaLlama38BInstructV1 => "Meta Llama 3 8B Instruct V1",
-            Self::MetaLlama370BInstructV1 => "Meta Llama 3 70B Instruct V1",
-            Self::MetaLlama318BInstructV1_128k => "Meta Llama 3 1.8B Instruct V1 128K",
-            Self::MetaLlama318BInstructV1 => "Meta Llama 3 1.8B Instruct V1",
-            Self::MetaLlama3170BInstructV1_128k => "Meta Llama 3 1 70B Instruct V1 128K",
-            Self::MetaLlama3170BInstructV1 => "Meta Llama 3 1 70B Instruct V1",
-            Self::MetaLlama3211BInstructV1 => "Meta Llama 3 2 11B Instruct V1",
-            Self::MetaLlama3290BInstructV1 => "Meta Llama 3 2 90B Instruct V1",
-            Self::MetaLlama321BInstructV1 => "Meta Llama 3 2 1B Instruct V1",
-            Self::MetaLlama323BInstructV1 => "Meta Llama 3 2 3B Instruct V1",
+            Self::MetaLlama38BInstructV1 => "Meta Llama 3 8B Instruct",
+            Self::MetaLlama370BInstructV1 => "Meta Llama 3 70B Instruct",
+            Self::MetaLlama318BInstructV1_128k => "Meta Llama 3.1 8B Instruct 128K",
+            Self::MetaLlama318BInstructV1 => "Meta Llama 3.1 8B Instruct",
+            Self::MetaLlama3170BInstructV1_128k => "Meta Llama 3.1 70B Instruct 128K",
+            Self::MetaLlama3170BInstructV1 => "Meta Llama 3.1 70B Instruct",
+            Self::MetaLlama31405BInstructV1 => "Meta Llama 3.1 405B Instruct",
+            Self::MetaLlama3211BInstructV1 => "Meta Llama 3.2 11B Instruct",
+            Self::MetaLlama3290BInstructV1 => "Meta Llama 3.2 90B Instruct",
+            Self::MetaLlama321BInstructV1 => "Meta Llama 3.2 1B Instruct",
+            Self::MetaLlama323BInstructV1 => "Meta Llama 3.2 3B Instruct",
+            Self::MetaLlama3370BInstructV1 => "Meta Llama 3.3 70B Instruct",
+            Self::MetaLlama4Scout17BInstructV1 => "Meta Llama 4 Scout 17B Instruct",
+            Self::MetaLlama4Maverick17BInstructV1 => "Meta Llama 4 Maverick 17B Instruct",
            Self::MistralMistral7BInstructV0 => "Mistral 7B Instruct V0",
            Self::MistralMixtral8x7BInstructV0 => "Mistral Mixtral 8x7B Instruct V0",
            Self::MistralMistralLarge2402V1 => "Mistral Large 2402 V1",
@@ -245,7 +317,9 @@ impl Model {
            | Self::Claude3_5Haiku
            | Self::Claude3_7Sonnet
            | Self::ClaudeSonnet4
-            | Self::ClaudeOpus4 => 200_000,
+            | Self::ClaudeOpus4
+            | Self::ClaudeSonnet4Thinking
+            | Self::ClaudeOpus4Thinking => 200_000,
            Self::AmazonNovaPremier => 1_000_000,
            Self::PalmyraWriterX5 => 1_000_000,
            Self::PalmyraWriterX4 => 128_000,
@@ -354,69 +428,76 @@ impl Model {
            anyhow::bail!("Unsupported Region {region}");
        };

-        let model_id = self.id();
+        let model_id = self.request_id();

        match (self, region_group) {
            // Custom models can't have CRI IDs
-            (Model::Custom { .. }, _) => Ok(self.id().into()),
+            (Model::Custom { .. }, _) => Ok(self.request_id().into()),

            // Models with US Gov only
            (Model::Claude3_5Sonnet, "us-gov") | (Model::Claude3Haiku, "us-gov") => {
                Ok(format!("{}.{}", region_group, model_id))
            }

-            // Models available only in US
-            (Model::Claude3Opus, "us")
-            | (Model::Claude3_5Haiku, "us")
-            | (Model::Claude3_7Sonnet, "us")
-            | (Model::ClaudeSonnet4, "us")
-            | (Model::ClaudeOpus4, "us")
-            | (Model::ClaudeSonnet4Thinking, "us")
-            | (Model::ClaudeOpus4Thinking, "us")
-            | (Model::Claude3_7SonnetThinking, "us")
-            | (Model::AmazonNovaPremier, "us")
-            | (Model::MistralPixtralLarge2502V1, "us") => {
+            // Available everywhere
+            (Model::AmazonNovaLite | Model::AmazonNovaMicro | Model::AmazonNovaPro, _) => {
                Ok(format!("{}.{}", region_group, model_id))
            }

-            // Models available in US, EU, and APAC
-            (Model::Claude3_5SonnetV2, "us")
-            | (Model::Claude3_5SonnetV2, "apac")
-            | (Model::Claude3_5Sonnet, _)
-            | (Model::Claude3Haiku, _)
-            | (Model::Claude3Sonnet, _)
-            | (Model::AmazonNovaLite, _)
-            | (Model::AmazonNovaMicro, _)
-            | (Model::AmazonNovaPro, _) => Ok(format!("{}.{}", region_group, model_id)),
+            // Models in US
+            (
+                Model::AmazonNovaPremier
+                | Model::Claude3_5Haiku
+                | Model::Claude3_5Sonnet
+                | Model::Claude3_5SonnetV2
+                | Model::Claude3_7Sonnet
+                | Model::Claude3_7SonnetThinking
+                | Model::Claude3Haiku
+                | Model::Claude3Opus
+                | Model::Claude3Sonnet
+                | Model::DeepSeekR1
+                | Model::MetaLlama31405BInstructV1
+                | Model::MetaLlama3170BInstructV1_128k
+                | Model::MetaLlama3170BInstructV1
+                | Model::MetaLlama318BInstructV1_128k
+                | Model::MetaLlama318BInstructV1
+                | Model::MetaLlama3211BInstructV1
+                | Model::MetaLlama321BInstructV1
+                | Model::MetaLlama323BInstructV1
+                | Model::MetaLlama3290BInstructV1
+                | Model::MetaLlama3370BInstructV1
+                | Model::MetaLlama4Maverick17BInstructV1
+                | Model::MetaLlama4Scout17BInstructV1
+                | Model::MistralPixtralLarge2502V1
+                | Model::PalmyraWriterX4
+                | Model::PalmyraWriterX5,
+                "us",
+            ) => Ok(format!("{}.{}", region_group, model_id)),

-            // Models with limited EU availability
-            (Model::MetaLlama321BInstructV1, "us")
-            | (Model::MetaLlama321BInstructV1, "eu")
-            | (Model::MetaLlama323BInstructV1, "us")
-            | (Model::MetaLlama323BInstructV1, "eu") => {
-                Ok(format!("{}.{}", region_group, model_id))
-            }
+            // Models available in EU
+            (
+                Model::Claude3_5Sonnet
+                | Model::Claude3_7Sonnet
+                | Model::Claude3_7SonnetThinking
+                | Model::Claude3Haiku
+                | Model::Claude3Sonnet
+                | Model::MetaLlama321BInstructV1
+                | Model::MetaLlama323BInstructV1
+                | Model::MistralPixtralLarge2502V1,
+                "eu",
+            ) => Ok(format!("{}.{}", region_group, model_id)),

-            // US-only models (all remaining Meta models)
-            (Model::MetaLlama38BInstructV1, "us")
-            | (Model::MetaLlama370BInstructV1, "us")
-            | (Model::MetaLlama318BInstructV1, "us")
-            | (Model::MetaLlama318BInstructV1_128k, "us")
-            | (Model::MetaLlama3170BInstructV1, "us")
-            | (Model::MetaLlama3170BInstructV1_128k, "us")
-            | (Model::MetaLlama3211BInstructV1, "us")
-            | (Model::MetaLlama3290BInstructV1, "us") => {
-                Ok(format!("{}.{}", region_group, model_id))
-            }
-
-            // Writer models only available in the US
-            (Model::PalmyraWriterX4, "us") | (Model::PalmyraWriterX5, "us") => {
-                // They have some goofiness
-                Ok(format!("{}.{}", region_group, model_id))
-            }
+            // Models available in APAC
+            (
+                Model::Claude3_5Sonnet
+                | Model::Claude3_5SonnetV2
+                | Model::Claude3Haiku
+                | Model::Claude3Sonnet,
+                "apac",
+            ) => Ok(format!("{}.{}", region_group, model_id)),

            // Any other combination is not supported
-            _ => Ok(self.id().into()),
+            _ => Ok(self.request_id().into()),
        }
    }
 }
@@ -464,6 +545,10 @@ mod tests {
            Model::Claude3_5SonnetV2.cross_region_inference_id("ap-northeast-1")?,
            "apac.anthropic.claude-3-5-sonnet-20241022-v2:0"
        );
+        assert_eq!(
+            Model::Claude3_5SonnetV2.cross_region_inference_id("ap-southeast-2")?,
+            "apac.anthropic.claude-3-5-sonnet-20241022-v2:0"
+        );
        assert_eq!(
            Model::AmazonNovaLite.cross_region_inference_id("ap-south-1")?,
            "apac.amazon.nova-lite-v1:0"
@@ -490,7 +575,11 @@ mod tests {
        // Test Meta models
        assert_eq!(
            Model::MetaLlama370BInstructV1.cross_region_inference_id("us-east-1")?,
-            "us.meta.llama3-70b-instruct-v1:0"
+            "meta.llama3-70b-instruct-v1:0"
+        );
+        assert_eq!(
+            Model::MetaLlama3170BInstructV1.cross_region_inference_id("us-east-1")?,
+            "us.meta.llama3-1-70b-instruct-v1:0"
        );
        assert_eq!(
            Model::MetaLlama321BInstructV1.cross_region_inference_id("eu-west-1")?,
@@ -563,4 +652,39 @@ mod tests {

        Ok(())
    }
+
+    #[test]
+    fn test_friendly_id_vs_request_id() {
+        // Test that id() returns friendly identifiers
+        assert_eq!(Model::Claude3_5SonnetV2.id(), "claude-3-5-sonnet-v2");
+        assert_eq!(Model::AmazonNovaLite.id(), "amazon-nova-lite");
+        assert_eq!(Model::DeepSeekR1.id(), "deepseek-r1");
+        assert_eq!(
+            Model::MetaLlama38BInstructV1.id(),
+            "meta-llama3-8b-instruct-v1"
+        );
+
+        // Test that request_id() returns actual backend model IDs
+        assert_eq!(
+            Model::Claude3_5SonnetV2.request_id(),
+            "anthropic.claude-3-5-sonnet-20241022-v2:0"
+        );
+        assert_eq!(Model::AmazonNovaLite.request_id(), "amazon.nova-lite-v1:0");
+        assert_eq!(Model::DeepSeekR1.request_id(), "deepseek.r1-v1:0");
+        assert_eq!(
+            Model::MetaLlama38BInstructV1.request_id(),
+            "meta.llama3-8b-instruct-v1:0"
+        );
+
+        // Test thinking models have different friendly IDs but same request IDs
+        assert_eq!(Model::ClaudeSonnet4.id(), "claude-4-sonnet");
+        assert_eq!(
+            Model::ClaudeSonnet4Thinking.id(),
+            "claude-4-sonnet-thinking"
+        );
+        assert_eq!(
+            Model::ClaudeSonnet4.request_id(),
+            Model::ClaudeSonnet4Thinking.request_id()
+        );
+    }
 }
--- a/crates/channel/src/channel_buffer.rs
+++ b/crates/channel/src/channel_buffer.rs
@@ -35,6 +35,7 @@ pub struct ChannelBuffer {
 pub enum ChannelBufferEvent {
    CollaboratorsChanged,
    Disconnected,
+    Connected,
    BufferEdited,
    ChannelChanged,
 }
@@ -103,6 +104,17 @@ impl ChannelBuffer {
        }
    }

+    pub fn connected(&mut self, cx: &mut Context<Self>) {
+        self.connected = true;
+        if self.subscription.is_none() {
+            let Ok(subscription) = self.client.subscribe_to_entity(self.channel_id.0) else {
+                return;
+            };
+            self.subscription = Some(subscription.set_entity(&cx.entity(), &mut cx.to_async()));
+            cx.emit(ChannelBufferEvent::Connected);
+        }
+    }
+
    pub fn remote_id(&self, cx: &App) -> BufferId {
        self.buffer.read(cx).remote_id()
    }
--- a/crates/channel/src/channel_store.rs
+++ b/crates/channel/src/channel_store.rs
@@ -56,7 +56,6 @@ pub struct Channel {
    pub name: SharedString,
    pub visibility: proto::ChannelVisibility,
    pub parent_path: Vec<ChannelId>,
-    pub channel_order: i32,
 }

 #[derive(Default, Debug)]
@@ -615,24 +614,7 @@ impl ChannelStore {
                    to: to.0,
                })
                .await?;
-            Ok(())
-        })
-    }

-    pub fn reorder_channel(
-        &mut self,
-        channel_id: ChannelId,
-        direction: proto::reorder_channel::Direction,
-        cx: &mut Context<Self>,
-    ) -> Task<Result<()>> {
-        let client = self.client.clone();
-        cx.spawn(async move |_, _| {
-            client
-                .request(proto::ReorderChannel {
-                    channel_id: channel_id.0,
-                    direction: direction.into(),
-                })
-                .await?;
            Ok(())
        })
    }
@@ -990,6 +972,7 @@ impl ChannelStore {
                                    .log_err();

                                if let Some(operations) = operations {
+                                    channel_buffer.connected(cx);
                                    let client = this.client.clone();
                                    cx.background_spawn(async move {
                                        let operations = operations.await;
@@ -1030,8 +1013,8 @@ impl ChannelStore {

                if let Some(this) = this.upgrade() {
                    this.update(cx, |this, cx| {
-                        for (_, buffer) in this.opened_buffers.drain() {
-                            if let OpenEntityHandle::Open(buffer) = buffer {
+                        for (_, buffer) in &this.opened_buffers {
+                            if let OpenEntityHandle::Open(buffer) = &buffer {
                                if let Some(buffer) = buffer.upgrade() {
                                    buffer.update(cx, |buffer, cx| buffer.disconnect(cx));
                                }
@@ -1068,7 +1051,6 @@ impl ChannelStore {
                        visibility: channel.visibility(),
                        name: channel.name.into(),
                        parent_path: channel.parent_path.into_iter().map(ChannelId).collect(),
-                        channel_order: channel.channel_order,
                    }),
                ),
            }
--- a/crates/channel/src/channel_store/channel_index.rs
+++ b/crates/channel/src/channel_store/channel_index.rs
@@ -61,13 +61,11 @@ impl ChannelPathsInsertGuard<'_> {

            ret = existing_channel.visibility != channel_proto.visibility()
                || existing_channel.name != channel_proto.name
-                || existing_channel.parent_path != parent_path
-                || existing_channel.channel_order != channel_proto.channel_order;
+                || existing_channel.parent_path != parent_path;

            existing_channel.visibility = channel_proto.visibility();
            existing_channel.name = channel_proto.name.into();
            existing_channel.parent_path = parent_path;
-            existing_channel.channel_order = channel_proto.channel_order;
        } else {
            self.channels_by_id.insert(
                ChannelId(channel_proto.id),
@@ -76,7 +74,6 @@ impl ChannelPathsInsertGuard<'_> {
                    visibility: channel_proto.visibility(),
                    name: channel_proto.name.into(),
                    parent_path,
-                    channel_order: channel_proto.channel_order,
                }),
            );
            self.insert_root(ChannelId(channel_proto.id));
@@ -103,18 +100,17 @@ impl Drop for ChannelPathsInsertGuard<'_> {
 fn channel_path_sorting_key(
    id: ChannelId,
    channels_by_id: &BTreeMap<ChannelId, Arc<Channel>>,
-) -> impl Iterator<Item = (i32, ChannelId)> {
-    let (parent_path, order_and_id) =
-        channels_by_id
-            .get(&id)
-            .map_or((&[] as &[_], None), |channel| {
-                (
-                    channel.parent_path.as_slice(),
-                    Some((channel.channel_order, channel.id)),
-                )
-            });
+) -> impl Iterator<Item = (&str, ChannelId)> {
+    let (parent_path, name) = channels_by_id
+        .get(&id)
+        .map_or((&[] as &[_], None), |channel| {
+            (
+                channel.parent_path.as_slice(),
+                Some((channel.name.as_ref(), channel.id)),
+            )
+        });
    parent_path
        .iter()
-        .filter_map(|id| Some((channels_by_id.get(id)?.channel_order, *id)))
-        .chain(order_and_id)
+        .filter_map(|id| Some((channels_by_id.get(id)?.name.as_ref(), *id)))
+        .chain(name)
 }
--- a/crates/channel/src/channel_store_tests.rs
+++ b/crates/channel/src/channel_store_tests.rs
@@ -21,14 +21,12 @@ fn test_update_channels(cx: &mut App) {
                    name: "b".to_string(),
                    visibility: proto::ChannelVisibility::Members as i32,
                    parent_path: Vec::new(),
-                    channel_order: 1,
                },
                proto::Channel {
                    id: 2,
                    name: "a".to_string(),
                    visibility: proto::ChannelVisibility::Members as i32,
                    parent_path: Vec::new(),
-                    channel_order: 2,
                },
            ],
            ..Default::default()
@@ -39,8 +37,8 @@ fn test_update_channels(cx: &mut App) {
        &channel_store,
        &[
            //
-            (0, "b".to_string()),
            (0, "a".to_string()),
+            (0, "b".to_string()),
        ],
        cx,
    );
@@ -54,14 +52,12 @@ fn test_update_channels(cx: &mut App) {
                    name: "x".to_string(),
                    visibility: proto::ChannelVisibility::Members as i32,
                    parent_path: vec![1],
-                    channel_order: 1,
                },
                proto::Channel {
                    id: 4,
                    name: "y".to_string(),
                    visibility: proto::ChannelVisibility::Members as i32,
                    parent_path: vec![2],
-                    channel_order: 1,
                },
            ],
            ..Default::default()
@@ -71,10 +67,10 @@ fn test_update_channels(cx: &mut App) {
    assert_channels(
        &channel_store,
        &[
-            (0, "b".to_string()),
-            (1, "x".to_string()),
            (0, "a".to_string()),
            (1, "y".to_string()),
+            (0, "b".to_string()),
+            (1, "x".to_string()),
        ],
        cx,
    );
@@ -93,21 +89,18 @@ fn test_dangling_channel_paths(cx: &mut App) {
                    name: "a".to_string(),
                    visibility: proto::ChannelVisibility::Members as i32,
                    parent_path: vec![],
-                    channel_order: 1,
                },
                proto::Channel {
                    id: 1,
                    name: "b".to_string(),
                    visibility: proto::ChannelVisibility::Members as i32,
                    parent_path: vec![0],
-                    channel_order: 1,
                },
                proto::Channel {
                    id: 2,
                    name: "c".to_string(),
                    visibility: proto::ChannelVisibility::Members as i32,
                    parent_path: vec![0, 1],
-                    channel_order: 1,
                },
            ],
            ..Default::default()
@@ -154,7 +147,6 @@ async fn test_channel_messages(cx: &mut TestAppContext) {
            name: "the-channel".to_string(),
            visibility: proto::ChannelVisibility::Members as i32,
            parent_path: vec![],
-            channel_order: 1,
        }],
        ..Default::default()
    });
--- a/crates/channel_tools/Cargo.toml
+++ b/crates/channel_tools/Cargo.toml
@@ -1,51 +0,0 @@
-[package]
-name = "channel_tools"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/channel_tools.rs"
-
-[dependencies]
-anyhow.workspace = true
-assistant_tool.workspace = true
-assistant_tools.workspace = true
-channel.workspace = true
-client.workspace = true
-collections.workspace = true
-editor.workspace = true
-futures.workspace = true
-gpui.workspace = true
-icons.workspace = true
-language_model.workspace = true
-log.workspace = true
-project.workspace = true
-rpc.workspace = true
-schemars.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-text.workspace = true
-util.workspace = true
-workspace.workspace = true
-
-[dev-dependencies]
-channel = { workspace = true, features = ["test-support"] }
-client = { workspace = true, features = ["test-support"] }
-clock = { workspace = true, features = ["test-support"] }
-fs = { workspace = true, features = ["test-support"] }
-gpui = { workspace = true, features = ["test-support"] }
-http_client = { workspace = true, features = ["test-support"] }
-language = { workspace = true, features = ["test-support"] }
-language_model = { workspace = true, features = ["test-support"] }
-node_runtime = { workspace = true, features = ["test-support"] }
-project = { workspace = true, features = ["test-support"] }
-release_channel.workspace = true
-rpc = { workspace = true, features = ["test-support"] }
-settings = { workspace = true, features = ["test-support"] }
-tempfile.workspace = true
-workspace = { workspace = true, features = ["test-support"] }
--- a/crates/channel_tools/MIGRATION.md
+++ b/crates/channel_tools/MIGRATION.md
@@ -1,62 +0,0 @@
-# Channel Tools Migration
-
-## Overview
-
-This document describes the migration of channel tools from the `assistant_tools` crate to a separate `channel_tools` crate to resolve initialization order issues.
-
-## Problem
-
-The channel tools were originally part of the `assistant_tools` crate, but this created an initialization order problem:
- `assistant_tools::init()` was called before `channel::init()` in `main.rs`
- Channel tools require `ChannelStore::global()` to be available
- Attempting to access the global channel store before initialization caused a panic
-
-## Solution
-
-Created a separate `channel_tools` crate that is initialized after the channel system is ready.
-
-### Changes Made
-
-1. **Created new `channel_tools` crate** (`crates/channel_tools/`)
-   - Moved all channel tool implementations from `assistant_tools`
-   - Added proper dependencies in `Cargo.toml`
-   - Maintained the same public API
-
-2. **Updated `assistant_tools` crate**
-   - Removed channel tools module
-   - Removed channel dependency
-   - Removed commented-out initialization code
-
-3. **Updated `zed` main crate**
-   - Added `channel_tools` dependency
-   - Added `channel_tools::init()` call after `channel::init()`
-   - Passes the global `ChannelStore` explicitly to channel tools
-
-4. **Updated workspace configuration**
-   - Added `channel_tools` to workspace members
-   - Added `channel_tools` to workspace dependencies
-
-## Benefits
-
-1. **Clean separation of concerns**: Channel-specific tools are now in their own crate
-2. **Proper initialization order**: Channel tools are initialized only after the channel system is ready
-3. **No runtime panics**: The explicit dependency on `ChannelStore` is satisfied
-4. **Maintainability**: Future channel-related tools can be added to this dedicated crate
-
-## Usage
-
-The channel tools are now initialized in `main.rs` after the channel system:
-
-```rust
-channel::init(&app_state.client.clone(), app_state.user_store.clone(), cx);
-channel_tools::init(channel::ChannelStore::global(cx), cx);
-```
-
-The tools remain available through the global `ToolRegistry` just as before, so no changes are needed in code that uses these tools.
-
-## Tools Included
-
- `CreateChannelTool`: Creates new channels
- `MoveChannelTool`: Moves channels to different parents
- `ReorderChannelTool`: Changes channel order within a parent
- `EditChannelNotesTool`: Edits channel notes collaboratively
--- a/crates/channel_tools/README.md
+++ b/crates/channel_tools/README.md
@@ -1,169 +0,0 @@
-# Channel Tools for AI Agents
-
-This module provides AI agent tools for interacting with Zed's channel system. These tools enable agents to manage channels programmatically, including creating channels, organizing them, and editing channel notes collaboratively.
-
-## Overview
-
-The channel tools allow AI agents to:
- Create new channels and subchannels
- Move channels to different parent channels
- Reorder channels within their parent
- Edit channel notes using collaborative editing
-
-## Tools
-
-### CreateChannelTool
-
-Creates a new channel in the workspace.
-
-**Input Schema:**
-```json
-{
-  "name": "channel-name",
-  "parent": "parent-channel-name",  // optional
-  "visibility": "members"  // or "public"
-}
-```
-
-**Features:**
- Creates root channels when no parent is specified
- Supports creating subchannels under existing channels
- Allows setting channel visibility (members-only or public)
- Does not require user confirmation
-
-### MoveChannelTool
-
-Moves a channel to a different parent channel.
-
-**Input Schema:**
-```json
-{
-  "channel": "channel-to-move",
-  "to": "new-parent-channel"  // or null for root
-}
-```
-
-**Features:**
- Moves channels between different parents
- Currently does not support moving channels to root (limitation)
- Validates against circular dependencies (can't move to descendants)
- Requires user confirmation before executing
-
-### ReorderChannelTool
-
-Changes the order of a channel among its siblings.
-
-**Input Schema:**
-```json
-{
-  "channel": "channel-name",
-  "direction": "up"  // or "down"
-}
-```
-
-**Features:**
- Moves channels up or down within their sibling list
- Uses the native channel reordering API
- Does not require user confirmation
-
-### EditChannelNotesTool
-
-Edits channel notes using collaborative editing to avoid conflicts.
-
-**Input Schema:**
-```json
-{
-  "channel": "channel-name",
-  "edits": [
-    {
-      "kind": "create",  // or "edit" or "append"
-      "content": "Note content",
-      "range": {  // optional, for "edit" kind
-        "start_line": 0,
-        "start_column": 0,
-        "end_line": 10,
-        "end_column": 0
-      }
-    }
-  ]
-}
-```
-
-**Features:**
- Supports creating new notes, editing existing content, or appending
- Uses collaborative editing through channel buffers
- Automatically handles buffer synchronization
- Supports multiple edits in a single operation
- Does not require user confirmation
-
-## Collaborative Editing
-
-The EditChannelNotesTool uses Zed's collaborative editing infrastructure:
-
-1. Opens a channel buffer (same as when users edit notes)
-2. Applies edits through the buffer's collaborative editing system
-3. Acknowledges buffer versions to ensure synchronization
-4. Avoids conflicts with other users editing simultaneously
-
-This approach ensures that agent edits integrate seamlessly with human edits and maintain consistency across all connected clients.
-
-## Implementation Details
-
-### Architecture
- Tools implement the `Tool` trait from the assistant_tool crate
- Each tool maintains a reference to the global ChannelStore
- Operations are performed asynchronously using GPUI's task system
- Channel lookups are done by name for user-friendliness
-
-### Error Handling
- Invalid channel names result in descriptive error messages
- Network failures are propagated as errors
- Validation prevents invalid operations (e.g., circular moves)
-
-### Testing
-All tools have comprehensive test coverage including:
- Schema validation
- UI text generation
- Confirmation requirements
- Basic operation validation
-
-## Limitations
-
-1. **Moving to Root**: The MoveChannelTool cannot currently move channels to the root level due to API limitations
-2. **Channel Deletion**: No tool for deleting channels (intentional safety measure)
-3. **Permissions**: Tools operate with the current user's permissions
-4. **Name Conflicts**: No automatic handling of duplicate channel names
-
-## Usage Example
-
-An agent might use these tools in sequence to organize a project:
-
-```
-1. Create main channels:
-   - "frontend" (public)
-   - "backend" (members)
-   - "docs" (public)
-
-2. Create subchannels:
-   - "frontend/components"
-   - "frontend/styles"
-   - "backend/api"
-   - "backend/database"
-
-3. Edit channel notes:
-   - Add README content to each channel
-   - Include guidelines and links
-
-4. Reorder for clarity:
-   - Move "docs" to the top
-   - Organize subchannels alphabetically
-```
-
-## Future Enhancements
-
-Potential improvements could include:
- Channel deletion tool (with strong safety measures)
- Bulk operations for efficiency
- Channel templates for common structures
- Integration with channel permissions/roles
- Search functionality for finding channels
--- a/crates/channel_tools/src/channel_tools.rs
+++ b/crates/channel_tools/src/channel_tools.rs
@@ -1,65 +0,0 @@
-mod create_channel_tool;
-mod edit_channel_notes_tool;
-mod list_channels_tool;
-mod move_channel_tool;
-mod reorder_channel_tool;
-mod schema;
-mod streaming_edit_channel_notes_tool;
-
-#[cfg(test)]
-mod channel_tools_tests;
-
-pub use create_channel_tool::CreateChannelTool;
-pub use edit_channel_notes_tool::EditChannelNotesTool;
-pub use list_channels_tool::ListChannelsTool;
-pub use move_channel_tool::MoveChannelTool;
-pub use reorder_channel_tool::ReorderChannelTool;
-pub use streaming_edit_channel_notes_tool::StreamingEditChannelNotesTool;
-
-use assistant_tool::ToolRegistry;
-use channel::{Channel, ChannelStore};
-use client::ChannelId;
-use gpui::{App, Entity};
-use std::sync::Arc;
-
-/// Initialize channel tools by registering them with the global ToolRegistry.
-/// This should be called after channel::init to ensure ChannelStore is available.
-pub fn init(channel_store: Entity<ChannelStore>, cx: &mut App) {
-    let registry = ToolRegistry::global(cx);
-    registry.register_tool(ListChannelsTool::new(channel_store.clone()));
-    registry.register_tool(CreateChannelTool::new(channel_store.clone()));
-    registry.register_tool(MoveChannelTool::new(channel_store.clone()));
-    registry.register_tool(ReorderChannelTool::new(channel_store.clone()));
-    registry.register_tool(EditChannelNotesTool::new(channel_store.clone()));
-    registry.register_tool(StreamingEditChannelNotesTool::new(channel_store));
-}
-
-/// Helper function to find a channel by name
-fn find_channel_by_name(
-    channel_store: &Entity<ChannelStore>,
-    name: &str,
-    cx: &App,
-) -> Option<(ChannelId, Arc<Channel>)> {
-    let store = channel_store.read(cx);
-    store
-        .channels()
-        .find(|channel| channel.name == name)
-        .map(|channel| (channel.id, channel.clone()))
-}
-
-/// Visibility options for channels
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum ChannelVisibility {
-    Members,
-    Public,
-}
-
-impl ChannelVisibility {
-    fn from_str(s: &str) -> Option<Self> {
-        match s.to_lowercase().as_str() {
-            "members" | "private" => Some(Self::Members),
-            "public" => Some(Self::Public),
-            _ => None,
-        }
-    }
-}
--- a/crates/channel_tools/src/channel_tools_tests.rs
+++ b/crates/channel_tools/src/channel_tools_tests.rs
@@ -1,335 +0,0 @@
-use crate::*;
-use assistant_tool::Tool;
-use client::{Client, UserStore};
-use gpui::{AppContext, TestAppContext};
-use project::Project;
-use serde_json::json;
-use std::sync::Arc;
-
-#[gpui::test]
-async fn test_create_channel_tool(cx: &mut TestAppContext) {
-    cx.update(|cx| {
-        let settings_store = settings::SettingsStore::test(cx);
-        cx.set_global(settings_store);
-        release_channel::init(gpui::SemanticVersion::default(), cx);
-        client::init_settings(cx);
-        Project::init_settings(cx);
-    });
-
-    // Create a minimal test setup without server
-    let http_client = http_client::FakeHttpClient::create(|_| async { unreachable!() });
-    let client = cx.update(|cx| {
-        Client::new(
-            Arc::new(clock::FakeSystemClock::new()),
-            http_client.clone(),
-            cx,
-        )
-    });
-
-    let user_store = cx.new(|cx| UserStore::new(client.clone(), cx));
-    cx.update(|cx| {
-        channel::init(&client, user_store.clone(), cx);
-    });
-    let channel_store = cx.update(|cx| channel::ChannelStore::global(cx));
-
-    let _project = cx.update(|cx| {
-        Project::local(
-            client.clone(),
-            node_runtime::NodeRuntime::unavailable(),
-            user_store.clone(),
-            Arc::new(language::LanguageRegistry::new(
-                cx.background_executor().clone(),
-            )),
-            fs::FakeFs::new(cx.background_executor().clone()),
-            None,
-            cx,
-        )
-    });
-
-    let tool = Arc::new(CreateChannelTool::new(channel_store.clone()));
-
-    // Test tool schema
-    let schema = tool
-        .input_schema(language_model::LanguageModelToolSchemaFormat::JsonSchema)
-        .unwrap();
-    assert!(schema.is_object());
-
-    // Test UI text generation
-    let input = json!({
-        "name": "test-channel",
-        "visibility": "members"
-    });
-
-    let ui_text = tool.ui_text(&input);
-    assert_eq!(
-        ui_text,
-        "Create channel 'test-channel' (visibility: members)"
-    );
-
-    // Test needs_confirmation
-    cx.update(|cx| {
-        assert!(!tool.needs_confirmation(&input, cx));
-    });
-
-    // Test with parent channel
-    let input_with_parent = json!({
-        "name": "sub-channel",
-        "parent": "parent-channel",
-        "visibility": "public"
-    });
-
-    let ui_text = tool.ui_text(&input_with_parent);
-    assert_eq!(
-        ui_text,
-        "Create channel 'sub-channel' under 'parent-channel' (visibility: public)"
-    );
-}
-
-#[gpui::test]
-async fn test_move_channel_tool(cx: &mut TestAppContext) {
-    // Create minimal setup
-    cx.update(|cx| {
-        let settings_store = settings::SettingsStore::test(cx);
-        cx.set_global(settings_store);
-        release_channel::init(gpui::SemanticVersion::default(), cx);
-        client::init_settings(cx);
-        Project::init_settings(cx);
-    });
-
-    let http_client = http_client::FakeHttpClient::create(|_| async { unreachable!() });
-    let client = cx.update(|cx| {
-        Client::new(
-            Arc::new(clock::FakeSystemClock::new()),
-            http_client.clone(),
-            cx,
-        )
-    });
-    let user_store = cx.new(|cx| UserStore::new(client.clone(), cx));
-    cx.update(|cx| {
-        channel::init(&client, user_store.clone(), cx);
-    });
-    let channel_store = cx.update(|cx| channel::ChannelStore::global(cx));
-
-    let tool = Arc::new(MoveChannelTool::new(channel_store));
-
-    // Test schema
-    let schema = tool
-        .input_schema(language_model::LanguageModelToolSchemaFormat::JsonSchema)
-        .unwrap();
-    assert!(schema.is_object());
-
-    // Test UI text generation
-    let input = json!({
-        "channel": "child",
-        "to": "new-parent"
-    });
-
-    let ui_text = tool.ui_text(&input);
-    assert_eq!(ui_text, "Move channel 'child' to 'new-parent'");
-
-    // Test moving to root
-    let input_to_root = json!({
-        "channel": "child",
-        "to": null
-    });
-
-    let ui_text = tool.ui_text(&input_to_root);
-    assert_eq!(ui_text, "Move channel 'child' to root");
-}
-
-#[gpui::test]
-async fn test_reorder_channel_tool(cx: &mut TestAppContext) {
-    // Create minimal setup
-    cx.update(|cx| {
-        let settings_store = settings::SettingsStore::test(cx);
-        cx.set_global(settings_store);
-        release_channel::init(gpui::SemanticVersion::default(), cx);
-        client::init_settings(cx);
-        Project::init_settings(cx);
-    });
-
-    let http_client = http_client::FakeHttpClient::create(|_| async { unreachable!() });
-    let client = cx.update(|cx| {
-        Client::new(
-            Arc::new(clock::FakeSystemClock::new()),
-            http_client.clone(),
-            cx,
-        )
-    });
-    let user_store = cx.new(|cx| UserStore::new(client.clone(), cx));
-    cx.update(|cx| {
-        channel::init(&client, user_store.clone(), cx);
-    });
-    let channel_store = cx.update(|cx| channel::ChannelStore::global(cx));
-
-    let tool = Arc::new(ReorderChannelTool::new(channel_store));
-
-    // Test schema
-    let schema = tool
-        .input_schema(language_model::LanguageModelToolSchemaFormat::JsonSchema)
-        .unwrap();
-    assert!(schema.is_object());
-
-    // Test UI text generation
-    let input = json!({
-        "channel": "test-channel",
-        "direction": "up"
-    });
-
-    let ui_text = tool.ui_text(&input);
-    assert_eq!(ui_text, "Move channel 'test-channel' up");
-
-    // Test with down direction
-    let input_down = json!({
-        "channel": "test-channel",
-        "direction": "down"
-    });
-
-    let ui_text = tool.ui_text(&input_down);
-    assert_eq!(ui_text, "Move channel 'test-channel' down");
-}
-
-#[gpui::test]
-async fn test_edit_channel_notes_tool(cx: &mut TestAppContext) {
-    // Create minimal setup
-    cx.update(|cx| {
-        let settings_store = settings::SettingsStore::test(cx);
-        cx.set_global(settings_store);
-        release_channel::init(gpui::SemanticVersion::default(), cx);
-        client::init_settings(cx);
-        Project::init_settings(cx);
-    });
-
-    let http_client = http_client::FakeHttpClient::create(|_| async { unreachable!() });
-    let client = cx.update(|cx| {
-        Client::new(
-            Arc::new(clock::FakeSystemClock::new()),
-            http_client.clone(),
-            cx,
-        )
-    });
-    let user_store = cx.new(|cx| UserStore::new(client.clone(), cx));
-    cx.update(|cx| {
-        channel::init(&client, user_store.clone(), cx);
-    });
-    let channel_store = cx.update(|cx| channel::ChannelStore::global(cx));
-
-    let tool = Arc::new(EditChannelNotesTool::new(channel_store));
-
-    // Test schema
-    let schema = tool
-        .input_schema(language_model::LanguageModelToolSchemaFormat::JsonSchema)
-        .unwrap();
-    assert!(schema.is_object());
-
-    // Test UI text generation - create
-    let input_create = json!({
-        "channel": "test-channel",
-        "edits": [
-            {
-                "kind": "create",
-                "content": "# Welcome\n\nChannel notes here."
-            }
-        ]
-    });
-
-    let ui_text = tool.ui_text(&input_create);
-    assert_eq!(ui_text, "Create notes for channel 'test-channel'");
-
-    // Test UI text generation - edit
-    let input_edit = json!({
-        "channel": "test-channel",
-        "edits": [
-            {
-                "kind": "edit",
-                "content": "Updated content"
-            }
-        ]
-    });
-
-    let ui_text = tool.ui_text(&input_edit);
-    assert_eq!(ui_text, "Edit notes for channel 'test-channel'");
-
-    // Test UI text generation - append
-    let input_append = json!({
-        "channel": "test-channel",
-        "edits": [
-            {
-                "kind": "append",
-                "content": "\n\n## New Section"
-            }
-        ]
-    });
-
-    let ui_text = tool.ui_text(&input_append);
-    assert_eq!(ui_text, "Append to notes for channel 'test-channel'");
-
-    // Test multiple edits
-    let input_multiple = json!({
-        "channel": "test-channel",
-        "edits": [
-            {
-                "kind": "edit",
-                "content": "Edit 1"
-            },
-            {
-                "kind": "append",
-                "content": "Edit 2"
-            }
-        ]
-    });
-
-    let ui_text = tool.ui_text(&input_multiple);
-    assert_eq!(
-        ui_text,
-        "Apply multiple edits to notes for channel 'test-channel'"
-    );
-}
-
-#[gpui::test]
-async fn test_channel_tools_confirmation(cx: &mut TestAppContext) {
-    // Create minimal setup
-    cx.update(|cx| {
-        let settings_store = settings::SettingsStore::test(cx);
-        cx.set_global(settings_store);
-        release_channel::init(gpui::SemanticVersion::default(), cx);
-        client::init_settings(cx);
-        Project::init_settings(cx);
-    });
-
-    let http_client = http_client::FakeHttpClient::create(|_| async { unreachable!() });
-    let client = cx.update(|cx| {
-        Client::new(
-            Arc::new(clock::FakeSystemClock::new()),
-            http_client.clone(),
-            cx,
-        )
-    });
-    let user_store = cx.new(|cx| UserStore::new(client.clone(), cx));
-    cx.update(|cx| {
-        channel::init(&client, user_store.clone(), cx);
-    });
-    let channel_store = cx.update(|cx| channel::ChannelStore::global(cx));
-
-    // Test that move tool requires confirmation
-    let move_tool = Arc::new(MoveChannelTool::new(channel_store.clone()));
-    let input = json!({
-        "channel": "important-channel",
-        "to": "new-location"
-    });
-
-    cx.update(|cx| {
-        assert!(move_tool.needs_confirmation(&input, cx));
-    });
-
-    // Test that create tool doesn't require confirmation
-    let create_tool = Arc::new(CreateChannelTool::new(channel_store));
-    let input = json!({
-        "name": "new-channel",
-        "visibility": "members"
-    });
-
-    cx.update(|cx| {
-        assert!(!create_tool.needs_confirmation(&input, cx));
-    });
-}
--- a/crates/channel_tools/src/create_channel_tool.rs
+++ b/crates/channel_tools/src/create_channel_tool.rs
@@ -1,165 +0,0 @@
-use super::{ChannelVisibility, find_channel_by_name};
-use anyhow::{Result, anyhow};
-use assistant_tool::{Tool, ToolResult, ToolResultOutput};
-use channel::ChannelStore;
-use gpui::{App, Entity, Task};
-use icons::IconName;
-use language_model::{LanguageModelRequest, LanguageModelToolSchemaFormat};
-use project::Project;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use std::sync::Arc;
-
-pub struct CreateChannelTool {
-    channel_store: Entity<ChannelStore>,
-}
-
-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
-struct CreateChannelInput {
-    /// The name of the channel to create
-    name: String,
-    /// The name of the parent channel (optional, if not provided creates a root channel)
-    #[serde(default)]
-    parent: Option<String>,
-    /// The visibility of the channel: "members" (default) or "public"
-    #[serde(default = "default_visibility")]
-    visibility: String,
-}
-
-fn default_visibility() -> String {
-    "members".to_string()
-}
-
-impl CreateChannelTool {
-    pub fn new(channel_store: Entity<ChannelStore>) -> Self {
-        Self { channel_store }
-    }
-}
-
-impl Tool for CreateChannelTool {
-    fn name(&self) -> String {
-        "create_channel".to_string()
-    }
-
-    fn description(&self) -> String {
-        "Create a new channel in the workspace".to_string()
-    }
-
-    fn icon(&self) -> IconName {
-        IconName::Hash
-    }
-
-    fn needs_confirmation(&self, _input: &serde_json::Value, _cx: &App) -> bool {
-        false
-    }
-
-    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
-        let schema = schemars::schema_for!(CreateChannelInput);
-        let mut json = serde_json::to_value(schema)?;
-
-        match format {
-            LanguageModelToolSchemaFormat::JsonSchema => Ok(json),
-            LanguageModelToolSchemaFormat::JsonSchemaSubset => {
-                assistant_tool::adapt_schema_to_format(&mut json, format)?;
-                Ok(json)
-            }
-        }
-    }
-
-    fn ui_text(&self, input: &serde_json::Value) -> String {
-        let Ok(input) = serde_json::from_value::<CreateChannelInput>(input.clone()) else {
-            return "Create channel (invalid input)".to_string();
-        };
-
-        if let Some(parent) = &input.parent {
-            format!(
-                "Create channel '{}' under '{}' (visibility: {})",
-                input.name, parent, input.visibility
-            )
-        } else {
-            format!(
-                "Create channel '{}' (visibility: {})",
-                input.name, input.visibility
-            )
-        }
-    }
-
-    fn run(
-        self: Arc<Self>,
-        input: serde_json::Value,
-        _request: Arc<LanguageModelRequest>,
-        _project: Entity<Project>,
-        _action_log: Entity<assistant_tool::ActionLog>,
-        _model: Arc<dyn language_model::LanguageModel>,
-        _window: Option<gpui::AnyWindowHandle>,
-        cx: &mut App,
-    ) -> ToolResult {
-        let input: CreateChannelInput = match serde_json::from_value(input) {
-            Ok(input) => input,
-            Err(err) => {
-                return ToolResult::from(Task::ready(Err(anyhow!("Invalid input: {}", err))));
-            }
-        };
-
-        let visibility = match ChannelVisibility::from_str(&input.visibility) {
-            Some(v) => v,
-            None => {
-                return ToolResult::from(Task::ready(Err(anyhow!(
-                    "Invalid visibility '{}'. Use 'members' or 'public'",
-                    input.visibility
-                ))));
-            }
-        };
-
-        let channel_store = self.channel_store.clone();
-        let name = input.name.clone();
-        let parent_name = input.parent.clone();
-
-        // Find parent channel if specified
-        let parent_id = if let Some(parent_name) = &parent_name {
-            match find_channel_by_name(&channel_store, parent_name, cx) {
-                Some((id, _)) => Some(id),
-                None => {
-                    return ToolResult::from(Task::ready(Err(anyhow!(
-                        "Parent channel '{}' not found",
-                        parent_name
-                    ))));
-                }
-            }
-        } else {
-            None
-        };
-
-        let task = cx.spawn(async move |cx| {
-            let create_task = cx.update(|cx| {
-                channel_store.update(cx, |store, cx| store.create_channel(&name, parent_id, cx))
-            })?;
-
-            let channel_id = create_task.await?;
-
-            // Set visibility if not default
-            if visibility == ChannelVisibility::Public {
-                let visibility_task = cx.update(|cx| {
-                    channel_store.update(cx, |store, cx| {
-                        store.set_channel_visibility(
-                            channel_id,
-                            rpc::proto::ChannelVisibility::Public,
-                            cx,
-                        )
-                    })
-                })?;
-                visibility_task.await?;
-            }
-
-            let message = if let Some(parent_name) = parent_name {
-                format!("Created channel '{}' under '{}'", name, parent_name)
-            } else {
-                format!("Created channel '{}'", name)
-            };
-
-            Ok(ToolResultOutput::from(message))
-        });
-
-        ToolResult::from(task)
-    }
-}
--- a/crates/channel_tools/src/edit_channel_notes_tool.rs
+++ b/crates/channel_tools/src/edit_channel_notes_tool.rs
@@ -1,211 +0,0 @@
-use super::find_channel_by_name;
-use crate::schema::json_schema_for;
-use anyhow::{Result, anyhow};
-use assistant_tool::{Tool, ToolResult, ToolResultContent, ToolResultOutput};
-use channel::{ChannelBuffer, ChannelStore};
-use gpui::{App, Entity, Task};
-use icons::IconName;
-use language_model::{LanguageModel, LanguageModelRequest, LanguageModelToolSchemaFormat};
-use project::Project;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use std::sync::Arc;
-use text::Point;
-
-pub struct EditChannelNotesTool {
-    channel_store: Entity<ChannelStore>,
-}
-
-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
-struct EditChannelNotesInput {
-    /// The name of the channel whose notes to edit
-    channel: String,
-    /// The edits to apply to the channel notes
-    edits: Vec<ChannelNotesEdit>,
-}
-
-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
-struct ChannelNotesEdit {
-    /// The kind of edit: "create", "edit", or "append"
-    kind: EditKind,
-    /// The content to insert, replace, or append
-    content: String,
-    /// For "edit" kind: the range to replace (optional, defaults to entire buffer)
-    #[serde(default)]
-    range: Option<EditRange>,
-}
-
-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
-#[serde(rename_all = "lowercase")]
-enum EditKind {
-    Create,
-    Edit,
-    Append,
-}
-
-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
-struct EditRange {
-    /// Starting line (0-based)
-    start_line: u32,
-    /// Starting column (0-based)
-    start_column: u32,
-    /// Ending line (0-based)
-    end_line: u32,
-    /// Ending column (0-based)
-    end_column: u32,
-}
-
-impl EditChannelNotesTool {
-    pub fn new(channel_store: Entity<ChannelStore>) -> Self {
-        Self { channel_store }
-    }
-
-    fn apply_edits(
-        channel_buffer: &Entity<ChannelBuffer>,
-        edits: Vec<ChannelNotesEdit>,
-        cx: &mut App,
-    ) -> Result<()> {
-        channel_buffer.update(cx, |channel_buffer, cx| {
-            let buffer = channel_buffer.buffer();
-            buffer.update(cx, |buffer, cx| {
-                for edit in edits {
-                    match edit.kind {
-                        EditKind::Create => {
-                            // Replace entire content
-                            let len = buffer.len();
-                            buffer.edit([(0..len, edit.content)], None, cx);
-                        }
-                        EditKind::Edit => {
-                            if let Some(range) = edit.range {
-                                let start = Point::new(range.start_line, range.start_column);
-                                let end = Point::new(range.end_line, range.end_column);
-                                let start_offset = buffer.point_to_offset(start);
-                                let end_offset = buffer.point_to_offset(end);
-                                buffer.edit([(start_offset..end_offset, edit.content)], None, cx);
-                            } else {
-                                // Replace entire content if no range specified
-                                let len = buffer.len();
-                                buffer.edit([(0..len, edit.content)], None, cx);
-                            }
-                        }
-                        EditKind::Append => {
-                            let len = buffer.len();
-                            buffer.edit([(len..len, edit.content)], None, cx);
-                        }
-                    }
-                }
-            });
-
-            // Acknowledge the buffer version to sync changes
-            channel_buffer.acknowledge_buffer_version(cx);
-        });
-
-        Ok(())
-    }
-}
-
-impl Tool for EditChannelNotesTool {
-    fn name(&self) -> String {
-        "edit_channel_notes".to_string()
-    }
-
-    fn description(&self) -> String {
-        "Edit the notes of a channel collaboratively".to_string()
-    }
-
-    fn icon(&self) -> IconName {
-        IconName::FileText
-    }
-
-    fn needs_confirmation(&self, _input: &serde_json::Value, _cx: &App) -> bool {
-        false
-    }
-
-    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
-        json_schema_for::<EditChannelNotesInput>(format)
-    }
-
-    fn ui_text(&self, input: &serde_json::Value) -> String {
-        let Ok(input) = serde_json::from_value::<EditChannelNotesInput>(input.clone()) else {
-            return "Edit channel notes (invalid input)".to_string();
-        };
-
-        let action = if input.edits.len() == 1 {
-            match &input.edits[0].kind {
-                EditKind::Create => "Create notes for",
-                EditKind::Edit => "Edit notes for",
-                EditKind::Append => "Append to notes for",
-            }
-        } else {
-            "Apply multiple edits to notes for"
-        };
-
-        format!("{} channel '{}'", action, input.channel)
-    }
-
-    fn run(
-        self: Arc<Self>,
-        input: serde_json::Value,
-        _request: Arc<LanguageModelRequest>,
-        _project: Entity<Project>,
-        _action_log: Entity<assistant_tool::ActionLog>,
-        _model: Arc<dyn LanguageModel>,
-        _window: Option<gpui::AnyWindowHandle>,
-        cx: &mut App,
-    ) -> ToolResult {
-        let input: EditChannelNotesInput = match serde_json::from_value(input) {
-            Ok(input) => input,
-            Err(err) => {
-                return ToolResult::from(Task::ready(Err(anyhow!("Invalid input: {}", err))));
-            }
-        };
-
-        if input.edits.is_empty() {
-            return ToolResult::from(Task::ready(Err(anyhow!("No edits provided"))));
-        }
-
-        let channel_store = self.channel_store.clone();
-        let channel_name = input.channel.clone();
-        let edits = input.edits;
-
-        // Find the channel
-        let (channel_id, _) = match find_channel_by_name(&channel_store, &channel_name, cx) {
-            Some(channel) => channel,
-            None => {
-                return ToolResult::from(Task::ready(Err(anyhow!(
-                    "Channel '{}' not found",
-                    channel_name
-                ))));
-            }
-        };
-
-        let task = cx.spawn(async move |cx| {
-            // Open the channel buffer
-            let channel_buffer = cx
-                .update(|cx| {
-                    channel_store.update(cx, |store, cx| store.open_channel_buffer(channel_id, cx))
-                })?
-                .await
-                .map_err(|e| anyhow!("Failed to open channel buffer: {}", e))?;
-
-            // Check if the buffer is connected
-            cx.update(|cx| {
-                if !channel_buffer.read(cx).is_connected() {
-                    return Err(anyhow!("Channel buffer is not connected"));
-                }
-                Ok(())
-            })??;
-
-            // Apply the edits
-            cx.update(|cx| Self::apply_edits(&channel_buffer, edits, cx))??;
-
-            let message = format!("Edited notes for channel '{}'", channel_name);
-            Ok(ToolResultOutput {
-                content: ToolResultContent::Text(message),
-                output: None,
-            })
-        });
-
-        ToolResult::from(task)
-    }
-}
--- a/crates/channel_tools/src/list_channels_tool.rs
+++ b/crates/channel_tools/src/list_channels_tool.rs
@@ -1,177 +0,0 @@
-use crate::schema::json_schema_for;
-use anyhow::Result;
-use assistant_tool::{Tool, ToolResult, ToolResultContent, ToolResultOutput};
-use channel::ChannelStore;
-use gpui::{App, Entity};
-use icons::IconName;
-use language_model::{LanguageModel, LanguageModelRequest, LanguageModelToolSchemaFormat};
-use project::Project;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use std::sync::Arc;
-
-pub struct ListChannelsTool {
-    channel_store: Entity<ChannelStore>,
-}
-
-impl ListChannelsTool {
-    pub fn new(channel_store: Entity<ChannelStore>) -> Self {
-        Self { channel_store }
-    }
-}
-
-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
-pub struct ListChannelsInput {
-    /// Optional filter to show only channels with names containing this string (case-insensitive)
-    #[serde(default)]
-    filter: Option<String>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct ChannelInfo {
-    id: u64,
-    name: String,
-    parent_path: Vec<String>,
-    visibility: String,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    participant_count: Option<usize>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct ListChannelsOutput {
-    channels: Vec<ChannelInfo>,
-    total_count: usize,
-}
-
-impl Tool for ListChannelsTool {
-    fn name(&self) -> String {
-        "list_channels".to_string()
-    }
-
-    fn needs_confirmation(&self, _input: &serde_json::Value, _cx: &App) -> bool {
-        false
-    }
-
-    fn description(&self) -> String {
-        "List available channels in the workspace".to_string()
-    }
-
-    fn icon(&self) -> IconName {
-        IconName::Hash
-    }
-
-    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
-        json_schema_for::<ListChannelsInput>(format)
-    }
-
-    fn ui_text(&self, input: &serde_json::Value) -> String {
-        let input = serde_json::from_value::<ListChannelsInput>(input.clone())
-            .unwrap_or(ListChannelsInput { filter: None });
-
-        let mut text = "Listing channels".to_string();
-        if let Some(ref filter) = input.filter {
-            text.push_str(&format!(" containing '{}'", filter));
-        }
-        text
-    }
-
-    fn run(
-        self: Arc<Self>,
-        input: serde_json::Value,
-        _request: Arc<LanguageModelRequest>,
-        _project: Entity<Project>,
-        _action_log: Entity<assistant_tool::ActionLog>,
-        _model: Arc<dyn LanguageModel>,
-        _window: Option<gpui::AnyWindowHandle>,
-        cx: &mut App,
-    ) -> ToolResult {
-        let channel_store = self.channel_store.clone();
-
-        let Ok(input) = serde_json::from_value::<ListChannelsInput>(input) else {
-            return ToolResult::from(gpui::Task::ready(Err(anyhow::anyhow!(
-                "Invalid input parameters"
-            ))));
-        };
-
-        let filter = input.filter.clone();
-
-        cx.spawn(async move |cx| {
-            let channels = cx
-                .update(|cx| {
-                    let store = channel_store.read(cx);
-                    let mut channel_infos = Vec::new();
-
-                    for channel in store.channels() {
-                        // Apply filter if provided
-                        if let Some(ref filter_text) = filter {
-                            if !channel
-                                .name
-                                .to_lowercase()
-                                .contains(&filter_text.to_lowercase())
-                            {
-                                continue;
-                            }
-                        }
-
-                        // Build parent path names
-                        let mut parent_path_names = Vec::new();
-                        for parent_id in &channel.parent_path {
-                            if let Some(parent) = store.channel_for_id(*parent_id) {
-                                parent_path_names.push(parent.name.to_string());
-                            }
-                        }
-
-                        let visibility = match channel.visibility {
-                            rpc::proto::ChannelVisibility::Public => "public",
-                            rpc::proto::ChannelVisibility::Members => "members",
-                        };
-
-                        let participant_count = Some(store.channel_participants(channel.id).len());
-
-                        channel_infos.push(ChannelInfo {
-                            id: channel.id.0,
-                            name: channel.name.to_string(),
-                            parent_path: parent_path_names,
-                            visibility: visibility.to_string(),
-                            participant_count,
-                        });
-                    }
-
-                    channel_infos
-                })
-                .ok()
-                .unwrap_or_default();
-
-            let total_count = channels.len();
-            let output = ListChannelsOutput {
-                channels,
-                total_count,
-            };
-
-            let mut text = String::new();
-            if output.channels.is_empty() {
-                text.push_str("No channels found");
-            } else {
-                text.push_str(&format!("Found {} channels:\n\n", output.total_count));
-                for channel in &output.channels {
-                    if !channel.parent_path.is_empty() {
-                        text.push_str(&channel.parent_path.join(" > "));
-                        text.push_str(" > ");
-                    }
-                    text.push_str(&channel.name);
-                    text.push_str(&format!(" ({})", channel.visibility));
-                    if let Some(count) = channel.participant_count {
-                        text.push_str(&format!(" - {} participants", count));
-                    }
-                    text.push('\n');
-                }
-            }
-
-            Ok(ToolResultOutput {
-                content: ToolResultContent::Text(text),
-                output: Some(serde_json::to_value(output).unwrap_or(serde_json::Value::Null)),
-            })
-        })
-        .into()
-    }
-}
--- a/crates/channel_tools/src/move_channel_tool.rs
+++ b/crates/channel_tools/src/move_channel_tool.rs
@@ -1,160 +0,0 @@
-use super::find_channel_by_name;
-use anyhow::{Result, anyhow};
-use assistant_tool::{Tool, ToolResult, ToolResultOutput};
-use channel::ChannelStore;
-use gpui::{App, Entity, Task};
-use icons::IconName;
-use language_model::{LanguageModelRequest, LanguageModelToolSchemaFormat};
-use project::Project;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use std::sync::Arc;
-
-pub struct MoveChannelTool {
-    channel_store: Entity<ChannelStore>,
-}
-
-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
-struct MoveChannelInput {
-    /// The name of the channel to move
-    channel: String,
-    /// The name of the new parent channel (null to move to root)
-    to: Option<String>,
-}
-
-impl MoveChannelTool {
-    pub fn new(channel_store: Entity<ChannelStore>) -> Self {
-        Self { channel_store }
-    }
-}
-
-impl Tool for MoveChannelTool {
-    fn name(&self) -> String {
-        "move_channel".to_string()
-    }
-
-    fn description(&self) -> String {
-        "Move a channel to a different parent or to the root level".to_string()
-    }
-
-    fn icon(&self) -> IconName {
-        IconName::FolderOpen
-    }
-
-    fn needs_confirmation(&self, _input: &serde_json::Value, _cx: &App) -> bool {
-        // Moving channels is a significant operation that should be confirmed
-        true
-    }
-
-    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
-        let schema = schemars::schema_for!(MoveChannelInput);
-        let mut json = serde_json::to_value(schema)?;
-
-        match format {
-            LanguageModelToolSchemaFormat::JsonSchema => Ok(json),
-            LanguageModelToolSchemaFormat::JsonSchemaSubset => {
-                assistant_tool::adapt_schema_to_format(&mut json, format)?;
-                Ok(json)
-            }
-        }
-    }
-
-    fn ui_text(&self, input: &serde_json::Value) -> String {
-        let Ok(input) = serde_json::from_value::<MoveChannelInput>(input.clone()) else {
-            return "Move channel (invalid input)".to_string();
-        };
-
-        if let Some(to) = &input.to {
-            format!("Move channel '{}' to '{}'", input.channel, to)
-        } else {
-            format!("Move channel '{}' to root", input.channel)
-        }
-    }
-
-    fn run(
-        self: Arc<Self>,
-        input: serde_json::Value,
-        _request: Arc<LanguageModelRequest>,
-        _project: Entity<Project>,
-        _action_log: Entity<assistant_tool::ActionLog>,
-        _model: Arc<dyn language_model::LanguageModel>,
-        _window: Option<gpui::AnyWindowHandle>,
-        cx: &mut App,
-    ) -> ToolResult {
-        let input: MoveChannelInput = match serde_json::from_value(input) {
-            Ok(input) => input,
-            Err(err) => {
-                return ToolResult::from(Task::ready(Err(anyhow!("Invalid input: {}", err))));
-            }
-        };
-
-        let channel_store = self.channel_store.clone();
-        let channel_name = input.channel.clone();
-        let to_name = input.to.clone();
-
-        // Find the channel to move
-        let (channel_id, _) = match find_channel_by_name(&channel_store, &channel_name, cx) {
-            Some(channel) => channel,
-            None => {
-                return ToolResult::from(Task::ready(Err(anyhow!(
-                    "Channel '{}' not found",
-                    channel_name
-                ))));
-            }
-        };
-
-        // Find the target parent channel if specified
-        let new_parent_id = if let Some(to_name) = &to_name {
-            match find_channel_by_name(&channel_store, to_name, cx) {
-                Some((id, _)) => Some(id),
-                None => {
-                    return ToolResult::from(Task::ready(Err(anyhow!(
-                        "Target channel '{}' not found",
-                        to_name
-                    ))));
-                }
-            }
-        } else {
-            None
-        };
-
-        // Check if we're trying to move a channel to itself or its descendant
-        if let Some(new_parent_id) = new_parent_id {
-            if channel_id == new_parent_id {
-                return ToolResult::from(Task::ready(Err(anyhow!(
-                    "Cannot move channel to itself"
-                ))));
-            }
-
-            // Check if new parent is a descendant of the channel being moved
-            let store = channel_store.read(cx);
-            if let Some(new_parent) = store.channel_for_id(new_parent_id) {
-                if new_parent.parent_path.contains(&channel_id) {
-                    return ToolResult::from(Task::ready(Err(anyhow!(
-                        "Cannot move channel to one of its descendants"
-                    ))));
-                }
-            }
-        }
-
-        let task = cx.spawn(async move |cx| {
-            // Check if we're trying to move to root
-            let new_parent_id = new_parent_id
-                .ok_or_else(|| anyhow!("Moving channels to root is not currently supported"))?;
-
-            let move_task = cx.update(|cx| {
-                channel_store.update(cx, |store, cx| {
-                    store.move_channel(channel_id, new_parent_id, cx)
-                })
-            })?;
-
-            move_task.await?;
-
-            let message = format!("Moved channel '{}' to '{}'", channel_name, to_name.unwrap());
-
-            Ok(ToolResultOutput::from(message))
-        });
-
-        ToolResult::from(task)
-    }
-}
--- a/crates/channel_tools/src/reorder_channel_tool.rs
+++ b/crates/channel_tools/src/reorder_channel_tool.rs
@@ -1,129 +0,0 @@
-use super::find_channel_by_name;
-use anyhow::{Result, anyhow};
-use assistant_tool::{Tool, ToolResult, ToolResultOutput};
-use channel::ChannelStore;
-use gpui::{App, Entity, Task};
-use icons::IconName;
-use language_model::{LanguageModelRequest, LanguageModelToolSchemaFormat};
-use project::Project;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use std::sync::Arc;
-
-pub struct ReorderChannelTool {
-    channel_store: Entity<ChannelStore>,
-}
-
-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
-struct ReorderChannelInput {
-    /// The name of the channel to reorder
-    channel: String,
-    /// The direction to move the channel: "up" or "down"
-    direction: String,
-}
-
-impl ReorderChannelTool {
-    pub fn new(channel_store: Entity<ChannelStore>) -> Self {
-        Self { channel_store }
-    }
-}
-
-impl Tool for ReorderChannelTool {
-    fn name(&self) -> String {
-        "reorder_channel".to_string()
-    }
-
-    fn description(&self) -> String {
-        "Move a channel up or down in the list among its siblings".to_string()
-    }
-
-    fn icon(&self) -> IconName {
-        IconName::ListTree
-    }
-
-    fn needs_confirmation(&self, _input: &serde_json::Value, _cx: &App) -> bool {
-        false
-    }
-
-    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
-        let schema = schemars::schema_for!(ReorderChannelInput);
-        let mut json = serde_json::to_value(schema)?;
-
-        match format {
-            LanguageModelToolSchemaFormat::JsonSchema => Ok(json),
-            LanguageModelToolSchemaFormat::JsonSchemaSubset => {
-                assistant_tool::adapt_schema_to_format(&mut json, format)?;
-                Ok(json)
-            }
-        }
-    }
-
-    fn ui_text(&self, input: &serde_json::Value) -> String {
-        let Ok(input) = serde_json::from_value::<ReorderChannelInput>(input.clone()) else {
-            return "Reorder channel (invalid input)".to_string();
-        };
-
-        format!("Move channel '{}' {}", input.channel, input.direction)
-    }
-
-    fn run(
-        self: Arc<Self>,
-        input: serde_json::Value,
-        _request: Arc<LanguageModelRequest>,
-        _project: Entity<Project>,
-        _action_log: Entity<assistant_tool::ActionLog>,
-        _model: Arc<dyn language_model::LanguageModel>,
-        _window: Option<gpui::AnyWindowHandle>,
-        cx: &mut App,
-    ) -> ToolResult {
-        let input: ReorderChannelInput = match serde_json::from_value(input) {
-            Ok(input) => input,
-            Err(err) => {
-                return ToolResult::from(Task::ready(Err(anyhow!("Invalid input: {}", err))));
-            }
-        };
-
-        let channel_store = self.channel_store.clone();
-        let channel_name = input.channel.clone();
-        let direction_str = input.direction.to_lowercase();
-
-        // Parse direction
-        let direction = match direction_str.as_str() {
-            "up" => rpc::proto::reorder_channel::Direction::Up,
-            "down" => rpc::proto::reorder_channel::Direction::Down,
-            _ => {
-                return ToolResult::from(Task::ready(Err(anyhow!(
-                    "Invalid direction '{}'. Use 'up' or 'down'",
-                    input.direction
-                ))));
-            }
-        };
-
-        // Find the channel to reorder
-        let (channel_id, _) = match find_channel_by_name(&channel_store, &channel_name, cx) {
-            Some(channel) => channel,
-            None => {
-                return ToolResult::from(Task::ready(Err(anyhow!(
-                    "Channel '{}' not found",
-                    channel_name
-                ))));
-            }
-        };
-
-        let task = cx.spawn(async move |cx| {
-            let reorder_task = cx.update(|cx| {
-                channel_store.update(cx, |store, cx| {
-                    store.reorder_channel(channel_id, direction, cx)
-                })
-            })?;
-
-            reorder_task.await?;
-
-            let message = format!("Moved channel '{}' {}", channel_name, direction_str);
-
-            Ok(ToolResultOutput::from(message))
-        });
-
-        ToolResult::from(task)
-    }
-}
--- a/crates/channel_tools/src/schema.rs
+++ b/crates/channel_tools/src/schema.rs
@@ -1,78 +0,0 @@
-use anyhow::Result;
-use language_model::LanguageModelToolSchemaFormat;
-use schemars::{
-    JsonSchema,
-    schema::{RootSchema, Schema, SchemaObject},
-};
-
-pub fn json_schema_for<T: JsonSchema>(
-    format: LanguageModelToolSchemaFormat,
-) -> Result<serde_json::Value> {
-    let schema = root_schema_for::<T>(format);
-    schema_to_json(&schema, format)
-}
-
-fn schema_to_json(
-    schema: &RootSchema,
-    format: LanguageModelToolSchemaFormat,
-) -> Result<serde_json::Value> {
-    let mut value = serde_json::to_value(schema)?;
-    assistant_tool::adapt_schema_to_format(&mut value, format)?;
-    Ok(value)
-}
-
-fn root_schema_for<T: JsonSchema>(format: LanguageModelToolSchemaFormat) -> RootSchema {
-    let mut generator = match format {
-        LanguageModelToolSchemaFormat::JsonSchema => schemars::SchemaGenerator::default(),
-        LanguageModelToolSchemaFormat::JsonSchemaSubset => {
-            schemars::r#gen::SchemaSettings::default()
-                .with(|settings| {
-                    settings.meta_schema = None;
-                    settings.inline_subschemas = true;
-                    settings
-                        .visitors
-                        .push(Box::new(TransformToJsonSchemaSubsetVisitor));
-                })
-                .into_generator()
-        }
-    };
-    generator.root_schema_for::<T>()
-}
-
-#[derive(Debug, Clone)]
-struct TransformToJsonSchemaSubsetVisitor;
-
-impl schemars::visit::Visitor for TransformToJsonSchemaSubsetVisitor {
-    fn visit_root_schema(&mut self, root: &mut RootSchema) {
-        schemars::visit::visit_root_schema(self, root)
-    }
-
-    fn visit_schema(&mut self, schema: &mut Schema) {
-        schemars::visit::visit_schema(self, schema)
-    }
-
-    fn visit_schema_object(&mut self, schema: &mut SchemaObject) {
-        // Ensure that the type field is not an array, this happens when we use
-        // Option<T>, the type will be [T, "null"].
-        if let Some(instance_type) = schema.instance_type.take() {
-            schema.instance_type = match instance_type {
-                schemars::schema::SingleOrVec::Single(t) => {
-                    Some(schemars::schema::SingleOrVec::Single(t))
-                }
-                schemars::schema::SingleOrVec::Vec(items) => items
-                    .into_iter()
-                    .next()
-                    .map(schemars::schema::SingleOrVec::from),
-            };
-        }
-
-        // One of is not supported, use anyOf instead.
-        if let Some(subschema) = schema.subschemas.as_mut() {
-            if let Some(one_of) = subschema.one_of.take() {
-                subschema.any_of = Some(one_of);
-            }
-        }
-
-        schemars::visit::visit_schema_object(self, schema)
-    }
-}
--- a/crates/channel_tools/src/streaming_edit_channel_notes_tool.rs
+++ b/crates/channel_tools/src/streaming_edit_channel_notes_tool.rs
@@ -1,211 +0,0 @@
-use super::find_channel_by_name;
-use crate::schema::json_schema_for;
-use anyhow::{Result, anyhow};
-use assistant_tool::{Tool, ToolResult, ToolResultContent, ToolResultOutput};
-use assistant_tools::{EditAgent, EditAgentOutputEvent, Templates};
-use channel::ChannelStore;
-use futures::StreamExt;
-use gpui::{App, Entity, Task};
-use icons::IconName;
-use language_model::{LanguageModel, LanguageModelRequest, LanguageModelToolSchemaFormat};
-use project::Project;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use std::sync::Arc;
-
-pub struct StreamingEditChannelNotesTool {
-    channel_store: Entity<ChannelStore>,
-}
-
-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
-struct StreamingEditChannelNotesInput {
-    /// The name of the channel whose notes to edit
-    channel: String,
-    /// A one-line, user-friendly markdown description of the edit.
-    /// Be terse, but also descriptive in what you want to achieve with this edit.
-    display_description: String,
-    /// The edit mode: "edit" to modify existing content, "overwrite" to replace entire content
-    #[serde(default)]
-    mode: EditMode,
-}
-
-#[derive(Debug, Serialize, Deserialize, JsonSchema, Default, Clone, Copy)]
-#[serde(rename_all = "lowercase")]
-enum EditMode {
-    #[default]
-    Edit,
-    Overwrite,
-}
-
-impl StreamingEditChannelNotesTool {
-    pub fn new(channel_store: Entity<ChannelStore>) -> Self {
-        Self { channel_store }
-    }
-}
-
-impl Tool for StreamingEditChannelNotesTool {
-    fn name(&self) -> String {
-        "streaming_edit_channel_notes".to_string()
-    }
-
-    fn description(&self) -> String {
-        "Edit channel notes using AI-powered streaming edits for efficient collaborative editing"
-            .to_string()
-    }
-
-    fn icon(&self) -> IconName {
-        IconName::FileText
-    }
-
-    fn needs_confirmation(&self, _input: &serde_json::Value, _cx: &App) -> bool {
-        false
-    }
-
-    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
-        json_schema_for::<StreamingEditChannelNotesInput>(format)
-    }
-
-    fn ui_text(&self, input: &serde_json::Value) -> String {
-        let Ok(input) = serde_json::from_value::<StreamingEditChannelNotesInput>(input.clone())
-        else {
-            return "Streaming edit channel notes (invalid input)".to_string();
-        };
-
-        if input.display_description.is_empty() {
-            format!("Streaming edit notes for channel '{}'", input.channel)
-        } else {
-            format!(
-                "{} in channel '{}'",
-                input.display_description, input.channel
-            )
-        }
-    }
-
-    fn run(
-        self: Arc<Self>,
-        input: serde_json::Value,
-        request: Arc<LanguageModelRequest>,
-        project: Entity<Project>,
-        action_log: Entity<assistant_tool::ActionLog>,
-        model: Arc<dyn LanguageModel>,
-        _window: Option<gpui::AnyWindowHandle>,
-        cx: &mut App,
-    ) -> ToolResult {
-        let input: StreamingEditChannelNotesInput = match serde_json::from_value(input) {
-            Ok(input) => input,
-            Err(err) => {
-                return ToolResult::from(Task::ready(Err(anyhow!("Invalid input: {}", err))));
-            }
-        };
-
-        let channel_store = self.channel_store.clone();
-        let channel_name = input.channel.clone();
-
-        // Find the channel
-        let (channel_id, _) = match find_channel_by_name(&channel_store, &channel_name, cx) {
-            Some(channel) => channel,
-            None => {
-                return ToolResult::from(Task::ready(Err(anyhow!(
-                    "Channel '{}' not found",
-                    channel_name
-                ))));
-            }
-        };
-
-        let task = cx.spawn(async move |mut cx| {
-            // Open the channel buffer
-            let channel_buffer = cx
-                .update(|cx| {
-                    channel_store.update(cx, |store, cx| store.open_channel_buffer(channel_id, cx))
-                })?
-                .await
-                .map_err(|e| anyhow!("Failed to open channel buffer: {}", e))?;
-
-            // Check if the buffer is connected
-            cx.update(|cx| {
-                if !channel_buffer.read(cx).is_connected() {
-                    return Err(anyhow!("Channel buffer is not connected"));
-                }
-                Ok(())
-            })??;
-
-            // Get the language buffer from the channel buffer
-            let buffer = cx.update(|cx| {
-                channel_buffer.read_with(cx, |channel_buffer, _| channel_buffer.buffer().clone())
-            })?;
-
-            // Create an EditAgent for streaming edits
-            let edit_agent = EditAgent::new(model, project, action_log, Templates::new());
-
-            // Perform the edit using EditAgent
-            let (output, mut events) = match input.mode {
-                EditMode::Edit => {
-                    edit_agent.edit(buffer.clone(), input.display_description, &request, &mut cx)
-                }
-                EditMode::Overwrite => edit_agent.overwrite(
-                    buffer.clone(),
-                    input.display_description,
-                    &request,
-                    &mut cx,
-                ),
-            };
-
-            // Process streaming events
-            let mut edit_completed = false;
-            let mut unresolved_range = false;
-            while let Some(event) = events.next().await {
-                match event {
-                    EditAgentOutputEvent::Edited => {
-                        edit_completed = true;
-                        // Acknowledge the buffer version to sync changes
-                        cx.update(|cx| {
-                            channel_buffer.update(cx, |channel_buffer, cx| {
-                                channel_buffer.acknowledge_buffer_version(cx);
-                            })
-                        })?;
-                    }
-                    EditAgentOutputEvent::UnresolvedEditRange => {
-                        unresolved_range = true;
-                        log::warn!("AI couldn't resolve edit range in channel notes");
-                    }
-                    EditAgentOutputEvent::ResolvingEditRange(_) => {
-                        // This is primarily for UI updates, which we don't need here
-                    }
-                }
-            }
-
-            let _result = output.await?;
-
-            if !edit_completed && !unresolved_range {
-                return Err(anyhow!("Edit was not completed successfully"));
-            }
-
-            let message = if unresolved_range {
-                format!(
-                    "Applied {} to channel '{}' (some ranges could not be resolved)",
-                    match input.mode {
-                        EditMode::Edit => "streaming edits",
-                        EditMode::Overwrite => "streaming overwrite",
-                    },
-                    channel_name
-                )
-            } else {
-                format!(
-                    "Applied {} to notes for channel '{}'",
-                    match input.mode {
-                        EditMode::Edit => "streaming edits",
-                        EditMode::Overwrite => "streaming overwrite",
-                    },
-                    channel_name
-                )
-            };
-
-            Ok(ToolResultOutput {
-                content: ToolResultContent::Text(message),
-                output: None,
-            })
-        });
-
-        ToolResult::from(task)
-    }
-}
--- a/crates/collab/README.md
+++ b/crates/collab/README.md
@@ -57,7 +57,7 @@ We run two instances of collab:

 Both of these run on the Kubernetes cluster hosted in Digital Ocean.

-Deployment is triggered by pushing to the `collab-staging` (or `collab-production`) tag in Github. The best way to do this is:
+Deployment is triggered by pushing to the `collab-staging` (or `collab-production`) tag in GitHub. The best way to do this is:

 - `./script/deploy-collab staging`
 - `./script/deploy-collab production`
--- a/crates/collab/migrations.sqlite/20221109000000_test_schema.sql
+++ b/crates/collab/migrations.sqlite/20221109000000_test_schema.sql
@@ -266,14 +266,11 @@ CREATE TABLE "channels" (
    "created_at" TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
    "visibility" VARCHAR NOT NULL,
    "parent_path" TEXT NOT NULL,
-    "requires_zed_cla" BOOLEAN NOT NULL DEFAULT FALSE,
-    "channel_order" INTEGER NOT NULL DEFAULT 1
+    "requires_zed_cla" BOOLEAN NOT NULL DEFAULT FALSE
 );

 CREATE INDEX "index_channels_on_parent_path" ON "channels" ("parent_path");

-CREATE INDEX "index_channels_on_parent_path_and_order" ON "channels" ("parent_path", "channel_order");
-
 CREATE TABLE IF NOT EXISTS "channel_chat_participants" (
    "id" INTEGER PRIMARY KEY AUTOINCREMENT,
    "user_id" INTEGER NOT NULL REFERENCES users (id),
--- a/crates/collab/migrations/20250530175450_add_channel_order.sql
+++ b/crates/collab/migrations/20250530175450_add_channel_order.sql
@@ -1,16 +0,0 @@
-- Add channel_order column to channels table with default value
-ALTER TABLE channels ADD COLUMN channel_order INTEGER NOT NULL DEFAULT 1;
-
-- Update channel_order for existing channels using ROW_NUMBER for deterministic ordering
-UPDATE channels
-SET channel_order = (
-    SELECT ROW_NUMBER() OVER (
-        PARTITION BY parent_path
-        ORDER BY name, id
-    )
-    FROM channels c2
-    WHERE c2.id = channels.id
-);
-
-- Create index for efficient ordering queries
-CREATE INDEX "index_channels_on_parent_path_and_order" ON "channels" ("parent_path", "channel_order");
--- a/crates/collab/src/api/billing.rs
+++ b/crates/collab/src/api/billing.rs
@@ -219,12 +219,19 @@ struct BillingSubscriptionJson {
    id: BillingSubscriptionId,
    name: String,
    status: StripeSubscriptionStatus,
+    period: Option<BillingSubscriptionPeriodJson>,
    trial_end_at: Option<String>,
    cancel_at: Option<String>,
    /// Whether this subscription can be canceled.
    is_cancelable: bool,
 }

+#[derive(Debug, Serialize)]
+struct BillingSubscriptionPeriodJson {
+    start_at: String,
+    end_at: String,
+}
+
 #[derive(Debug, Serialize)]
 struct ListBillingSubscriptionsResponse {
    subscriptions: Vec<BillingSubscriptionJson>,
@@ -254,6 +261,15 @@ async fn list_billing_subscriptions(
                    None => "Zed LLM Usage".to_string(),
                },
                status: subscription.stripe_subscription_status,
+                period: maybe!({
+                    let start_at = subscription.current_period_start_at()?;
+                    let end_at = subscription.current_period_end_at()?;
+
+                    Some(BillingSubscriptionPeriodJson {
+                        start_at: start_at.to_rfc3339_opts(SecondsFormat::Millis, true),
+                        end_at: end_at.to_rfc3339_opts(SecondsFormat::Millis, true),
+                    })
+                }),
                trial_end_at: if subscription.kind == Some(SubscriptionKind::ZedProTrial) {
                    maybe!({
                        let end_at = subscription.stripe_current_period_end?;
--- a/crates/collab/src/api/extensions.rs
+++ b/crates/collab/src/api/extensions.rs
@@ -66,7 +66,7 @@ async fn get_extensions(
            params.filter.as_deref(),
            provides_filter.as_ref(),
            params.max_schema_version,
-            500,
+            1_000,
        )
        .await?;

--- a/crates/collab/src/db.rs
+++ b/crates/collab/src/db.rs
@@ -582,7 +582,6 @@ pub struct Channel {
    pub visibility: ChannelVisibility,
    /// parent_path is the channel ids from the root to this one (not including this one)
    pub parent_path: Vec<ChannelId>,
-    pub channel_order: i32,
 }

 impl Channel {
@@ -592,7 +591,6 @@ impl Channel {
            visibility: value.visibility,
            name: value.clone().name,
            parent_path: value.ancestors().collect(),
-            channel_order: value.channel_order,
        }
    }

@@ -602,13 +600,8 @@ impl Channel {
            name: self.name.clone(),
            visibility: self.visibility.into(),
            parent_path: self.parent_path.iter().map(|c| c.to_proto()).collect(),
-            channel_order: self.channel_order,
        }
    }
-
-    pub fn root_id(&self) -> ChannelId {
-        self.parent_path.first().copied().unwrap_or(self.id)
-    }
 }

 #[derive(Debug, PartialEq, Eq, Hash)]
--- a/crates/collab/src/db/queries/channels.rs
+++ b/crates/collab/src/db/queries/channels.rs
@@ -4,7 +4,7 @@ use rpc::{
    ErrorCode, ErrorCodeExt,
    proto::{ChannelBufferVersion, VectorClockEntry, channel_member::Kind},
 };
-use sea_orm::{ActiveValue, DbBackend, TryGetableMany};
+use sea_orm::{DbBackend, TryGetableMany};

 impl Database {
    #[cfg(test)]
@@ -59,36 +59,16 @@ impl Database {
                parent = Some(parent_channel);
            }

-            let parent_path = parent
-                .as_ref()
-                .map_or(String::new(), |parent| parent.path());
-
-            // Find the maximum channel_order among siblings to set the new channel at the end
-            let max_order = channel::Entity::find()
-                .filter(channel::Column::ParentPath.eq(&parent_path))
-                .select_only()
-                .column_as(channel::Column::ChannelOrder.max(), "max_order")
-                .into_tuple::<Option<i32>>()
-                .one(&*tx)
-                .await?
-                .flatten()
-                .unwrap_or(0);
-
-            log::info!(
-                "Creating channel '{}' with parent_path='{}', max_order={}, new_order={}",
-                name,
-                parent_path,
-                max_order,
-                max_order + 1
-            );
-
            let channel = channel::ActiveModel {
                id: ActiveValue::NotSet,
                name: ActiveValue::Set(name.to_string()),
                visibility: ActiveValue::Set(ChannelVisibility::Members),
-                parent_path: ActiveValue::Set(parent_path),
+                parent_path: ActiveValue::Set(
+                    parent
+                        .as_ref()
+                        .map_or(String::new(), |parent| parent.path()),
+                ),
                requires_zed_cla: ActiveValue::NotSet,
-                channel_order: ActiveValue::Set(max_order + 1),
            }
            .insert(&*tx)
            .await?;
@@ -574,42 +554,6 @@ impl Database {
            })
            .collect();

-        // Build a map of channel_id -> channel_order for lookup
-        let channel_order_map: std::collections::HashMap<ChannelId, i32> =
-            channels.iter().map(|c| (c.id, c.channel_order)).collect();
-
-        // Pre-compute sort keys for efficient O(n log n) sorting instead of O(n²)
-        let mut channels_with_keys: Vec<(Vec<i32>, Channel)> = channels
-            .into_iter()
-            .map(|channel| {
-                let mut sort_key = Vec::with_capacity(channel.parent_path.len() + 1);
-
-                // Build sort key from parent path orders
-                for parent_id in &channel.parent_path {
-                    match channel_order_map.get(parent_id) {
-                        Some(&order) => sort_key.push(order),
-                        None => {
-                            // Missing parent - this should not happen in a well-formed tree
-                            // Put orphaned channels at the end with a high sort value
-                            sort_key.push(i32::MAX);
-                        }
-                    }
-                }
-                sort_key.push(channel.channel_order);
-
-                (sort_key, channel)
-            })
-            .collect();
-
-        // Sort by pre-computed keys (stable sort for deterministic ordering)
-        channels_with_keys.sort_by(|a, b| a.0.cmp(&b.0));
-
-        // Extract the sorted channels
-        let channels: Vec<Channel> = channels_with_keys
-            .into_iter()
-            .map(|(_, channel)| channel)
-            .collect();
-
        #[derive(Copy, Clone, Debug, EnumIter, DeriveColumn)]
        enum QueryUserIdsAndChannelIds {
            ChannelId,
@@ -1042,174 +986,6 @@ impl Database {
        })
        .await
    }
-
-    pub async fn reorder_channel(
-        &self,
-        channel_id: ChannelId,
-        direction: proto::reorder_channel::Direction,
-        user_id: UserId,
-    ) -> Result<Vec<Channel>> {
-        self.transaction(|tx| async move {
-            let channel = self.get_channel_internal(channel_id, &tx).await?;
-
-            log::info!(
-                "Reordering channel {} (parent_path: '{}', order: {})",
-                channel.id,
-                channel.parent_path,
-                channel.channel_order
-            );
-
-            // Check if user is admin of the channel
-            self.check_user_is_channel_admin(&channel, user_id, &tx)
-                .await?;
-
-            // Find the sibling channel to swap with
-            let sibling_channel = match direction {
-                proto::reorder_channel::Direction::Up => {
-                    log::info!(
-                        "Looking for sibling with parent_path='{}' and order < {}",
-                        channel.parent_path,
-                        channel.channel_order
-                    );
-                    // Find channel with highest order less than current
-                    channel::Entity::find()
-                        .filter(
-                            channel::Column::ParentPath
-                                .eq(&channel.parent_path)
-                                .and(channel::Column::ChannelOrder.lt(channel.channel_order)),
-                        )
-                        .order_by_desc(channel::Column::ChannelOrder)
-                        .one(&*tx)
-                        .await?
-                }
-                proto::reorder_channel::Direction::Down => {
-                    log::info!(
-                        "Looking for sibling with parent_path='{}' and order > {}",
-                        channel.parent_path,
-                        channel.channel_order
-                    );
-                    // Find channel with lowest order greater than current
-                    channel::Entity::find()
-                        .filter(
-                            channel::Column::ParentPath
-                                .eq(&channel.parent_path)
-                                .and(channel::Column::ChannelOrder.gt(channel.channel_order)),
-                        )
-                        .order_by_asc(channel::Column::ChannelOrder)
-                        .one(&*tx)
-                        .await?
-                }
-            };
-
-            let sibling_channel = match sibling_channel {
-                Some(sibling) => {
-                    log::info!(
-                        "Found sibling {} (parent_path: '{}', order: {})",
-                        sibling.id,
-                        sibling.parent_path,
-                        sibling.channel_order
-                    );
-                    sibling
-                }
-                None => {
-                    log::warn!("No sibling found to swap with");
-                    // No sibling to swap with, return current channel unchanged
-                    return Ok(vec![Channel::from_model(channel)]);
-                }
-            };
-
-            // Validate that we're not swapping identical orders
-            if channel.channel_order == sibling_channel.channel_order {
-                return Err(anyhow!("Channels have identical order values, cannot swap").into());
-            }
-
-            // Bounds checking for channel_order values
-            const MIN_CHANNEL_ORDER: i32 = 1;
-            const MAX_CHANNEL_ORDER: i32 = 999_999;
-
-            if channel.channel_order < MIN_CHANNEL_ORDER
-                || channel.channel_order > MAX_CHANNEL_ORDER
-            {
-                return Err(anyhow!(
-                    "Channel order {} is out of valid range ({}-{})",
-                    channel.channel_order,
-                    MIN_CHANNEL_ORDER,
-                    MAX_CHANNEL_ORDER
-                )
-                .into());
-            }
-
-            if sibling_channel.channel_order < MIN_CHANNEL_ORDER
-                || sibling_channel.channel_order > MAX_CHANNEL_ORDER
-            {
-                return Err(anyhow!(
-                    "Sibling channel order {} is out of valid range ({}-{})",
-                    sibling_channel.channel_order,
-                    MIN_CHANNEL_ORDER,
-                    MAX_CHANNEL_ORDER
-                )
-                .into());
-            }
-
-            // Swap the channel_order values atomically using a temporary value to avoid conflicts
-            let current_order = channel.channel_order;
-            let sibling_order = sibling_channel.channel_order;
-            let temp_order = i32::MAX; // Use max value as temporary to avoid conflicts
-
-            // Three-step swap to avoid unique constraint violations
-            // Step 1: Set current channel to temp value
-            channel::ActiveModel {
-                id: ActiveValue::Unchanged(channel.id),
-                channel_order: ActiveValue::Set(temp_order),
-                ..Default::default()
-            }
-            .update(&*tx)
-            .await?;
-
-            // Step 2: Set sibling to current's original value
-            channel::ActiveModel {
-                id: ActiveValue::Unchanged(sibling_channel.id),
-                channel_order: ActiveValue::Set(current_order),
-                ..Default::default()
-            }
-            .update(&*tx)
-            .await?;
-
-            // Step 3: Set current to sibling's original value
-            channel::ActiveModel {
-                id: ActiveValue::Unchanged(channel.id),
-                channel_order: ActiveValue::Set(sibling_order),
-                ..Default::default()
-            }
-            .update(&*tx)
-            .await?;
-
-            // Return only the two channels that were swapped
-            let updated_channel = channel::Entity::find_by_id(channel.id)
-                .one(&*tx)
-                .await?
-                .ok_or_else(|| anyhow!("Channel not found after update"))?;
-
-            let updated_sibling = channel::Entity::find_by_id(sibling_channel.id)
-                .one(&*tx)
-                .await?
-                .ok_or_else(|| anyhow!("Sibling channel not found after update"))?;
-
-            let swapped_channels = vec![
-                Channel::from_model(updated_channel),
-                Channel::from_model(updated_sibling),
-            ];
-
-            log::info!(
-                "Reorder complete. Swapped channels {} and {}",
-                channel.id,
-                sibling_channel.id
-            );
-
-            Ok(swapped_channels)
-        })
-        .await
-    }
 }

 #[derive(Copy, Clone, Debug, EnumIter, DeriveColumn)]
--- a/crates/collab/src/db/queries/servers.rs
+++ b/crates/collab/src/db/queries/servers.rs
@@ -66,6 +66,87 @@ impl Database {
        .await
    }

+    /// Delete all channel chat participants from previous servers
+    pub async fn delete_stale_channel_chat_participants(
+        &self,
+        environment: &str,
+        new_server_id: ServerId,
+    ) -> Result<()> {
+        self.transaction(|tx| async move {
+            let stale_server_epochs = self
+                .stale_server_ids(environment, new_server_id, &tx)
+                .await?;
+
+            channel_chat_participant::Entity::delete_many()
+                .filter(
+                    channel_chat_participant::Column::ConnectionServerId
+                        .is_in(stale_server_epochs.iter().copied()),
+                )
+                .exec(&*tx)
+                .await?;
+
+            Ok(())
+        })
+        .await
+    }
+
+    pub async fn clear_old_worktree_entries(&self, server_id: ServerId) -> Result<()> {
+        self.transaction(|tx| async move {
+            use sea_orm::Statement;
+            use sea_orm::sea_query::{Expr, Query};
+
+            loop {
+                let delete_query = Query::delete()
+                    .from_table(worktree_entry::Entity)
+                    .and_where(
+                        Expr::tuple([
+                            Expr::col((worktree_entry::Entity, worktree_entry::Column::ProjectId))
+                                .into(),
+                            Expr::col((worktree_entry::Entity, worktree_entry::Column::WorktreeId))
+                                .into(),
+                            Expr::col((worktree_entry::Entity, worktree_entry::Column::Id)).into(),
+                        ])
+                        .in_subquery(
+                            Query::select()
+                                .columns([
+                                    (worktree_entry::Entity, worktree_entry::Column::ProjectId),
+                                    (worktree_entry::Entity, worktree_entry::Column::WorktreeId),
+                                    (worktree_entry::Entity, worktree_entry::Column::Id),
+                                ])
+                                .from(worktree_entry::Entity)
+                                .inner_join(
+                                    project::Entity,
+                                    Expr::col((project::Entity, project::Column::Id)).equals((
+                                        worktree_entry::Entity,
+                                        worktree_entry::Column::ProjectId,
+                                    )),
+                                )
+                                .and_where(project::Column::HostConnectionServerId.ne(server_id))
+                                .limit(10000)
+                                .to_owned(),
+                        ),
+                    )
+                    .to_owned();
+
+                let statement = Statement::from_sql_and_values(
+                    tx.get_database_backend(),
+                    delete_query
+                        .to_string(sea_orm::sea_query::PostgresQueryBuilder)
+                        .as_str(),
+                    vec![],
+                );
+
+                let result = tx.execute(statement).await?;
+                if result.rows_affected() == 0 {
+                    break;
+                }
+            }
+
+            Ok(())
+        })
+        .await
+    }
+
    /// Deletes any stale servers in the environment that don't match the `new_server_id`.
    pub async fn delete_stale_servers(
        &self,
@@ -86,7 +167,7 @@ impl Database {
        .await
    }

-    async fn stale_server_ids(
+    pub async fn stale_server_ids(
        &self,
        environment: &str,
        new_server_id: ServerId,
--- a/crates/collab/src/db/tables/channel.rs
+++ b/crates/collab/src/db/tables/channel.rs
@@ -10,9 +10,6 @@ pub struct Model {
    pub visibility: ChannelVisibility,
    pub parent_path: String,
    pub requires_zed_cla: bool,
-    /// The order of this channel relative to its siblings within the same parent.
-    /// Lower values appear first. Channels are sorted by parent_path first, then by channel_order.
-    pub channel_order: i32,
 }

 impl Model {
--- a/crates/collab/src/db/tests.rs
+++ b/crates/collab/src/db/tests.rs
@@ -173,28 +173,15 @@ impl Drop for TestDb {
 }

 fn channel_tree(channels: &[(ChannelId, &[ChannelId], &'static str)]) -> Vec<Channel> {
-    use std::collections::HashMap;
-
-    let mut result = Vec::new();
-    let mut order_by_parent: HashMap<Vec<ChannelId>, i32> = HashMap::new();
-
-    for (id, parent_path, name) in channels {
-        let parent_key = parent_path.to_vec();
-        let order = *order_by_parent
-            .entry(parent_key.clone())
-            .and_modify(|e| *e += 1)
-            .or_insert(1);
-
-        result.push(Channel {
+    channels
+        .iter()
+        .map(|(id, parent_path, name)| Channel {
            id: *id,
            name: name.to_string(),
            visibility: ChannelVisibility::Members,
-            parent_path: parent_key,
-            channel_order: order,
-        });
-    }
-
-    result
+            parent_path: parent_path.to_vec(),
+        })
+        .collect()
 }

 static GITHUB_USER_ID: AtomicI32 = AtomicI32::new(5);
--- a/crates/collab/src/db/tests/channel_tests.rs
+++ b/crates/collab/src/db/tests/channel_tests.rs
@@ -7,7 +7,7 @@ use crate::{
 };
 use rpc::{
    ConnectionId,
-    proto::{self, reorder_channel},
+    proto::{self},
 };
 use std::sync::Arc;

@@ -64,11 +64,11 @@ async fn test_channels(db: &Arc<Database>) {
        channel_tree(&[
            (zed_id, &[], "zed"),
            (crdb_id, &[zed_id], "crdb"),
-            (livestreaming_id, &[zed_id], "livestreaming"),
+            (livestreaming_id, &[zed_id], "livestreaming",),
            (replace_id, &[zed_id], "replace"),
            (rust_id, &[], "rust"),
            (cargo_id, &[rust_id], "cargo"),
-            (cargo_ra_id, &[rust_id, cargo_id], "cargo-ra")
+            (cargo_ra_id, &[rust_id, cargo_id], "cargo-ra",)
        ],)
    );

@@ -78,7 +78,7 @@ async fn test_channels(db: &Arc<Database>) {
        channel_tree(&[
            (zed_id, &[], "zed"),
            (crdb_id, &[zed_id], "crdb"),
-            (livestreaming_id, &[zed_id], "livestreaming"),
+            (livestreaming_id, &[zed_id], "livestreaming",),
            (replace_id, &[zed_id], "replace")
        ],)
    );
@@ -99,7 +99,7 @@ async fn test_channels(db: &Arc<Database>) {
        channel_tree(&[
            (zed_id, &[], "zed"),
            (crdb_id, &[zed_id], "crdb"),
-            (livestreaming_id, &[zed_id], "livestreaming"),
+            (livestreaming_id, &[zed_id], "livestreaming",),
            (replace_id, &[zed_id], "replace")
        ],)
    );
@@ -366,152 +366,6 @@ async fn test_db_channel_moving(db: &Arc<Database>) {
    );
 }

-test_both_dbs!(
-    test_channel_reordering,
-    test_channel_reordering_postgres,
-    test_channel_reordering_sqlite
-);
-
-async fn test_channel_reordering(db: &Arc<Database>) {
-    let admin_id = db
-        .create_user(
-            "admin@example.com",
-            None,
-            false,
-            NewUserParams {
-                github_login: "admin".into(),
-                github_user_id: 1,
-            },
-        )
-        .await
-        .unwrap()
-        .user_id;
-
-    let user_id = db
-        .create_user(
-            "user@example.com",
-            None,
-            false,
-            NewUserParams {
-                github_login: "user".into(),
-                github_user_id: 2,
-            },
-        )
-        .await
-        .unwrap()
-        .user_id;
-
-    // Create a root channel with some sub-channels
-    let root_id = db.create_root_channel("root", admin_id).await.unwrap();
-
-    // Invite user to root channel so they can see the sub-channels
-    db.invite_channel_member(root_id, user_id, admin_id, ChannelRole::Member)
-        .await
-        .unwrap();
-    db.respond_to_channel_invite(root_id, user_id, true)
-        .await
-        .unwrap();
-
-    let alpha_id = db
-        .create_sub_channel("alpha", root_id, admin_id)
-        .await
-        .unwrap();
-    let beta_id = db
-        .create_sub_channel("beta", root_id, admin_id)
-        .await
-        .unwrap();
-    let gamma_id = db
-        .create_sub_channel("gamma", root_id, admin_id)
-        .await
-        .unwrap();
-
-    // Initial order should be: root, alpha (order=1), beta (order=2), gamma (order=3)
-    let result = db.get_channels_for_user(admin_id).await.unwrap();
-    assert_channel_tree(
-        result.channels,
-        &[
-            (root_id, &[]),
-            (alpha_id, &[root_id]),
-            (beta_id, &[root_id]),
-            (gamma_id, &[root_id]),
-        ],
-    );
-
-    // Test moving beta up (should swap with alpha)
-    let updated_channels = db
-        .reorder_channel(beta_id, reorder_channel::Direction::Up, admin_id)
-        .await
-        .unwrap();
-
-    // Verify that beta and alpha were returned as updated
-    assert_eq!(updated_channels.len(), 2);
-    let updated_ids: std::collections::HashSet<_> = updated_channels.iter().map(|c| c.id).collect();
-    assert!(updated_ids.contains(&alpha_id));
-    assert!(updated_ids.contains(&beta_id));
-
-    // Now order should be: root, beta (order=1), alpha (order=2), gamma (order=3)
-    let result = db.get_channels_for_user(admin_id).await.unwrap();
-    assert_channel_tree(
-        result.channels,
-        &[
-            (root_id, &[]),
-            (beta_id, &[root_id]),
-            (alpha_id, &[root_id]),
-            (gamma_id, &[root_id]),
-        ],
-    );
-
-    // Test moving gamma down (should be no-op since it's already last)
-    let updated_channels = db
-        .reorder_channel(gamma_id, reorder_channel::Direction::Down, admin_id)
-        .await
-        .unwrap();
-
-    // Should return just gamma (no change)
-    assert_eq!(updated_channels.len(), 1);
-    assert_eq!(updated_channels[0].id, gamma_id);
-
-    // Test moving alpha down (should swap with gamma)
-    let updated_channels = db
-        .reorder_channel(alpha_id, reorder_channel::Direction::Down, admin_id)
-        .await
-        .unwrap();
-
-    // Verify that alpha and gamma were returned as updated
-    assert_eq!(updated_channels.len(), 2);
-    let updated_ids: std::collections::HashSet<_> = updated_channels.iter().map(|c| c.id).collect();
-    assert!(updated_ids.contains(&alpha_id));
-    assert!(updated_ids.contains(&gamma_id));
-
-    // Now order should be: root, beta (order=1), gamma (order=2), alpha (order=3)
-    let result = db.get_channels_for_user(admin_id).await.unwrap();
-    assert_channel_tree(
-        result.channels,
-        &[
-            (root_id, &[]),
-            (beta_id, &[root_id]),
-            (gamma_id, &[root_id]),
-            (alpha_id, &[root_id]),
-        ],
-    );
-
-    // Test that non-admin cannot reorder
-    let reorder_result = db
-        .reorder_channel(beta_id, reorder_channel::Direction::Up, user_id)
-        .await;
-    assert!(reorder_result.is_err());
-
-    // Test moving beta up (should be no-op since it's already first)
-    let updated_channels = db
-        .reorder_channel(beta_id, reorder_channel::Direction::Up, admin_id)
-        .await
-        .unwrap();
-
-    // Should return just beta (no change)
-    assert_eq!(updated_channels.len(), 1);
-    assert_eq!(updated_channels[0].id, beta_id);
-}
-
 test_both_dbs!(
    test_db_channel_moving_bugs,
    test_db_channel_moving_bugs_postgres,
--- a/crates/collab/src/rpc.rs
+++ b/crates/collab/src/rpc.rs
@@ -384,7 +384,6 @@ impl Server {
            .add_request_handler(get_notifications)
            .add_request_handler(mark_notification_as_read)
            .add_request_handler(move_channel)
-            .add_request_handler(reorder_channel)
            .add_request_handler(follow)
            .add_message_handler(unfollow)
            .add_message_handler(update_followers)
@@ -434,6 +433,16 @@ impl Server {
                tracing::info!("waiting for cleanup timeout");
                timeout.await;
                tracing::info!("cleanup timeout expired, retrieving stale rooms");
+
+                app_state
+                    .db
+                    .delete_stale_channel_chat_participants(
+                        &app_state.config.zed_environment,
+                        server_id,
+                    )
+                    .await
+                    .trace_err();
+
                if let Some((room_ids, channel_ids)) = app_state
                    .db
                    .stale_server_resource_ids(&app_state.config.zed_environment, server_id)
@@ -555,6 +564,21 @@ impl Server {
                    }
                }

+                app_state
+                    .db
+                    .delete_stale_channel_chat_participants(
+                        &app_state.config.zed_environment,
+                        server_id,
+                    )
+                    .await
+                    .trace_err();
+
+                app_state
+                    .db
+                    .clear_old_worktree_entries(server_id)
+                    .await
+                    .trace_err();
+
                app_state
                    .db
                    .delete_stale_servers(&app_state.config.zed_environment, server_id)
@@ -3196,55 +3220,6 @@ async fn move_channel(
    Ok(())
 }

-async fn reorder_channel(
-    request: proto::ReorderChannel,
-    response: Response<proto::ReorderChannel>,
-    session: Session,
-) -> Result<()> {
-    let channel_id = ChannelId::from_proto(request.channel_id);
-    let direction = request.direction();
-
-    let updated_channels = session
-        .db()
-        .await
-        .reorder_channel(channel_id, direction, session.user_id())
-        .await?;
-
-    // Get the root channel to find all connections that need updates
-    let root_id = updated_channels
-        .first()
-        .map(|channel| channel.root_id())
-        .unwrap_or(channel_id);
-
-    let connection_pool = session.connection_pool().await;
-    for (connection_id, role) in connection_pool.channel_connection_ids(root_id) {
-        let channels = updated_channels
-            .iter()
-            .filter_map(|channel| {
-                if role.can_see_channel(channel.visibility) {
-                    Some(channel.to_proto())
-                } else {
-                    None
-                }
-            })
-            .collect::<Vec<_>>();
-
-        if channels.is_empty() {
-            continue;
-        }
-
-        let update = proto::UpdateChannels {
-            channels,
-            ..Default::default()
-        };
-
-        session.peer.send(connection_id, update.clone())?;
-    }
-
-    response.send(Ack {})?;
-    Ok(())
-}
-
 /// Get the list of channel members
 async fn get_channel_members(
    request: proto::GetChannelMembers,
--- a/crates/collab/src/stripe_client/real_stripe_client.rs
+++ b/crates/collab/src/stripe_client/real_stripe_client.rs
@@ -3,7 +3,7 @@ use std::sync::Arc;

 use anyhow::{Context as _, Result, anyhow};
 use async_trait::async_trait;
-use serde::Serialize;
+use serde::{Deserialize, Serialize};
 use stripe::{
    CancellationDetails, CancellationDetailsReason, CheckoutSession, CheckoutSessionMode,
    CheckoutSessionPaymentMethodCollection, CreateCheckoutSession, CreateCheckoutSessionLineItems,
@@ -213,9 +213,18 @@ impl StripeClient for RealStripeClient {
    }

    async fn create_meter_event(&self, params: StripeCreateMeterEventParams<'_>) -> Result<()> {
+        #[derive(Deserialize)]
+        struct StripeMeterEvent {
+            pub identifier: String,
+        }
+
        let identifier = params.identifier;
-        match self.client.post_form("/billing/meter_events", params).await {
-            Ok(event) => Ok(event),
+        match self
+            .client
+            .post_form::<StripeMeterEvent, _>("/billing/meter_events", params)
+            .await
+        {
+            Ok(_event) => Ok(()),
            Err(stripe::StripeError::Stripe(error)) => {
                if error.http_status == 400
                    && error
@@ -228,7 +237,7 @@ impl StripeClient for RealStripeClient {
                    Err(anyhow!(stripe::StripeError::Stripe(error)))
                }
            }
-            Err(error) => Err(anyhow!(error)),
+            Err(error) => Err(anyhow!("failed to create meter event: {error:?}")),
        }
    }

--- a/crates/collab/src/tests/following_tests.rs
+++ b/crates/collab/src/tests/following_tests.rs
@@ -1010,7 +1010,6 @@ async fn test_peers_following_each_other(cx_a: &mut TestAppContext, cx_b: &mut T
    workspace_b.update_in(cx_b, |workspace, window, cx| {
        workspace.active_pane().update(cx, |pane, cx| {
            pane.close_inactive_items(&Default::default(), window, cx)
-                .unwrap()
                .detach();
        });
    });
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-list-todo-icon lucide-list-todo"><rect x="3" y="5" width="6" height="6" rx="1"/><path d="m3 17 2 2 4-4"/><path d="M13 6h8"/><path d="M13 12h8"/><path d="M13 18h8"/></svg>`