fix workspace-hack

move apm (webrtc audio processor) to audio crate
adds error handling to audio input pipeline
2025-08-26 15:10:14 +02:00 · 2025-08-26 15:06:52 +02:00 · 2025-08-26 12:37:10 +02:00 · 2025-08-26 12:17:17 +02:00 · 2025-08-26 12:12:01 +02:00 · 2025-08-25 16:13:09 +02:00
207 changed files with 8380 additions and 12281 deletions
--- a/.config/hakari.toml
+++ b/.config/hakari.toml
@ -26,7 +26,7 @@ third-party = [
    # build of remote_server should not include scap / its x11 dependency
    { name = "scap", git = "https://github.com/zed-industries/scap", rev = "808aa5c45b41e8f44729d02e38fd00a2fe2722e7" },
    # build of remote_server should not need to include on libalsa through rodio
-    { name = "rodio" },
+    # { name = "rodio" },
 ]
 [final-excludes]
--- a/.github/ISSUE_TEMPLATE/10_bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/10_bug_report.yml
@ -14,7 +14,7 @@ body:
        ### Description
        <!--  Describe with sufficient detail to reproduce from a clean Zed install.
          - Any code must be sufficient to reproduce (include context!)
-          - Include code as text, not just as a screenshot.
+          - Code must as text, not just as a screenshot.
          - Issues with insufficient detail may be summarily closed.
        -->
--- a/Cargo.lock
+++ b/Cargo.lock
@ -39,26 +39,6 @@ dependencies = [
 "workspace-hack",
 ]
 [[package]]
 name = "acp_tools"
 version = "0.1.0"
 dependencies = [
 "agent-client-protocol",
 "collections",
 "gpui",
 "language",
 "markdown",
 "project",
 "serde",
 "serde_json",
 "settings",
 "theme",
 "ui",
 "util",
 "workspace",
 "workspace-hack",
 ]
 [[package]]
 name = "action_log"
 version = "0.1.0"
@ -191,12 +171,11 @@ dependencies = [
 [[package]]
 name = "agent-client-protocol"
-version = "0.0.31"
+version = "0.0.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "289eb34ee17213dadcca47eedadd386a5e7678094095414e475965d1bcca2860"
+checksum = "5f792e009ba59b137ee1db560bc37e567887ad4b5af6f32181d381fff690e2d4"
 dependencies = [
 "anyhow",
 "async-broadcast",
 "futures 0.3.31",
 "log",
 "parking_lot",
@ -285,10 +264,10 @@ name = "agent_servers"
 version = "0.1.0"
 dependencies = [
 "acp_thread",
 "acp_tools",
 "action_log",
 "agent-client-protocol",
 "agent_settings",
 "agentic-coding-protocol",
 "anyhow",
 "client",
 "collections",
@ -403,7 +382,6 @@ dependencies = [
 "parking_lot",
 "paths",
 "picker",
 "postage",
 "pretty_assertions",
 "project",
 "prompt_store",
@ -443,6 +421,24 @@ dependencies = [
 "zed_actions",
 ]
 [[package]]
 name = "agentic-coding-protocol"
 version = "0.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a3e6ae951b36fa2f8d9dd6e1af6da2fcaba13d7c866cf6a9e65deda9dc6c5fe4"
 dependencies = [
 "anyhow",
 "chrono",
 "derive_more 2.0.1",
 "futures 0.3.31",
 "log",
 "parking_lot",
 "schemars",
 "semver",
 "serde",
 "serde_json",
 ]
 [[package]]
 name = "ahash"
 version = "0.7.8"
@ -858,7 +854,7 @@ dependencies = [
 "anyhow",
 "async-trait",
 "collections",
- "derive_more",
+ "derive_more 0.99.19",
 "extension",
 "futures 0.3.31",
 "gpui",
@ -921,7 +917,7 @@ dependencies = [
 "clock",
 "collections",
 "ctor",
- "derive_more",
+ "derive_more 0.99.19",
 "gpui",
 "icons",
 "indoc",
@ -958,7 +954,7 @@ dependencies = [
 "cloud_llm_client",
 "collections",
 "component",
- "derive_more",
+ "derive_more 0.99.19",
 "diffy",
 "editor",
 "feature_flags",
@ -1385,6 +1381,8 @@ dependencies = [
 "anyhow",
 "collections",
 "gpui",
 "libwebrtc",
 "parking_lot",
 "rodio",
 "schemars",
 "serde",
@ -2685,7 +2683,7 @@ dependencies = [
 "cap-primitives",
 "cap-std",
 "io-lifetimes",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 [[package]]
@ -2714,7 +2712,7 @@ dependencies = [
 "maybe-owned",
 "rustix 1.0.7",
 "rustix-linux-procfs",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 "winx",
 ]
@ -3071,7 +3069,7 @@ dependencies = [
 "cocoa 0.26.0",
 "collections",
 "credentials_provider",
- "derive_more",
+ "derive_more 0.99.19",
 "feature_flags",
 "fs",
 "futures 0.3.31",
@ -3503,7 +3501,7 @@ name = "command_palette_hooks"
 version = "0.1.0"
 dependencies = [
 "collections",
- "derive_more",
+ "derive_more 0.99.19",
 "gpui",
 "workspace-hack",
 ]
@ -4666,6 +4664,27 @@ dependencies = [
 "syn 2.0.101",
 ]
 [[package]]
 name = "derive_more"
 version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678"
 dependencies = [
 "derive_more-impl",
 ]
 [[package]]
 name = "derive_more-impl"
 version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3"
 dependencies = [
 "proc-macro2",
 "quote",
 "syn 2.0.101",
 "unicode-xid",
 ]
 [[package]]
 name = "derive_refineable"
 version = "0.1.0"
@ -4686,6 +4705,7 @@ dependencies = [
 "component",
 "ctor",
 "editor",
 "futures 0.3.31",
 "gpui",
 "indoc",
 "language",
@ -5309,7 +5329,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e"
 dependencies = [
 "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 [[package]]
@ -5696,7 +5716,7 @@ checksum = "0ce92ff622d6dadf7349484f42c93271a0d49b7cc4d466a936405bacbe10aa78"
 dependencies = [
 "cfg-if",
 "rustix 1.0.7",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 [[package]]
@ -6074,7 +6094,7 @@ checksum = "94e7099f6313ecacbe1256e8ff9d617b75d1bcb16a6fddef94866d225a01a14a"
 dependencies = [
 "io-lifetimes",
 "rustix 1.0.7",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 [[package]]
@ -6401,7 +6421,7 @@ dependencies = [
 "askpass",
 "async-trait",
 "collections",
- "derive_more",
+ "derive_more 0.99.19",
 "futures 0.3.31",
 "git2",
 "gpui",
@ -7431,7 +7451,7 @@ dependencies = [
 "core-video",
 "cosmic-text",
 "ctor",
- "derive_more",
+ "derive_more 0.99.19",
 "embed-resource",
 "env_logger 0.11.8",
 "etagere",
@ -7956,7 +7976,7 @@ version = "0.1.0"
 dependencies = [
 "anyhow",
 "bytes 1.10.1",
- "derive_more",
+ "derive_more 0.99.19",
 "futures 0.3.31",
 "http 1.3.1",
 "http-body 1.0.1",
@ -8468,7 +8488,6 @@ dependencies = [
 "theme",
 "ui",
 "util",
 "util_macros",
 "workspace",
 "workspace-hack",
 "zed_actions",
@ -8534,7 +8553,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2285ddfe3054097ef4b2fe909ef8c3bcd1ea52a8f0d274416caebeef39f04a65"
 dependencies = [
 "io-lifetimes",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 [[package]]
@ -8607,7 +8626,7 @@ checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9"
 dependencies = [
 "hermit-abi 0.5.0",
 "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 [[package]]
@ -8689,7 +8708,7 @@ dependencies = [
 "portable-atomic",
 "portable-atomic-util",
 "serde",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 [[package]]
@ -9389,7 +9408,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
 dependencies = [
 "cfg-if",
- "windows-targets 0.52.6",
+ "windows-targets 0.48.5",
 ]
 [[package]]
@ -9611,6 +9630,7 @@ dependencies = [
 "core-video",
 "coreaudio-rs 0.12.1",
 "cpal",
 "dasp_sample",
 "futures 0.3.31",
 "gpui",
 "gpui_tokio",
@ -13044,7 +13064,7 @@ dependencies = [
 "once_cell",
 "socket2",
 "tracing",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 [[package]]
@ -13521,7 +13541,6 @@ dependencies = [
 "smol",
 "sysinfo",
 "telemetry_events",
 "thiserror 2.0.12",
 "toml 0.8.20",
 "unindent",
 "util",
@ -13857,14 +13876,15 @@ dependencies = [
 [[package]]
 name = "rodio"
 version = "0.21.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/RustAudio/rodio?branch=microphone#cad73716a363a5ba92fcb73ec37a4b98a7d7de5f"
 checksum = "e40ecf59e742e03336be6a3d53755e789fd05a059fa22dfa0ed624722319e183"
 dependencies = [
 "cpal",
 "dasp_sample",
 "hound",
 "num-rational",
 "rtrb",
 "symphonia",
 "thiserror 2.0.12",
 "tracing",
 ]
@ -13939,6 +13959,12 @@ dependencies = [
 "zeroize",
 ]
 [[package]]
 name = "rtrb"
 version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ad8388ea1a9e0ea807e442e8263a699e7edcb320ecbcd21b4fa8ff859acce3ba"
 [[package]]
 name = "rules_library"
 version = "0.1.0"
@ -14080,7 +14106,7 @@ dependencies = [
 "itoa",
 "libc",
 "linux-raw-sys 0.4.15",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 [[package]]
@ -14093,7 +14119,7 @@ dependencies = [
 "errno 0.3.11",
 "libc",
 "linux-raw-sys 0.9.4",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 [[package]]
@ -14215,7 +14241,7 @@ dependencies = [
 "security-framework 3.2.0",
 "security-framework-sys",
 "webpki-root-certs",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 [[package]]
@ -14361,10 +14387,12 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fe8c9d1c68d67dd9f97ecbc6f932b60eb289c5dbddd8aa1405484a8fd2fcd984"
 dependencies = [
 "chrono",
 "dyn-clone",
 "indexmap",
 "ref-cast",
 "schemars_derive",
 "semver",
 "serde",
 "serde_json",
 ]
@ -15565,7 +15593,7 @@ dependencies = [
 "cfg-if",
 "libc",
 "psm",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 [[package]]
@ -15936,12 +15964,53 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "815c942ae7ee74737bb00f965fa5b5a2ac2ce7b6c01c0cc169bbeaf7abd5f5a9"
 dependencies = [
 "lazy_static",
 "symphonia-bundle-flac",
 "symphonia-bundle-mp3",
 "symphonia-codec-aac",
 "symphonia-codec-pcm",
 "symphonia-codec-vorbis",
 "symphonia-core",
 "symphonia-format-isomp4",
 "symphonia-format-ogg",
 "symphonia-format-riff",
 "symphonia-metadata",
 ]
 [[package]]
 name = "symphonia-bundle-flac"
 version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72e34f34298a7308d4397a6c7fbf5b84c5d491231ce3dd379707ba673ab3bd97"
 dependencies = [
 "log",
 "symphonia-core",
 "symphonia-metadata",
 "symphonia-utils-xiph",
 ]
 [[package]]
 name = "symphonia-bundle-mp3"
 version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c01c2aae70f0f1fb096b6f0ff112a930b1fb3626178fba3ae68b09dce71706d4"
 dependencies = [
 "lazy_static",
 "log",
 "symphonia-core",
 "symphonia-metadata",
 ]
 [[package]]
 name = "symphonia-codec-aac"
 version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cdbf25b545ad0d3ee3e891ea643ad115aff4ca92f6aec472086b957a58522f70"
 dependencies = [
 "lazy_static",
 "log",
 "symphonia-core",
 ]
 [[package]]
 name = "symphonia-codec-pcm"
 version = "0.5.4"
@ -15952,6 +16021,17 @@ dependencies = [
 "symphonia-core",
 ]
 [[package]]
 name = "symphonia-codec-vorbis"
 version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a98765fb46a0a6732b007f7e2870c2129b6f78d87db7987e6533c8f164a9f30"
 dependencies = [
 "log",
 "symphonia-core",
 "symphonia-utils-xiph",
 ]
 [[package]]
 name = "symphonia-core"
 version = "0.5.4"
@ -15965,6 +16045,31 @@ dependencies = [
 "log",
 ]
 [[package]]
 name = "symphonia-format-isomp4"
 version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "abfdf178d697e50ce1e5d9b982ba1b94c47218e03ec35022d9f0e071a16dc844"
 dependencies = [
 "encoding_rs",
 "log",
 "symphonia-core",
 "symphonia-metadata",
 "symphonia-utils-xiph",
 ]
 [[package]]
 name = "symphonia-format-ogg"
 version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ada3505789516bcf00fc1157c67729eded428b455c27ca370e41f4d785bfa931"
 dependencies = [
 "log",
 "symphonia-core",
 "symphonia-metadata",
 "symphonia-utils-xiph",
 ]
 [[package]]
 name = "symphonia-format-riff"
 version = "0.5.4"
@ -15989,6 +16094,16 @@ dependencies = [
 "symphonia-core",
 ]
 [[package]]
 name = "symphonia-utils-xiph"
 version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "484472580fa49991afda5f6550ece662237b00c6f562c7d9638d1b086ed010fe"
 dependencies = [
 "symphonia-core",
 "symphonia-metadata",
 ]
 [[package]]
 name = "syn"
 version = "1.0.109"
@ -16136,7 +16251,7 @@ dependencies = [
 "fd-lock",
 "io-lifetimes",
 "rustix 0.38.44",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 "winx",
 ]
@ -16318,7 +16433,7 @@ dependencies = [
 "getrandom 0.3.2",
 "once_cell",
 "rustix 1.0.7",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 [[package]]
@ -16448,7 +16563,7 @@ version = "0.1.0"
 dependencies = [
 "anyhow",
 "collections",
- "derive_more",
+ "derive_more 0.99.19",
 "fs",
 "futures 0.3.31",
 "gpui",
@ -18880,7 +18995,7 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.48.0",
 ]
 [[package]]
@ -19539,7 +19654,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f3fd376f71958b862e7afb20cfe5a22830e1963462f3a17f49d82a6c1d1f42d"
 dependencies = [
 "bitflags 2.9.0",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 [[package]]
@ -19789,6 +19904,7 @@ dependencies = [
 "any_vec",
 "anyhow",
 "async-recursion",
 "bincode",
 "call",
 "client",
 "clock",
@ -19807,7 +19923,6 @@ dependencies = [
 "node_runtime",
 "parking_lot",
 "postage",
 "pretty_assertions",
 "project",
 "remote",
 "schemars",
@ -19916,6 +20031,7 @@ dependencies = [
 "libsqlite3-sys",
 "linux-raw-sys 0.4.15",
 "linux-raw-sys 0.9.4",
 "livekit-runtime",
 "log",
 "lyon",
 "lyon_path",
@ -19957,12 +20073,14 @@ dependencies = [
 "regex-automata 0.4.9",
 "regex-syntax 0.8.5",
 "ring",
 "rodio",
 "rust_decimal",
 "rustc-hash 1.1.0",
 "rustix 0.38.44",
 "rustix 1.0.7",
 "rustls 0.23.26",
 "rustls-webpki 0.103.1",
 "schemars",
 "scopeguard",
 "sea-orm",
 "sea-query-binder",
@ -20398,7 +20516,6 @@ dependencies = [
 name = "zed"
 version = "0.202.0"
 dependencies = [
 "acp_tools",
 "activity_indicator",
 "agent",
 "agent_servers",
--- a/Cargo.toml
+++ b/Cargo.toml
@ -1,7 +1,6 @@
 [workspace]
 resolver = "2"
 members = [
    "crates/acp_tools",
    "crates/acp_thread",
    "crates/action_log",
    "crates/activity_indicator",
@ -228,7 +227,6 @@ edition = "2024"
 # Workspace member crates
 #
 acp_tools = { path = "crates/acp_tools" }
 acp_thread = { path = "crates/acp_thread" }
 action_log = { path = "crates/action_log" }
 agent = { path = "crates/agent" }
@ -363,7 +361,7 @@ remote_server = { path = "crates/remote_server" }
 repl = { path = "crates/repl" }
 reqwest_client = { path = "crates/reqwest_client" }
 rich_text = { path = "crates/rich_text" }
-rodio = { version = "0.21.1", default-features = false }
+rodio = { git = "https://github.com/RustAudio/rodio", branch = "microphone"}
 rope = { path = "crates/rope" }
 rpc = { path = "crates/rpc" }
 rules_library = { path = "crates/rules_library" }
@ -426,7 +424,8 @@ zlog_settings = { path = "crates/zlog_settings" }
 # External crates
 #
-agent-client-protocol = "0.0.31"
+agentic-coding-protocol = "0.0.10"
 agent-client-protocol = "0.0.30"
 aho-corasick = "1.1"
 alacritty_terminal = { git = "https://github.com/zed-industries/alacritty.git", branch = "add-hush-login-flag" }
 any_vec = "0.14"
--- a/GLOSSARY.md
+++ b/GLOSSARY.md
@ -0,0 +1,68 @@
 TODO dvdsk copy latest from notes
 These are some terms and structures frequently used throughout the zed codebase. This is a best effort list. PR's are very welcome.
 Questions:
 - Can we generate this list form doc comments throughout zed?
 ## GPUI
 - `Context`: A wrapper around the App struct with specialized behavior for a specific Entity
 - `App`: A singleton which holds the full application state including all the entities.
 - `AsyncApp`:
 - `Window`:
 - `Task`:
 - `Executor`:
  - both background and foreground
 - `Entity`: A strong, well-typed reference to a struct which is managed by gpui. Effectively a pointer into the Context.
 - `Global`: A singleton type which has only one value
 - `Event`: A datatype which can be send by an Entity to subscribers
 - `Action`: An event that represents a user's keyboard input that can be handled by listerners
  Example: `file finder: toggle`
 - `Subscription`: An event handler that is used to react to the changes of state in the application.
  1. Emitted event handling
  2. Observing {new,release,on notify} of an entity
 - `Focus`: The place where keystrokes are handled first
 - `Element`: An type that can be rendered
 - `AnyElement`: A type erased version of an Element
 - `element expression`: An expression that builds an element tree, example:
 ```
 h_flex()
    .id(text[i])
    .relative()
    .when(selected, |this| {
        this.child(
            div()
                .h_4()
                .absolute()
                etc etc
 ```
 ## Zed
 - `Workspace`: The root of the window <TODO add image>
 - `Buffer`: The in memory representation of a 'file' together with relevant data such as syntax trees, git status and diagnostics.
 - `Picker`: A model showing a list of items. When an item is selected you can confirm the item and then something happens. <TODO add image>
 - `PickerDelegate`: A trait used to specialize behavior for a Picker
 - `Modal`: todo! <TODO add image>
 - `Project`: todo! <TODO add image>
 - `Stores`: todo!
 ## Collab
 - `Upstream client`: The zed client which has shared their workspace
 - `Downstream client`: The zed client joining a shared workspace
 ## Debugger
 - `DapStore`: Is an entity that manages debugger sessions
 - `debugger::Session`: Is an entity that manages the lifecycle of a debug session and communication with DAPS
 - `BreakpointStore`: Is an entity that manages breakpoints states in local and remote instances of Zed
 - `DebugSession`: Manages a debug session's UI and running state
 - `RunningState`: Directily manages all the views of a debug session
 - `VariableList`: The variable and watch list view of a debug session
 - `Console`
 - `Terminal`
 - `BreakpointList`
 - `
--- a/Procfile.web
+++ b/Procfile.web
@ -1,2 +0,0 @@
 postgrest_llm: postgrest crates/collab/postgrest_llm.conf
 website: cd ../zed.dev; npm run dev -- --port=3000
--- a/assets/icons/copy.svg
+++ b/assets/icons/copy.svg
@ -1,4 +1 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M12.286 6H7.048C6.469 6 6 6.469 6 7.048v5.238c0 .578.469 1.047 1.048 1.047h5.238c.578 0 1.047-.469 1.047-1.047V7.048c0-.579-.469-1.048-1.047-1.048Z"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2" d="M3.714 10a1.05 1.05 0 0 1-1.047-1.048V3.714a1.05 1.05 0 0 1 1.047-1.047h5.238A1.05 1.05 0 0 1 10 3.714"/></svg>
 <path d="M12.486 6.2H7.24795C6.66895 6.2 6.19995 6.669 6.19995 7.248V12.486C6.19995 13.064 6.66895 13.533 7.24795 13.533H12.486C13.064 13.533 13.533 13.064 13.533 12.486V7.248C13.533 6.669 13.064 6.2 12.486 6.2Z" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 <path d="M3.91712 10.203C3.63951 10.2022 3.37351 10.0915 3.1773 9.89511C2.98109 9.69872 2.87064 9.43261 2.87012 9.155V3.917C2.87091 3.63956 2.98147 3.37371 3.17765 3.17753C3.37383 2.98135 3.63968 2.87079 3.91712 2.87H9.15512C9.43273 2.87053 9.69883 2.98097 9.89523 3.17718C10.0916 3.37339 10.2023 3.63939 10.2031 3.917" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
--- a/assets/icons/terminal_ghost.svg
+++ b/assets/icons/terminal_ghost.svg
@ -1,4 +0,0 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M8 12.375H13" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 <path d="M3 11.125L6.75003 7.375L3 3.62497" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
--- a/assets/images/acp_grid.svg
+++ b/assets/images/acp_grid.svg
--- a/assets/images/acp_logo.svg
+++ b/assets/images/acp_logo.svg
@ -1 +0,0 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="160" height="61" fill="none"><g clip-path="url(#a)"><path fill="#000" d="M130.75.385c5.428 0 10.297 2.81 13.011 7.511l14.214 24.618-.013-.005c2.599 4.504 2.707 9.932.28 14.513-2.618 4.944-7.862 8.015-13.679 8.015h-31.811c-.452 0-.873-.242-1.103-.637a1.268 1.268 0 0 1 0-1.274l3.919-6.78c.223-.394.65-.636 1.102-.636h28.288a5.622 5.622 0 0 0 4.925-2.849 5.615 5.615 0 0 0 0-5.69l-14.214-24.617a5.621 5.621 0 0 0-4.925-2.848 5.621 5.621 0 0 0-4.925 2.848l-14.214 24.618a6.267 6.267 0 0 0-.319.643.998.998 0 0 1-.069.14L101.724 54.4l-.823 1.313-2.529 4.39a1.27 1.27 0 0 1-1.103.636h-7.83c-.452 0-.873-.242-1.102-.637-.23-.394-.23-.879 0-1.274l2.188-3.791H66.803c-3.32 0-6.454-1.122-8.818-3.167a17.141 17.141 0 0 1-3.394-3.96 1.261 1.261 0 0 1-.091-.137L34.2 12.573a5.622 5.622 0 0 0-4.925-2.849 5.621 5.621 0 0 0-4.924 2.85L10.137 37.19a5.615 5.615 0 0 0 0 5.69 5.63 5.63 0 0 0 4.925 2.841h29.862a1.276 1.276 0 0 1 1.102 1.912l-3.912 6.778a1.27 1.27 0 0 1-1.102.638H14.495c-3.32 0-6.454-1.128-8.817-3.173-5.906-5.104-7.36-12.883-3.62-19.363L16.267 7.89C18.872 3.385 23.517.583 28.697.39c.184-.006.356-.006.534-.006 5.378 0 10.45 3.007 13.246 7.85l12.986 22.372L68.58 7.891C71.186 3.385 75.83.582 81.01.39c.185-.006.358-.006.536-.006 4.453 0 8.71 2.039 11.672 5.588.337.407.388.98.127 1.446l-3.765 6.6a1.268 1.268 0 0 1-2.205.006l-.847-1.465a5.623 5.623 0 0 0-4.926-2.848 5.622 5.622 0 0 0-4.924 2.848L62.464 37.18a5.614 5.614 0 0 0 0 5.689 5.628 5.628 0 0 0 4.925 2.842H95.91L117.76 7.87c2.714-4.683 7.575-7.486 12.99-7.486Z"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 .385h160v60.36H0z"/></clipPath></defs></svg>
--- a/assets/images/acp_logo_serif.svg
+++ b/assets/images/acp_logo_serif.svg
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@ -16,6 +16,7 @@
      "up": "menu::SelectPrevious",
      "enter": "menu::Confirm",
      "ctrl-enter": "menu::SecondaryConfirm",
      "ctrl-escape": "menu::Cancel",
      "ctrl-c": "menu::Cancel",
      "escape": "menu::Cancel",
      "alt-shift-enter": "menu::Restart",
@ -40,7 +41,7 @@
      "shift-f11": "debugger::StepOut",
      "f11": "zed::ToggleFullScreen",
      "ctrl-alt-z": "edit_prediction::RateCompletions",
-      "ctrl-alt-shift-i": "edit_prediction::ToggleMenu",
+      "ctrl-shift-i": "edit_prediction::ToggleMenu",
      "ctrl-alt-l": "lsp_tool::ToggleMenu"
    }
  },
@ -120,7 +121,7 @@
      "alt-g m": "git::OpenModifiedFiles",
      "menu": "editor::OpenContextMenu",
      "shift-f10": "editor::OpenContextMenu",
-      "ctrl-alt-shift-e": "editor::ToggleEditPrediction",
+      "ctrl-shift-e": "editor::ToggleEditPrediction",
      "f9": "editor::ToggleBreakpoint",
      "shift-f9": "editor::EditLogBreakpoint"
    }
@ -855,7 +856,7 @@
      "ctrl-backspace": ["project_panel::Delete", { "skip_prompt": false }],
      "ctrl-delete": ["project_panel::Delete", { "skip_prompt": false }],
      "alt-ctrl-r": "project_panel::RevealInFileManager",
-      "ctrl-shift-enter": "workspace::OpenWithSystem",
+      "ctrl-shift-enter": "project_panel::OpenWithSystem",
      "alt-d": "project_panel::CompareMarkedFiles",
      "shift-find": "project_panel::NewSearchInDirectory",
      "ctrl-alt-shift-f": "project_panel::NewSearchInDirectory",
@ -1194,16 +1195,9 @@
      "ctrl-1": "onboarding::ActivateBasicsPage",
      "ctrl-2": "onboarding::ActivateEditingPage",
      "ctrl-3": "onboarding::ActivateAISetupPage",
-      "ctrl-enter": "onboarding::Finish",
+      "ctrl-escape": "onboarding::Finish",
-      "alt-shift-l": "onboarding::SignIn",
+      "alt-tab": "onboarding::SignIn",
      "alt-shift-a": "onboarding::OpenAccount"
    }
  },
  {
    "context": "InvalidBuffer",
    "use_key_equivalents": true,
    "bindings": {
      "ctrl-shift-enter": "workspace::OpenWithSystem"
    }
  }
 ]
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@ -915,7 +915,7 @@
      "cmd-backspace": ["project_panel::Trash", { "skip_prompt": true }],
      "cmd-delete": ["project_panel::Delete", { "skip_prompt": false }],
      "alt-cmd-r": "project_panel::RevealInFileManager",
-      "ctrl-shift-enter": "workspace::OpenWithSystem",
+      "ctrl-shift-enter": "project_panel::OpenWithSystem",
      "alt-d": "project_panel::CompareMarkedFiles",
      "cmd-alt-backspace": ["project_panel::Delete", { "skip_prompt": false }],
      "cmd-alt-shift-f": "project_panel::NewSearchInDirectory",
@ -1301,12 +1301,5 @@
      "alt-tab": "onboarding::SignIn",
      "alt-shift-a": "onboarding::OpenAccount"
    }
  },
  {
    "context": "InvalidBuffer",
    "use_key_equivalents": true,
    "bindings": {
      "ctrl-shift-enter": "workspace::OpenWithSystem"
    }
  }
 ]
--- a/assets/keymaps/default-windows.json
+++ b/assets/keymaps/default-windows.json
--- a/assets/keymaps/linux/emacs.json
+++ b/assets/keymaps/linux/emacs.json
@ -38,7 +38,6 @@
      "alt-;": ["editor::ToggleComments", { "advance_downwards": false }],
      "ctrl-x ctrl-;": "editor::ToggleComments",
      "alt-.": "editor::GoToDefinition", // xref-find-definitions
      "alt-?": "editor::FindAllReferences", // xref-find-references
      "alt-,": "pane::GoBack", // xref-pop-marker-stack
      "ctrl-x h": "editor::SelectAll", // mark-whole-buffer
      "ctrl-d": "editor::Delete", // delete-char
--- a/assets/keymaps/macos/emacs.json
+++ b/assets/keymaps/macos/emacs.json
@ -38,7 +38,6 @@
      "alt-;": ["editor::ToggleComments", { "advance_downwards": false }],
      "ctrl-x ctrl-;": "editor::ToggleComments",
      "alt-.": "editor::GoToDefinition", // xref-find-definitions
      "alt-?": "editor::FindAllReferences", // xref-find-references
      "alt-,": "pane::GoBack", // xref-pop-marker-stack
      "ctrl-x h": "editor::SelectAll", // mark-whole-buffer
      "ctrl-d": "editor::Delete", // delete-char
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@ -428,13 +428,11 @@
      "g h": "vim::StartOfLine",
      "g s": "vim::FirstNonWhitespace", // "g s" default behavior is "space s"
      "g e": "vim::EndOfDocument",
      "g .": "vim::HelixGotoLastModification", // go to last modification
      "g r": "editor::FindAllReferences", // zed specific
      "g t": "vim::WindowTop",
      "g c": "vim::WindowMiddle",
      "g b": "vim::WindowBottom",
      "shift-r": "editor::Paste",
      "x": "editor::SelectLine",
      "shift-x": "editor::SelectLine",
      "%": "editor::SelectAll",
@ -821,7 +819,7 @@
      "v": "project_panel::OpenPermanent",
      "p": "project_panel::Open",
      "x": "project_panel::RevealInFileManager",
-      "s": "workspace::OpenWithSystem",
+      "s": "project_panel::OpenWithSystem",
      "z d": "project_panel::CompareMarkedFiles",
      "] c": "project_panel::SelectNextGitEntry",
      "[ c": "project_panel::SelectPrevGitEntry",
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@ -162,12 +162,6 @@
  //  2. Always quit the application
  //         "on_last_window_closed": "quit_app",
  "on_last_window_closed": "platform_default",
  // Whether to show padding for zoomed panels.
  // When enabled, zoomed center panels (e.g. code editor) will have padding all around,
  // while zoomed bottom/left/right panels will have padding to the top/right/left (respectively).
  //
  // Default: true
  "zoomed_padding": true,
  // Whether to use the system provided dialogs for Open and Save As.
  // When set to false, Zed will use the built-in keyboard-first pickers.
  "use_system_path_prompts": true,
@ -653,8 +647,6 @@
      //    "never"
      "show": "always"
    },
    // Whether to enable drag-and-drop operations in the project panel.
    "drag_and_drop": true,
    // Whether to hide the root entry when only one folder is open in the window.
    "hide_root": false
  },
@ -1141,6 +1133,11 @@
      // The minimum severity of the diagnostics to show inline.
      // Inherits editor's diagnostics' max severity settings when `null`.
      "max_severity": null
    },
    "cargo": {
      // When enabled, Zed disables rust-analyzer's check on save and starts to query
      // Cargo diagnostics separately.
      "fetch_cargo_diagnostics": false
    }
  },
  // Files or globs of files that will be excluded by Zed entirely. They will be skipped during file
@ -1637,9 +1634,6 @@
        "allowed": true
      }
    },
    "Kotlin": {
      "language_servers": ["kotlin-language-server", "!kotlin-lsp", "..."]
    },
    "LaTeX": {
      "formatter": "language_server",
      "language_servers": ["texlab", "..."],
--- a/assets/settings/initial_tasks.json
+++ b/assets/settings/initial_tasks.json
@ -43,8 +43,8 @@
    //           "args": ["--login"]
    //         }
    //     }
-    "shell": "system"
+    "shell": "system",
    // Represents the tags for inline runnable indicators, or spawning multiple tasks at once.
-    // "tags": []
+    "tags": []
  }
 ]
--- a/assets/themes/ayu/ayu.json
+++ b/assets/themes/ayu/ayu.json
@ -93,7 +93,7 @@
        "terminal.ansi.bright_cyan": "#4c806fff",
        "terminal.ansi.dim_cyan": "#cbf2e4ff",
        "terminal.ansi.white": "#bfbdb6ff",
-        "terminal.ansi.bright_white": "#fafafaff",
+        "terminal.ansi.bright_white": "#bfbdb6ff",
        "terminal.ansi.dim_white": "#787876ff",
        "link_text.hover": "#5ac1feff",
        "conflict": "#feb454ff",
@ -479,7 +479,7 @@
        "terminal.ansi.bright_cyan": "#ace0cbff",
        "terminal.ansi.dim_cyan": "#2a5f4aff",
        "terminal.ansi.white": "#fcfcfcff",
-        "terminal.ansi.bright_white": "#ffffffff",
+        "terminal.ansi.bright_white": "#fcfcfcff",
        "terminal.ansi.dim_white": "#bcbec0ff",
        "link_text.hover": "#3b9ee5ff",
        "conflict": "#f1ad49ff",
@ -865,7 +865,7 @@
        "terminal.ansi.bright_cyan": "#4c806fff",
        "terminal.ansi.dim_cyan": "#cbf2e4ff",
        "terminal.ansi.white": "#cccac2ff",
-        "terminal.ansi.bright_white": "#fafafaff",
+        "terminal.ansi.bright_white": "#cccac2ff",
        "terminal.ansi.dim_white": "#898a8aff",
        "link_text.hover": "#72cffeff",
        "conflict": "#fecf72ff",
--- a/assets/themes/gruvbox/gruvbox.json
+++ b/assets/themes/gruvbox/gruvbox.json
@ -94,7 +94,7 @@
        "terminal.ansi.bright_cyan": "#45603eff",
        "terminal.ansi.dim_cyan": "#c7dfbdff",
        "terminal.ansi.white": "#fbf1c7ff",
-        "terminal.ansi.bright_white": "#ffffffff",
+        "terminal.ansi.bright_white": "#fbf1c7ff",
        "terminal.ansi.dim_white": "#b0a189ff",
        "link_text.hover": "#83a598ff",
        "version_control.added": "#b7bb26ff",
@ -494,7 +494,7 @@
        "terminal.ansi.bright_cyan": "#45603eff",
        "terminal.ansi.dim_cyan": "#c7dfbdff",
        "terminal.ansi.white": "#fbf1c7ff",
-        "terminal.ansi.bright_white": "#ffffffff",
+        "terminal.ansi.bright_white": "#fbf1c7ff",
        "terminal.ansi.dim_white": "#b0a189ff",
        "link_text.hover": "#83a598ff",
        "version_control.added": "#b7bb26ff",
@ -894,7 +894,7 @@
        "terminal.ansi.bright_cyan": "#45603eff",
        "terminal.ansi.dim_cyan": "#c7dfbdff",
        "terminal.ansi.white": "#fbf1c7ff",
-        "terminal.ansi.bright_white": "#ffffffff",
+        "terminal.ansi.bright_white": "#fbf1c7ff",
        "terminal.ansi.dim_white": "#b0a189ff",
        "link_text.hover": "#83a598ff",
        "version_control.added": "#b7bb26ff",
@ -1294,7 +1294,7 @@
        "terminal.ansi.bright_cyan": "#9fbca8ff",
        "terminal.ansi.dim_cyan": "#253e2eff",
        "terminal.ansi.white": "#fbf1c7ff",
-        "terminal.ansi.bright_white": "#ffffffff",
+        "terminal.ansi.bright_white": "#fbf1c7ff",
        "terminal.ansi.dim_white": "#b0a189ff",
        "link_text.hover": "#0b6678ff",
        "version_control.added": "#797410ff",
@ -1694,7 +1694,7 @@
        "terminal.ansi.bright_cyan": "#9fbca8ff",
        "terminal.ansi.dim_cyan": "#253e2eff",
        "terminal.ansi.white": "#f9f5d7ff",
-        "terminal.ansi.bright_white": "#ffffffff",
+        "terminal.ansi.bright_white": "#f9f5d7ff",
        "terminal.ansi.dim_white": "#b0a189ff",
        "link_text.hover": "#0b6678ff",
        "version_control.added": "#797410ff",
@ -2094,7 +2094,7 @@
        "terminal.ansi.bright_cyan": "#9fbca8ff",
        "terminal.ansi.dim_cyan": "#253e2eff",
        "terminal.ansi.white": "#f2e5bcff",
-        "terminal.ansi.bright_white": "#ffffffff",
+        "terminal.ansi.bright_white": "#f2e5bcff",
        "terminal.ansi.dim_white": "#b0a189ff",
        "link_text.hover": "#0b6678ff",
        "version_control.added": "#797410ff",
--- a/assets/themes/one/one.json
+++ b/assets/themes/one/one.json
@ -93,7 +93,7 @@
        "terminal.ansi.bright_cyan": "#3a565bff",
        "terminal.ansi.dim_cyan": "#b9d9dfff",
        "terminal.ansi.white": "#dce0e5ff",
-        "terminal.ansi.bright_white": "#fafafaff",
+        "terminal.ansi.bright_white": "#dce0e5ff",
        "terminal.ansi.dim_white": "#575d65ff",
        "link_text.hover": "#74ade8ff",
        "version_control.added": "#27a657ff",
@ -468,7 +468,7 @@
        "terminal.bright_foreground": "#242529ff",
        "terminal.dim_foreground": "#fafafaff",
        "terminal.ansi.black": "#242529ff",
-        "terminal.ansi.bright_black": "#747579ff",
+        "terminal.ansi.bright_black": "#242529ff",
        "terminal.ansi.dim_black": "#97979aff",
        "terminal.ansi.red": "#d36151ff",
        "terminal.ansi.bright_red": "#f0b0a4ff",
@ -489,7 +489,7 @@
        "terminal.ansi.bright_cyan": "#a3bedaff",
        "terminal.ansi.dim_cyan": "#254058ff",
        "terminal.ansi.white": "#fafafaff",
-        "terminal.ansi.bright_white": "#ffffffff",
+        "terminal.ansi.bright_white": "#fafafaff",
        "terminal.ansi.dim_white": "#aaaaaaff",
        "link_text.hover": "#5c78e2ff",
        "version_control.added": "#27a657ff",
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@ -183,15 +183,16 @@ impl ToolCall {
        language_registry: Arc<LanguageRegistry>,
        cx: &mut App,
    ) -> Self {
        let title = if let Some((first_line, _)) = tool_call.title.split_once("\n") {
            first_line.to_owned() + "…"
        } else {
            tool_call.title
        };
        Self {
            id: tool_call.id,
-            label: cx
+            label: cx.new(|cx| {
-                .new(|cx| Markdown::new(title.into(), Some(language_registry.clone()), None, cx)),
+                Markdown::new(
                    tool_call.title.into(),
                    Some(language_registry.clone()),
                    None,
                    cx,
                )
            }),
            kind: tool_call.kind,
            content: tool_call
                .content
@ -232,11 +233,7 @@ impl ToolCall {
        if let Some(title) = title {
            self.label.update(cx, |label, cx| {
-                if let Some((first_line, _)) = title.split_once("\n") {
+                label.replace(title, cx);
                    label.replace(first_line.to_owned() + "…", cx)
                } else {
                    label.replace(title, cx);
                }
            });
        }
@ -512,7 +509,7 @@ impl ContentBlock {
        "`Image`".into()
    }
-    pub fn to_markdown<'a>(&'a self, cx: &'a App) -> &'a str {
+    fn to_markdown<'a>(&'a self, cx: &'a App) -> &'a str {
        match self {
            ContentBlock::Empty => "",
            ContentBlock::Markdown { markdown } => markdown.read(cx).source(),
@ -759,8 +756,6 @@ pub struct AcpThread {
    connection: Rc<dyn AgentConnection>,
    session_id: acp::SessionId,
    token_usage: Option<TokenUsage>,
    prompt_capabilities: acp::PromptCapabilities,
    _observe_prompt_capabilities: Task<anyhow::Result<()>>,
 }
 #[derive(Debug)]
@ -775,12 +770,11 @@ pub enum AcpThreadEvent {
    Stopped,
    Error,
    LoadError(LoadError),
    PromptCapabilitiesUpdated,
 }
 impl EventEmitter<AcpThreadEvent> for AcpThread {}
-#[derive(PartialEq, Eq, Debug)]
+#[derive(PartialEq, Eq)]
 pub enum ThreadStatus {
    Idle,
    WaitingForToolConfirmation,
@ -827,20 +821,7 @@ impl AcpThread {
        project: Entity<Project>,
        action_log: Entity<ActionLog>,
        session_id: acp::SessionId,
        mut prompt_capabilities_rx: watch::Receiver<acp::PromptCapabilities>,
        cx: &mut Context<Self>,
    ) -> Self {
        let prompt_capabilities = *prompt_capabilities_rx.borrow();
        let task = cx.spawn::<_, anyhow::Result<()>>(async move |this, cx| {
            loop {
                let caps = prompt_capabilities_rx.recv().await?;
                this.update(cx, |this, cx| {
                    this.prompt_capabilities = caps;
                    cx.emit(AcpThreadEvent::PromptCapabilitiesUpdated);
                })?;
            }
        });
        Self {
            action_log,
            shared_buffers: Default::default(),
@ -852,15 +833,9 @@ impl AcpThread {
            connection,
            session_id,
            token_usage: None,
            prompt_capabilities,
            _observe_prompt_capabilities: task,
        }
    }
    pub fn prompt_capabilities(&self) -> acp::PromptCapabilities {
        self.prompt_capabilities
    }
    pub fn connection(&self) -> &Rc<dyn AgentConnection> {
        &self.connection
    }
@ -1398,10 +1373,6 @@ impl AcpThread {
        })
    }
    pub fn can_resume(&self, cx: &App) -> bool {
        self.connection.resume(&self.session_id, cx).is_some()
    }
    pub fn resume(&mut self, cx: &mut Context<Self>) -> BoxFuture<'static, Result<()>> {
        self.run_turn(cx, async move |this, cx| {
            this.update(cx, |this, cx| {
@ -2624,19 +2595,13 @@ mod tests {
                    .into(),
            );
            let action_log = cx.new(|_| ActionLog::new(project.clone()));
-            let thread = cx.new(|cx| {
+            let thread = cx.new(|_cx| {
                AcpThread::new(
                    "Test",
                    self.clone(),
                    project,
                    action_log,
                    session_id.clone(),
                    watch::Receiver::constant(acp::PromptCapabilities {
                        image: true,
                        audio: true,
                        embedded_context: true,
                    }),
                    cx,
                )
            });
            self.sessions.lock().insert(session_id, thread.downgrade());
@ -2670,6 +2635,14 @@ mod tests {
            }
        }
        fn prompt_capabilities(&self) -> acp::PromptCapabilities {
            acp::PromptCapabilities {
                image: true,
                audio: true,
                embedded_context: true,
            }
        }
        fn cancel(&self, session_id: &acp::SessionId, cx: &mut App) {
            let sessions = self.sessions.lock();
            let thread = sessions.get(session_id).unwrap().clone();
@ -2686,7 +2659,7 @@ mod tests {
        fn truncate(
            &self,
            session_id: &acp::SessionId,
-            _cx: &App,
+            _cx: &mut App,
        ) -> Option<Rc<dyn AgentSessionTruncate>> {
            Some(Rc::new(FakeAgentSessionEditor {
                _session_id: session_id.clone(),
--- a/crates/acp_thread/src/connection.rs
+++ b/crates/acp_thread/src/connection.rs
@ -38,10 +38,12 @@ pub trait AgentConnection {
        cx: &mut App,
    ) -> Task<Result<acp::PromptResponse>>;
    fn prompt_capabilities(&self) -> acp::PromptCapabilities;
    fn resume(
        &self,
        _session_id: &acp::SessionId,
-        _cx: &App,
+        _cx: &mut App,
    ) -> Option<Rc<dyn AgentSessionResume>> {
        None
    }
@ -51,7 +53,7 @@ pub trait AgentConnection {
    fn truncate(
        &self,
        _session_id: &acp::SessionId,
-        _cx: &App,
+        _cx: &mut App,
    ) -> Option<Rc<dyn AgentSessionTruncate>> {
        None
    }
@ -59,7 +61,7 @@ pub trait AgentConnection {
    fn set_title(
        &self,
        _session_id: &acp::SessionId,
-        _cx: &App,
+        _cx: &mut App,
    ) -> Option<Rc<dyn AgentSessionSetTitle>> {
        None
    }
@ -327,19 +329,13 @@ mod test_support {
        ) -> Task<gpui::Result<Entity<AcpThread>>> {
            let session_id = acp::SessionId(self.sessions.lock().len().to_string().into());
            let action_log = cx.new(|_| ActionLog::new(project.clone()));
-            let thread = cx.new(|cx| {
+            let thread = cx.new(|_cx| {
                AcpThread::new(
                    "Test",
                    self.clone(),
                    project,
                    action_log,
                    session_id.clone(),
                    watch::Receiver::constant(acp::PromptCapabilities {
                        image: true,
                        audio: true,
                        embedded_context: true,
                    }),
                    cx,
                )
            });
            self.sessions.lock().insert(
@ -352,6 +348,14 @@ mod test_support {
            Task::ready(Ok(thread))
        }
        fn prompt_capabilities(&self) -> acp::PromptCapabilities {
            acp::PromptCapabilities {
                image: true,
                audio: true,
                embedded_context: true,
            }
        }
        fn authenticate(
            &self,
            _method_id: acp::AuthMethodId,
@ -435,7 +439,7 @@ mod test_support {
        fn truncate(
            &self,
            _session_id: &agent_client_protocol::SessionId,
-            _cx: &App,
+            _cx: &mut App,
        ) -> Option<Rc<dyn AgentSessionTruncate>> {
            Some(Rc::new(StubAgentSessionEditor))
        }
--- a/crates/acp_thread/src/mention.rs
+++ b/crates/acp_thread/src/mention.rs
@ -5,7 +5,7 @@ use prompt_store::{PromptId, UserPromptId};
 use serde::{Deserialize, Serialize};
 use std::{
    fmt,
-    ops::RangeInclusive,
+    ops::Range,
    path::{Path, PathBuf},
    str::FromStr,
 };
@ -17,14 +17,13 @@ pub enum MentionUri {
    File {
        abs_path: PathBuf,
    },
    PastedImage,
    Directory {
        abs_path: PathBuf,
    },
    Symbol {
-        abs_path: PathBuf,
+        path: PathBuf,
        name: String,
-        line_range: RangeInclusive<u32>,
+        line_range: Range<u32>,
    },
    Thread {
        id: acp::SessionId,
@ -39,9 +38,8 @@ pub enum MentionUri {
        name: String,
    },
    Selection {
-        #[serde(default, skip_serializing_if = "Option::is_none")]
+        path: PathBuf,
-        abs_path: Option<PathBuf>,
+        line_range: Range<u32>,
        line_range: RangeInclusive<u32>,
    },
    Fetch {
        url: Url,
@ -50,44 +48,36 @@ pub enum MentionUri {
 impl MentionUri {
    pub fn parse(input: &str) -> Result<Self> {
        fn parse_line_range(fragment: &str) -> Result<RangeInclusive<u32>> {
            let range = fragment
                .strip_prefix("L")
                .context("Line range must start with \"L\"")?;
            let (start, end) = range
                .split_once(":")
                .context("Line range must use colon as separator")?;
            let range = start
                .parse::<u32>()
                .context("Parsing line range start")?
                .checked_sub(1)
                .context("Line numbers should be 1-based")?
                ..=end
                    .parse::<u32>()
                    .context("Parsing line range end")?
                    .checked_sub(1)
                    .context("Line numbers should be 1-based")?;
            Ok(range)
        }
        let url = url::Url::parse(input)?;
        let path = url.path();
        match url.scheme() {
            "file" => {
                let path = url.to_file_path().ok().context("Extracting file path")?;
                if let Some(fragment) = url.fragment() {
-                    let line_range = parse_line_range(fragment)?;
+                    let range = fragment
                        .strip_prefix("L")
                        .context("Line range must start with \"L\"")?;
                    let (start, end) = range
                        .split_once(":")
                        .context("Line range must use colon as separator")?;
                    let line_range = start
                        .parse::<u32>()
                        .context("Parsing line range start")?
                        .checked_sub(1)
                        .context("Line numbers should be 1-based")?
                        ..end
                            .parse::<u32>()
                            .context("Parsing line range end")?
                            .checked_sub(1)
                            .context("Line numbers should be 1-based")?;
                    if let Some(name) = single_query_param(&url, "symbol")? {
                        Ok(Self::Symbol {
                            name,
-                            abs_path: path,
+                            path,
                            line_range,
                        })
                    } else {
-                        Ok(Self::Selection {
+                        Ok(Self::Selection { path, line_range })
                            abs_path: Some(path),
                            line_range,
                        })
                    }
                } else if input.ends_with("/") {
                    Ok(Self::Directory { abs_path: path })
@ -115,17 +105,6 @@ impl MentionUri {
                        id: rule_id.into(),
                        name,
                    })
                } else if path.starts_with("/agent/pasted-image") {
                    Ok(Self::PastedImage)
                } else if path.starts_with("/agent/untitled-buffer") {
                    let fragment = url
                        .fragment()
                        .context("Missing fragment for untitled buffer selection")?;
                    let line_range = parse_line_range(fragment)?;
                    Ok(Self::Selection {
                        abs_path: None,
                        line_range,
                    })
                } else {
                    bail!("invalid zed url: {:?}", input);
                }
@ -142,16 +121,13 @@ impl MentionUri {
                .unwrap_or_default()
                .to_string_lossy()
                .into_owned(),
            MentionUri::PastedImage => "Image".to_string(),
            MentionUri::Symbol { name, .. } => name.clone(),
            MentionUri::Thread { name, .. } => name.clone(),
            MentionUri::TextThread { name, .. } => name.clone(),
            MentionUri::Rule { name, .. } => name.clone(),
            MentionUri::Selection {
-                abs_path: path,
+                path, line_range, ..
-                line_range,
+            } => selection_name(path, line_range),
                ..
            } => selection_name(path.as_deref(), line_range),
            MentionUri::Fetch { url } => url.to_string(),
        }
    }
@ -161,7 +137,6 @@ impl MentionUri {
            MentionUri::File { abs_path } => {
                FileIcons::get_icon(abs_path, cx).unwrap_or_else(|| IconName::File.path().into())
            }
            MentionUri::PastedImage => IconName::Image.path().into(),
            MentionUri::Directory { .. } => FileIcons::get_folder_icon(false, cx)
                .unwrap_or_else(|| IconName::Folder.path().into()),
            MentionUri::Symbol { .. } => IconName::Code.path().into(),
@ -182,40 +157,29 @@ impl MentionUri {
            MentionUri::File { abs_path } => {
                Url::from_file_path(abs_path).expect("mention path should be absolute")
            }
            MentionUri::PastedImage => Url::parse("zed:///agent/pasted-image").unwrap(),
            MentionUri::Directory { abs_path } => {
                Url::from_directory_path(abs_path).expect("mention path should be absolute")
            }
            MentionUri::Symbol {
-                abs_path,
+                path,
                name,
                line_range,
            } => {
-                let mut url =
+                let mut url = Url::from_file_path(path).expect("mention path should be absolute");
                    Url::from_file_path(abs_path).expect("mention path should be absolute");
                url.query_pairs_mut().append_pair("symbol", name);
                url.set_fragment(Some(&format!(
                    "L{}:{}",
-                    line_range.start() + 1,
+                    line_range.start + 1,
-                    line_range.end() + 1
+                    line_range.end + 1
                )));
                url
            }
-            MentionUri::Selection {
+            MentionUri::Selection { path, line_range } => {
-                abs_path: path,
+                let mut url = Url::from_file_path(path).expect("mention path should be absolute");
                line_range,
            } => {
                let mut url = if let Some(path) = path {
                    Url::from_file_path(path).expect("mention path should be absolute")
                } else {
                    let mut url = Url::parse("zed:///").unwrap();
                    url.set_path("/agent/untitled-buffer");
                    url
                };
                url.set_fragment(Some(&format!(
                    "L{}:{}",
-                    line_range.start() + 1,
+                    line_range.start + 1,
-                    line_range.end() + 1
+                    line_range.end + 1
                )));
                url
            }
@ -227,10 +191,7 @@ impl MentionUri {
            }
            MentionUri::TextThread { path, name } => {
                let mut url = Url::parse("zed:///").unwrap();
-                url.set_path(&format!(
+                url.set_path(&format!("/agent/text-thread/{}", path.to_string_lossy()));
                    "/agent/text-thread/{}",
                    path.to_string_lossy().trim_start_matches('/')
                ));
                url.query_pairs_mut().append_pair("name", name);
                url
            }
@ -276,14 +237,12 @@ fn single_query_param(url: &Url, name: &'static str) -> Result<Option<String>> {
    }
 }
-pub fn selection_name(path: Option<&Path>, line_range: &RangeInclusive<u32>) -> String {
+pub fn selection_name(path: &Path, line_range: &Range<u32>) -> String {
    format!(
        "{} ({}:{})",
-        path.and_then(|path| path.file_name())
+        path.file_name().unwrap_or_default().display(),
-            .unwrap_or("Untitled".as_ref())
+        line_range.start + 1,
-            .display(),
+        line_range.end + 1
        *line_range.start() + 1,
        *line_range.end() + 1
    )
 }
@ -343,14 +302,14 @@ mod tests {
        let parsed = MentionUri::parse(symbol_uri).unwrap();
        match &parsed {
            MentionUri::Symbol {
-                abs_path: path,
+                path,
                name,
                line_range,
            } => {
                assert_eq!(path.to_str().unwrap(), path!("/path/to/file.rs"));
                assert_eq!(name, "MySymbol");
-                assert_eq!(line_range.start(), &9);
+                assert_eq!(line_range.start, 9);
-                assert_eq!(line_range.end(), &19);
+                assert_eq!(line_range.end, 19);
            }
            _ => panic!("Expected Symbol variant"),
        }
@ -362,39 +321,16 @@ mod tests {
        let selection_uri = uri!("file:///path/to/file.rs#L5:15");
        let parsed = MentionUri::parse(selection_uri).unwrap();
        match &parsed {
-            MentionUri::Selection {
+            MentionUri::Selection { path, line_range } => {
-                abs_path: path,
+                assert_eq!(path.to_str().unwrap(), path!("/path/to/file.rs"));
-                line_range,
+                assert_eq!(line_range.start, 4);
-            } => {
+                assert_eq!(line_range.end, 14);
                assert_eq!(
                    path.as_ref().unwrap().to_str().unwrap(),
                    path!("/path/to/file.rs")
                );
                assert_eq!(line_range.start(), &4);
                assert_eq!(line_range.end(), &14);
            }
            _ => panic!("Expected Selection variant"),
        }
        assert_eq!(parsed.to_uri().to_string(), selection_uri);
    }
    #[test]
    fn test_parse_untitled_selection_uri() {
        let selection_uri = uri!("zed:///agent/untitled-buffer#L1:10");
        let parsed = MentionUri::parse(selection_uri).unwrap();
        match &parsed {
            MentionUri::Selection {
                abs_path: None,
                line_range,
            } => {
                assert_eq!(line_range.start(), &0);
                assert_eq!(line_range.end(), &9);
            }
            _ => panic!("Expected Selection variant without path"),
        }
        assert_eq!(parsed.to_uri().to_string(), selection_uri);
    }
    #[test]
    fn test_parse_thread_uri() {
        let thread_uri = "zed:///agent/thread/session123?name=Thread+name";
--- a/crates/acp_tools/Cargo.toml
+++ b/crates/acp_tools/Cargo.toml
@ -1,30 +0,0 @@
 [package]
 name = "acp_tools"
 version = "0.1.0"
 edition.workspace = true
 publish.workspace = true
 license = "GPL-3.0-or-later"
 [lints]
 workspace = true
 [lib]
 path = "src/acp_tools.rs"
 doctest = false
 [dependencies]
 agent-client-protocol.workspace = true
 collections.workspace = true
 gpui.workspace = true
 language.workspace= true
 markdown.workspace = true
 project.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 settings.workspace = true
 theme.workspace = true
 ui.workspace = true
 util.workspace = true
 workspace-hack.workspace = true
 workspace.workspace = true
--- a/crates/acp_tools/LICENSE-GPL
+++ b/crates/acp_tools/LICENSE-GPL
@ -1 +0,0 @@
 ../../LICENSE-GPL
--- a/crates/acp_tools/src/acp_tools.rs
+++ b/crates/acp_tools/src/acp_tools.rs
@ -1,494 +0,0 @@
 use std::{
    cell::RefCell,
    collections::HashSet,
    fmt::Display,
    rc::{Rc, Weak},
    sync::Arc,
 };
 use agent_client_protocol as acp;
 use collections::HashMap;
 use gpui::{
    App, Empty, Entity, EventEmitter, FocusHandle, Focusable, Global, ListAlignment, ListState,
    StyleRefinement, Subscription, Task, TextStyleRefinement, Window, actions, list, prelude::*,
 };
 use language::LanguageRegistry;
 use markdown::{CodeBlockRenderer, Markdown, MarkdownElement, MarkdownStyle};
 use project::Project;
 use settings::Settings;
 use theme::ThemeSettings;
 use ui::prelude::*;
 use util::ResultExt as _;
 use workspace::{Item, Workspace};
 actions!(dev, [OpenAcpLogs]);
 pub fn init(cx: &mut App) {
    cx.observe_new(
        |workspace: &mut Workspace, _window, _cx: &mut Context<Workspace>| {
            workspace.register_action(|workspace, _: &OpenAcpLogs, window, cx| {
                let acp_tools =
                    Box::new(cx.new(|cx| AcpTools::new(workspace.project().clone(), cx)));
                workspace.add_item_to_active_pane(acp_tools, None, true, window, cx);
            });
        },
    )
    .detach();
 }
 struct GlobalAcpConnectionRegistry(Entity<AcpConnectionRegistry>);
 impl Global for GlobalAcpConnectionRegistry {}
 #[derive(Default)]
 pub struct AcpConnectionRegistry {
    active_connection: RefCell<Option<ActiveConnection>>,
 }
 struct ActiveConnection {
    server_name: SharedString,
    connection: Weak<acp::ClientSideConnection>,
 }
 impl AcpConnectionRegistry {
    pub fn default_global(cx: &mut App) -> Entity<Self> {
        if cx.has_global::<GlobalAcpConnectionRegistry>() {
            cx.global::<GlobalAcpConnectionRegistry>().0.clone()
        } else {
            let registry = cx.new(|_cx| AcpConnectionRegistry::default());
            cx.set_global(GlobalAcpConnectionRegistry(registry.clone()));
            registry
        }
    }
    pub fn set_active_connection(
        &self,
        server_name: impl Into<SharedString>,
        connection: &Rc<acp::ClientSideConnection>,
        cx: &mut Context<Self>,
    ) {
        self.active_connection.replace(Some(ActiveConnection {
            server_name: server_name.into(),
            connection: Rc::downgrade(connection),
        }));
        cx.notify();
    }
 }
 struct AcpTools {
    project: Entity<Project>,
    focus_handle: FocusHandle,
    expanded: HashSet<usize>,
    watched_connection: Option<WatchedConnection>,
    connection_registry: Entity<AcpConnectionRegistry>,
    _subscription: Subscription,
 }
 struct WatchedConnection {
    server_name: SharedString,
    messages: Vec<WatchedConnectionMessage>,
    list_state: ListState,
    connection: Weak<acp::ClientSideConnection>,
    incoming_request_methods: HashMap<i32, Arc<str>>,
    outgoing_request_methods: HashMap<i32, Arc<str>>,
    _task: Task<()>,
 }
 impl AcpTools {
    fn new(project: Entity<Project>, cx: &mut Context<Self>) -> Self {
        let connection_registry = AcpConnectionRegistry::default_global(cx);
        let subscription = cx.observe(&connection_registry, |this, _, cx| {
            this.update_connection(cx);
            cx.notify();
        });
        let mut this = Self {
            project,
            focus_handle: cx.focus_handle(),
            expanded: HashSet::default(),
            watched_connection: None,
            connection_registry,
            _subscription: subscription,
        };
        this.update_connection(cx);
        this
    }
    fn update_connection(&mut self, cx: &mut Context<Self>) {
        let active_connection = self.connection_registry.read(cx).active_connection.borrow();
        let Some(active_connection) = active_connection.as_ref() else {
            return;
        };
        if let Some(watched_connection) = self.watched_connection.as_ref() {
            if Weak::ptr_eq(
                &watched_connection.connection,
                &active_connection.connection,
            ) {
                return;
            }
        }
        if let Some(connection) = active_connection.connection.upgrade() {
            let mut receiver = connection.subscribe();
            let task = cx.spawn(async move |this, cx| {
                while let Ok(message) = receiver.recv().await {
                    this.update(cx, |this, cx| {
                        this.push_stream_message(message, cx);
                    })
                    .ok();
                }
            });
            self.watched_connection = Some(WatchedConnection {
                server_name: active_connection.server_name.clone(),
                messages: vec![],
                list_state: ListState::new(0, ListAlignment::Bottom, px(2048.)),
                connection: active_connection.connection.clone(),
                incoming_request_methods: HashMap::default(),
                outgoing_request_methods: HashMap::default(),
                _task: task,
            });
        }
    }
    fn push_stream_message(&mut self, stream_message: acp::StreamMessage, cx: &mut Context<Self>) {
        let Some(connection) = self.watched_connection.as_mut() else {
            return;
        };
        let language_registry = self.project.read(cx).languages().clone();
        let index = connection.messages.len();
        let (request_id, method, message_type, params) = match stream_message.message {
            acp::StreamMessageContent::Request { id, method, params } => {
                let method_map = match stream_message.direction {
                    acp::StreamMessageDirection::Incoming => {
                        &mut connection.incoming_request_methods
                    }
                    acp::StreamMessageDirection::Outgoing => {
                        &mut connection.outgoing_request_methods
                    }
                };
                method_map.insert(id, method.clone());
                (Some(id), method.into(), MessageType::Request, Ok(params))
            }
            acp::StreamMessageContent::Response { id, result } => {
                let method_map = match stream_message.direction {
                    acp::StreamMessageDirection::Incoming => {
                        &mut connection.outgoing_request_methods
                    }
                    acp::StreamMessageDirection::Outgoing => {
                        &mut connection.incoming_request_methods
                    }
                };
                if let Some(method) = method_map.remove(&id) {
                    (Some(id), method.into(), MessageType::Response, result)
                } else {
                    (
                        Some(id),
                        "[unrecognized response]".into(),
                        MessageType::Response,
                        result,
                    )
                }
            }
            acp::StreamMessageContent::Notification { method, params } => {
                (None, method.into(), MessageType::Notification, Ok(params))
            }
        };
        let message = WatchedConnectionMessage {
            name: method,
            message_type,
            request_id,
            direction: stream_message.direction,
            collapsed_params_md: match params.as_ref() {
                Ok(params) => params
                    .as_ref()
                    .map(|params| collapsed_params_md(params, &language_registry, cx)),
                Err(err) => {
                    if let Ok(err) = &serde_json::to_value(err) {
                        Some(collapsed_params_md(&err, &language_registry, cx))
                    } else {
                        None
                    }
                }
            },
            expanded_params_md: None,
            params,
        };
        connection.messages.push(message);
        connection.list_state.splice(index..index, 1);
        cx.notify();
    }
    fn render_message(
        &mut self,
        index: usize,
        window: &mut Window,
        cx: &mut Context<Self>,
    ) -> AnyElement {
        let Some(connection) = self.watched_connection.as_ref() else {
            return Empty.into_any();
        };
        let Some(message) = connection.messages.get(index) else {
            return Empty.into_any();
        };
        let base_size = TextSize::Editor.rems(cx);
        let theme_settings = ThemeSettings::get_global(cx);
        let text_style = window.text_style();
        let colors = cx.theme().colors();
        let expanded = self.expanded.contains(&index);
        v_flex()
            .w_full()
            .px_4()
            .py_3()
            .border_color(colors.border)
            .border_b_1()
            .gap_2()
            .items_start()
            .font_buffer(cx)
            .text_size(base_size)
            .id(index)
            .group("message")
            .hover(|this| this.bg(colors.element_background.opacity(0.5)))
            .on_click(cx.listener(move |this, _, _, cx| {
                if this.expanded.contains(&index) {
                    this.expanded.remove(&index);
                } else {
                    this.expanded.insert(index);
                    let Some(connection) = &mut this.watched_connection else {
                        return;
                    };
                    let Some(message) = connection.messages.get_mut(index) else {
                        return;
                    };
                    message.expanded(this.project.read(cx).languages().clone(), cx);
                    connection.list_state.scroll_to_reveal_item(index);
                }
                cx.notify()
            }))
            .child(
                h_flex()
                    .w_full()
                    .gap_2()
                    .items_center()
                    .flex_shrink_0()
                    .child(match message.direction {
                        acp::StreamMessageDirection::Incoming => {
                            ui::Icon::new(ui::IconName::ArrowDown).color(Color::Error)
                        }
                        acp::StreamMessageDirection::Outgoing => {
                            ui::Icon::new(ui::IconName::ArrowUp).color(Color::Success)
                        }
                    })
                    .child(
                        Label::new(message.name.clone())
                            .buffer_font(cx)
                            .color(Color::Muted),
                    )
                    .child(div().flex_1())
                    .child(
                        div()
                            .child(ui::Chip::new(message.message_type.to_string()))
                            .visible_on_hover("message"),
                    )
                    .children(
                        message
                            .request_id
                            .map(|req_id| div().child(ui::Chip::new(req_id.to_string()))),
                    ),
            )
            // I'm aware using markdown is a hack. Trying to get something working for the demo.
            // Will clean up soon!
            .when_some(
                if expanded {
                    message.expanded_params_md.clone()
                } else {
                    message.collapsed_params_md.clone()
                },
                |this, params| {
                    this.child(
                        div().pl_6().w_full().child(
                            MarkdownElement::new(
                                params,
                                MarkdownStyle {
                                    base_text_style: text_style,
                                    selection_background_color: colors.element_selection_background,
                                    syntax: cx.theme().syntax().clone(),
                                    code_block_overflow_x_scroll: true,
                                    code_block: StyleRefinement {
                                        text: Some(TextStyleRefinement {
                                            font_family: Some(
                                                theme_settings.buffer_font.family.clone(),
                                            ),
                                            font_size: Some((base_size * 0.8).into()),
                                            ..Default::default()
                                        }),
                                        ..Default::default()
                                    },
                                    ..Default::default()
                                },
                            )
                            .code_block_renderer(
                                CodeBlockRenderer::Default {
                                    copy_button: false,
                                    copy_button_on_hover: expanded,
                                    border: false,
                                },
                            ),
                        ),
                    )
                },
            )
            .into_any()
    }
 }
 struct WatchedConnectionMessage {
    name: SharedString,
    request_id: Option<i32>,
    direction: acp::StreamMessageDirection,
    message_type: MessageType,
    params: Result<Option<serde_json::Value>, acp::Error>,
    collapsed_params_md: Option<Entity<Markdown>>,
    expanded_params_md: Option<Entity<Markdown>>,
 }
 impl WatchedConnectionMessage {
    fn expanded(&mut self, language_registry: Arc<LanguageRegistry>, cx: &mut App) {
        let params_md = match &self.params {
            Ok(Some(params)) => Some(expanded_params_md(params, &language_registry, cx)),
            Err(err) => {
                if let Some(err) = &serde_json::to_value(err).log_err() {
                    Some(expanded_params_md(&err, &language_registry, cx))
                } else {
                    None
                }
            }
            _ => None,
        };
        self.expanded_params_md = params_md;
    }
 }
 fn collapsed_params_md(
    params: &serde_json::Value,
    language_registry: &Arc<LanguageRegistry>,
    cx: &mut App,
 ) -> Entity<Markdown> {
    let params_json = serde_json::to_string(params).unwrap_or_default();
    let mut spaced_out_json = String::with_capacity(params_json.len() + params_json.len() / 4);
    for ch in params_json.chars() {
        match ch {
            '{' => spaced_out_json.push_str("{ "),
            '}' => spaced_out_json.push_str(" }"),
            ':' => spaced_out_json.push_str(": "),
            ',' => spaced_out_json.push_str(", "),
            c => spaced_out_json.push(c),
        }
    }
    let params_md = format!("```json\n{}\n```", spaced_out_json);
    cx.new(|cx| Markdown::new(params_md.into(), Some(language_registry.clone()), None, cx))
 }
 fn expanded_params_md(
    params: &serde_json::Value,
    language_registry: &Arc<LanguageRegistry>,
    cx: &mut App,
 ) -> Entity<Markdown> {
    let params_json = serde_json::to_string_pretty(params).unwrap_or_default();
    let params_md = format!("```json\n{}\n```", params_json);
    cx.new(|cx| Markdown::new(params_md.into(), Some(language_registry.clone()), None, cx))
 }
 enum MessageType {
    Request,
    Response,
    Notification,
 }
 impl Display for MessageType {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        match self {
            MessageType::Request => write!(f, "Request"),
            MessageType::Response => write!(f, "Response"),
            MessageType::Notification => write!(f, "Notification"),
        }
    }
 }
 enum AcpToolsEvent {}
 impl EventEmitter<AcpToolsEvent> for AcpTools {}
 impl Item for AcpTools {
    type Event = AcpToolsEvent;
    fn tab_content_text(&self, _detail: usize, _cx: &App) -> ui::SharedString {
        format!(
            "ACP: {}",
            self.watched_connection
                .as_ref()
                .map_or("Disconnected", |connection| &connection.server_name)
        )
        .into()
    }
    fn tab_icon(&self, _window: &Window, _cx: &App) -> Option<Icon> {
        Some(ui::Icon::new(IconName::Thread))
    }
 }
 impl Focusable for AcpTools {
    fn focus_handle(&self, _cx: &App) -> FocusHandle {
        self.focus_handle.clone()
    }
 }
 impl Render for AcpTools {
    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
        v_flex()
            .track_focus(&self.focus_handle)
            .size_full()
            .bg(cx.theme().colors().editor_background)
            .child(match self.watched_connection.as_ref() {
                Some(connection) => {
                    if connection.messages.is_empty() {
                        h_flex()
                            .size_full()
                            .justify_center()
                            .items_center()
                            .child("No messages recorded yet")
                            .into_any()
                    } else {
                        list(
                            connection.list_state.clone(),
                            cx.processor(Self::render_message),
                        )
                        .with_sizing_behavior(gpui::ListSizingBehavior::Auto)
                        .flex_grow()
                        .into_any()
                    }
                }
                None => h_flex()
                    .size_full()
                    .justify_center()
                    .items_center()
                    .child("No active connection")
                    .into_any(),
            })
    }
 }
--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
@ -664,7 +664,7 @@ impl Thread {
    }
    pub fn get_or_init_configured_model(&mut self, cx: &App) -> Option<ConfiguredModel> {
-        if self.configured_model.is_none() {
+        if self.configured_model.is_none() || self.messages.is_empty() {
            self.configured_model = LanguageModelRegistry::read_global(cx).default_model();
        }
        self.configured_model.clone()
@ -2097,7 +2097,7 @@ impl Thread {
    }
    pub fn summarize(&mut self, cx: &mut Context<Self>) {
-        let Some(model) = LanguageModelRegistry::read_global(cx).thread_summary_model() else {
+        let Some(model) = LanguageModelRegistry::read_global(cx).thread_summary_model(cx) else {
            println!("No thread summary model");
            return;
        };
@ -2416,7 +2416,7 @@ impl Thread {
        }
        let Some(ConfiguredModel { model, provider }) =
-            LanguageModelRegistry::read_global(cx).thread_summary_model()
+            LanguageModelRegistry::read_global(cx).thread_summary_model(cx)
        else {
            return;
        };
@ -5410,13 +5410,10 @@ fn main() {{
                    }),
                    cx,
                );
-                registry.set_thread_summary_model(
+                registry.set_thread_summary_model(Some(ConfiguredModel {
-                    Some(ConfiguredModel {
+                    provider,
-                        provider,
+                    model: model.clone(),
-                        model: model.clone(),
+                }));
                    }),
                    cx,
                );
            })
        });
--- a/crates/agent/src/thread_store.rs
+++ b/crates/agent/src/thread_store.rs
@ -893,19 +893,8 @@ impl ThreadsDatabase {
        let needs_migration_from_heed = mdb_path.exists();
-        let connection = if *ZED_STATELESS {
+        let connection = if *ZED_STATELESS || cfg!(any(feature = "test-support", test)) {
            Connection::open_memory(Some("THREAD_FALLBACK_DB"))
        } else if cfg!(any(feature = "test-support", test)) {
            // rust stores the name of the test on the current thread.
            // We use this to automatically create a database that will
            // be shared within the test (for the test_retrieve_old_thread)
            // but not with concurrent tests.
            let thread = std::thread::current();
            let test_name = thread.name();
            Connection::open_memory(Some(&format!(
                "THREAD_FALLBACK_{}",
                test_name.unwrap_or_default()
            )))
        } else {
            Connection::open_file(&sqlite_path.to_string_lossy())
        };
--- a/crates/agent2/src/agent.rs
+++ b/crates/agent2/src/agent.rs
@ -180,7 +180,7 @@ impl NativeAgent {
        fs: Arc<dyn Fs>,
        cx: &mut AsyncApp,
    ) -> Result<Entity<NativeAgent>> {
-        log::debug!("Creating new NativeAgent");
+        log::info!("Creating new NativeAgent");
        let project_context = cx
            .update(|cx| Self::build_project_context(&project, prompt_store.as_ref(), cx))?
@ -228,7 +228,7 @@ impl NativeAgent {
    ) -> Entity<AcpThread> {
        let connection = Rc::new(NativeAgentConnection(cx.entity()));
        let registry = LanguageModelRegistry::read_global(cx);
-        let summarization_model = registry.thread_summary_model().map(|c| c.model);
+        let summarization_model = registry.thread_summary_model(cx).map(|c| c.model);
        thread_handle.update(cx, |thread, cx| {
            thread.set_summarization_model(summarization_model, cx);
@ -240,16 +240,13 @@ impl NativeAgent {
        let title = thread.title();
        let project = thread.project.clone();
        let action_log = thread.action_log.clone();
-        let prompt_capabilities_rx = thread.prompt_capabilities_rx.clone();
+        let acp_thread = cx.new(|_cx| {
        let acp_thread = cx.new(|cx| {
            acp_thread::AcpThread::new(
                title,
                connection,
                project.clone(),
                action_log.clone(),
                session_id.clone(),
                prompt_capabilities_rx,
                cx,
            )
        });
        let subscriptions = vec![
@ -524,7 +521,7 @@ impl NativeAgent {
        let registry = LanguageModelRegistry::read_global(cx);
        let default_model = registry.default_model().map(|m| m.model);
-        let summarization_model = registry.thread_summary_model().map(|m| m.model);
+        let summarization_model = registry.thread_summary_model(cx).map(|m| m.model);
        for session in self.sessions.values_mut() {
            session.thread.update(cx, |thread, cx| {
@ -759,7 +756,7 @@ impl NativeAgentConnection {
                }
            }
-            log::debug!("Response stream completed");
+            log::info!("Response stream completed");
            anyhow::Ok(acp::PromptResponse {
                stop_reason: acp::StopReason::EndTurn,
            })
@ -784,7 +781,7 @@ impl AgentModelSelector for NativeAgentConnection {
        model_id: acp_thread::AgentModelId,
        cx: &mut App,
    ) -> Task<Result<()>> {
-        log::debug!("Setting model for session {}: {}", session_id, model_id);
+        log::info!("Setting model for session {}: {}", session_id, model_id);
        let Some(thread) = self
            .0
            .read(cx)
@ -855,7 +852,7 @@ impl acp_thread::AgentConnection for NativeAgentConnection {
        cx: &mut App,
    ) -> Task<Result<Entity<acp_thread::AcpThread>>> {
        let agent = self.0.clone();
-        log::debug!("Creating new thread for project at: {:?}", cwd);
+        log::info!("Creating new thread for project at: {:?}", cwd);
        cx.spawn(async move |cx| {
            log::debug!("Starting thread creation in async context");
@ -920,7 +917,7 @@ impl acp_thread::AgentConnection for NativeAgentConnection {
                .into_iter()
                .map(Into::into)
                .collect::<Vec<_>>();
-            log::debug!("Converted prompt to message: {} chars", content.len());
+            log::info!("Converted prompt to message: {} chars", content.len());
            log::debug!("Message id: {:?}", id);
            log::debug!("Message content: {:?}", content);
@ -928,10 +925,18 @@ impl acp_thread::AgentConnection for NativeAgentConnection {
        })
    }
    fn prompt_capabilities(&self) -> acp::PromptCapabilities {
        acp::PromptCapabilities {
            image: true,
            audio: false,
            embedded_context: true,
        }
    }
    fn resume(
        &self,
        session_id: &acp::SessionId,
-        _cx: &App,
+        _cx: &mut App,
    ) -> Option<Rc<dyn acp_thread::AgentSessionResume>> {
        Some(Rc::new(NativeAgentSessionResume {
            connection: self.clone(),
@ -951,9 +956,9 @@ impl acp_thread::AgentConnection for NativeAgentConnection {
    fn truncate(
        &self,
        session_id: &agent_client_protocol::SessionId,
-        cx: &App,
+        cx: &mut App,
    ) -> Option<Rc<dyn acp_thread::AgentSessionTruncate>> {
-        self.0.read_with(cx, |agent, _cx| {
+        self.0.update(cx, |agent, _cx| {
            agent.sessions.get(session_id).map(|session| {
                Rc::new(NativeAgentSessionEditor {
                    thread: session.thread.clone(),
@ -966,7 +971,7 @@ impl acp_thread::AgentConnection for NativeAgentConnection {
    fn set_title(
        &self,
        session_id: &acp::SessionId,
-        _cx: &App,
+        _cx: &mut App,
    ) -> Option<Rc<dyn acp_thread::AgentSessionSetTitle>> {
        Some(Rc::new(NativeAgentSessionSetTitle {
            connection: self.clone(),
--- a/crates/agent2/src/db.rs
+++ b/crates/agent2/src/db.rs
@ -266,19 +266,8 @@ impl ThreadsDatabase {
    }
    pub fn new(executor: BackgroundExecutor) -> Result<Self> {
-        let connection = if *ZED_STATELESS {
+        let connection = if *ZED_STATELESS || cfg!(any(feature = "test-support", test)) {
            Connection::open_memory(Some("THREAD_FALLBACK_DB"))
        } else if cfg!(any(feature = "test-support", test)) {
            // rust stores the name of the test on the current thread.
            // We use this to automatically create a database that will
            // be shared within the test (for the test_retrieve_old_thread)
            // but not with concurrent tests.
            let thread = std::thread::current();
            let test_name = thread.name();
            Connection::open_memory(Some(&format!(
                "THREAD_FALLBACK_{}",
                test_name.unwrap_or_default()
            )))
        } else {
            let threads_dir = paths::data_dir().join("threads");
            std::fs::create_dir_all(&threads_dir)?;
--- a/crates/agent2/src/native_agent_server.rs
+++ b/crates/agent2/src/native_agent_server.rs
@ -3,7 +3,7 @@ use std::{any::Any, path::Path, rc::Rc, sync::Arc};
 use agent_servers::AgentServer;
 use anyhow::Result;
 use fs::Fs;
-use gpui::{App, Entity, SharedString, Task};
+use gpui::{App, Entity, Task};
 use project::Project;
 use prompt_store::PromptStore;
@ -22,20 +22,16 @@ impl NativeAgentServer {
 }
 impl AgentServer for NativeAgentServer {
-    fn telemetry_id(&self) -> &'static str {
+    fn name(&self) -> &'static str {
-        "zed"
+        "Native Agent"
    }
-    fn name(&self) -> SharedString {
+    fn empty_state_headline(&self) -> &'static str {
-        "Zed Agent".into()
+        "Welcome to the Agent Panel"
    }
-    fn empty_state_headline(&self) -> SharedString {
+    fn empty_state_message(&self) -> &'static str {
-        self.name()
+        ""
    }
    fn empty_state_message(&self) -> SharedString {
        "".into()
    }
    fn logo(&self) -> ui::IconName {
@ -48,7 +44,7 @@ impl AgentServer for NativeAgentServer {
        project: &Entity<Project>,
        cx: &mut App,
    ) -> Task<Result<Rc<dyn acp_thread::AgentConnection>>> {
-        log::debug!(
+        log::info!(
            "NativeAgentServer::connect called for path: {:?}",
            _root_dir
        );
@ -67,7 +63,7 @@ impl AgentServer for NativeAgentServer {
            // Create the connection wrapper
            let connection = NativeAgentConnection(agent);
-            log::debug!("NativeAgentServer connection established successfully");
+            log::info!("NativeAgentServer connection established successfully");
            Ok(Rc::new(connection) as Rc<dyn acp_thread::AgentConnection>)
        })
--- a/crates/agent2/src/tests/mod.rs
+++ b/crates/agent2/src/tests/mod.rs
@ -4,8 +4,6 @@ use agent_client_protocol::{self as acp};
 use agent_settings::AgentProfileId;
 use anyhow::Result;
 use client::{Client, UserStore};
 use cloud_llm_client::CompletionIntent;
 use collections::IndexMap;
 use context_server::{ContextServer, ContextServerCommand, ContextServerId};
 use fs::{FakeFs, Fs};
 use futures::{
@ -72,7 +70,6 @@ async fn test_echo(cx: &mut TestAppContext) {
 }
 #[gpui::test]
 #[cfg_attr(target_os = "windows", ignore)] // TODO: Fix this test on Windows
 async fn test_thinking(cx: &mut TestAppContext) {
    let ThreadTest { model, thread, .. } = setup(cx, TestModel::Fake).await;
    let fake_model = model.as_fake();
@ -472,7 +469,7 @@ async fn test_tool_authorization(cx: &mut TestAppContext) {
                tool_name: ToolRequiringPermission::name().into(),
                is_error: true,
                content: "Permission to run tool denied by user".into(),
-                output: Some("Permission to run tool denied by user".into())
+                output: None
            })
        ]
    );
@ -675,6 +672,15 @@ async fn test_resume_after_tool_use_limit(cx: &mut TestAppContext) {
            "}
        )
    });
    // Ensure we error if calling resume when tool use limit was *not* reached.
    let error = thread
        .update(cx, |thread, cx| thread.resume(cx))
        .unwrap_err();
    assert_eq!(
        error.to_string(),
        "can only resume after tool use limit is reached"
    )
 }
 #[gpui::test]
@ -1348,7 +1354,6 @@ async fn test_cancellation(cx: &mut TestAppContext) {
 }
 #[gpui::test]
 #[cfg_attr(target_os = "windows", ignore)] // TODO: Fix this test on Windows
 async fn test_in_progress_send_canceled_by_next_send(cx: &mut TestAppContext) {
    let ThreadTest { model, thread, .. } = setup(cx, TestModel::Fake).await;
    let fake_model = model.as_fake();
@ -1687,7 +1692,6 @@ async fn test_truncate_second_message(cx: &mut TestAppContext) {
 }
 #[gpui::test]
 #[cfg_attr(target_os = "windows", ignore)] // TODO: Fix this test on Windows
 async fn test_title_generation(cx: &mut TestAppContext) {
    let ThreadTest { model, thread, .. } = setup(cx, TestModel::Fake).await;
    let fake_model = model.as_fake();
@ -1733,81 +1737,6 @@ async fn test_title_generation(cx: &mut TestAppContext) {
    thread.read_with(cx, |thread, _| assert_eq!(thread.title(), "Hello world"));
 }
 #[gpui::test]
 async fn test_building_request_with_pending_tools(cx: &mut TestAppContext) {
    let ThreadTest { model, thread, .. } = setup(cx, TestModel::Fake).await;
    let fake_model = model.as_fake();
    let _events = thread
        .update(cx, |thread, cx| {
            thread.add_tool(ToolRequiringPermission);
            thread.add_tool(EchoTool);
            thread.send(UserMessageId::new(), ["Hey!"], cx)
        })
        .unwrap();
    cx.run_until_parked();
    let permission_tool_use = LanguageModelToolUse {
        id: "tool_id_1".into(),
        name: ToolRequiringPermission::name().into(),
        raw_input: "{}".into(),
        input: json!({}),
        is_input_complete: true,
    };
    let echo_tool_use = LanguageModelToolUse {
        id: "tool_id_2".into(),
        name: EchoTool::name().into(),
        raw_input: json!({"text": "test"}).to_string(),
        input: json!({"text": "test"}),
        is_input_complete: true,
    };
    fake_model.send_last_completion_stream_text_chunk("Hi!");
    fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::ToolUse(
        permission_tool_use,
    ));
    fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::ToolUse(
        echo_tool_use.clone(),
    ));
    fake_model.end_last_completion_stream();
    cx.run_until_parked();
    // Ensure pending tools are skipped when building a request.
    let request = thread
        .read_with(cx, |thread, cx| {
            thread.build_completion_request(CompletionIntent::EditFile, cx)
        })
        .unwrap();
    assert_eq!(
        request.messages[1..],
        vec![
            LanguageModelRequestMessage {
                role: Role::User,
                content: vec!["Hey!".into()],
                cache: true
            },
            LanguageModelRequestMessage {
                role: Role::Assistant,
                content: vec![
                    MessageContent::Text("Hi!".into()),
                    MessageContent::ToolUse(echo_tool_use.clone())
                ],
                cache: false
            },
            LanguageModelRequestMessage {
                role: Role::User,
                content: vec![MessageContent::ToolResult(LanguageModelToolResult {
                    tool_use_id: echo_tool_use.id.clone(),
                    tool_name: echo_tool_use.name,
                    is_error: false,
                    content: "test".into(),
                    output: Some("test".into())
                })],
                cache: false
            },
        ],
    );
 }
 #[gpui::test]
 async fn test_agent_connection(cx: &mut TestAppContext) {
    cx.update(settings::init);
@ -1822,11 +1751,11 @@ async fn test_agent_connection(cx: &mut TestAppContext) {
        let clock = Arc::new(clock::FakeSystemClock::new());
        let client = Client::new(clock, http_client, cx);
        let user_store = cx.new(|cx| UserStore::new(client.clone(), cx));
        Project::init_settings(cx);
        agent_settings::init(cx);
        language_model::init(client.clone(), cx);
        language_models::init(user_store, client.clone(), cx);
        Project::init_settings(cx);
        LanguageModelRegistry::test(cx);
        agent_settings::init(cx);
    });
    cx.executor().forbid_parking();
@ -2100,7 +2029,6 @@ async fn test_send_retry_on_error(cx: &mut TestAppContext) {
        .unwrap();
    cx.run_until_parked();
    fake_model.send_last_completion_stream_text_chunk("Hey,");
    fake_model.send_last_completion_stream_error(LanguageModelCompletionError::ServerOverloaded {
        provider: LanguageModelProviderName::new("Anthropic"),
        retry_after: Some(Duration::from_secs(3)),
@ -2110,9 +2038,8 @@ async fn test_send_retry_on_error(cx: &mut TestAppContext) {
    cx.executor().advance_clock(Duration::from_secs(3));
    cx.run_until_parked();
-    fake_model.send_last_completion_stream_text_chunk("there!");
+    fake_model.send_last_completion_stream_text_chunk("Hey!");
    fake_model.end_last_completion_stream();
    cx.run_until_parked();
    let mut retry_events = Vec::new();
    while let Some(Ok(event)) = events.next().await {
@ -2140,94 +2067,12 @@ async fn test_send_retry_on_error(cx: &mut TestAppContext) {
                ## Assistant
-                Hey,
+                Hey!
                [resume]
                ## Assistant
                there!
            "}
        )
    });
 }
 #[gpui::test]
 async fn test_send_retry_finishes_tool_calls_on_error(cx: &mut TestAppContext) {
    let ThreadTest { thread, model, .. } = setup(cx, TestModel::Fake).await;
    let fake_model = model.as_fake();
    let events = thread
        .update(cx, |thread, cx| {
            thread.set_completion_mode(agent_settings::CompletionMode::Burn, cx);
            thread.add_tool(EchoTool);
            thread.send(UserMessageId::new(), ["Call the echo tool!"], cx)
        })
        .unwrap();
    cx.run_until_parked();
    let tool_use_1 = LanguageModelToolUse {
        id: "tool_1".into(),
        name: EchoTool::name().into(),
        raw_input: json!({"text": "test"}).to_string(),
        input: json!({"text": "test"}),
        is_input_complete: true,
    };
    fake_model.send_last_completion_stream_event(LanguageModelCompletionEvent::ToolUse(
        tool_use_1.clone(),
    ));
    fake_model.send_last_completion_stream_error(LanguageModelCompletionError::ServerOverloaded {
        provider: LanguageModelProviderName::new("Anthropic"),
        retry_after: Some(Duration::from_secs(3)),
    });
    fake_model.end_last_completion_stream();
    cx.executor().advance_clock(Duration::from_secs(3));
    let completion = fake_model.pending_completions().pop().unwrap();
    assert_eq!(
        completion.messages[1..],
        vec![
            LanguageModelRequestMessage {
                role: Role::User,
                content: vec!["Call the echo tool!".into()],
                cache: false
            },
            LanguageModelRequestMessage {
                role: Role::Assistant,
                content: vec![language_model::MessageContent::ToolUse(tool_use_1.clone())],
                cache: false
            },
            LanguageModelRequestMessage {
                role: Role::User,
                content: vec![language_model::MessageContent::ToolResult(
                    LanguageModelToolResult {
                        tool_use_id: tool_use_1.id.clone(),
                        tool_name: tool_use_1.name.clone(),
                        is_error: false,
                        content: "test".into(),
                        output: Some("test".into())
                    }
                )],
                cache: true
            },
        ]
    );
    fake_model.send_last_completion_stream_text_chunk("Done");
    fake_model.end_last_completion_stream();
    cx.run_until_parked();
    events.collect::<Vec<_>>().await;
    thread.read_with(cx, |thread, _cx| {
        assert_eq!(
            thread.last_message(),
            Some(Message::Agent(AgentMessage {
                content: vec![AgentMessageContent::Text("Done".into())],
                tool_results: IndexMap::default()
            }))
        );
    })
 }
 #[gpui::test]
 async fn test_send_max_retries_exceeded(cx: &mut TestAppContext) {
    let ThreadTest { thread, model, .. } = setup(cx, TestModel::Fake).await;
--- a/crates/agent2/src/thread.rs
+++ b/crates/agent2/src/thread.rs
@ -45,15 +45,14 @@ use schemars::{JsonSchema, Schema};
 use serde::{Deserialize, Serialize};
 use settings::{Settings, update_settings_file};
 use smol::stream::StreamExt;
 use std::fmt::Write;
 use std::{
    collections::BTreeMap,
    ops::RangeInclusive,
    path::Path,
    sync::Arc,
    time::{Duration, Instant},
 };
-use util::{ResultExt, debug_panic, markdown::MarkdownCodeBlock};
+use std::{fmt::Write, ops::Range};
 use util::{ResultExt, markdown::MarkdownCodeBlock};
 use uuid::Uuid;
 const TOOL_CANCELED_MESSAGE: &str = "Tool canceled by user";
@ -123,7 +122,7 @@ impl Message {
        match self {
            Message::User(message) => message.to_markdown(),
            Message::Agent(message) => message.to_markdown(),
-            Message::Resume => "[resume]\n".into(),
+            Message::Resume => "[resumed after tool use limit was reached]".into(),
        }
    }
@ -188,7 +187,6 @@ impl UserMessage {
        const OPEN_FILES_TAG: &str = "<files>";
        const OPEN_DIRECTORIES_TAG: &str = "<directories>";
        const OPEN_SYMBOLS_TAG: &str = "<symbols>";
        const OPEN_SELECTIONS_TAG: &str = "<selections>";
        const OPEN_THREADS_TAG: &str = "<threads>";
        const OPEN_FETCH_TAG: &str = "<fetched_urls>";
        const OPEN_RULES_TAG: &str =
@ -197,7 +195,6 @@ impl UserMessage {
        let mut file_context = OPEN_FILES_TAG.to_string();
        let mut directory_context = OPEN_DIRECTORIES_TAG.to_string();
        let mut symbol_context = OPEN_SYMBOLS_TAG.to_string();
        let mut selection_context = OPEN_SELECTIONS_TAG.to_string();
        let mut thread_context = OPEN_THREADS_TAG.to_string();
        let mut fetch_context = OPEN_FETCH_TAG.to_string();
        let mut rules_context = OPEN_RULES_TAG.to_string();
@ -214,7 +211,7 @@ impl UserMessage {
                    match uri {
                        MentionUri::File { abs_path } => {
                            write!(
-                                &mut file_context,
+                                &mut symbol_context,
                                "\n{}",
                                MarkdownCodeBlock {
                                    tag: &codeblock_tag(abs_path, None),
@ -223,19 +220,17 @@ impl UserMessage {
                            )
                            .ok();
                        }
                        MentionUri::PastedImage => {
                            debug_panic!("pasted image URI should not be used in mention content")
                        }
                        MentionUri::Directory { .. } => {
                            write!(&mut directory_context, "\n{}\n", content).ok();
                        }
                        MentionUri::Symbol {
-                            abs_path: path,
+                            path, line_range, ..
-                            line_range,
+                        }
-                            ..
+                        | MentionUri::Selection {
                            path, line_range, ..
                        } => {
                            write!(
-                                &mut symbol_context,
+                                &mut rules_context,
                                "\n{}",
                                MarkdownCodeBlock {
                                    tag: &codeblock_tag(path, Some(line_range)),
@ -244,24 +239,6 @@ impl UserMessage {
                            )
                            .ok();
                        }
                        MentionUri::Selection {
                            abs_path: path,
                            line_range,
                            ..
                        } => {
                            write!(
                                &mut selection_context,
                                "\n{}",
                                MarkdownCodeBlock {
                                    tag: &codeblock_tag(
                                        path.as_deref().unwrap_or("Untitled".as_ref()),
                                        Some(line_range)
                                    ),
                                    text: content
                                }
                            )
                            .ok();
                        }
                        MentionUri::Thread { .. } => {
                            write!(&mut thread_context, "\n{}\n", content).ok();
                        }
@ -314,13 +291,6 @@ impl UserMessage {
                .push(language_model::MessageContent::Text(symbol_context));
        }
        if selection_context.len() > OPEN_SELECTIONS_TAG.len() {
            selection_context.push_str("</selections>\n");
            message
                .content
                .push(language_model::MessageContent::Text(selection_context));
        }
        if thread_context.len() > OPEN_THREADS_TAG.len() {
            thread_context.push_str("</threads>\n");
            message
@ -356,7 +326,7 @@ impl UserMessage {
    }
 }
-fn codeblock_tag(full_path: &Path, line_range: Option<&RangeInclusive<u32>>) -> String {
+fn codeblock_tag(full_path: &Path, line_range: Option<&Range<u32>>) -> String {
    let mut result = String::new();
    if let Some(extension) = full_path.extension().and_then(|ext| ext.to_str()) {
@ -366,10 +336,10 @@ fn codeblock_tag(full_path: &Path, line_range: Option<&RangeInclusive<u32>>) ->
    let _ = write!(result, "{}", full_path.display());
    if let Some(range) = line_range {
-        if range.start() == range.end() {
+        if range.start == range.end {
-            let _ = write!(result, ":{}", range.start() + 1);
+            let _ = write!(result, ":{}", range.start + 1);
        } else {
-            let _ = write!(result, ":{}-{}", range.start() + 1, range.end() + 1);
+            let _ = write!(result, ":{}-{}", range.start + 1, range.end + 1);
        }
    }
@ -448,33 +418,24 @@ impl AgentMessage {
            cache: false,
        };
        for chunk in &self.content {
-            match chunk {
+            let chunk = match chunk {
                AgentMessageContent::Text(text) => {
-                    assistant_message
+                    language_model::MessageContent::Text(text.clone())
                        .content
                        .push(language_model::MessageContent::Text(text.clone()));
                }
                AgentMessageContent::Thinking { text, signature } => {
-                    assistant_message
+                    language_model::MessageContent::Thinking {
-                        .content
+                        text: text.clone(),
-                        .push(language_model::MessageContent::Thinking {
+                        signature: signature.clone(),
                            text: text.clone(),
                            signature: signature.clone(),
                        });
                }
                AgentMessageContent::RedactedThinking(value) => {
                    assistant_message.content.push(
                        language_model::MessageContent::RedactedThinking(value.clone()),
                    );
                }
                AgentMessageContent::ToolUse(tool_use) => {
                    if self.tool_results.contains_key(&tool_use.id) {
                        assistant_message
                            .content
                            .push(language_model::MessageContent::ToolUse(tool_use.clone()));
                    }
                }
                AgentMessageContent::RedactedThinking(value) => {
                    language_model::MessageContent::RedactedThinking(value.clone())
                }
                AgentMessageContent::ToolUse(value) => {
                    language_model::MessageContent::ToolUse(value.clone())
                }
            };
            assistant_message.content.push(chunk);
        }
        let mut user_message = LanguageModelRequestMessage {
@ -575,22 +536,11 @@ pub struct Thread {
    templates: Arc<Templates>,
    model: Option<Arc<dyn LanguageModel>>,
    summarization_model: Option<Arc<dyn LanguageModel>>,
    prompt_capabilities_tx: watch::Sender<acp::PromptCapabilities>,
    pub(crate) prompt_capabilities_rx: watch::Receiver<acp::PromptCapabilities>,
    pub(crate) project: Entity<Project>,
    pub(crate) action_log: Entity<ActionLog>,
 }
 impl Thread {
    fn prompt_capabilities(model: Option<&dyn LanguageModel>) -> acp::PromptCapabilities {
        let image = model.map_or(true, |model| model.supports_images());
        acp::PromptCapabilities {
            image,
            audio: false,
            embedded_context: true,
        }
    }
    pub fn new(
        project: Entity<Project>,
        project_context: Entity<ProjectContext>,
@ -601,8 +551,6 @@ impl Thread {
    ) -> Self {
        let profile_id = AgentSettings::get_global(cx).default_profile.clone();
        let action_log = cx.new(|_cx| ActionLog::new(project.clone()));
        let (prompt_capabilities_tx, prompt_capabilities_rx) =
            watch::channel(Self::prompt_capabilities(model.as_deref()));
        Self {
            id: acp::SessionId(uuid::Uuid::new_v4().to_string().into()),
            prompt_id: PromptId::new(),
@ -630,8 +578,6 @@ impl Thread {
            templates,
            model,
            summarization_model: None,
            prompt_capabilities_tx,
            prompt_capabilities_rx,
            project,
            action_log,
        }
@ -732,17 +678,7 @@ impl Thread {
        stream.update_tool_call_fields(
            &tool_use.id,
            acp::ToolCallUpdateFields {
-                status: Some(
+                status: Some(acp::ToolCallStatus::Completed),
                    tool_result
                        .as_ref()
                        .map_or(acp::ToolCallStatus::Failed, |result| {
                            if result.is_error {
                                acp::ToolCallStatus::Failed
                            } else {
                                acp::ToolCallStatus::Completed
                            }
                        }),
                ),
                raw_output: output,
                ..Default::default()
            },
@ -775,8 +711,6 @@ impl Thread {
                .or_else(|| registry.default_model())
                .map(|model| model.model)
        });
        let (prompt_capabilities_tx, prompt_capabilities_rx) =
            watch::channel(Self::prompt_capabilities(model.as_deref()));
        Self {
            id,
@ -806,8 +740,6 @@ impl Thread {
            project,
            action_log,
            updated_at: db_thread.updated_at,
            prompt_capabilities_tx,
            prompt_capabilities_rx,
        }
    }
@ -975,12 +907,10 @@ impl Thread {
    pub fn set_model(&mut self, model: Arc<dyn LanguageModel>, cx: &mut Context<Self>) {
        let old_usage = self.latest_token_usage();
        self.model = Some(model);
        let new_caps = Self::prompt_capabilities(self.model.as_deref());
        let new_usage = self.latest_token_usage();
        if old_usage != new_usage {
            cx.emit(TokenUsageUpdated(new_usage));
        }
        self.prompt_capabilities_tx.send(new_caps).log_err();
        cx.notify()
    }
@ -1116,10 +1046,15 @@ impl Thread {
        &mut self,
        cx: &mut Context<Self>,
    ) -> Result<mpsc::UnboundedReceiver<Result<ThreadEvent>>> {
        anyhow::ensure!(
            self.tool_use_limit_reached,
            "can only resume after tool use limit is reached"
        );
        self.messages.push(Message::Resume);
        cx.notify();
-        log::debug!("Total messages in thread: {}", self.messages.len());
+        log::info!("Total messages in thread: {}", self.messages.len());
        self.run_turn(cx)
    }
@ -1137,7 +1072,7 @@ impl Thread {
    {
        let model = self.model().context("No language model configured")?;
-        log::info!("Thread::send called with model: {}", model.name().0);
+        log::info!("Thread::send called with model: {:?}", model.name());
        self.advance_prompt_id();
        let content = content.into_iter().map(Into::into).collect::<Vec<_>>();
@ -1147,7 +1082,7 @@ impl Thread {
            .push(Message::User(UserMessage { id, content }));
        cx.notify();
-        log::debug!("Total messages in thread: {}", self.messages.len());
+        log::info!("Total messages in thread: {}", self.messages.len());
        self.run_turn(cx)
    }
@ -1171,14 +1106,44 @@ impl Thread {
            event_stream: event_stream.clone(),
            tools: self.enabled_tools(profile, &model, cx),
            _task: cx.spawn(async move |this, cx| {
-                log::debug!("Starting agent turn execution");
+                log::info!("Starting agent turn execution");
-                let turn_result = Self::run_turn_internal(&this, model, &event_stream, cx).await;
+                let turn_result: Result<()> = async {
                    let mut intent = CompletionIntent::UserPrompt;
                    loop {
                        Self::stream_completion(&this, &model, intent, &event_stream, cx).await?;
                        let mut end_turn = true;
                        this.update(cx, |this, cx| {
                            // Generate title if needed.
                            if this.title.is_none() && this.pending_title_generation.is_none() {
                                this.generate_title(cx);
                            }
                            // End the turn if the model didn't use tools.
                            let message = this.pending_message.as_ref();
                            end_turn =
                                message.map_or(true, |message| message.tool_results.is_empty());
                            this.flush_pending_message(cx);
                        })?;
                        if this.read_with(cx, |this, _| this.tool_use_limit_reached)? {
                            log::info!("Tool use limit reached, completing turn");
                            return Err(language_model::ToolUseLimitReachedError.into());
                        } else if end_turn {
                            log::info!("No tool uses found, completing turn");
                            return Ok(());
                        } else {
                            intent = CompletionIntent::ToolResults;
                        }
                    }
                }
                .await;
                _ = this.update(cx, |this, cx| this.flush_pending_message(cx));
                match turn_result {
                    Ok(()) => {
-                        log::debug!("Turn execution completed");
+                        log::info!("Turn execution completed");
                        event_stream.send_stop(acp::StopReason::EndTurn);
                    }
                    Err(error) => {
@ -1204,18 +1169,20 @@ impl Thread {
        Ok(events_rx)
    }
-    async fn run_turn_internal(
+    async fn stream_completion(
        this: &WeakEntity<Self>,
-        model: Arc<dyn LanguageModel>,
+        model: &Arc<dyn LanguageModel>,
        completion_intent: CompletionIntent,
        event_stream: &ThreadEventStream,
        cx: &mut AsyncApp,
    ) -> Result<()> {
-        let mut attempt = 0;
+        log::debug!("Stream completion started successfully");
-        let mut intent = CompletionIntent::UserPrompt;
+        let request = this.update(cx, |this, cx| {
-        loop {
+            this.build_completion_request(completion_intent, cx)
-            let request =
+        })??;
                this.update(cx, |this, cx| this.build_completion_request(intent, cx))??;
        let mut attempt = None;
        'retry: loop {
            telemetry::event!(
                "Agent Thread Completion",
                thread_id = this.read_with(cx, |this, _| this.id.to_string())?,
@ -1225,31 +1192,75 @@ impl Thread {
                attempt
            );
-            log::debug!("Calling model.stream_completion, attempt {}", attempt);
+            log::info!(
                "Calling model.stream_completion, attempt {}",
                attempt.unwrap_or(0)
            );
            let mut events = model
-                .stream_completion(request, cx)
+                .stream_completion(request.clone(), cx)
                .await
                .map_err(|error| anyhow!(error))?;
            let mut tool_results = FuturesUnordered::new();
-            let mut error = None;
+
            while let Some(event) = events.next().await {
                log::trace!("Received completion event: {:?}", event);
                match event {
                    Ok(event) => {
                        log::trace!("Received completion event: {:?}", event);
                        tool_results.extend(this.update(cx, |this, cx| {
-                            this.handle_completion_event(event, event_stream, cx)
+                            this.handle_streamed_completion_event(event, event_stream, cx)
                        })??);
                    }
-                    Err(err) => {
+                    Err(error) => {
-                        error = Some(err);
+                        let completion_mode =
-                        break;
+                            this.read_with(cx, |thread, _cx| thread.completion_mode())?;
                        if completion_mode == CompletionMode::Normal {
                            return Err(anyhow!(error))?;
                        }
                        let Some(strategy) = Self::retry_strategy_for(&error) else {
                            return Err(anyhow!(error))?;
                        };
                        let max_attempts = match &strategy {
                            RetryStrategy::ExponentialBackoff { max_attempts, .. } => *max_attempts,
                            RetryStrategy::Fixed { max_attempts, .. } => *max_attempts,
                        };
                        let attempt = attempt.get_or_insert(0u8);
                        *attempt += 1;
                        let attempt = *attempt;
                        if attempt > max_attempts {
                            return Err(anyhow!(error))?;
                        }
                        let delay = match &strategy {
                            RetryStrategy::ExponentialBackoff { initial_delay, .. } => {
                                let delay_secs =
                                    initial_delay.as_secs() * 2u64.pow((attempt - 1) as u32);
                                Duration::from_secs(delay_secs)
                            }
                            RetryStrategy::Fixed { delay, .. } => *delay,
                        };
                        log::debug!("Retry attempt {attempt} with delay {delay:?}");
                        event_stream.send_retry(acp_thread::RetryStatus {
                            last_error: error.to_string().into(),
                            attempt: attempt as usize,
                            max_attempts: max_attempts as usize,
                            started_at: Instant::now(),
                            duration: delay,
                        });
                        cx.background_executor().timer(delay).await;
                        continue 'retry;
                    }
                }
            }
            let end_turn = tool_results.is_empty();
            while let Some(tool_result) = tool_results.next().await {
-                log::debug!("Tool finished {:?}", tool_result);
+                log::info!("Tool finished {:?}", tool_result);
                event_stream.update_tool_call_fields(
                    &tool_result.tool_use_id,
@ -1270,83 +1281,31 @@ impl Thread {
                })?;
            }
-            this.update(cx, |this, cx| {
+            return Ok(());
                this.flush_pending_message(cx);
                if this.title.is_none() && this.pending_title_generation.is_none() {
                    this.generate_title(cx);
                }
            })?;
            if let Some(error) = error {
                attempt += 1;
                let retry =
                    this.update(cx, |this, _| this.handle_completion_error(error, attempt))??;
                let timer = cx.background_executor().timer(retry.duration);
                event_stream.send_retry(retry);
                timer.await;
                this.update(cx, |this, _cx| {
                    if let Some(Message::Agent(message)) = this.messages.last() {
                        if message.tool_results.is_empty() {
                            intent = CompletionIntent::UserPrompt;
                            this.messages.push(Message::Resume);
                        }
                    }
                })?;
            } else if this.read_with(cx, |this, _| this.tool_use_limit_reached)? {
                return Err(language_model::ToolUseLimitReachedError.into());
            } else if end_turn {
                return Ok(());
            } else {
                intent = CompletionIntent::ToolResults;
                attempt = 0;
            }
        }
    }
-    fn handle_completion_error(
+    pub fn build_system_message(&self, cx: &App) -> LanguageModelRequestMessage {
-        &mut self,
+        log::debug!("Building system message");
-        error: LanguageModelCompletionError,
+        let prompt = SystemPromptTemplate {
-        attempt: u8,
+            project: self.project_context.read(cx),
-    ) -> Result<acp_thread::RetryStatus> {
+            available_tools: self.tools.keys().cloned().collect(),
        if self.completion_mode == CompletionMode::Normal {
            return Err(anyhow!(error));
        }
-
+        .render(&self.templates)
-        let Some(strategy) = Self::retry_strategy_for(&error) else {
+        .context("failed to build system prompt")
-            return Err(anyhow!(error));
+        .expect("Invalid template");
-        };
+        log::debug!("System message built");
-
+        LanguageModelRequestMessage {
-        let max_attempts = match &strategy {
+            role: Role::System,
-            RetryStrategy::ExponentialBackoff { max_attempts, .. } => *max_attempts,
+            content: vec![prompt.into()],
-            RetryStrategy::Fixed { max_attempts, .. } => *max_attempts,
+            cache: true,
        };
        if attempt > max_attempts {
            return Err(anyhow!(error));
        }
        let delay = match &strategy {
            RetryStrategy::ExponentialBackoff { initial_delay, .. } => {
                let delay_secs = initial_delay.as_secs() * 2u64.pow((attempt - 1) as u32);
                Duration::from_secs(delay_secs)
            }
            RetryStrategy::Fixed { delay, .. } => *delay,
        };
        log::debug!("Retry attempt {attempt} with delay {delay:?}");
        Ok(acp_thread::RetryStatus {
            last_error: error.to_string().into(),
            attempt: attempt as usize,
            max_attempts: max_attempts as usize,
            started_at: Instant::now(),
            duration: delay,
        })
    }
    /// A helper method that's called on every streamed completion event.
    /// Returns an optional tool result task, which the main agentic loop will
    /// send back to the model when it resolves.
-    fn handle_completion_event(
+    fn handle_streamed_completion_event(
        &mut self,
        event: LanguageModelCompletionEvent,
        event_stream: &ThreadEventStream,
@ -1541,7 +1500,7 @@ impl Thread {
        });
        let supports_images = self.model().is_some_and(|model| model.supports_images());
        let tool_result = tool.run(tool_use.input, tool_event_stream, cx);
-        log::debug!("Running tool {}", tool_use.name);
+        log::info!("Running tool {}", tool_use.name);
        Some(cx.foreground_executor().spawn(async move {
            let tool_result = tool_result.await.and_then(|output| {
                if let LanguageModelToolResultContent::Image(_) = &output.llm_output
@ -1567,7 +1526,7 @@ impl Thread {
                    tool_name: tool_use.name,
                    is_error: true,
                    content: LanguageModelToolResultContent::Text(Arc::from(error.to_string())),
-                    output: Some(error.to_string().into()),
+                    output: None,
                },
            }
        }))
@ -1653,7 +1612,7 @@ impl Thread {
                summary.extend(lines.next());
            }
-            log::debug!("Setting summary: {}", summary);
+            log::info!("Setting summary: {}", summary);
            let summary = SharedString::from(summary);
            this.update(cx, |this, cx| {
@ -1670,7 +1629,7 @@ impl Thread {
            return;
        };
-        log::debug!(
+        log::info!(
            "Generating title with model: {:?}",
            self.summarization_model.as_ref().map(|model| model.name())
        );
@ -1756,10 +1715,6 @@ impl Thread {
            return;
        };
        if message.content.is_empty() {
            return;
        }
        for content in &message.content {
            let AgentMessageContent::ToolUse(tool_use) = content else {
                continue;
@ -1788,7 +1743,7 @@ impl Thread {
    pub(crate) fn build_completion_request(
        &self,
        completion_intent: CompletionIntent,
-        cx: &App,
+        cx: &mut App,
    ) -> Result<LanguageModelRequest> {
        let model = self.model().context("No language model configured")?;
        let tools = if let Some(turn) = self.running_turn.as_ref() {
@ -1812,8 +1767,8 @@ impl Thread {
        log::debug!("Completion mode: {:?}", self.completion_mode);
        let messages = self.build_request_messages(cx);
-        log::debug!("Request will include {} messages", messages.len());
+        log::info!("Request will include {} messages", messages.len());
-        log::debug!("Request includes {} tools", tools.len());
+        log::info!("Request includes {} tools", tools.len());
        let request = LanguageModelRequest {
            thread_id: Some(self.id.to_string()),
@ -1909,31 +1864,23 @@ impl Thread {
            "Building request messages from {} thread messages",
            self.messages.len()
        );
-
+        let mut messages = vec![self.build_system_message(cx)];
        let system_prompt = SystemPromptTemplate {
            project: self.project_context.read(cx),
            available_tools: self.tools.keys().cloned().collect(),
        }
        .render(&self.templates)
        .context("failed to build system prompt")
        .expect("Invalid template");
        let mut messages = vec![LanguageModelRequestMessage {
            role: Role::System,
            content: vec![system_prompt.into()],
            cache: false,
        }];
        for message in &self.messages {
            messages.extend(message.to_request());
        }
        if let Some(last_message) = messages.last_mut() {
            last_message.cache = true;
        }
        if let Some(message) = self.pending_message.as_ref() {
            messages.extend(message.to_request());
        }
        if let Some(last_user_message) = messages
            .iter_mut()
            .rev()
            .find(|message| message.role == Role::User)
        {
            last_user_message.cache = true;
        }
        messages
    }
@ -2469,30 +2416,6 @@ impl ToolCallEventStreamReceiver {
        }
    }
    pub async fn expect_update_fields(&mut self) -> acp::ToolCallUpdateFields {
        let event = self.0.next().await;
        if let Some(Ok(ThreadEvent::ToolCallUpdate(acp_thread::ToolCallUpdate::UpdateFields(
            update,
        )))) = event
        {
            update.fields
        } else {
            panic!("Expected update fields but got: {:?}", event);
        }
    }
    pub async fn expect_diff(&mut self) -> Entity<acp_thread::Diff> {
        let event = self.0.next().await;
        if let Some(Ok(ThreadEvent::ToolCallUpdate(acp_thread::ToolCallUpdate::UpdateDiff(
            update,
        )))) = event
        {
            update.diff
        } else {
            panic!("Expected diff but got: {:?}", event);
        }
    }
    pub async fn expect_terminal(&mut self) -> Entity<acp_thread::Terminal> {
        let event = self.0.next().await;
        if let Some(Ok(ThreadEvent::ToolCallUpdate(acp_thread::ToolCallUpdate::UpdateTerminal(
--- a/crates/agent2/src/tools/edit_file_tool.rs
+++ b/crates/agent2/src/tools/edit_file_tool.rs
@ -273,13 +273,6 @@ impl AgentTool for EditFileTool {
            let diff = cx.new(|cx| Diff::new(buffer.clone(), cx))?;
            event_stream.update_diff(diff.clone());
            let _finalize_diff = util::defer({
               let diff = diff.downgrade();
               let mut cx = cx.clone();
               move || {
                   diff.update(&mut cx, |diff, cx| diff.finalize(cx)).ok();
               }
            });
            let old_snapshot = buffer.read_with(cx, |buffer, _cx| buffer.snapshot())?;
            let old_text = cx
@ -396,6 +389,8 @@ impl AgentTool for EditFileTool {
                })
                .await;
            diff.update(cx, |diff, cx| diff.finalize(cx)).ok();
            let input_path = input.path.display();
            if unified_diff.is_empty() {
                anyhow::ensure!(
@ -1550,100 +1545,6 @@ mod tests {
        );
    }
    #[gpui::test]
    async fn test_diff_finalization(cx: &mut TestAppContext) {
        init_test(cx);
        let fs = project::FakeFs::new(cx.executor());
        fs.insert_tree("/", json!({"main.rs": ""})).await;
        let project = Project::test(fs.clone(), [path!("/").as_ref()], cx).await;
        let languages = project.read_with(cx, |project, _cx| project.languages().clone());
        let context_server_registry =
            cx.new(|cx| ContextServerRegistry::new(project.read(cx).context_server_store(), cx));
        let model = Arc::new(FakeLanguageModel::default());
        let thread = cx.new(|cx| {
            Thread::new(
                project.clone(),
                cx.new(|_cx| ProjectContext::default()),
                context_server_registry.clone(),
                Templates::new(),
                Some(model.clone()),
                cx,
            )
        });
        // Ensure the diff is finalized after the edit completes.
        {
            let tool = Arc::new(EditFileTool::new(thread.downgrade(), languages.clone()));
            let (stream_tx, mut stream_rx) = ToolCallEventStream::test();
            let edit = cx.update(|cx| {
                tool.run(
                    EditFileToolInput {
                        display_description: "Edit file".into(),
                        path: path!("/main.rs").into(),
                        mode: EditFileMode::Edit,
                    },
                    stream_tx,
                    cx,
                )
            });
            stream_rx.expect_update_fields().await;
            let diff = stream_rx.expect_diff().await;
            diff.read_with(cx, |diff, _| assert!(matches!(diff, Diff::Pending(_))));
            cx.run_until_parked();
            model.end_last_completion_stream();
            edit.await.unwrap();
            diff.read_with(cx, |diff, _| assert!(matches!(diff, Diff::Finalized(_))));
        }
        // Ensure the diff is finalized if an error occurs while editing.
        {
            model.forbid_requests();
            let tool = Arc::new(EditFileTool::new(thread.downgrade(), languages.clone()));
            let (stream_tx, mut stream_rx) = ToolCallEventStream::test();
            let edit = cx.update(|cx| {
                tool.run(
                    EditFileToolInput {
                        display_description: "Edit file".into(),
                        path: path!("/main.rs").into(),
                        mode: EditFileMode::Edit,
                    },
                    stream_tx,
                    cx,
                )
            });
            stream_rx.expect_update_fields().await;
            let diff = stream_rx.expect_diff().await;
            diff.read_with(cx, |diff, _| assert!(matches!(diff, Diff::Pending(_))));
            edit.await.unwrap_err();
            diff.read_with(cx, |diff, _| assert!(matches!(diff, Diff::Finalized(_))));
            model.allow_requests();
        }
        // Ensure the diff is finalized if the tool call gets dropped.
        {
            let tool = Arc::new(EditFileTool::new(thread.downgrade(), languages.clone()));
            let (stream_tx, mut stream_rx) = ToolCallEventStream::test();
            let edit = cx.update(|cx| {
                tool.run(
                    EditFileToolInput {
                        display_description: "Edit file".into(),
                        path: path!("/main.rs").into(),
                        mode: EditFileMode::Edit,
                    },
                    stream_tx,
                    cx,
                )
            });
            stream_rx.expect_update_fields().await;
            let diff = stream_rx.expect_diff().await;
            diff.read_with(cx, |diff, _| assert!(matches!(diff, Diff::Pending(_))));
            drop(edit);
            cx.run_until_parked();
            diff.read_with(cx, |diff, _| assert!(matches!(diff, Diff::Finalized(_))));
        }
    }
    fn init_test(cx: &mut TestAppContext) {
        cx.update(|cx| {
            let settings_store = SettingsStore::test(cx);
--- a/crates/agent2/src/tools/fetch_tool.rs
+++ b/crates/agent2/src/tools/fetch_tool.rs
@ -136,17 +136,12 @@ impl AgentTool for FetchTool {
    fn run(
        self: Arc<Self>,
        input: Self::Input,
-        event_stream: ToolCallEventStream,
+        _event_stream: ToolCallEventStream,
        cx: &mut App,
    ) -> Task<Result<Self::Output>> {
        let authorize = event_stream.authorize(input.url.clone(), cx);
        let text = cx.background_spawn({
            let http_client = self.http_client.clone();
-            async move {
+            async move { Self::build_message(http_client, &input.url).await }
                authorize.await?;
                Self::build_message(http_client, &input.url).await
            }
        });
        cx.foreground_executor().spawn(async move {
--- a/crates/agent2/src/tools/find_path_tool.rs
+++ b/crates/agent2/src/tools/find_path_tool.rs
@ -165,17 +165,16 @@ fn search_paths(glob: &str, project: Entity<Project>, cx: &mut App) -> Task<Resu
        .collect();
    cx.background_spawn(async move {
-        let mut results = Vec::new();
+        Ok(snapshots
-        for snapshot in snapshots {
+            .iter()
-            for entry in snapshot.entries(false, 0) {
+            .flat_map(|snapshot| {
                let root_name = PathBuf::from(snapshot.root_name());
-                if path_matcher.is_match(root_name.join(&entry.path)) {
+                snapshot
-                    results.push(snapshot.abs_path().join(entry.path.as_ref()));
+                    .entries(false, 0)
-                }
+                    .map(move |entry| root_name.join(&entry.path))
-            }
+                    .filter(|path| path_matcher.is_match(&path))
-        }
+            })
-
+            .collect())
        Ok(results)
    })
 }
@ -216,8 +215,8 @@ mod test {
        assert_eq!(
            matches,
            &[
-                PathBuf::from(path!("/root/apple/banana/carrot")),
+                PathBuf::from("root/apple/banana/carrot"),
-                PathBuf::from(path!("/root/apple/bandana/carbonara"))
+                PathBuf::from("root/apple/bandana/carbonara")
            ]
        );
@ -228,8 +227,8 @@ mod test {
        assert_eq!(
            matches,
            &[
-                PathBuf::from(path!("/root/apple/banana/carrot")),
+                PathBuf::from("root/apple/banana/carrot"),
-                PathBuf::from(path!("/root/apple/bandana/carbonara"))
+                PathBuf::from("root/apple/bandana/carbonara")
            ]
        );
    }
--- a/crates/agent2/src/tools/read_file_tool.rs
+++ b/crates/agent2/src/tools/read_file_tool.rs
@ -10,8 +10,7 @@ use project::{AgentLocation, ImageItem, Project, WorktreeSettings, image_store};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use settings::Settings;
-use std::{path::Path, sync::Arc};
+use std::sync::Arc;
 use util::markdown::MarkdownCodeBlock;
 use crate::{AgentTool, ToolCallEventStream};
@ -69,12 +68,27 @@ impl AgentTool for ReadFileTool {
    }
    fn initial_title(&self, input: Result<Self::Input, serde_json::Value>) -> SharedString {
-        input
+        if let Ok(input) = input {
-            .ok()
+            let path = &input.path;
-            .as_ref()
+            match (input.start_line, input.end_line) {
-            .and_then(|input| Path::new(&input.path).file_name())
+                (Some(start), Some(end)) => {
-            .map(|file_name| file_name.to_string_lossy().to_string().into())
+                    format!(
-            .unwrap_or_default()
+                        "[Read file `{}` (lines {}-{})](@selection:{}:({}-{}))",
                        path, start, end, path, start, end
                    )
                }
                (Some(start), None) => {
                    format!(
                        "[Read file `{}` (from line {})](@selection:{}:({}-{}))",
                        path, start, path, start, start
                    )
                }
                _ => format!("[Read file `{}`](@file:{})", path, path),
            }
            .into()
        } else {
            "Read file".into()
        }
    }
    fn run(
@ -244,19 +258,6 @@ impl AgentTool for ReadFileTool {
                        }]),
                        ..Default::default()
                    });
                    if let Ok(LanguageModelToolResultContent::Text(text)) = &result {
                        let markdown = MarkdownCodeBlock {
                            tag: &input.path,
                            text,
                        }
                        .to_string();
                        event_stream.update_fields(ToolCallUpdateFields {
                            content: Some(vec![acp::ToolCallContent::Content {
                                content: markdown.into(),
                            }]),
                            ..Default::default()
                        })
                    }
                }
            })?;
--- a/crates/agent_servers/Cargo.toml
+++ b/crates/agent_servers/Cargo.toml
@ -17,11 +17,11 @@ path = "src/agent_servers.rs"
 doctest = false
 [dependencies]
 acp_tools.workspace = true
 acp_thread.workspace = true
 action_log.workspace = true
 agent-client-protocol.workspace = true
 agent_settings.workspace = true
 agentic-coding-protocol.workspace = true
 anyhow.workspace = true
 client = { workspace = true, optional = true }
 collections.workspace = true
--- a/crates/agent_servers/src/acp.rs
+++ b/crates/agent_servers/src/acp.rs
@ -1,414 +1,34 @@
 use std::{path::Path, rc::Rc};
 use crate::AgentServerCommand;
 use acp_thread::AgentConnection;
-use acp_tools::AcpConnectionRegistry;
+use anyhow::Result;
-use action_log::ActionLog;
+use gpui::AsyncApp;
 use agent_client_protocol::{self as acp, Agent as _, ErrorCode};
 use anyhow::anyhow;
 use collections::HashMap;
 use futures::AsyncBufReadExt as _;
 use futures::channel::oneshot;
 use futures::io::BufReader;
 use project::Project;
 use serde::Deserialize;
 use std::{any::Any, cell::RefCell};
 use std::{path::Path, rc::Rc};
 use thiserror::Error;
-use anyhow::{Context as _, Result};
+mod v0;
-use gpui::{App, AppContext as _, AsyncApp, Entity, SharedString, Task, WeakEntity};
+mod v1;
 use acp_thread::{AcpThread, AuthRequired, LoadError};
 #[derive(Debug, Error)]
 #[error("Unsupported version")]
 pub struct UnsupportedVersion;
 pub struct AcpConnection {
    server_name: SharedString,
    connection: Rc<acp::ClientSideConnection>,
    sessions: Rc<RefCell<HashMap<acp::SessionId, AcpSession>>>,
    auth_methods: Vec<acp::AuthMethod>,
    prompt_capabilities: acp::PromptCapabilities,
    _io_task: Task<Result<()>>,
 }
 pub struct AcpSession {
    thread: WeakEntity<AcpThread>,
    suppress_abort_err: bool,
 }
 pub async fn connect(
-    server_name: SharedString,
+    server_name: &'static str,
    command: AgentServerCommand,
    root_dir: &Path,
    cx: &mut AsyncApp,
 ) -> Result<Rc<dyn AgentConnection>> {
-    let conn = AcpConnection::stdio(server_name, command.clone(), root_dir, cx).await?;
+    let conn = v1::AcpConnection::stdio(server_name, command.clone(), root_dir, cx).await;
    Ok(Rc::new(conn) as _)
 }
-const MINIMUM_SUPPORTED_VERSION: acp::ProtocolVersion = acp::V1;
+    match conn {
-
+        Ok(conn) => Ok(Rc::new(conn) as _),
-impl AcpConnection {
+        Err(err) if err.is::<UnsupportedVersion>() => {
-    pub async fn stdio(
+            // Consider re-using initialize response and subprocess when adding another version here
-        server_name: SharedString,
+            let conn: Rc<dyn AgentConnection> =
-        command: AgentServerCommand,
+                Rc::new(v0::AcpConnection::stdio(server_name, command, root_dir, cx).await?);
-        root_dir: &Path,
+            Ok(conn)
        cx: &mut AsyncApp,
    ) -> Result<Self> {
        let mut child = util::command::new_smol_command(&command.path)
            .args(command.args.iter().map(|arg| arg.as_str()))
            .envs(command.env.iter().flatten())
            .current_dir(root_dir)
            .stdin(std::process::Stdio::piped())
            .stdout(std::process::Stdio::piped())
            .stderr(std::process::Stdio::piped())
            .kill_on_drop(true)
            .spawn()?;
        let stdout = child.stdout.take().context("Failed to take stdout")?;
        let stdin = child.stdin.take().context("Failed to take stdin")?;
        let stderr = child.stderr.take().context("Failed to take stderr")?;
        log::trace!("Spawned (pid: {})", child.id());
        let sessions = Rc::new(RefCell::new(HashMap::default()));
        let client = ClientDelegate {
            sessions: sessions.clone(),
            cx: cx.clone(),
        };
        let (connection, io_task) = acp::ClientSideConnection::new(client, stdin, stdout, {
            let foreground_executor = cx.foreground_executor().clone();
            move |fut| {
                foreground_executor.spawn(fut).detach();
            }
        });
        let io_task = cx.background_spawn(io_task);
        cx.background_spawn(async move {
            let mut stderr = BufReader::new(stderr);
            let mut line = String::new();
            while let Ok(n) = stderr.read_line(&mut line).await
                && n > 0
            {
                log::warn!("agent stderr: {}", &line);
                line.clear();
            }
        })
        .detach();
        cx.spawn({
            let sessions = sessions.clone();
            async move |cx| {
                let status = child.status().await?;
                for session in sessions.borrow().values() {
                    session
                        .thread
                        .update(cx, |thread, cx| {
                            thread.emit_load_error(LoadError::Exited { status }, cx)
                        })
                        .ok();
                }
                anyhow::Ok(())
            }
        })
        .detach();
        let connection = Rc::new(connection);
        cx.update(|cx| {
            AcpConnectionRegistry::default_global(cx).update(cx, |registry, cx| {
                registry.set_active_connection(server_name.clone(), &connection, cx)
            });
        })?;
        let response = connection
            .initialize(acp::InitializeRequest {
                protocol_version: acp::VERSION,
                client_capabilities: acp::ClientCapabilities {
                    fs: acp::FileSystemCapability {
                        read_text_file: true,
                        write_text_file: true,
                    },
                },
            })
            .await?;
        if response.protocol_version < MINIMUM_SUPPORTED_VERSION {
            return Err(UnsupportedVersion.into());
        }
-
+        Err(err) => Err(err),
        Ok(Self {
            auth_methods: response.auth_methods,
            connection,
            server_name,
            sessions,
            prompt_capabilities: response.agent_capabilities.prompt_capabilities,
            _io_task: io_task,
        })
    }
 }
 impl AgentConnection for AcpConnection {
    fn new_thread(
        self: Rc<Self>,
        project: Entity<Project>,
        cwd: &Path,
        cx: &mut App,
    ) -> Task<Result<Entity<AcpThread>>> {
        let conn = self.connection.clone();
        let sessions = self.sessions.clone();
        let cwd = cwd.to_path_buf();
        let context_server_store = project.read(cx).context_server_store().read(cx);
        let mcp_servers = context_server_store
            .configured_server_ids()
            .iter()
            .filter_map(|id| {
                let configuration = context_server_store.configuration_for_server(id)?;
                let command = configuration.command();
                Some(acp::McpServer {
                    name: id.0.to_string(),
                    command: command.path.clone(),
                    args: command.args.clone(),
                    env: if let Some(env) = command.env.as_ref() {
                        env.iter()
                            .map(|(name, value)| acp::EnvVariable {
                                name: name.clone(),
                                value: value.clone(),
                            })
                            .collect()
                    } else {
                        vec![]
                    },
                })
            })
            .collect();
        cx.spawn(async move |cx| {
            let response = conn
                .new_session(acp::NewSessionRequest { mcp_servers, cwd })
                .await
                .map_err(|err| {
                    if err.code == acp::ErrorCode::AUTH_REQUIRED.code {
                        let mut error = AuthRequired::new();
                        if err.message != acp::ErrorCode::AUTH_REQUIRED.message {
                            error = error.with_description(err.message);
                        }
                        anyhow!(error)
                    } else {
                        anyhow!(err)
                    }
                })?;
            let session_id = response.session_id;
            let action_log = cx.new(|_| ActionLog::new(project.clone()))?;
            let thread = cx.new(|cx| {
                AcpThread::new(
                    self.server_name.clone(),
                    self.clone(),
                    project,
                    action_log,
                    session_id.clone(),
                    // ACP doesn't currently support per-session prompt capabilities or changing capabilities dynamically.
                    watch::Receiver::constant(self.prompt_capabilities),
                    cx,
                )
            })?;
            let session = AcpSession {
                thread: thread.downgrade(),
                suppress_abort_err: false,
            };
            sessions.borrow_mut().insert(session_id, session);
            Ok(thread)
        })
    }
    fn auth_methods(&self) -> &[acp::AuthMethod] {
        &self.auth_methods
    }
    fn authenticate(&self, method_id: acp::AuthMethodId, cx: &mut App) -> Task<Result<()>> {
        let conn = self.connection.clone();
        cx.foreground_executor().spawn(async move {
            let result = conn
                .authenticate(acp::AuthenticateRequest {
                    method_id: method_id.clone(),
                })
                .await?;
            Ok(result)
        })
    }
    fn prompt(
        &self,
        _id: Option<acp_thread::UserMessageId>,
        params: acp::PromptRequest,
        cx: &mut App,
    ) -> Task<Result<acp::PromptResponse>> {
        let conn = self.connection.clone();
        let sessions = self.sessions.clone();
        let session_id = params.session_id.clone();
        cx.foreground_executor().spawn(async move {
            let result = conn.prompt(params).await;
            let mut suppress_abort_err = false;
            if let Some(session) = sessions.borrow_mut().get_mut(&session_id) {
                suppress_abort_err = session.suppress_abort_err;
                session.suppress_abort_err = false;
            }
            match result {
                Ok(response) => Ok(response),
                Err(err) => {
                    if err.code != ErrorCode::INTERNAL_ERROR.code {
                        anyhow::bail!(err)
                    }
                    let Some(data) = &err.data else {
                        anyhow::bail!(err)
                    };
                    // Temporary workaround until the following PR is generally available:
                    // https://github.com/google-gemini/gemini-cli/pull/6656
                    #[derive(Deserialize)]
                    #[serde(deny_unknown_fields)]
                    struct ErrorDetails {
                        details: Box<str>,
                    }
                    match serde_json::from_value(data.clone()) {
                        Ok(ErrorDetails { details }) => {
                            if suppress_abort_err
                                && (details.contains("This operation was aborted")
                                    || details.contains("The user aborted a request"))
                            {
                                Ok(acp::PromptResponse {
                                    stop_reason: acp::StopReason::Cancelled,
                                })
                            } else {
                                Err(anyhow!(details))
                            }
                        }
                        Err(_) => Err(anyhow!(err)),
                    }
                }
            }
        })
    }
    fn cancel(&self, session_id: &acp::SessionId, cx: &mut App) {
        if let Some(session) = self.sessions.borrow_mut().get_mut(session_id) {
            session.suppress_abort_err = true;
        }
        let conn = self.connection.clone();
        let params = acp::CancelNotification {
            session_id: session_id.clone(),
        };
        cx.foreground_executor()
            .spawn(async move { conn.cancel(params).await })
            .detach();
    }
    fn into_any(self: Rc<Self>) -> Rc<dyn Any> {
        self
    }
 }
 struct ClientDelegate {
    sessions: Rc<RefCell<HashMap<acp::SessionId, AcpSession>>>,
    cx: AsyncApp,
 }
 impl acp::Client for ClientDelegate {
    async fn request_permission(
        &self,
        arguments: acp::RequestPermissionRequest,
    ) -> Result<acp::RequestPermissionResponse, acp::Error> {
        let cx = &mut self.cx.clone();
        let rx = self
            .sessions
            .borrow()
            .get(&arguments.session_id)
            .context("Failed to get session")?
            .thread
            .update(cx, |thread, cx| {
                thread.request_tool_call_authorization(arguments.tool_call, arguments.options, cx)
            })?;
        let result = rx?.await;
        let outcome = match result {
            Ok(option) => acp::RequestPermissionOutcome::Selected { option_id: option },
            Err(oneshot::Canceled) => acp::RequestPermissionOutcome::Cancelled,
        };
        Ok(acp::RequestPermissionResponse { outcome })
    }
    async fn write_text_file(
        &self,
        arguments: acp::WriteTextFileRequest,
    ) -> Result<(), acp::Error> {
        let cx = &mut self.cx.clone();
        let task = self
            .sessions
            .borrow()
            .get(&arguments.session_id)
            .context("Failed to get session")?
            .thread
            .update(cx, |thread, cx| {
                thread.write_text_file(arguments.path, arguments.content, cx)
            })?;
        task.await?;
        Ok(())
    }
    async fn read_text_file(
        &self,
        arguments: acp::ReadTextFileRequest,
    ) -> Result<acp::ReadTextFileResponse, acp::Error> {
        let cx = &mut self.cx.clone();
        let task = self
            .sessions
            .borrow()
            .get(&arguments.session_id)
            .context("Failed to get session")?
            .thread
            .update(cx, |thread, cx| {
                thread.read_text_file(arguments.path, arguments.line, arguments.limit, false, cx)
            })?;
        let content = task.await?;
        Ok(acp::ReadTextFileResponse { content })
    }
    async fn session_notification(
        &self,
        notification: acp::SessionNotification,
    ) -> Result<(), acp::Error> {
        let cx = &mut self.cx.clone();
        let sessions = self.sessions.borrow();
        let session = sessions
            .get(&notification.session_id)
            .context("Failed to get session")?;
        session.thread.update(cx, |thread, cx| {
            thread.handle_session_update(notification.update, cx)
        })??;
        Ok(())
    }
 }
--- a/crates/agent_servers/src/acp/v0.rs
+++ b/crates/agent_servers/src/acp/v0.rs
@ -0,0 +1,524 @@
 // Translates old acp agents into the new schema
 use action_log::ActionLog;
 use agent_client_protocol as acp;
 use agentic_coding_protocol::{self as acp_old, AgentRequest as _};
 use anyhow::{Context as _, Result, anyhow};
 use futures::channel::oneshot;
 use gpui::{AppContext as _, AsyncApp, Entity, Task, WeakEntity};
 use project::Project;
 use std::{any::Any, cell::RefCell, path::Path, rc::Rc};
 use ui::App;
 use util::ResultExt as _;
 use crate::AgentServerCommand;
 use acp_thread::{AcpThread, AgentConnection, AuthRequired};
 #[derive(Clone)]
 struct OldAcpClientDelegate {
    thread: Rc<RefCell<WeakEntity<AcpThread>>>,
    cx: AsyncApp,
    next_tool_call_id: Rc<RefCell<u64>>,
    // sent_buffer_versions: HashMap<Entity<Buffer>, HashMap<u64, BufferSnapshot>>,
 }
 impl OldAcpClientDelegate {
    fn new(thread: Rc<RefCell<WeakEntity<AcpThread>>>, cx: AsyncApp) -> Self {
        Self {
            thread,
            cx,
            next_tool_call_id: Rc::new(RefCell::new(0)),
        }
    }
 }
 impl acp_old::Client for OldAcpClientDelegate {
    async fn stream_assistant_message_chunk(
        &self,
        params: acp_old::StreamAssistantMessageChunkParams,
    ) -> Result<(), acp_old::Error> {
        let cx = &mut self.cx.clone();
        cx.update(|cx| {
            self.thread
                .borrow()
                .update(cx, |thread, cx| match params.chunk {
                    acp_old::AssistantMessageChunk::Text { text } => {
                        thread.push_assistant_content_block(text.into(), false, cx)
                    }
                    acp_old::AssistantMessageChunk::Thought { thought } => {
                        thread.push_assistant_content_block(thought.into(), true, cx)
                    }
                })
                .log_err();
        })?;
        Ok(())
    }
    async fn request_tool_call_confirmation(
        &self,
        request: acp_old::RequestToolCallConfirmationParams,
    ) -> Result<acp_old::RequestToolCallConfirmationResponse, acp_old::Error> {
        let cx = &mut self.cx.clone();
        let old_acp_id = *self.next_tool_call_id.borrow() + 1;
        self.next_tool_call_id.replace(old_acp_id);
        let tool_call = into_new_tool_call(
            acp::ToolCallId(old_acp_id.to_string().into()),
            request.tool_call,
        );
        let mut options = match request.confirmation {
            acp_old::ToolCallConfirmation::Edit { .. } => vec![(
                acp_old::ToolCallConfirmationOutcome::AlwaysAllow,
                acp::PermissionOptionKind::AllowAlways,
                "Always Allow Edits".to_string(),
            )],
            acp_old::ToolCallConfirmation::Execute { root_command, .. } => vec![(
                acp_old::ToolCallConfirmationOutcome::AlwaysAllow,
                acp::PermissionOptionKind::AllowAlways,
                format!("Always Allow {}", root_command),
            )],
            acp_old::ToolCallConfirmation::Mcp {
                server_name,
                tool_name,
                ..
            } => vec![
                (
                    acp_old::ToolCallConfirmationOutcome::AlwaysAllowMcpServer,
                    acp::PermissionOptionKind::AllowAlways,
                    format!("Always Allow {}", server_name),
                ),
                (
                    acp_old::ToolCallConfirmationOutcome::AlwaysAllowTool,
                    acp::PermissionOptionKind::AllowAlways,
                    format!("Always Allow {}", tool_name),
                ),
            ],
            acp_old::ToolCallConfirmation::Fetch { .. } => vec![(
                acp_old::ToolCallConfirmationOutcome::AlwaysAllow,
                acp::PermissionOptionKind::AllowAlways,
                "Always Allow".to_string(),
            )],
            acp_old::ToolCallConfirmation::Other { .. } => vec![(
                acp_old::ToolCallConfirmationOutcome::AlwaysAllow,
                acp::PermissionOptionKind::AllowAlways,
                "Always Allow".to_string(),
            )],
        };
        options.extend([
            (
                acp_old::ToolCallConfirmationOutcome::Allow,
                acp::PermissionOptionKind::AllowOnce,
                "Allow".to_string(),
            ),
            (
                acp_old::ToolCallConfirmationOutcome::Reject,
                acp::PermissionOptionKind::RejectOnce,
                "Reject".to_string(),
            ),
        ]);
        let mut outcomes = Vec::with_capacity(options.len());
        let mut acp_options = Vec::with_capacity(options.len());
        for (index, (outcome, kind, label)) in options.into_iter().enumerate() {
            outcomes.push(outcome);
            acp_options.push(acp::PermissionOption {
                id: acp::PermissionOptionId(index.to_string().into()),
                name: label,
                kind,
            })
        }
        let response = cx
            .update(|cx| {
                self.thread.borrow().update(cx, |thread, cx| {
                    thread.request_tool_call_authorization(tool_call.into(), acp_options, cx)
                })
            })??
            .context("Failed to update thread")?
            .await;
        let outcome = match response {
            Ok(option_id) => outcomes[option_id.0.parse::<usize>().unwrap_or(0)],
            Err(oneshot::Canceled) => acp_old::ToolCallConfirmationOutcome::Cancel,
        };
        Ok(acp_old::RequestToolCallConfirmationResponse {
            id: acp_old::ToolCallId(old_acp_id),
            outcome,
        })
    }
    async fn push_tool_call(
        &self,
        request: acp_old::PushToolCallParams,
    ) -> Result<acp_old::PushToolCallResponse, acp_old::Error> {
        let cx = &mut self.cx.clone();
        let old_acp_id = *self.next_tool_call_id.borrow() + 1;
        self.next_tool_call_id.replace(old_acp_id);
        cx.update(|cx| {
            self.thread.borrow().update(cx, |thread, cx| {
                thread.upsert_tool_call(
                    into_new_tool_call(acp::ToolCallId(old_acp_id.to_string().into()), request),
                    cx,
                )
            })
        })??
        .context("Failed to update thread")?;
        Ok(acp_old::PushToolCallResponse {
            id: acp_old::ToolCallId(old_acp_id),
        })
    }
    async fn update_tool_call(
        &self,
        request: acp_old::UpdateToolCallParams,
    ) -> Result<(), acp_old::Error> {
        let cx = &mut self.cx.clone();
        cx.update(|cx| {
            self.thread.borrow().update(cx, |thread, cx| {
                thread.update_tool_call(
                    acp::ToolCallUpdate {
                        id: acp::ToolCallId(request.tool_call_id.0.to_string().into()),
                        fields: acp::ToolCallUpdateFields {
                            status: Some(into_new_tool_call_status(request.status)),
                            content: Some(
                                request
                                    .content
                                    .into_iter()
                                    .map(into_new_tool_call_content)
                                    .collect::<Vec<_>>(),
                            ),
                            ..Default::default()
                        },
                    },
                    cx,
                )
            })
        })?
        .context("Failed to update thread")??;
        Ok(())
    }
    async fn update_plan(&self, request: acp_old::UpdatePlanParams) -> Result<(), acp_old::Error> {
        let cx = &mut self.cx.clone();
        cx.update(|cx| {
            self.thread.borrow().update(cx, |thread, cx| {
                thread.update_plan(
                    acp::Plan {
                        entries: request
                            .entries
                            .into_iter()
                            .map(into_new_plan_entry)
                            .collect(),
                    },
                    cx,
                )
            })
        })?
        .context("Failed to update thread")?;
        Ok(())
    }
    async fn read_text_file(
        &self,
        acp_old::ReadTextFileParams { path, line, limit }: acp_old::ReadTextFileParams,
    ) -> Result<acp_old::ReadTextFileResponse, acp_old::Error> {
        let content = self
            .cx
            .update(|cx| {
                self.thread.borrow().update(cx, |thread, cx| {
                    thread.read_text_file(path, line, limit, false, cx)
                })
            })?
            .context("Failed to update thread")?
            .await?;
        Ok(acp_old::ReadTextFileResponse { content })
    }
    async fn write_text_file(
        &self,
        acp_old::WriteTextFileParams { path, content }: acp_old::WriteTextFileParams,
    ) -> Result<(), acp_old::Error> {
        self.cx
            .update(|cx| {
                self.thread
                    .borrow()
                    .update(cx, |thread, cx| thread.write_text_file(path, content, cx))
            })?
            .context("Failed to update thread")?
            .await?;
        Ok(())
    }
 }
 fn into_new_tool_call(id: acp::ToolCallId, request: acp_old::PushToolCallParams) -> acp::ToolCall {
    acp::ToolCall {
        id,
        title: request.label,
        kind: acp_kind_from_old_icon(request.icon),
        status: acp::ToolCallStatus::InProgress,
        content: request
            .content
            .into_iter()
            .map(into_new_tool_call_content)
            .collect(),
        locations: request
            .locations
            .into_iter()
            .map(into_new_tool_call_location)
            .collect(),
        raw_input: None,
        raw_output: None,
    }
 }
 fn acp_kind_from_old_icon(icon: acp_old::Icon) -> acp::ToolKind {
    match icon {
        acp_old::Icon::FileSearch => acp::ToolKind::Search,
        acp_old::Icon::Folder => acp::ToolKind::Search,
        acp_old::Icon::Globe => acp::ToolKind::Search,
        acp_old::Icon::Hammer => acp::ToolKind::Other,
        acp_old::Icon::LightBulb => acp::ToolKind::Think,
        acp_old::Icon::Pencil => acp::ToolKind::Edit,
        acp_old::Icon::Regex => acp::ToolKind::Search,
        acp_old::Icon::Terminal => acp::ToolKind::Execute,
    }
 }
 fn into_new_tool_call_status(status: acp_old::ToolCallStatus) -> acp::ToolCallStatus {
    match status {
        acp_old::ToolCallStatus::Running => acp::ToolCallStatus::InProgress,
        acp_old::ToolCallStatus::Finished => acp::ToolCallStatus::Completed,
        acp_old::ToolCallStatus::Error => acp::ToolCallStatus::Failed,
    }
 }
 fn into_new_tool_call_content(content: acp_old::ToolCallContent) -> acp::ToolCallContent {
    match content {
        acp_old::ToolCallContent::Markdown { markdown } => markdown.into(),
        acp_old::ToolCallContent::Diff { diff } => acp::ToolCallContent::Diff {
            diff: into_new_diff(diff),
        },
    }
 }
 fn into_new_diff(diff: acp_old::Diff) -> acp::Diff {
    acp::Diff {
        path: diff.path,
        old_text: diff.old_text,
        new_text: diff.new_text,
    }
 }
 fn into_new_tool_call_location(location: acp_old::ToolCallLocation) -> acp::ToolCallLocation {
    acp::ToolCallLocation {
        path: location.path,
        line: location.line,
    }
 }
 fn into_new_plan_entry(entry: acp_old::PlanEntry) -> acp::PlanEntry {
    acp::PlanEntry {
        content: entry.content,
        priority: into_new_plan_priority(entry.priority),
        status: into_new_plan_status(entry.status),
    }
 }
 fn into_new_plan_priority(priority: acp_old::PlanEntryPriority) -> acp::PlanEntryPriority {
    match priority {
        acp_old::PlanEntryPriority::Low => acp::PlanEntryPriority::Low,
        acp_old::PlanEntryPriority::Medium => acp::PlanEntryPriority::Medium,
        acp_old::PlanEntryPriority::High => acp::PlanEntryPriority::High,
    }
 }
 fn into_new_plan_status(status: acp_old::PlanEntryStatus) -> acp::PlanEntryStatus {
    match status {
        acp_old::PlanEntryStatus::Pending => acp::PlanEntryStatus::Pending,
        acp_old::PlanEntryStatus::InProgress => acp::PlanEntryStatus::InProgress,
        acp_old::PlanEntryStatus::Completed => acp::PlanEntryStatus::Completed,
    }
 }
 pub struct AcpConnection {
    pub name: &'static str,
    pub connection: acp_old::AgentConnection,
    pub _child_status: Task<Result<()>>,
    pub current_thread: Rc<RefCell<WeakEntity<AcpThread>>>,
 }
 impl AcpConnection {
    pub fn stdio(
        name: &'static str,
        command: AgentServerCommand,
        root_dir: &Path,
        cx: &mut AsyncApp,
    ) -> Task<Result<Self>> {
        let root_dir = root_dir.to_path_buf();
        cx.spawn(async move |cx| {
            let mut child = util::command::new_smol_command(&command.path)
                .args(command.args.iter())
                .current_dir(root_dir)
                .stdin(std::process::Stdio::piped())
                .stdout(std::process::Stdio::piped())
                .stderr(std::process::Stdio::inherit())
                .kill_on_drop(true)
                .spawn()?;
            let stdin = child.stdin.take().unwrap();
            let stdout = child.stdout.take().unwrap();
            log::trace!("Spawned (pid: {})", child.id());
            let foreground_executor = cx.foreground_executor().clone();
            let thread_rc = Rc::new(RefCell::new(WeakEntity::new_invalid()));
            let (connection, io_fut) = acp_old::AgentConnection::connect_to_agent(
                OldAcpClientDelegate::new(thread_rc.clone(), cx.clone()),
                stdin,
                stdout,
                move |fut| foreground_executor.spawn(fut).detach(),
            );
            let io_task = cx.background_spawn(async move {
                io_fut.await.log_err();
            });
            let child_status = cx.background_spawn(async move {
                let result = match child.status().await {
                    Err(e) => Err(anyhow!(e)),
                    Ok(result) if result.success() => Ok(()),
                    Ok(result) => Err(anyhow!(result)),
                };
                drop(io_task);
                result
            });
            Ok(Self {
                name,
                connection,
                _child_status: child_status,
                current_thread: thread_rc,
            })
        })
    }
 }
 impl AgentConnection for AcpConnection {
    fn new_thread(
        self: Rc<Self>,
        project: Entity<Project>,
        _cwd: &Path,
        cx: &mut App,
    ) -> Task<Result<Entity<AcpThread>>> {
        let task = self.connection.request_any(
            acp_old::InitializeParams {
                protocol_version: acp_old::ProtocolVersion::latest(),
            }
            .into_any(),
        );
        let current_thread = self.current_thread.clone();
        cx.spawn(async move |cx| {
            let result = task.await?;
            let result = acp_old::InitializeParams::response_from_any(result)?;
            if !result.is_authenticated {
                anyhow::bail!(AuthRequired::new())
            }
            cx.update(|cx| {
                let thread = cx.new(|cx| {
                    let session_id = acp::SessionId("acp-old-no-id".into());
                    let action_log = cx.new(|_| ActionLog::new(project.clone()));
                    AcpThread::new(self.name, self.clone(), project, action_log, session_id)
                });
                current_thread.replace(thread.downgrade());
                thread
            })
        })
    }
    fn auth_methods(&self) -> &[acp::AuthMethod] {
        &[]
    }
    fn authenticate(&self, _method_id: acp::AuthMethodId, cx: &mut App) -> Task<Result<()>> {
        let task = self
            .connection
            .request_any(acp_old::AuthenticateParams.into_any());
        cx.foreground_executor().spawn(async move {
            task.await?;
            Ok(())
        })
    }
    fn prompt(
        &self,
        _id: Option<acp_thread::UserMessageId>,
        params: acp::PromptRequest,
        cx: &mut App,
    ) -> Task<Result<acp::PromptResponse>> {
        let chunks = params
            .prompt
            .into_iter()
            .filter_map(|block| match block {
                acp::ContentBlock::Text(text) => {
                    Some(acp_old::UserMessageChunk::Text { text: text.text })
                }
                acp::ContentBlock::ResourceLink(link) => Some(acp_old::UserMessageChunk::Path {
                    path: link.uri.into(),
                }),
                _ => None,
            })
            .collect();
        let task = self
            .connection
            .request_any(acp_old::SendUserMessageParams { chunks }.into_any());
        cx.foreground_executor().spawn(async move {
            task.await?;
            anyhow::Ok(acp::PromptResponse {
                stop_reason: acp::StopReason::EndTurn,
            })
        })
    }
    fn prompt_capabilities(&self) -> acp::PromptCapabilities {
        acp::PromptCapabilities {
            image: false,
            audio: false,
            embedded_context: false,
        }
    }
    fn cancel(&self, _session_id: &acp::SessionId, cx: &mut App) {
        let task = self
            .connection
            .request_any(acp_old::CancelSendMessageParams.into_any());
        cx.foreground_executor()
            .spawn(async move {
                task.await?;
                anyhow::Ok(())
            })
            .detach_and_log_err(cx)
    }
    fn into_any(self: Rc<Self>) -> Rc<dyn Any> {
        self
    }
 }
--- a/crates/agent_servers/src/acp/v1.rs
+++ b/crates/agent_servers/src/acp/v1.rs
@ -0,0 +1,367 @@
 use action_log::ActionLog;
 use agent_client_protocol::{self as acp, Agent as _, ErrorCode};
 use anyhow::anyhow;
 use collections::HashMap;
 use futures::AsyncBufReadExt as _;
 use futures::channel::oneshot;
 use futures::io::BufReader;
 use project::Project;
 use serde::Deserialize;
 use std::path::Path;
 use std::rc::Rc;
 use std::{any::Any, cell::RefCell};
 use anyhow::{Context as _, Result};
 use gpui::{App, AppContext as _, AsyncApp, Entity, Task, WeakEntity};
 use crate::{AgentServerCommand, acp::UnsupportedVersion};
 use acp_thread::{AcpThread, AgentConnection, AuthRequired, LoadError};
 pub struct AcpConnection {
    server_name: &'static str,
    connection: Rc<acp::ClientSideConnection>,
    sessions: Rc<RefCell<HashMap<acp::SessionId, AcpSession>>>,
    auth_methods: Vec<acp::AuthMethod>,
    prompt_capabilities: acp::PromptCapabilities,
    _io_task: Task<Result<()>>,
 }
 pub struct AcpSession {
    thread: WeakEntity<AcpThread>,
    suppress_abort_err: bool,
 }
 const MINIMUM_SUPPORTED_VERSION: acp::ProtocolVersion = acp::V1;
 impl AcpConnection {
    pub async fn stdio(
        server_name: &'static str,
        command: AgentServerCommand,
        root_dir: &Path,
        cx: &mut AsyncApp,
    ) -> Result<Self> {
        let mut child = util::command::new_smol_command(&command.path)
            .args(command.args.iter().map(|arg| arg.as_str()))
            .envs(command.env.iter().flatten())
            .current_dir(root_dir)
            .stdin(std::process::Stdio::piped())
            .stdout(std::process::Stdio::piped())
            .stderr(std::process::Stdio::piped())
            .kill_on_drop(true)
            .spawn()?;
        let stdout = child.stdout.take().context("Failed to take stdout")?;
        let stdin = child.stdin.take().context("Failed to take stdin")?;
        let stderr = child.stderr.take().context("Failed to take stderr")?;
        log::trace!("Spawned (pid: {})", child.id());
        let sessions = Rc::new(RefCell::new(HashMap::default()));
        let client = ClientDelegate {
            sessions: sessions.clone(),
            cx: cx.clone(),
        };
        let (connection, io_task) = acp::ClientSideConnection::new(client, stdin, stdout, {
            let foreground_executor = cx.foreground_executor().clone();
            move |fut| {
                foreground_executor.spawn(fut).detach();
            }
        });
        let io_task = cx.background_spawn(io_task);
        cx.background_spawn(async move {
            let mut stderr = BufReader::new(stderr);
            let mut line = String::new();
            while let Ok(n) = stderr.read_line(&mut line).await
                && n > 0
            {
                log::warn!("agent stderr: {}", &line);
                line.clear();
            }
        })
        .detach();
        cx.spawn({
            let sessions = sessions.clone();
            async move |cx| {
                let status = child.status().await?;
                for session in sessions.borrow().values() {
                    session
                        .thread
                        .update(cx, |thread, cx| {
                            thread.emit_load_error(LoadError::Exited { status }, cx)
                        })
                        .ok();
                }
                anyhow::Ok(())
            }
        })
        .detach();
        let response = connection
            .initialize(acp::InitializeRequest {
                protocol_version: acp::VERSION,
                client_capabilities: acp::ClientCapabilities {
                    fs: acp::FileSystemCapability {
                        read_text_file: true,
                        write_text_file: true,
                    },
                },
            })
            .await?;
        if response.protocol_version < MINIMUM_SUPPORTED_VERSION {
            return Err(UnsupportedVersion.into());
        }
        Ok(Self {
            auth_methods: response.auth_methods,
            connection: connection.into(),
            server_name,
            sessions,
            prompt_capabilities: response.agent_capabilities.prompt_capabilities,
            _io_task: io_task,
        })
    }
 }
 impl AgentConnection for AcpConnection {
    fn new_thread(
        self: Rc<Self>,
        project: Entity<Project>,
        cwd: &Path,
        cx: &mut App,
    ) -> Task<Result<Entity<AcpThread>>> {
        let conn = self.connection.clone();
        let sessions = self.sessions.clone();
        let cwd = cwd.to_path_buf();
        cx.spawn(async move |cx| {
            let response = conn
                .new_session(acp::NewSessionRequest {
                    mcp_servers: vec![],
                    cwd,
                })
                .await
                .map_err(|err| {
                    if err.code == acp::ErrorCode::AUTH_REQUIRED.code {
                        let mut error = AuthRequired::new();
                        if err.message != acp::ErrorCode::AUTH_REQUIRED.message {
                            error = error.with_description(err.message);
                        }
                        anyhow!(error)
                    } else {
                        anyhow!(err)
                    }
                })?;
            let session_id = response.session_id;
            let action_log = cx.new(|_| ActionLog::new(project.clone()))?;
            let thread = cx.new(|_cx| {
                AcpThread::new(
                    self.server_name,
                    self.clone(),
                    project,
                    action_log,
                    session_id.clone(),
                )
            })?;
            let session = AcpSession {
                thread: thread.downgrade(),
                suppress_abort_err: false,
            };
            sessions.borrow_mut().insert(session_id, session);
            Ok(thread)
        })
    }
    fn auth_methods(&self) -> &[acp::AuthMethod] {
        &self.auth_methods
    }
    fn authenticate(&self, method_id: acp::AuthMethodId, cx: &mut App) -> Task<Result<()>> {
        let conn = self.connection.clone();
        cx.foreground_executor().spawn(async move {
            let result = conn
                .authenticate(acp::AuthenticateRequest {
                    method_id: method_id.clone(),
                })
                .await?;
            Ok(result)
        })
    }
    fn prompt(
        &self,
        _id: Option<acp_thread::UserMessageId>,
        params: acp::PromptRequest,
        cx: &mut App,
    ) -> Task<Result<acp::PromptResponse>> {
        let conn = self.connection.clone();
        let sessions = self.sessions.clone();
        let session_id = params.session_id.clone();
        cx.foreground_executor().spawn(async move {
            let result = conn.prompt(params).await;
            let mut suppress_abort_err = false;
            if let Some(session) = sessions.borrow_mut().get_mut(&session_id) {
                suppress_abort_err = session.suppress_abort_err;
                session.suppress_abort_err = false;
            }
            match result {
                Ok(response) => Ok(response),
                Err(err) => {
                    if err.code != ErrorCode::INTERNAL_ERROR.code {
                        anyhow::bail!(err)
                    }
                    let Some(data) = &err.data else {
                        anyhow::bail!(err)
                    };
                    // Temporary workaround until the following PR is generally available:
                    // https://github.com/google-gemini/gemini-cli/pull/6656
                    #[derive(Deserialize)]
                    #[serde(deny_unknown_fields)]
                    struct ErrorDetails {
                        details: Box<str>,
                    }
                    match serde_json::from_value(data.clone()) {
                        Ok(ErrorDetails { details }) => {
                            if suppress_abort_err && details.contains("This operation was aborted")
                            {
                                Ok(acp::PromptResponse {
                                    stop_reason: acp::StopReason::Cancelled,
                                })
                            } else {
                                Err(anyhow!(details))
                            }
                        }
                        Err(_) => Err(anyhow!(err)),
                    }
                }
            }
        })
    }
    fn prompt_capabilities(&self) -> acp::PromptCapabilities {
        self.prompt_capabilities
    }
    fn cancel(&self, session_id: &acp::SessionId, cx: &mut App) {
        if let Some(session) = self.sessions.borrow_mut().get_mut(session_id) {
            session.suppress_abort_err = true;
        }
        let conn = self.connection.clone();
        let params = acp::CancelNotification {
            session_id: session_id.clone(),
        };
        cx.foreground_executor()
            .spawn(async move { conn.cancel(params).await })
            .detach();
    }
    fn into_any(self: Rc<Self>) -> Rc<dyn Any> {
        self
    }
 }
 struct ClientDelegate {
    sessions: Rc<RefCell<HashMap<acp::SessionId, AcpSession>>>,
    cx: AsyncApp,
 }
 impl acp::Client for ClientDelegate {
    async fn request_permission(
        &self,
        arguments: acp::RequestPermissionRequest,
    ) -> Result<acp::RequestPermissionResponse, acp::Error> {
        let cx = &mut self.cx.clone();
        let rx = self
            .sessions
            .borrow()
            .get(&arguments.session_id)
            .context("Failed to get session")?
            .thread
            .update(cx, |thread, cx| {
                thread.request_tool_call_authorization(arguments.tool_call, arguments.options, cx)
            })?;
        let result = rx?.await;
        let outcome = match result {
            Ok(option) => acp::RequestPermissionOutcome::Selected { option_id: option },
            Err(oneshot::Canceled) => acp::RequestPermissionOutcome::Cancelled,
        };
        Ok(acp::RequestPermissionResponse { outcome })
    }
    async fn write_text_file(
        &self,
        arguments: acp::WriteTextFileRequest,
    ) -> Result<(), acp::Error> {
        let cx = &mut self.cx.clone();
        let task = self
            .sessions
            .borrow()
            .get(&arguments.session_id)
            .context("Failed to get session")?
            .thread
            .update(cx, |thread, cx| {
                thread.write_text_file(arguments.path, arguments.content, cx)
            })?;
        task.await?;
        Ok(())
    }
    async fn read_text_file(
        &self,
        arguments: acp::ReadTextFileRequest,
    ) -> Result<acp::ReadTextFileResponse, acp::Error> {
        let cx = &mut self.cx.clone();
        let task = self
            .sessions
            .borrow()
            .get(&arguments.session_id)
            .context("Failed to get session")?
            .thread
            .update(cx, |thread, cx| {
                thread.read_text_file(arguments.path, arguments.line, arguments.limit, false, cx)
            })?;
        let content = task.await?;
        Ok(acp::ReadTextFileResponse { content })
    }
    async fn session_notification(
        &self,
        notification: acp::SessionNotification,
    ) -> Result<(), acp::Error> {
        let cx = &mut self.cx.clone();
        let sessions = self.sessions.borrow();
        let session = sessions
            .get(&notification.session_id)
            .context("Failed to get session")?;
        session.thread.update(cx, |thread, cx| {
            thread.handle_session_update(notification.update, cx)
        })??;
        Ok(())
    }
 }
--- a/crates/agent_servers/src/agent_servers.rs
+++ b/crates/agent_servers/src/agent_servers.rs
@ -1,6 +1,5 @@
 mod acp;
 mod claude;
 mod custom;
 mod gemini;
 mod settings;
@ -8,7 +7,6 @@ mod settings;
 pub mod e2e_tests;
 pub use claude::*;
 pub use custom::*;
 pub use gemini::*;
 pub use settings::*;
@ -33,10 +31,9 @@ pub fn init(cx: &mut App) {
 pub trait AgentServer: Send {
    fn logo(&self) -> ui::IconName;
-    fn name(&self) -> SharedString;
+    fn name(&self) -> &'static str;
-    fn empty_state_headline(&self) -> SharedString;
+    fn empty_state_headline(&self) -> &'static str;
-    fn empty_state_message(&self) -> SharedString;
+    fn empty_state_message(&self) -> &'static str;
    fn telemetry_id(&self) -> &'static str;
    fn connect(
        &self,
@ -98,7 +95,7 @@ pub struct AgentServerCommand {
 }
 impl AgentServerCommand {
-    pub async fn resolve(
+    pub(crate) async fn resolve(
        path_bin_name: &'static str,
        extra_args: &[&'static str],
        fallback_path: Option<&Path>,
--- a/crates/agent_servers/src/claude.rs
+++ b/crates/agent_servers/src/claude.rs
@ -30,7 +30,7 @@ use futures::{
    io::BufReader,
    select_biased,
 };
-use gpui::{App, AppContext, AsyncApp, Entity, SharedString, Task, WeakEntity};
+use gpui::{App, AppContext, AsyncApp, Entity, Task, WeakEntity};
 use serde::{Deserialize, Serialize};
 use util::{ResultExt, debug_panic};
@ -43,20 +43,16 @@ use acp_thread::{AcpThread, AgentConnection, AuthRequired, LoadError, MentionUri
 pub struct ClaudeCode;
 impl AgentServer for ClaudeCode {
-    fn telemetry_id(&self) -> &'static str {
+    fn name(&self) -> &'static str {
-        "claude-code"
+        "Claude Code"
    }
-    fn name(&self) -> SharedString {
+    fn empty_state_headline(&self) -> &'static str {
        "Claude Code".into()
    }
    fn empty_state_headline(&self) -> SharedString {
        self.name()
    }
-    fn empty_state_message(&self) -> SharedString {
+    fn empty_state_message(&self) -> &'static str {
-        "How can I help you today?".into()
+        "How can I help you today?"
    }
    fn logo(&self) -> ui::IconName {
@ -253,19 +249,13 @@ impl AgentConnection for ClaudeAgentConnection {
            });
            let action_log = cx.new(|_| ActionLog::new(project.clone()))?;
-            let thread = cx.new(|cx| {
+            let thread = cx.new(|_cx| {
                AcpThread::new(
                    "Claude Code",
                    self.clone(),
                    project,
                    action_log,
                    session_id.clone(),
                    watch::Receiver::constant(acp::PromptCapabilities {
                        image: true,
                        audio: false,
                        embedded_context: true,
                    }),
                    cx,
                )
            })?;
@ -329,6 +319,14 @@ impl AgentConnection for ClaudeAgentConnection {
        cx.foreground_executor().spawn(async move { end_rx.await? })
    }
    fn prompt_capabilities(&self) -> acp::PromptCapabilities {
        acp::PromptCapabilities {
            image: true,
            audio: false,
            embedded_context: true,
        }
    }
    fn cancel(&self, session_id: &acp::SessionId, _cx: &mut App) {
        let sessions = self.sessions.borrow();
        let Some(session) = sessions.get(session_id) else {
--- a/crates/agent_servers/src/custom.rs
+++ b/crates/agent_servers/src/custom.rs
@ -1,63 +0,0 @@
 use crate::{AgentServerCommand, AgentServerSettings};
 use acp_thread::AgentConnection;
 use anyhow::Result;
 use gpui::{App, Entity, SharedString, Task};
 use project::Project;
 use std::{path::Path, rc::Rc};
 use ui::IconName;
 /// A generic agent server implementation for custom user-defined agents
 pub struct CustomAgentServer {
    name: SharedString,
    command: AgentServerCommand,
 }
 impl CustomAgentServer {
    pub fn new(name: SharedString, settings: &AgentServerSettings) -> Self {
        Self {
            name,
            command: settings.command.clone(),
        }
    }
 }
 impl crate::AgentServer for CustomAgentServer {
    fn telemetry_id(&self) -> &'static str {
        "custom"
    }
    fn name(&self) -> SharedString {
        self.name.clone()
    }
    fn logo(&self) -> IconName {
        IconName::Terminal
    }
    fn empty_state_headline(&self) -> SharedString {
        "No conversations yet".into()
    }
    fn empty_state_message(&self) -> SharedString {
        format!("Start a conversation with {}", self.name).into()
    }
    fn connect(
        &self,
        root_dir: &Path,
        _project: &Entity<Project>,
        cx: &mut App,
    ) -> Task<Result<Rc<dyn AgentConnection>>> {
        let server_name = self.name();
        let command = self.command.clone();
        let root_dir = root_dir.to_path_buf();
        cx.spawn(async move |mut cx| {
            crate::acp::connect(server_name, command, &root_dir, &mut cx).await
        })
    }
    fn into_any(self: Rc<Self>) -> Rc<dyn std::any::Any> {
        self
    }
 }
--- a/crates/agent_servers/src/e2e_tests.rs
+++ b/crates/agent_servers/src/e2e_tests.rs
@ -1,15 +1,17 @@
 use crate::AgentServer;
 use acp_thread::{AcpThread, AgentThreadEntry, ToolCall, ToolCallStatus};
 use agent_client_protocol as acp;
 use futures::{FutureExt, StreamExt, channel::mpsc, select};
 use gpui::{AppContext, Entity, TestAppContext};
 use indoc::indoc;
 use project::{FakeFs, Project};
 use std::{
    path::{Path, PathBuf},
    sync::Arc,
    time::Duration,
 };
 use crate::AgentServer;
 use acp_thread::{AcpThread, AgentThreadEntry, ToolCall, ToolCallStatus};
 use agent_client_protocol as acp;
 use futures::{FutureExt, StreamExt, channel::mpsc, select};
 use gpui::{AppContext, Entity, TestAppContext};
 use indoc::indoc;
 use project::{FakeFs, Project};
 use util::path;
 pub async fn test_basic<T, F>(server: F, cx: &mut TestAppContext)
@ -477,7 +479,6 @@ pub async fn init_test(cx: &mut TestAppContext) -> Arc<FakeFs> {
                gemini: Some(crate::AgentServerSettings {
                    command: crate::gemini::tests::local_command(),
                }),
                custom: collections::HashMap::default(),
            },
            cx,
        );
--- a/crates/agent_servers/src/gemini.rs
+++ b/crates/agent_servers/src/gemini.rs
@ -4,10 +4,11 @@ use std::{any::Any, path::Path};
 use crate::{AgentServer, AgentServerCommand};
 use acp_thread::{AgentConnection, LoadError};
 use anyhow::Result;
-use gpui::{App, Entity, SharedString, Task};
+use gpui::{Entity, Task};
 use language_models::provider::google::GoogleLanguageModelProvider;
 use project::Project;
 use settings::SettingsStore;
 use ui::App;
 use crate::AllAgentServersSettings;
@ -17,20 +18,16 @@ pub struct Gemini;
 const ACP_ARG: &str = "--experimental-acp";
 impl AgentServer for Gemini {
-    fn telemetry_id(&self) -> &'static str {
+    fn name(&self) -> &'static str {
-        "gemini-cli"
+        "Gemini CLI"
    }
-    fn name(&self) -> SharedString {
+    fn empty_state_headline(&self) -> &'static str {
        "Gemini CLI".into()
    }
    fn empty_state_headline(&self) -> SharedString {
        self.name()
    }
-    fn empty_state_message(&self) -> SharedString {
+    fn empty_state_message(&self) -> &'static str {
-        "Ask questions, edit files, run commands".into()
+        "Ask questions, edit files, run commands"
    }
    fn logo(&self) -> ui::IconName {
@ -57,7 +54,7 @@ impl AgentServer for Gemini {
                return Err(LoadError::NotInstalled {
                    error_message: "Failed to find Gemini CLI binary".into(),
                    install_message: "Install Gemini CLI".into(),
-                    install_command: Self::install_command().into(),
+                    install_command: "npm install -g @google/gemini-cli@preview".into()
                }.into());
            };
@ -92,7 +89,7 @@ impl AgentServer for Gemini {
                            current_version
                        ).into(),
                        upgrade_message: "Upgrade Gemini CLI to latest".into(),
-                        upgrade_command: Self::upgrade_command().into(),
+                        upgrade_command: "npm install -g @google/gemini-cli@preview".into(),
                    }.into())
                }
            }
@ -105,20 +102,6 @@ impl AgentServer for Gemini {
    }
 }
 impl Gemini {
    pub fn binary_name() -> &'static str {
        "gemini"
    }
    pub fn install_command() -> &'static str {
        "npm install -g @google/gemini-cli@preview"
    }
    pub fn upgrade_command() -> &'static str {
        "npm install -g @google/gemini-cli@preview"
    }
 }
 #[cfg(test)]
 pub(crate) mod tests {
    use super::*;
--- a/crates/agent_servers/src/settings.rs
+++ b/crates/agent_servers/src/settings.rs
@ -1,7 +1,6 @@
 use crate::AgentServerCommand;
 use anyhow::Result;
-use collections::HashMap;
+use gpui::App;
 use gpui::{App, SharedString};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use settings::{Settings, SettingsSources};
@ -14,13 +13,9 @@ pub fn init(cx: &mut App) {
 pub struct AllAgentServersSettings {
    pub gemini: Option<AgentServerSettings>,
    pub claude: Option<AgentServerSettings>,
    /// Custom agent servers configured by the user
    #[serde(flatten)]
    pub custom: HashMap<SharedString, AgentServerSettings>,
 }
-#[derive(Deserialize, Serialize, Clone, JsonSchema, Debug, PartialEq)]
+#[derive(Deserialize, Serialize, Clone, JsonSchema, Debug)]
 pub struct AgentServerSettings {
    #[serde(flatten)]
    pub command: AgentServerCommand,
@ -34,26 +29,13 @@ impl settings::Settings for AllAgentServersSettings {
    fn load(sources: SettingsSources<Self::FileContent>, _: &mut App) -> Result<Self> {
        let mut settings = AllAgentServersSettings::default();
-        for AllAgentServersSettings {
+        for AllAgentServersSettings { gemini, claude } in sources.defaults_and_customizations() {
            gemini,
            claude,
            custom,
        } in sources.defaults_and_customizations()
        {
            if gemini.is_some() {
                settings.gemini = gemini.clone();
            }
            if claude.is_some() {
                settings.claude = claude.clone();
            }
            // Merge custom agents
            for (name, config) in custom {
                // Skip built-in agent names to avoid conflicts
                if name != "gemini" && name != "claude" {
                    settings.custom.insert(name.clone(), config.clone());
                }
            }
        }
        Ok(settings)
--- a/crates/agent_ui/Cargo.toml
+++ b/crates/agent_ui/Cargo.toml
@ -67,7 +67,6 @@ ordered-float.workspace = true
 parking_lot.workspace = true
 paths.workspace = true
 picker.workspace = true
 postage.workspace = true
 project.workspace = true
 prompt_store.workspace = true
 proto.workspace = true
--- a/crates/agent_ui/src/acp/completion_provider.rs
+++ b/crates/agent_ui/src/acp/completion_provider.rs
@ -247,9 +247,9 @@ impl ContextPickerCompletionProvider {
        let abs_path = project.read(cx).absolute_path(&symbol.path, cx)?;
        let uri = MentionUri::Symbol {
-            abs_path,
+            path: abs_path,
            name: symbol.name.clone(),
-            line_range: symbol.range.start.0.row..=symbol.range.end.0.row,
+            line_range: symbol.range.start.0.row..symbol.range.end.0.row,
        };
        let new_text = format!("{} ", uri.as_link());
        let new_text_len = new_text.len();
--- a/crates/agent_ui/src/acp/entry_view_state.rs
+++ b/crates/agent_ui/src/acp/entry_view_state.rs
@ -6,7 +6,7 @@ use agent2::HistoryStore;
 use collections::HashMap;
 use editor::{Editor, EditorMode, MinimapVisibility};
 use gpui::{
-    AnyEntity, App, AppContext as _, Entity, EntityId, EventEmitter, Focusable, ScrollHandle,
+    AnyEntity, App, AppContext as _, Entity, EntityId, EventEmitter, Focusable,
    TextStyleRefinement, WeakEntity, Window,
 };
 use language::language_settings::SoftWrap;
@ -154,22 +154,10 @@ impl EntryViewState {
                    });
                }
            }
-            AgentThreadEntry::AssistantMessage(message) => {
+            AgentThreadEntry::AssistantMessage(_) => {
-                let entry = if let Some(Entry::AssistantMessage(entry)) =
+                if index == self.entries.len() {
-                    self.entries.get_mut(index)
+                    self.entries.push(Entry::empty())
-                {
+                }
                    entry
                } else {
                    self.set_entry(
                        index,
                        Entry::AssistantMessage(AssistantMessageEntry::default()),
                    );
                    let Some(Entry::AssistantMessage(entry)) = self.entries.get_mut(index) else {
                        unreachable!()
                    };
                    entry
                };
                entry.sync(message);
            }
        };
    }
@ -189,7 +177,7 @@ impl EntryViewState {
    pub fn settings_changed(&mut self, cx: &mut App) {
        for entry in self.entries.iter() {
            match entry {
-                Entry::UserMessage { .. } | Entry::AssistantMessage { .. } => {}
+                Entry::UserMessage { .. } => {}
                Entry::Content(response_views) => {
                    for view in response_views.values() {
                        if let Ok(diff_editor) = view.clone().downcast::<Editor>() {
@ -220,29 +208,9 @@ pub enum ViewEvent {
    MessageEditorEvent(Entity<MessageEditor>, MessageEditorEvent),
 }
 #[derive(Default, Debug)]
 pub struct AssistantMessageEntry {
    scroll_handles_by_chunk_index: HashMap<usize, ScrollHandle>,
 }
 impl AssistantMessageEntry {
    pub fn scroll_handle_for_chunk(&self, ix: usize) -> Option<ScrollHandle> {
        self.scroll_handles_by_chunk_index.get(&ix).cloned()
    }
    pub fn sync(&mut self, message: &acp_thread::AssistantMessage) {
        if let Some(acp_thread::AssistantMessageChunk::Thought { .. }) = message.chunks.last() {
            let ix = message.chunks.len() - 1;
            let handle = self.scroll_handles_by_chunk_index.entry(ix).or_default();
            handle.scroll_to_bottom();
        }
    }
 }
 #[derive(Debug)]
 pub enum Entry {
    UserMessage(Entity<MessageEditor>),
    AssistantMessage(AssistantMessageEntry),
    Content(HashMap<EntityId, AnyEntity>),
 }
@ -250,7 +218,7 @@ impl Entry {
    pub fn message_editor(&self) -> Option<&Entity<MessageEditor>> {
        match self {
            Self::UserMessage(editor) => Some(editor),
-            Self::AssistantMessage(_) | Self::Content(_) => None,
+            Entry::Content(_) => None,
        }
    }
@ -271,16 +239,6 @@ impl Entry {
            .map(|entity| entity.downcast::<TerminalView>().unwrap())
    }
    pub fn scroll_handle_for_assistant_message_chunk(
        &self,
        chunk_ix: usize,
    ) -> Option<ScrollHandle> {
        match self {
            Self::AssistantMessage(message) => message.scroll_handle_for_chunk(chunk_ix),
            Self::UserMessage(_) | Self::Content(_) => None,
        }
    }
    fn content_map(&self) -> Option<&HashMap<EntityId, AnyEntity>> {
        match self {
            Self::Content(map) => Some(map),
@ -296,7 +254,7 @@ impl Entry {
    pub fn has_content(&self) -> bool {
        match self {
            Self::Content(map) => !map.is_empty(),
-            Self::UserMessage(_) | Self::AssistantMessage(_) => false,
+            Self::UserMessage(_) => false,
        }
    }
 }
--- a/crates/agent_ui/src/acp/message_editor.rs
+++ b/crates/agent_ui/src/acp/message_editor.rs
--- a/crates/agent_ui/src/acp/thread_history.rs
+++ b/crates/agent_ui/src/acp/thread_history.rs
@ -462,7 +462,7 @@ impl AcpThreadHistory {
                        cx.notify();
                    }))
-                    .end_slot::<IconButton>(if hovered {
+                    .end_slot::<IconButton>(if hovered || selected {
                        Some(
                            IconButton::new("delete", IconName::Trash)
                                .shape(IconButtonShape::Square)
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
--- a/crates/agent_ui/src/active_thread.rs
+++ b/crates/agent_ui/src/active_thread.rs
@ -1595,6 +1595,11 @@ impl ActiveThread {
            return;
        };
        if model.provider.must_accept_terms(cx) {
            cx.notify();
            return;
        }
        let edited_text = state.editor.read(cx).text(cx);
        let creases = state.editor.update(cx, extract_message_creases);
--- a/crates/agent_ui/src/agent_configuration.rs
+++ b/crates/agent_ui/src/agent_configuration.rs
@ -3,23 +3,19 @@ mod configure_context_server_modal;
 mod manage_profiles_modal;
 mod tool_picker;
-use std::{ops::Range, sync::Arc, time::Duration};
+use std::{sync::Arc, time::Duration};
 use agent_servers::{AgentServerCommand, AgentServerSettings, AllAgentServersSettings, Gemini};
 use agent_settings::AgentSettings;
 use anyhow::Result;
 use assistant_tool::{ToolSource, ToolWorkingSet};
 use cloud_llm_client::Plan;
 use collections::HashMap;
 use context_server::ContextServerId;
 use editor::{Editor, SelectionEffects, scroll::Autoscroll};
 use extension::ExtensionManifest;
 use extension_host::ExtensionStore;
 use fs::Fs;
 use gpui::{
-    Action, Animation, AnimationExt as _, AnyView, App, AsyncWindowContext, Corner, Entity,
+    Action, Animation, AnimationExt as _, AnyView, App, Corner, Entity, EventEmitter, FocusHandle,
-    EventEmitter, FocusHandle, Focusable, Hsla, ScrollHandle, Subscription, Task, Transformation,
+    Focusable, ScrollHandle, Subscription, Task, Transformation, WeakEntity, percentage,
    WeakEntity, percentage,
 };
 use language::LanguageRegistry;
 use language_model::{
@ -27,24 +23,23 @@ use language_model::{
 };
 use notifications::status_toast::{StatusToast, ToastIcon};
 use project::{
    Project,
    context_server_store::{ContextServerConfiguration, ContextServerStatus, ContextServerStore},
    project_settings::{ContextServerSettings, ProjectSettings},
 };
-use settings::{Settings, SettingsStore, update_settings_file};
+use settings::{Settings, update_settings_file};
 use ui::{
    Chip, ContextMenu, Disclosure, Divider, DividerColor, ElevationIndex, Indicator, PopoverMenu,
    Scrollbar, ScrollbarState, Switch, SwitchColor, SwitchField, Tooltip, prelude::*,
 };
 use util::ResultExt as _;
-use workspace::{Workspace, create_and_open_local_file};
+use workspace::Workspace;
 use zed_actions::ExtensionCategoryFilter;
 pub(crate) use configure_context_server_modal::ConfigureContextServerModal;
 pub(crate) use manage_profiles_modal::ManageProfilesModal;
 use crate::{
-    AddContextServer, ExternalAgent, NewExternalAgentThread,
+    AddContextServer,
    agent_configuration::add_llm_provider_modal::{AddLlmProviderModal, LlmCompatibleProvider},
 };
@ -52,7 +47,6 @@ pub struct AgentConfiguration {
    fs: Arc<dyn Fs>,
    language_registry: Arc<LanguageRegistry>,
    workspace: WeakEntity<Workspace>,
    project: WeakEntity<Project>,
    focus_handle: FocusHandle,
    configuration_views_by_provider: HashMap<LanguageModelProviderId, AnyView>,
    context_server_store: Entity<ContextServerStore>,
@ -62,8 +56,6 @@ pub struct AgentConfiguration {
    _registry_subscription: Subscription,
    scroll_handle: ScrollHandle,
    scrollbar_state: ScrollbarState,
    gemini_is_installed: bool,
    _check_for_gemini: Task<()>,
 }
 impl AgentConfiguration {
@ -73,7 +65,6 @@ impl AgentConfiguration {
        tools: Entity<ToolWorkingSet>,
        language_registry: Arc<LanguageRegistry>,
        workspace: WeakEntity<Workspace>,
        project: WeakEntity<Project>,
        window: &mut Window,
        cx: &mut Context<Self>,
    ) -> Self {
@ -98,34 +89,33 @@ impl AgentConfiguration {
        cx.subscribe(&context_server_store, |_, _, _, cx| cx.notify())
            .detach();
        cx.observe_global_in::<SettingsStore>(window, |this, _, cx| {
            this.check_for_gemini(cx);
            cx.notify();
        })
        .detach();
        let scroll_handle = ScrollHandle::new();
        let scrollbar_state = ScrollbarState::new(scroll_handle.clone());
        let mut expanded_provider_configurations = HashMap::default();
        if LanguageModelRegistry::read_global(cx)
            .provider(&ZED_CLOUD_PROVIDER_ID)
            .is_some_and(|cloud_provider| cloud_provider.must_accept_terms(cx))
        {
            expanded_provider_configurations.insert(ZED_CLOUD_PROVIDER_ID, true);
        }
        let mut this = Self {
            fs,
            language_registry,
            workspace,
            project,
            focus_handle,
            configuration_views_by_provider: HashMap::default(),
            context_server_store,
            expanded_context_server_tools: HashMap::default(),
-            expanded_provider_configurations: HashMap::default(),
+            expanded_provider_configurations,
            tools,
            _registry_subscription: registry_subscription,
            scroll_handle,
            scrollbar_state,
            gemini_is_installed: false,
            _check_for_gemini: Task::ready(()),
        };
        this.build_provider_configuration_views(window, cx);
        this.check_for_gemini(cx);
        this
    }
@ -155,34 +145,6 @@ impl AgentConfiguration {
        self.configuration_views_by_provider
            .insert(provider.id(), configuration_view);
    }
    fn check_for_gemini(&mut self, cx: &mut Context<Self>) {
        let project = self.project.clone();
        let settings = AllAgentServersSettings::get_global(cx).clone();
        self._check_for_gemini = cx.spawn({
            async move |this, cx| {
                let Some(project) = project.upgrade() else {
                    return;
                };
                let gemini_is_installed = AgentServerCommand::resolve(
                    Gemini::binary_name(),
                    &[],
                    // TODO expose fallback path from the Gemini/CC types so we don't have to hardcode it again here
                    None,
                    settings.gemini,
                    &project,
                    cx,
                )
                .await
                .is_some();
                this.update(cx, |this, cx| {
                    this.gemini_is_installed = gemini_is_installed;
                    cx.notify();
                })
                .ok();
            }
        });
    }
 }
 impl Focusable for AgentConfiguration {
@ -257,6 +219,7 @@ impl AgentConfiguration {
                    .child(
                        h_flex()
                            .id(provider_id_string.clone())
                            .cursor_pointer()
                            .px_2()
                            .py_0p5()
                            .w_full()
@ -276,7 +239,10 @@ impl AgentConfiguration {
                                        h_flex()
                                            .w_full()
                                            .gap_1()
-                                            .child(Label::new(provider_name.clone()))
+                                            .child(
                                                Label::new(provider_name.clone())
                                                    .size(LabelSize::Large),
                                            )
                                            .map(|this| {
                                                if is_zed_provider && is_signed_in {
                                                    this.child(
@ -321,7 +287,7 @@ impl AgentConfiguration {
                                "Start New Thread",
                            )
                            .icon_position(IconPosition::Start)
-                            .icon(IconName::Thread)
+                            .icon(IconName::Plus)
                            .icon_size(IconSize::Small)
                            .icon_color(Color::Muted)
                            .label_size(LabelSize::Small)
@ -420,7 +386,7 @@ impl AgentConfiguration {
                                    ),
                            )
                            .child(
-                                Label::new("Add at least one provider to use AI-powered features with Zed's native agent.")
+                                Label::new("Add at least one provider to use AI-powered features.")
                                    .color(Color::Muted),
                            ),
                    ),
@ -561,14 +527,6 @@ impl AgentConfiguration {
        }
    }
    fn card_item_bg_color(&self, cx: &mut Context<Self>) -> Hsla {
        cx.theme().colors().background.opacity(0.25)
    }
    fn card_item_border_color(&self, cx: &mut Context<Self>) -> Hsla {
        cx.theme().colors().border.opacity(0.6)
    }
    fn render_context_servers_section(
        &mut self,
        window: &mut Window,
@ -586,12 +544,7 @@ impl AgentConfiguration {
                v_flex()
                    .gap_0p5()
                    .child(Headline::new("Model Context Protocol (MCP) Servers"))
-                    .child(
+                    .child(Label::new("Connect to context servers through the Model Context Protocol, either using Zed extensions or directly.").color(Color::Muted)),
                        Label::new(
                            "All context servers connected through the Model Context Protocol.",
                        )
                        .color(Color::Muted),
                    ),
            )
            .children(
                context_server_ids.into_iter().map(|context_server_id| {
@ -601,7 +554,7 @@ impl AgentConfiguration {
            .child(
                h_flex()
                    .justify_between()
-                    .gap_1p5()
+                    .gap_2()
                    .child(
                        h_flex().w_full().child(
                            Button::new("add-context-server", "Add Custom Server")
@ -692,6 +645,8 @@ impl AgentConfiguration {
            .map_or([].as_slice(), |tools| tools.as_slice());
        let tool_count = tools.len();
        let border_color = cx.theme().colors().border.opacity(0.6);
        let (source_icon, source_tooltip) = if is_from_extension {
            (
                IconName::ZedMcpExtension,
@ -834,8 +789,8 @@ impl AgentConfiguration {
            .id(item_id.clone())
            .border_1()
            .rounded_md()
-            .border_color(self.card_item_border_color(cx))
+            .border_color(border_color)
-            .bg(self.card_item_bg_color(cx))
+            .bg(cx.theme().colors().background.opacity(0.2))
            .overflow_hidden()
            .child(
                h_flex()
@ -843,11 +798,7 @@ impl AgentConfiguration {
                    .justify_between()
                    .when(
                        error.is_some() || are_tools_expanded && tool_count >= 1,
-                        |element| {
+                        |element| element.border_b_1().border_color(border_color),
                            element
                                .border_b_1()
                                .border_color(self.card_item_border_color(cx))
                        },
                    )
                    .child(
                        h_flex()
@ -1029,195 +980,6 @@ impl AgentConfiguration {
                ))
            })
    }
    fn render_agent_servers_section(&mut self, cx: &mut Context<Self>) -> impl IntoElement {
        let settings = AllAgentServersSettings::get_global(cx).clone();
        let user_defined_agents = settings
            .custom
            .iter()
            .map(|(name, settings)| {
                self.render_agent_server(
                    IconName::Ai,
                    name.clone(),
                    ExternalAgent::Custom {
                        name: name.clone(),
                        settings: settings.clone(),
                    },
                    None,
                    cx,
                )
                .into_any_element()
            })
            .collect::<Vec<_>>();
        v_flex()
            .border_b_1()
            .border_color(cx.theme().colors().border)
            .child(
                v_flex()
                    .p(DynamicSpacing::Base16.rems(cx))
                    .pr(DynamicSpacing::Base20.rems(cx))
                    .gap_2()
                    .child(
                        v_flex()
                            .gap_0p5()
                            .child(
                                h_flex()
                                    .w_full()
                                    .gap_2()
                                    .justify_between()
                                    .child(Headline::new("External Agents"))
                                    .child(
                                        Button::new("add-agent", "Add Agent")
                                            .icon_position(IconPosition::Start)
                                            .icon(IconName::Plus)
                                            .icon_size(IconSize::Small)
                                            .icon_color(Color::Muted)
                                            .label_size(LabelSize::Small)
                                            .on_click(
                                                move |_, window, cx| {
                                                    if let Some(workspace) = window.root().flatten() {
                                                        let workspace = workspace.downgrade();
                                                        window
                                                            .spawn(cx, async |cx| {
                                                                open_new_agent_servers_entry_in_settings_editor(
                                                                    workspace,
                                                                    cx,
                                                                ).await
                                                            })
                                                            .detach_and_log_err(cx);
                                                    }
                                                }
                                            ),
                                    )
                            )
                            .child(
                                Label::new(
                                    "Bring the agent of your choice to Zed via our new Agent Client Protocol.",
                                )
                                .color(Color::Muted),
                            ),
                    )
                    .child(self.render_agent_server(
                        IconName::AiGemini,
                        "Gemini CLI",
                        ExternalAgent::Gemini,
                        (!self.gemini_is_installed).then_some(Gemini::install_command().into()),
                        cx,
                    ))
                    // TODO add CC
                    .children(user_defined_agents),
            )
    }
    fn render_agent_server(
        &self,
        icon: IconName,
        name: impl Into<SharedString>,
        agent: ExternalAgent,
        install_command: Option<SharedString>,
        cx: &mut Context<Self>,
    ) -> impl IntoElement {
        let name = name.into();
        h_flex()
            .p_1()
            .pl_2()
            .gap_1p5()
            .justify_between()
            .border_1()
            .rounded_md()
            .border_color(self.card_item_border_color(cx))
            .bg(self.card_item_bg_color(cx))
            .overflow_hidden()
            .child(
                h_flex()
                    .gap_1p5()
                    .child(Icon::new(icon).size(IconSize::Small).color(Color::Muted))
                    .child(Label::new(name.clone())),
            )
            .map(|this| {
                if let Some(install_command) = install_command {
                    this.child(
                        Button::new(
                            SharedString::from(format!("install_external_agent-{name}")),
                            "Install Agent",
                        )
                        .label_size(LabelSize::Small)
                        .icon(IconName::Plus)
                        .icon_position(IconPosition::Start)
                        .icon_size(IconSize::XSmall)
                        .icon_color(Color::Muted)
                        .tooltip(Tooltip::text(install_command.clone()))
                        .on_click(cx.listener(
                            move |this, _, window, cx| {
                                let Some(project) = this.project.upgrade() else {
                                    return;
                                };
                                let Some(workspace) = this.workspace.upgrade() else {
                                    return;
                                };
                                let cwd = project.read(cx).first_project_directory(cx);
                                let shell =
                                    project.read(cx).terminal_settings(&cwd, cx).shell.clone();
                                let spawn_in_terminal = task::SpawnInTerminal {
                                    id: task::TaskId(install_command.to_string()),
                                    full_label: install_command.to_string(),
                                    label: install_command.to_string(),
                                    command: Some(install_command.to_string()),
                                    args: Vec::new(),
                                    command_label: install_command.to_string(),
                                    cwd,
                                    env: Default::default(),
                                    use_new_terminal: true,
                                    allow_concurrent_runs: true,
                                    reveal: Default::default(),
                                    reveal_target: Default::default(),
                                    hide: Default::default(),
                                    shell,
                                    show_summary: true,
                                    show_command: true,
                                    show_rerun: false,
                                };
                                let task = workspace.update(cx, |workspace, cx| {
                                    workspace.spawn_in_terminal(spawn_in_terminal, window, cx)
                                });
                                cx.spawn(async move |this, cx| {
                                    task.await;
                                    this.update(cx, |this, cx| {
                                        this.check_for_gemini(cx);
                                    })
                                    .ok();
                                })
                                .detach();
                            },
                        )),
                    )
                } else {
                    this.child(
                        h_flex().gap_1().child(
                            Button::new(
                                SharedString::from(format!("start_acp_thread-{name}")),
                                "Start New Thread",
                            )
                            .label_size(LabelSize::Small)
                            .icon(IconName::Thread)
                            .icon_position(IconPosition::Start)
                            .icon_size(IconSize::XSmall)
                            .icon_color(Color::Muted)
                            .on_click(move |_, window, cx| {
                                window.dispatch_action(
                                    NewExternalAgentThread {
                                        agent: Some(agent.clone()),
                                    }
                                    .boxed_clone(),
                                    cx,
                                );
                            }),
                        ),
                    )
                }
            })
    }
 }
 impl Render for AgentConfiguration {
@ -1237,7 +999,6 @@ impl Render for AgentConfiguration {
                    .size_full()
                    .overflow_y_scroll()
                    .child(self.render_general_settings_section(cx))
                    .child(self.render_agent_servers_section(cx))
                    .child(self.render_context_servers_section(window, cx))
                    .child(self.render_provider_configuration_section(cx)),
            )
@ -1356,109 +1117,3 @@ fn show_unable_to_uninstall_extension_with_context_server(
    workspace.toggle_status_toast(status_toast, cx);
 }
 async fn open_new_agent_servers_entry_in_settings_editor(
    workspace: WeakEntity<Workspace>,
    cx: &mut AsyncWindowContext,
 ) -> Result<()> {
    let settings_editor = workspace
        .update_in(cx, |_, window, cx| {
            create_and_open_local_file(paths::settings_file(), window, cx, || {
                settings::initial_user_settings_content().as_ref().into()
            })
        })?
        .await?
        .downcast::<Editor>()
        .unwrap();
    settings_editor
        .downgrade()
        .update_in(cx, |item, window, cx| {
            let text = item.buffer().read(cx).snapshot(cx).text();
            let settings = cx.global::<SettingsStore>();
            let mut unique_server_name = None;
            let edits = settings.edits_for_update::<AllAgentServersSettings>(&text, |file| {
                let server_name: Option<SharedString> = (0..u8::MAX)
                    .map(|i| {
                        if i == 0 {
                            "your_agent".into()
                        } else {
                            format!("your_agent_{}", i).into()
                        }
                    })
                    .find(|name| !file.custom.contains_key(name));
                if let Some(server_name) = server_name {
                    unique_server_name = Some(server_name.clone());
                    file.custom.insert(
                        server_name,
                        AgentServerSettings {
                            command: AgentServerCommand {
                                path: "path_to_executable".into(),
                                args: vec![],
                                env: Some(HashMap::default()),
                            },
                        },
                    );
                }
            });
            if edits.is_empty() {
                return;
            }
            let ranges = edits
                .iter()
                .map(|(range, _)| range.clone())
                .collect::<Vec<_>>();
            item.edit(edits, cx);
            if let Some((unique_server_name, buffer)) =
                unique_server_name.zip(item.buffer().read(cx).as_singleton())
            {
                let snapshot = buffer.read(cx).snapshot();
                if let Some(range) =
                    find_text_in_buffer(&unique_server_name, ranges[0].start, &snapshot)
                {
                    item.change_selections(
                        SelectionEffects::scroll(Autoscroll::newest()),
                        window,
                        cx,
                        |selections| {
                            selections.select_ranges(vec![range]);
                        },
                    );
                }
            }
        })
 }
 fn find_text_in_buffer(
    text: &str,
    start: usize,
    snapshot: &language::BufferSnapshot,
 ) -> Option<Range<usize>> {
    let chars = text.chars().collect::<Vec<char>>();
    let mut offset = start;
    let mut char_offset = 0;
    for c in snapshot.chars_at(start) {
        if char_offset >= chars.len() {
            break;
        }
        offset += 1;
        if c == chars[char_offset] {
            char_offset += 1;
        } else {
            char_offset = 0;
        }
    }
    if char_offset == chars.len() {
        Some(offset.saturating_sub(chars.len())..offset)
    } else {
        None
    }
 }
--- a/crates/agent_ui/src/agent_diff.rs
+++ b/crates/agent_ui/src/agent_diff.rs
@ -1529,7 +1529,6 @@ impl AgentDiff {
            | AcpThreadEvent::TokenUsageUpdated
            | AcpThreadEvent::EntriesRemoved(_)
            | AcpThreadEvent::ToolAuthorizationRequired
            | AcpThreadEvent::PromptCapabilitiesUpdated
            | AcpThreadEvent::Retry(_) => {}
        }
    }
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@ -5,16 +5,12 @@ use std::sync::Arc;
 use std::time::Duration;
 use acp_thread::AcpThread;
 use agent_servers::AgentServerSettings;
 use agent2::{DbThreadMetadata, HistoryEntry};
 use db::kvp::{Dismissable, KEY_VALUE_STORE};
 use serde::{Deserialize, Serialize};
 use zed_actions::OpenBrowser;
 use zed_actions::agent::ReauthenticateAgent;
 use crate::acp::{AcpThreadHistory, ThreadHistoryEvent};
 use crate::agent_diff::AgentDiffThread;
 use crate::ui::AcpOnboardingModal;
 use crate::{
    AddContextServer, AgentDiffPane, ContinueThread, ContinueWithBurnMode,
    DeleteRecentlyOpenThread, ExpandMessageEditor, Follow, InlineAssistant, NewTextThread,
@ -58,7 +54,9 @@ use gpui::{
    Pixels, Subscription, Task, UpdateGlobal, WeakEntity, prelude::*, pulsating_between,
 };
 use language::LanguageRegistry;
-use language_model::{ConfigurationError, ConfiguredModel, LanguageModelRegistry};
+use language_model::{
    ConfigurationError, ConfiguredModel, LanguageModelProviderTosView, LanguageModelRegistry,
 };
 use project::{DisableAiSettings, Project, ProjectPath, Worktree};
 use prompt_store::{PromptBuilder, PromptStore, UserPromptId};
 use rules_library::{RulesLibrary, open_rules_library};
@ -78,10 +76,7 @@ use workspace::{
 };
 use zed_actions::{
    DecreaseBufferFontSize, IncreaseBufferFontSize, ResetBufferFontSize,
-    agent::{
+    agent::{OpenOnboardingModal, OpenSettings, ResetOnboarding, ToggleModelSelector},
        OpenAcpOnboardingModal, OpenOnboardingModal, OpenSettings, ResetOnboarding,
        ToggleModelSelector,
    },
    assistant::{OpenRulesLibrary, ToggleFocus},
 };
@ -135,7 +130,7 @@ pub fn init(cx: &mut App) {
                    if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
                        workspace.focus_panel::<AgentPanel>(window, cx);
                        panel.update(cx, |panel, cx| {
-                            panel.external_thread(action.agent.clone(), None, None, window, cx)
+                            panel.external_thread(action.agent, None, None, window, cx)
                        });
                    }
                })
@ -205,9 +200,6 @@ pub fn init(cx: &mut App) {
                .register_action(|workspace, _: &OpenOnboardingModal, window, cx| {
                    AgentOnboardingModal::toggle(workspace, window, cx)
                })
                .register_action(|workspace, _: &OpenAcpOnboardingModal, window, cx| {
                    AcpOnboardingModal::toggle(workspace, window, cx)
                })
                .register_action(|_workspace, _: &ResetOnboarding, window, cx| {
                    window.dispatch_action(workspace::RestoreBanner.boxed_clone(), cx);
                    window.refresh();
@ -249,8 +241,7 @@ enum WhichFontSize {
    None,
 }
-// TODO unify this with ExternalAgent
+#[derive(Debug, Default, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
 #[derive(Debug, Default, Clone, PartialEq, Serialize, Deserialize)]
 pub enum AgentType {
    #[default]
    Zed,
@ -258,29 +249,23 @@ pub enum AgentType {
    Gemini,
    ClaudeCode,
    NativeAgent,
    Custom {
        name: SharedString,
        settings: AgentServerSettings,
    },
 }
 impl AgentType {
-    fn label(&self) -> SharedString {
+    fn label(self) -> impl Into<SharedString> {
        match self {
-            Self::Zed | Self::TextThread => "Zed Agent".into(),
+            Self::Zed | Self::TextThread => "Zed Agent",
-            Self::NativeAgent => "Agent 2".into(),
+            Self::NativeAgent => "Agent 2",
-            Self::Gemini => "Gemini CLI".into(),
+            Self::Gemini => "Gemini CLI",
-            Self::ClaudeCode => "Claude Code".into(),
+            Self::ClaudeCode => "Claude Code",
            Self::Custom { name, .. } => name.into(),
        }
    }
-    fn icon(&self) -> Option<IconName> {
+    fn icon(self) -> Option<IconName> {
        match self {
            Self::Zed | Self::NativeAgent | Self::TextThread => None,
            Self::Gemini => Some(IconName::AiGemini),
            Self::ClaudeCode => Some(IconName::AiClaude),
            Self::Custom { .. } => Some(IconName::Terminal),
        }
    }
 }
@ -534,7 +519,7 @@ pub struct AgentPanel {
 impl AgentPanel {
    fn serialize(&mut self, cx: &mut Context<Self>) {
        let width = self.width;
-        let selected_agent = self.selected_agent.clone();
+        let selected_agent = self.selected_agent;
        self.pending_serialization = Some(cx.background_spawn(async move {
            KEY_VALUE_STORE
                .write_kvp(
@ -598,6 +583,17 @@ impl AgentPanel {
                None
            };
            // Wait for the Gemini/Native feature flag to be available.
            let client = workspace.read_with(cx, |workspace, _| workspace.client().clone())?;
            if !client.status().borrow().is_signed_out() {
                cx.update(|_, cx| {
                    cx.wait_for_flag_or_timeout::<feature_flags::GeminiAndNativeFeatureFlag>(
                        Duration::from_secs(2),
                    )
                })?
                .await;
            }
            let panel = workspace.update_in(cx, |workspace, window, cx| {
                let panel = cx.new(|cx| {
                    Self::new(
@ -613,7 +609,7 @@ impl AgentPanel {
                    panel.update(cx, |panel, cx| {
                        panel.width = serialized_panel.width.map(|w| w.round());
                        if let Some(selected_agent) = serialized_panel.selected_agent {
-                            panel.selected_agent = selected_agent.clone();
+                            panel.selected_agent = selected_agent;
                            panel.new_agent_thread(selected_agent, window, cx);
                        }
                        cx.notify();
@ -1023,8 +1019,6 @@ impl AgentPanel {
    }
    fn new_prompt_editor(&mut self, window: &mut Window, cx: &mut Context<Self>) {
        telemetry::event!("Agent Thread Started", agent = "zed-text");
        let context = self
            .context_store
            .update(cx, |context_store, cx| context_store.create(cx));
@ -1085,17 +1079,14 @@ impl AgentPanel {
        cx.spawn_in(window, async move |this, cx| {
            let ext_agent = match agent_choice {
                Some(agent) => {
-                    cx.background_spawn({
+                    cx.background_spawn(async move {
-                        let agent = agent.clone();
+                        if let Some(serialized) =
-                        async move {
+                            serde_json::to_string(&LastUsedExternalAgent { agent }).log_err()
-                            if let Some(serialized) =
+                        {
-                                serde_json::to_string(&LastUsedExternalAgent { agent }).log_err()
+                            KEY_VALUE_STORE
-                            {
+                                .write_kvp(LAST_USED_EXTERNAL_AGENT_KEY.to_string(), serialized)
-                                KEY_VALUE_STORE
+                                .await
-                                    .write_kvp(LAST_USED_EXTERNAL_AGENT_KEY.to_string(), serialized)
+                                .log_err();
                                    .await
                                    .log_err();
                            }
                        }
                    })
                    .detach();
@ -1117,15 +1108,11 @@ impl AgentPanel {
                }
            };
            telemetry::event!("Agent Thread Started", agent = ext_agent.name());
            let server = ext_agent.server(fs, history);
            this.update_in(cx, |this, window, cx| {
                match ext_agent {
-                    crate::ExternalAgent::Gemini
+                    crate::ExternalAgent::Gemini | crate::ExternalAgent::NativeAgent => {
                    | crate::ExternalAgent::NativeAgent
                    | crate::ExternalAgent::Custom { .. } => {
                        if !cx.has_flag::<GeminiAndNativeFeatureFlag>() {
                            return;
                        }
@ -1476,7 +1463,6 @@ impl AgentPanel {
                tools,
                self.language_registry.clone(),
                self.workspace.clone(),
                self.project.downgrade(),
                window,
                cx,
            )
@ -1848,8 +1834,21 @@ impl AgentPanel {
        menu
    }
    pub fn set_selected_agent(
        &mut self,
        agent: AgentType,
        window: &mut Window,
        cx: &mut Context<Self>,
    ) {
        if self.selected_agent != agent {
            self.selected_agent = agent;
            self.serialize(cx);
        }
        self.new_agent_thread(agent, window, cx);
    }
    pub fn selected_agent(&self) -> AgentType {
-        self.selected_agent.clone()
+        self.selected_agent
    }
    pub fn new_agent_thread(
@ -1858,11 +1857,6 @@ impl AgentPanel {
        window: &mut Window,
        cx: &mut Context<Self>,
    ) {
        if self.selected_agent != agent {
            self.selected_agent = agent.clone();
            self.serialize(cx);
        }
        match agent {
            AgentType::Zed => {
                window.dispatch_action(
@ -1893,13 +1887,6 @@ impl AgentPanel {
                window,
                cx,
            ),
            AgentType::Custom { name, settings } => self.external_thread(
                Some(crate::ExternalAgent::Custom { name, settings }),
                None,
                None,
                window,
                cx,
            ),
        }
    }
@ -2112,7 +2099,7 @@ impl AgentPanel {
                        .child(title_editor)
                        .into_any_element()
                } else {
-                    Label::new(thread_view.read(cx).title())
+                    Label::new(thread_view.read(cx).title(cx))
                        .color(Color::Muted)
                        .truncate()
                        .into_any_element()
@ -2200,8 +2187,6 @@ impl AgentPanel {
            "Enable Full Screen"
        };
        let selected_agent = self.selected_agent.clone();
        PopoverMenu::new("agent-options-menu")
            .trigger_with_tooltip(
                IconButton::new("agent-options-menu", IconName::Ellipsis)
@ -2281,11 +2266,6 @@ impl AgentPanel {
                            .action("Settings", Box::new(OpenSettings))
                            .separator()
                            .action(full_screen_label, Box::new(ToggleZoom));
                        if selected_agent == AgentType::Gemini {
                            menu = menu.action("Reauthenticate", Box::new(ReauthenticateAgent))
                        }
                        menu
                    }))
                }
@ -2320,8 +2300,6 @@ impl AgentPanel {
            .menu({
                let menu = self.assistant_navigation_menu.clone();
                move |window, cx| {
                    telemetry::event!("View Thread History Clicked");
                    if let Some(menu) = menu.as_ref() {
                        menu.update(cx, |_, cx| {
                            cx.defer_in(window, |menu, window, cx| {
@ -2500,8 +2478,6 @@ impl AgentPanel {
                let workspace = self.workspace.clone();
                move |window, cx| {
                    telemetry::event!("New Thread Clicked");
                    let active_thread = active_thread.clone();
                    Some(ContextMenu::build(window, cx, |mut menu, _window, cx| {
                        menu = menu
@ -2543,7 +2519,7 @@ impl AgentPanel {
                                                        workspace.panel::<AgentPanel>(cx)
                                                    {
                                                        panel.update(cx, |panel, cx| {
-                                                            panel.new_agent_thread(
+                                                            panel.set_selected_agent(
                                                                AgentType::NativeAgent,
                                                                window,
                                                                cx,
@ -2569,7 +2545,7 @@ impl AgentPanel {
                                                        workspace.panel::<AgentPanel>(cx)
                                                    {
                                                        panel.update(cx, |panel, cx| {
-                                                            panel.new_agent_thread(
+                                                            panel.set_selected_agent(
                                                                AgentType::TextThread,
                                                                window,
                                                                cx,
@ -2597,7 +2573,7 @@ impl AgentPanel {
                                                            workspace.panel::<AgentPanel>(cx)
                                                        {
                                                            panel.update(cx, |panel, cx| {
-                                                                panel.new_agent_thread(
+                                                                panel.set_selected_agent(
                                                                    AgentType::Gemini,
                                                                    window,
                                                                    cx,
@ -2624,7 +2600,7 @@ impl AgentPanel {
                                                            workspace.panel::<AgentPanel>(cx)
                                                        {
                                                            panel.update(cx, |panel, cx| {
-                                                                panel.new_agent_thread(
+                                                                panel.set_selected_agent(
                                                                    AgentType::ClaudeCode,
                                                                    window,
                                                                    cx,
@ -2636,64 +2612,13 @@ impl AgentPanel {
                                            }
                                        }),
                                )
                            })
                            .when(cx.has_flag::<GeminiAndNativeFeatureFlag>(), |mut menu| {
                                // Add custom agents from settings
                                let settings =
                                    agent_servers::AllAgentServersSettings::get_global(cx);
                                for (agent_name, agent_settings) in &settings.custom {
                                    menu = menu.item(
                                        ContextMenuEntry::new(format!("New {} Thread", agent_name))
                                            .icon(IconName::Terminal)
                                            .icon_color(Color::Muted)
                                            .handler({
                                                let workspace = workspace.clone();
                                                let agent_name = agent_name.clone();
                                                let agent_settings = agent_settings.clone();
                                                move |window, cx| {
                                                    if let Some(workspace) = workspace.upgrade() {
                                                        workspace.update(cx, |workspace, cx| {
                                                            if let Some(panel) =
                                                                workspace.panel::<AgentPanel>(cx)
                                                            {
                                                                panel.update(cx, |panel, cx| {
                                                                    panel.new_agent_thread(
                                                                        AgentType::Custom {
                                                                            name: agent_name
                                                                                .clone(),
                                                                            settings:
                                                                                agent_settings
                                                                                    .clone(),
                                                                        },
                                                                        window,
                                                                        cx,
                                                                    );
                                                                });
                                                            }
                                                        });
                                                    }
                                                }
                                            }),
                                    );
                                }
                                menu
                            })
                            .when(cx.has_flag::<GeminiAndNativeFeatureFlag>(), |menu| {
                                menu.separator().link(
                                    "Add Other Agents",
                                    OpenBrowser {
                                        url: zed_urls::external_agents_docs(cx),
                                    }
                                    .boxed_clone(),
                                )
                            });
                        menu
                    }))
                }
            });
-        let selected_agent_label = self.selected_agent.label();
+        let selected_agent_label = self.selected_agent.label().into();
        let selected_agent = div()
            .id("selected_agent_icon")
            .when_some(self.selected_agent.icon(), |this, icon| {
@ -3278,6 +3203,17 @@ impl AgentPanel {
            ConfigurationError::ModelNotFound
            | ConfigurationError::ProviderNotAuthenticated(_)
            | ConfigurationError::NoProvider => callout.into_any_element(),
            ConfigurationError::ProviderPendingTermsAcceptance(provider) => {
                Banner::new()
                    .severity(Severity::Warning)
                    .child(h_flex().w_full().children(
                        provider.render_accept_terms(
                            LanguageModelProviderTosView::ThreadEmptyState,
                            cx,
                        ),
                    ))
                    .into_any_element()
            }
        }
    }
@ -3767,11 +3703,6 @@ impl Render for AgentPanel {
                }
            }))
            .on_action(cx.listener(Self::toggle_burn_mode))
            .on_action(cx.listener(|this, _: &ReauthenticateAgent, window, cx| {
                if let Some(thread_view) = this.active_thread_view() {
                    thread_view.update(cx, |thread_view, cx| thread_view.reauthenticate(window, cx))
                }
            }))
            .child(self.render_toolbar(window, cx))
            .children(self.render_onboarding(window, cx))
            .map(|parent| match &self.active_view {
--- a/crates/agent_ui/src/agent_ui.rs
+++ b/crates/agent_ui/src/agent_ui.rs
@ -28,14 +28,13 @@ use std::rc::Rc;
 use std::sync::Arc;
 use agent::{Thread, ThreadId};
 use agent_servers::AgentServerSettings;
 use agent_settings::{AgentProfileId, AgentSettings, LanguageModelSelection};
 use assistant_slash_command::SlashCommandRegistry;
 use client::Client;
 use command_palette_hooks::CommandPaletteFilter;
 use feature_flags::FeatureFlagAppExt as _;
 use fs::Fs;
-use gpui::{Action, App, Entity, SharedString, actions};
+use gpui::{Action, App, Entity, actions};
 use language::LanguageRegistry;
 use language_model::{
    ConfiguredModel, LanguageModel, LanguageModelId, LanguageModelProviderId, LanguageModelRegistry,
@ -160,43 +159,25 @@ pub struct NewNativeAgentThreadFromSummary {
    from_session_id: agent_client_protocol::SessionId,
 }
-// TODO unify this with AgentType
+#[derive(Default, Debug, Clone, Copy, PartialEq, Serialize, Deserialize, JsonSchema)]
 #[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize, JsonSchema)]
 #[serde(rename_all = "snake_case")]
 enum ExternalAgent {
    #[default]
    Gemini,
    ClaudeCode,
    NativeAgent,
    Custom {
        name: SharedString,
        settings: AgentServerSettings,
    },
 }
 impl ExternalAgent {
    fn name(&self) -> &'static str {
        match self {
            Self::NativeAgent => "zed",
            Self::Gemini => "gemini-cli",
            Self::ClaudeCode => "claude-code",
            Self::Custom { .. } => "custom",
        }
    }
    pub fn server(
        &self,
        fs: Arc<dyn fs::Fs>,
        history: Entity<agent2::HistoryStore>,
    ) -> Rc<dyn agent_servers::AgentServer> {
        match self {
-            Self::Gemini => Rc::new(agent_servers::Gemini),
+            ExternalAgent::Gemini => Rc::new(agent_servers::Gemini),
-            Self::ClaudeCode => Rc::new(agent_servers::ClaudeCode),
+            ExternalAgent::ClaudeCode => Rc::new(agent_servers::ClaudeCode),
-            Self::NativeAgent => Rc::new(agent2::NativeAgentServer::new(fs, history)),
+            ExternalAgent::NativeAgent => Rc::new(agent2::NativeAgentServer::new(fs, history)),
            Self::Custom { name, settings } => Rc::new(agent_servers::CustomAgentServer::new(
                name.clone(),
                settings,
            )),
        }
    }
 }
--- a/crates/agent_ui/src/language_model_selector.rs
+++ b/crates/agent_ui/src/language_model_selector.rs
@ -6,8 +6,7 @@ use feature_flags::ZedProFeatureFlag;
 use fuzzy::{StringMatch, StringMatchCandidate, match_strings};
 use gpui::{Action, AnyElement, App, BackgroundExecutor, DismissEvent, Subscription, Task};
 use language_model::{
-    AuthenticateError, ConfiguredModel, LanguageModel, LanguageModelProviderId,
+    ConfiguredModel, LanguageModel, LanguageModelProviderId, LanguageModelRegistry,
    LanguageModelRegistry,
 };
 use ordered_float::OrderedFloat;
 use picker::{Picker, PickerDelegate};
@ -77,7 +76,6 @@ pub struct LanguageModelPickerDelegate {
    all_models: Arc<GroupedModels>,
    filtered_entries: Vec<LanguageModelPickerEntry>,
    selected_index: usize,
    _authenticate_all_providers_task: Task<()>,
    _subscriptions: Vec<Subscription>,
 }
@ -98,7 +96,6 @@ impl LanguageModelPickerDelegate {
            selected_index: Self::get_active_model_index(&entries, get_active_model(cx)),
            filtered_entries: entries,
            get_active_model: Arc::new(get_active_model),
            _authenticate_all_providers_task: Self::authenticate_all_providers(cx),
            _subscriptions: vec![cx.subscribe_in(
                &LanguageModelRegistry::global(cx),
                window,
@ -142,56 +139,6 @@ impl LanguageModelPickerDelegate {
            .unwrap_or(0)
    }
    /// Authenticates all providers in the [`LanguageModelRegistry`].
    ///
    /// We do this so that we can populate the language selector with all of the
    /// models from the configured providers.
    fn authenticate_all_providers(cx: &mut App) -> Task<()> {
        let authenticate_all_providers = LanguageModelRegistry::global(cx)
            .read(cx)
            .providers()
            .iter()
            .map(|provider| (provider.id(), provider.name(), provider.authenticate(cx)))
            .collect::<Vec<_>>();
        cx.spawn(async move |_cx| {
            for (provider_id, provider_name, authenticate_task) in authenticate_all_providers {
                if let Err(err) = authenticate_task.await {
                    if matches!(err, AuthenticateError::CredentialsNotFound) {
                        // Since we're authenticating these providers in the
                        // background for the purposes of populating the
                        // language selector, we don't care about providers
                        // where the credentials are not found.
                    } else {
                        // Some providers have noisy failure states that we
                        // don't want to spam the logs with every time the
                        // language model selector is initialized.
                        //
                        // Ideally these should have more clear failure modes
                        // that we know are safe to ignore here, like what we do
                        // with `CredentialsNotFound` above.
                        match provider_id.0.as_ref() {
                            "lmstudio" | "ollama" => {
                                // LM Studio and Ollama both make fetch requests to the local APIs to determine if they are "authenticated".
                                //
                                // These fail noisily, so we don't log them.
                            }
                            "copilot_chat" => {
                                // Copilot Chat returns an error if Copilot is not enabled, so we don't log those errors.
                            }
                            _ => {
                                log::error!(
                                    "Failed to authenticate provider: {}: {err}",
                                    provider_name.0
                                );
                            }
                        }
                    }
                }
            }
        })
    }
    pub fn active_model(&self, cx: &App) -> Option<ConfiguredModel> {
        (self.get_active_model)(cx)
    }
--- a/crates/agent_ui/src/message_editor.rs
+++ b/crates/agent_ui/src/message_editor.rs
@ -378,13 +378,18 @@ impl MessageEditor {
    }
    fn send_to_model(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let Some(ConfiguredModel { model, .. }) = self
+        let Some(ConfiguredModel { model, provider }) = self
            .thread
            .update(cx, |thread, cx| thread.get_or_init_configured_model(cx))
        else {
            return;
        };
        if provider.must_accept_terms(cx) {
            cx.notify();
            return;
        }
        let (user_message, user_message_creases) = self.editor.update(cx, |editor, cx| {
            let creases = extract_message_creases(editor, cx);
            let text = editor.text(cx);
--- a/crates/agent_ui/src/text_thread_editor.rs
+++ b/crates/agent_ui/src/text_thread_editor.rs
@ -190,6 +190,7 @@ pub struct TextThreadEditor {
    invoked_slash_command_creases: HashMap<InvokedSlashCommandId, CreaseId>,
    _subscriptions: Vec<Subscription>,
    last_error: Option<AssistError>,
    show_accept_terms: bool,
    pub(crate) slash_menu_handle:
        PopoverMenuHandle<Picker<slash_command_picker::SlashCommandDelegate>>,
    // dragged_file_worktrees is used to keep references to worktrees that were added
@ -288,6 +289,7 @@ impl TextThreadEditor {
            invoked_slash_command_creases: HashMap::default(),
            _subscriptions,
            last_error: None,
            show_accept_terms: false,
            slash_menu_handle: Default::default(),
            dragged_file_worktrees: Vec::new(),
            language_model_selector: cx.new(|cx| {
@ -361,12 +363,24 @@ impl TextThreadEditor {
        if self.sending_disabled(cx) {
            return;
        }
        telemetry::event!("Agent Message Sent", agent = "zed-text");
        self.send_to_model(window, cx);
    }
    fn send_to_model(&mut self, window: &mut Window, cx: &mut Context<Self>) {
        let provider = LanguageModelRegistry::read_global(cx)
            .default_model()
            .map(|default| default.provider);
        if provider
            .as_ref()
            .is_some_and(|provider| provider.must_accept_terms(cx))
        {
            self.show_accept_terms = true;
            cx.notify();
            return;
        }
        self.last_error = None;
        if let Some(user_message) = self.context.update(cx, |context, cx| context.assist(cx)) {
            let new_selection = {
                let cursor = user_message
@ -1916,6 +1930,7 @@ impl TextThreadEditor {
            ConfigurationError::NoProvider
            | ConfigurationError::ModelNotFound
            | ConfigurationError::ProviderNotAuthenticated(_) => true,
            ConfigurationError::ProviderPendingTermsAcceptance(_) => self.show_accept_terms,
        }
    }
--- a/crates/agent_ui/src/ui.rs
+++ b/crates/agent_ui/src/ui.rs
@ -1,4 +1,3 @@
 mod acp_onboarding_modal;
 mod agent_notification;
 mod burn_mode_tooltip;
 mod context_pill;
@ -7,7 +6,6 @@ mod onboarding_modal;
 pub mod preview;
 mod unavailable_editing_tooltip;
 pub use acp_onboarding_modal::*;
 pub use agent_notification::*;
 pub use burn_mode_tooltip::*;
 pub use context_pill::*;
--- a/crates/agent_ui/src/ui/acp_onboarding_modal.rs
+++ b/crates/agent_ui/src/ui/acp_onboarding_modal.rs
@ -1,254 +0,0 @@
 use client::zed_urls;
 use gpui::{
    ClickEvent, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, MouseDownEvent, Render,
    linear_color_stop, linear_gradient,
 };
 use ui::{TintColor, Vector, VectorName, prelude::*};
 use workspace::{ModalView, Workspace};
 use crate::agent_panel::{AgentPanel, AgentType};
 macro_rules! acp_onboarding_event {
    ($name:expr) => {
        telemetry::event!($name, source = "ACP Onboarding");
    };
    ($name:expr, $($key:ident $(= $value:expr)?),+ $(,)?) => {
        telemetry::event!($name, source = "ACP Onboarding", $($key $(= $value)?),+);
    };
 }
 pub struct AcpOnboardingModal {
    focus_handle: FocusHandle,
    workspace: Entity<Workspace>,
 }
 impl AcpOnboardingModal {
    pub fn toggle(workspace: &mut Workspace, window: &mut Window, cx: &mut Context<Workspace>) {
        let workspace_entity = cx.entity();
        workspace.toggle_modal(window, cx, |_window, cx| Self {
            workspace: workspace_entity,
            focus_handle: cx.focus_handle(),
        });
    }
    fn open_panel(&mut self, _: &ClickEvent, window: &mut Window, cx: &mut Context<Self>) {
        self.workspace.update(cx, |workspace, cx| {
            workspace.focus_panel::<AgentPanel>(window, cx);
            if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
                panel.update(cx, |panel, cx| {
                    panel.new_agent_thread(AgentType::Gemini, window, cx);
                });
            }
        });
        cx.emit(DismissEvent);
        acp_onboarding_event!("Open Panel Clicked");
    }
    fn view_docs(&mut self, _: &ClickEvent, _: &mut Window, cx: &mut Context<Self>) {
        cx.open_url(&zed_urls::external_agents_docs(cx));
        cx.notify();
        acp_onboarding_event!("Documentation Link Clicked");
    }
    fn cancel(&mut self, _: &menu::Cancel, _: &mut Window, cx: &mut Context<Self>) {
        cx.emit(DismissEvent);
    }
 }
 impl EventEmitter<DismissEvent> for AcpOnboardingModal {}
 impl Focusable for AcpOnboardingModal {
    fn focus_handle(&self, _cx: &App) -> FocusHandle {
        self.focus_handle.clone()
    }
 }
 impl ModalView for AcpOnboardingModal {}
 impl Render for AcpOnboardingModal {
    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
        let illustration_element = |label: bool, opacity: f32| {
            h_flex()
                .px_1()
                .py_0p5()
                .gap_1()
                .rounded_sm()
                .bg(cx.theme().colors().element_active.opacity(0.05))
                .border_1()
                .border_color(cx.theme().colors().border)
                .border_dashed()
                .child(
                    Icon::new(IconName::Stop)
                        .size(IconSize::Small)
                        .color(Color::Custom(cx.theme().colors().text_muted.opacity(0.15))),
                )
                .map(|this| {
                    if label {
                        this.child(
                            Label::new("Your Agent Here")
                                .size(LabelSize::Small)
                                .color(Color::Muted),
                        )
                    } else {
                        this.child(
                            div().w_16().h_1().rounded_full().bg(cx
                                .theme()
                                .colors()
                                .element_active
                                .opacity(0.6)),
                        )
                    }
                })
                .opacity(opacity)
        };
        let illustration = h_flex()
            .relative()
            .h(rems_from_px(126.))
            .bg(cx.theme().colors().editor_background)
            .border_b_1()
            .border_color(cx.theme().colors().border_variant)
            .justify_center()
            .gap_8()
            .rounded_t_md()
            .overflow_hidden()
            .child(
                div().absolute().inset_0().w(px(515.)).h(px(126.)).child(
                    Vector::new(VectorName::AcpGrid, rems_from_px(515.), rems_from_px(126.))
                        .color(ui::Color::Custom(cx.theme().colors().text.opacity(0.02))),
                ),
            )
            .child(div().absolute().inset_0().size_full().bg(linear_gradient(
                0.,
                linear_color_stop(
                    cx.theme().colors().elevated_surface_background.opacity(0.1),
                    0.9,
                ),
                linear_color_stop(
                    cx.theme().colors().elevated_surface_background.opacity(0.),
                    0.,
                ),
            )))
            .child(
                div()
                    .absolute()
                    .inset_0()
                    .size_full()
                    .bg(gpui::black().opacity(0.15)),
            )
            .child(
                h_flex()
                    .gap_4()
                    .child(
                        Vector::new(VectorName::AcpLogo, rems_from_px(106.), rems_from_px(40.))
                            .color(ui::Color::Custom(cx.theme().colors().text.opacity(0.8))),
                    )
                    .child(
                        Vector::new(
                            VectorName::AcpLogoSerif,
                            rems_from_px(111.),
                            rems_from_px(41.),
                        )
                        .color(ui::Color::Custom(cx.theme().colors().text.opacity(0.8))),
                    ),
            )
            .child(
                v_flex()
                    .gap_1p5()
                    .child(illustration_element(false, 0.15))
                    .child(illustration_element(true, 0.3))
                    .child(
                        h_flex()
                            .pl_1()
                            .pr_2()
                            .py_0p5()
                            .gap_1()
                            .rounded_sm()
                            .bg(cx.theme().colors().element_active.opacity(0.2))
                            .border_1()
                            .border_color(cx.theme().colors().border)
                            .child(
                                Icon::new(IconName::AiGemini)
                                    .size(IconSize::Small)
                                    .color(Color::Muted),
                            )
                            .child(Label::new("New Gemini CLI Thread").size(LabelSize::Small)),
                    )
                    .child(illustration_element(true, 0.3))
                    .child(illustration_element(false, 0.15)),
            );
        let heading = v_flex()
            .w_full()
            .gap_1()
            .child(
                Label::new("Now Available")
                    .size(LabelSize::Small)
                    .color(Color::Muted),
            )
            .child(Headline::new("Bring Your Own Agent to Zed").size(HeadlineSize::Large));
        let copy = "Bring the agent of your choice to Zed via our new Agent Client Protocol (ACP), starting with Google's Gemini CLI integration.";
        let open_panel_button = Button::new("open-panel", "Start with Gemini CLI")
            .icon_size(IconSize::Indicator)
            .style(ButtonStyle::Tinted(TintColor::Accent))
            .full_width()
            .on_click(cx.listener(Self::open_panel));
        let docs_button = Button::new("add-other-agents", "Add Other Agents")
            .icon(IconName::ArrowUpRight)
            .icon_size(IconSize::Indicator)
            .icon_color(Color::Muted)
            .full_width()
            .on_click(cx.listener(Self::view_docs));
        let close_button = h_flex().absolute().top_2().right_2().child(
            IconButton::new("cancel", IconName::Close).on_click(cx.listener(
                |_, _: &ClickEvent, _window, cx| {
                    acp_onboarding_event!("Canceled", trigger = "X click");
                    cx.emit(DismissEvent);
                },
            )),
        );
        v_flex()
            .id("acp-onboarding")
            .key_context("AcpOnboardingModal")
            .relative()
            .w(rems(34.))
            .h_full()
            .elevation_3(cx)
            .track_focus(&self.focus_handle(cx))
            .overflow_hidden()
            .on_action(cx.listener(Self::cancel))
            .on_action(cx.listener(|_, _: &menu::Cancel, _window, cx| {
                acp_onboarding_event!("Canceled", trigger = "Action");
                cx.emit(DismissEvent);
            }))
            .on_any_mouse_down(cx.listener(|this, _: &MouseDownEvent, window, _cx| {
                this.focus_handle.focus(window);
            }))
            .child(illustration)
            .child(
                v_flex()
                    .p_4()
                    .gap_2()
                    .child(heading)
                    .child(Label::new(copy).color(Color::Muted))
                    .child(
                        v_flex()
                            .w_full()
                            .mt_2()
                            .gap_1()
                            .child(open_panel_button)
                            .child(docs_button),
                    ),
            )
            .child(close_button)
    }
 }
--- a/crates/agent_ui/src/ui/preview/usage_callouts.rs
+++ b/crates/agent_ui/src/ui/preview/usage_callouts.rs
@ -86,18 +86,23 @@ impl RenderOnce for UsageCallout {
            (IconName::Warning, Severity::Warning)
        };
-        Callout::new()
+        div()
-            .icon(icon)
+            .border_t_1()
-            .severity(severity)
+            .border_color(cx.theme().colors().border)
-            .icon(icon)
+            .child(
-            .title(title)
+                Callout::new()
-            .description(message)
+                    .icon(icon)
-            .actions_slot(
+                    .severity(severity)
-                Button::new("upgrade", button_text)
+                    .icon(icon)
-                    .label_size(LabelSize::Small)
+                    .title(title)
-                    .on_click(move |_, _, cx| {
+                    .description(message)
-                        cx.open_url(&url);
+                    .actions_slot(
-                    }),
+                        Button::new("upgrade", button_text)
                            .label_size(LabelSize::Small)
                            .on_click(move |_, _, cx| {
                                cx.open_url(&url);
                            }),
                    ),
            )
            .into_any_element()
    }
--- a/crates/ai_onboarding/src/ai_onboarding.rs
+++ b/crates/ai_onboarding/src/ai_onboarding.rs
@ -19,7 +19,7 @@ use std::sync::Arc;
 use client::{Client, UserStore, zed_urls};
 use gpui::{AnyElement, Entity, IntoElement, ParentElement};
-use ui::{Divider, RegisterComponent, Tooltip, prelude::*};
+use ui::{Divider, RegisterComponent, TintColor, Tooltip, prelude::*};
 #[derive(PartialEq)]
 pub enum SignInStatus {
@ -43,10 +43,12 @@ impl From<client::Status> for SignInStatus {
 #[derive(RegisterComponent, IntoElement)]
 pub struct ZedAiOnboarding {
    pub sign_in_status: SignInStatus,
    pub has_accepted_terms_of_service: bool,
    pub plan: Option<Plan>,
    pub account_too_young: bool,
    pub continue_with_zed_ai: Arc<dyn Fn(&mut Window, &mut App)>,
    pub sign_in: Arc<dyn Fn(&mut Window, &mut App)>,
    pub accept_terms_of_service: Arc<dyn Fn(&mut Window, &mut App)>,
    pub dismiss_onboarding: Option<Arc<dyn Fn(&mut Window, &mut App)>>,
 }
@ -62,9 +64,17 @@ impl ZedAiOnboarding {
        Self {
            sign_in_status: status.into(),
            has_accepted_terms_of_service: store.has_accepted_terms_of_service(),
            plan: store.plan(),
            account_too_young: store.account_too_young(),
            continue_with_zed_ai,
            accept_terms_of_service: Arc::new({
                let store = user_store.clone();
                move |_window, cx| {
                    let task = store.update(cx, |store, cx| store.accept_terms_of_service(cx));
                    task.detach_and_log_err(cx);
                }
            }),
            sign_in: Arc::new(move |_window, cx| {
                cx.spawn({
                    let client = client.clone();
@ -84,6 +94,42 @@ impl ZedAiOnboarding {
        self
    }
    fn render_accept_terms_of_service(&self) -> AnyElement {
        v_flex()
            .gap_1()
            .w_full()
            .child(Headline::new("Accept Terms of Service"))
            .child(
                Label::new("We don’t sell your data, track you across the web, or compromise your privacy.")
                    .color(Color::Muted)
                    .mb_2(),
            )
            .child(
                Button::new("terms_of_service", "Review Terms of Service")
                    .full_width()
                    .style(ButtonStyle::Outlined)
                    .icon(IconName::ArrowUpRight)
                    .icon_color(Color::Muted)
                    .icon_size(IconSize::Small)
                    .on_click(move |_, _window, cx| {
                        telemetry::event!("Review Terms of Service Clicked");
                        cx.open_url(&zed_urls::terms_of_service(cx))
                    }),
            )
            .child(
                Button::new("accept_terms", "Accept")
                    .full_width()
                    .style(ButtonStyle::Tinted(TintColor::Accent))
                    .on_click({
                        let callback = self.accept_terms_of_service.clone();
                        move |_, window, cx| {
                            telemetry::event!("Terms of Service Accepted");
                            (callback)(window, cx)}
                    }),
            )
            .into_any_element()
    }
    fn render_sign_in_disclaimer(&self, _cx: &mut App) -> AnyElement {
        let signing_in = matches!(self.sign_in_status, SignInStatus::SigningIn);
        let plan_definitions = PlanDefinitions;
@ -313,10 +359,14 @@ impl ZedAiOnboarding {
 impl RenderOnce for ZedAiOnboarding {
    fn render(self, _window: &mut ui::Window, cx: &mut App) -> impl IntoElement {
        if matches!(self.sign_in_status, SignInStatus::SignedIn) {
-            match self.plan {
+            if self.has_accepted_terms_of_service {
-                None | Some(Plan::ZedFree) => self.render_free_plan_state(cx),
+                match self.plan {
-                Some(Plan::ZedProTrial) => self.render_trial_state(cx),
+                    None | Some(Plan::ZedFree) => self.render_free_plan_state(cx),
-                Some(Plan::ZedPro) => self.render_pro_plan_state(cx),
+                    Some(Plan::ZedProTrial) => self.render_trial_state(cx),
                    Some(Plan::ZedPro) => self.render_pro_plan_state(cx),
                }
            } else {
                self.render_accept_terms_of_service()
            }
        } else {
            self.render_sign_in_disclaimer(cx)
@ -340,15 +390,18 @@ impl Component for ZedAiOnboarding {
    fn preview(_window: &mut Window, _cx: &mut App) -> Option<AnyElement> {
        fn onboarding(
            sign_in_status: SignInStatus,
            has_accepted_terms_of_service: bool,
            plan: Option<Plan>,
            account_too_young: bool,
        ) -> AnyElement {
            ZedAiOnboarding {
                sign_in_status,
                has_accepted_terms_of_service,
                plan,
                account_too_young,
                continue_with_zed_ai: Arc::new(|_, _| {}),
                sign_in: Arc::new(|_, _| {}),
                accept_terms_of_service: Arc::new(|_, _| {}),
                dismiss_onboarding: None,
            }
            .into_any_element()
@ -362,23 +415,27 @@ impl Component for ZedAiOnboarding {
                .children(vec![
                    single_example(
                        "Not Signed-in",
-                        onboarding(SignInStatus::SignedOut, None, false),
+                        onboarding(SignInStatus::SignedOut, false, None, false),
                    ),
                    single_example(
                        "Not Accepted ToS",
                        onboarding(SignInStatus::SignedIn, false, None, false),
                    ),
                    single_example(
                        "Young Account",
-                        onboarding(SignInStatus::SignedIn, None, true),
+                        onboarding(SignInStatus::SignedIn, true, None, true),
                    ),
                    single_example(
                        "Free Plan",
-                        onboarding(SignInStatus::SignedIn, Some(Plan::ZedFree), false),
+                        onboarding(SignInStatus::SignedIn, true, Some(Plan::ZedFree), false),
                    ),
                    single_example(
                        "Pro Trial",
-                        onboarding(SignInStatus::SignedIn, Some(Plan::ZedProTrial), false),
+                        onboarding(SignInStatus::SignedIn, true, Some(Plan::ZedProTrial), false),
                    ),
                    single_example(
                        "Pro Plan",
-                        onboarding(SignInStatus::SignedIn, Some(Plan::ZedPro), false),
+                        onboarding(SignInStatus::SignedIn, true, Some(Plan::ZedPro), false),
                    ),
                ])
                .into_any_element(),
--- a/crates/ai_onboarding/src/ai_upsell_card.rs
+++ b/crates/ai_onboarding/src/ai_upsell_card.rs
@ -12,11 +12,11 @@ use crate::{SignInStatus, YoungAccountBanner, plan_definitions::PlanDefinitions}
 #[derive(IntoElement, RegisterComponent)]
 pub struct AiUpsellCard {
-    sign_in_status: SignInStatus,
+    pub sign_in_status: SignInStatus,
-    sign_in: Arc<dyn Fn(&mut Window, &mut App)>,
+    pub sign_in: Arc<dyn Fn(&mut Window, &mut App)>,
-    account_too_young: bool,
+    pub account_too_young: bool,
-    user_plan: Option<Plan>,
+    pub user_plan: Option<Plan>,
-    tab_index: Option<isize>,
+    pub tab_index: Option<isize>,
 }
 impl AiUpsellCard {
@ -43,11 +43,6 @@ impl AiUpsellCard {
            tab_index: None,
        }
    }
    pub fn tab_index(mut self, tab_index: Option<isize>) -> Self {
        self.tab_index = tab_index;
        self
    }
 }
 impl RenderOnce for AiUpsellCard {
--- a/crates/assistant_tools/src/fetch_tool.rs
+++ b/crates/assistant_tools/src/fetch_tool.rs
@ -118,7 +118,7 @@ impl Tool for FetchTool {
    }
    fn needs_confirmation(&self, _: &serde_json::Value, _: &Entity<Project>, _: &App) -> bool {
-        true
+        false
    }
    fn may_perform_edits(&self) -> bool {
--- a/crates/assistant_tools/src/find_path_tool.rs
+++ b/crates/assistant_tools/src/find_path_tool.rs
@ -435,8 +435,8 @@ mod test {
        assert_eq!(
            matches,
            &[
-                PathBuf::from(path!("root/apple/banana/carrot")),
+                PathBuf::from("root/apple/banana/carrot"),
-                PathBuf::from(path!("root/apple/bandana/carbonara"))
+                PathBuf::from("root/apple/bandana/carbonara")
            ]
        );
@ -447,8 +447,8 @@ mod test {
        assert_eq!(
            matches,
            &[
-                PathBuf::from(path!("root/apple/banana/carrot")),
+                PathBuf::from("root/apple/banana/carrot"),
-                PathBuf::from(path!("root/apple/bandana/carbonara"))
+                PathBuf::from("root/apple/bandana/carbonara")
            ]
        );
    }
--- a/crates/assistant_tools/src/read_file_tool.rs
+++ b/crates/assistant_tools/src/read_file_tool.rs
@ -68,7 +68,7 @@ impl Tool for ReadFileTool {
    }
    fn icon(&self) -> IconName {
-        IconName::ToolSearch
+        IconName::ToolRead
    }
    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
--- a/crates/audio/Cargo.toml
+++ b/crates/audio/Cargo.toml
@ -19,6 +19,10 @@ gpui.workspace = true
 settings.workspace = true
 schemars.workspace = true
 serde.workspace = true
 parking_lot.workspace = true
 rodio = { workspace = true, features = [ "wav", "playback", "tracing" ] }
 util.workspace = true
 workspace-hack.workspace = true
 [target.'cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd")))'.dependencies]
 libwebrtc = { rev = "5f04705ac3f356350ae31534ffbc476abc9ea83d", git = "https://github.com/zed-industries/livekit-rust-sdks" }
--- a/crates/audio/src/audio.rs
+++ b/crates/audio/src/audio.rs
@ -1,12 +1,15 @@
 use anyhow::{Context as _, Result, anyhow};
 use collections::HashMap;
 use gpui::{App, BorrowAppContext, Global};
-use rodio::{Decoder, OutputStream, OutputStreamBuilder, Source, source::Buffered};
+use libwebrtc::native::apm;
 use parking_lot::Mutex;
 use rodio::{Decoder, OutputStream, OutputStreamBuilder, Source, mixer::Mixer, source::Buffered};
 use settings::Settings;
-use std::io::Cursor;
+use std::{io::Cursor, sync::Arc};
 use util::ResultExt;
 mod audio_settings;
 mod rodio_ext;
 pub use audio_settings::AudioSettings;
 pub fn init(cx: &mut App) {
@ -38,18 +41,46 @@ impl Sound {
    }
 }
 #[derive(Default)]
 pub struct Audio {
    output_handle: Option<OutputStream>,
    output_mixer: Option<Mixer>,
    echo_canceller: Arc<Mutex<apm::AudioProcessingModule>>,
    source_cache: HashMap<Sound, Buffered<Decoder<Cursor<Vec<u8>>>>>,
 }
 impl Default for Audio {
    fn default() -> Self {
        Self {
            output_handle: Default::default(),
            output_mixer: Default::default(),
            echo_canceller: Arc::new(Mutex::new(apm::AudioProcessingModule::new(
                true, false, false, false,
            ))),
            source_cache: Default::default(),
        }
    }
 }
 impl Global for Audio {}
 impl Audio {
    fn ensure_output_exists(&mut self) -> Option<&OutputStream> {
        if self.output_handle.is_none() {
            self.output_handle = OutputStreamBuilder::open_default_stream().log_err();
            if let Some(output_handle) = self.output_handle {
                let config = output_handle.config();
                let (mixer, source) =
                    rodio::mixer::mixer(config.channel_count(), config.sample_rate());
                self.output_mixer = Some(mixer);
                let echo_canceller = Arc::clone(&self.echo_canceller);
                let source = source.inspect_buffered(
                    |buffer| echo_canceller.lock().process_reverse_stream(&mut buf),
                    config.sample_rate().get() as i32,
                    config.channel_count().get().into(),
                );
                output_handle.mixer().add(source);
            }
        }
        self.output_handle.as_ref()
@ -72,6 +103,7 @@ impl Audio {
        cx.update_default_global(|this: &mut Self, cx| {
            let source = this.sound_source(sound, cx).log_err()?;
            let output_handle = this.ensure_output_exists()?;
            output_handle.mixer().add(source);
            Some(())
        });
--- a/crates/audio/src/rodio_ext.rs
+++ b/crates/audio/src/rodio_ext.rs
@ -0,0 +1,93 @@
 use rodio::Source;
 pub trait RodioExt: Source + Sized {
    fn process_buffer<const N: usize, F>(self, callback: F) -> ProcessBuffer<N, Self, F>
    where
        F: FnMut(&mut [rodio::Sample; N]);
    fn inspect_buffer<const N: usize, F>(self, callback: F) -> ProcessBuffer<N, Self, F>
    where
        F: FnMut(&[rodio::Sample; N]);
 }
 impl<S: Source> RodioExt for S {
    fn process_buffer<const N: usize, F>(self, callback: F) -> ProcessBuffer<N, Self, F>
    where
        F: FnMut(&mut [rodio::Sample; N]),
    {
        ProcessBuffer {
            inner: self,
            callback,
            buffer: [0.0; N],
            next: N,
        }
    }
    fn inspect_buffer<const N: usize, F>(self, callback: F) -> ProcessBuffer<N, Self, F>
    where
        F: FnMut(&[rodio::Sample; N]),
    {
        InspectBuffer {
            inner: self,
            callback,
            buffer: [0.0; N],
            next: N,
        }
    }
 }
 pub struct ProcessBuffer<const N: usize, S, F>
 where
    S: Source + Sized,
    F: FnMut(&mut [rodio::Sample; N]),
 {
    inner: S,
    callback: F,
    buffer: [rodio::Sample; N],
    next: usize,
 }
 impl<const N: usize, S, F> Iterator for ProcessBuffer<N, S, F>
 where
    S: Source + Sized,
    F: FnMut(&mut [rodio::Sample; N]),
 {
    type Item = rodio::Sample;
    fn next(&mut self) -> Option<Self::Item> {
        self.next += 1;
        if self.next < self.buffer.len() {
            let sample = self.buffer[self.next];
            return Some(sample);
        }
        for sample in &mut self.buffer {
            *sample = self.inner.next()?
        }
        (self.callback)(&mut self.buffer);
        self.next = 0;
        Some(self.buffer[0])
    }
 }
 impl<const N: usize, S, F> Source for ProcessBuffer<N, S, F>
 where
    S: Source + Sized,
    F: FnMut(&mut [rodio::Sample; N]),
 {
    fn current_span_len(&self) -> Option<usize> {
        // TODO dvdsk this should be a spanless Source
        None
    }
    fn channels(&self) -> rodio::ChannelCount {
        self.inner.channels()
    }
    fn sample_rate(&self) -> rodio::SampleRate {
        self.inner.sample_rate()
    }
    fn total_duration(&self) -> Option<std::time::Duration> {
        self.inner.total_duration()
    }
 }
--- a/crates/client/src/client.rs
+++ b/crates/client/src/client.rs
@ -66,8 +66,6 @@ pub static IMPERSONATE_LOGIN: LazyLock<Option<String>> = LazyLock::new(|| {
        .and_then(|s| if s.is_empty() { None } else { Some(s) })
 });
 pub static USE_WEB_LOGIN: LazyLock<bool> = LazyLock::new(|| std::env::var("ZED_WEB_LOGIN").is_ok());
 pub static ADMIN_API_TOKEN: LazyLock<Option<String>> = LazyLock::new(|| {
    std::env::var("ZED_ADMIN_API_TOKEN")
        .ok()
@ -1394,13 +1392,11 @@ impl Client {
                    if let Some((login, token)) =
                        IMPERSONATE_LOGIN.as_ref().zip(ADMIN_API_TOKEN.as_ref())
                    {
-                        if !*USE_WEB_LOGIN {
+                        eprintln!("authenticate as admin {login}, {token}");
                            eprintln!("authenticate as admin {login}, {token}");
-                            return this
+                        return this
-                                .authenticate_as_admin(http, login.clone(), token.clone())
+                            .authenticate_as_admin(http, login.clone(), token.clone())
-                                .await;
+                            .await;
                        }
                    }
                    // Start an HTTP server to receive the redirect from Zed's sign-in page.
--- a/crates/client/src/user.rs
+++ b/crates/client/src/user.rs
@ -1,5 +1,5 @@
 use super::{Client, Status, TypedEnvelope, proto};
-use anyhow::{Context as _, Result};
+use anyhow::{Context as _, Result, anyhow};
 use chrono::{DateTime, Utc};
 use cloud_api_client::websocket_protocol::MessageToClient;
 use cloud_api_client::{GetAuthenticatedUserResponse, PlanInfo};
@ -46,6 +46,11 @@ impl ProjectId {
    }
 }
 #[derive(
    Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy, serde::Serialize, serde::Deserialize,
 )]
 pub struct DevServerProjectId(pub u64);
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub struct ParticipantIndex(pub u32);
@ -111,6 +116,7 @@ pub struct UserStore {
    edit_prediction_usage: Option<EditPredictionUsage>,
    plan_info: Option<PlanInfo>,
    current_user: watch::Receiver<Option<Arc<User>>>,
    accepted_tos_at: Option<Option<cloud_api_client::Timestamp>>,
    contacts: Vec<Arc<Contact>>,
    incoming_contact_requests: Vec<Arc<User>>,
    outgoing_contact_requests: Vec<Arc<User>>,
@ -188,6 +194,7 @@ impl UserStore {
            plan_info: None,
            model_request_usage: None,
            edit_prediction_usage: None,
            accepted_tos_at: None,
            contacts: Default::default(),
            incoming_contact_requests: Default::default(),
            participant_indices: Default::default(),
@ -264,6 +271,7 @@ impl UserStore {
                        Status::SignedOut => {
                            current_user_tx.send(None).await.ok();
                            this.update(cx, |this, cx| {
                                this.accepted_tos_at = None;
                                cx.emit(Event::PrivateUserInfoUpdated);
                                cx.notify();
                                this.clear_contacts()
@ -783,6 +791,19 @@ impl UserStore {
                .set_authenticated_user_info(Some(response.user.metrics_id.clone()), staff);
        }
        let accepted_tos_at = {
            #[cfg(debug_assertions)]
            if std::env::var("ZED_IGNORE_ACCEPTED_TOS").is_ok() {
                None
            } else {
                response.user.accepted_tos_at
            }
            #[cfg(not(debug_assertions))]
            response.user.accepted_tos_at
        };
        self.accepted_tos_at = Some(accepted_tos_at);
        self.model_request_usage = Some(ModelRequestUsage(RequestUsage {
            limit: response.plan.usage.model_requests.limit,
            amount: response.plan.usage.model_requests.used as i32,
@ -825,6 +846,32 @@ impl UserStore {
        self.current_user.clone()
    }
    pub fn has_accepted_terms_of_service(&self) -> bool {
        self.accepted_tos_at
            .is_some_and(|accepted_tos_at| accepted_tos_at.is_some())
    }
    pub fn accept_terms_of_service(&self, cx: &Context<Self>) -> Task<Result<()>> {
        if self.current_user().is_none() {
            return Task::ready(Err(anyhow!("no current user")));
        };
        let client = self.client.clone();
        cx.spawn(async move |this, cx| -> anyhow::Result<()> {
            let client = client.upgrade().context("client not found")?;
            let response = client
                .cloud_client()
                .accept_terms_of_service()
                .await
                .context("error accepting tos")?;
            this.update(cx, |this, cx| {
                this.accepted_tos_at = Some(response.user.accepted_tos_at);
                cx.emit(Event::PrivateUserInfoUpdated);
            })?;
            Ok(())
        })
    }
    fn load_users(
        &self,
        request: impl RequestMessage<Response = UsersResponse>,
--- a/crates/client/src/zed_urls.rs
+++ b/crates/client/src/zed_urls.rs
@ -43,11 +43,3 @@ pub fn ai_privacy_and_security(cx: &App) -> String {
        server_url = server_url(cx)
    )
 }
 /// Returns the URL to Zed AI's external agents documentation.
 pub fn external_agents_docs(cx: &App) -> String {
    format!(
        "{server_url}/docs/ai/external-agents",
        server_url = server_url(cx)
    )
 }
--- a/crates/cloud_api_client/src/cloud_api_client.rs
+++ b/crates/cloud_api_client/src/cloud_api_client.rs
@ -115,6 +115,34 @@ impl CloudApiClient {
        }))
    }
    pub async fn accept_terms_of_service(&self) -> Result<AcceptTermsOfServiceResponse> {
        let request = self.build_request(
            Request::builder().method(Method::POST).uri(
                self.http_client
                    .build_zed_cloud_url("/client/terms_of_service/accept", &[])?
                    .as_ref(),
            ),
            AsyncBody::default(),
        )?;
        let mut response = self.http_client.send(request).await?;
        if !response.status().is_success() {
            let mut body = String::new();
            response.body_mut().read_to_string(&mut body).await?;
            anyhow::bail!(
                "Failed to accept terms of service.\nStatus: {:?}\nBody: {body}",
                response.status()
            )
        }
        let mut body = String::new();
        response.body_mut().read_to_string(&mut body).await?;
        Ok(serde_json::from_str(&body)?)
    }
    pub async fn create_llm_token(
        &self,
        system_id: Option<String>,
--- a/crates/collab/src/tests/following_tests.rs
+++ b/crates/collab/src/tests/following_tests.rs
@ -970,7 +970,7 @@ async fn test_peers_following_each_other(cx_a: &mut TestAppContext, cx_b: &mut T
    // the follow.
    workspace_b.update_in(cx_b, |workspace, window, cx| {
        workspace.active_pane().update(cx, |pane, cx| {
-            pane.activate_previous_item(&Default::default(), window, cx);
+            pane.activate_prev_item(true, window, cx);
        });
    });
    executor.run_until_parked();
@ -1073,7 +1073,7 @@ async fn test_peers_following_each_other(cx_a: &mut TestAppContext, cx_b: &mut T
    // Client A cycles through some tabs.
    workspace_a.update_in(cx_a, |workspace, window, cx| {
        workspace.active_pane().update(cx, |pane, cx| {
-            pane.activate_previous_item(&Default::default(), window, cx);
+            pane.activate_prev_item(true, window, cx);
        });
    });
    executor.run_until_parked();
@ -1117,7 +1117,7 @@ async fn test_peers_following_each_other(cx_a: &mut TestAppContext, cx_b: &mut T
    workspace_a.update_in(cx_a, |workspace, window, cx| {
        workspace.active_pane().update(cx, |pane, cx| {
-            pane.activate_previous_item(&Default::default(), window, cx);
+            pane.activate_prev_item(true, window, cx);
        });
    });
    executor.run_until_parked();
@ -1164,7 +1164,7 @@ async fn test_peers_following_each_other(cx_a: &mut TestAppContext, cx_b: &mut T
    workspace_a.update_in(cx_a, |workspace, window, cx| {
        workspace.active_pane().update(cx, |pane, cx| {
-            pane.activate_previous_item(&Default::default(), window, cx);
+            pane.activate_prev_item(true, window, cx);
        });
    });
    executor.run_until_parked();
--- a/crates/command_palette/src/persistence.rs
+++ b/crates/command_palette/src/persistence.rs
@ -1,10 +1,7 @@
 use anyhow::Result;
 use db::{
-    query,
+    define_connection, query,
-    sqlez::{
+    sqlez::{bindable::Column, statement::Statement},
        bindable::Column, domain::Domain, statement::Statement,
        thread_safe_connection::ThreadSafeConnection,
    },
    sqlez_macros::sql,
 };
 use serde::{Deserialize, Serialize};
@ -53,11 +50,8 @@ impl Column for SerializedCommandInvocation {
    }
 }
-pub struct CommandPaletteDB(ThreadSafeConnection);
+define_connection!(pub static ref COMMAND_PALETTE_HISTORY: CommandPaletteDB<()> =
-
+    &[sql!(
 impl Domain for CommandPaletteDB {
    const NAME: &str = stringify!(CommandPaletteDB);
    const MIGRATIONS: &[&str] = &[sql!(
        CREATE TABLE IF NOT EXISTS command_invocations(
            id INTEGER PRIMARY KEY AUTOINCREMENT,
            command_name TEXT NOT NULL,
@ -65,9 +59,7 @@ impl Domain for CommandPaletteDB {
            last_invoked INTEGER DEFAULT (unixepoch())  NOT NULL
        ) STRICT;
    )];
-}
+);
 db::static_connection!(COMMAND_PALETTE_HISTORY, CommandPaletteDB, []);
 impl CommandPaletteDB {
    pub async fn write_command_invocation(
--- a/crates/db/src/db.rs
+++ b/crates/db/src/db.rs
@ -110,14 +110,11 @@ pub async fn open_test_db<M: Migrator>(db_name: &str) -> ThreadSafeConnection {
 }
 /// Implements a basic DB wrapper for a given domain
 ///
 /// Arguments:
 /// - static variable name for connection
 /// - type of connection wrapper
 /// - dependencies, whose migrations should be run prior to this domain's migrations
 #[macro_export]
-macro_rules! static_connection {
+macro_rules! define_connection {
-    ($id:ident, $t:ident, [ $($d:ty),* ] $(, $global:ident)?) => {
+    (pub static ref $id:ident: $t:ident<()> = $migrations:expr; $($global:ident)?) => {
        pub struct $t($crate::sqlez::thread_safe_connection::ThreadSafeConnection);
        impl ::std::ops::Deref for $t {
            type Target = $crate::sqlez::thread_safe_connection::ThreadSafeConnection;
@ -126,6 +123,16 @@ macro_rules! static_connection {
            }
        }
        impl $crate::sqlez::domain::Domain for $t {
            fn name() -> &'static str {
                stringify!($t)
            }
            fn migrations() -> &'static [&'static str] {
                $migrations
            }
        }
        impl $t {
            #[cfg(any(test, feature = "test-support"))]
            pub async fn open_test_db(name: &'static str) -> Self {
@ -135,8 +142,7 @@ macro_rules! static_connection {
        #[cfg(any(test, feature = "test-support"))]
        pub static $id: std::sync::LazyLock<$t> = std::sync::LazyLock::new(|| {
-            #[allow(unused_parens)]
+            $t($crate::smol::block_on($crate::open_test_db::<$t>(stringify!($id))))
            $t($crate::smol::block_on($crate::open_test_db::<($($d,)* $t)>(stringify!($id))))
        });
        #[cfg(not(any(test, feature = "test-support")))]
@ -147,10 +153,46 @@ macro_rules! static_connection {
            } else {
                $crate::RELEASE_CHANNEL.dev_name()
            };
-            #[allow(unused_parens)]
+            $t($crate::smol::block_on($crate::open_db::<$t>(db_dir, scope)))
            $t($crate::smol::block_on($crate::open_db::<($($d,)* $t)>(db_dir, scope)))
        });
-    }
+    };
    (pub static ref $id:ident: $t:ident<$($d:ty),+> = $migrations:expr; $($global:ident)?) => {
        pub struct $t($crate::sqlez::thread_safe_connection::ThreadSafeConnection);
        impl ::std::ops::Deref for $t {
            type Target = $crate::sqlez::thread_safe_connection::ThreadSafeConnection;
            fn deref(&self) -> &Self::Target {
                &self.0
            }
        }
        impl $crate::sqlez::domain::Domain for $t {
            fn name() -> &'static str {
                stringify!($t)
            }
            fn migrations() -> &'static [&'static str] {
                $migrations
            }
        }
        #[cfg(any(test, feature = "test-support"))]
        pub static $id: std::sync::LazyLock<$t> = std::sync::LazyLock::new(|| {
            $t($crate::smol::block_on($crate::open_test_db::<($($d),+, $t)>(stringify!($id))))
        });
        #[cfg(not(any(test, feature = "test-support")))]
        pub static $id: std::sync::LazyLock<$t> = std::sync::LazyLock::new(|| {
            let db_dir = $crate::database_dir();
            let scope = if false $(|| stringify!($global) == "global")? {
                "global"
            } else {
                $crate::RELEASE_CHANNEL.dev_name()
            };
            $t($crate::smol::block_on($crate::open_db::<($($d),+, $t)>(db_dir, scope)))
        });
    };
 }
 pub fn write_and_log<F>(cx: &App, db_write: impl FnOnce() -> F + Send + 'static)
@ -177,12 +219,17 @@ mod tests {
        enum BadDB {}
        impl Domain for BadDB {
-            const NAME: &str = "db_tests";
+            fn name() -> &'static str {
-            const MIGRATIONS: &[&str] = &[
+                "db_tests"
-                sql!(CREATE TABLE test(value);),
+            }
-                // failure because test already exists
+
-                sql!(CREATE TABLE test(value);),
+            fn migrations() -> &'static [&'static str] {
-            ];
+                &[
                    sql!(CREATE TABLE test(value);),
                    // failure because test already exists
                    sql!(CREATE TABLE test(value);),
                ]
            }
        }
        let tempdir = tempfile::Builder::new()
@ -204,15 +251,25 @@ mod tests {
        enum CorruptedDB {}
        impl Domain for CorruptedDB {
-            const NAME: &str = "db_tests";
+            fn name() -> &'static str {
-            const MIGRATIONS: &[&str] = &[sql!(CREATE TABLE test(value);)];
+                "db_tests"
            }
            fn migrations() -> &'static [&'static str] {
                &[sql!(CREATE TABLE test(value);)]
            }
        }
        enum GoodDB {}
        impl Domain for GoodDB {
-            const NAME: &str = "db_tests"; //Notice same name
+            fn name() -> &'static str {
-            const MIGRATIONS: &[&str] = &[sql!(CREATE TABLE test2(value);)];
+                "db_tests" //Notice same name
            }
            fn migrations() -> &'static [&'static str] {
                &[sql!(CREATE TABLE test2(value);)] //But different migration
            }
        }
        let tempdir = tempfile::Builder::new()
@ -248,16 +305,25 @@ mod tests {
        enum CorruptedDB {}
        impl Domain for CorruptedDB {
-            const NAME: &str = "db_tests";
+            fn name() -> &'static str {
                "db_tests"
            }
-            const MIGRATIONS: &[&str] = &[sql!(CREATE TABLE test(value);)];
+            fn migrations() -> &'static [&'static str] {
                &[sql!(CREATE TABLE test(value);)]
            }
        }
        enum GoodDB {}
        impl Domain for GoodDB {
-            const NAME: &str = "db_tests"; //Notice same name
+            fn name() -> &'static str {
-            const MIGRATIONS: &[&str] = &[sql!(CREATE TABLE test2(value);)]; // But different migration
+                "db_tests" //Notice same name
            }
            fn migrations() -> &'static [&'static str] {
                &[sql!(CREATE TABLE test2(value);)] //But different migration
            }
        }
        let tempdir = tempfile::Builder::new()
--- a/crates/db/src/kvp.rs
+++ b/crates/db/src/kvp.rs
@ -2,26 +2,16 @@ use gpui::App;
 use sqlez_macros::sql;
 use util::ResultExt as _;
-use crate::{
+use crate::{define_connection, query, write_and_log};
    query,
    sqlez::{domain::Domain, thread_safe_connection::ThreadSafeConnection},
    write_and_log,
 };
-pub struct KeyValueStore(crate::sqlez::thread_safe_connection::ThreadSafeConnection);
+define_connection!(pub static ref KEY_VALUE_STORE: KeyValueStore<()> =
-
+    &[sql!(
 impl Domain for KeyValueStore {
    const NAME: &str = stringify!(KeyValueStore);
    const MIGRATIONS: &[&str] = &[sql!(
        CREATE TABLE IF NOT EXISTS kv_store(
            key TEXT PRIMARY KEY,
            value TEXT NOT NULL
        ) STRICT;
    )];
-}
+);
 crate::static_connection!(KEY_VALUE_STORE, KeyValueStore, []);
 pub trait Dismissable {
    const KEY: &'static str;
@ -101,19 +91,15 @@ mod tests {
    }
 }
-pub struct GlobalKeyValueStore(ThreadSafeConnection);
+define_connection!(pub static ref GLOBAL_KEY_VALUE_STORE: GlobalKeyValueStore<()> =
-
+    &[sql!(
 impl Domain for GlobalKeyValueStore {
    const NAME: &str = stringify!(GlobalKeyValueStore);
    const MIGRATIONS: &[&str] = &[sql!(
        CREATE TABLE IF NOT EXISTS kv_store(
            key TEXT PRIMARY KEY,
            value TEXT NOT NULL
        ) STRICT;
    )];
-}
+    global
-
+);
 crate::static_connection!(GLOBAL_KEY_VALUE_STORE, GlobalKeyValueStore, [], global);
 impl GlobalKeyValueStore {
    query! {
--- a/crates/diagnostics/Cargo.toml
+++ b/crates/diagnostics/Cargo.toml
@ -18,6 +18,7 @@ collections.workspace = true
 component.workspace = true
 ctor.workspace = true
 editor.workspace = true
 futures.workspace = true
 gpui.workspace = true
 indoc.workspace = true
 language.workspace = true
--- a/crates/diagnostics/src/diagnostics.rs
+++ b/crates/diagnostics/src/diagnostics.rs
@ -13,6 +13,7 @@ use editor::{
    DEFAULT_MULTIBUFFER_CONTEXT, Editor, EditorEvent, ExcerptRange, MultiBuffer, PathKey,
    display_map::{BlockPlacement, BlockProperties, BlockStyle, CustomBlockId},
 };
 use futures::future::join_all;
 use gpui::{
    AnyElement, AnyView, App, AsyncApp, Context, Entity, EventEmitter, FocusHandle, Focusable,
    Global, InteractiveElement, IntoElement, ParentElement, Render, SharedString, Styled,
@ -23,6 +24,7 @@ use language::{
 };
 use project::{
    DiagnosticSummary, Project, ProjectPath,
    lsp_store::rust_analyzer_ext::{cancel_flycheck, run_flycheck},
    project_settings::{DiagnosticSeverity, ProjectSettings},
 };
 use settings::Settings;
@ -77,10 +79,17 @@ pub(crate) struct ProjectDiagnosticsEditor {
    paths_to_update: BTreeSet<ProjectPath>,
    include_warnings: bool,
    update_excerpts_task: Option<Task<Result<()>>>,
    cargo_diagnostics_fetch: CargoDiagnosticsFetchState,
    diagnostic_summary_update: Task<()>,
    _subscription: Subscription,
 }
 struct CargoDiagnosticsFetchState {
    fetch_task: Option<Task<()>>,
    cancel_task: Option<Task<()>>,
    diagnostic_sources: Arc<Vec<ProjectPath>>,
 }
 impl EventEmitter<EditorEvent> for ProjectDiagnosticsEditor {}
 const DIAGNOSTICS_UPDATE_DELAY: Duration = Duration::from_millis(50);
@ -251,7 +260,11 @@ impl ProjectDiagnosticsEditor {
                )
            });
            this.diagnostics.clear();
-            this.update_all_excerpts(window, cx);
+            this.update_all_diagnostics(false, window, cx);
        })
        .detach();
        cx.observe_release(&cx.entity(), |editor, _, cx| {
            editor.stop_cargo_diagnostics_fetch(cx);
        })
        .detach();
@ -268,10 +281,15 @@ impl ProjectDiagnosticsEditor {
            editor,
            paths_to_update: Default::default(),
            update_excerpts_task: None,
            cargo_diagnostics_fetch: CargoDiagnosticsFetchState {
                fetch_task: None,
                cancel_task: None,
                diagnostic_sources: Arc::new(Vec::new()),
            },
            diagnostic_summary_update: Task::ready(()),
            _subscription: project_event_subscription,
        };
-        this.update_all_excerpts(window, cx);
+        this.update_all_diagnostics(true, window, cx);
        this
    }
@ -355,10 +373,20 @@ impl ProjectDiagnosticsEditor {
        window: &mut Window,
        cx: &mut Context<Self>,
    ) {
-        if self.update_excerpts_task.is_some() {
+        let fetch_cargo_diagnostics = ProjectSettings::get_global(cx)
            .diagnostics
            .fetch_cargo_diagnostics();
        if fetch_cargo_diagnostics {
            if self.cargo_diagnostics_fetch.fetch_task.is_some() {
                self.stop_cargo_diagnostics_fetch(cx);
            } else {
                self.update_all_diagnostics(false, window, cx);
            }
        } else if self.update_excerpts_task.is_some() {
            self.update_excerpts_task = None;
        } else {
-            self.update_all_excerpts(window, cx);
+            self.update_all_diagnostics(false, window, cx);
        }
        cx.notify();
    }
@ -376,6 +404,73 @@ impl ProjectDiagnosticsEditor {
        }
    }
    fn update_all_diagnostics(
        &mut self,
        first_launch: bool,
        window: &mut Window,
        cx: &mut Context<Self>,
    ) {
        let cargo_diagnostics_sources = self.cargo_diagnostics_sources(cx);
        if cargo_diagnostics_sources.is_empty() {
            self.update_all_excerpts(window, cx);
        } else if first_launch && !self.summary.is_empty() {
            self.update_all_excerpts(window, cx);
        } else {
            self.fetch_cargo_diagnostics(Arc::new(cargo_diagnostics_sources), cx);
        }
    }
    fn fetch_cargo_diagnostics(
        &mut self,
        diagnostics_sources: Arc<Vec<ProjectPath>>,
        cx: &mut Context<Self>,
    ) {
        let project = self.project.clone();
        self.cargo_diagnostics_fetch.cancel_task = None;
        self.cargo_diagnostics_fetch.fetch_task = None;
        self.cargo_diagnostics_fetch.diagnostic_sources = diagnostics_sources.clone();
        if self.cargo_diagnostics_fetch.diagnostic_sources.is_empty() {
            return;
        }
        self.cargo_diagnostics_fetch.fetch_task = Some(cx.spawn(async move |editor, cx| {
            let mut fetch_tasks = Vec::new();
            for buffer_path in diagnostics_sources.iter().cloned() {
                if cx
                    .update(|cx| {
                        fetch_tasks.push(run_flycheck(project.clone(), buffer_path, cx));
                    })
                    .is_err()
                {
                    break;
                }
            }
            let _ = join_all(fetch_tasks).await;
            editor
                .update(cx, |editor, _| {
                    editor.cargo_diagnostics_fetch.fetch_task = None;
                })
                .ok();
        }));
    }
    fn stop_cargo_diagnostics_fetch(&mut self, cx: &mut App) {
        self.cargo_diagnostics_fetch.fetch_task = None;
        let mut cancel_gasks = Vec::new();
        for buffer_path in std::mem::take(&mut self.cargo_diagnostics_fetch.diagnostic_sources)
            .iter()
            .cloned()
        {
            cancel_gasks.push(cancel_flycheck(self.project.clone(), buffer_path, cx));
        }
        self.cargo_diagnostics_fetch.cancel_task = Some(cx.background_spawn(async move {
            let _ = join_all(cancel_gasks).await;
            log::info!("Finished fetching cargo diagnostics");
        }));
    }
    /// Enqueue an update of all excerpts. Updates all paths that either
    /// currently have diagnostics or are currently present in this view.
    fn update_all_excerpts(&mut self, window: &mut Window, cx: &mut Context<Self>) {
@ -600,6 +695,30 @@ impl ProjectDiagnosticsEditor {
            })
        })
    }
    pub fn cargo_diagnostics_sources(&self, cx: &App) -> Vec<ProjectPath> {
        let fetch_cargo_diagnostics = ProjectSettings::get_global(cx)
            .diagnostics
            .fetch_cargo_diagnostics();
        if !fetch_cargo_diagnostics {
            return Vec::new();
        }
        self.project
            .read(cx)
            .worktrees(cx)
            .filter_map(|worktree| {
                let _cargo_toml_entry = worktree.read(cx).entry_for_path("Cargo.toml")?;
                let rust_file_entry = worktree.read(cx).entries(false, 0).find(|entry| {
                    entry
                        .path
                        .extension()
                        .and_then(|extension| extension.to_str())
                        == Some("rs")
                })?;
                self.project.read(cx).path_for_entry(rust_file_entry.id, cx)
            })
            .collect()
    }
 }
 impl Focusable for ProjectDiagnosticsEditor {
--- a/crates/diagnostics/src/toolbar_controls.rs
+++ b/crates/diagnostics/src/toolbar_controls.rs
@ -1,3 +1,5 @@
 use std::sync::Arc;
 use crate::{ProjectDiagnosticsEditor, ToggleDiagnosticsRefresh};
 use gpui::{Context, Entity, EventEmitter, ParentElement, Render, WeakEntity, Window};
 use ui::prelude::*;
@ -13,18 +15,26 @@ impl Render for ToolbarControls {
        let mut include_warnings = false;
        let mut has_stale_excerpts = false;
        let mut is_updating = false;
        let cargo_diagnostics_sources = Arc::new(self.diagnostics().map_or(Vec::new(), |editor| {
            editor.read(cx).cargo_diagnostics_sources(cx)
        }));
        let fetch_cargo_diagnostics = !cargo_diagnostics_sources.is_empty();
        if let Some(editor) = self.diagnostics() {
            let diagnostics = editor.read(cx);
            include_warnings = diagnostics.include_warnings;
            has_stale_excerpts = !diagnostics.paths_to_update.is_empty();
-            is_updating = diagnostics.update_excerpts_task.is_some()
+            is_updating = if fetch_cargo_diagnostics {
-                || diagnostics
+                diagnostics.cargo_diagnostics_fetch.fetch_task.is_some()
-                    .project
+            } else {
-                    .read(cx)
+                diagnostics.update_excerpts_task.is_some()
-                    .language_servers_running_disk_based_diagnostics(cx)
+                    || diagnostics
-                    .next()
+                        .project
-                    .is_some();
+                        .read(cx)
                        .language_servers_running_disk_based_diagnostics(cx)
                        .next()
                        .is_some()
            };
        }
        let tooltip = if include_warnings {
@ -54,6 +64,7 @@ impl Render for ToolbarControls {
                            .on_click(cx.listener(move |toolbar_controls, _, _, cx| {
                                if let Some(diagnostics) = toolbar_controls.diagnostics() {
                                    diagnostics.update(cx, |diagnostics, cx| {
                                        diagnostics.stop_cargo_diagnostics_fetch(cx);
                                        diagnostics.update_excerpts_task = None;
                                        cx.notify();
                                    });
@ -65,7 +76,7 @@ impl Render for ToolbarControls {
                        IconButton::new("refresh-diagnostics", IconName::ArrowCircle)
                            .icon_color(Color::Info)
                            .shape(IconButtonShape::Square)
-                            .disabled(!has_stale_excerpts)
+                            .disabled(!has_stale_excerpts && !fetch_cargo_diagnostics)
                            .tooltip(Tooltip::for_action_title(
                                "Refresh diagnostics",
                                &ToggleDiagnosticsRefresh,
@ -73,8 +84,17 @@ impl Render for ToolbarControls {
                            .on_click(cx.listener({
                                move |toolbar_controls, _, window, cx| {
                                    if let Some(diagnostics) = toolbar_controls.diagnostics() {
                                        let cargo_diagnostics_sources =
                                            Arc::clone(&cargo_diagnostics_sources);
                                        diagnostics.update(cx, move |diagnostics, cx| {
-                                            diagnostics.update_all_excerpts(window, cx);
+                                            if fetch_cargo_diagnostics {
                                                diagnostics.fetch_cargo_diagnostics(
                                                    cargo_diagnostics_sources,
                                                    cx,
                                                );
                                            } else {
                                                diagnostics.update_all_excerpts(window, cx);
                                            }
                                        });
                                    }
                                }
--- a/crates/docs_preprocessor/src/main.rs
+++ b/crates/docs_preprocessor/src/main.rs
@ -19,10 +19,6 @@ static KEYMAP_LINUX: LazyLock<KeymapFile> = LazyLock::new(|| {
    load_keymap("keymaps/default-linux.json").expect("Failed to load Linux keymap")
 });
 static KEYMAP_WINDOWS: LazyLock<KeymapFile> = LazyLock::new(|| {
    load_keymap("keymaps/default-windows.json").expect("Failed to load Windows keymap")
 });
 static ALL_ACTIONS: LazyLock<Vec<ActionDef>> = LazyLock::new(dump_all_gpui_actions);
 const FRONT_MATTER_COMMENT: &str = "<!-- ZED_META {} -->";
@ -220,7 +216,6 @@ fn find_binding(os: &str, action: &str) -> Option<String> {
    let keymap = match os {
        "macos" => &KEYMAP_MACOS,
        "linux" | "freebsd" => &KEYMAP_LINUX,
        "windows" => &KEYMAP_WINDOWS,
        _ => unreachable!("Not a valid OS: {}", os),
    };
--- a/crates/edit_prediction/src/edit_prediction.rs
+++ b/crates/edit_prediction/src/edit_prediction.rs
@ -89,6 +89,9 @@ pub trait EditPredictionProvider: 'static + Sized {
        debounce: bool,
        cx: &mut Context<Self>,
    );
    fn needs_terms_acceptance(&self, _cx: &App) -> bool {
        false
    }
    fn cycle(
        &mut self,
        buffer: Entity<Buffer>,
@ -121,6 +124,7 @@ pub trait EditPredictionProviderHandle {
    fn data_collection_state(&self, cx: &App) -> DataCollectionState;
    fn usage(&self, cx: &App) -> Option<EditPredictionUsage>;
    fn toggle_data_collection(&self, cx: &mut App);
    fn needs_terms_acceptance(&self, cx: &App) -> bool;
    fn is_refreshing(&self, cx: &App) -> bool;
    fn refresh(
        &self,
@ -192,6 +196,10 @@ where
        self.read(cx).is_enabled(buffer, cursor_position, cx)
    }
    fn needs_terms_acceptance(&self, cx: &App) -> bool {
        self.read(cx).needs_terms_acceptance(cx)
    }
    fn is_refreshing(&self, cx: &App) -> bool {
        self.read(cx).is_refreshing()
    }
--- a/crates/edit_prediction_button/src/edit_prediction_button.rs
+++ b/crates/edit_prediction_button/src/edit_prediction_button.rs
@ -242,9 +242,13 @@ impl Render for EditPredictionButton {
                    IconName::ZedPredictDisabled
                };
-                if zeta::should_show_upsell_modal() {
+                if zeta::should_show_upsell_modal(&self.user_store, cx) {
                    let tooltip_meta = if self.user_store.read(cx).current_user().is_some() {
-                        "Choose a Plan"
+                        if self.user_store.read(cx).has_accepted_terms_of_service() {
                            "Choose a Plan"
                        } else {
                            "Accept the Terms of Service"
                        }
                    } else {
                        "Sign In"
                    };
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@ -253,6 +253,7 @@ pub type RenderDiffHunkControlsFn = Arc<
 enum ReportEditorEvent {
    Saved { auto_saved: bool },
    EditorOpened,
    ZetaTosClicked,
    Closed,
 }
@ -261,6 +262,7 @@ impl ReportEditorEvent {
        match self {
            Self::Saved { .. } => "Editor Saved",
            Self::EditorOpened => "Editor Opened",
            Self::ZetaTosClicked => "Edit Prediction Provider ToS Clicked",
            Self::Closed => "Editor Closed",
        }
    }
@ -2588,7 +2590,7 @@ impl Editor {
                || binding
                    .keystrokes()
                    .first()
-                    .is_some_and(|keystroke| keystroke.display_modifiers.modified())
+                    .is_some_and(|keystroke| keystroke.modifiers.modified())
        }))
    }
@ -7686,16 +7688,16 @@ impl Editor {
            .keystroke()
        {
            modifiers_held = modifiers_held
-                || (&accept_keystroke.display_modifiers == modifiers
+                || (&accept_keystroke.modifiers == modifiers
-                    && accept_keystroke.display_modifiers.modified());
+                    && accept_keystroke.modifiers.modified());
        };
        if let Some(accept_partial_keystroke) = self
            .accept_edit_prediction_keybind(true, window, cx)
            .keystroke()
        {
            modifiers_held = modifiers_held
-                || (&accept_partial_keystroke.display_modifiers == modifiers
+                || (&accept_partial_keystroke.modifiers == modifiers
-                    && accept_partial_keystroke.display_modifiers.modified());
+                    && accept_partial_keystroke.modifiers.modified());
        }
        if modifiers_held {
@ -9044,7 +9046,7 @@ impl Editor {
        let is_platform_style_mac = PlatformStyle::platform() == PlatformStyle::Mac;
-        let modifiers_color = if accept_keystroke.display_modifiers == window.modifiers() {
+        let modifiers_color = if accept_keystroke.modifiers == window.modifiers() {
            Color::Accent
        } else {
            Color::Muted
@ -9056,19 +9058,19 @@ impl Editor {
            .font(theme::ThemeSettings::get_global(cx).buffer_font.clone())
            .text_size(TextSize::XSmall.rems(cx))
            .child(h_flex().children(ui::render_modifiers(
-                &accept_keystroke.display_modifiers,
+                &accept_keystroke.modifiers,
                PlatformStyle::platform(),
                Some(modifiers_color),
                Some(IconSize::XSmall.rems().into()),
                true,
            )))
            .when(is_platform_style_mac, |parent| {
-                parent.child(accept_keystroke.display_key.clone())
+                parent.child(accept_keystroke.key.clone())
            })
            .when(!is_platform_style_mac, |parent| {
                parent.child(
                    Key::new(
-                        util::capitalize(&accept_keystroke.display_key),
+                        util::capitalize(&accept_keystroke.key),
                        Some(Color::Default),
                    )
                    .size(Some(IconSize::XSmall.rems().into())),
@ -9171,13 +9173,52 @@ impl Editor {
        max_width: Pixels,
        cursor_point: Point,
        style: &EditorStyle,
-        accept_keystroke: Option<&gpui::KeybindingKeystroke>,
+        accept_keystroke: Option<&gpui::Keystroke>,
        _window: &Window,
        cx: &mut Context<Editor>,
    ) -> Option<AnyElement> {
        let provider = self.edit_prediction_provider.as_ref()?;
        let provider_icon = Self::get_prediction_provider_icon_name(&self.edit_prediction_provider);
        if provider.provider.needs_terms_acceptance(cx) {
            return Some(
                h_flex()
                    .min_w(min_width)
                    .flex_1()
                    .px_2()
                    .py_1()
                    .gap_3()
                    .elevation_2(cx)
                    .hover(|style| style.bg(cx.theme().colors().element_hover))
                    .id("accept-terms")
                    .cursor_pointer()
                    .on_mouse_down(MouseButton::Left, |_, window, _| window.prevent_default())
                    .on_click(cx.listener(|this, _event, window, cx| {
                        cx.stop_propagation();
                        this.report_editor_event(ReportEditorEvent::ZetaTosClicked, None, cx);
                        window.dispatch_action(
                            zed_actions::OpenZedPredictOnboarding.boxed_clone(),
                            cx,
                        );
                    }))
                    .child(
                        h_flex()
                            .flex_1()
                            .gap_2()
                            .child(Icon::new(provider_icon))
                            .child(Label::new("Accept Terms of Service"))
                            .child(div().w_full())
                            .child(
                                Icon::new(IconName::ArrowUpRight)
                                    .color(Color::Muted)
                                    .size(IconSize::Small),
                            )
                            .into_any_element(),
                    )
                    .into_any(),
            );
        }
        let is_refreshing = provider.provider.is_refreshing(cx);
        fn pending_completion_container(icon: IconName) -> Div {
@ -9249,7 +9290,7 @@ impl Editor {
                                        accept_keystroke.as_ref(),
                                        |el, accept_keystroke| {
                                            el.child(h_flex().children(ui::render_modifiers(
-                                                &accept_keystroke.display_modifiers,
+                                                &accept_keystroke.modifiers,
                                                PlatformStyle::platform(),
                                                Some(Color::Default),
                                                Some(IconSize::XSmall.rems().into()),
@ -9319,7 +9360,7 @@ impl Editor {
                        .child(completion),
                )
                .when_some(accept_keystroke, |el, accept_keystroke| {
-                    if !accept_keystroke.display_modifiers.modified() {
+                    if !accept_keystroke.modifiers.modified() {
                        return el;
                    }
@ -9338,7 +9379,7 @@ impl Editor {
                                    .font(theme::ThemeSettings::get_global(cx).buffer_font.clone())
                                    .when(is_platform_style_mac, |parent| parent.gap_1())
                                    .child(h_flex().children(ui::render_modifiers(
-                                        &accept_keystroke.display_modifiers,
+                                        &accept_keystroke.modifiers,
                                        PlatformStyle::platform(),
                                        Some(if !has_completion {
                                            Color::Muted
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@ -57,9 +57,7 @@ use util::{
 use workspace::{
    CloseActiveItem, CloseAllItems, CloseOtherItems, MoveItemToPaneInDirection, NavigationEntry,
    OpenOptions, ViewId,
    invalid_buffer_view::InvalidBufferView,
    item::{FollowEvent, FollowableItem, Item, ItemHandle, SaveOptions},
    register_project_item,
 };
 #[gpui::test]
@ -22715,7 +22713,7 @@ async fn test_invisible_worktree_servers(cx: &mut TestAppContext) {
    .await
    .unwrap();
    pane.update_in(cx, |pane, window, cx| {
-        pane.navigate_backward(&Default::default(), window, cx);
+        pane.navigate_backward(window, cx);
    });
    cx.run_until_parked();
    pane.update(cx, |pane, cx| {
@ -24302,7 +24300,7 @@ async fn test_document_colors(cx: &mut TestAppContext) {
    workspace
        .update(cx, |workspace, window, cx| {
            workspace.active_pane().update(cx, |pane, cx| {
-                pane.navigate_backward(&Default::default(), window, cx);
+                pane.navigate_backward(window, cx);
            })
        })
        .unwrap();
@ -24350,41 +24348,6 @@ async fn test_newline_replacement_in_single_line(cx: &mut TestAppContext) {
    });
 }
 #[gpui::test]
 async fn test_non_utf_8_opens(cx: &mut TestAppContext) {
    init_test(cx, |_| {});
    cx.update(|cx| {
        register_project_item::<Editor>(cx);
    });
    let fs = FakeFs::new(cx.executor());
    fs.insert_tree("/root1", json!({})).await;
    fs.insert_file("/root1/one.pdf", vec![0xff, 0xfe, 0xfd])
        .await;
    let project = Project::test(fs, ["/root1".as_ref()], cx).await;
    let (workspace, cx) =
        cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
    let worktree_id = project.update(cx, |project, cx| {
        project.worktrees(cx).next().unwrap().read(cx).id()
    });
    let handle = workspace
        .update_in(cx, |workspace, window, cx| {
            let project_path = (worktree_id, "one.pdf");
            workspace.open_path(project_path, None, true, window, cx)
        })
        .await
        .unwrap();
    assert_eq!(
        handle.to_any().entity_type(),
        TypeId::of::<InvalidBufferView>()
    );
 }
 #[track_caller]
 fn extract_color_inlays(editor: &Editor, cx: &App) -> Vec<Rgba> {
    editor
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@ -43,10 +43,10 @@ use gpui::{
    Bounds, ClickEvent, ClipboardItem, ContentMask, Context, Corner, Corners, CursorStyle,
    DispatchPhase, Edges, Element, ElementInputHandler, Entity, Focusable as _, FontId,
    GlobalElementId, Hitbox, HitboxBehavior, Hsla, InteractiveElement, IntoElement, IsZero,
-    KeybindingKeystroke, Length, ModifiersChangedEvent, MouseButton, MouseClickEvent,
+    Keystroke, Length, ModifiersChangedEvent, MouseButton, MouseClickEvent, MouseDownEvent,
-    MouseDownEvent, MouseMoveEvent, MouseUpEvent, PaintQuad, ParentElement, Pixels, ScrollDelta,
+    MouseMoveEvent, MouseUpEvent, PaintQuad, ParentElement, Pixels, ScrollDelta, ScrollHandle,
-    ScrollHandle, ScrollWheelEvent, ShapedLine, SharedString, Size, StatefulInteractiveElement,
+    ScrollWheelEvent, ShapedLine, SharedString, Size, StatefulInteractiveElement, Style, Styled,
-    Style, Styled, TextRun, TextStyleRefinement, WeakEntity, Window, anchored, deferred, div, fill,
+    TextRun, TextStyleRefinement, WeakEntity, Window, anchored, deferred, div, fill,
    linear_color_stop, linear_gradient, outline, point, px, quad, relative, size, solid_background,
    transparent_black,
 };
@ -74,7 +74,6 @@ use std::{
    fmt::{self, Write},
    iter, mem,
    ops::{Deref, Range},
    path::{self, Path},
    rc::Rc,
    sync::Arc,
    time::{Duration, Instant},
@ -90,8 +89,8 @@ use unicode_segmentation::UnicodeSegmentation;
 use util::post_inc;
 use util::{RangeExt, ResultExt, debug_panic};
 use workspace::{
-    CollaboratorId, ItemSettings, OpenInTerminal, OpenTerminal, RevealInProjectPanel, Workspace,
+    CollaboratorId, OpenInTerminal, OpenTerminal, RevealInProjectPanel, Workspace, item::Item,
-    item::Item, notifications::NotifyTaskExt,
+    notifications::NotifyTaskExt,
 };
 /// Determines what kinds of highlights should be applied to a lines background.
@ -3603,187 +3602,171 @@ impl EditorElement {
        let focus_handle = editor.focus_handle(cx);
        let colors = cx.theme().colors();
-        let header = div()
+        let header =
-            .p_1()
+            div()
-            .w_full()
+                .p_1()
-            .h(FILE_HEADER_HEIGHT as f32 * window.line_height())
+                .w_full()
-            .child(
+                .h(FILE_HEADER_HEIGHT as f32 * window.line_height())
-                h_flex()
+                .child(
-                    .size_full()
+                    h_flex()
-                    .gap_2()
+                        .size_full()
-                    .flex_basis(Length::Definite(DefiniteLength::Fraction(0.667)))
+                        .gap_2()
-                    .pl_0p5()
+                        .flex_basis(Length::Definite(DefiniteLength::Fraction(0.667)))
-                    .pr_5()
+                        .pl_0p5()
-                    .rounded_sm()
+                        .pr_5()
-                    .when(is_sticky, |el| el.shadow_md())
+                        .rounded_sm()
-                    .border_1()
+                        .when(is_sticky, |el| el.shadow_md())
-                    .map(|div| {
+                        .border_1()
-                        let border_color = if is_selected
+                        .map(|div| {
-                            && is_folded
+                            let border_color = if is_selected
-                            && focus_handle.contains_focused(window, cx)
+                                && is_folded
-                        {
+                                && focus_handle.contains_focused(window, cx)
-                            colors.border_focused
+                            {
-                        } else {
+                                colors.border_focused
-                            colors.border
+                            } else {
-                        };
+                                colors.border
-                        div.border_color(border_color)
+                            };
-                    })
+                            div.border_color(border_color)
-                    .bg(colors.editor_subheader_background)
+                        })
-                    .hover(|style| style.bg(colors.element_hover))
+                        .bg(colors.editor_subheader_background)
-                    .map(|header| {
+                        .hover(|style| style.bg(colors.element_hover))
-                        let editor = self.editor.clone();
+                        .map(|header| {
-                        let buffer_id = for_excerpt.buffer_id;
+                            let editor = self.editor.clone();
-                        let toggle_chevron_icon =
+                            let buffer_id = for_excerpt.buffer_id;
-                            FileIcons::get_chevron_icon(!is_folded, cx).map(Icon::from_path);
+                            let toggle_chevron_icon =
-                        header.child(
+                                FileIcons::get_chevron_icon(!is_folded, cx).map(Icon::from_path);
-                            div()
+                            header.child(
-                                .hover(|style| style.bg(colors.element_selected))
+                                div()
-                                .rounded_xs()
+                                    .hover(|style| style.bg(colors.element_selected))
-                                .child(
+                                    .rounded_xs()
-                                    ButtonLike::new("toggle-buffer-fold")
+                                    .child(
-                                        .style(ui::ButtonStyle::Transparent)
+                                        ButtonLike::new("toggle-buffer-fold")
-                                        .height(px(28.).into())
+                                            .style(ui::ButtonStyle::Transparent)
-                                        .width(px(28.))
+                                            .height(px(28.).into())
-                                        .children(toggle_chevron_icon)
+                                            .width(px(28.))
-                                        .tooltip({
+                                            .children(toggle_chevron_icon)
-                                            let focus_handle = focus_handle.clone();
+                                            .tooltip({
-                                            move |window, cx| {
+                                                let focus_handle = focus_handle.clone();
-                                                Tooltip::with_meta_in(
+                                                move |window, cx| {
-                                                    "Toggle Excerpt Fold",
+                                                    Tooltip::with_meta_in(
-                                                    Some(&ToggleFold),
+                                                        "Toggle Excerpt Fold",
-                                                    "Alt+click to toggle all",
+                                                        Some(&ToggleFold),
-                                                    &focus_handle,
+                                                        "Alt+click to toggle all",
-                                                    window,
+                                                        &focus_handle,
                                                    cx,
                                                )
                                            }
                                        })
                                        .on_click(move |event, window, cx| {
                                            if event.modifiers().alt {
                                                // Alt+click toggles all buffers
                                                editor.update(cx, |editor, cx| {
                                                    editor.toggle_fold_all(
                                                        &ToggleFoldAll,
                                                        window,
                                                        cx,
-                                                    );
+                                                    )
-                                                });
+                                                }
-                                            } else {
+                                            })
-                                                // Regular click toggles single buffer
+                                            .on_click(move |event, window, cx| {
-                                                if is_folded {
+                                                if event.modifiers().alt {
                                                    // Alt+click toggles all buffers
                                                    editor.update(cx, |editor, cx| {
-                                                        editor.unfold_buffer(buffer_id, cx);
+                                                        editor.toggle_fold_all(
                                                            &ToggleFoldAll,
                                                            window,
                                                            cx,
                                                        );
                                                    });
                                                } else {
-                                                    editor.update(cx, |editor, cx| {
+                                                    // Regular click toggles single buffer
-                                                        editor.fold_buffer(buffer_id, cx);
+                                                    if is_folded {
-                                                    });
+                                                        editor.update(cx, |editor, cx| {
-                                                }
+                                                            editor.unfold_buffer(buffer_id, cx);
-                                            }
+                                                        });
                                        }),
                                ),
                        )
                    })
                    .children(
                        editor
                            .addons
                            .values()
                            .filter_map(|addon| {
                                addon.render_buffer_header_controls(for_excerpt, window, cx)
                            })
                            .take(1),
                    )
                    .child(
                        h_flex()
                            .size(Pixels(12.0))
                            .justify_center()
                            .children(indicator),
                    )
                    .child(
                        h_flex()
                            .cursor_pointer()
                            .id("path header block")
                            .size_full()
                            .justify_between()
                            .overflow_hidden()
                            .child(
                                h_flex()
                                    .gap_2()
                                    .map(|path_header| {
                                        let filename = filename
                                            .map(SharedString::from)
                                            .unwrap_or_else(|| "untitled".into());
                                        path_header
                                            .when(ItemSettings::get_global(cx).file_icons, |el| {
                                                let path = path::Path::new(filename.as_str());
                                                let icon = FileIcons::get_icon(path, cx)
                                                    .unwrap_or_default();
                                                let icon =
                                                    Icon::from_path(icon).color(Color::Muted);
                                                el.child(icon)
                                            })
                                            .child(Label::new(filename).single_line().when_some(
                                                file_status,
                                                |el, status| {
                                                    el.color(if status.is_conflicted() {
                                                        Color::Conflict
                                                    } else if status.is_modified() {
                                                        Color::Modified
                                                    } else if status.is_deleted() {
                                                        Color::Disabled
                                                    } else {
-                                                        Color::Created
+                                                        editor.update(cx, |editor, cx| {
-                                                    })
+                                                            editor.fold_buffer(buffer_id, cx);
-                                                    .when(status.is_deleted(), |el| {
+                                                        });
-                                                        el.strikethrough()
+                                                    }
-                                                    })
+                                                }
                                            }),
                                    ),
                            )
                        })
                        .children(
                            editor
                                .addons
                                .values()
                                .filter_map(|addon| {
                                    addon.render_buffer_header_controls(for_excerpt, window, cx)
                                })
                                .take(1),
                        )
                        .children(indicator)
                        .child(
                            h_flex()
                                .cursor_pointer()
                                .id("path header block")
                                .size_full()
                                .justify_between()
                                .overflow_hidden()
                                .child(
                                    h_flex()
                                        .gap_2()
                                        .child(
                                            Label::new(
                                                filename
                                                    .map(SharedString::from)
                                                    .unwrap_or_else(|| "untitled".into()),
                                            )
                                            .single_line()
                                            .when_some(file_status, |el, status| {
                                                el.color(if status.is_conflicted() {
                                                    Color::Conflict
                                                } else if status.is_modified() {
                                                    Color::Modified
                                                } else if status.is_deleted() {
                                                    Color::Disabled
                                                } else {
                                                    Color::Created
                                                })
                                                .when(status.is_deleted(), |el| el.strikethrough())
                                            }),
                                        )
                                        .when_some(parent_path, |then, path| {
                                            then.child(div().child(path).text_color(
                                                if file_status.is_some_and(FileStatus::is_deleted) {
                                                    colors.text_disabled
                                                } else {
                                                    colors.text_muted
                                                },
                                            ))
-                                    })
+                                        }),
-                                    .when_some(parent_path, |then, path| {
+                                )
-                                        then.child(div().child(path).text_color(
+                                .when(
-                                            if file_status.is_some_and(FileStatus::is_deleted) {
+                                    can_open_excerpts && is_selected && relative_path.is_some(),
-                                                colors.text_disabled
+                                    |el| {
-                                            } else {
+                                        el.child(
-                                                colors.text_muted
+                                            h_flex()
-                                            },
+                                                .id("jump-to-file-button")
-                                        ))
+                                                .gap_2p5()
-                                    }),
+                                                .child(Label::new("Jump To File"))
-                            )
+                                                .children(
-                            .when(
+                                                    KeyBinding::for_action_in(
-                                can_open_excerpts && is_selected && relative_path.is_some(),
+                                                        &OpenExcerpts,
-                                |el| {
+                                                        &focus_handle,
-                                    el.child(
+                                                        window,
-                                        h_flex()
+                                                        cx,
-                                            .id("jump-to-file-button")
+                                                    )
-                                            .gap_2p5()
+                                                    .map(|binding| binding.into_any_element()),
-                                            .child(Label::new("Jump To File"))
+                                                ),
-                                            .children(
+                                        )
-                                                KeyBinding::for_action_in(
+                                    },
-                                                    &OpenExcerpts,
+                                )
-                                                    &focus_handle,
+                                .on_mouse_down(MouseButton::Left, |_, _, cx| cx.stop_propagation())
-                                                    window,
+                                .on_click(window.listener_for(&self.editor, {
-                                                    cx,
+                                    move |editor, e: &ClickEvent, window, cx| {
-                                                )
+                                        editor.open_excerpts_common(
-                                                .map(|binding| binding.into_any_element()),
+                                            Some(jump_data.clone()),
-                                            ),
+                                            e.modifiers().secondary(),
-                                    )
+                                            window,
-                                },
+                                            cx,
-                            )
+                                        );
-                            .on_mouse_down(MouseButton::Left, |_, _, cx| cx.stop_propagation())
+                                    }
-                            .on_click(window.listener_for(&self.editor, {
+                                })),
-                                move |editor, e: &ClickEvent, window, cx| {
+                        ),
-                                    editor.open_excerpts_common(
+                );
                                        Some(jump_data.clone()),
                                        e.modifiers().secondary(),
                                        window,
                                        cx,
                                    );
                                }
                            })),
                    ),
            );
        let file = for_excerpt.buffer.file().cloned();
        let editor = self.editor.clone();
@ -3799,31 +3782,25 @@ impl EditorElement {
                        && let Some(worktree) =
                            project.read(cx).worktree_for_id(file.worktree_id(cx), cx)
                    {
                        let worktree = worktree.read(cx);
                        let relative_path = file.path();
-                        let entry_for_path = worktree.entry_for_path(relative_path);
+                        let entry_for_path = worktree.read(cx).entry_for_path(relative_path);
-                        let abs_path = entry_for_path.map(|e| {
+                        let abs_path = entry_for_path.and_then(|e| e.canonical_path.as_deref());
-                            e.canonical_path.as_deref().map_or_else(
+                        let has_relative_path =
-                                || worktree.abs_path().join(relative_path),
+                            worktree.read(cx).root_entry().is_some_and(Entry::is_dir);
                                Path::to_path_buf,
                            )
                        });
                        let has_relative_path = worktree.root_entry().is_some_and(Entry::is_dir);
-                        let parent_abs_path = abs_path
+                        let parent_abs_path =
-                            .as_ref()
+                            abs_path.and_then(|abs_path| Some(abs_path.parent()?.to_path_buf()));
                            .and_then(|abs_path| Some(abs_path.parent()?.to_path_buf()));
                        let relative_path = has_relative_path
                            .then_some(relative_path)
                            .map(ToOwned::to_owned);
                        let visible_in_project_panel =
-                            relative_path.is_some() && worktree.is_visible();
+                            relative_path.is_some() && worktree.read(cx).is_visible();
                        let reveal_in_project_panel = entry_for_path
                            .filter(|_| visible_in_project_panel)
                            .map(|entry| entry.id);
                        menu = menu
-                            .when_some(abs_path, |menu, abs_path| {
+                            .when_some(abs_path.map(ToOwned::to_owned), |menu, abs_path| {
                                menu.entry(
                                    "Copy Path",
                                    Some(Box::new(zed_actions::workspace::CopyPath)),
@ -7150,7 +7127,7 @@ fn header_jump_data(
 pub struct AcceptEditPredictionBinding(pub(crate) Option<gpui::KeyBinding>);
 impl AcceptEditPredictionBinding {
-    pub fn keystroke(&self) -> Option<&KeybindingKeystroke> {
+    pub fn keystroke(&self) -> Option<&Keystroke> {
        if let Some(binding) = self.0.as_ref() {
            match &binding.keystrokes() {
                [keystroke, ..] => Some(keystroke),
--- a/crates/editor/src/items.rs
+++ b/crates/editor/src/items.rs
@ -42,7 +42,6 @@ use ui::{IconDecorationKind, prelude::*};
 use util::{ResultExt, TryFutureExt, paths::PathExt};
 use workspace::{
    CollaboratorId, ItemId, ItemNavHistory, ToolbarItemLocation, ViewId, Workspace, WorkspaceId,
    invalid_buffer_view::InvalidBufferView,
    item::{FollowableItem, Item, ItemEvent, ProjectItem, SaveOptions},
    searchable::{Direction, SearchEvent, SearchableItem, SearchableItemHandle},
 };
@ -1402,16 +1401,6 @@ impl ProjectItem for Editor {
        editor
    }
    fn for_broken_project_item(
        abs_path: &Path,
        is_local: bool,
        e: &anyhow::Error,
        window: &mut Window,
        cx: &mut App,
    ) -> Option<InvalidBufferView> {
        Some(InvalidBufferView::new(abs_path, is_local, e, window, cx))
    }
 }
 fn clip_ranges<'a>(
--- a/crates/editor/src/persistence.rs
+++ b/crates/editor/src/persistence.rs
@ -1,17 +1,13 @@
 use anyhow::Result;
-use db::{
+use db::sqlez::bindable::{Bind, Column, StaticColumnCount};
-    query,
+use db::sqlez::statement::Statement;
    sqlez::{
        bindable::{Bind, Column, StaticColumnCount},
        domain::Domain,
        statement::Statement,
    },
    sqlez_macros::sql,
 };
 use fs::MTime;
 use itertools::Itertools as _;
 use std::path::PathBuf;
 use db::sqlez_macros::sql;
 use db::{define_connection, query};
 use workspace::{ItemId, WorkspaceDb, WorkspaceId};
 #[derive(Clone, Debug, PartialEq, Default)]
@ -87,11 +83,7 @@ impl Column for SerializedEditor {
    }
 }
-pub struct EditorDb(db::sqlez::thread_safe_connection::ThreadSafeConnection);
+define_connection!(
 impl Domain for EditorDb {
    const NAME: &str = stringify!(EditorDb);
    // Current schema shape using pseudo-rust syntax:
    // editors(
    //   item_id: usize,
@ -121,8 +113,7 @@ impl Domain for EditorDb {
    //   start: usize,
    //   end: usize,
    // )
-
+    pub static ref DB: EditorDb<WorkspaceDb> = &[
    const MIGRATIONS: &[&str] = &[
        sql! (
            CREATE TABLE editors(
                item_id INTEGER NOT NULL,
@ -198,9 +189,7 @@ impl Domain for EditorDb {
            ) STRICT;
        ),
    ];
-}
+);
 db::static_connection!(DB, EditorDb, [WorkspaceDb]);
 // https://www.sqlite.org/limits.html
 // > <..> the maximum value of a host parameter number is SQLITE_MAX_VARIABLE_NUMBER,
--- a/crates/editor/src/rust_analyzer_ext.rs
+++ b/crates/editor/src/rust_analyzer_ext.rs
@ -26,17 +26,6 @@ fn is_rust_language(language: &Language) -> bool {
 }
 pub fn apply_related_actions(editor: &Entity<Editor>, window: &mut Window, cx: &mut App) {
    if editor.read(cx).project().is_some_and(|project| {
        project
            .read(cx)
            .language_server_statuses(cx)
            .any(|(_, status)| status.name == RUST_ANALYZER_NAME)
    }) {
        register_action(editor, window, cancel_flycheck_action);
        register_action(editor, window, run_flycheck_action);
        register_action(editor, window, clear_flycheck_action);
    }
    if editor
        .read(cx)
        .buffer()
@ -49,6 +38,9 @@ pub fn apply_related_actions(editor: &Entity<Editor>, window: &mut Window, cx: &
        register_action(editor, window, go_to_parent_module);
        register_action(editor, window, expand_macro_recursively);
        register_action(editor, window, open_docs);
        register_action(editor, window, cancel_flycheck_action);
        register_action(editor, window, run_flycheck_action);
        register_action(editor, window, clear_flycheck_action);
    }
 }
@ -317,7 +309,7 @@ fn cancel_flycheck_action(
    let Some(project) = &editor.project else {
        return;
    };
-    let buffer_id = editor
+    let Some(buffer_id) = editor
        .selections
        .disjoint_anchors()
        .iter()
@ -329,7 +321,10 @@ fn cancel_flycheck_action(
                .read(cx)
                .entry_id(cx)?;
            project.path_for_entry(entry_id, cx)
-        });
+        })
    else {
        return;
    };
    cancel_flycheck(project.clone(), buffer_id, cx).detach_and_log_err(cx);
 }
@ -342,7 +337,7 @@ fn run_flycheck_action(
    let Some(project) = &editor.project else {
        return;
    };
-    let buffer_id = editor
+    let Some(buffer_id) = editor
        .selections
        .disjoint_anchors()
        .iter()
@ -354,7 +349,10 @@ fn run_flycheck_action(
                .read(cx)
                .entry_id(cx)?;
            project.path_for_entry(entry_id, cx)
-        });
+        })
    else {
        return;
    };
    run_flycheck(project.clone(), buffer_id, cx).detach_and_log_err(cx);
 }
@ -367,7 +365,7 @@ fn clear_flycheck_action(
    let Some(project) = &editor.project else {
        return;
    };
-    let buffer_id = editor
+    let Some(buffer_id) = editor
        .selections
        .disjoint_anchors()
        .iter()
@ -379,6 +377,9 @@ fn clear_flycheck_action(
                .read(cx)
                .entry_id(cx)?;
            project.path_for_entry(entry_id, cx)
-        });
+        })
    else {
        return;
    };
    clear_flycheck(project.clone(), buffer_id, cx).detach_and_log_err(cx);
 }
--- a/crates/feature_flags/src/feature_flags.rs
+++ b/crates/feature_flags/src/feature_flags.rs
@ -98,10 +98,6 @@ impl FeatureFlag for GeminiAndNativeFeatureFlag {
    // integration too, and we'd like to turn Gemini/Native on in new builds
    // without enabling Claude Code in old builds.
    const NAME: &'static str = "gemini-and-native";
    fn enabled_for_all() -> bool {
        true
    }
 }
 pub struct ClaudeCodeFeatureFlag;
@ -205,7 +201,7 @@ impl FeatureFlagAppExt for App {
    fn has_flag<T: FeatureFlag>(&self) -> bool {
        self.try_global::<FeatureFlags>()
            .map(|flags| flags.has_flag::<T>())
-            .unwrap_or(T::enabled_for_all())
+            .unwrap_or(false)
    }
    fn is_staff(&self) -> bool {
--- a/crates/file_finder/src/file_finder.rs
+++ b/crates/file_finder/src/file_finder.rs
@ -1401,16 +1401,13 @@ impl PickerDelegate for FileFinderDelegate {
            #[cfg(windows)]
            let raw_query = raw_query.trim().to_owned().replace("/", "\\");
            #[cfg(not(windows))]
-            let raw_query = raw_query.trim();
+            let raw_query = raw_query.trim().to_owned();
-            let raw_query = raw_query.trim_end_matches(':').to_owned();
+            let file_query_end = if path_position.path.to_str().unwrap_or(&raw_query) == raw_query {
            let path = path_position.path.to_str();
            let path_trimmed = path.unwrap_or(&raw_query).trim_end_matches(':');
            let file_query_end = if path_trimmed == raw_query {
                None
            } else {
                // Safe to unwrap as we won't get here when the unwrap in if fails
-                Some(path.unwrap().len())
+                Some(path_position.path.to_str().unwrap().len())
            };
            let query = FileSearchQuery {
--- a/crates/file_finder/src/file_finder_tests.rs
+++ b/crates/file_finder/src/file_finder_tests.rs
@ -218,7 +218,6 @@ async fn test_matching_paths(cx: &mut TestAppContext) {
        " ndan ",
        " band ",
        "a bandana",
        "bandana:",
    ] {
        picker
            .update_in(cx, |picker, window, cx| {
@ -253,53 +252,6 @@ async fn test_matching_paths(cx: &mut TestAppContext) {
    }
 }
 #[gpui::test]
 async fn test_matching_paths_with_colon(cx: &mut TestAppContext) {
    let app_state = init_test(cx);
    app_state
        .fs
        .as_fake()
        .insert_tree(
            path!("/root"),
            json!({
                "a": {
                    "foo:bar.rs": "",
                    "foo.rs": "",
                }
            }),
        )
        .await;
    let project = Project::test(app_state.fs.clone(), [path!("/root").as_ref()], cx).await;
    let (picker, _, cx) = build_find_picker(project, cx);
    // 'foo:' matches both files
    cx.simulate_input("foo:");
    picker.update(cx, |picker, _| {
        assert_eq!(picker.delegate.matches.len(), 3);
        assert_match_at_position(picker, 0, "foo.rs");
        assert_match_at_position(picker, 1, "foo:bar.rs");
    });
    // 'foo:b' matches one of the files
    cx.simulate_input("b");
    picker.update(cx, |picker, _| {
        assert_eq!(picker.delegate.matches.len(), 2);
        assert_match_at_position(picker, 0, "foo:bar.rs");
    });
    cx.dispatch_action(editor::actions::Backspace);
    // 'foo:1' matches both files, specifying which row to jump to
    cx.simulate_input("1");
    picker.update(cx, |picker, _| {
        assert_eq!(picker.delegate.matches.len(), 3);
        assert_match_at_position(picker, 0, "foo.rs");
        assert_match_at_position(picker, 1, "foo:bar.rs");
    });
 }
 #[gpui::test]
 async fn test_unicode_paths(cx: &mut TestAppContext) {
    let app_state = init_test(cx);
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@ -4466,7 +4466,7 @@ fn current_language_model(cx: &Context<'_, GitPanel>) -> Option<Arc<dyn Language
    is_enabled
        .then(|| {
            let ConfiguredModel { provider, model } =
-                LanguageModelRegistry::read_global(cx).commit_message_model()?;
+                LanguageModelRegistry::read_global(cx).commit_message_model(cx)?;
            provider.is_authenticated(cx).then(|| model)
        })
--- a/crates/gpui/src/app.rs
+++ b/crates/gpui/src/app.rs
@ -37,10 +37,10 @@ use crate::{
    AssetSource, BackgroundExecutor, Bounds, ClipboardItem, CursorStyle, DispatchPhase, DisplayId,
    EventEmitter, FocusHandle, FocusMap, ForegroundExecutor, Global, KeyBinding, KeyContext,
    Keymap, Keystroke, LayoutId, Menu, MenuItem, OwnedMenu, PathPromptOptions, Pixels, Platform,
-    PlatformDisplay, PlatformKeyboardLayout, PlatformKeyboardMapper, Point, PromptBuilder,
+    PlatformDisplay, PlatformKeyboardLayout, Point, PromptBuilder, PromptButton, PromptHandle,
-    PromptButton, PromptHandle, PromptLevel, Render, RenderImage, RenderablePromptHandle,
+    PromptLevel, Render, RenderImage, RenderablePromptHandle, Reservation, ScreenCaptureSource,
-    Reservation, ScreenCaptureSource, SubscriberSet, Subscription, SvgRenderer, Task, TextSystem,
+    SubscriberSet, Subscription, SvgRenderer, Task, TextSystem, Window, WindowAppearance,
-    Window, WindowAppearance, WindowHandle, WindowId, WindowInvalidator,
+    WindowHandle, WindowId, WindowInvalidator,
    colors::{Colors, GlobalColors},
    current_platform, hash, init_app_menus,
 };
@ -263,7 +263,6 @@ pub struct App {
    pub(crate) focus_handles: Arc<FocusMap>,
    pub(crate) keymap: Rc<RefCell<Keymap>>,
    pub(crate) keyboard_layout: Box<dyn PlatformKeyboardLayout>,
    pub(crate) keyboard_mapper: Rc<dyn PlatformKeyboardMapper>,
    pub(crate) global_action_listeners:
        FxHashMap<TypeId, Vec<Rc<dyn Fn(&dyn Any, DispatchPhase, &mut Self)>>>,
    pending_effects: VecDeque<Effect>,
@ -313,7 +312,6 @@ impl App {
        let text_system = Arc::new(TextSystem::new(platform.text_system()));
        let entities = EntityMap::new();
        let keyboard_layout = platform.keyboard_layout();
        let keyboard_mapper = platform.keyboard_mapper();
        let app = Rc::new_cyclic(|this| AppCell {
            app: RefCell::new(App {
@ -339,7 +337,6 @@ impl App {
                focus_handles: Arc::new(RwLock::new(SlotMap::with_key())),
                keymap: Rc::new(RefCell::new(Keymap::default())),
                keyboard_layout,
                keyboard_mapper,
                global_action_listeners: FxHashMap::default(),
                pending_effects: VecDeque::new(),
                pending_notifications: FxHashSet::default(),
@ -379,7 +376,6 @@ impl App {
                if let Some(app) = app.upgrade() {
                    let cx = &mut app.borrow_mut();
                    cx.keyboard_layout = cx.platform.keyboard_layout();
                    cx.keyboard_mapper = cx.platform.keyboard_mapper();
                    cx.keyboard_layout_observers
                        .clone()
                        .retain(&(), move |callback| (callback)(cx));
@ -428,11 +424,6 @@ impl App {
        self.keyboard_layout.as_ref()
    }
    /// Get the current keyboard mapper.
    pub fn keyboard_mapper(&self) -> &Rc<dyn PlatformKeyboardMapper> {
        &self.keyboard_mapper
    }
    /// Invokes a handler when the current keyboard layout changes
    pub fn on_keyboard_layout_change<F>(&self, mut callback: F) -> Subscription
    where
--- a/crates/gpui/src/keymap.rs
+++ b/crates/gpui/src/keymap.rs
@ -4,7 +4,7 @@ mod context;
 pub use binding::*;
 pub use context::*;
-use crate::{Action, AsKeystroke, Keystroke, is_no_action};
+use crate::{Action, Keystroke, is_no_action};
 use collections::{HashMap, HashSet};
 use smallvec::SmallVec;
 use std::any::TypeId;
@ -141,7 +141,7 @@ impl Keymap {
    /// only.
    pub fn bindings_for_input(
        &self,
-        input: &[impl AsKeystroke],
+        input: &[Keystroke],
        context_stack: &[KeyContext],
    ) -> (SmallVec<[KeyBinding; 1]>, bool) {
        let mut matched_bindings = SmallVec::<[(usize, BindingIndex, &KeyBinding); 1]>::new();
@ -192,6 +192,7 @@ impl Keymap {
        (bindings, !pending.is_empty())
    }
    /// Check if the given binding is enabled, given a certain key context.
    /// Returns the deepest depth at which the binding matches, or None if it doesn't match.
    fn binding_enabled(&self, binding: &KeyBinding, contexts: &[KeyContext]) -> Option<usize> {
@ -638,7 +639,7 @@ mod tests {
        fn assert_bindings(keymap: &Keymap, action: &dyn Action, expected: &[&str]) {
            let actual = keymap
                .bindings_for_action(action)
-                .map(|binding| binding.keystrokes[0].inner.unparse())
+                .map(|binding| binding.keystrokes[0].unparse())
                .collect::<Vec<_>>();
            assert_eq!(actual, expected, "{:?}", action);
        }
--- a/Show more
+++ b/Show more
Author	SHA1	Message	Date
David Kleingeld	0a434c5cd4	fix workspace-hack	2025-08-26 15:10:14 +02:00
David Kleingeld	cef721465f	move apm (webrtc audio processor) to audio crate	2025-08-26 15:06:52 +02:00
David Kleingeld	5a4f284e45	adds error handling to audio input pipeline	2025-08-26 12:37:10 +02:00
David Kleingeld	efd9edb5ff	make process_buffer take bufsize const generic	2025-08-26 12:17:17 +02:00
David Kleingeld	9521f540fd	adds ProcessBuffer as rodio Source	2025-08-26 12:12:01 +02:00
David Kleingeld	3a5d02cb7d	in progress add buffer processor	2025-08-25 16:13:09 +02:00
David Kleingeld	d76c7e1ba8	add first draft of glossary	2025-08-25 13:00:46 +02:00
		`@ -1,2 +0,0 @@`
			`postgrest_llm: postgrest crates/collab/postgrest_llm.conf`
			`website: cd ../zed.dev; npm run dev -- --port=3000`
		`@ -1 +0,0 @@`
			<svg xmlns="http://www.w3.org/2000/svg" width="160" height="61" fill="none"><g clip-path="url(#a)"><path fill="#000" d="M130.75.385c5.428 0 10.297 2.81 13.011 7.511l14.214 24.618-.013-.005c2.599 4.504 2.707 9.932.28 14.513-2.618 4.944-7.862 8.015-13.679 8.015h-31.811c-.452 0-.873-.242-1.103-.637a1.268 1.268 0 0 1 0-1.274l3.919-6.78c.223-.394.65-.636 1.102-.636h28.288a5.622 5.622 0 0 0 4.925-2.849 5.615 5.615 0 0 0 0-5.69l-14.214-24.617a5.621 5.621 0 0 0-4.925-2.848 5.621 5.621 0 0 0-4.925 2.848l-14.214 24.618a6.267 6.267 0 0 0-.319.643.998.998 0 0 1-.069.14L101.724 54.4l-.823 1.313-2.529 4.39a1.27 1.27 0 0 1-1.103.636h-7.83c-.452 0-.873-.242-1.102-.637-.23-.394-.23-.879 0-1.274l2.188-3.791H66.803c-3.32 0-6.454-1.122-8.818-3.167a17.141 17.141 0 0 1-3.394-3.96 1.261 1.261 0 0 1-.091-.137L34.2 12.573a5.622 5.622 0 0 0-4.925-2.849 5.621 5.621 0 0 0-4.924 2.85L10.137 37.19a5.615 5.615 0 0 0 0 5.69 5.63 5.63 0 0 0 4.925 2.841h29.862a1.276 1.276 0 0 1 1.102 1.912l-3.912 6.778a1.27 1.27 0 0 1-1.102.638H14.495c-3.32 0-6.454-1.128-8.817-3.173-5.906-5.104-7.36-12.883-3.62-19.363L16.267 7.89C18.872 3.385 23.517.583 28.697.39c.184-.006.356-.006.534-.006 5.378 0 10.45 3.007 13.246 7.85l12.986 22.372L68.58 7.891C71.186 3.385 75.83.582 81.01.39c.185-.006.358-.006.536-.006 4.453 0 8.71 2.039 11.672 5.588.337.407.388.98.127 1.446l-3.765 6.6a1.268 1.268 0 0 1-2.205.006l-.847-1.465a5.623 5.623 0 0 0-4.926-2.848 5.622 5.622 0 0 0-4.924 2.848L62.464 37.18a5.614 5.614 0 0 0 0 5.689 5.628 5.628 0 0 0 4.925 2.842H95.91L117.76 7.87c2.714-4.683 7.575-7.486 12.99-7.486Z"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 .385h160v60.36H0z"/></clipPath></defs></svg>