zed 0.186.4

language_models: Improve subscription states in the Agent configuration view (#30252 )
This PR improves the subscription states in the Agent configuration view to the new billing system. Zed Free (legacy): <img width="638" alt="Screenshot 2025-05-08 at 8 42 59 AM" src="https://github.com/user-attachments/assets/7b62d4c1-2a9c-4c6a-aa8f-060730b6d7b3" /> Zed Free (new): <img width="640" alt="Screenshot 2025-05-08 at 8 43 56 AM" src="https://github.com/user-attachments/assets/8a48448e-813e-4633-955d-623d3e6d603c" /> Zed Pro trial: <img width="641" alt="Screenshot 2025-05-08 at 8 45 52 AM" src="https://github.com/user-attachments/assets/1ec7ee62-e954-48e7-8447-4584527307c9" /> Zed Pro: <img width="636" alt="Screenshot 2025-05-08 at 8 47 21 AM" src="https://github.com/user-attachments/assets/f934b2e3-0943-4b78-b8dc-0a31e731d8fb" /> Release Notes: - agent: Improved the subscription-related information in the configuration view.
2025-05-08 09:28:53 -04:00 · 2025-05-08 09:15:48 -04:00 · 2025-05-08 09:13:13 -04:00 · 2025-05-08 09:05:30 -04:00 · 2025-05-08 14:42:45 +02:00 · 2025-05-08 08:34:29 -04:00
252 changed files with 7893 additions and 9760 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -513,6 +513,7 @@ dependencies = [
 "settings",
 "smallvec",
 "smol",
+ "strum 0.27.1",
 "telemetry_events",
 "text",
 "theme",
@@ -676,7 +677,6 @@ dependencies = [
 "language_models",
 "linkme",
 "log",
- "markdown",
 "open",
 "paths",
 "portable-pty",
@@ -1270,9 +1270,9 @@ dependencies = [

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

 [[package]]
 name = "aws-lc-sys"
-version = "0.29.0"
+version = "0.28.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61b1d86e7705efe1be1b569bab41d4fa1e14e220b60a160f78de2db687add079"
+checksum = "bfa9b6986f250236c27e5a204062434a773a13243d2ffc2955f37bdba4c5c6a1"
 dependencies = [
 "bindgen 0.69.5",
 "cc",
@@ -2029,7 +2029,7 @@ dependencies = [
 [[package]]
 name = "blade-graphics"
 version = "0.6.0"
-source = "git+https://github.com/kvark/blade?rev=416375211bb0b5826b3584dccdb6a43369e499ad#416375211bb0b5826b3584dccdb6a43369e499ad"
+source = "git+https://github.com/kvark/blade?rev=b16f5c7bd873c7126f48c82c39e7ae64602ae74f#b16f5c7bd873c7126f48c82c39e7ae64602ae74f"
 dependencies = [
 "ash",
 "ash-window",
@@ -2048,7 +2048,6 @@ dependencies = [
 "naga",
 "objc2",
 "objc2-app-kit",
- "objc2-core-foundation",
 "objc2-foundation",
 "objc2-metal",
 "objc2-quartz-core",
@@ -2062,7 +2061,7 @@ dependencies = [
 [[package]]
 name = "blade-macros"
 version = "0.3.0"
-source = "git+https://github.com/kvark/blade?rev=416375211bb0b5826b3584dccdb6a43369e499ad#416375211bb0b5826b3584dccdb6a43369e499ad"
+source = "git+https://github.com/kvark/blade?rev=b16f5c7bd873c7126f48c82c39e7ae64602ae74f#b16f5c7bd873c7126f48c82c39e7ae64602ae74f"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -2072,7 +2071,7 @@ dependencies = [
 [[package]]
 name = "blade-util"
 version = "0.2.0"
-source = "git+https://github.com/kvark/blade?rev=416375211bb0b5826b3584dccdb6a43369e499ad#416375211bb0b5826b3584dccdb6a43369e499ad"
+source = "git+https://github.com/kvark/blade?rev=b16f5c7bd873c7126f48c82c39e7ae64602ae74f#b16f5c7bd873c7126f48c82c39e7ae64602ae74f"
 dependencies = [
 "blade-graphics",
 "bytemuck",
@@ -2119,9 +2118,9 @@ dependencies = [

 [[package]]
 name = "block2"
-version = "0.6.1"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "340d2f0bdb2a43c1d3cd40513185b2bd7def0aa1052f956455114bc98f82dcf2"
+checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f"
 dependencies = [
 "objc2",
 ]
@@ -3068,7 +3067,6 @@ dependencies = [
 "gpui",
 "http_client",
 "language",
- "log",
 "menu",
 "notifications",
 "picker",
@@ -3184,6 +3182,32 @@ dependencies = [
 "workspace-hack",
 ]

+[[package]]
+name = "component_preview"
+version = "0.1.0"
+dependencies = [
+ "agent",
+ "anyhow",
+ "assistant_tool",
+ "client",
+ "collections",
+ "component",
+ "db",
+ "futures 0.3.31",
+ "gpui",
+ "languages",
+ "log",
+ "notifications",
+ "project",
+ "prompt_store",
+ "serde",
+ "ui",
+ "ui_input",
+ "util",
+ "workspace",
+ "workspace-hack",
+]
+
 [[package]]
 name = "concurrent-queue"
 version = "2.5.0"
@@ -3508,9 +3532,9 @@ dependencies = [

 [[package]]
 name = "cosmic-text"
-version = "0.14.0"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e1ecbb5db9a4c2ee642df67bcfa8f044dd867dbbaa21bfab139cbc204ffbf67"
+checksum = "e418dd4f5128c3e93eab12246391c54a20c496811131f85754dc8152ee207892"
 dependencies = [
 "bitflags 2.9.0",
 "fontdb 0.16.2",
@@ -3983,6 +4007,7 @@ dependencies = [
 "http_client",
 "language",
 "log",
+ "lsp-types",
 "node_runtime",
 "parking_lot",
 "paths",
@@ -4018,6 +4043,7 @@ dependencies = [
 "futures 0.3.31",
 "gpui",
 "language",
+ "lsp-types",
 "paths",
 "serde",
 "serde_json",
@@ -4162,7 +4188,6 @@ dependencies = [
 "collections",
 "command_palette_hooks",
 "dap",
- "dap_adapters",
 "db",
 "debugger_tools",
 "editor",
@@ -4175,7 +4200,6 @@ dependencies = [
 "log",
 "menu",
 "parking_lot",
- "paths",
 "picker",
 "pretty_assertions",
 "project",
@@ -4433,16 +4457,6 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b"

-[[package]]
-name = "dispatch2"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89a09f22a6c6069a18470eb92d2298acf25463f14256d24778e1230d789a2aec"
-dependencies = [
- "bitflags 2.9.0",
- "objc2",
-]
-
 [[package]]
 name = "displaydoc"
 version = "0.2.5"
@@ -6333,7 +6347,6 @@ checksum = "459196ed295495a68f7d7fe1d84f6c4b7ff0e21fe3017b2f283c6fac3ad803c9"
 dependencies = [
 "cfg-if",
 "crunchy",
- "num-traits",
 ]

 [[package]]
@@ -7723,7 +7736,6 @@ dependencies = [
 "tree-sitter-html",
 "tree-sitter-json",
 "tree-sitter-md",
- "tree-sitter-python",
 "tree-sitter-ruby",
 "tree-sitter-rust",
 "tree-sitter-typescript",
@@ -7788,12 +7800,9 @@ version = "0.1.0"
 dependencies = [
 "collections",
 "feature_flags",
- "futures 0.3.31",
- "fuzzy",
 "gpui",
 "language_model",
 "log",
- "ordered-float 2.10.1",
 "picker",
 "proto",
 "ui",
@@ -8507,7 +8516,6 @@ version = "0.1.0"
 dependencies = [
 "anyhow",
 "assets",
- "base64 0.22.1",
 "env_logger 0.11.8",
 "gpui",
 "language",
@@ -8896,27 +8904,23 @@ checksum = "defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03"

 [[package]]
 name = "naga"
-version = "25.0.1"
+version = "23.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b977c445f26e49757f9aca3631c3b8b836942cb278d69a92e7b80d3b24da632"
+checksum = "364f94bc34f61332abebe8cad6f6cd82a5b65cff22c828d05d0968911462ca4f"
 dependencies = [
 "arrayvec",
 "bit-set 0.8.0",
 "bitflags 2.9.0",
- "cfg_aliases 0.2.1",
- "codespan-reporting 0.12.0",
- "half",
- "hashbrown 0.15.2",
+ "cfg_aliases 0.1.1",
+ "codespan-reporting 0.11.1",
 "hexf-parse",
 "indexmap",
 "log",
- "num-traits",
- "once_cell",
 "rustc-hash 1.1.0",
 "spirv",
- "strum 0.26.3",
- "thiserror 2.0.12",
- "unicode-ident",
+ "termcolor",
+ "thiserror 1.0.69",
+ "unicode-xid",
 ]

 [[package]]
@@ -9371,36 +9375,95 @@ dependencies = [
 ]

 [[package]]
-name = "objc2"
-version = "0.6.1"
+name = "objc-sys"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88c6597e14493ab2e44ce58f2fdecf095a51f12ca57bec060a11c57332520551"
+checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310"
+
+[[package]]
+name = "objc2"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804"
 dependencies = [
+ "objc-sys",
 "objc2-encode",
 ]

 [[package]]
 name = "objc2-app-kit"
-version = "0.3.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6f29f568bec459b0ddff777cec4fe3fd8666d82d5a40ebd0ff7e66134f89bcc"
+checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff"
 dependencies = [
 "bitflags 2.9.0",
+ "block2",
+ "libc",
 "objc2",
- "objc2-core-foundation",
+ "objc2-core-data",
+ "objc2-core-image",
 "objc2-foundation",
 "objc2-quartz-core",
 ]

 [[package]]
-name = "objc2-core-foundation"
-version = "0.3.1"
+name = "objc2-cloud-kit"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c10c2894a6fed806ade6027bcd50662746363a9589d3ec9d9bef30a4e4bc166"
+checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009"
 dependencies = [
 "bitflags 2.9.0",
- "dispatch2",
+ "block2",
 "objc2",
+ "objc2-core-location",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "objc2-contacts"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5ff520e9c33812fd374d8deecef01d4a840e7b41862d849513de77e44aa4889"
+dependencies = [
+ "block2",
+ "objc2",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "objc2-core-data"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef"
+dependencies = [
+ "bitflags 2.9.0",
+ "block2",
+ "objc2",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "objc2-core-image"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80"
+dependencies = [
+ "block2",
+ "objc2",
+ "objc2-foundation",
+ "objc2-metal",
+]
+
+[[package]]
+name = "objc2-core-location"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "000cfee34e683244f284252ee206a27953279d370e309649dc3ee317b37e5781"
+dependencies = [
+ "block2",
+ "objc2",
+ "objc2-contacts",
+ "objc2-foundation",
 ]

 [[package]]
@@ -9411,53 +9474,106 @@ checksum = "ef25abbcd74fb2609453eb695bd2f860d389e457f67dc17cafc8b8cbc89d0c33"

 [[package]]
 name = "objc2-foundation"
-version = "0.3.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "900831247d2fe1a09a683278e5384cfb8c80c79fe6b166f9d14bfdde0ea1b03c"
+checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8"
 dependencies = [
 "bitflags 2.9.0",
+ "block2",
+ "libc",
 "objc2",
- "objc2-core-foundation",
+]
+
+[[package]]
+name = "objc2-link-presentation"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1a1ae721c5e35be65f01a03b6d2ac13a54cb4fa70d8a5da293d7b0020261398"
+dependencies = [
+ "block2",
+ "objc2",
+ "objc2-app-kit",
+ "objc2-foundation",
 ]

 [[package]]
 name = "objc2-metal"
-version = "0.3.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f246c183239540aab1782457b35ab2040d4259175bd1d0c58e46ada7b47a874"
+checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6"
 dependencies = [
 "bitflags 2.9.0",
 "block2",
- "dispatch2",
 "objc2",
- "objc2-core-foundation",
 "objc2-foundation",
 ]

 [[package]]
 name = "objc2-quartz-core"
-version = "0.3.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90ffb6a0cd5f182dc964334388560b12a57f7b74b3e2dec5e2722aa2dfb2ccd5"
+checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a"
 dependencies = [
 "bitflags 2.9.0",
+ "block2",
 "objc2",
- "objc2-core-foundation",
 "objc2-foundation",
 "objc2-metal",
 ]

 [[package]]
-name = "objc2-ui-kit"
-version = "0.3.1"
+name = "objc2-symbols"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25b1312ad7bc8a0e92adae17aa10f90aae1fb618832f9b993b022b591027daed"
+checksum = "0a684efe3dec1b305badae1a28f6555f6ddd3bb2c2267896782858d5a78404dc"
+dependencies = [
+ "objc2",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "objc2-ui-kit"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f"
 dependencies = [
 "bitflags 2.9.0",
+ "block2",
 "objc2",
- "objc2-core-foundation",
+ "objc2-cloud-kit",
+ "objc2-core-data",
+ "objc2-core-image",
+ "objc2-core-location",
 "objc2-foundation",
+ "objc2-link-presentation",
 "objc2-quartz-core",
+ "objc2-symbols",
+ "objc2-uniform-type-identifiers",
+ "objc2-user-notifications",
+]
+
+[[package]]
+name = "objc2-uniform-type-identifiers"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44fa5f9748dbfe1ca6c0b79ad20725a11eca7c2218bceb4b005cb1be26273bfe"
+dependencies = [
+ "block2",
+ "objc2",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "objc2-user-notifications"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3"
+dependencies = [
+ "bitflags 2.9.0",
+ "block2",
+ "objc2",
+ "objc2-core-location",
+ "objc2-foundation",
 ]

 [[package]]
@@ -11836,8 +11952,6 @@ version = "0.1.0"
 dependencies = [
 "anyhow",
 "askpass",
- "assistant_tool",
- "assistant_tools",
 "async-watch",
 "backtrace",
 "cargo_toml",
@@ -11860,7 +11974,6 @@ dependencies = [
 "http_client",
 "language",
 "language_extension",
- "language_model",
 "languages",
 "libc",
 "log",
@@ -18035,7 +18148,6 @@ dependencies = [
 "base64ct",
 "bigdecimal",
 "bit-set 0.8.0",
- "bit-vec 0.8.0",
 "bitflags 2.9.0",
 "bstr",
 "bytemuck",
@@ -18047,7 +18159,6 @@ dependencies = [
 "clang-sys",
 "clap",
 "clap_builder",
- "codespan-reporting 0.12.0",
 "concurrent-queue",
 "core-foundation 0.9.4",
 "core-foundation-sys",
@@ -18076,7 +18187,6 @@ dependencies = [
 "getrandom 0.2.15",
 "getrandom 0.3.2",
 "gimli",
- "half",
 "handlebars 4.5.0",
 "hashbrown 0.14.5",
 "hashbrown 0.15.2",
@@ -18110,9 +18220,6 @@ dependencies = [
 "num-iter",
 "num-rational",
 "num-traits",
- "objc2",
- "objc2-foundation",
- "objc2-metal",
 "object",
 "once_cell",
 "percent-encoding",
@@ -18131,7 +18238,6 @@ dependencies = [
 "regex-syntax 0.8.5",
 "ring",
 "rust_decimal",
- "rustc-hash 1.1.0",
 "rustix 0.38.44",
 "rustix 1.0.5",
 "rustls 0.23.26",
@@ -18527,7 +18633,7 @@ dependencies = [

 [[package]]
 name = "zed"
-version = "0.187.0"
+version = "0.186.4"
 dependencies = [
 "activity_indicator",
 "agent",
@@ -18537,7 +18643,6 @@ dependencies = [
 "assets",
 "assistant_context_editor",
 "assistant_settings",
- "assistant_tool",
 "assistant_tools",
 "async-watch",
 "audio",
@@ -18554,7 +18659,7 @@ dependencies = [
 "collab_ui",
 "collections",
 "command_palette",
- "component",
+ "component_preview",
 "copilot",
 "dap",
 "dap_adapters",
@@ -18580,7 +18685,6 @@ dependencies = [
 "gpui_tokio",
 "http_client",
 "image_viewer",
- "indoc",
 "inline_completion_button",
 "install_cli",
 "journal",
@@ -18644,7 +18748,6 @@ dependencies = [
 "tree-sitter-md",
 "tree-sitter-rust",
 "ui",
- "ui_input",
 "ui_prompt",
 "url",
 "urlencoding",
@@ -18719,9 +18822,9 @@ dependencies = [

 [[package]]
 name = "zed_llm_client"
-version = "0.8.1"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16d993fc42f9ec43ab76fa46c6eb579a66e116bb08cd2bc9a67f3afcaa05d39d"
+checksum = "a23b2fd00776b0c55072f389654910ceb501eb0083d7f78905ab0e5cc86949ec"
 dependencies = [
 "anyhow",
 "serde",
@@ -18929,7 +19032,6 @@ dependencies = [
 "paths",
 "postage",
 "project",
- "proto",
 "regex",
 "release_channel",
 "reqwest_client",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -31,6 +31,7 @@ members = [
    "crates/command_palette",
    "crates/command_palette_hooks",
    "crates/component",
+    "crates/component_preview",
    "crates/context_server",
    "crates/copilot",
    "crates/credentials_provider",
@@ -237,6 +238,7 @@ collections = { path = "crates/collections" }
 command_palette = { path = "crates/command_palette" }
 command_palette_hooks = { path = "crates/command_palette_hooks" }
 component = { path = "crates/component" }
+component_preview = { path = "crates/component_preview" }
 context_server = { path = "crates/context_server" }
 copilot = { path = "crates/copilot" }
 credentials_provider = { path = "crates/credentials_provider" }
@@ -408,9 +410,9 @@ aws-smithy-runtime-api = { version = "1.7.4", features = ["http-1x", "client"] }
 aws-smithy-types = { version = "1.3.0", features = ["http-body-1-x"] }
 base64 = "0.22"
 bitflags = "2.6.0"
-blade-graphics = { git = "https://github.com/kvark/blade", rev = "416375211bb0b5826b3584dccdb6a43369e499ad" }
-blade-macros = { git = "https://github.com/kvark/blade", rev = "416375211bb0b5826b3584dccdb6a43369e499ad" }
-blade-util = { git = "https://github.com/kvark/blade", rev = "416375211bb0b5826b3584dccdb6a43369e499ad" }
+blade-graphics = { git = "https://github.com/kvark/blade", rev = "b16f5c7bd873c7126f48c82c39e7ae64602ae74f" }
+blade-macros = { git = "https://github.com/kvark/blade", rev = "b16f5c7bd873c7126f48c82c39e7ae64602ae74f" }
+blade-util = { git = "https://github.com/kvark/blade", rev = "b16f5c7bd873c7126f48c82c39e7ae64602ae74f" }
 blake3 = "1.5.3"
 bytes = "1.0"
 cargo_metadata = "0.19"
@@ -469,7 +471,7 @@ lsp-types = { git = "https://github.com/zed-industries/lsp-types", rev = "c9c189
 markup5ever_rcdom = "0.3.0"
 metal = "0.29"
 mlua = { version = "0.10", features = ["lua54", "vendored", "async", "send"] }
-naga = { version = "25.0", features = ["wgsl-in"] }
+naga = { version = "23.1.0", features = ["wgsl-in"] }
 nanoid = "0.4"
 nbformat = {  git = "https://github.com/ConradIrwin/runtimed", rev = "7130c804216b6914355d15d0b91ea91f6babd734" }
 nix = "0.29"
@@ -606,7 +608,7 @@ wasmtime-wasi = "29"
 which = "6.0.0"
 wit-component = "0.221"
 workspace-hack = "0.1.0"
-zed_llm_client = "0.8.1"
+zed_llm_client = "0.8.0"
 zstd = "0.11"

 [workspace.dependencies.async-stripe]
--- a/assets/icons/load_circle.svg
+++ b/assets/icons/load_circle.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-loader-circle-icon lucide-loader-circle"><path d="M21 12a9 9 0 1 1-6.219-8.56"/></svg>
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -217,6 +217,7 @@
    "context": "ContextEditor > Editor",
    "bindings": {
      "ctrl-enter": "assistant::Assist",
+      "ctrl-shift-enter": "assistant::Edit",
      "ctrl-s": "workspace::Save",
      "save": "workspace::Save",
      "ctrl->": "assistant::QuoteSelection",
@@ -934,7 +935,6 @@
      "ctrl-e": ["terminal::SendKeystroke", "ctrl-e"],
      "ctrl-o": ["terminal::SendKeystroke", "ctrl-o"],
      "ctrl-w": ["terminal::SendKeystroke", "ctrl-w"],
-      "ctrl-backspace": ["terminal::SendKeystroke", "ctrl-w"],
      "ctrl-shift-a": "editor::SelectAll",
      "find": "buffer_search::Deploy",
      "ctrl-shift-f": "buffer_search::Deploy",
@@ -952,10 +952,7 @@
      "shift-down": "terminal::ScrollLineDown",
      "shift-home": "terminal::ScrollToTop",
      "shift-end": "terminal::ScrollToBottom",
-      "ctrl-shift-space": "terminal::ToggleViMode",
-      "ctrl-shift-r": "terminal::RerunTask",
-      "ctrl-alt-r": "terminal::RerunTask",
-      "alt-t": "terminal::RerunTask"
+      "ctrl-shift-space": "terminal::ToggleViMode"
    }
  },
  {
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -263,6 +263,7 @@
    "use_key_equivalents": true,
    "bindings": {
      "cmd-enter": "assistant::Assist",
+      "cmd-shift-enter": "assistant::Edit",
      "cmd-s": "workspace::Save",
      "cmd->": "assistant::QuoteSelection",
      "cmd-<": "assistant::InsertIntoEditor",
@@ -1021,7 +1022,6 @@
      "escape": ["terminal::SendKeystroke", "escape"],
      "enter": ["terminal::SendKeystroke", "enter"],
      "ctrl-c": ["terminal::SendKeystroke", "ctrl-c"],
-      "ctrl-backspace": ["terminal::SendKeystroke", "ctrl-w"],
      "shift-pageup": "terminal::ScrollPageUp",
      "cmd-up": "terminal::ScrollPageUp",
      "shift-pagedown": "terminal::ScrollPageDown",
@@ -1038,8 +1038,7 @@
      "ctrl-alt-up": "pane::SplitUp",
      "ctrl-alt-down": "pane::SplitDown",
      "ctrl-alt-left": "pane::SplitLeft",
-      "ctrl-alt-right": "pane::SplitRight",
-      "cmd-alt-r": "terminal::RerunTask"
+      "ctrl-alt-right": "pane::SplitRight"
    }
  },
  {
--- a/assets/prompts/content_prompt.hbs
+++ b/assets/prompts/content_prompt.hbs
@@ -49,9 +49,10 @@ And here's the section to rewrite based on that prompt again for reference:
 </rewrite_this>

 {{#if diagnostic_errors}}
+{{#each diagnostic_errors}}
+
 Below are the diagnostic errors visible to the user.  If the user requests problems to be fixed, use this information, but do not try to fix these errors if the user hasn't asked you to.

-{{#each diagnostic_errors}}
 <diagnostic_error>
    <line_number>{{line_number}}</line_number>
    <error_message>{{error_message}}</error_message>
--- a/assets/prompts/suggest_edits.hbs
+++ b/assets/prompts/suggest_edits.hbs
@@ -0,0 +1,206 @@
+<task_description>
+
+The user of a code editor wants to make a change to their codebase.
+You must describe the change using the following XML structure:
+
+- <patch> - A group of related code changes.
+  Child tags:
+    - <title> (required) - A high-level description of the changes. This should be as short
+      as possible, possibly using common abbreviations.
+    - <edit> (1 or more) - An edit to make at a particular range within a file.
+      Includes the following child tags:
+        - <path> (required) - The path to the file that will be changed.
+        - <description> (optional) - An arbitrarily-long comment that describes the purpose
+          of this edit.
+        - <old_text> (optional) - An excerpt from the file's current contents that uniquely
+          identifies a range within the file where the edit should occur. Required for all operations
+          except `create`.
+        - <new_text> (required) - The new text to insert into the file.
+        - <operation> (required) - The type of change that should occur at the given range
+          of the file. Must be one of the following values:
+            - `update`: Replaces the entire range with the new text.
+            - `insert_before`: Inserts the new text before the range.
+            - `insert_after`: Inserts new text after the range.
+            - `create`: Creates or overwrites a file with the given path and the new text.
+            - `delete`: Deletes the specified range from the file.
+
+<guidelines>
+- Never provide multiple edits whose ranges intersect each other. Instead, merge them into one edit.
+- Prefer multiple edits to smaller, disjoint ranges, rather than one edit to a larger range.
+- There's no need to escape angle brackets within XML tags.
+- Always ensure imports are added if you're referencing symbols that are not in scope.
+</guidelines>
+
+Here are some concrete examples.
+
+<example>
+<message role="user">
+
+```rs src/shapes.rs
+pub mod rectangle;
+pub mod circle;
+```
+
+```rs src/shapes/rectangle.rs
+pub struct Rectangle {
+    width: f64,
+    height: f64,
+}
+
+impl Rectangle {
+    pub fn new(width: f64, height: f64) -> Self {
+        Rectangle { width, height }
+    }
+}
+```
+
+```rs src/shapes/circle.rs
+pub struct Circle {
+    radius: f64,
+}
+
+impl Circle {
+    pub fn new(radius: f64) -> Self {
+        Circle { radius }
+    }
+}
+```
+
+Update all shapes to store their origin as an (x, y) tuple and implement Display.
+</message>
+
+<message role="assistant">
+We'll need to update both the rectangle and circle modules.
+
+<patch>
+<title>Add origins and display impls to shapes</title>
+<edit>
+<path>src/shapes/rectangle.rs</path>
+<description>Add the origin field to Rectangle struct</description>
+<operation>insert_after</operation>
+<old_text>
+pub struct Rectangle {
+</old_text>
+<new_text>
+origin: (f64, f64),
+</new_text>
+</edit>
+
+<edit>
+<path>src/shapes/rectangle.rs</path>
+<operation>update</operation>
+<old_text>
+fn new(width: f64, height: f64) -> Self {
+    Rectangle { width, height }
+}
+</old_text>
+<new_text>
+fn new(origin: (f64, f64), width: f64, height: f64) -> Self {
+    Rectangle { origin, width, height }
+}
+</new_text>
+</edit>
+
+<edit>
+<path>src/shapes/circle.rs</path>
+<description>Add the origin field to Circle struct</description>
+<operation>insert_after</operation>
+<old_text>
+pub struct Circle {
+    radius: f64,
+</old_text>
+<new_text>
+    origin: (f64, f64),
+</new_text>
+</edit>
+
+<edit>
+<path>src/shapes/circle.rs</path>
+<operation>update</operation>
+<old_text>
+fn new(radius: f64) -> Self {
+    Circle { radius }
+}
+</old_text>
+<new_text>
+fn new(origin: (f64, f64), radius: f64) -> Self {
+    Circle { origin, radius }
+}
+</new_text>
+</edit>
+</step>
+
+<edit>
+<path>src/shapes/rectangle.rs</path>
+<operation>insert_before</operation>
+<old_text>
+struct Rectangle {
+</old_text>
+<new_text>
+use std::fmt;
+
+</new_text>
+</edit>
+
+<edit>
+<path>src/shapes/rectangle.rs</path>
+<description>
+Add a manual Display implementation for Rectangle.
+Currently, this is the same as a derived Display implementation.
+</description>
+<operation>insert_after</operation>
+<old_text>
+        Rectangle { width, height }
+    }
+}
+</old_text>
+<new_text>
+impl fmt::Display for Rectangle {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.format_struct(f, "Rectangle")
+            .field("origin", &self.origin)
+            .field("width", &self.width)
+            .field("height", &self.height)
+            .finish()
+    }
+}
+</new_text>
+</edit>
+
+<edit>
+<path>src/shapes/circle.rs</path>
+<operation>insert_before</operation>
+<old_text>
+struct Circle {
+</old_text>
+<new_text>
+use std::fmt;
+</new_text>
+</edit>
+
+<edit>
+<path>src/shapes/circle.rs</path>
+<operation>insert_after</operation>
+<old_text>
+        Circle { radius }
+    }
+}
+</old_text>
+<new_text>
+impl fmt::Display for Rectangle {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.format_struct(f, "Rectangle")
+            .field("origin", &self.origin)
+            .field("width", &self.width)
+            .field("height", &self.height)
+            .finish()
+    }
+}
+</new_text>
+</edit>
+</patch>
+
+</message>
+</example>
+
+</task_description>
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -218,23 +218,6 @@
  // 1. Do nothing: `none`
  // 2. Find references for the same symbol: `find_all_references` (default)
  "go_to_definition_fallback": "find_all_references",
-  // Which level to use to filter out diagnostics displayed in the editor.
-  //
-  // Affects the editor rendering only, and does not interrupt
-  // the functionality of diagnostics fetching and project diagnostics editor.
-  // Which files containing diagnostic errors/warnings to mark in the tabs.
-  // Diagnostics are only shown when file icons are also active.
-  // This setting only works when can take the following three values:
-  //
-  // Which diagnostic indicators to show in the scrollbar, their level should be more or equal to the specified severity level.
-  // Possible values:
-  //  - "off" — no diagnostics are allowed
-  //  - "error"
-  //  - "warning" (default)
-  //  - "info"
-  //  - "hint"
-  //  - null — allow all diagnostics
-  "diagnostics_max_severity": "warning",
  // Whether to show wrap guides (vertical rulers) in the editor.
  // Setting this to true will show a guide at the 'preferred_line_length' value
  // if 'soft_wrap' is set to 'preferred_line_length', and will show any
@@ -373,45 +356,6 @@
      "vertical": true
    }
  },
-  // Minimap related settings
-  "minimap": {
-    // When to show the minimap in the editor.
-    // This setting can take three values:
-    // 1. Show the minimap if the editor's scrollbar is visible:
-    //    "auto"
-    // 2. Always show the minimap:
-    //    "always"
-    // 3. Never show the minimap:
-    //    "never" (default)
-    "show": "never",
-    // When to show the minimap thumb.
-    // This setting can take two values:
-    // 1. Show the minimap thumb if the mouse is over the minimap:
-    //    "hover"
-    // 2. Always show the minimap thumb:
-    //    "always" (default)
-    "thumb": "always",
-    // How the minimap thumb border should look.
-    // This setting can take five values:
-    // 1. Display a border on all sides of the thumb:
-    //    "thumb_border": "full"
-    // 2. Display a border on all sides except the left side of the thumb:
-    //    "thumb_border": "left_open" (default)
-    // 3. Display a border on all sides except the right side of the thumb:
-    //    "thumb_border": "right_open"
-    // 4. Display a border only on the left side of the thumb:
-    //    "thumb_border": "left_only"
-    // 5. Display the thumb without any border:
-    //    "thumb_border": "none"
-    "thumb_border": "left_open",
-    // How to highlight the current line in the minimap.
-    // This setting can take the following values:
-    //
-    // 1. `null` to inherit the editor `current_line_highlight` setting (default)
-    // 2. "line" or "all" to highlight the current line in the minimap.
-    // 3. "gutter" or "none" to not highlight the current line in the minimap.
-    "current_line_highlight": null
-  },
  // Enable middle-click paste on Linux.
  "middle_click_paste": true,
  // What to do when multibuffer is double clicked in some of its excerpts
@@ -426,6 +370,8 @@
  "gutter": {
    // Whether to show line numbers in the gutter.
    "line_numbers": true,
+    // Whether to show code action buttons in the gutter.
+    "code_actions": true,
    // Whether to show runnables buttons in the gutter.
    "runnables": true,
    // Whether to show breakpoints in the gutter.
@@ -1019,7 +965,7 @@
      // longer than this value will still push diagnostics further to the right.
      "min_column": 0,
      // The minimum severity of the diagnostics to show inline.
-      // Inherits editor's diagnostics' max severity settings when `null`.
+      // Shows all diagnostics when not specified.
      "max_severity": null
    },
    "cargo": {
@@ -1297,22 +1243,21 @@
    "JSONC": ["**/.zed/**/*.json", "**/zed/**/*.json", "**/Zed/**/*.json", "**/.vscode/**/*.json"],
    "Shell Script": [".env.*"]
  },
-  // Settings for which version of Node.js and NPM to use when installing
-  // language servers and Copilot.
-  //
-  // Note: changing this setting currently requires restarting Zed.
-  "node": {
-    // By default, Zed will look for `node` and `npm` on your `$PATH`, and use the
-    // existing executables if their version is recent enough. Set this to `true`
-    // to prevent this, and force Zed to always download and install its own
-    // version of Node.
-    "ignore_system_version": false,
-    // You can also specify alternative paths to Node and NPM. If you specify
-    // `path`, but not `npm_path`, Zed will assume that `npm` is located at
-    // `${path}/../npm`.
-    "path": null,
-    "npm_path": null
-  },
+  // By default use a recent system version of node, or install our own.
+  // You can override this to use a version of node that is not in $PATH with:
+  // {
+  //   "node": {
+  //     "path": "/path/to/node"
+  //     "npm_path": "/path/to/npm" (defaults to node_path/../npm)
+  //   }
+  // }
+  // or to ensure Zed always downloads and installs an isolated version of node:
+  // {
+  //   "node": {
+  //     "ignore_system_version": true,
+  //   }
+  // NOTE: changing this setting currently requires restarting Zed.
+  "node": {},
  // The extensions that Zed should automatically install on startup.
  //
  // If you don't want any of these extensions, add this field to your settings
--- a/crates/agent/src/active_thread.rs
+++ b/crates/agent/src/active_thread.rs
@@ -3,10 +3,9 @@ use crate::context::{AgentContextHandle, RULES_ICON};
 use crate::context_picker::{ContextPicker, MentionLink};
 use crate::context_store::ContextStore;
 use crate::context_strip::{ContextStrip, ContextStripEvent, SuggestContextKind};
-use crate::message_editor::insert_message_creases;
 use crate::thread::{
-    LastRestoreCheckpoint, MessageCrease, MessageId, MessageSegment, Thread, ThreadError,
-    ThreadEvent, ThreadFeedback,
+    LastRestoreCheckpoint, MessageId, MessageSegment, Thread, ThreadError, ThreadEvent,
+    ThreadFeedback,
 };
 use crate::thread_store::{RulesLoadingError, TextThreadStore, ThreadStore};
 use crate::tool_use::{PendingToolUseStatus, ToolUse};
@@ -328,7 +327,6 @@ fn tool_use_markdown_style(window: &Window, cx: &mut App) -> MarkdownStyle {
    }
 }

-const CODEBLOCK_CONTAINER_GROUP: &str = "codeblock_container";
 const MAX_UNCOLLAPSED_LINES_IN_CODE_BLOCK: usize = 10;

 fn render_markdown_code_block(
@@ -487,18 +485,12 @@ fn render_markdown_code_block(
        .copied_code_block_ids
        .contains(&(message_id, ix));

-    let can_expand = metadata.line_count > MAX_UNCOLLAPSED_LINES_IN_CODE_BLOCK;
-
-    let is_expanded = if can_expand {
-        active_thread
-            .read(cx)
-            .expanded_code_blocks
-            .get(&(message_id, ix))
-            .copied()
-            .unwrap_or(false)
-    } else {
-        false
-    };
+    let is_expanded = active_thread
+        .read(cx)
+        .expanded_code_blocks
+        .get(&(message_id, ix))
+        .copied()
+        .unwrap_or(true);

    let codeblock_header_bg = cx
        .theme()
@@ -519,7 +511,7 @@ fn render_markdown_code_block(
        .children(label)
        .child(
            h_flex()
-                .visible_on_hover(CODEBLOCK_CONTAINER_GROUP)
+                .visible_on_hover("codeblock_container")
                .gap_1()
                .child(
                    IconButton::new(
@@ -561,42 +553,45 @@ fn render_markdown_code_block(
                        }
                    }),
                )
-                .when(can_expand, |header| {
-                    header.child(
-                        IconButton::new(
-                            ("expand-collapse-code", ix),
-                            if is_expanded {
-                                IconName::ChevronUp
+                .when(
+                    metadata.line_count > MAX_UNCOLLAPSED_LINES_IN_CODE_BLOCK,
+                    |header| {
+                        header.child(
+                            IconButton::new(
+                                ("expand-collapse-code", ix),
+                                if is_expanded {
+                                    IconName::ChevronUp
+                                } else {
+                                    IconName::ChevronDown
+                                },
+                            )
+                            .icon_color(Color::Muted)
+                            .shape(ui::IconButtonShape::Square)
+                            .tooltip(Tooltip::text(if is_expanded {
+                                "Collapse Code"
                            } else {
-                                IconName::ChevronDown
-                            },
+                                "Expand Code"
+                            }))
+                            .on_click({
+                                let active_thread = active_thread.clone();
+                                move |_event, _window, cx| {
+                                    active_thread.update(cx, |this, cx| {
+                                        let is_expanded = this
+                                            .expanded_code_blocks
+                                            .entry((message_id, ix))
+                                            .or_insert(true);
+                                        *is_expanded = !*is_expanded;
+                                        cx.notify();
+                                    });
+                                }
+                            }),
                        )
-                        .icon_color(Color::Muted)
-                        .shape(ui::IconButtonShape::Square)
-                        .tooltip(Tooltip::text(if is_expanded {
-                            "Collapse Code"
-                        } else {
-                            "Expand Code"
-                        }))
-                        .on_click({
-                            let active_thread = active_thread.clone();
-                            move |_event, _window, cx| {
-                                active_thread.update(cx, |this, cx| {
-                                    let is_expanded = this
-                                        .expanded_code_blocks
-                                        .entry((message_id, ix))
-                                        .or_insert(true);
-                                    *is_expanded = !*is_expanded;
-                                    cx.notify();
-                                });
-                            }
-                        }),
-                    )
-                }),
+                    },
+                ),
        );

    v_flex()
-        .group(CODEBLOCK_CONTAINER_GROUP)
+        .group("codeblock_container")
        .my_2()
        .overflow_hidden()
        .rounded_lg()
@@ -604,7 +599,16 @@ fn render_markdown_code_block(
        .border_color(cx.theme().colors().border.opacity(0.6))
        .bg(cx.theme().colors().editor_background)
        .child(codeblock_header)
-        .when(can_expand && !is_expanded, |this| this.max_h_80())
+        .when(
+            metadata.line_count > MAX_UNCOLLAPSED_LINES_IN_CODE_BLOCK,
+            |this| {
+                if is_expanded {
+                    this.h_full()
+                } else {
+                    this.max_h_80()
+                }
+            },
+        )
 }

 fn render_code_language(
@@ -1268,7 +1272,6 @@ impl ActiveThread {
        &mut self,
        message_id: MessageId,
        message_segments: &[MessageSegment],
-        message_creases: &[MessageCrease],
        window: &mut Window,
        cx: &mut Context<Self>,
    ) {
@@ -1278,6 +1281,9 @@ impl ActiveThread {
            return;
        };

+        // Cancel any ongoing streaming when user starts editing a previous message
+        self.cancel_last_completion(window, cx);
+
        let editor = crate::message_editor::create_editor(
            self.workspace.clone(),
            self.context_store.downgrade(),
@@ -1288,7 +1294,6 @@ impl ActiveThread {
        );
        editor.update(cx, |editor, cx| {
            editor.set_text(message_text.clone(), window, cx);
-            insert_message_creases(editor, message_creases, &self.context_store, window, cx);
            editor.focus_handle(cx).focus(window);
            editor.move_to_end(&editor::actions::MoveToEnd, window, cx);
        });
@@ -1743,7 +1748,6 @@ impl ActiveThread {
        let Some(message) = self.thread.read(cx).message(message_id) else {
            return Empty.into_any();
        };
-        let message_creases = message.creases.clone();

        let Some(rendered_message) = self.rendered_messages_by_id.get(&message_id) else {
            return Empty.into_any();
@@ -2035,7 +2039,6 @@ impl ActiveThread {
                                this.start_editing_message(
                                    message_id,
                                    &message_segments,
-                                    &message_creases,
                                    window,
                                    cx,
                                );
@@ -2240,7 +2243,7 @@ impl ActiveThread {
                // Backdrop to dim out the whole thread below the editing user message
                parent.relative().child(
                    div()
-                        .stop_mouse_events_except_scroll()
+                        .occlude()
                        .absolute()
                        .inset_0()
                        .size_full()
@@ -2359,22 +2362,19 @@ impl ActiveThread {
                                            let editor_bg = cx.theme().colors().editor_background;

                                            move |el, range, metadata, _, cx| {
-                                                let can_expand = metadata.line_count
-                                                    > MAX_UNCOLLAPSED_LINES_IN_CODE_BLOCK;
-                                                if !can_expand {
-                                                    return el;
-                                                }
-
                                                let is_expanded = active_thread
                                                    .read(cx)
                                                    .expanded_code_blocks
                                                    .get(&(message_id, range.start))
                                                    .copied()
-                                                    .unwrap_or(false);
-                                                if is_expanded {
+                                                    .unwrap_or(true);
+
+                                                if is_expanded
+                                                    || metadata.line_count
+                                                        <= MAX_UNCOLLAPSED_LINES_IN_CODE_BLOCK
+                                                {
                                                    return el;
                                                }
-
                                                el.child(
                                                    div()
                                                        .absolute()
@@ -2400,7 +2400,6 @@ impl ActiveThread {
                                markdown_element.code_block_renderer(
                                    markdown::CodeBlockRenderer::Default {
                                        copy_button: false,
-                                        copy_button_on_hover: false,
                                        border: true,
                                    },
                                )
@@ -2720,7 +2719,6 @@ impl ActiveThread {
                                )
                                .code_block_renderer(markdown::CodeBlockRenderer::Default {
                                    copy_button: false,
-                                    copy_button_on_hover: false,
                                    border: false,
                                })
                                .on_url_click({
@@ -2751,7 +2749,6 @@ impl ActiveThread {
                                )
                                .code_block_renderer(markdown::CodeBlockRenderer::Default {
                                    copy_button: false,
-                                    copy_button_on_hover: false,
                                    border: false,
                                })
                                .on_url_click({
@@ -3583,3 +3580,152 @@ fn open_editor_at_position(
        }
    })
 }
+
+#[cfg(test)]
+mod tests {
+    use assistant_tool::{ToolRegistry, ToolWorkingSet};
+    use editor::EditorSettings;
+    use fs::FakeFs;
+    use gpui::{TestAppContext, VisualTestContext};
+    use language_model::{LanguageModel, fake_provider::FakeLanguageModel};
+    use project::Project;
+    use prompt_store::PromptBuilder;
+    use serde_json::json;
+    use settings::SettingsStore;
+    use util::path;
+
+    use crate::{ContextLoadResult, thread_store};
+
+    use super::*;
+
+    #[gpui::test]
+    async fn test_current_completion_cancelled_when_message_edited(cx: &mut TestAppContext) {
+        init_test_settings(cx);
+
+        let project = create_test_project(
+            cx,
+            json!({"code.rs": "fn main() {\n    println!(\"Hello, world!\");\n}"}),
+        )
+        .await;
+
+        let (cx, active_thread, thread, model) = setup_test_environment(cx, project.clone()).await;
+
+        // Insert user message without any context (empty context vector)
+        let message = thread.update(cx, |thread, cx| {
+            let message_id = thread.insert_user_message(
+                "What is the best way to learn Rust?",
+                ContextLoadResult::default(),
+                None,
+                vec![],
+                cx,
+            );
+            thread
+                .message(message_id)
+                .expect("message should exist")
+                .clone()
+        });
+
+        // Stream response to user message
+        thread.update(cx, |thread, cx| {
+            let request = thread.to_completion_request(model.clone(), cx);
+            thread.stream_completion(request, model, cx.active_window(), cx)
+        });
+        let generating = thread.update(cx, |thread, _cx| thread.is_generating());
+        assert!(generating, "There should be one pending completion");
+
+        // Edit the previous message
+        active_thread.update_in(cx, |active_thread, window, cx| {
+            active_thread.start_editing_message(message.id, &message.segments, window, cx);
+        });
+
+        // Check that the stream was cancelled
+        let generating = thread.update(cx, |thread, _cx| thread.is_generating());
+        assert!(!generating, "The completion should have been cancelled");
+    }
+
+    fn init_test_settings(cx: &mut TestAppContext) {
+        cx.update(|cx| {
+            let settings_store = SettingsStore::test(cx);
+            cx.set_global(settings_store);
+            language::init(cx);
+            Project::init_settings(cx);
+            AssistantSettings::register(cx);
+            prompt_store::init(cx);
+            thread_store::init(cx);
+            workspace::init_settings(cx);
+            language_model::init_settings(cx);
+            ThemeSettings::register(cx);
+            EditorSettings::register(cx);
+            ToolRegistry::default_global(cx);
+        });
+    }
+
+    // Helper to create a test project with test files
+    async fn create_test_project(
+        cx: &mut TestAppContext,
+        files: serde_json::Value,
+    ) -> Entity<Project> {
+        let fs = FakeFs::new(cx.executor());
+        fs.insert_tree(path!("/test"), files).await;
+        Project::test(fs, [path!("/test").as_ref()], cx).await
+    }
+
+    async fn setup_test_environment(
+        cx: &mut TestAppContext,
+        project: Entity<Project>,
+    ) -> (
+        &mut VisualTestContext,
+        Entity<ActiveThread>,
+        Entity<Thread>,
+        Arc<dyn LanguageModel>,
+    ) {
+        let (workspace, cx) =
+            cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
+
+        let prompt_builder = Arc::new(PromptBuilder::new(None).unwrap());
+        let thread_store = cx
+            .update(|_, cx| {
+                ThreadStore::load(
+                    project.clone(),
+                    cx.new(|_| ToolWorkingSet::default()),
+                    None,
+                    prompt_builder.clone(),
+                    cx,
+                )
+            })
+            .await
+            .unwrap();
+        let text_thread_store = cx
+            .update(|_, cx| {
+                TextThreadStore::new(project.clone(), prompt_builder, Default::default(), cx)
+            })
+            .await
+            .unwrap();
+
+        let thread = thread_store.update(cx, |store, cx| store.create_thread(cx));
+        let context_store = cx.new(|_cx| ContextStore::new(project.downgrade(), None));
+
+        let model = FakeLanguageModel::default();
+        let model: Arc<dyn LanguageModel> = Arc::new(model);
+
+        let language_registry = LanguageRegistry::new(cx.executor());
+        let language_registry = Arc::new(language_registry);
+
+        let active_thread = cx.update(|window, cx| {
+            cx.new(|cx| {
+                ActiveThread::new(
+                    thread.clone(),
+                    thread_store.clone(),
+                    text_thread_store.clone(),
+                    context_store.clone(),
+                    language_registry.clone(),
+                    workspace.downgrade(),
+                    window,
+                    cx,
+                )
+            })
+        });
+
+        (cx, active_thread, thread, model)
+    }
+}
--- a/crates/agent/src/agent_diff.rs
+++ b/crates/agent/src/agent_diff.rs
@@ -1,4 +1,6 @@
-use crate::{Keep, KeepAll, OpenAgentDiff, Reject, RejectAll, Thread, ThreadEvent};
+use crate::{
+    Keep, KeepAll, OpenAgentDiff, Reject, RejectAll, Thread, ThreadEvent, ui::AnimatedLabel,
+};
 use anyhow::Result;
 use assistant_settings::AssistantSettings;
 use buffer_diff::DiffHunkStatus;
@@ -9,9 +11,8 @@ use editor::{
    scroll::Autoscroll,
 };
 use gpui::{
-    Action, Animation, AnimationExt, AnyElement, AnyView, App, AppContext, Empty, Entity,
-    EventEmitter, FocusHandle, Focusable, Global, SharedString, Subscription, Task, Transformation,
-    WeakEntity, Window, percentage, prelude::*,
+    Action, AnyElement, AnyView, App, AppContext, Empty, Entity, EventEmitter, FocusHandle,
+    Focusable, Global, SharedString, Subscription, Task, WeakEntity, Window, prelude::*,
 };

 use language::{Buffer, Capability, DiskState, OffsetRangeExt, Point};
@@ -24,7 +25,6 @@ use std::{
    collections::hash_map::Entry,
    ops::Range,
    sync::Arc,
-    time::Duration,
 };
 use ui::{IconButtonShape, KeyBinding, Tooltip, prelude::*, vertical_divider};
 use util::ResultExt;
@@ -978,20 +978,9 @@ impl ToolbarItemView for AgentDiffToolbar {

 impl Render for AgentDiffToolbar {
    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let spinner_icon = div()
-            .px_0p5()
-            .id("generating")
-            .tooltip(Tooltip::text("Generating Changes…"))
-            .child(
-                Icon::new(IconName::LoadCircle)
-                    .size(IconSize::Small)
-                    .color(Color::Accent)
-                    .with_animation(
-                        "load_circle",
-                        Animation::new(Duration::from_secs(3)).repeat(),
-                        |icon, delta| icon.transform(Transformation::rotate(percentage(delta))),
-                    ),
-            )
+        let generating_label = div()
+            .w(rems_from_px(110.)) // Arbitrary size so the label doesn't dance around
+            .child(AnimatedLabel::new("Generating"))
            .into_any();

        let Some(active_item) = self.active_item.as_ref() else {
@@ -1008,7 +997,7 @@ impl Render for AgentDiffToolbar {

                let content = match state {
                    EditorState::Idle => return Empty.into_any(),
-                    EditorState::Generating => vec![spinner_icon],
+                    EditorState::Generating => vec![generating_label],
                    EditorState::Reviewing => vec![
                        h_flex()
                            .child(
@@ -1126,7 +1115,7 @@ impl Render for AgentDiffToolbar {

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

                let is_empty = agent_diff.read(cx).multibuffer.read(cx).is_empty();
--- a/crates/agent/src/agent_panel.rs
+++ b/crates/agent/src/agent_panel.rs
@@ -46,9 +46,7 @@ use ui::{
 };
 use util::{ResultExt as _, maybe};
 use workspace::dock::{DockPosition, Panel, PanelEvent};
-use workspace::{
-    CollaboratorId, DraggedSelection, DraggedTab, ToggleZoom, ToolbarItemView, Workspace,
-};
+use workspace::{CollaboratorId, DraggedSelection, DraggedTab, ToolbarItemView, Workspace};
 use zed_actions::agent::{OpenConfiguration, OpenOnboardingModal, ResetOnboarding};
 use zed_actions::assistant::{OpenRulesLibrary, ToggleFocus};
 use zed_actions::{DecreaseBufferFontSize, IncreaseBufferFontSize, ResetBufferFontSize};
@@ -57,10 +55,10 @@ use zed_llm_client::UsageLimit;
 use crate::active_thread::{self, ActiveThread, ActiveThreadEvent};
 use crate::agent_configuration::{AgentConfiguration, AssistantConfigurationEvent};
 use crate::agent_diff::AgentDiff;
-use crate::history_store::{HistoryStore, RecentEntry};
+use crate::history_store::{HistoryEntry, HistoryStore, RecentEntry};
 use crate::message_editor::{MessageEditor, MessageEditorEvent};
 use crate::thread::{Thread, ThreadError, ThreadId, TokenUsageRatio};
-use crate::thread_history::{HistoryEntryElement, ThreadHistory};
+use crate::thread_history::{EntryTimeFormat, PastContext, PastThread, ThreadHistory};
 use crate::thread_store::ThreadStore;
 use crate::ui::AgentOnboardingModal;
 use crate::{
@@ -358,13 +356,11 @@ pub struct AgentPanel {
    previous_view: Option<ActiveView>,
    history_store: Entity<HistoryStore>,
    history: Entity<ThreadHistory>,
-    hovered_recent_history_item: Option<usize>,
    assistant_dropdown_menu_handle: PopoverMenuHandle<ContextMenu>,
    assistant_navigation_menu_handle: PopoverMenuHandle<ContextMenu>,
    assistant_navigation_menu: Option<Entity<ContextMenu>>,
    width: Option<Pixels>,
    height: Option<Pixels>,
-    zoomed: bool,
    pending_serialization: Option<Task<Result<()>>>,
    hide_trial_upsell: bool,
    _trial_markdown: Entity<Markdown>,
@@ -700,13 +696,11 @@ impl AgentPanel {
            previous_view: None,
            history_store: history_store.clone(),
            history: cx.new(|cx| ThreadHistory::new(weak_self, history_store, window, cx)),
-            hovered_recent_history_item: None,
            assistant_dropdown_menu_handle: PopoverMenuHandle::default(),
            assistant_navigation_menu_handle: PopoverMenuHandle::default(),
            assistant_navigation_menu: None,
            width: None,
            height: None,
-            zoomed: false,
            pending_serialization: None,
            hide_trial_upsell: false,
            _trial_markdown: trial_markdown,
@@ -1148,17 +1142,6 @@ impl AgentPanel {
        }
    }

-    pub fn toggle_zoom(&mut self, _: &ToggleZoom, window: &mut Window, cx: &mut Context<Self>) {
-        if self.zoomed {
-            cx.emit(PanelEvent::ZoomOut);
-        } else {
-            if !self.focus_handle(cx).contains_focused(window, cx) {
-                cx.focus_self(window);
-            }
-            cx.emit(PanelEvent::ZoomIn);
-        }
-    }
-
    pub fn open_agent_diff(
        &mut self,
        _: &OpenAgentDiff,
@@ -1431,15 +1414,6 @@ impl Panel for AgentPanel {
    fn enabled(&self, cx: &App) -> bool {
        AssistantSettings::get_global(cx).enabled
    }
-
-    fn is_zoomed(&self, _window: &Window, _cx: &App) -> bool {
-        self.zoomed
-    }
-
-    fn set_zoomed(&mut self, zoomed: bool, _window: &mut Window, cx: &mut Context<Self>) {
-        self.zoomed = zoomed;
-        cx.notify();
-    }
 }

 impl AgentPanel {
@@ -2238,7 +2212,7 @@ impl AgentPanel {
                            .border_b_1()
                            .border_color(cx.theme().colors().border_variant)
                            .child(
-                                Label::new("Recent")
+                                Label::new("Past Interactions")
                                    .size(LabelSize::Small)
                                    .color(Color::Muted),
                            )
@@ -2263,20 +2237,18 @@ impl AgentPanel {
                        v_flex()
                            .gap_1()
                            .children(
-                                recent_history.into_iter().enumerate().map(|(index, entry)| {
+                                recent_history.into_iter().map(|entry| {
                                    // TODO: Add keyboard navigation.
-                                    let is_hovered = self.hovered_recent_history_item == Some(index);
-                                    HistoryEntryElement::new(entry.clone(), cx.entity().downgrade())
-                                        .hovered(is_hovered)
-                                        .on_hover(cx.listener(move |this, is_hovered, _window, cx| {
-                                            if *is_hovered {
-                                                this.hovered_recent_history_item = Some(index);
-                                            } else if this.hovered_recent_history_item == Some(index) {
-                                                this.hovered_recent_history_item = None;
-                                            }
-                                            cx.notify();
-                                        }))
-                                        .into_any_element()
+                                    match entry {
+                                        HistoryEntry::Thread(thread) => {
+                                            PastThread::new(thread, cx.entity().downgrade(), false, vec![], EntryTimeFormat::DateAndTime)
+                                                .into_any_element()
+                                        }
+                                        HistoryEntry::Context(context) => {
+                                            PastContext::new(context, cx.entity().downgrade(), false, vec![], EntryTimeFormat::DateAndTime)
+                                                .into_any_element()
+                                        }
+                                    }
                                }),
                            )
                    )
@@ -2772,16 +2744,42 @@ impl AgentPanel {

 impl Render for AgentPanel {
    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        // WARNING: Changes to this element hierarchy can have
-        // non-obvious implications to the layout of children.
-        //
-        // If you need to change it, please confirm:
-        // - The message editor expands (⌘esc) correctly
-        // - When expanded, the buttons at the bottom of the panel are displayed correctly
-        // - Font size works as expected and can be changed with ⌘+/⌘-
-        // - Scrolling in all views works as expected
-        // - Files can be dropped into the panel
-        let content = v_flex()
+        let content = match &self.active_view {
+            ActiveView::Thread { .. } => v_flex()
+                .relative()
+                .justify_between()
+                .size_full()
+                .child(self.render_active_thread_or_empty_state(window, cx))
+                .children(self.render_tool_use_limit_reached(cx))
+                .child(h_flex().child(self.message_editor.clone()))
+                .children(self.render_last_error(cx))
+                .child(self.render_drag_target(cx))
+                .into_any(),
+            ActiveView::History => self.history.clone().into_any_element(),
+            ActiveView::PromptEditor {
+                context_editor,
+                buffer_search_bar,
+                ..
+            } => self
+                .render_prompt_editor(context_editor, buffer_search_bar, window, cx)
+                .into_any(),
+            ActiveView::Configuration => v_flex()
+                .size_full()
+                .children(self.configuration.clone())
+                .into_any(),
+        };
+
+        let content = match self.active_view.which_font_size_used() {
+            WhichFontSize::AgentFont => {
+                WithRemSize::new(ThemeSettings::get_global(cx).agent_font_size(cx))
+                    .size_full()
+                    .child(content)
+                    .into_any()
+            }
+            _ => content,
+        };
+
+        v_flex()
            .key_context(self.key_context())
            .justify_between()
            .size_full()
@@ -2804,40 +2802,9 @@ impl Render for AgentPanel {
            .on_action(cx.listener(Self::increase_font_size))
            .on_action(cx.listener(Self::decrease_font_size))
            .on_action(cx.listener(Self::reset_font_size))
-            .on_action(cx.listener(Self::toggle_zoom))
            .child(self.render_toolbar(window, cx))
            .children(self.render_trial_upsell(window, cx))
-            .map(|parent| match &self.active_view {
-                ActiveView::Thread { .. } => parent
-                    .relative()
-                    .child(self.render_active_thread_or_empty_state(window, cx))
-                    .children(self.render_tool_use_limit_reached(cx))
-                    .child(h_flex().child(self.message_editor.clone()))
-                    .children(self.render_last_error(cx))
-                    .child(self.render_drag_target(cx)),
-                ActiveView::History => parent.child(self.history.clone()),
-                ActiveView::PromptEditor {
-                    context_editor,
-                    buffer_search_bar,
-                    ..
-                } => parent.child(self.render_prompt_editor(
-                    context_editor,
-                    buffer_search_bar,
-                    window,
-                    cx,
-                )),
-                ActiveView::Configuration => parent.children(self.configuration.clone()),
-            });
-
-        match self.active_view.which_font_size_used() {
-            WhichFontSize::AgentFont => {
-                WithRemSize::new(ThemeSettings::get_global(cx).agent_font_size(cx))
-                    .size_full()
-                    .child(content)
-                    .into_any()
-            }
-            _ => content.into_any(),
-        }
+            .child(content)
    }
 }

--- a/crates/agent/src/context.rs
+++ b/crates/agent/src/context.rs
@@ -754,11 +754,11 @@ pub enum ImageStatus {

 impl ImageContext {
    pub fn eq_for_key(&self, other: &Self) -> bool {
-        self.original_image.id() == other.original_image.id()
+        self.original_image.id == other.original_image.id
    }

    pub fn hash_for_key<H: Hasher>(&self, state: &mut H) {
-        self.original_image.id().hash(state);
+        self.original_image.id.hash(state);
    }

    pub fn image(&self) -> Option<LanguageModelImage> {
@@ -830,20 +830,23 @@ pub fn load_context(
    prompt_store: &Option<Entity<PromptStore>>,
    cx: &mut App,
 ) -> Task<ContextLoadResult> {
-    let load_tasks: Vec<_> = contexts
-        .into_iter()
-        .map(|context| match context {
-            AgentContextHandle::File(context) => context.load(cx),
-            AgentContextHandle::Directory(context) => context.load(project.clone(), cx),
-            AgentContextHandle::Symbol(context) => context.load(cx),
-            AgentContextHandle::Selection(context) => context.load(cx),
-            AgentContextHandle::FetchedUrl(context) => context.load(),
-            AgentContextHandle::Thread(context) => context.load(cx),
-            AgentContextHandle::TextThread(context) => context.load(cx),
-            AgentContextHandle::Rules(context) => context.load(prompt_store, cx),
-            AgentContextHandle::Image(context) => context.load(cx),
-        })
-        .collect();
+    let mut load_tasks = Vec::new();
+
+    for context in contexts.iter().cloned() {
+        match context {
+            AgentContextHandle::File(context) => load_tasks.push(context.load(cx)),
+            AgentContextHandle::Directory(context) => {
+                load_tasks.push(context.load(project.clone(), cx))
+            }
+            AgentContextHandle::Symbol(context) => load_tasks.push(context.load(cx)),
+            AgentContextHandle::Selection(context) => load_tasks.push(context.load(cx)),
+            AgentContextHandle::FetchedUrl(context) => load_tasks.push(context.load()),
+            AgentContextHandle::Thread(context) => load_tasks.push(context.load(cx)),
+            AgentContextHandle::TextThread(context) => load_tasks.push(context.load(cx)),
+            AgentContextHandle::Rules(context) => load_tasks.push(context.load(prompt_store, cx)),
+            AgentContextHandle::Image(context) => load_tasks.push(context.load(cx)),
+        }
+    }

    cx.background_spawn(async move {
        let load_results = future::join_all(load_tasks).await;
--- a/crates/agent/src/context_picker.rs
+++ b/crates/agent/src/context_picker.rs
@@ -381,16 +381,6 @@ impl ContextPicker {
        cx.focus_self(window);
    }

-    pub fn select_first(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        match &self.mode {
-            ContextPickerState::Default(entity) => entity.update(cx, |entity, cx| {
-                entity.select_first(&Default::default(), window, cx)
-            }),
-            // Other variants already select their first entry on open automatically
-            _ => {}
-        }
-    }
-
    fn recent_menu_item(
        &self,
        context_picker: Entity<ContextPicker>,
--- a/crates/agent/src/context_strip.rs
+++ b/crates/agent/src/context_strip.rs
@@ -420,25 +420,12 @@ impl Render for ContextStrip {
            })
            .child(
                PopoverMenu::new("context-picker")
-                    .menu({
-                        let context_picker = context_picker.clone();
-                        move |window, cx| {
-                            context_picker.update(cx, |this, cx| {
-                                this.init(window, cx);
-                            });
+                    .menu(move |window, cx| {
+                        context_picker.update(cx, |this, cx| {
+                            this.init(window, cx);
+                        });

-                            Some(context_picker.clone())
-                        }
-                    })
-                    .on_open({
-                        let context_picker = context_picker.downgrade();
-                        Rc::new(move |window, cx| {
-                            context_picker
-                                .update(cx, |context_picker, cx| {
-                                    context_picker.select_first(window, cx);
-                                })
-                                .ok();
-                        })
+                        Some(context_picker.clone())
                    })
                    .trigger_with_tooltip(
                        IconButton::new("add-context", IconName::Plus)
--- a/crates/agent/src/debug.rs
+++ b/crates/agent/src/debug.rs
@@ -75,7 +75,7 @@ impl Default for DebugAccountState {
        Self {
            enabled: false,
            trial_expired: false,
-            plan: Plan::ZedFree,
+            plan: Plan::Free,
            custom_prompt_usage: RequestUsage {
                limit: UsageLimit::Unlimited,
                amount: 0,
--- a/crates/agent/src/history_store.rs
+++ b/crates/agent/src/history_store.rs
@@ -1,4 +1,4 @@
-use std::{collections::VecDeque, path::Path, sync::Arc};
+use std::{collections::VecDeque, path::Path};

 use anyhow::{Context as _, anyhow};
 use assistant_context_editor::{AssistantContext, SavedContextMetadata};
@@ -34,20 +34,6 @@ impl HistoryEntry {
            HistoryEntry::Context(context) => context.mtime.to_utc(),
        }
    }
-
-    pub fn id(&self) -> HistoryEntryId {
-        match self {
-            HistoryEntry::Thread(thread) => HistoryEntryId::Thread(thread.id.clone()),
-            HistoryEntry::Context(context) => HistoryEntryId::Context(context.path.clone()),
-        }
-    }
-}
-
-/// Generic identifier for a history entry.
-#[derive(Clone, PartialEq, Eq)]
-pub enum HistoryEntryId {
-    Thread(ThreadId),
-    Context(Arc<Path>),
 }

 #[derive(Clone, Debug)]
--- a/crates/agent/src/inline_assistant.rs
+++ b/crates/agent/src/inline_assistant.rs
@@ -8,10 +8,9 @@ use anyhow::{Context as _, Result};
 use assistant_settings::AssistantSettings;
 use client::telemetry::Telemetry;
 use collections::{HashMap, HashSet, VecDeque, hash_map};
-use editor::display_map::EditorMargins;
 use editor::{
    Anchor, AnchorRangeExt, CodeActionProvider, Editor, EditorEvent, ExcerptId, ExcerptRange,
-    MultiBuffer, MultiBufferSnapshot, ToOffset as _, ToPoint,
+    GutterDimensions, MultiBuffer, MultiBufferSnapshot, ToOffset as _, ToPoint,
    actions::SelectAll,
    display_map::{
        BlockContext, BlockPlacement, BlockProperties, BlockStyle, CustomBlockId, RenderBlock,
@@ -458,11 +457,11 @@ impl InlineAssistant {
                )
            });

-            let editor_margins = Arc::new(Mutex::new(EditorMargins::default()));
+            let gutter_dimensions = Arc::new(Mutex::new(GutterDimensions::default()));
            let prompt_editor = cx.new(|cx| {
                PromptEditor::new_buffer(
                    assist_id,
-                    editor_margins,
+                    gutter_dimensions.clone(),
                    self.prompt_history.clone(),
                    prompt_buffer.clone(),
                    codegen.clone(),
@@ -577,11 +576,11 @@ impl InlineAssistant {
            )
        });

-        let editor_margins = Arc::new(Mutex::new(EditorMargins::default()));
+        let gutter_dimensions = Arc::new(Mutex::new(GutterDimensions::default()));
        let prompt_editor = cx.new(|cx| {
            PromptEditor::new_buffer(
                assist_id,
-                editor_margins,
+                gutter_dimensions.clone(),
                self.prompt_history.clone(),
                prompt_buffer.clone(),
                codegen.clone(),
@@ -650,7 +649,6 @@ impl InlineAssistant {
                height: Some(prompt_editor_height),
                render: build_assist_editor_renderer(prompt_editor),
                priority: 0,
-                render_in_minimap: false,
            },
            BlockProperties {
                style: BlockStyle::Sticky,
@@ -665,7 +663,6 @@ impl InlineAssistant {
                        .into_any_element()
                }),
                priority: 0,
-                render_in_minimap: false,
            },
        ];

@@ -1407,11 +1404,11 @@ impl InlineAssistant {

                    enum DeletedLines {}
                    let mut editor = Editor::for_multibuffer(multi_buffer, None, window, cx);
-                    editor.disable_scrollbars_and_minimap(window, cx);
                    editor.set_soft_wrap_mode(language::language_settings::SoftWrap::None, cx);
                    editor.set_show_wrap_guides(false, cx);
                    editor.set_show_gutter(false, cx);
                    editor.scroll_manager.set_forbid_vertical_scroll(true);
+                    editor.set_show_scrollbars(false, cx);
                    editor.set_read_only(true);
                    editor.set_show_edit_predictions(Some(false), window, cx);
                    editor.highlight_rows::<DeletedLines>(
@@ -1435,12 +1432,11 @@ impl InlineAssistant {
                            .bg(cx.theme().status().deleted_background)
                            .size_full()
                            .h(height as f32 * cx.window.line_height())
-                            .pl(cx.margins.gutter.full_width())
+                            .pl(cx.gutter_dimensions.full_width())
                            .child(deleted_lines_editor.clone())
                            .into_any_element()
                    }),
                    priority: 0,
-                    render_in_minimap: false,
                });
            }

@@ -1598,9 +1594,9 @@ fn build_assist_editor_renderer(editor: &Entity<PromptEditor<BufferCodegen>>) ->
    let editor = editor.clone();

    Arc::new(move |cx: &mut BlockContext| {
-        let editor_margins = editor.read(cx).editor_margins();
+        let gutter_dimensions = editor.read(cx).gutter_dimensions();

-        *editor_margins.lock() = *cx.margins;
+        *gutter_dimensions.lock() = *cx.gutter_dimensions;
        editor.clone().into_any_element()
    })
 }
--- a/crates/agent/src/inline_prompt_editor.rs
+++ b/crates/agent/src/inline_prompt_editor.rs
@@ -11,9 +11,9 @@ use crate::{CycleNextInlineAssist, CyclePreviousInlineAssist};
 use crate::{RemoveAllContext, ToggleContextPicker};
 use client::ErrorExt;
 use collections::VecDeque;
-use editor::display_map::EditorMargins;
 use editor::{
-    ContextMenuOptions, Editor, EditorElement, EditorEvent, EditorMode, EditorStyle, MultiBuffer,
+    ContextMenuOptions, Editor, EditorElement, EditorEvent, EditorMode, EditorStyle,
+    GutterDimensions, MultiBuffer,
    actions::{MoveDown, MoveUp},
 };
 use feature_flags::{FeatureFlagAppExt as _, ZedProFeatureFlag};
@@ -61,13 +61,11 @@ impl<T: 'static> Render for PromptEditor<T> {
        let ui_font_size = ThemeSettings::get_global(cx).ui_font_size(cx);
        let mut buttons = Vec::new();

-        const RIGHT_PADDING: Pixels = px(9.);
-
-        let (left_gutter_width, right_padding) = match &self.mode {
+        let left_gutter_width = match &self.mode {
            PromptEditorMode::Buffer {
                id: _,
                codegen,
-                editor_margins,
+                gutter_dimensions,
            } => {
                let codegen = codegen.read(cx);

@@ -75,17 +73,13 @@ impl<T: 'static> Render for PromptEditor<T> {
                    buttons.push(self.render_cycle_controls(&codegen, cx));
                }

-                let editor_margins = editor_margins.lock();
-                let gutter = editor_margins.gutter;
+                let gutter_dimensions = gutter_dimensions.lock();

-                let left_gutter_width = gutter.full_width() + (gutter.margin / 2.0);
-                let right_padding = editor_margins.right + RIGHT_PADDING;
-
-                (left_gutter_width, right_padding)
+                gutter_dimensions.full_width() + (gutter_dimensions.margin / 2.0)
            }
            PromptEditorMode::Terminal { .. } => {
                // Give the equivalent of the same left-padding that we're using on the right
-                (Pixels::from(40.0), Pixels::from(24.))
+                Pixels::from(40.0)
            }
        };

@@ -106,7 +100,7 @@ impl<T: 'static> Render for PromptEditor<T> {
            .size_full()
            .pt_0p5()
            .pb(bottom_padding)
-            .pr(right_padding)
+            .pr_6()
            .child(
                h_flex()
                    .items_start()
@@ -812,7 +806,7 @@ pub enum PromptEditorMode {
    Buffer {
        id: InlineAssistId,
        codegen: Entity<BufferCodegen>,
-        editor_margins: Arc<Mutex<EditorMargins>>,
+        gutter_dimensions: Arc<Mutex<GutterDimensions>>,
    },
    Terminal {
        id: TerminalInlineAssistId,
@@ -844,7 +838,7 @@ impl InlineAssistId {
 impl PromptEditor<BufferCodegen> {
    pub fn new_buffer(
        id: InlineAssistId,
-        editor_margins: Arc<Mutex<EditorMargins>>,
+        gutter_dimensions: Arc<Mutex<GutterDimensions>>,
        prompt_history: VecDeque<String>,
        prompt_buffer: Entity<MultiBuffer>,
        codegen: Entity<BufferCodegen>,
@@ -861,7 +855,7 @@ impl PromptEditor<BufferCodegen> {
        let mode = PromptEditorMode::Buffer {
            id,
            codegen,
-            editor_margins,
+            gutter_dimensions,
        };

        let prompt_editor = cx.new(|cx| {
@@ -1001,9 +995,11 @@ impl PromptEditor<BufferCodegen> {
        }
    }

-    pub fn editor_margins(&self) -> &Arc<Mutex<EditorMargins>> {
+    pub fn gutter_dimensions(&self) -> &Arc<Mutex<GutterDimensions>> {
        match &self.mode {
-            PromptEditorMode::Buffer { editor_margins, .. } => editor_margins,
+            PromptEditorMode::Buffer {
+                gutter_dimensions, ..
+            } => gutter_dimensions,
            PromptEditorMode::Terminal { .. } => unreachable!(),
        }
    }
--- a/crates/agent/src/message_editor.rs
+++ b/crates/agent/src/message_editor.rs
@@ -200,13 +200,7 @@ impl MessageEditor {
        });

        let profile_selector = cx.new(|cx| {
-            ProfileSelector::new(
-                fs,
-                thread.clone(),
-                thread_store,
-                editor.focus_handle(cx),
-                cx,
-            )
+            ProfileSelector::new(thread.clone(), thread_store, editor.focus_handle(cx), cx)
        });

        Self {
@@ -1085,11 +1079,11 @@ impl MessageEditor {
        let plan = user_store
            .current_plan()
            .map(|plan| match plan {
-                Plan::Free => zed_llm_client::Plan::ZedFree,
+                Plan::Free => zed_llm_client::Plan::Free,
                Plan::ZedPro => zed_llm_client::Plan::ZedPro,
                Plan::ZedProTrial => zed_llm_client::Plan::ZedProTrial,
            })
-            .unwrap_or(zed_llm_client::Plan::ZedFree);
+            .unwrap_or(zed_llm_client::Plan::Free);
        let usage = self.thread.read(cx).last_usage().or_else(|| {
            maybe!({
                let amount = user_store.model_request_usage_amount()?;
--- a/crates/agent/src/profile_selector.rs
+++ b/crates/agent/src/profile_selector.rs
@@ -1,13 +1,10 @@
-use std::sync::Arc;
-
 use assistant_settings::{
    AgentProfile, AgentProfileId, AssistantDockPosition, AssistantSettings, GroupedAgentProfiles,
    builtin_profiles,
 };
-use fs::Fs;
 use gpui::{Action, Entity, FocusHandle, Subscription, WeakEntity, prelude::*};
 use language_model::LanguageModelRegistry;
-use settings::{Settings as _, SettingsStore, update_settings_file};
+use settings::{Settings as _, SettingsStore};
 use ui::{
    ContextMenu, ContextMenuEntry, DocumentationSide, PopoverMenu, PopoverMenuHandle, Tooltip,
    prelude::*,
@@ -18,7 +15,6 @@ use crate::{ManageProfiles, Thread, ThreadStore, ToggleProfileSelector};

 pub struct ProfileSelector {
    profiles: GroupedAgentProfiles,
-    fs: Arc<dyn Fs>,
    thread: Entity<Thread>,
    thread_store: WeakEntity<ThreadStore>,
    menu_handle: PopoverMenuHandle<ContextMenu>,
@@ -28,7 +24,6 @@ pub struct ProfileSelector {

 impl ProfileSelector {
    pub fn new(
-        fs: Arc<dyn Fs>,
        thread: Entity<Thread>,
        thread_store: WeakEntity<ThreadStore>,
        focus_handle: FocusHandle,
@@ -40,7 +35,6 @@ impl ProfileSelector {

        Self {
            profiles: GroupedAgentProfiles::from_settings(AssistantSettings::get_global(cx)),
-            fs,
            thread,
            thread_store,
            menu_handle: PopoverMenuHandle::default(),
@@ -65,12 +59,8 @@ impl ProfileSelector {
        ContextMenu::build(window, cx, |mut menu, _window, cx| {
            let settings = AssistantSettings::get_global(cx);
            for (profile_id, profile) in self.profiles.builtin.iter() {
-                menu = menu.item(self.menu_entry_for_profile(
-                    profile_id.clone(),
-                    profile,
-                    settings,
-                    cx,
-                ));
+                menu =
+                    menu.item(self.menu_entry_for_profile(profile_id.clone(), profile, settings));
            }

            if !self.profiles.custom.is_empty() {
@@ -80,7 +70,6 @@ impl ProfileSelector {
                        profile_id.clone(),
                        profile,
                        settings,
-                        cx,
                    ));
                }
            }
@@ -101,7 +90,6 @@ impl ProfileSelector {
        profile_id: AgentProfileId,
        profile: &AgentProfile,
        settings: &AssistantSettings,
-        _cx: &App,
    ) -> ContextMenuEntry {
        let documentation = match profile.name.to_lowercase().as_str() {
            builtin_profiles::WRITE => Some("Get help to write anything."),
@@ -122,15 +110,15 @@ impl ProfileSelector {
        };

        entry.handler({
-            let fs = self.fs.clone();
            let thread_store = self.thread_store.clone();
            let profile_id = profile_id.clone();
+            let profile = profile.clone();
+
+            let thread = self.thread.clone();
+
            move |_window, cx| {
-                update_settings_file::<AssistantSettings>(fs.clone(), cx, {
-                    let profile_id = profile_id.clone();
-                    move |settings, _cx| {
-                        settings.set_profile(profile_id.clone());
-                    }
+                thread.update(cx, |thread, cx| {
+                    thread.set_configured_profile(Some(profile.clone()), cx);
                });

                thread_store
@@ -146,8 +134,14 @@ impl ProfileSelector {
 impl Render for ProfileSelector {
    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
        let settings = AssistantSettings::get_global(cx);
-        let profile_id = &settings.default_profile;
-        let profile = settings.profiles.get(profile_id);
+        let profile = self
+            .thread
+            .read_with(cx, |thread, _cx| thread.configured_profile())
+            .or_else(|| {
+                let profile_id = &settings.default_profile;
+                let profile = settings.profiles.get(profile_id);
+                profile.cloned()
+            });

        let selected_profile = profile
            .map(|profile| profile.name.clone())
--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
@@ -5,7 +5,7 @@ use std::sync::Arc;
 use std::time::Instant;

 use anyhow::{Result, anyhow};
-use assistant_settings::{AssistantSettings, CompletionMode};
+use assistant_settings::{AgentProfile, AgentProfileId, AssistantSettings, CompletionMode};
 use assistant_tool::{ActionLog, AnyToolCard, Tool, ToolWorkingSet};
 use chrono::{DateTime, Utc};
 use collections::HashMap;
@@ -359,6 +359,7 @@ pub struct Thread {
    >,
    remaining_turns: u32,
    configured_model: Option<ConfiguredModel>,
+    configured_profile: Option<AgentProfile>,
 }

 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -379,6 +380,9 @@ impl Thread {
    ) -> Self {
        let (detailed_summary_tx, detailed_summary_rx) = postage::watch::channel();
        let configured_model = LanguageModelRegistry::read_global(cx).default_model();
+        let assistant_settings = AssistantSettings::get_global(cx);
+        let profile_id = &assistant_settings.default_profile;
+        let configured_profile = assistant_settings.profiles.get(profile_id).cloned();

        Self {
            id: ThreadId::new(),
@@ -421,6 +425,7 @@ impl Thread {
            request_callback: None,
            remaining_turns: u32::MAX,
            configured_model,
+            configured_profile,
        }
    }

@@ -468,6 +473,13 @@ impl Thread {
            .completion_mode
            .unwrap_or_else(|| AssistantSettings::get_global(cx).preferred_completion_mode);

+        let configured_profile = serialized.profile.and_then(|profile| {
+            AssistantSettings::get_global(cx)
+                .profiles
+                .get(&profile)
+                .cloned()
+        });
+
        Self {
            id,
            updated_at: serialized.updated_at,
@@ -541,6 +553,7 @@ impl Thread {
            request_callback: None,
            remaining_turns: u32::MAX,
            configured_model,
+            configured_profile,
        }
    }

@@ -596,6 +609,19 @@ impl Thread {
        cx.notify();
    }

+    pub fn configured_profile(&self) -> Option<AgentProfile> {
+        self.configured_profile.clone()
+    }
+
+    pub fn set_configured_profile(
+        &mut self,
+        profile: Option<AgentProfile>,
+        cx: &mut Context<Self>,
+    ) {
+        self.configured_profile = profile;
+        cx.notify();
+    }
+
    pub const DEFAULT_SUMMARY: SharedString = SharedString::new_static("New Thread");

    pub fn summary_or_default(&self) -> SharedString {
@@ -1100,6 +1126,10 @@ impl Thread {
                        provider: model.provider.id().0.to_string(),
                        model: model.model.id().0.to_string(),
                    }),
+                profile: this
+                    .configured_profile
+                    .as_ref()
+                    .map(|profile| AgentProfileId(profile.name.clone().into())),
                completion_mode: Some(this.completion_mode),
            })
        })
@@ -2466,13 +2496,6 @@ impl Thread {

                writeln!(markdown, "**\n")?;
                writeln!(markdown, "{}", tool_result.content)?;
-                if let Some(output) = tool_result.output.as_ref() {
-                    writeln!(
-                        markdown,
-                        "\n\nDebug Output:\n\n```json\n{}\n```\n",
-                        serde_json::to_string_pretty(output)?
-                    )?;
-                }
            }
        }

--- a/crates/agent/src/thread_history.rs
+++ b/crates/agent/src/thread_history.rs
@@ -2,11 +2,12 @@ use std::fmt::Display;
 use std::ops::Range;
 use std::sync::Arc;

+use assistant_context_editor::SavedContextMetadata;
 use chrono::{Datelike as _, Local, NaiveDate, TimeDelta};
 use editor::{Editor, EditorEvent};
 use fuzzy::{StringMatch, StringMatchCandidate};
 use gpui::{
-    App, ClickEvent, Empty, Entity, FocusHandle, Focusable, ScrollStrategy, Stateful, Task,
+    App, Empty, Entity, FocusHandle, Focusable, ScrollStrategy, Stateful, Task,
    UniformListScrollHandle, WeakEntity, Window, uniform_list,
 };
 use time::{OffsetDateTime, UtcOffset};
@@ -17,6 +18,7 @@ use ui::{
 use util::ResultExt;

 use crate::history_store::{HistoryEntry, HistoryStore};
+use crate::thread_store::SerializedThreadMetadata;
 use crate::{AgentPanel, RemoveSelectedThread};

 pub struct ThreadHistory {
@@ -24,14 +26,11 @@ pub struct ThreadHistory {
    history_store: Entity<HistoryStore>,
    scroll_handle: UniformListScrollHandle,
    selected_index: usize,
-    hovered_index: Option<usize>,
    search_editor: Entity<Editor>,
    all_entries: Arc<Vec<HistoryEntry>>,
    // When the search is empty, we display date separators between history entries
    // This vector contains an enum of either a separator or an actual entry
-    separated_items: Vec<ListItemType>,
-    // Maps entry indexes to list item indexes
-    separated_item_indexes: Vec<u32>,
+    separated_items: Vec<HistoryListItem>,
    _separated_items_task: Option<Task<()>>,
    search_state: SearchState,
    scrollbar_visibility: bool,
@@ -51,7 +50,7 @@ enum SearchState {
    },
 }

-enum ListItemType {
+enum HistoryListItem {
    BucketSeparator(TimeBucket),
    Entry {
        index: usize,
@@ -59,11 +58,11 @@ enum ListItemType {
    },
 }

-impl ListItemType {
+impl HistoryListItem {
    fn entry_index(&self) -> Option<usize> {
        match self {
-            ListItemType::BucketSeparator(_) => None,
-            ListItemType::Entry { index, .. } => Some(*index),
+            HistoryListItem::BucketSeparator(_) => None,
+            HistoryListItem::Entry { index, .. } => Some(*index),
        }
    }
 }
@@ -101,11 +100,9 @@ impl ThreadHistory {
            history_store,
            scroll_handle,
            selected_index: 0,
-            hovered_index: None,
            search_state: SearchState::Empty,
            all_entries: Default::default(),
            separated_items: Default::default(),
-            separated_item_indexes: Default::default(),
            search_editor,
            scrollbar_visibility: true,
            scrollbar_state,
@@ -117,21 +114,35 @@ impl ThreadHistory {
    }

    fn update_all_entries(&mut self, cx: &mut Context<Self>) {
-        let new_entries: Arc<Vec<HistoryEntry>> = self
+        self.all_entries = self
            .history_store
            .update(cx, |store, cx| store.entries(cx))
            .into();

+        self.set_selected_index(0, cx);
+        self.update_separated_items(cx);
+
+        match &self.search_state {
+            SearchState::Empty => {}
+            SearchState::Searching { query, .. } | SearchState::Searched { query, .. } => {
+                self.search(query.clone(), cx);
+            }
+        }
+        cx.notify();
+    }
+
+    fn update_separated_items(&mut self, cx: &mut Context<Self>) {
        self._separated_items_task.take();

-        let mut items = Vec::with_capacity(new_entries.len() + 1);
-        let mut indexes = Vec::with_capacity(new_entries.len() + 1);
+        let mut separated_items = std::mem::take(&mut self.separated_items);
+        separated_items.clear();
+        let all_entries = self.all_entries.clone();

        let bg_task = cx.background_spawn(async move {
            let mut bucket = None;
            let today = Local::now().naive_local().date();

-            for (index, entry) in new_entries.iter().enumerate() {
+            for (index, entry) in all_entries.iter().enumerate() {
                let entry_date = entry
                    .updated_at()
                    .with_timezone(&Local)
@@ -141,50 +152,20 @@ impl ThreadHistory {

                if Some(entry_bucket) != bucket {
                    bucket = Some(entry_bucket);
-                    items.push(ListItemType::BucketSeparator(entry_bucket));
+                    separated_items.push(HistoryListItem::BucketSeparator(entry_bucket));
                }
-
-                indexes.push(items.len() as u32);
-                items.push(ListItemType::Entry {
+                separated_items.push(HistoryListItem::Entry {
                    index,
                    format: entry_bucket.into(),
                });
            }
-            (new_entries, items, indexes)
+            separated_items
        });

        let task = cx.spawn(async move |this, cx| {
-            let (new_entries, items, indexes) = bg_task.await;
+            let separated_items = bg_task.await;
            this.update(cx, |this, cx| {
-                let previously_selected_entry =
-                    this.all_entries.get(this.selected_index).map(|e| e.id());
-
-                this.all_entries = new_entries;
-                this.separated_items = items;
-                this.separated_item_indexes = indexes;
-
-                match &this.search_state {
-                    SearchState::Empty => {
-                        if this.selected_index >= this.all_entries.len() {
-                            this.set_selected_entry_index(
-                                this.all_entries.len().saturating_sub(1),
-                                cx,
-                            );
-                        } else if let Some(prev_id) = previously_selected_entry {
-                            if let Some(new_ix) = this
-                                .all_entries
-                                .iter()
-                                .position(|probe| probe.id() == prev_id)
-                            {
-                                this.set_selected_entry_index(new_ix, cx);
-                            }
-                        }
-                    }
-                    SearchState::Searching { query, .. } | SearchState::Searched { query, .. } => {
-                        this.search(query.clone(), cx);
-                    }
-                }
-
+                this.separated_items = separated_items;
                cx.notify();
            })
            .log_err();
@@ -252,7 +233,7 @@ impl ThreadHistory {
                            matches,
                        };

-                        this.set_selected_entry_index(0, cx);
+                        this.set_selected_index(0, cx);
                        cx.notify();
                    };
                })
@@ -310,9 +291,9 @@ impl ThreadHistory {
        let count = self.matched_count();
        if count > 0 {
            if self.selected_index == 0 {
-                self.set_selected_entry_index(count - 1, cx);
+                self.set_selected_index(count - 1, cx);
            } else {
-                self.set_selected_entry_index(self.selected_index - 1, cx);
+                self.set_selected_index(self.selected_index - 1, cx);
            }
        }
    }
@@ -326,9 +307,9 @@ impl ThreadHistory {
        let count = self.matched_count();
        if count > 0 {
            if self.selected_index == count - 1 {
-                self.set_selected_entry_index(0, cx);
+                self.set_selected_index(0, cx);
            } else {
-                self.set_selected_entry_index(self.selected_index + 1, cx);
+                self.set_selected_index(self.selected_index + 1, cx);
            }
        }
    }
@@ -341,32 +322,21 @@ impl ThreadHistory {
    ) {
        let count = self.matched_count();
        if count > 0 {
-            self.set_selected_entry_index(0, cx);
+            self.set_selected_index(0, cx);
        }
    }

    fn select_last(&mut self, _: &menu::SelectLast, _window: &mut Window, cx: &mut Context<Self>) {
        let count = self.matched_count();
        if count > 0 {
-            self.set_selected_entry_index(count - 1, cx);
+            self.set_selected_index(count - 1, cx);
        }
    }

-    fn set_selected_entry_index(&mut self, entry_index: usize, cx: &mut Context<Self>) {
-        self.selected_index = entry_index;
-
-        let scroll_ix = match self.search_state {
-            SearchState::Empty | SearchState::Searching { .. } => self
-                .separated_item_indexes
-                .get(entry_index)
-                .map(|ix| *ix as usize)
-                .unwrap_or(entry_index + 1),
-            SearchState::Searched { .. } => entry_index,
-        };
-
+    fn set_selected_index(&mut self, index: usize, cx: &mut Context<Self>) {
+        self.selected_index = index;
        self.scroll_handle
-            .scroll_to_item(scroll_ix, ScrollStrategy::Top);
-
+            .scroll_to_item(index, ScrollStrategy::Top);
        cx.notify();
    }

@@ -475,7 +445,7 @@ impl ThreadHistory {
                .map(|(ix, m)| {
                    self.render_list_item(
                        Some(range_start + ix),
-                        &ListItemType::Entry {
+                        &HistoryListItem::Entry {
                            index: m.candidate_id,
                            format: EntryTimeFormat::DateAndTime,
                        },
@@ -493,36 +463,25 @@ impl ThreadHistory {
    fn render_list_item(
        &self,
        list_entry_ix: Option<usize>,
-        item: &ListItemType,
+        item: &HistoryListItem,
        highlight_positions: Vec<usize>,
-        cx: &Context<Self>,
+        cx: &App,
    ) -> AnyElement {
        match item {
-            ListItemType::Entry { index, format } => match self.all_entries.get(*index) {
+            HistoryListItem::Entry { index, format } => match self.all_entries.get(*index) {
                Some(entry) => h_flex()
                    .w_full()
                    .pb_1()
-                    .child(
-                        HistoryEntryElement::new(entry.clone(), self.agent_panel.clone())
-                            .highlight_positions(highlight_positions)
-                            .timestamp_format(*format)
-                            .selected(list_entry_ix == Some(self.selected_index))
-                            .hovered(list_entry_ix == self.hovered_index)
-                            .on_hover(cx.listener(move |this, is_hovered, _window, cx| {
-                                if *is_hovered {
-                                    this.hovered_index = list_entry_ix;
-                                } else if this.hovered_index == list_entry_ix {
-                                    this.hovered_index = None;
-                                }
-
-                                cx.notify();
-                            }))
-                            .into_any_element(),
-                    )
+                    .child(self.render_history_entry(
+                        entry,
+                        list_entry_ix == Some(self.selected_index),
+                        highlight_positions,
+                        *format,
+                    ))
                    .into_any(),
                None => Empty.into_any_element(),
            },
-            ListItemType::BucketSeparator(bucket) => div()
+            HistoryListItem::BucketSeparator(bucket) => div()
                .px(DynamicSpacing::Base06.rems(cx))
                .pt_2()
                .pb_1()
@@ -534,6 +493,33 @@ impl ThreadHistory {
                .into_any_element(),
        }
    }
+
+    fn render_history_entry(
+        &self,
+        entry: &HistoryEntry,
+        is_active: bool,
+        highlight_positions: Vec<usize>,
+        format: EntryTimeFormat,
+    ) -> AnyElement {
+        match entry {
+            HistoryEntry::Thread(thread) => PastThread::new(
+                thread.clone(),
+                self.agent_panel.clone(),
+                is_active,
+                highlight_positions,
+                format,
+            )
+            .into_any_element(),
+            HistoryEntry::Context(context) => PastContext::new(
+                context.clone(),
+                self.agent_panel.clone(),
+                is_active,
+                highlight_positions,
+                format,
+            )
+            .into_any_element(),
+        }
+    }
 }

 impl Focusable for ThreadHistory {
@@ -615,97 +601,155 @@ impl Render for ThreadHistory {
 }

 #[derive(IntoElement)]
-pub struct HistoryEntryElement {
-    entry: HistoryEntry,
+pub struct PastThread {
+    thread: SerializedThreadMetadata,
    agent_panel: WeakEntity<AgentPanel>,
    selected: bool,
-    hovered: bool,
    highlight_positions: Vec<usize>,
    timestamp_format: EntryTimeFormat,
-    on_hover: Box<dyn Fn(&bool, &mut Window, &mut App) + 'static>,
 }

-impl HistoryEntryElement {
-    pub fn new(entry: HistoryEntry, agent_panel: WeakEntity<AgentPanel>) -> Self {
+impl PastThread {
+    pub fn new(
+        thread: SerializedThreadMetadata,
+        agent_panel: WeakEntity<AgentPanel>,
+        selected: bool,
+        highlight_positions: Vec<usize>,
+        timestamp_format: EntryTimeFormat,
+    ) -> Self {
        Self {
-            entry,
+            thread,
            agent_panel,
-            selected: false,
-            hovered: false,
-            highlight_positions: vec![],
-            timestamp_format: EntryTimeFormat::DateAndTime,
-            on_hover: Box::new(|_, _, _| {}),
+            selected,
+            highlight_positions,
+            timestamp_format,
        }
    }
-
-    pub fn selected(mut self, selected: bool) -> Self {
-        self.selected = selected;
-        self
-    }
-
-    pub fn hovered(mut self, hovered: bool) -> Self {
-        self.hovered = hovered;
-        self
-    }
-
-    pub fn highlight_positions(mut self, positions: Vec<usize>) -> Self {
-        self.highlight_positions = positions;
-        self
-    }
-
-    pub fn on_hover(mut self, on_hover: impl Fn(&bool, &mut Window, &mut App) + 'static) -> Self {
-        self.on_hover = Box::new(on_hover);
-        self
-    }
-
-    pub fn timestamp_format(mut self, format: EntryTimeFormat) -> Self {
-        self.timestamp_format = format;
-        self
-    }
 }

-impl RenderOnce for HistoryEntryElement {
+impl RenderOnce for PastThread {
    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
-        let (id, summary, timestamp) = match &self.entry {
-            HistoryEntry::Thread(thread) => (
-                thread.id.to_string(),
-                thread.summary.clone(),
-                thread.updated_at.timestamp(),
-            ),
-            HistoryEntry::Context(context) => (
-                context.path.to_string_lossy().to_string(),
-                context.title.clone().into(),
-                context.mtime.timestamp(),
-            ),
-        };
+        let summary = self.thread.summary;

-        let thread_timestamp =
-            self.timestamp_format
-                .format_timestamp(&self.agent_panel, timestamp, cx);
+        let thread_timestamp = self.timestamp_format.format_timestamp(
+            &self.agent_panel,
+            self.thread.updated_at.timestamp(),
+            cx,
+        );

-        ListItem::new(SharedString::from(id))
+        ListItem::new(SharedString::from(self.thread.id.to_string()))
            .rounded()
            .toggle_state(self.selected)
            .spacing(ListItemSpacing::Sparse)
            .start_slot(
+                div().max_w_4_5().child(
+                    HighlightedLabel::new(summary, self.highlight_positions)
+                        .size(LabelSize::Small)
+                        .truncate(),
+                ),
+            )
+            .end_slot(
                h_flex()
-                    .w_full()
-                    .gap_2()
-                    .justify_between()
-                    .child(
-                        HighlightedLabel::new(summary, self.highlight_positions)
-                            .size(LabelSize::Small)
-                            .truncate(),
-                    )
+                    .gap_1p5()
                    .child(
                        Label::new(thread_timestamp)
                            .color(Color::Muted)
                            .size(LabelSize::XSmall),
+                    )
+                    .child(
+                        IconButton::new("delete", IconName::TrashAlt)
+                            .shape(IconButtonShape::Square)
+                            .icon_size(IconSize::XSmall)
+                            .icon_color(Color::Muted)
+                            .tooltip(move |window, cx| {
+                                Tooltip::for_action("Delete", &RemoveSelectedThread, window, cx)
+                            })
+                            .on_click({
+                                let agent_panel = self.agent_panel.clone();
+                                let id = self.thread.id.clone();
+                                move |_event, _window, cx| {
+                                    agent_panel
+                                        .update(cx, |this, cx| {
+                                            this.delete_thread(&id, cx).detach_and_log_err(cx);
+                                        })
+                                        .ok();
+                                }
+                            }),
                    ),
            )
-            .on_hover(self.on_hover)
-            .end_slot::<IconButton>(if self.hovered || self.selected {
-                Some(
+            .on_click({
+                let agent_panel = self.agent_panel.clone();
+                let id = self.thread.id.clone();
+                move |_event, window, cx| {
+                    agent_panel
+                        .update(cx, |this, cx| {
+                            this.open_thread_by_id(&id, window, cx)
+                                .detach_and_log_err(cx);
+                        })
+                        .ok();
+                }
+            })
+    }
+}
+
+#[derive(IntoElement)]
+pub struct PastContext {
+    context: SavedContextMetadata,
+    agent_panel: WeakEntity<AgentPanel>,
+    selected: bool,
+    highlight_positions: Vec<usize>,
+    timestamp_format: EntryTimeFormat,
+}
+
+impl PastContext {
+    pub fn new(
+        context: SavedContextMetadata,
+        agent_panel: WeakEntity<AgentPanel>,
+        selected: bool,
+        highlight_positions: Vec<usize>,
+        timestamp_format: EntryTimeFormat,
+    ) -> Self {
+        Self {
+            context,
+            agent_panel,
+            selected,
+            highlight_positions,
+            timestamp_format,
+        }
+    }
+}
+
+impl RenderOnce for PastContext {
+    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
+        let summary = self.context.title;
+        let context_timestamp = self.timestamp_format.format_timestamp(
+            &self.agent_panel,
+            self.context.mtime.timestamp(),
+            cx,
+        );
+
+        ListItem::new(SharedString::from(
+            self.context.path.to_string_lossy().to_string(),
+        ))
+        .rounded()
+        .toggle_state(self.selected)
+        .spacing(ListItemSpacing::Sparse)
+        .start_slot(
+            div().max_w_4_5().child(
+                HighlightedLabel::new(summary, self.highlight_positions)
+                    .size(LabelSize::Small)
+                    .truncate(),
+            ),
+        )
+        .end_slot(
+            h_flex()
+                .gap_1p5()
+                .child(
+                    Label::new(context_timestamp)
+                        .color(Color::Muted)
+                        .size(LabelSize::XSmall),
+                )
+                .child(
                    IconButton::new("delete", IconName::TrashAlt)
                        .shape(IconButtonShape::Square)
                        .icon_size(IconSize::XSmall)
@@ -715,70 +759,30 @@ impl RenderOnce for HistoryEntryElement {
                        })
                        .on_click({
                            let agent_panel = self.agent_panel.clone();
-
-                            let f: Box<dyn Fn(&ClickEvent, &mut Window, &mut App) + 'static> =
-                                match &self.entry {
-                                    HistoryEntry::Thread(thread) => {
-                                        let id = thread.id.clone();
-
-                                        Box::new(move |_event, _window, cx| {
-                                            agent_panel
-                                                .update(cx, |this, cx| {
-                                                    this.delete_thread(&id, cx)
-                                                        .detach_and_log_err(cx);
-                                                })
-                                                .ok();
-                                        })
-                                    }
-                                    HistoryEntry::Context(context) => {
-                                        let path = context.path.clone();
-
-                                        Box::new(move |_event, _window, cx| {
-                                            agent_panel
-                                                .update(cx, |this, cx| {
-                                                    this.delete_context(path.clone(), cx)
-                                                        .detach_and_log_err(cx);
-                                                })
-                                                .ok();
-                                        })
-                                    }
-                                };
-                            f
+                            let path = self.context.path.clone();
+                            move |_event, _window, cx| {
+                                agent_panel
+                                    .update(cx, |this, cx| {
+                                        this.delete_context(path.clone(), cx)
+                                            .detach_and_log_err(cx);
+                                    })
+                                    .ok();
+                            }
                        }),
-                )
-            } else {
-                None
-            })
-            .on_click({
-                let agent_panel = self.agent_panel.clone();
-
-                let f: Box<dyn Fn(&ClickEvent, &mut Window, &mut App) + 'static> = match &self.entry
-                {
-                    HistoryEntry::Thread(thread) => {
-                        let id = thread.id.clone();
-                        Box::new(move |_event, window, cx| {
-                            agent_panel
-                                .update(cx, |this, cx| {
-                                    this.open_thread_by_id(&id, window, cx)
-                                        .detach_and_log_err(cx);
-                                })
-                                .ok();
-                        })
-                    }
-                    HistoryEntry::Context(context) => {
-                        let path = context.path.clone();
-                        Box::new(move |_event, window, cx| {
-                            agent_panel
-                                .update(cx, |this, cx| {
-                                    this.open_saved_prompt_editor(path.clone(), window, cx)
-                                        .detach_and_log_err(cx);
-                                })
-                                .ok();
-                        })
-                    }
-                };
-                f
-            })
+                ),
+        )
+        .on_click({
+            let agent_panel = self.agent_panel.clone();
+            let path = self.context.path.clone();
+            move |_event, window, cx| {
+                agent_panel
+                    .update(cx, |this, cx| {
+                        this.open_saved_prompt_editor(path.clone(), window, cx)
+                            .detach_and_log_err(cx);
+                    })
+                    .ok();
+            }
+        })
    }
 }

--- a/crates/agent/src/thread_store.rs
+++ b/crates/agent/src/thread_store.rs
@@ -657,6 +657,8 @@ pub struct SerializedThread {
    pub model: Option<SerializedLanguageModel>,
    #[serde(default)]
    pub completion_mode: Option<CompletionMode>,
+    #[serde(default)]
+    pub profile: Option<AgentProfileId>,
 }

 #[derive(Serialize, Deserialize, Debug)]
@@ -802,6 +804,7 @@ impl LegacySerializedThread {
            exceeded_window_error: None,
            model: None,
            completion_mode: None,
+            profile: None,
        }
    }
 }
--- a/crates/agent/src/ui/preview/usage_callouts.rs
+++ b/crates/agent/src/ui/preview/usage_callouts.rs
@@ -39,7 +39,7 @@ impl RenderOnce for UsageCallout {

        let (title, message, button_text, url) = if is_limit_reached {
            match self.plan {
-                Plan::ZedFree => (
+                Plan::Free => (
                    "Out of free prompts",
                    "Upgrade to continue, wait for the next reset, or switch to API key."
                        .to_string(),
@@ -61,7 +61,7 @@ impl RenderOnce for UsageCallout {
            }
        } else {
            match self.plan {
-                Plan::ZedFree => (
+                Plan::Free => (
                    "Reaching free plan limit soon",
                    format!(
                        "{remaining} remaining - Upgrade to increase limit, or switch providers",
@@ -120,7 +120,7 @@ impl Component for UsageCallout {
                single_example(
                    "Approaching limit (90%)",
                    UsageCallout::new(
-                        Plan::ZedFree,
+                        Plan::Free,
                        RequestUsage {
                            limit: UsageLimit::Limited(50),
                            amount: 45, // 90% of limit
@@ -131,7 +131,7 @@ impl Component for UsageCallout {
                single_example(
                    "Limit reached (100%)",
                    UsageCallout::new(
-                        Plan::ZedFree,
+                        Plan::Free,
                        RequestUsage {
                            limit: UsageLimit::Limited(50),
                            amount: 50, // 100% of limit
--- a/crates/askpass/src/askpass.rs
+++ b/crates/askpass/src/askpass.rs
@@ -167,20 +167,16 @@ fn get_shell_safe_zed_path() -> anyhow::Result<String> {
        .to_string_lossy()
        .to_string();

-    // NOTE: this was previously enabled, however, it caused errors when it shouldn't have
-    //       (see https://github.com/zed-industries/zed/issues/29819)
-    //       The zed path failing to execute within the askpass script results in very vague ssh
-    //       authentication failed errors, so this was done to try and surface a better error
-    //
-    // use std::os::unix::fs::MetadataExt;
-    // let metadata = std::fs::metadata(&zed_path)
-    //     .context("Failed to check metadata of Zed executable path for use in askpass")?;
-    // let is_executable = metadata.is_file() && metadata.mode() & 0o111 != 0;
-    // anyhow::ensure!(
-    //     is_executable,
-    //     "Failed to verify Zed executable path for use in askpass"
-    // );
-
+    // sanity check on unix systems that the path exists and is executable
+    // todo(windows): implement this check for windows (or just use `is-executable` crate)
+    use std::os::unix::fs::MetadataExt;
+    let metadata = std::fs::metadata(&zed_path)
+        .context("Failed to check metadata of Zed executable path for use in askpass")?;
+    let is_executable = metadata.is_file() && metadata.mode() & 0o111 != 0;
+    anyhow::ensure!(
+        is_executable,
+        "Failed to verify Zed executable path for use in askpass"
+    );
    // As of writing, this can only be fail if the path contains a null byte, which shouldn't be possible
    // but shlex has annotated the error as #[non_exhaustive] so we can't make it a compile error if other
    // errors are introduced in the future :(
--- a/crates/assistant_context_editor/Cargo.toml
+++ b/crates/assistant_context_editor/Cargo.toml
@@ -46,6 +46,7 @@ serde_json.workspace = true
 settings.workspace = true
 smallvec.workspace = true
 smol.workspace = true
+strum.workspace = true
 telemetry_events.workspace = true
 text.workspace = true
 theme.workspace = true
--- a/crates/assistant_context_editor/src/assistant_context_editor.rs
+++ b/crates/assistant_context_editor/src/assistant_context_editor.rs
@@ -2,33 +2,22 @@ mod context;
 mod context_editor;
 mod context_history;
 mod context_store;
+mod patch;
 mod slash_command;
 mod slash_command_picker;

 use std::sync::Arc;

 use client::Client;
-use gpui::{App, Context};
-use workspace::Workspace;
+use gpui::App;

 pub use crate::context::*;
 pub use crate::context_editor::*;
 pub use crate::context_history::*;
 pub use crate::context_store::*;
+pub use crate::patch::*;
 pub use crate::slash_command::*;

-pub fn init(client: Arc<Client>, cx: &mut App) {
+pub fn init(client: Arc<Client>, _cx: &mut App) {
    context_store::init(&client.into());
-    workspace::FollowableViewRegistry::register::<ContextEditor>(cx);
-
-    cx.observe_new(
-        |workspace: &mut Workspace, _window, _cx: &mut Context<Workspace>| {
-            workspace
-                .register_action(ContextEditor::quote_selection)
-                .register_action(ContextEditor::insert_selection)
-                .register_action(ContextEditor::copy_code)
-                .register_action(ContextEditor::handle_insert_dragged_files);
-        },
-    )
-    .detach();
 }
--- a/crates/assistant_context_editor/src/context.rs
+++ b/crates/assistant_context_editor/src/context.rs
@@ -1,6 +1,7 @@
 #[cfg(test)]
 mod context_tests;

+use crate::patch::{AssistantEdit, AssistantPatch, AssistantPatchStatus};
 use anyhow::{Context as _, Result, anyhow};
 use assistant_settings::AssistantSettings;
 use assistant_slash_command::{
@@ -36,6 +37,7 @@ use std::{
    iter, mem,
    ops::Range,
    path::Path,
+    str::FromStr as _,
    sync::Arc,
    time::{Duration, Instant},
 };
@@ -120,6 +122,14 @@ impl MessageStatus {
    }
 }

+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum RequestType {
+    /// Request a normal chat response from the model.
+    Chat,
+    /// Add a preamble to the message, which tells the model to return a structured response that suggests edits.
+    SuggestEdits,
+}
+
 #[derive(Clone, Debug)]
 pub enum ContextOperation {
    InsertMessage {
@@ -454,6 +464,10 @@ pub enum ContextEvent {
    StreamedCompletion,
    StartedThoughtProcess(Range<language::Anchor>),
    EndedThoughtProcess(language::Anchor),
+    PatchesUpdated {
+        removed: Vec<Range<language::Anchor>>,
+        updated: Vec<Range<language::Anchor>>,
+    },
    InvokedSlashCommandChanged {
        command_id: InvokedSlashCommandId,
    },
@@ -591,6 +605,26 @@ struct PendingCompletion {
 #[derive(Copy, Clone, Debug, Hash, Eq, PartialEq)]
 pub struct InvokedSlashCommandId(clock::Lamport);

+#[derive(Clone, Debug)]
+pub struct XmlTag {
+    pub kind: XmlTagKind,
+    pub range: Range<text::Anchor>,
+    pub is_open_tag: bool,
+}
+
+#[derive(Copy, Clone, Debug, strum::EnumString, PartialEq, Eq, strum::AsRefStr)]
+#[strum(serialize_all = "snake_case")]
+pub enum XmlTagKind {
+    Patch,
+    Title,
+    Edit,
+    Path,
+    Description,
+    OldText,
+    NewText,
+    Operation,
+}
+
 pub struct AssistantContext {
    id: ContextId,
    timestamp: clock::Lamport,
@@ -619,6 +653,8 @@ pub struct AssistantContext {
    _subscriptions: Vec<Subscription>,
    telemetry: Option<Arc<Telemetry>>,
    language_registry: Arc<LanguageRegistry>,
+    patches: Vec<AssistantPatch>,
+    xml_tags: Vec<XmlTag>,
    project: Option<Entity<Project>>,
    prompt_builder: Arc<PromptBuilder>,
 }
@@ -633,6 +669,18 @@ impl ContextAnnotation for ParsedSlashCommand {
    }
 }

+impl ContextAnnotation for AssistantPatch {
+    fn range(&self) -> &Range<language::Anchor> {
+        &self.range
+    }
+}
+
+impl ContextAnnotation for XmlTag {
+    fn range(&self) -> &Range<language::Anchor> {
+        &self.range
+    }
+}
+
 impl EventEmitter<ContextEvent> for AssistantContext {}

 impl AssistantContext {
@@ -709,6 +757,8 @@ impl AssistantContext {
            project,
            language_registry,
            slash_commands,
+            patches: Vec::new(),
+            xml_tags: Vec::new(),
            prompt_builder,
        };

@@ -1106,6 +1156,48 @@ impl AssistantContext {
        self.summary.as_ref()
    }

+    pub fn patch_containing(&self, position: Point, cx: &App) -> Option<&AssistantPatch> {
+        let buffer = self.buffer.read(cx);
+        let index = self.patches.binary_search_by(|patch| {
+            let patch_range = patch.range.to_point(&buffer);
+            if position < patch_range.start {
+                Ordering::Greater
+            } else if position > patch_range.end {
+                Ordering::Less
+            } else {
+                Ordering::Equal
+            }
+        });
+        if let Ok(ix) = index {
+            Some(&self.patches[ix])
+        } else {
+            None
+        }
+    }
+
+    pub fn patch_ranges(&self) -> impl Iterator<Item = Range<language::Anchor>> + '_ {
+        self.patches.iter().map(|patch| patch.range.clone())
+    }
+
+    pub fn patch_for_range(
+        &self,
+        range: &Range<language::Anchor>,
+        cx: &App,
+    ) -> Option<&AssistantPatch> {
+        let buffer = self.buffer.read(cx);
+        let index = self.patch_index_for_range(range, buffer).ok()?;
+        Some(&self.patches[index])
+    }
+
+    fn patch_index_for_range(
+        &self,
+        tagged_range: &Range<text::Anchor>,
+        buffer: &text::BufferSnapshot,
+    ) -> Result<usize, usize> {
+        self.patches
+            .binary_search_by(|probe| probe.range.cmp(&tagged_range, buffer))
+    }
+
    pub fn parsed_slash_commands(&self) -> &[ParsedSlashCommand] {
        &self.parsed_slash_commands
    }
@@ -1185,7 +1277,7 @@ impl AssistantContext {
        let Some(model) = LanguageModelRegistry::read_global(cx).default_model() else {
            return;
        };
-        let request = self.to_completion_request(Some(&model.model), cx);
+        let request = self.to_completion_request(Some(&model.model), RequestType::Chat, cx);
        let debounce = self.token_count.is_some();
        self.pending_token_count = cx.spawn(async move |this, cx| {
            async move {
@@ -1331,7 +1423,7 @@ impl AssistantContext {
        }

        let request = {
-            let mut req = self.to_completion_request(Some(&model), cx);
+            let mut req = self.to_completion_request(Some(&model), RequestType::Chat, cx);
            // Skip the last message because it's likely to change and
            // therefore would be a waste to cache.
            req.messages.pop();
@@ -1406,6 +1498,8 @@ impl AssistantContext {

        let mut removed_parsed_slash_command_ranges = Vec::new();
        let mut updated_parsed_slash_commands = Vec::new();
+        let mut removed_patches = Vec::new();
+        let mut updated_patches = Vec::new();
        while let Some(mut row_range) = row_ranges.next() {
            while let Some(next_row_range) = row_ranges.peek() {
                if row_range.end >= next_row_range.start {
@@ -1430,6 +1524,13 @@ impl AssistantContext {
                cx,
            );
            self.invalidate_pending_slash_commands(&buffer, cx);
+            self.reparse_patches_in_range(
+                start..end,
+                &buffer,
+                &mut updated_patches,
+                &mut removed_patches,
+                cx,
+            );
        }

        if !updated_parsed_slash_commands.is_empty()
@@ -1440,6 +1541,13 @@ impl AssistantContext {
                updated: updated_parsed_slash_commands,
            });
        }
+
+        if !updated_patches.is_empty() || !removed_patches.is_empty() {
+            cx.emit(ContextEvent::PatchesUpdated {
+                removed: removed_patches,
+                updated: updated_patches,
+            });
+        }
    }

    fn reparse_slash_commands_in_range(
@@ -1530,6 +1638,267 @@ impl AssistantContext {
        }
    }

+    fn reparse_patches_in_range(
+        &mut self,
+        range: Range<text::Anchor>,
+        buffer: &BufferSnapshot,
+        updated: &mut Vec<Range<text::Anchor>>,
+        removed: &mut Vec<Range<text::Anchor>>,
+        cx: &mut Context<Self>,
+    ) {
+        // Rebuild the XML tags in the edited range.
+        let intersecting_tags_range =
+            self.indices_intersecting_buffer_range(&self.xml_tags, range.clone(), cx);
+        let new_tags = self.parse_xml_tags_in_range(buffer, range.clone(), cx);
+        self.xml_tags
+            .splice(intersecting_tags_range.clone(), new_tags);
+
+        // Find which patches intersect the changed range.
+        let intersecting_patches_range =
+            self.indices_intersecting_buffer_range(&self.patches, range.clone(), cx);
+
+        // Reparse all tags after the last unchanged patch before the change.
+        let mut tags_start_ix = 0;
+        if let Some(preceding_unchanged_patch) =
+            self.patches[..intersecting_patches_range.start].last()
+        {
+            tags_start_ix = match self.xml_tags.binary_search_by(|tag| {
+                tag.range
+                    .start
+                    .cmp(&preceding_unchanged_patch.range.end, buffer)
+                    .then(Ordering::Less)
+            }) {
+                Ok(ix) | Err(ix) => ix,
+            };
+        }
+
+        // Rebuild the patches in the range.
+        let new_patches = self.parse_patches(tags_start_ix, range.end, buffer, cx);
+        updated.extend(new_patches.iter().map(|patch| patch.range.clone()));
+        let removed_patches = self.patches.splice(intersecting_patches_range, new_patches);
+        removed.extend(
+            removed_patches
+                .map(|patch| patch.range)
+                .filter(|range| !updated.contains(&range)),
+        );
+    }
+
+    fn parse_xml_tags_in_range(
+        &self,
+        buffer: &BufferSnapshot,
+        range: Range<text::Anchor>,
+        cx: &App,
+    ) -> Vec<XmlTag> {
+        let mut messages = self.messages(cx).peekable();
+
+        let mut tags = Vec::new();
+        let mut lines = buffer.text_for_range(range).lines();
+        let mut offset = lines.offset();
+
+        while let Some(line) = lines.next() {
+            while let Some(message) = messages.peek() {
+                if offset < message.offset_range.end {
+                    break;
+                } else {
+                    messages.next();
+                }
+            }
+
+            let is_assistant_message = messages
+                .peek()
+                .map_or(false, |message| message.role == Role::Assistant);
+            if is_assistant_message {
+                for (start_ix, _) in line.match_indices('<') {
+                    let mut name_start_ix = start_ix + 1;
+                    let closing_bracket_ix = line[start_ix..].find('>').map(|i| start_ix + i);
+                    if let Some(closing_bracket_ix) = closing_bracket_ix {
+                        let end_ix = closing_bracket_ix + 1;
+                        let mut is_open_tag = true;
+                        if line[name_start_ix..closing_bracket_ix].starts_with('/') {
+                            name_start_ix += 1;
+                            is_open_tag = false;
+                        }
+                        let tag_inner = &line[name_start_ix..closing_bracket_ix];
+                        let tag_name_len = tag_inner
+                            .find(|c: char| c.is_whitespace())
+                            .unwrap_or(tag_inner.len());
+                        if let Ok(kind) = XmlTagKind::from_str(&tag_inner[..tag_name_len]) {
+                            tags.push(XmlTag {
+                                range: buffer.anchor_after(offset + start_ix)
+                                    ..buffer.anchor_before(offset + end_ix),
+                                is_open_tag,
+                                kind,
+                            });
+                        };
+                    }
+                }
+            }
+
+            offset = lines.offset();
+        }
+        tags
+    }
+
+    fn parse_patches(
+        &mut self,
+        tags_start_ix: usize,
+        buffer_end: text::Anchor,
+        buffer: &BufferSnapshot,
+        cx: &App,
+    ) -> Vec<AssistantPatch> {
+        let mut new_patches = Vec::new();
+        let mut pending_patch = None;
+        let mut patch_tag_depth = 0;
+        let mut tags = self.xml_tags[tags_start_ix..].iter().peekable();
+        'tags: while let Some(tag) = tags.next() {
+            if tag.range.start.cmp(&buffer_end, buffer).is_gt() && patch_tag_depth == 0 {
+                break;
+            }
+
+            if tag.kind == XmlTagKind::Patch && tag.is_open_tag {
+                patch_tag_depth += 1;
+                let patch_start = tag.range.start;
+                let mut edits = Vec::<Result<AssistantEdit>>::new();
+                let mut patch = AssistantPatch {
+                    range: patch_start..patch_start,
+                    title: String::new().into(),
+                    edits: Default::default(),
+                    status: crate::AssistantPatchStatus::Pending,
+                };
+
+                while let Some(tag) = tags.next() {
+                    if tag.kind == XmlTagKind::Patch && !tag.is_open_tag {
+                        patch_tag_depth -= 1;
+                        if patch_tag_depth == 0 {
+                            patch.range.end = tag.range.end;
+
+                            // Include the line immediately after this <patch> tag if it's empty.
+                            let patch_end_offset = patch.range.end.to_offset(buffer);
+                            let mut patch_end_chars = buffer.chars_at(patch_end_offset);
+                            if patch_end_chars.next() == Some('\n')
+                                && patch_end_chars.next().map_or(true, |ch| ch == '\n')
+                            {
+                                let messages = self.messages_for_offsets(
+                                    [patch_end_offset, patch_end_offset + 1],
+                                    cx,
+                                );
+                                if messages.len() == 1 {
+                                    patch.range.end = buffer.anchor_before(patch_end_offset + 1);
+                                }
+                            }
+
+                            edits.sort_unstable_by(|a, b| {
+                                if let (Ok(a), Ok(b)) = (a, b) {
+                                    a.path.cmp(&b.path)
+                                } else {
+                                    Ordering::Equal
+                                }
+                            });
+                            patch.edits = edits.into();
+                            patch.status = AssistantPatchStatus::Ready;
+                            new_patches.push(patch);
+                            continue 'tags;
+                        }
+                    }
+
+                    if tag.kind == XmlTagKind::Title && tag.is_open_tag {
+                        let content_start = tag.range.end;
+                        while let Some(tag) = tags.next() {
+                            if tag.kind == XmlTagKind::Title && !tag.is_open_tag {
+                                let content_end = tag.range.start;
+                                patch.title =
+                                    trimmed_text_in_range(buffer, content_start..content_end)
+                                        .into();
+                                break;
+                            }
+                        }
+                    }
+
+                    if tag.kind == XmlTagKind::Edit && tag.is_open_tag {
+                        let mut path = None;
+                        let mut old_text = None;
+                        let mut new_text = None;
+                        let mut operation = None;
+                        let mut description = None;
+
+                        while let Some(tag) = tags.next() {
+                            if tag.kind == XmlTagKind::Edit && !tag.is_open_tag {
+                                edits.push(AssistantEdit::new(
+                                    path,
+                                    operation,
+                                    old_text,
+                                    new_text,
+                                    description,
+                                ));
+                                break;
+                            }
+
+                            if tag.is_open_tag
+                                && [
+                                    XmlTagKind::Path,
+                                    XmlTagKind::OldText,
+                                    XmlTagKind::NewText,
+                                    XmlTagKind::Operation,
+                                    XmlTagKind::Description,
+                                ]
+                                .contains(&tag.kind)
+                            {
+                                let kind = tag.kind;
+                                let content_start = tag.range.end;
+                                if let Some(tag) = tags.peek() {
+                                    if tag.kind == kind && !tag.is_open_tag {
+                                        let tag = tags.next().unwrap();
+                                        let content_end = tag.range.start;
+                                        let content = trimmed_text_in_range(
+                                            buffer,
+                                            content_start..content_end,
+                                        );
+                                        match kind {
+                                            XmlTagKind::Path => path = Some(content),
+                                            XmlTagKind::Operation => operation = Some(content),
+                                            XmlTagKind::OldText => {
+                                                old_text = Some(content).filter(|s| !s.is_empty())
+                                            }
+                                            XmlTagKind::NewText => {
+                                                new_text = Some(content).filter(|s| !s.is_empty())
+                                            }
+                                            XmlTagKind::Description => {
+                                                description =
+                                                    Some(content).filter(|s| !s.is_empty())
+                                            }
+                                            _ => {}
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+
+                patch.edits = edits.into();
+                pending_patch = Some(patch);
+            }
+        }
+
+        if let Some(mut pending_patch) = pending_patch {
+            let patch_start = pending_patch.range.start.to_offset(buffer);
+            if let Some(message) = self.message_for_offset(patch_start, cx) {
+                if message.anchor_range.end == text::Anchor::MAX {
+                    pending_patch.range.end = text::Anchor::MAX;
+                } else {
+                    let message_end = buffer.anchor_after(message.offset_range.end - 1);
+                    pending_patch.range.end = message_end;
+                }
+            } else {
+                pending_patch.range.end = text::Anchor::MAX;
+            }
+
+            new_patches.push(pending_patch);
+        }
+
+        new_patches
+    }
+
    pub fn pending_command_for_position(
        &mut self,
        position: language::Anchor,
@@ -1934,7 +2303,11 @@ impl AssistantContext {
        })
    }

-    pub fn assist(&mut self, cx: &mut Context<Self>) -> Option<MessageAnchor> {
+    pub fn assist(
+        &mut self,
+        request_type: RequestType,
+        cx: &mut Context<Self>,
+    ) -> Option<MessageAnchor> {
        let model_registry = LanguageModelRegistry::read_global(cx);
        let model = model_registry.default_model()?;
        let last_message_id = self.get_last_valid_message_id(cx)?;
@@ -1949,7 +2322,7 @@ impl AssistantContext {
        // Compute which messages to cache, including the last one.
        self.mark_cache_anchors(&model.cache_configuration(), false, cx);

-        let request = self.to_completion_request(Some(&model), cx);
+        let request = self.to_completion_request(Some(&model), request_type, cx);

        let assistant_message = self
            .insert_message_after(last_message_id, Role::Assistant, MessageStatus::Pending, cx)
@@ -2190,6 +2563,7 @@ impl AssistantContext {
    pub fn to_completion_request(
        &self,
        model: Option<&Arc<dyn LanguageModel>>,
+        request_type: RequestType,
        cx: &App,
    ) -> LanguageModelRequest {
        let buffer = self.buffer.read(cx);
@@ -2270,6 +2644,25 @@ impl AssistantContext {
            }
        }

+        if let RequestType::SuggestEdits = request_type {
+            if let Ok(preamble) = self.prompt_builder.generate_suggest_edits_prompt() {
+                let last_elem_index = completion_request.messages.len();
+
+                completion_request
+                    .messages
+                    .push(LanguageModelRequestMessage {
+                        role: Role::User,
+                        content: vec![MessageContent::Text(preamble)],
+                        cache: false,
+                    });
+
+                // The preamble message should be sent right before the last actual user message.
+                completion_request
+                    .messages
+                    .swap(last_elem_index, last_elem_index.saturating_sub(1));
+            }
+        }
+
        completion_request
    }

@@ -2304,6 +2697,17 @@ impl AssistantContext {
                ranges.push(message.anchor_range.clone());
            }
        }
+
+        let buffer = self.buffer.read(cx).text_snapshot();
+        let mut updated = Vec::new();
+        let mut removed = Vec::new();
+        for range in ranges {
+            self.reparse_patches_in_range(range, &buffer, &mut updated, &mut removed, cx);
+        }
+
+        if !updated.is_empty() || !removed.is_empty() {
+            cx.emit(ContextEvent::PatchesUpdated { removed, updated })
+        }
    }

    pub fn update_metadata(
@@ -2581,7 +2985,7 @@ impl AssistantContext {
                return;
            }

-            let mut request = self.to_completion_request(Some(&model.model), cx);
+            let mut request = self.to_completion_request(Some(&model.model), RequestType::Chat, cx);
            request.messages.push(LanguageModelRequestMessage {
                role: Role::User,
                content: vec![
@@ -2840,6 +3244,24 @@ impl AssistantContext {
    }
 }

+fn trimmed_text_in_range(buffer: &BufferSnapshot, range: Range<text::Anchor>) -> String {
+    let mut is_start = true;
+    let mut content = buffer
+        .text_for_range(range)
+        .map(|mut chunk| {
+            if is_start {
+                chunk = chunk.trim_start_matches('\n');
+                if !chunk.is_empty() {
+                    is_start = false;
+                }
+            }
+            chunk
+        })
+        .collect::<String>();
+    content.truncate(content.trim_end().len());
+    content
+}
+
 #[derive(Debug, Default)]
 pub struct ContextVersion {
    context: clock::Global,
--- a/crates/assistant_context_editor/src/context/context_tests.rs
+++ b/crates/assistant_context_editor/src/context/context_tests.rs
@@ -1,6 +1,6 @@
 use crate::{
-    AssistantContext, CacheStatus, ContextEvent, ContextId, ContextOperation,
-    InvokedSlashCommandId, MessageCacheMetadata, MessageId, MessageStatus,
+    AssistantContext, AssistantEdit, AssistantEditKind, CacheStatus, ContextEvent, ContextId,
+    ContextOperation, InvokedSlashCommandId, MessageCacheMetadata, MessageId, MessageStatus,
 };
 use anyhow::Result;
 use assistant_slash_command::{
@@ -32,10 +32,13 @@ use std::{
    rc::Rc,
    sync::{Arc, atomic::AtomicBool},
 };
-use text::{ReplicaId, ToOffset, network::Network};
+use text::{OffsetRangeExt as _, ReplicaId, ToOffset, network::Network};
 use ui::{IconName, Window};
 use unindent::Unindent;
-use util::RandomCharIter;
+use util::{
+    RandomCharIter,
+    test::{generate_marked_text, marked_text_ranges},
+};
 use workspace::Workspace;

 #[gpui::test]
@@ -661,6 +664,401 @@ async fn test_slash_commands(cx: &mut TestAppContext) {
    }
 }

+#[gpui::test]
+async fn test_workflow_step_parsing(cx: &mut TestAppContext) {
+    cx.update(|cx| {
+        init_test(cx);
+        cx.update_global(|settings_store: &mut SettingsStore, cx| {
+            settings_store
+                .set_user_settings(
+                    r#"{ "assistant": { "enable_experimental_live_diffs": true } }"#,
+                    cx,
+                )
+                .unwrap()
+        })
+    });
+    let fs = FakeFs::new(cx.executor());
+    let project = Project::test(fs, [Path::new("/root")], cx).await;
+
+    let registry = Arc::new(LanguageRegistry::test(cx.executor()));
+
+    // Create a new context
+    let prompt_builder = Arc::new(PromptBuilder::new(None).unwrap());
+    let context = cx.new(|cx| {
+        AssistantContext::local(
+            registry.clone(),
+            Some(project),
+            None,
+            prompt_builder.clone(),
+            Arc::new(SlashCommandWorkingSet::default()),
+            cx,
+        )
+    });
+
+    // Insert an assistant message to simulate a response.
+    let assistant_message_id = context.update(cx, |context, cx| {
+        let user_message_id = context.messages(cx).next().unwrap().id;
+        context
+            .insert_message_after(user_message_id, Role::Assistant, MessageStatus::Done, cx)
+            .unwrap()
+            .id
+    });
+
+    // No edit tags
+    edit(
+        &context,
+        "
+
+        «one
+        two
+        »",
+        cx,
+    );
+    expect_patches(
+        &context,
+        "
+
+        one
+        two
+        ",
+        &[],
+        cx,
+    );
+
+    // Partial edit step tag is added
+    edit(
+        &context,
+        "
+
+        one
+        two
+        «
+        <patch»",
+        cx,
+    );
+    expect_patches(
+        &context,
+        "
+
+        one
+        two
+
+        <patch",
+        &[],
+        cx,
+    );
+
+    // The rest of the step tag is added. The unclosed
+    // step is treated as incomplete.
+    edit(
+        &context,
+        "
+
+        one
+        two
+
+        <patch«>
+        <edit>»",
+        cx,
+    );
+    expect_patches(
+        &context,
+        "
+
+        one
+        two
+
+        «<patch>
+        <edit>»",
+        &[&[]],
+        cx,
+    );
+
+    // The full patch is added
+    edit(
+        &context,
+        "
+
+        one
+        two
+
+        <patch>
+        <edit>«
+        <description>add a `two` function</description>
+        <path>src/lib.rs</path>
+        <operation>insert_after</operation>
+        <old_text>fn one</old_text>
+        <new_text>
+        fn two() {}
+        </new_text>
+        </edit>
+        </patch>
+
+        also,»",
+        cx,
+    );
+    expect_patches(
+        &context,
+        "
+
+        one
+        two
+
+        «<patch>
+        <edit>
+        <description>add a `two` function</description>
+        <path>src/lib.rs</path>
+        <operation>insert_after</operation>
+        <old_text>fn one</old_text>
+        <new_text>
+        fn two() {}
+        </new_text>
+        </edit>
+        </patch>
+        »
+        also,",
+        &[&[AssistantEdit {
+            path: "src/lib.rs".into(),
+            kind: AssistantEditKind::InsertAfter {
+                old_text: "fn one".into(),
+                new_text: "fn two() {}".into(),
+                description: Some("add a `two` function".into()),
+            },
+        }]],
+        cx,
+    );
+
+    // The step is manually edited.
+    edit(
+        &context,
+        "
+
+        one
+        two
+
+        <patch>
+        <edit>
+        <description>add a `two` function</description>
+        <path>src/lib.rs</path>
+        <operation>insert_after</operation>
+        <old_text>«fn zero»</old_text>
+        <new_text>
+        fn two() {}
+        </new_text>
+        </edit>
+        </patch>
+
+        also,",
+        cx,
+    );
+    expect_patches(
+        &context,
+        "
+
+        one
+        two
+
+        «<patch>
+        <edit>
+        <description>add a `two` function</description>
+        <path>src/lib.rs</path>
+        <operation>insert_after</operation>
+        <old_text>fn zero</old_text>
+        <new_text>
+        fn two() {}
+        </new_text>
+        </edit>
+        </patch>
+        »
+        also,",
+        &[&[AssistantEdit {
+            path: "src/lib.rs".into(),
+            kind: AssistantEditKind::InsertAfter {
+                old_text: "fn zero".into(),
+                new_text: "fn two() {}".into(),
+                description: Some("add a `two` function".into()),
+            },
+        }]],
+        cx,
+    );
+
+    // When setting the message role to User, the steps are cleared.
+    context.update(cx, |context, cx| {
+        context.cycle_message_roles(HashSet::from_iter([assistant_message_id]), cx);
+        context.cycle_message_roles(HashSet::from_iter([assistant_message_id]), cx);
+    });
+    expect_patches(
+        &context,
+        "
+
+        one
+        two
+
+        <patch>
+        <edit>
+        <description>add a `two` function</description>
+        <path>src/lib.rs</path>
+        <operation>insert_after</operation>
+        <old_text>fn zero</old_text>
+        <new_text>
+        fn two() {}
+        </new_text>
+        </edit>
+        </patch>
+
+        also,",
+        &[],
+        cx,
+    );
+
+    // When setting the message role back to Assistant, the steps are reparsed.
+    context.update(cx, |context, cx| {
+        context.cycle_message_roles(HashSet::from_iter([assistant_message_id]), cx);
+    });
+    expect_patches(
+        &context,
+        "
+
+        one
+        two
+
+        «<patch>
+        <edit>
+        <description>add a `two` function</description>
+        <path>src/lib.rs</path>
+        <operation>insert_after</operation>
+        <old_text>fn zero</old_text>
+        <new_text>
+        fn two() {}
+        </new_text>
+        </edit>
+        </patch>
+        »
+        also,",
+        &[&[AssistantEdit {
+            path: "src/lib.rs".into(),
+            kind: AssistantEditKind::InsertAfter {
+                old_text: "fn zero".into(),
+                new_text: "fn two() {}".into(),
+                description: Some("add a `two` function".into()),
+            },
+        }]],
+        cx,
+    );
+
+    // Ensure steps are re-parsed when deserializing.
+    let serialized_context = context.read_with(cx, |context, cx| context.serialize(cx));
+    let deserialized_context = cx.new(|cx| {
+        AssistantContext::deserialize(
+            serialized_context,
+            Path::new("").into(),
+            registry.clone(),
+            prompt_builder.clone(),
+            Arc::new(SlashCommandWorkingSet::default()),
+            None,
+            None,
+            cx,
+        )
+    });
+    expect_patches(
+        &deserialized_context,
+        "
+
+        one
+        two
+
+        «<patch>
+        <edit>
+        <description>add a `two` function</description>
+        <path>src/lib.rs</path>
+        <operation>insert_after</operation>
+        <old_text>fn zero</old_text>
+        <new_text>
+        fn two() {}
+        </new_text>
+        </edit>
+        </patch>
+        »
+        also,",
+        &[&[AssistantEdit {
+            path: "src/lib.rs".into(),
+            kind: AssistantEditKind::InsertAfter {
+                old_text: "fn zero".into(),
+                new_text: "fn two() {}".into(),
+                description: Some("add a `two` function".into()),
+            },
+        }]],
+        cx,
+    );
+
+    fn edit(
+        context: &Entity<AssistantContext>,
+        new_text_marked_with_edits: &str,
+        cx: &mut TestAppContext,
+    ) {
+        context.update(cx, |context, cx| {
+            context.buffer.update(cx, |buffer, cx| {
+                buffer.edit_via_marked_text(&new_text_marked_with_edits.unindent(), None, cx);
+            });
+        });
+        cx.executor().run_until_parked();
+    }
+
+    #[track_caller]
+    fn expect_patches(
+        context: &Entity<AssistantContext>,
+        expected_marked_text: &str,
+        expected_suggestions: &[&[AssistantEdit]],
+        cx: &mut TestAppContext,
+    ) {
+        let expected_marked_text = expected_marked_text.unindent();
+        let (expected_text, _) = marked_text_ranges(&expected_marked_text, false);
+
+        let (buffer_text, ranges, patches) = context.update(cx, |context, cx| {
+            context.buffer.read_with(cx, |buffer, _| {
+                let ranges = context
+                    .patches
+                    .iter()
+                    .map(|entry| entry.range.to_offset(buffer))
+                    .collect::<Vec<_>>();
+                (
+                    buffer.text(),
+                    ranges,
+                    context
+                        .patches
+                        .iter()
+                        .map(|step| step.edits.clone())
+                        .collect::<Vec<_>>(),
+                )
+            })
+        });
+
+        assert_eq!(buffer_text, expected_text);
+
+        let actual_marked_text = generate_marked_text(&expected_text, &ranges, false);
+        assert_eq!(actual_marked_text, expected_marked_text);
+
+        assert_eq!(
+            patches
+                .iter()
+                .map(|patch| {
+                    patch
+                        .iter()
+                        .map(|edit| {
+                            let edit = edit.as_ref().unwrap();
+                            AssistantEdit {
+                                path: edit.path.clone(),
+                                kind: edit.kind.clone(),
+                            }
+                        })
+                        .collect::<Vec<_>>()
+                })
+                .collect::<Vec<_>>(),
+            expected_suggestions
+        );
+    }
+}
+
 #[gpui::test]
 async fn test_serialization(cx: &mut TestAppContext) {
    cx.update(init_test);
--- a/crates/assistant_context_editor/src/context_editor.rs
+++ b/crates/assistant_context_editor/src/context_editor.rs
@@ -9,11 +9,11 @@ use client::{proto, zed_urls};
 use collections::{BTreeSet, HashMap, HashSet, hash_map};
 use editor::{
    Anchor, Editor, EditorEvent, MenuInlineCompletionsPolicy, MultiBuffer, MultiBufferSnapshot,
-    RowExt, ToOffset as _, ToPoint,
+    ProposedChangeLocation, ProposedChangesEditor, RowExt, ToOffset as _, ToPoint,
    actions::{MoveToEndOfLine, Newline, ShowCompletions},
    display_map::{
-        BlockPlacement, BlockProperties, BlockStyle, Crease, CreaseMetadata, CustomBlockId, FoldId,
-        RenderBlock, ToDisplayPoint,
+        BlockContext, BlockId, BlockPlacement, BlockProperties, BlockStyle, Crease, CreaseMetadata,
+        CustomBlockId, FoldId, RenderBlock, ToDisplayPoint,
    },
    scroll::Autoscroll,
 };
@@ -21,11 +21,12 @@ use editor::{FoldPlaceholder, display_map::CreaseId};
 use fs::Fs;
 use futures::FutureExt;
 use gpui::{
-    Animation, AnimationExt, AnyElement, AnyView, App, ClipboardEntry, ClipboardItem, Empty,
-    Entity, EventEmitter, FocusHandle, Focusable, FontWeight, Global, InteractiveElement,
-    IntoElement, ParentElement, Pixels, Render, RenderImage, SharedString, Size,
-    StatefulInteractiveElement, Styled, Subscription, Task, Transformation, WeakEntity, actions,
-    div, img, impl_internal_actions, percentage, point, prelude::*, pulsating_between, size,
+    Animation, AnimationExt, AnyElement, AnyView, App, AsyncWindowContext, ClipboardEntry,
+    ClipboardItem, CursorStyle, Empty, Entity, EventEmitter, FocusHandle, Focusable, FontWeight,
+    Global, InteractiveElement, IntoElement, ParentElement, Pixels, Render, RenderImage,
+    SharedString, Size, StatefulInteractiveElement, Styled, Subscription, Task, Transformation,
+    WeakEntity, actions, div, img, impl_internal_actions, percentage, point, prelude::*,
+    pulsating_between, size,
 };
 use indexed_docs::IndexedDocsStore;
 use language::{
@@ -68,14 +69,14 @@ use workspace::{
    Save, Toast, ToolbarItemEvent, ToolbarItemLocation, ToolbarItemView, Workspace,
    item::{self, FollowableItem, Item, ItemHandle},
    notifications::NotificationId,
-    pane,
+    pane::{self, SaveIntent},
    searchable::{SearchEvent, SearchableItem},
 };

 use crate::{
-    AssistantContext, CacheStatus, Content, ContextEvent, ContextId, InvokedSlashCommandId,
-    InvokedSlashCommandStatus, Message, MessageId, MessageMetadata, MessageStatus,
-    ParsedSlashCommand, PendingSlashCommandStatus,
+    AssistantContext, AssistantPatch, AssistantPatchStatus, CacheStatus, Content, ContextEvent,
+    ContextId, InvokedSlashCommandId, InvokedSlashCommandStatus, Message, MessageId,
+    MessageMetadata, MessageStatus, ParsedSlashCommand, PendingSlashCommandStatus, RequestType,
 };
 use crate::{
    ThoughtProcessOutputSection, slash_command::SlashCommandCompletionProvider,
@@ -89,6 +90,7 @@ actions!(
        ConfirmCommand,
        CopyCode,
        CycleMessageRole,
+        Edit,
        InsertIntoEditor,
        QuoteSelection,
        Split,
@@ -109,10 +111,22 @@ struct ScrollPosition {
    cursor: Anchor,
 }

+struct PatchViewState {
+    crease_id: CreaseId,
+    editor: Option<PatchEditorState>,
+    update_task: Option<Task<()>>,
+}
+
+struct PatchEditorState {
+    editor: WeakEntity<ProposedChangesEditor>,
+    opened_patch: AssistantPatch,
+}
+
 type MessageHeader = MessageMetadata;

 #[derive(Clone)]
 enum AssistError {
+    FileRequired,
    PaymentRequired,
    MaxMonthlySpendReached,
    Message(SharedString),
@@ -190,6 +204,8 @@ pub struct ContextEditor {
    pending_slash_command_creases: HashMap<Range<language::Anchor>, CreaseId>,
    invoked_slash_command_creases: HashMap<InvokedSlashCommandId, CreaseId>,
    _subscriptions: Vec<Subscription>,
+    patches: HashMap<Range<language::Anchor>, PatchViewState>,
+    active_patch: Option<Range<language::Anchor>>,
    last_error: Option<AssistError>,
    show_accept_terms: bool,
    pub(crate) slash_menu_handle:
@@ -226,9 +242,9 @@ impl ContextEditor {
        let editor = cx.new(|cx| {
            let mut editor =
                Editor::for_buffer(context.read(cx).buffer().clone(), None, window, cx);
-            editor.disable_scrollbars_and_minimap(window, cx);
            editor.set_soft_wrap_mode(SoftWrap::EditorWidth, cx);
            editor.set_show_line_numbers(false, cx);
+            editor.set_show_scrollbars(false, cx);
            editor.set_show_git_diff_gutter(false, cx);
            editor.set_show_code_actions(false, cx);
            editor.set_show_runnables(false, cx);
@@ -258,6 +274,7 @@ impl ContextEditor {

        let slash_command_sections = context.read(cx).slash_command_output_sections().to_vec();
        let thought_process_sections = context.read(cx).thought_process_output_sections().to_vec();
+        let patch_ranges = context.read(cx).patch_ranges().collect::<Vec<_>>();
        let slash_commands = context.read(cx).slash_commands().clone();
        let mut this = Self {
            context,
@@ -275,6 +292,8 @@ impl ContextEditor {
            pending_slash_command_creases: HashMap::default(),
            invoked_slash_command_creases: HashMap::default(),
            _subscriptions,
+            patches: HashMap::default(),
+            active_patch: None,
            last_error: None,
            show_accept_terms: false,
            slash_menu_handle: Default::default(),
@@ -305,6 +324,7 @@ impl ContextEditor {
            window,
            cx,
        );
+        this.patches_updated(&Vec::new(), &patch_ranges, window, cx);
        this
    }

@@ -347,13 +367,34 @@ impl ContextEditor {
    }

    fn assist(&mut self, _: &Assist, window: &mut Window, cx: &mut Context<Self>) {
-        if self.sending_disabled(cx) {
-            return;
-        }
-        self.send_to_model(window, cx);
+        self.send_to_model(RequestType::Chat, window, cx);
    }

-    fn send_to_model(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+    fn edit(&mut self, _: &Edit, window: &mut Window, cx: &mut Context<Self>) {
+        self.send_to_model(RequestType::SuggestEdits, window, cx);
+    }
+
+    fn focus_active_patch(&mut self, window: &mut Window, cx: &mut Context<Self>) -> bool {
+        if let Some((_range, patch)) = self.active_patch() {
+            if let Some(editor) = patch
+                .editor
+                .as_ref()
+                .and_then(|state| state.editor.upgrade())
+            {
+                editor.focus_handle(cx).focus(window);
+                return true;
+            }
+        }
+
+        false
+    }
+
+    fn send_to_model(
+        &mut self,
+        request_type: RequestType,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
        let provider = LanguageModelRegistry::read_global(cx)
            .default_model()
            .map(|default| default.provider);
@@ -366,9 +407,19 @@ impl ContextEditor {
            return;
        }

+        if self.focus_active_patch(window, cx) {
+            return;
+        }
+
        self.last_error = None;

-        if let Some(user_message) = self.context.update(cx, |context, cx| context.assist(cx)) {
+        if request_type == RequestType::SuggestEdits && !self.context.read(cx).contains_files(cx) {
+            self.last_error = Some(AssistError::FileRequired);
+            cx.notify();
+        } else if let Some(user_message) = self
+            .context
+            .update(cx, |context, cx| context.assist(request_type, cx))
+        {
            let new_selection = {
                let cursor = user_message
                    .start
@@ -633,6 +684,9 @@ impl ContextEditor {
                    }
                });
            }
+            ContextEvent::PatchesUpdated { removed, updated } => {
+                self.patches_updated(removed, updated, window, cx);
+            }
            ContextEvent::ParsedSlashCommandsUpdated { removed, updated } => {
                self.editor.update(cx, |editor, cx| {
                    let buffer = editor.buffer().read(cx).snapshot(cx);
@@ -837,6 +891,131 @@ impl ContextEditor {
        });
    }

+    fn patches_updated(
+        &mut self,
+        removed: &Vec<Range<text::Anchor>>,
+        updated: &Vec<Range<text::Anchor>>,
+        window: &mut Window,
+        cx: &mut Context<ContextEditor>,
+    ) {
+        let this = cx.entity().downgrade();
+        let mut editors_to_close = Vec::new();
+
+        self.editor.update(cx, |editor, cx| {
+            let snapshot = editor.snapshot(window, cx);
+            let multibuffer = &snapshot.buffer_snapshot;
+            let (&excerpt_id, _, _) = multibuffer.as_singleton().unwrap();
+
+            let mut removed_crease_ids = Vec::new();
+            let mut ranges_to_unfold: Vec<Range<Anchor>> = Vec::new();
+            for range in removed {
+                if let Some(state) = self.patches.remove(range) {
+                    let patch_start = multibuffer
+                        .anchor_in_excerpt(excerpt_id, range.start)
+                        .unwrap();
+                    let patch_end = multibuffer
+                        .anchor_in_excerpt(excerpt_id, range.end)
+                        .unwrap();
+
+                    editors_to_close.extend(state.editor.and_then(|state| state.editor.upgrade()));
+                    ranges_to_unfold.push(patch_start..patch_end);
+                    removed_crease_ids.push(state.crease_id);
+                }
+            }
+            editor.unfold_ranges(&ranges_to_unfold, true, false, cx);
+            editor.remove_creases(removed_crease_ids, cx);
+
+            for range in updated {
+                let Some(patch) = self.context.read(cx).patch_for_range(&range, cx).cloned() else {
+                    continue;
+                };
+
+                let path_count = patch.path_count();
+                let patch_start = multibuffer
+                    .anchor_in_excerpt(excerpt_id, patch.range.start)
+                    .unwrap();
+                let patch_end = multibuffer
+                    .anchor_in_excerpt(excerpt_id, patch.range.end)
+                    .unwrap();
+                let render_block: RenderBlock = Arc::new({
+                    let this = this.clone();
+                    let patch_range = range.clone();
+                    move |cx: &mut BlockContext| {
+                        let max_width = cx.max_width;
+                        let gutter_width = cx.gutter_dimensions.full_width();
+                        let block_id = cx.block_id;
+                        let selected = cx.selected;
+                        let window = &mut cx.window;
+                        this.update(cx.app, |this, cx| {
+                            this.render_patch_block(
+                                patch_range.clone(),
+                                max_width,
+                                gutter_width,
+                                block_id,
+                                selected,
+                                window,
+                                cx,
+                            )
+                        })
+                        .ok()
+                        .flatten()
+                        .unwrap_or_else(|| Empty.into_any())
+                    }
+                });
+
+                let height = path_count as u32 + 1;
+                let crease = Crease::block(
+                    patch_start..patch_end,
+                    height,
+                    BlockStyle::Flex,
+                    render_block.clone(),
+                );
+
+                let should_refold;
+                if let Some(state) = self.patches.get_mut(&range) {
+                    if let Some(editor_state) = &state.editor {
+                        if editor_state.opened_patch != patch {
+                            state.update_task = Some({
+                                let this = this.clone();
+                                cx.spawn_in(window, async move |_, cx| {
+                                    Self::update_patch_editor(this.clone(), patch, cx)
+                                        .await
+                                        .log_err();
+                                })
+                            });
+                        }
+                    }
+
+                    should_refold =
+                        snapshot.intersects_fold(patch_start.to_offset(&snapshot.buffer_snapshot));
+                } else {
+                    let crease_id = editor.insert_creases([crease.clone()], cx)[0];
+                    self.patches.insert(
+                        range.clone(),
+                        PatchViewState {
+                            crease_id,
+                            editor: None,
+                            update_task: None,
+                        },
+                    );
+
+                    should_refold = true;
+                }
+
+                if should_refold {
+                    editor.unfold_ranges(&[patch_start..patch_end], true, false, cx);
+                    editor.fold_creases(vec![crease], false, window, cx);
+                }
+            }
+        });
+
+        for editor in editors_to_close {
+            self.close_patch_editor(editor, window, cx);
+        }
+
+        self.update_active_patch(window, cx);
+    }
+
    fn insert_thought_process_output_sections(
        &mut self,
        sections: impl IntoIterator<
@@ -965,12 +1144,177 @@ impl ContextEditor {
            }
            EditorEvent::SelectionsChanged { .. } => {
                self.scroll_position = self.cursor_scroll_position(window, cx);
+                self.update_active_patch(window, cx);
            }
            _ => {}
        }
        cx.emit(event.clone());
    }

+    fn active_patch(&self) -> Option<(Range<text::Anchor>, &PatchViewState)> {
+        let patch = self.active_patch.as_ref()?;
+        Some((patch.clone(), self.patches.get(&patch)?))
+    }
+
+    fn update_active_patch(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let newest_cursor = self.editor.update(cx, |editor, cx| {
+            editor.selections.newest::<Point>(cx).head()
+        });
+        let context = self.context.read(cx);
+
+        let new_patch = context.patch_containing(newest_cursor, cx).cloned();
+
+        if new_patch.as_ref().map(|p| &p.range) == self.active_patch.as_ref() {
+            return;
+        }
+
+        if let Some(old_patch_range) = self.active_patch.take() {
+            if let Some(patch_state) = self.patches.get_mut(&old_patch_range) {
+                if let Some(state) = patch_state.editor.take() {
+                    if let Some(editor) = state.editor.upgrade() {
+                        self.close_patch_editor(editor, window, cx);
+                    }
+                }
+            }
+        }
+
+        if let Some(new_patch) = new_patch {
+            self.active_patch = Some(new_patch.range.clone());
+
+            if let Some(patch_state) = self.patches.get_mut(&new_patch.range) {
+                let mut editor = None;
+                if let Some(state) = &patch_state.editor {
+                    if let Some(opened_editor) = state.editor.upgrade() {
+                        editor = Some(opened_editor);
+                    }
+                }
+
+                if let Some(editor) = editor {
+                    self.workspace
+                        .update(cx, |workspace, cx| {
+                            workspace.activate_item(&editor, true, false, window, cx);
+                        })
+                        .ok();
+                } else {
+                    patch_state.update_task = Some(cx.spawn_in(window, async move |this, cx| {
+                        Self::open_patch_editor(this, new_patch, cx).await.log_err();
+                    }));
+                }
+            }
+        }
+    }
+
+    fn close_patch_editor(
+        &mut self,
+        editor: Entity<ProposedChangesEditor>,
+        window: &mut Window,
+        cx: &mut Context<ContextEditor>,
+    ) {
+        self.workspace
+            .update(cx, |workspace, cx| {
+                if let Some(pane) = workspace.pane_for(&editor) {
+                    pane.update(cx, |pane, cx| {
+                        let item_id = editor.entity_id();
+                        if !editor.read(cx).focus_handle(cx).is_focused(window) {
+                            pane.close_item_by_id(item_id, SaveIntent::Skip, window, cx)
+                                .detach_and_log_err(cx);
+                        }
+                    });
+                }
+            })
+            .ok();
+    }
+
+    async fn open_patch_editor(
+        this: WeakEntity<Self>,
+        patch: AssistantPatch,
+        cx: &mut AsyncWindowContext,
+    ) -> Result<()> {
+        let project = this.read_with(cx, |this, _| this.project.clone())?;
+        let resolved_patch = patch.resolve(project.clone(), cx).await;
+
+        let editor = cx.new_window_entity(|window, cx| {
+            let editor = ProposedChangesEditor::new(
+                patch.title.clone(),
+                resolved_patch
+                    .edit_groups
+                    .iter()
+                    .map(|(buffer, groups)| ProposedChangeLocation {
+                        buffer: buffer.clone(),
+                        ranges: groups
+                            .iter()
+                            .map(|group| group.context_range.clone())
+                            .collect(),
+                    })
+                    .collect(),
+                Some(project.clone()),
+                window,
+                cx,
+            );
+            resolved_patch.apply(&editor, cx);
+            editor
+        })?;
+
+        this.update(cx, |this, _| {
+            if let Some(patch_state) = this.patches.get_mut(&patch.range) {
+                patch_state.editor = Some(PatchEditorState {
+                    editor: editor.downgrade(),
+                    opened_patch: patch,
+                });
+                patch_state.update_task.take();
+            }
+        })?;
+        this.read_with(cx, |this, _| this.workspace.clone())?
+            .update_in(cx, |workspace, window, cx| {
+                workspace.add_item_to_active_pane(Box::new(editor.clone()), None, false, window, cx)
+            })
+            .log_err();
+
+        Ok(())
+    }
+
+    async fn update_patch_editor(
+        this: WeakEntity<Self>,
+        patch: AssistantPatch,
+        cx: &mut AsyncWindowContext,
+    ) -> Result<()> {
+        let project = this.update(cx, |this, _| this.project.clone())?;
+        let resolved_patch = patch.resolve(project.clone(), cx).await;
+        this.update_in(cx, |this, window, cx| {
+            let patch_state = this.patches.get_mut(&patch.range)?;
+
+            let locations = resolved_patch
+                .edit_groups
+                .iter()
+                .map(|(buffer, groups)| ProposedChangeLocation {
+                    buffer: buffer.clone(),
+                    ranges: groups
+                        .iter()
+                        .map(|group| group.context_range.clone())
+                        .collect(),
+                })
+                .collect();
+
+            if let Some(state) = &mut patch_state.editor {
+                if let Some(editor) = state.editor.upgrade() {
+                    editor.update(cx, |editor, cx| {
+                        editor.set_title(patch.title.clone(), cx);
+                        editor.reset_locations(locations, window, cx);
+                        resolved_patch.apply(editor, cx);
+                    });
+
+                    state.opened_patch = patch;
+                } else {
+                    patch_state.editor.take();
+                }
+            }
+            patch_state.update_task.take();
+
+            Some(())
+        })?;
+        Ok(())
+    }
+
    fn handle_editor_search_event(
        &mut self,
        _: &Entity<Editor>,
@@ -1144,7 +1488,7 @@ impl ContextEditor {

                        h_flex()
                            .id(("message_header", message_id.as_u64()))
-                            .pl(cx.margins.gutter.full_width())
+                            .pl(cx.gutter_dimensions.full_width())
                            .h_11()
                            .w_full()
                            .relative()
@@ -1239,7 +1583,6 @@ impl ContextEditor {
                ),
                priority: usize::MAX,
                render: render_block(MessageMetadata::from(message)),
-                render_in_minimap: false,
            };
            let mut new_blocks = vec![];
            let mut block_index_to_message = vec![];
@@ -1814,12 +2157,12 @@ impl ContextEditor {
                            let image_size = size_for_image(
                                &image,
                                size(
-                                    cx.max_width - cx.margins.gutter.full_width(),
+                                    cx.max_width - cx.gutter_dimensions.full_width(),
                                    MAX_HEIGHT_IN_LINES as f32 * cx.line_height,
                                ),
                            );
                            h_flex()
-                                .pl(cx.margins.gutter.full_width())
+                                .pl(cx.gutter_dimensions.full_width())
                                .child(
                                    img(image.clone())
                                        .object_fit(gpui::ObjectFit::ScaleDown)
@@ -1829,7 +2172,6 @@ impl ContextEditor {
                                .into_any_element()
                        }),
                        priority: 0,
-                        render_in_minimap: false,
                    })
                })
                .collect::<Vec<_>>();
@@ -1863,6 +2205,118 @@ impl ContextEditor {
        self.context.read(cx).summary_or_default()
    }

+    fn render_patch_block(
+        &mut self,
+        range: Range<text::Anchor>,
+        max_width: Pixels,
+        gutter_width: Pixels,
+        id: BlockId,
+        selected: bool,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Option<AnyElement> {
+        let snapshot = self
+            .editor
+            .update(cx, |editor, cx| editor.snapshot(window, cx));
+        let (excerpt_id, _buffer_id, _) = snapshot.buffer_snapshot.as_singleton().unwrap();
+        let excerpt_id = *excerpt_id;
+        let anchor = snapshot
+            .buffer_snapshot
+            .anchor_in_excerpt(excerpt_id, range.start)
+            .unwrap();
+
+        let theme = cx.theme().clone();
+        let patch = self.context.read(cx).patch_for_range(&range, cx)?;
+        let paths = patch
+            .paths()
+            .map(|p| SharedString::from(p.to_string()))
+            .collect::<BTreeSet<_>>();
+
+        Some(
+            v_flex()
+                .id(id)
+                .bg(theme.colors().editor_background)
+                .ml(gutter_width)
+                .pb_1()
+                .w(max_width - gutter_width)
+                .rounded_sm()
+                .border_1()
+                .border_color(theme.colors().border_variant)
+                .overflow_hidden()
+                .hover(|style| style.border_color(theme.colors().text_accent))
+                .when(selected, |this| {
+                    this.border_color(theme.colors().text_accent)
+                })
+                .cursor(CursorStyle::PointingHand)
+                .on_click(cx.listener(move |this, _, window, cx| {
+                    this.editor.update(cx, |editor, cx| {
+                        editor.change_selections(None, window, cx, |selections| {
+                            selections.select_ranges(vec![anchor..anchor]);
+                        });
+                    });
+                    this.focus_active_patch(window, cx);
+                }))
+                .child(
+                    div()
+                        .px_2()
+                        .py_1()
+                        .overflow_hidden()
+                        .text_ellipsis()
+                        .border_b_1()
+                        .border_color(theme.colors().border_variant)
+                        .bg(theme.colors().element_background)
+                        .child(
+                            Label::new(patch.title.clone())
+                                .size(LabelSize::Small)
+                                .color(Color::Muted),
+                        ),
+                )
+                .children(paths.into_iter().map(|path| {
+                    h_flex()
+                        .px_2()
+                        .pt_1()
+                        .gap_1p5()
+                        .child(Icon::new(IconName::File).size(IconSize::Small))
+                        .child(Label::new(path).size(LabelSize::Small))
+                }))
+                .when(patch.status == AssistantPatchStatus::Pending, |div| {
+                    div.child(
+                        h_flex()
+                            .pt_1()
+                            .px_2()
+                            .gap_1()
+                            .child(
+                                Icon::new(IconName::ArrowCircle)
+                                    .size(IconSize::XSmall)
+                                    .color(Color::Muted)
+                                    .with_animation(
+                                        "arrow-circle",
+                                        Animation::new(Duration::from_secs(2)).repeat(),
+                                        |icon, delta| {
+                                            icon.transform(Transformation::rotate(percentage(
+                                                delta,
+                                            )))
+                                        },
+                                    ),
+                            )
+                            .child(
+                                Label::new("Generating…")
+                                    .color(Color::Muted)
+                                    .size(LabelSize::Small)
+                                    .with_animation(
+                                        "pulsating-label",
+                                        Animation::new(Duration::from_secs(2))
+                                            .repeat()
+                                            .with_easing(pulsating_between(0.4, 0.8)),
+                                        |label, delta| label.alpha(delta),
+                                    ),
+                            ),
+                    )
+                })
+                .into_any(),
+        )
+    }
+
    fn render_notice(&self, cx: &mut Context<Self>) -> Option<AnyElement> {
        // This was previously gated behind the `zed-pro` feature flag. Since we
        // aren't planning to ship that right now, we're just hard-coding this
@@ -1894,24 +2348,11 @@ impl ContextEditor {
                                    .log_err();

                                if let Some(client) = client {
-                                    cx.spawn(async move |context_editor, cx| {
-                                        match client.authenticate_and_connect(true, cx).await {
-                                            util::ConnectionResult::Timeout => {
-                                                log::error!("Authentication timeout")
-                                            }
-                                            util::ConnectionResult::ConnectionReset => {
-                                                log::error!("Connection reset")
-                                            }
-                                            util::ConnectionResult::Result(r) => {
-                                                if r.log_err().is_some() {
-                                                    context_editor
-                                                        .update(cx, |_, cx| cx.notify())
-                                                        .ok();
-                                                }
-                                            }
-                                        }
+                                    cx.spawn(async move |this, cx| {
+                                        client.authenticate_and_connect(true, cx).await?;
+                                        this.update(cx, |_, cx| cx.notify())
                                    })
-                                    .detach()
+                                    .detach_and_log_err(cx)
                                }
                            })),
                    )
@@ -1995,14 +2436,29 @@ impl ContextEditor {
            None => (ButtonStyle::Filled, None),
        };

+        let model = LanguageModelRegistry::read_global(cx).default_model();
+
+        let has_configuration_error = configuration_error(cx).is_some();
+        let needs_to_accept_terms = self.show_accept_terms
+            && model
+                .as_ref()
+                .map_or(false, |model| model.provider.must_accept_terms(cx));
+        let disabled = has_configuration_error || needs_to_accept_terms;
+
        ButtonLike::new("send_button")
-            .disabled(self.sending_disabled(cx))
+            .disabled(disabled)
            .style(style)
            .when_some(tooltip, |button, tooltip| {
                button.tooltip(move |_, _| tooltip.clone())
            })
            .layer(ElevationIndex::ModalSurface)
-            .child(Label::new("Send"))
+            .child(Label::new(
+                if AssistantSettings::get_global(cx).are_live_diffs_enabled(cx) {
+                    "Chat"
+                } else {
+                    "Send"
+                },
+            ))
            .children(
                KeyBinding::for_action_in(&Assist, &focus_handle, window, cx)
                    .map(|binding| binding.into_any_element()),
@@ -2012,18 +2468,59 @@ impl ContextEditor {
            })
    }

-    /// Whether or not we should allow messages to be sent.
-    /// Will return false if the selected provided has a configuration error or
-    /// if the user has not accepted the terms of service for this provider.
-    fn sending_disabled(&self, cx: &mut Context<'_, ContextEditor>) -> bool {
-        let model = LanguageModelRegistry::read_global(cx).default_model();
+    fn render_edit_button(&self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let focus_handle = self.focus_handle(cx).clone();
+
+        let (style, tooltip) = match token_state(&self.context, cx) {
+            Some(TokenState::NoTokensLeft { .. }) => (
+                ButtonStyle::Tinted(TintColor::Error),
+                Some(Tooltip::text("Token limit reached")(window, cx)),
+            ),
+            Some(TokenState::HasMoreTokens {
+                over_warn_threshold,
+                ..
+            }) => {
+                let (style, tooltip) = if over_warn_threshold {
+                    (
+                        ButtonStyle::Tinted(TintColor::Warning),
+                        Some(Tooltip::text("Token limit is close to exhaustion")(
+                            window, cx,
+                        )),
+                    )
+                } else {
+                    (ButtonStyle::Filled, None)
+                };
+                (style, tooltip)
+            }
+            None => (ButtonStyle::Filled, None),
+        };
+
+        let provider = LanguageModelRegistry::read_global(cx)
+            .default_model()
+            .map(|default| default.provider);

        let has_configuration_error = configuration_error(cx).is_some();
        let needs_to_accept_terms = self.show_accept_terms
-            && model
+            && provider
                .as_ref()
-                .map_or(false, |model| model.provider.must_accept_terms(cx));
-        has_configuration_error || needs_to_accept_terms
+                .map_or(false, |provider| provider.must_accept_terms(cx));
+        let disabled = has_configuration_error || needs_to_accept_terms;
+
+        ButtonLike::new("edit_button")
+            .disabled(disabled)
+            .style(style)
+            .when_some(tooltip, |button, tooltip| {
+                button.tooltip(move |_, _| tooltip.clone())
+            })
+            .layer(ElevationIndex::ModalSurface)
+            .child(Label::new("Suggest Edits"))
+            .children(
+                KeyBinding::for_action_in(&Edit, &focus_handle, window, cx)
+                    .map(|binding| binding.into_any_element()),
+            )
+            .on_click(move |_event, window, cx| {
+                focus_handle.dispatch_action(&Edit, window, cx);
+            })
    }

    fn render_inject_context_menu(&self, cx: &mut Context<Self>) -> impl IntoElement {
@@ -2101,6 +2598,7 @@ impl ContextEditor {
                .elevation_2(cx)
                .occlude()
                .child(match last_error {
+                    AssistError::FileRequired => self.render_file_required_error(cx),
                    AssistError::PaymentRequired => self.render_payment_required_error(cx),
                    AssistError::MaxMonthlySpendReached => {
                        self.render_max_monthly_spend_reached_error(cx)
@@ -2113,6 +2611,41 @@ impl ContextEditor {
        )
    }

+    fn render_file_required_error(&self, cx: &mut Context<Self>) -> AnyElement {
+        v_flex()
+            .gap_0p5()
+            .child(
+                h_flex()
+                    .gap_1p5()
+                    .items_center()
+                    .child(Icon::new(IconName::Warning).color(Color::Warning))
+                    .child(
+                        Label::new("Suggest Edits needs a file to edit").weight(FontWeight::MEDIUM),
+                    ),
+            )
+            .child(
+                div()
+                    .id("error-message")
+                    .max_h_24()
+                    .overflow_y_scroll()
+                    .child(Label::new(
+                        "To include files, type /file or /tab in your prompt.",
+                    )),
+            )
+            .child(
+                h_flex()
+                    .justify_end()
+                    .mt_1()
+                    .child(Button::new("dismiss", "Dismiss").on_click(cx.listener(
+                        |this, _, _window, cx| {
+                            this.last_error = None;
+                            cx.notify();
+                        },
+                    ))),
+            )
+            .into_any()
+    }
+
    fn render_payment_required_error(&self, cx: &mut Context<Self>) -> AnyElement {
        const ERROR_MESSAGE: &str = "Free tier exceeded. Subscribe and add payment to continue using Zed LLMs. You'll be billed at cost for tokens used.";

@@ -2553,6 +3086,7 @@ impl Render for ContextEditor {
            .capture_action(cx.listener(ContextEditor::paste))
            .capture_action(cx.listener(ContextEditor::cycle_message_role))
            .capture_action(cx.listener(ContextEditor::confirm_command))
+            .on_action(cx.listener(ContextEditor::edit))
            .on_action(cx.listener(ContextEditor::assist))
            .on_action(cx.listener(ContextEditor::split))
            .on_action(move |_: &ToggleModelSelector, window, cx| {
@@ -2605,6 +3139,20 @@ impl Render for ContextEditor {
                            h_flex()
                                .w_full()
                                .justify_end()
+                                .when(
+                                    AssistantSettings::get_global(cx).are_live_diffs_enabled(cx),
+                                    |buttons| {
+                                        buttons
+                                            .items_center()
+                                            .gap_1p5()
+                                            .child(self.render_edit_button(window, cx))
+                                            .child(
+                                                Label::new("or")
+                                                    .size(LabelSize::Small)
+                                                    .color(Color::Muted),
+                                            )
+                                    },
+                                )
                                .child(self.render_send_button(window, cx)),
                        ),
                ),
--- a/crates/assistant_context_editor/src/patch.rs
+++ b/crates/assistant_context_editor/src/patch.rs
@@ -0,0 +1,957 @@
+use anyhow::{Context as _, Result, anyhow};
+use collections::HashMap;
+use editor::ProposedChangesEditor;
+use futures::{TryFutureExt as _, future};
+use gpui::{App, AppContext as _, AsyncApp, Entity, SharedString};
+use language::{AutoindentMode, Buffer, BufferSnapshot};
+use project::{Project, ProjectPath};
+use std::{cmp, ops::Range, path::Path, sync::Arc};
+use text::{AnchorRangeExt as _, Bias, OffsetRangeExt as _, Point};
+
+#[derive(Clone, Debug)]
+pub struct AssistantPatch {
+    pub range: Range<language::Anchor>,
+    pub title: SharedString,
+    pub edits: Arc<[Result<AssistantEdit>]>,
+    pub status: AssistantPatchStatus,
+}
+
+#[derive(Copy, Clone, Debug, PartialEq, Eq)]
+pub enum AssistantPatchStatus {
+    Pending,
+    Ready,
+}
+
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct AssistantEdit {
+    pub path: String,
+    pub kind: AssistantEditKind,
+}
+
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub enum AssistantEditKind {
+    Update {
+        old_text: String,
+        new_text: String,
+        description: Option<String>,
+    },
+    Create {
+        new_text: String,
+        description: Option<String>,
+    },
+    InsertBefore {
+        old_text: String,
+        new_text: String,
+        description: Option<String>,
+    },
+    InsertAfter {
+        old_text: String,
+        new_text: String,
+        description: Option<String>,
+    },
+    Delete {
+        old_text: String,
+    },
+}
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct ResolvedPatch {
+    pub edit_groups: HashMap<Entity<Buffer>, Vec<ResolvedEditGroup>>,
+    pub errors: Vec<AssistantPatchResolutionError>,
+}
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct ResolvedEditGroup {
+    pub context_range: Range<language::Anchor>,
+    pub edits: Vec<ResolvedEdit>,
+}
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct ResolvedEdit {
+    range: Range<language::Anchor>,
+    new_text: String,
+    description: Option<String>,
+}
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct AssistantPatchResolutionError {
+    pub edit_ix: usize,
+    pub message: String,
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord)]
+enum SearchDirection {
+    Up,
+    Left,
+    Diagonal,
+}
+
+#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord)]
+struct SearchState {
+    cost: u32,
+    direction: SearchDirection,
+}
+
+impl SearchState {
+    fn new(cost: u32, direction: SearchDirection) -> Self {
+        Self { cost, direction }
+    }
+}
+
+struct SearchMatrix {
+    cols: usize,
+    data: Vec<SearchState>,
+}
+
+impl SearchMatrix {
+    fn new(rows: usize, cols: usize) -> Self {
+        SearchMatrix {
+            cols,
+            data: vec![SearchState::new(0, SearchDirection::Diagonal); rows * cols],
+        }
+    }
+
+    fn get(&self, row: usize, col: usize) -> SearchState {
+        self.data[row * self.cols + col]
+    }
+
+    fn set(&mut self, row: usize, col: usize, cost: SearchState) {
+        self.data[row * self.cols + col] = cost;
+    }
+}
+
+impl ResolvedPatch {
+    pub fn apply(&self, editor: &ProposedChangesEditor, cx: &mut App) {
+        for (buffer, groups) in &self.edit_groups {
+            let branch = editor.branch_buffer_for_base(buffer).unwrap();
+            Self::apply_edit_groups(groups, &branch, cx);
+        }
+        editor.recalculate_all_buffer_diffs();
+    }
+
+    fn apply_edit_groups(groups: &Vec<ResolvedEditGroup>, buffer: &Entity<Buffer>, cx: &mut App) {
+        let mut edits = Vec::new();
+        for group in groups {
+            for suggestion in &group.edits {
+                edits.push((suggestion.range.clone(), suggestion.new_text.clone()));
+            }
+        }
+        buffer.update(cx, |buffer, cx| {
+            buffer.edit(
+                edits,
+                Some(AutoindentMode::Block {
+                    original_indent_columns: Vec::new(),
+                }),
+                cx,
+            );
+        });
+    }
+}
+
+impl ResolvedEdit {
+    pub fn try_merge(&mut self, other: &Self, buffer: &text::BufferSnapshot) -> bool {
+        let range = &self.range;
+        let other_range = &other.range;
+
+        // Don't merge if we don't contain the other suggestion.
+        if range.start.cmp(&other_range.start, buffer).is_gt()
+            || range.end.cmp(&other_range.end, buffer).is_lt()
+        {
+            return false;
+        }
+
+        let other_offset_range = other_range.to_offset(buffer);
+        let offset_range = range.to_offset(buffer);
+
+        // If the other range is empty at the start of this edit's range, combine the new text
+        if other_offset_range.is_empty() && other_offset_range.start == offset_range.start {
+            self.new_text = format!("{}\n{}", other.new_text, self.new_text);
+            self.range.start = other_range.start;
+
+            if let Some((description, other_description)) =
+                self.description.as_mut().zip(other.description.as_ref())
+            {
+                *description = format!("{}\n{}", other_description, description)
+            }
+        } else {
+            if let Some((description, other_description)) =
+                self.description.as_mut().zip(other.description.as_ref())
+            {
+                description.push('\n');
+                description.push_str(other_description);
+            }
+        }
+
+        true
+    }
+}
+
+impl AssistantEdit {
+    pub fn new(
+        path: Option<String>,
+        operation: Option<String>,
+        old_text: Option<String>,
+        new_text: Option<String>,
+        description: Option<String>,
+    ) -> Result<Self> {
+        let path = path.ok_or_else(|| anyhow!("missing path"))?;
+        let operation = operation.ok_or_else(|| anyhow!("missing operation"))?;
+
+        let kind = match operation.as_str() {
+            "update" => AssistantEditKind::Update {
+                old_text: old_text.ok_or_else(|| anyhow!("missing old_text"))?,
+                new_text: new_text.ok_or_else(|| anyhow!("missing new_text"))?,
+                description,
+            },
+            "insert_before" => AssistantEditKind::InsertBefore {
+                old_text: old_text.ok_or_else(|| anyhow!("missing old_text"))?,
+                new_text: new_text.ok_or_else(|| anyhow!("missing new_text"))?,
+                description,
+            },
+            "insert_after" => AssistantEditKind::InsertAfter {
+                old_text: old_text.ok_or_else(|| anyhow!("missing old_text"))?,
+                new_text: new_text.ok_or_else(|| anyhow!("missing new_text"))?,
+                description,
+            },
+            "delete" => AssistantEditKind::Delete {
+                old_text: old_text.ok_or_else(|| anyhow!("missing old_text"))?,
+            },
+            "create" => AssistantEditKind::Create {
+                description,
+                new_text: new_text.ok_or_else(|| anyhow!("missing new_text"))?,
+            },
+            _ => Err(anyhow!("unknown operation {operation:?}"))?,
+        };
+
+        Ok(Self { path, kind })
+    }
+
+    pub async fn resolve(
+        &self,
+        project: Entity<Project>,
+        mut cx: AsyncApp,
+    ) -> Result<(Entity<Buffer>, ResolvedEdit)> {
+        let path = self.path.clone();
+        let kind = self.kind.clone();
+        let buffer = project
+            .update(&mut cx, |project, cx| {
+                let project_path = project
+                    .find_project_path(Path::new(&path), cx)
+                    .or_else(|| {
+                        // If we couldn't find a project path for it, put it in the active worktree
+                        // so that when we create the buffer, it can be saved.
+                        let worktree = project
+                            .active_entry()
+                            .and_then(|entry_id| project.worktree_for_entry(entry_id, cx))
+                            .or_else(|| project.worktrees(cx).next())?;
+                        let worktree = worktree.read(cx);
+
+                        Some(ProjectPath {
+                            worktree_id: worktree.id(),
+                            path: Arc::from(Path::new(&path)),
+                        })
+                    })
+                    .with_context(|| format!("worktree not found for {:?}", path))?;
+                anyhow::Ok(project.open_buffer(project_path, cx))
+            })??
+            .await?;
+
+        let snapshot = buffer.update(&mut cx, |buffer, _| buffer.snapshot())?;
+        let suggestion = cx
+            .background_spawn(async move { kind.resolve(&snapshot) })
+            .await;
+
+        Ok((buffer, suggestion))
+    }
+}
+
+impl AssistantEditKind {
+    fn resolve(self, snapshot: &BufferSnapshot) -> ResolvedEdit {
+        match self {
+            Self::Update {
+                old_text,
+                new_text,
+                description,
+            } => {
+                let range = Self::resolve_location(&snapshot, &old_text);
+                ResolvedEdit {
+                    range,
+                    new_text,
+                    description,
+                }
+            }
+            Self::Create {
+                new_text,
+                description,
+            } => ResolvedEdit {
+                range: text::Anchor::MIN..text::Anchor::MAX,
+                description,
+                new_text,
+            },
+            Self::InsertBefore {
+                old_text,
+                mut new_text,
+                description,
+            } => {
+                let range = Self::resolve_location(&snapshot, &old_text);
+                new_text.push('\n');
+                ResolvedEdit {
+                    range: range.start..range.start,
+                    new_text,
+                    description,
+                }
+            }
+            Self::InsertAfter {
+                old_text,
+                mut new_text,
+                description,
+            } => {
+                let range = Self::resolve_location(&snapshot, &old_text);
+                new_text.insert(0, '\n');
+                ResolvedEdit {
+                    range: range.end..range.end,
+                    new_text,
+                    description,
+                }
+            }
+            Self::Delete { old_text } => {
+                let range = Self::resolve_location(&snapshot, &old_text);
+                ResolvedEdit {
+                    range,
+                    new_text: String::new(),
+                    description: None,
+                }
+            }
+        }
+    }
+
+    fn resolve_location(buffer: &text::BufferSnapshot, search_query: &str) -> Range<text::Anchor> {
+        const INSERTION_COST: u32 = 3;
+        const DELETION_COST: u32 = 10;
+        const WHITESPACE_INSERTION_COST: u32 = 1;
+        const WHITESPACE_DELETION_COST: u32 = 1;
+
+        let buffer_len = buffer.len();
+        let query_len = search_query.len();
+        let mut matrix = SearchMatrix::new(query_len + 1, buffer_len + 1);
+        let mut leading_deletion_cost = 0_u32;
+        for (row, query_byte) in search_query.bytes().enumerate() {
+            let deletion_cost = if query_byte.is_ascii_whitespace() {
+                WHITESPACE_DELETION_COST
+            } else {
+                DELETION_COST
+            };
+
+            leading_deletion_cost = leading_deletion_cost.saturating_add(deletion_cost);
+            matrix.set(
+                row + 1,
+                0,
+                SearchState::new(leading_deletion_cost, SearchDirection::Diagonal),
+            );
+
+            for (col, buffer_byte) in buffer.bytes_in_range(0..buffer.len()).flatten().enumerate() {
+                let insertion_cost = if buffer_byte.is_ascii_whitespace() {
+                    WHITESPACE_INSERTION_COST
+                } else {
+                    INSERTION_COST
+                };
+
+                let up = SearchState::new(
+                    matrix.get(row, col + 1).cost.saturating_add(deletion_cost),
+                    SearchDirection::Up,
+                );
+                let left = SearchState::new(
+                    matrix.get(row + 1, col).cost.saturating_add(insertion_cost),
+                    SearchDirection::Left,
+                );
+                let diagonal = SearchState::new(
+                    if query_byte == *buffer_byte {
+                        matrix.get(row, col).cost
+                    } else {
+                        matrix
+                            .get(row, col)
+                            .cost
+                            .saturating_add(deletion_cost + insertion_cost)
+                    },
+                    SearchDirection::Diagonal,
+                );
+                matrix.set(row + 1, col + 1, up.min(left).min(diagonal));
+            }
+        }
+
+        // Traceback to find the best match
+        let mut best_buffer_end = buffer_len;
+        let mut best_cost = u32::MAX;
+        for col in 1..=buffer_len {
+            let cost = matrix.get(query_len, col).cost;
+            if cost < best_cost {
+                best_cost = cost;
+                best_buffer_end = col;
+            }
+        }
+
+        let mut query_ix = query_len;
+        let mut buffer_ix = best_buffer_end;
+        while query_ix > 0 && buffer_ix > 0 {
+            let current = matrix.get(query_ix, buffer_ix);
+            match current.direction {
+                SearchDirection::Diagonal => {
+                    query_ix -= 1;
+                    buffer_ix -= 1;
+                }
+                SearchDirection::Up => {
+                    query_ix -= 1;
+                }
+                SearchDirection::Left => {
+                    buffer_ix -= 1;
+                }
+            }
+        }
+
+        let mut start = buffer.offset_to_point(buffer.clip_offset(buffer_ix, Bias::Left));
+        start.column = 0;
+        let mut end = buffer.offset_to_point(buffer.clip_offset(best_buffer_end, Bias::Right));
+        if end.column > 0 {
+            end.column = buffer.line_len(end.row);
+        }
+
+        buffer.anchor_after(start)..buffer.anchor_before(end)
+    }
+}
+
+impl AssistantPatch {
+    pub async fn resolve(&self, project: Entity<Project>, cx: &mut AsyncApp) -> ResolvedPatch {
+        let mut resolve_tasks = Vec::new();
+        for (ix, edit) in self.edits.iter().enumerate() {
+            if let Ok(edit) = edit.as_ref() {
+                resolve_tasks.push(
+                    edit.resolve(project.clone(), cx.clone())
+                        .map_err(move |error| (ix, error)),
+                );
+            }
+        }
+
+        let edits = future::join_all(resolve_tasks).await;
+        let mut errors = Vec::new();
+        let mut edits_by_buffer = HashMap::default();
+        for entry in edits {
+            match entry {
+                Ok((buffer, edit)) => {
+                    edits_by_buffer
+                        .entry(buffer)
+                        .or_insert_with(Vec::new)
+                        .push(edit);
+                }
+                Err((edit_ix, error)) => errors.push(AssistantPatchResolutionError {
+                    edit_ix,
+                    message: error.to_string(),
+                }),
+            }
+        }
+
+        // Expand the context ranges of each edit and group edits with overlapping context ranges.
+        let mut edit_groups_by_buffer = HashMap::default();
+        for (buffer, edits) in edits_by_buffer {
+            if let Ok(snapshot) = buffer.update(cx, |buffer, _| buffer.text_snapshot()) {
+                edit_groups_by_buffer.insert(buffer, Self::group_edits(edits, &snapshot));
+            }
+        }
+
+        ResolvedPatch {
+            edit_groups: edit_groups_by_buffer,
+            errors,
+        }
+    }
+
+    fn group_edits(
+        mut edits: Vec<ResolvedEdit>,
+        snapshot: &text::BufferSnapshot,
+    ) -> Vec<ResolvedEditGroup> {
+        let mut edit_groups = Vec::<ResolvedEditGroup>::new();
+        // Sort edits by their range so that earlier, larger ranges come first
+        edits.sort_by(|a, b| a.range.cmp(&b.range, &snapshot));
+
+        // Merge overlapping edits
+        edits.dedup_by(|a, b| b.try_merge(a, &snapshot));
+
+        // Create context ranges for each edit
+        for edit in edits {
+            let context_range = {
+                let edit_point_range = edit.range.to_point(&snapshot);
+                let start_row = edit_point_range.start.row.saturating_sub(5);
+                let end_row = cmp::min(edit_point_range.end.row + 5, snapshot.max_point().row);
+                let start = snapshot.anchor_before(Point::new(start_row, 0));
+                let end = snapshot.anchor_after(Point::new(end_row, snapshot.line_len(end_row)));
+                start..end
+            };
+
+            if let Some(last_group) = edit_groups.last_mut() {
+                if last_group
+                    .context_range
+                    .end
+                    .cmp(&context_range.start, &snapshot)
+                    .is_ge()
+                {
+                    // Merge with the previous group if context ranges overlap
+                    last_group.context_range.end = context_range.end;
+                    last_group.edits.push(edit);
+                } else {
+                    // Create a new group
+                    edit_groups.push(ResolvedEditGroup {
+                        context_range,
+                        edits: vec![edit],
+                    });
+                }
+            } else {
+                // Create the first group
+                edit_groups.push(ResolvedEditGroup {
+                    context_range,
+                    edits: vec![edit],
+                });
+            }
+        }
+
+        edit_groups
+    }
+
+    pub fn path_count(&self) -> usize {
+        self.paths().count()
+    }
+
+    pub fn paths(&self) -> impl '_ + Iterator<Item = &str> {
+        let mut prev_path = None;
+        self.edits.iter().filter_map(move |edit| {
+            if let Ok(edit) = edit {
+                let path = Some(edit.path.as_str());
+                if path != prev_path {
+                    prev_path = path;
+                    return path;
+                }
+            }
+            None
+        })
+    }
+}
+
+impl PartialEq for AssistantPatch {
+    fn eq(&self, other: &Self) -> bool {
+        self.range == other.range
+            && self.title == other.title
+            && Arc::ptr_eq(&self.edits, &other.edits)
+    }
+}
+
+impl Eq for AssistantPatch {}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use gpui::App;
+    use language::{
+        Language, LanguageConfig, LanguageMatcher, language_settings::AllLanguageSettings,
+    };
+    use settings::SettingsStore;
+    use ui::BorrowAppContext;
+    use unindent::Unindent as _;
+    use util::test::{generate_marked_text, marked_text_ranges};
+
+    #[gpui::test]
+    fn test_resolve_location(cx: &mut App) {
+        assert_location_resolution(
+            concat!(
+                "    Lorem\n",
+                "«    ipsum\n",
+                "    dolor sit amet»\n",
+                "    consecteur",
+            ),
+            "ipsum\ndolor",
+            cx,
+        );
+
+        assert_location_resolution(
+            &"
+            «fn foo1(a: usize) -> usize {
+                40
+            }»
+
+            fn foo2(b: usize) -> usize {
+                42
+            }
+            "
+            .unindent(),
+            "fn foo1(b: usize) {\n40\n}",
+            cx,
+        );
+
+        assert_location_resolution(
+            &"
+            fn main() {
+            «    Foo
+                    .bar()
+                    .baz()
+                    .qux()»
+            }
+
+            fn foo2(b: usize) -> usize {
+                42
+            }
+            "
+            .unindent(),
+            "Foo.bar.baz.qux()",
+            cx,
+        );
+
+        assert_location_resolution(
+            &"
+            class Something {
+                one() { return 1; }
+            «    two() { return 2222; }
+                three() { return 333; }
+                four() { return 4444; }
+                five() { return 5555; }
+                six() { return 6666; }
+            »    seven() { return 7; }
+                eight() { return 8; }
+            }
+            "
+            .unindent(),
+            &"
+                two() { return 2222; }
+                four() { return 4444; }
+                five() { return 5555; }
+                six() { return 6666; }
+            "
+            .unindent(),
+            cx,
+        );
+    }
+
+    #[gpui::test]
+    fn test_resolve_edits(cx: &mut App) {
+        init_test(cx);
+
+        assert_edits(
+            "
+                /// A person
+                struct Person {
+                    name: String,
+                    age: usize,
+                }
+
+                /// A dog
+                struct Dog {
+                    weight: f32,
+                }
+
+                impl Person {
+                    fn name(&self) -> &str {
+                        &self.name
+                    }
+                }
+            "
+            .unindent(),
+            vec![
+                AssistantEditKind::Update {
+                    old_text: "
+                        name: String,
+                    "
+                    .unindent(),
+                    new_text: "
+                        first_name: String,
+                        last_name: String,
+                    "
+                    .unindent(),
+                    description: None,
+                },
+                AssistantEditKind::Update {
+                    old_text: "
+                        fn name(&self) -> &str {
+                            &self.name
+                        }
+                    "
+                    .unindent(),
+                    new_text: "
+                        fn name(&self) -> String {
+                            format!(\"{} {}\", self.first_name, self.last_name)
+                        }
+                    "
+                    .unindent(),
+                    description: None,
+                },
+            ],
+            "
+                /// A person
+                struct Person {
+                    first_name: String,
+                    last_name: String,
+                    age: usize,
+                }
+
+                /// A dog
+                struct Dog {
+                    weight: f32,
+                }
+
+                impl Person {
+                    fn name(&self) -> String {
+                        format!(\"{} {}\", self.first_name, self.last_name)
+                    }
+                }
+            "
+            .unindent(),
+            cx,
+        );
+
+        // Ensure InsertBefore merges correctly with Update of the same text
+        assert_edits(
+            "
+                fn foo() {
+
+                }
+            "
+            .unindent(),
+            vec![
+                AssistantEditKind::InsertBefore {
+                    old_text: "
+                        fn foo() {"
+                        .unindent(),
+                    new_text: "
+                        fn bar() {
+                            qux();
+                        }"
+                    .unindent(),
+                    description: Some("implement bar".into()),
+                },
+                AssistantEditKind::Update {
+                    old_text: "
+                        fn foo() {
+
+                        }"
+                    .unindent(),
+                    new_text: "
+                        fn foo() {
+                            bar();
+                        }"
+                    .unindent(),
+                    description: Some("call bar in foo".into()),
+                },
+                AssistantEditKind::InsertAfter {
+                    old_text: "
+                        fn foo() {
+
+                        }
+                    "
+                    .unindent(),
+                    new_text: "
+                        fn qux() {
+                            // todo
+                        }
+                    "
+                    .unindent(),
+                    description: Some("implement qux".into()),
+                },
+            ],
+            "
+                fn bar() {
+                    qux();
+                }
+
+                fn foo() {
+                    bar();
+                }
+
+                fn qux() {
+                    // todo
+                }
+            "
+            .unindent(),
+            cx,
+        );
+
+        // Correctly indent new text when replacing multiple adjacent indented blocks.
+        assert_edits(
+            "
+            impl Numbers {
+                fn one() {
+                    1
+                }
+
+                fn two() {
+                    2
+                }
+
+                fn three() {
+                    3
+                }
+            }
+            "
+            .unindent(),
+            vec![
+                AssistantEditKind::Update {
+                    old_text: "
+                        fn one() {
+                            1
+                        }
+                    "
+                    .unindent(),
+                    new_text: "
+                        fn one() {
+                            101
+                        }
+                    "
+                    .unindent(),
+                    description: None,
+                },
+                AssistantEditKind::Update {
+                    old_text: "
+                        fn two() {
+                            2
+                        }
+                    "
+                    .unindent(),
+                    new_text: "
+                        fn two() {
+                            102
+                        }
+                    "
+                    .unindent(),
+                    description: None,
+                },
+                AssistantEditKind::Update {
+                    old_text: "
+                        fn three() {
+                            3
+                        }
+                    "
+                    .unindent(),
+                    new_text: "
+                        fn three() {
+                            103
+                        }
+                    "
+                    .unindent(),
+                    description: None,
+                },
+            ],
+            "
+                impl Numbers {
+                    fn one() {
+                        101
+                    }
+
+                    fn two() {
+                        102
+                    }
+
+                    fn three() {
+                        103
+                    }
+                }
+            "
+            .unindent(),
+            cx,
+        );
+
+        assert_edits(
+            "
+            impl Person {
+                fn set_name(&mut self, name: String) {
+                    self.name = name;
+                }
+
+                fn name(&self) -> String {
+                    return self.name;
+                }
+            }
+            "
+            .unindent(),
+            vec![
+                AssistantEditKind::Update {
+                    old_text: "self.name = name;".unindent(),
+                    new_text: "self._name = name;".unindent(),
+                    description: None,
+                },
+                AssistantEditKind::Update {
+                    old_text: "return self.name;\n".unindent(),
+                    new_text: "return self._name;\n".unindent(),
+                    description: None,
+                },
+            ],
+            "
+                impl Person {
+                    fn set_name(&mut self, name: String) {
+                        self._name = name;
+                    }
+
+                    fn name(&self) -> String {
+                        return self._name;
+                    }
+                }
+            "
+            .unindent(),
+            cx,
+        );
+    }
+
+    fn init_test(cx: &mut App) {
+        let settings_store = SettingsStore::test(cx);
+        cx.set_global(settings_store);
+        language::init(cx);
+        cx.update_global::<SettingsStore, _>(|settings, cx| {
+            settings.update_user_settings::<AllLanguageSettings>(cx, |_| {});
+        });
+    }
+
+    #[track_caller]
+    fn assert_location_resolution(text_with_expected_range: &str, query: &str, cx: &mut App) {
+        let (text, _) = marked_text_ranges(text_with_expected_range, false);
+        let buffer = cx.new(|cx| Buffer::local(text.clone(), cx));
+        let snapshot = buffer.read(cx).snapshot();
+        let range = AssistantEditKind::resolve_location(&snapshot, query).to_offset(&snapshot);
+        let text_with_actual_range = generate_marked_text(&text, &[range], false);
+        pretty_assertions::assert_eq!(text_with_actual_range, text_with_expected_range);
+    }
+
+    #[track_caller]
+    fn assert_edits(
+        old_text: String,
+        edits: Vec<AssistantEditKind>,
+        new_text: String,
+        cx: &mut App,
+    ) {
+        let buffer =
+            cx.new(|cx| Buffer::local(old_text, cx).with_language(Arc::new(rust_lang()), cx));
+        let snapshot = buffer.read(cx).snapshot();
+        let resolved_edits = edits
+            .into_iter()
+            .map(|kind| kind.resolve(&snapshot))
+            .collect();
+        let edit_groups = AssistantPatch::group_edits(resolved_edits, &snapshot);
+        ResolvedPatch::apply_edit_groups(&edit_groups, &buffer, cx);
+        let actual_new_text = buffer.read(cx).text();
+        pretty_assertions::assert_eq!(actual_new_text, new_text);
+    }
+
+    fn rust_lang() -> Language {
+        Language::new(
+            LanguageConfig {
+                name: "Rust".into(),
+                matcher: LanguageMatcher {
+                    path_suffixes: vec!["rs".to_string()],
+                    ..Default::default()
+                },
+                ..Default::default()
+            },
+            Some(language::tree_sitter_rust::LANGUAGE.into()),
+        )
+        .with_indents_query(
+            r#"
+            (call_expression) @indent
+            (field_expression) @indent
+            (_ "(" ")" @end) @indent
+            (_ "{" "}" @end) @indent
+            "#,
+        )
+        .unwrap()
+    }
+}
--- a/crates/assistant_settings/src/assistant_settings.rs
+++ b/crates/assistant_settings/src/assistant_settings.rs
@@ -85,6 +85,7 @@ pub struct AssistantSettings {
    pub thread_summary_model: Option<LanguageModelSelection>,
    pub inline_alternatives: Vec<LanguageModelSelection>,
    pub using_outdated_settings_version: bool,
+    pub enable_experimental_live_diffs: bool,
    pub default_profile: AgentProfileId,
    pub profiles: IndexMap<AgentProfileId, AgentProfile>,
    pub always_allow_tool_actions: bool,
@@ -105,6 +106,10 @@ impl AssistantSettings {
            .and_then(|m| m.temperature)
    }

+    pub fn are_live_diffs_enabled(&self, _cx: &App) -> bool {
+        false
+    }
+
    pub fn set_inline_assistant_model(&mut self, provider: String, model: String) {
        self.inline_assistant_model = Some(LanguageModelSelection {
            provider: provider.into(),
@@ -252,6 +257,7 @@ impl AssistantSettingsContent {
                    commit_message_model: None,
                    thread_summary_model: None,
                    inline_alternatives: None,
+                    enable_experimental_live_diffs: None,
                    default_profile: None,
                    profiles: None,
                    always_allow_tool_actions: None,
@@ -282,6 +288,7 @@ impl AssistantSettingsContent {
                commit_message_model: None,
                thread_summary_model: None,
                inline_alternatives: None,
+                enable_experimental_live_diffs: None,
                default_profile: None,
                profiles: None,
                always_allow_tool_actions: None,
@@ -563,6 +570,7 @@ impl Default for VersionedAssistantSettingsContent {
            commit_message_model: None,
            thread_summary_model: None,
            inline_alternatives: None,
+            enable_experimental_live_diffs: None,
            default_profile: None,
            profiles: None,
            always_allow_tool_actions: None,
@@ -607,6 +615,10 @@ pub struct AssistantSettingsContentV2 {
    thread_summary_model: Option<LanguageModelSelection>,
    /// Additional models with which to generate alternatives when performing inline assists.
    inline_alternatives: Option<Vec<LanguageModelSelection>>,
+    /// Enable experimental live diffs in the assistant panel.
+    ///
+    /// Default: false
+    enable_experimental_live_diffs: Option<bool>,
    /// The default profile to use in the Agent.
    ///
    /// Default: write
@@ -833,6 +845,10 @@ impl Settings for AssistantSettings {
                .thread_summary_model
                .or(settings.thread_summary_model.take());
            merge(&mut settings.inline_alternatives, value.inline_alternatives);
+            merge(
+                &mut settings.enable_experimental_live_diffs,
+                value.enable_experimental_live_diffs,
+            );
            merge(
                &mut settings.always_allow_tool_actions,
                value.always_allow_tool_actions,
@@ -978,6 +994,7 @@ mod tests {
                                dock: None,
                                default_width: None,
                                default_height: None,
+                                enable_experimental_live_diffs: None,
                                default_profile: None,
                                profiles: None,
                                always_allow_tool_actions: None,
--- a/crates/assistant_tools/Cargo.toml
+++ b/crates/assistant_tools/Cargo.toml
@@ -17,14 +17,14 @@ eval = []
 [dependencies]
 aho-corasick.workspace = true
 anyhow.workspace = true
-assistant_settings.workspace = true
 assistant_tool.workspace = true
+assistant_settings.workspace = true
 buffer_diff.workspace = true
 chrono.workspace = true
 collections.workspace = true
 component.workspace = true
-derive_more.workspace = true
 editor.workspace = true
+derive_more.workspace = true
 feature_flags.workspace = true
 futures.workspace = true
 gpui.workspace = true
@@ -35,9 +35,8 @@ indoc.workspace = true
 itertools.workspace = true
 language.workspace = true
 language_model.workspace = true
-linkme.workspace = true
 log.workspace = true
-markdown.workspace = true
+linkme.workspace = true
 open.workspace = true
 paths.workspace = true
 portable-pty.workspace = true
--- a/crates/assistant_tools/src/assistant_tools.rs
+++ b/crates/assistant_tools/src/assistant_tools.rs
@@ -40,12 +40,13 @@ use crate::find_path_tool::FindPathTool;
 use crate::grep_tool::GrepTool;
 use crate::list_directory_tool::ListDirectoryTool;
 use crate::now_tool::NowTool;
+use crate::read_file_tool::ReadFileTool;
 use crate::thinking_tool::ThinkingTool;

 pub use edit_file_tool::EditFileToolInput;
 pub use find_path_tool::FindPathToolInput;
 pub use open_tool::OpenTool;
-pub use read_file_tool::{ReadFileTool, ReadFileToolInput};
+pub use read_file_tool::ReadFileToolInput;
 pub use terminal_tool::TerminalTool;

 pub fn init(http_client: Arc<HttpClientWithUrl>, cx: &mut App) {
--- a/crates/assistant_tools/src/edit_agent.rs
+++ b/crates/assistant_tools/src/edit_agent.rs
@@ -20,8 +20,7 @@ use language_model::{
    LanguageModelToolChoice, MessageContent, Role,
 };
 use project::{AgentLocation, Project};
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
+use serde::Serialize;
 use std::{cmp, iter, mem, ops::Range, path::PathBuf, sync::Arc, task::Poll};
 use streaming_diff::{CharOperation, StreamingDiff};

@@ -51,10 +50,10 @@ pub enum EditAgentOutputEvent {
    OldTextNotFound(SharedString),
 }

-#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
+#[derive(Clone, Debug)]
 pub struct EditAgentOutput {
-    pub raw_edits: String,
-    pub parser_metrics: EditParserMetrics,
+    pub _raw_edits: String,
+    pub _parser_metrics: EditParserMetrics,
 }

 #[derive(Clone)]
@@ -187,8 +186,8 @@ impl EditAgent {
        }

        Ok(EditAgentOutput {
-            raw_edits,
-            parser_metrics: EditParserMetrics::default(),
+            _raw_edits: raw_edits,
+            _parser_metrics: EditParserMetrics::default(),
        })
    }

@@ -427,8 +426,8 @@ impl EditAgent {
                }
            }
            Ok(EditAgentOutput {
-                raw_edits,
-                parser_metrics: parser.finish(),
+                _raw_edits: raw_edits,
+                _parser_metrics: parser.finish(),
            })
        });
        (output, rx)
--- a/crates/assistant_tools/src/edit_agent/edit_parser.rs
+++ b/crates/assistant_tools/src/edit_agent/edit_parser.rs
@@ -1,6 +1,4 @@
 use derive_more::{Add, AddAssign};
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
 use smallvec::SmallVec;
 use std::{cmp, mem, ops::Range};

@@ -15,9 +13,7 @@ pub enum EditParserEvent {
    NewTextChunk { chunk: String, done: bool },
 }

-#[derive(
-    Clone, Debug, Default, PartialEq, Eq, Add, AddAssign, Serialize, Deserialize, JsonSchema,
-)]
+#[derive(Clone, Debug, Default, PartialEq, Eq, Add, AddAssign)]
 pub struct EditParserMetrics {
    pub tags: usize,
    pub mismatched_tags: usize,
--- a/crates/assistant_tools/src/edit_agent/evals.rs
+++ b/crates/assistant_tools/src/edit_agent/evals.rs
@@ -1116,7 +1116,7 @@ fn eval(iterations: usize, expected_pass_ratio: f32, mut eval: EvalInput) {
    while let Ok(output) = rx.recv() {
        match output {
            Ok(output) => {
-                cumulative_parser_metrics += output.sample.edit_output.parser_metrics.clone();
+                cumulative_parser_metrics += output.sample.edit_output._parser_metrics.clone();
                eval_outputs.push(output.clone());
                if output.assertion.score < 80 {
                    failed_count += 1;
@@ -1197,9 +1197,9 @@ impl Display for EvalOutput {
        writeln!(
            f,
            "Parser Metrics:\n{:#?}",
-            self.sample.edit_output.parser_metrics
+            self.sample.edit_output._parser_metrics
        )?;
-        writeln!(f, "Raw Edits:\n{}", self.sample.edit_output.raw_edits)?;
+        writeln!(f, "Raw Edits:\n{}", self.sample.edit_output._raw_edits)?;
        Ok(())
    }
 }
--- a/crates/assistant_tools/src/edit_file_tool.rs
+++ b/crates/assistant_tools/src/edit_file_tool.rs
@@ -1,6 +1,6 @@
 use crate::{
    Templates,
-    edit_agent::{EditAgent, EditAgentOutput, EditAgentOutputEvent},
+    edit_agent::{EditAgent, EditAgentOutputEvent},
    schema::json_schema_for,
 };
 use anyhow::{Result, anyhow};
@@ -8,11 +8,11 @@ use assistant_tool::{
    ActionLog, AnyToolCard, Tool, ToolCard, ToolResult, ToolResultOutput, ToolUseStatus,
 };
 use buffer_diff::{BufferDiff, BufferDiffSnapshot};
-use editor::{Editor, EditorMode, MultiBuffer, PathKey};
+use editor::{Editor, EditorElement, EditorMode, EditorStyle, MultiBuffer, PathKey};
 use futures::StreamExt;
 use gpui::{
    Animation, AnimationExt, AnyWindowHandle, App, AppContext, AsyncApp, Entity, EntityId, Task,
-    TextStyleRefinement, WeakEntity, pulsating_between,
+    TextStyle, WeakEntity, pulsating_between,
 };
 use indoc::formatdoc;
 use language::{
@@ -20,7 +20,6 @@ use language::{
    language_settings::SoftWrap,
 };
 use language_model::{LanguageModel, LanguageModelRequest, LanguageModelToolSchemaFormat};
-use markdown::{Markdown, MarkdownElement, MarkdownStyle};
 use project::Project;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
@@ -88,7 +87,6 @@ pub struct EditFileToolOutput {
    pub original_path: PathBuf,
    pub new_text: String,
    pub old_text: String,
-    pub raw_output: Option<EditAgentOutput>,
 }

 #[derive(Debug, Serialize, Deserialize, JsonSchema)]
@@ -249,7 +247,7 @@ impl Tool for EditFileTool {
                    EditAgentOutputEvent::OldTextNotFound(_) => hallucinated_old_text = true,
                }
            }
-            let agent_output = output.await?;
+            output.await?;

            project
                .update(cx, |project, cx| project.save_buffer(buffer.clone(), cx))?
@@ -269,7 +267,6 @@ impl Tool for EditFileTool {
                original_path: project_path.path.to_path_buf(),
                new_text: new_text.clone(),
                old_text: old_text.clone(),
-                raw_output: Some(agent_output),
            };

            if let Some(card) = card_clone {
@@ -338,7 +335,7 @@ pub struct EditFileToolCard {
    project: Entity<Project>,
    diff_task: Option<Task<Result<()>>>,
    preview_expanded: bool,
-    error_expanded: Option<Entity<Markdown>>,
+    error_expanded: bool,
    full_height_expanded: bool,
    total_lines: Option<u32>,
    editor_unique_id: EntityId,
@@ -362,9 +359,9 @@ impl EditFileToolCard {
            editor.set_show_gutter(false, cx);
            editor.disable_inline_diagnostics();
            editor.disable_expand_excerpt_buttons(cx);
-            editor.disable_scrollbars_and_minimap(window, cx);
            editor.set_soft_wrap_mode(SoftWrap::None, cx);
            editor.scroll_manager.set_forbid_vertical_scroll(true);
+            editor.set_show_scrollbars(false, cx);
            editor.set_show_indent_guides(false, cx);
            editor.set_read_only(true);
            editor.set_show_breakpoints(false, cx);
@@ -381,7 +378,7 @@ impl EditFileToolCard {
            multibuffer,
            diff_task: None,
            preview_expanded: true,
-            error_expanded: None,
+            error_expanded: false,
            full_height_expanded: false,
            total_lines: None,
        }
@@ -438,9 +435,9 @@ impl ToolCard for EditFileToolCard {
        workspace: WeakEntity<Workspace>,
        cx: &mut Context<Self>,
    ) -> impl IntoElement {
-        let error_message = match status {
-            ToolUseStatus::Error(err) => Some(err),
-            _ => None,
+        let (failed, error_message) = match status {
+            ToolUseStatus::Error(err) => (true, Some(err.to_string())),
+            _ => (false, None),
        };

        let path_label_button = h_flex()
@@ -528,11 +525,9 @@ impl ToolCard for EditFileToolCard {
            .gap_1()
            .justify_between()
            .rounded_t_md()
-            .when(error_message.is_none(), |header| {
-                header.bg(codeblock_header_bg)
-            })
+            .when(!failed, |header| header.bg(codeblock_header_bg))
            .child(path_label_button)
-            .when_some(error_message, |header, error_message| {
+            .when(failed, |header| {
                header.child(
                    h_flex()
                        .gap_1()
@@ -544,28 +539,19 @@ impl ToolCard for EditFileToolCard {
                        .child(
                            Disclosure::new(
                                ("edit-file-error-disclosure", self.editor_unique_id),
-                                self.error_expanded.is_some(),
+                                self.error_expanded,
                            )
                            .opened_icon(IconName::ChevronUp)
                            .closed_icon(IconName::ChevronDown)
-                            .on_click(cx.listener({
-                                let error_message = error_message.clone();
-
-                                move |this, _event, _window, cx| {
-                                    if this.error_expanded.is_some() {
-                                        this.error_expanded.take();
-                                    } else {
-                                        this.error_expanded = Some(cx.new(|cx| {
-                                            Markdown::new(error_message.clone(), None, None, cx)
-                                        }))
-                                    }
-                                    cx.notify();
-                                }
-                            })),
+                            .on_click(cx.listener(
+                                move |this, _event, _window, _cx| {
+                                    this.error_expanded = !this.error_expanded;
+                                },
+                            )),
                        ),
                )
            })
-            .when(error_message.is_none() && self.has_diff(), |header| {
+            .when(!failed && self.has_diff(), |header| {
                header.child(
                    Disclosure::new(
                        ("edit-file-disclosure", self.editor_unique_id),
@@ -587,16 +573,33 @@ impl ToolCard for EditFileToolCard {
                .map(|style| style.text.line_height_in_pixels(window.rem_size()))
                .unwrap_or_default();

-            editor.set_text_style_refinement(TextStyleRefinement {
-                font_size: Some(
-                    TextSize::Small
-                        .rems(cx)
-                        .to_pixels(ThemeSettings::get_global(cx).agent_font_size(cx))
-                        .into(),
-                ),
-                ..TextStyleRefinement::default()
-            });
-            let element = editor.render(window, cx);
+            let settings = ThemeSettings::get_global(cx);
+            let element = EditorElement::new(
+                &cx.entity(),
+                EditorStyle {
+                    background: cx.theme().colors().editor_background,
+                    horizontal_padding: rems(0.25).to_pixels(window.rem_size()),
+                    local_player: cx.theme().players().local(),
+                    text: TextStyle {
+                        color: cx.theme().colors().editor_foreground,
+                        font_family: settings.buffer_font.family.clone(),
+                        font_features: settings.buffer_font.features.clone(),
+                        font_fallbacks: settings.buffer_font.fallbacks.clone(),
+                        font_size: TextSize::Small
+                            .rems(cx)
+                            .to_pixels(settings.agent_font_size(cx))
+                            .into(),
+                        font_weight: settings.buffer_font.weight,
+                        line_height: relative(settings.buffer_line_height.value()),
+                        ..Default::default()
+                    },
+                    scrollbar_width: EditorElement::SCROLLBAR_WIDTH,
+                    syntax: cx.theme().syntax().clone(),
+                    status: cx.theme().status().clone(),
+                    ..Default::default()
+                },
+            );
+
            (element.into_any_element(), line_height)
        });

@@ -637,7 +640,7 @@ impl ToolCard for EditFileToolCard {
                .p_3()
                .gap_1()
                .border_t_1()
-                .rounded_b_md()
+                .rounded_md()
                .border_color(border_color)
                .bg(cx.theme().colors().editor_background);

@@ -672,12 +675,12 @@ impl ToolCard for EditFileToolCard {
        v_flex()
            .mb_2()
            .border_1()
-            .when(error_message.is_some(), |card| card.border_dashed())
+            .when(failed, |card| card.border_dashed())
            .border_color(border_color)
            .rounded_md()
            .overflow_hidden()
            .child(codeblock_header)
-            .when_some(self.error_expanded.as_ref(), |card, error_markdown| {
+            .when(failed && self.error_expanded, |card| {
                card.child(
                    v_flex()
                        .p_2()
@@ -697,81 +700,65 @@ impl ToolCard for EditFileToolCard {
                                .rounded_md()
                                .text_ui_sm(cx)
                                .bg(cx.theme().colors().editor_background)
-                                .child(MarkdownElement::new(
-                                    error_markdown.clone(),
-                                    markdown_style(window, cx),
-                                )),
+                                .children(
+                                    error_message
+                                        .map(|error| div().child(error).into_any_element()),
+                                ),
                        ),
                )
            })
-            .when(!self.has_diff() && error_message.is_none(), |card| {
+            .when(!self.has_diff() && !failed, |card| {
                card.child(waiting_for_diff)
            })
-            .when(self.preview_expanded && self.has_diff(), |card| {
-                card.child(
-                    v_flex()
-                        .relative()
-                        .h_full()
-                        .when(!self.full_height_expanded, |editor_container| {
-                            editor_container
-                                .max_h(DEFAULT_COLLAPSED_LINES as f32 * editor_line_height)
-                        })
-                        .overflow_hidden()
-                        .border_t_1()
-                        .border_color(border_color)
-                        .bg(cx.theme().colors().editor_background)
-                        .child(editor)
-                        .when(
-                            !self.full_height_expanded && is_collapsible,
-                            |editor_container| editor_container.child(gradient_overlay),
-                        ),
-                )
-                .when(is_collapsible, |card| {
+            .when(
+                !failed && self.preview_expanded && self.has_diff(),
+                |card| {
                    card.child(
-                        h_flex()
-                            .id(("expand-button", self.editor_unique_id))
-                            .flex_none()
-                            .cursor_pointer()
-                            .h_5()
-                            .justify_center()
+                        v_flex()
+                            .relative()
+                            .h_full()
+                            .when(!self.full_height_expanded, |editor_container| {
+                                editor_container
+                                    .max_h(DEFAULT_COLLAPSED_LINES as f32 * editor_line_height)
+                            })
+                            .overflow_hidden()
                            .border_t_1()
-                            .rounded_b_md()
                            .border_color(border_color)
                            .bg(cx.theme().colors().editor_background)
-                            .hover(|style| style.bg(cx.theme().colors().element_hover.opacity(0.1)))
-                            .child(
-                                Icon::new(full_height_icon)
-                                    .size(IconSize::Small)
-                                    .color(Color::Muted),
-                            )
-                            .tooltip(Tooltip::text(full_height_tooltip_label))
-                            .on_click(cx.listener(move |this, _event, _window, _cx| {
-                                this.full_height_expanded = !this.full_height_expanded;
-                            })),
+                            .child(editor)
+                            .when(
+                                !self.full_height_expanded && is_collapsible,
+                                |editor_container| editor_container.child(gradient_overlay),
+                            ),
                    )
-                })
-            })
-    }
-}
-
-fn markdown_style(window: &Window, cx: &App) -> MarkdownStyle {
-    let theme_settings = ThemeSettings::get_global(cx);
-    let ui_font_size = TextSize::Default.rems(cx);
-    let mut text_style = window.text_style();
-
-    text_style.refine(&TextStyleRefinement {
-        font_family: Some(theme_settings.ui_font.family.clone()),
-        font_fallbacks: theme_settings.ui_font.fallbacks.clone(),
-        font_features: Some(theme_settings.ui_font.features.clone()),
-        font_size: Some(ui_font_size.into()),
-        color: Some(cx.theme().colors().text),
-        ..Default::default()
-    });
-
-    MarkdownStyle {
-        base_text_style: text_style.clone(),
-        selection_background_color: cx.theme().players().local().selection,
-        ..Default::default()
+                    .when(is_collapsible, |card| {
+                        card.child(
+                            h_flex()
+                                .id(("expand-button", self.editor_unique_id))
+                                .flex_none()
+                                .cursor_pointer()
+                                .h_5()
+                                .justify_center()
+                                .border_t_1()
+                                .rounded_b_md()
+                                .border_color(border_color)
+                                .bg(cx.theme().colors().editor_background)
+                                .hover(|style| {
+                                    style.bg(cx.theme().colors().element_hover.opacity(0.1))
+                                })
+                                .child(
+                                    Icon::new(full_height_icon)
+                                        .size(IconSize::Small)
+                                        .color(Color::Muted),
+                                )
+                                .tooltip(Tooltip::text(full_height_tooltip_label))
+                                .on_click(cx.listener(move |this, _event, _window, _cx| {
+                                    this.full_height_expanded = !this.full_height_expanded;
+                                })),
+                        )
+                    })
+                },
+            )
    }
 }

--- a/crates/assistant_tools/src/terminal_tool.rs
+++ b/crates/assistant_tools/src/terminal_tool.rs
@@ -2,18 +2,13 @@ use crate::schema::json_schema_for;
 use anyhow::{Context as _, Result, anyhow, bail};
 use assistant_tool::{ActionLog, Tool, ToolCard, ToolResult, ToolUseStatus};
 use futures::{FutureExt as _, future::Shared};
-use gpui::{
-    AnyWindowHandle, App, AppContext, Empty, Entity, EntityId, Task, TextStyleRefinement,
-    WeakEntity, Window,
-};
+use gpui::{AnyWindowHandle, App, AppContext, Empty, Entity, EntityId, Task, WeakEntity, Window};
 use language::LineEnding;
 use language_model::{LanguageModel, LanguageModelRequest, LanguageModelToolSchemaFormat};
-use markdown::{Markdown, MarkdownElement, MarkdownStyle};
 use portable_pty::{CommandBuilder, PtySize, native_pty_system};
 use project::{Project, terminals::TerminalKind};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::Settings;
 use std::{
    env,
    path::{Path, PathBuf},
@@ -22,7 +17,6 @@ use std::{
    time::{Duration, Instant},
 };
 use terminal_view::TerminalView;
-use theme::ThemeSettings;
 use ui::{Disclosure, Tooltip, prelude::*};
 use util::{
    get_system_shell, markdown::MarkdownInlineCode, size::format_file_size,
@@ -217,21 +211,8 @@ impl Tool for TerminalTool {
            }
        });

-        let command_markdown = cx.new(|cx| {
-            Markdown::new(
-                format!("```bash\n{}\n```", input.command).into(),
-                None,
-                None,
-                cx,
-            )
-        });
-
        let card = cx.new(|cx| {
-            TerminalToolCard::new(
-                command_markdown.clone(),
-                working_dir.clone(),
-                cx.entity_id(),
-            )
+            TerminalToolCard::new(input.command.clone(), working_dir.clone(), cx.entity_id())
        });

        let output = cx.spawn({
@@ -407,7 +388,7 @@ fn working_dir(
 }

 struct TerminalToolCard {
-    input_command: Entity<Markdown>,
+    input_command: String,
    working_dir: Option<PathBuf>,
    entity_id: EntityId,
    exit_status: Option<ExitStatus>,
@@ -423,11 +404,7 @@ struct TerminalToolCard {
 }

 impl TerminalToolCard {
-    pub fn new(
-        input_command: Entity<Markdown>,
-        working_dir: Option<PathBuf>,
-        entity_id: EntityId,
-    ) -> Self {
+    pub fn new(input_command: String, working_dir: Option<PathBuf>, entity_id: EntityId) -> Self {
        Self {
            input_command,
            working_dir,
@@ -450,7 +427,7 @@ impl ToolCard for TerminalToolCard {
    fn render(
        &mut self,
        status: &ToolUseStatus,
-        window: &mut Window,
+        _window: &mut Window,
        _workspace: WeakEntity<Workspace>,
        cx: &mut Context<Self>,
    ) -> impl IntoElement {
@@ -594,25 +571,11 @@ impl ToolCard for TerminalToolCard {
            .rounded_lg()
            .overflow_hidden()
            .child(
-                v_flex()
-                    .p_2()
-                    .gap_0p5()
-                    .bg(header_bg)
-                    .text_xs()
-                    .child(header)
-                    .child(
-                        MarkdownElement::new(
-                            self.input_command.clone(),
-                            markdown_style(window, cx),
-                        )
-                        .code_block_renderer(
-                            markdown::CodeBlockRenderer::Default {
-                                copy_button: false,
-                                copy_button_on_hover: true,
-                                border: false,
-                            },
-                        ),
-                    ),
+                v_flex().p_2().gap_0p5().bg(header_bg).child(header).child(
+                    Label::new(self.input_command.clone())
+                        .buffer_font(cx)
+                        .size(LabelSize::Small),
+                ),
            )
            .when(self.preview_expanded && !should_hide_terminal, |this| {
                this.child(
@@ -631,27 +594,6 @@ impl ToolCard for TerminalToolCard {
    }
 }

-fn markdown_style(window: &Window, cx: &App) -> MarkdownStyle {
-    let theme_settings = ThemeSettings::get_global(cx);
-    let buffer_font_size = TextSize::Default.rems(cx);
-    let mut text_style = window.text_style();
-
-    text_style.refine(&TextStyleRefinement {
-        font_family: Some(theme_settings.buffer_font.family.clone()),
-        font_fallbacks: theme_settings.buffer_font.fallbacks.clone(),
-        font_features: Some(theme_settings.buffer_font.features.clone()),
-        font_size: Some(buffer_font_size.into()),
-        color: Some(cx.theme().colors().text),
-        ..Default::default()
-    });
-
-    MarkdownStyle {
-        base_text_style: text_style.clone(),
-        selection_background_color: cx.theme().players().local().selection,
-        ..Default::default()
-    }
-}
-
 #[cfg(test)]
 mod tests {
    use editor::EditorSettings;
--- a/crates/auto_update_ui/src/auto_update_ui.rs
+++ b/crates/auto_update_ui/src/auto_update_ui.rs
@@ -155,7 +155,6 @@ pub fn notify_if_app_was_updated(cx: &mut App) {
                                }
                                cx.emit(DismissEvent);
                            })
-                            .show_suppress_button(false)
                        })
                    },
                );
--- a/crates/client/src/client.rs
+++ b/crates/client/src/client.rs
@@ -49,7 +49,7 @@ use telemetry::Telemetry;
 use thiserror::Error;
 use tokio::net::TcpStream;
 use url::Url;
-use util::{ConnectionResult, ResultExt};
+use util::{ResultExt, TryFutureExt};

 pub use rpc::*;
 pub use telemetry_events::Event;
@@ -151,19 +151,9 @@ pub fn init(client: &Arc<Client>, cx: &mut App) {
        let client = client.clone();
        move |_: &SignIn, cx| {
            if let Some(client) = client.upgrade() {
-                cx.spawn(
-                    async move |cx| match client.authenticate_and_connect(true, &cx).await {
-                        ConnectionResult::Timeout => {
-                            log::error!("Initial authentication timed out");
-                        }
-                        ConnectionResult::ConnectionReset => {
-                            log::error!("Initial authentication connection reset");
-                        }
-                        ConnectionResult::Result(r) => {
-                            r.log_err();
-                        }
-                    },
-                )
+                cx.spawn(async move |cx| {
+                    client.authenticate_and_connect(true, &cx).log_err().await
+                })
                .detach();
            }
        }
@@ -668,7 +658,7 @@ impl Client {
                state._reconnect_task = None;
            }
            Status::ConnectionLost => {
-                let client = self.clone();
+                let this = self.clone();
                state._reconnect_task = Some(cx.spawn(async move |cx| {
                    #[cfg(any(test, feature = "test-support"))]
                    let mut rng = StdRng::seed_from_u64(0);
@@ -676,25 +666,10 @@ impl Client {
                    let mut rng = StdRng::from_entropy();

                    let mut delay = INITIAL_RECONNECTION_DELAY;
-                    loop {
-                        match client.authenticate_and_connect(true, &cx).await {
-                            ConnectionResult::Timeout => {
-                                log::error!("client connect attempt timed out")
-                            }
-                            ConnectionResult::ConnectionReset => {
-                                log::error!("client connect attempt reset")
-                            }
-                            ConnectionResult::Result(r) => {
-                                if let Err(error) = r {
-                                    log::error!("failed to connect: {error}");
-                                } else {
-                                    break;
-                                }
-                            }
-                        }
-
-                        if matches!(*client.status().borrow(), Status::ConnectionError) {
-                            client.set_status(
+                    while let Err(error) = this.authenticate_and_connect(true, &cx).await {
+                        log::error!("failed to connect {}", error);
+                        if matches!(*this.status().borrow(), Status::ConnectionError) {
+                            this.set_status(
                                Status::ReconnectionError {
                                    next_reconnection: Instant::now() + delay,
                                },
@@ -852,7 +827,7 @@ impl Client {
        self: &Arc<Self>,
        try_provider: bool,
        cx: &AsyncApp,
-    ) -> ConnectionResult<()> {
+    ) -> anyhow::Result<()> {
        let was_disconnected = match *self.status().borrow() {
            Status::SignedOut => true,
            Status::ConnectionError
@@ -861,14 +836,9 @@ impl Client {
            | Status::Reauthenticating { .. }
            | Status::ReconnectionError { .. } => false,
            Status::Connected { .. } | Status::Connecting { .. } | Status::Reconnecting { .. } => {
-                return ConnectionResult::Result(Ok(()));
-            }
-            Status::UpgradeRequired => {
-                return ConnectionResult::Result(
-                    Err(EstablishConnectionError::UpgradeRequired)
-                        .context("client auth and connect"),
-                );
+                return Ok(());
            }
+            Status::UpgradeRequired => return Err(EstablishConnectionError::UpgradeRequired)?,
        };
        if was_disconnected {
            self.set_status(Status::Authenticating, cx);
@@ -892,12 +862,12 @@ impl Client {
                        Ok(creds) => credentials = Some(creds),
                        Err(err) => {
                            self.set_status(Status::ConnectionError, cx);
-                            return ConnectionResult::Result(Err(err));
+                            return Err(err);
                        }
                    }
                }
                _ = status_rx.next().fuse() => {
-                    return ConnectionResult::Result(Err(anyhow!("authentication canceled")));
+                    return Err(anyhow!("authentication canceled"));
                }
            }
        }
@@ -922,10 +892,10 @@ impl Client {
                        }

                        futures::select_biased! {
-                            result = self.set_connection(conn, cx).fuse() => ConnectionResult::Result(result.context("client auth and connect")),
+                            result = self.set_connection(conn, cx).fuse() => result,
                            _ = timeout => {
                                self.set_status(Status::ConnectionError, cx);
-                                ConnectionResult::Timeout
+                                Err(anyhow!("timed out waiting on hello message from server"))
                            }
                        }
                    }
@@ -937,22 +907,22 @@ impl Client {
                            self.authenticate_and_connect(false, cx).await
                        } else {
                            self.set_status(Status::ConnectionError, cx);
-                            ConnectionResult::Result(Err(EstablishConnectionError::Unauthorized).context("client auth and connect"))
+                            Err(EstablishConnectionError::Unauthorized)?
                        }
                    }
                    Err(EstablishConnectionError::UpgradeRequired) => {
                        self.set_status(Status::UpgradeRequired, cx);
-                        ConnectionResult::Result(Err(EstablishConnectionError::UpgradeRequired).context("client auth and connect"))
+                        Err(EstablishConnectionError::UpgradeRequired)?
                    }
                    Err(error) => {
                        self.set_status(Status::ConnectionError, cx);
-                        ConnectionResult::Result(Err(error).context("client auth and connect"))
+                        Err(error)?
                    }
                }
            }
            _ = &mut timeout => {
                self.set_status(Status::ConnectionError, cx);
-                ConnectionResult::Timeout
+                Err(anyhow!("timed out trying to establish connection"))
            }
        }
    }
@@ -968,7 +938,10 @@ impl Client {

        let peer_id = async {
            log::debug!("waiting for server hello");
-            let message = incoming.next().await.context("no hello message received")?;
+            let message = incoming
+                .next()
+                .await
+                .ok_or_else(|| anyhow!("no hello message received"))?;
            log::debug!("got server hello");
            let hello_message_type_name = message.payload_type_name().to_string();
            let hello = message
@@ -1770,7 +1743,7 @@ mod tests {
            status.next().await,
            Some(Status::ConnectionError { .. })
        ));
-        auth_and_connect.await.into_response().unwrap_err();
+        auth_and_connect.await.unwrap_err();

        // Allow the connection to be established.
        let server = FakeServer::for_client(user_id, &client, cx).await;
--- a/crates/client/src/test.rs
+++ b/crates/client/src/test.rs
@@ -107,7 +107,6 @@ impl FakeServer {
        client
            .authenticate_and_connect(false, &cx.to_async())
            .await
-            .into_response()
            .unwrap();

        server
--- a/crates/collab/src/api/billing.rs
+++ b/crates/collab/src/api/billing.rs
@@ -18,8 +18,7 @@ use stripe::{
    CreateBillingPortalSessionFlowDataSubscriptionUpdateConfirm,
    CreateBillingPortalSessionFlowDataSubscriptionUpdateConfirmItems,
    CreateBillingPortalSessionFlowDataType, CreateCustomer, Customer, CustomerId, EventObject,
-    EventType, Expandable, ListEvents, PaymentMethod, Subscription, SubscriptionId,
-    SubscriptionStatus,
+    EventType, Expandable, ListEvents, Subscription, SubscriptionId, SubscriptionStatus,
 };
 use util::{ResultExt, maybe};

@@ -72,7 +71,6 @@ struct GetBillingPreferencesParams {

 #[derive(Debug, Serialize)]
 struct BillingPreferencesResponse {
-    trial_started_at: Option<String>,
    max_monthly_llm_usage_spending_in_cents: i32,
    model_request_overages_enabled: bool,
    model_request_overages_spend_limit_in_cents: i32,
@@ -88,17 +86,9 @@ async fn get_billing_preferences(
        .await?
        .ok_or_else(|| anyhow!("user not found"))?;

-    let billing_customer = app.db.get_billing_customer_by_user_id(user.id).await?;
    let preferences = app.db.get_billing_preferences(user.id).await?;

    Ok(Json(BillingPreferencesResponse {
-        trial_started_at: billing_customer
-            .and_then(|billing_customer| billing_customer.trial_started_at)
-            .map(|trial_started_at| {
-                trial_started_at
-                    .and_utc()
-                    .to_rfc3339_opts(SecondsFormat::Millis, true)
-            }),
        max_monthly_llm_usage_spending_in_cents: preferences
            .as_ref()
            .map_or(DEFAULT_MAX_MONTHLY_SPEND.0 as i32, |preferences| {
@@ -137,8 +127,6 @@ async fn update_billing_preferences(
        .await?
        .ok_or_else(|| anyhow!("user not found"))?;

-    let billing_customer = app.db.get_billing_customer_by_user_id(user.id).await?;
-
    let max_monthly_llm_usage_spending_in_cents =
        body.max_monthly_llm_usage_spending_in_cents.max(0);
    let model_request_overages_spend_limit_in_cents =
@@ -194,13 +182,6 @@ async fn update_billing_preferences(
    rpc_server.refresh_llm_tokens_for_user(user.id).await;

    Ok(Json(BillingPreferencesResponse {
-        trial_started_at: billing_customer
-            .and_then(|billing_customer| billing_customer.trial_started_at)
-            .map(|trial_started_at| {
-                trial_started_at
-                    .and_utc()
-                    .to_rfc3339_opts(SecondsFormat::Millis, true)
-            }),
        max_monthly_llm_usage_spending_in_cents: billing_preferences
            .max_monthly_llm_usage_spending_in_cents,
        model_request_overages_enabled: billing_preferences.model_request_overages_enabled,
@@ -320,6 +301,13 @@ async fn create_billing_subscription(
            "not supported".into(),
        ))?
    };
+    let Some(llm_db) = app.llm_db.clone() else {
+        log::error!("failed to retrieve LLM database");
+        Err(Error::http(
+            StatusCode::NOT_IMPLEMENTED,
+            "not supported".into(),
+        ))?
+    };

    if app.db.has_active_billing_subscription(user.id).await? {
        return Err(Error::http(
@@ -411,10 +399,16 @@ async fn create_billing_subscription(
                .await?
        }
        None => {
-            return Err(Error::http(
-                StatusCode::BAD_REQUEST,
-                "No product selected".into(),
-            ));
+            let default_model = llm_db.model(
+                zed_llm_client::LanguageModelProvider::Anthropic,
+                "claude-3-7-sonnet",
+            )?;
+            let stripe_model = stripe_billing
+                .register_model_for_token_based_usage(default_model)
+                .await?;
+            stripe_billing
+                .checkout(customer_id, &user.github_login, &stripe_model, &success_url)
+                .await?
        }
    };

@@ -430,8 +424,6 @@ enum ManageSubscriptionIntent {
    ///
    /// This will open the Stripe billing portal without putting the user in a specific flow.
    ManageSubscription,
-    /// The user intends to update their payment method.
-    UpdatePaymentMethod,
    /// The user intends to upgrade to Zed Pro.
    UpgradeToPro,
    /// The user intends to cancel their subscription.
@@ -446,7 +438,6 @@ struct ManageBillingSubscriptionBody {
    intent: ManageSubscriptionIntent,
    /// The ID of the subscription to manage.
    subscription_id: BillingSubscriptionId,
-    redirect_to: Option<String>,
 }

 #[derive(Debug, Serialize)]
@@ -544,23 +535,6 @@ async fn manage_billing_subscription(
                        .map_or(false, |price| price.id == zed_pro_price_id)
                });
            if is_on_zed_pro_trial {
-                let payment_methods = PaymentMethod::list(
-                    &stripe_client,
-                    &stripe::ListPaymentMethods {
-                        customer: Some(stripe_subscription.customer.id()),
-                        ..Default::default()
-                    },
-                )
-                .await?;
-
-                let has_payment_method = !payment_methods.data.is_empty();
-                if !has_payment_method {
-                    return Err(Error::http(
-                        StatusCode::BAD_REQUEST,
-                        "missing payment method".into(),
-                    ));
-                }
-
                // If the user is already on a Zed Pro trial and wants to upgrade to Pro, we just need to end their trial early.
                Subscription::update(
                    &stripe_client,
@@ -610,21 +584,6 @@ async fn manage_billing_subscription(
                ..Default::default()
            })
        }
-        ManageSubscriptionIntent::UpdatePaymentMethod => Some(CreateBillingPortalSessionFlowData {
-            type_: CreateBillingPortalSessionFlowDataType::PaymentMethodUpdate,
-            after_completion: Some(CreateBillingPortalSessionFlowDataAfterCompletion {
-                type_: stripe::CreateBillingPortalSessionFlowDataAfterCompletionType::Redirect,
-                redirect: Some(CreateBillingPortalSessionFlowDataAfterCompletionRedirect {
-                    return_url: format!(
-                        "{}{path}",
-                        app.config.zed_dot_dev_url(),
-                        path = body.redirect_to.unwrap_or_else(|| "/account".to_string())
-                    ),
-                }),
-                ..Default::default()
-            }),
-            ..Default::default()
-        }),
        ManageSubscriptionIntent::Cancel => Some(CreateBillingPortalSessionFlowData {
            type_: CreateBillingPortalSessionFlowDataType::SubscriptionCancel,
            after_completion: Some(CreateBillingPortalSessionFlowDataAfterCompletion {
@@ -1137,12 +1096,6 @@ async fn handle_customer_subscription_event(
            .await?;
    }

-    // When the user's subscription changes, push down any changes to their plan.
-    rpc_server
-        .update_plan_for_user(billing_customer.user_id)
-        .await
-        .trace_err();
-
    // When the user's subscription changes, we want to refresh their LLM tokens
    // to either grant/revoke access.
    rpc_server
@@ -1280,7 +1233,7 @@ async fn get_current_usage(
            subscription
                .kind
                .map(Into::into)
-                .unwrap_or(zed_llm_client::Plan::ZedFree)
+                .unwrap_or(zed_llm_client::Plan::Free)
        });

    let model_requests_limit = match plan.model_requests_limit() {
@@ -1428,6 +1381,81 @@ async fn find_or_create_billing_customer(
    Ok(Some(billing_customer))
 }

+const SYNC_LLM_TOKEN_USAGE_WITH_STRIPE_INTERVAL: Duration = Duration::from_secs(60);
+
+pub fn sync_llm_token_usage_with_stripe_periodically(app: Arc<AppState>) {
+    let Some(stripe_billing) = app.stripe_billing.clone() else {
+        log::warn!("failed to retrieve Stripe billing object");
+        return;
+    };
+    let Some(llm_db) = app.llm_db.clone() else {
+        log::warn!("failed to retrieve LLM database");
+        return;
+    };
+
+    let executor = app.executor.clone();
+    executor.spawn_detached({
+        let executor = executor.clone();
+        async move {
+            loop {
+                sync_token_usage_with_stripe(&app, &llm_db, &stripe_billing)
+                    .await
+                    .context("failed to sync LLM usage to Stripe")
+                    .trace_err();
+                executor
+                    .sleep(SYNC_LLM_TOKEN_USAGE_WITH_STRIPE_INTERVAL)
+                    .await;
+            }
+        }
+    });
+}
+
+async fn sync_token_usage_with_stripe(
+    app: &Arc<AppState>,
+    llm_db: &Arc<LlmDatabase>,
+    stripe_billing: &Arc<StripeBilling>,
+) -> anyhow::Result<()> {
+    let events = llm_db.get_billing_events().await?;
+    let user_ids = events
+        .iter()
+        .map(|(event, _)| event.user_id)
+        .collect::<HashSet<UserId>>();
+    let stripe_subscriptions = app.db.get_active_billing_subscriptions(user_ids).await?;
+
+    for (event, model) in events {
+        let Some((stripe_db_customer, stripe_db_subscription)) =
+            stripe_subscriptions.get(&event.user_id)
+        else {
+            tracing::warn!(
+                user_id = event.user_id.0,
+                "Registered billing event for user who is not a Stripe customer. Billing events should only be created for users who are Stripe customers, so this is a mistake on our side."
+            );
+            continue;
+        };
+        let stripe_subscription_id: stripe::SubscriptionId = stripe_db_subscription
+            .stripe_subscription_id
+            .parse()
+            .context("failed to parse stripe subscription id from db")?;
+        let stripe_customer_id: stripe::CustomerId = stripe_db_customer
+            .stripe_customer_id
+            .parse()
+            .context("failed to parse stripe customer id from db")?;
+
+        let stripe_model = stripe_billing
+            .register_model_for_token_based_usage(&model)
+            .await?;
+        stripe_billing
+            .subscribe_to_model(&stripe_subscription_id, &stripe_model)
+            .await?;
+        stripe_billing
+            .bill_model_token_usage(&stripe_customer_id, &stripe_model, &event)
+            .await?;
+        llm_db.consume_billing_event(event.id).await?;
+    }
+
+    Ok(())
+}
+
 const SYNC_LLM_REQUEST_USAGE_WITH_STRIPE_INTERVAL: Duration = Duration::from_secs(60);

 pub fn sync_llm_request_usage_with_stripe_periodically(app: Arc<AppState>) {
--- a/crates/collab/src/db/tables/billing_subscription.rs
+++ b/crates/collab/src/db/tables/billing_subscription.rs
@@ -99,7 +99,7 @@ impl From<SubscriptionKind> for zed_llm_client::Plan {
        match value {
            SubscriptionKind::ZedPro => Self::ZedPro,
            SubscriptionKind::ZedProTrial => Self::ZedProTrial,
-            SubscriptionKind::ZedFree => Self::ZedFree,
+            SubscriptionKind::ZedFree => Self::Free,
        }
    }
 }
--- a/crates/collab/src/llm/db/queries.rs
+++ b/crates/collab/src/llm/db/queries.rs
@@ -1,5 +1,6 @@
 use super::*;

+pub mod billing_events;
 pub mod providers;
 pub mod subscription_usage_meters;
 pub mod subscription_usages;
--- a/crates/collab/src/llm/db/queries/billing_events.rs
+++ b/crates/collab/src/llm/db/queries/billing_events.rs
@@ -0,0 +1,31 @@
+use super::*;
+use crate::Result;
+use anyhow::Context as _;
+
+impl LlmDatabase {
+    pub async fn get_billing_events(&self) -> Result<Vec<(billing_event::Model, model::Model)>> {
+        self.transaction(|tx| async move {
+            let events_with_models = billing_event::Entity::find()
+                .find_also_related(model::Entity)
+                .all(&*tx)
+                .await?;
+            events_with_models
+                .into_iter()
+                .map(|(event, model)| {
+                    let model =
+                        model.context("could not find model associated with billing event")?;
+                    Ok((event, model))
+                })
+                .collect()
+        })
+        .await
+    }
+
+    pub async fn consume_billing_event(&self, id: BillingEventId) -> Result<()> {
+        self.transaction(|tx| async move {
+            billing_event::Entity::delete_by_id(id).exec(&*tx).await?;
+            Ok(())
+        })
+        .await
+    }
+}
--- a/crates/collab/src/llm/db/tables.rs
+++ b/crates/collab/src/llm/db/tables.rs
@@ -1,3 +1,4 @@
+pub mod billing_event;
 pub mod model;
 pub mod monthly_usage;
 pub mod provider;
--- a/crates/collab/src/llm/db/tables/billing_event.rs
+++ b/crates/collab/src/llm/db/tables/billing_event.rs
@@ -0,0 +1,37 @@
+use crate::{
+    db::UserId,
+    llm::db::{BillingEventId, ModelId},
+};
+use sea_orm::entity::prelude::*;
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel)]
+#[sea_orm(table_name = "billing_events")]
+pub struct Model {
+    #[sea_orm(primary_key)]
+    pub id: BillingEventId,
+    pub idempotency_key: Uuid,
+    pub user_id: UserId,
+    pub model_id: ModelId,
+    pub input_tokens: i64,
+    pub input_cache_creation_tokens: i64,
+    pub input_cache_read_tokens: i64,
+    pub output_tokens: i64,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(
+        belongs_to = "super::model::Entity",
+        from = "Column::ModelId",
+        to = "super::model::Column::Id"
+    )]
+    Model,
+}
+
+impl Related<super::model::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Model.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}
--- a/crates/collab/src/llm/db/tables/model.rs
+++ b/crates/collab/src/llm/db/tables/model.rs
@@ -31,6 +31,8 @@ pub enum Relation {
    Provider,
    #[sea_orm(has_many = "super::usage::Entity")]
    Usages,
+    #[sea_orm(has_many = "super::billing_event::Entity")]
+    BillingEvents,
 }

 impl Related<super::provider::Entity> for Entity {
@@ -45,4 +47,10 @@ impl Related<super::usage::Entity> for Entity {
    }
 }

+impl Related<super::billing_event::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::BillingEvents.def()
+    }
+}
+
 impl ActiveModelBehavior for ActiveModel {}
--- a/crates/collab/src/llm/token.rs
+++ b/crates/collab/src/llm/token.rs
@@ -1,6 +1,9 @@
+use crate::Cents;
 use crate::db::billing_subscription::SubscriptionKind;
 use crate::db::{billing_subscription, user};
-use crate::llm::AGENT_EXTENDED_TRIAL_FEATURE_FLAG;
+use crate::llm::{
+    AGENT_EXTENDED_TRIAL_FEATURE_FLAG, DEFAULT_MAX_MONTHLY_SPEND, FREE_TIER_MONTHLY_SPENDING_LIMIT,
+};
 use crate::{Config, db::billing_preference};
 use anyhow::{Result, anyhow};
 use chrono::{NaiveDateTime, Utc};
@@ -25,12 +28,23 @@ pub struct LlmTokenClaims {
    pub is_staff: bool,
    pub has_llm_closed_beta_feature_flag: bool,
    pub bypass_account_age_check: bool,
+    pub has_llm_subscription: bool,
+    #[serde(default)]
    pub use_llm_request_queue: bool,
+    pub max_monthly_spend_in_cents: u32,
+    pub custom_llm_monthly_allowance_in_cents: Option<u32>,
+    #[serde(default)]
+    pub use_new_billing: bool,
    pub plan: Plan,
+    #[serde(default)]
    pub has_extended_trial: bool,
-    pub subscription_period: (NaiveDateTime, NaiveDateTime),
+    #[serde(default)]
+    pub subscription_period: Option<(NaiveDateTime, NaiveDateTime)>,
+    #[serde(default)]
    pub enable_model_request_overages: bool,
+    #[serde(default)]
    pub model_request_overages_spend_limit_in_cents: u32,
+    #[serde(default)]
    pub can_use_web_search_tool: bool,
 }

@@ -42,6 +56,7 @@ impl LlmTokenClaims {
        is_staff: bool,
        billing_preferences: Option<billing_preference::Model>,
        feature_flags: &Vec<String>,
+        has_legacy_llm_subscription: bool,
        subscription: Option<billing_subscription::Model>,
        system_id: Option<String>,
        config: &Config,
@@ -51,23 +66,6 @@ impl LlmTokenClaims {
            .as_ref()
            .ok_or_else(|| anyhow!("no LLM API secret"))?;

-        let plan = if is_staff {
-            Plan::ZedPro
-        } else {
-            subscription
-                .as_ref()
-                .and_then(|subscription| subscription.kind)
-                .map_or(Plan::ZedFree, |kind| match kind {
-                    SubscriptionKind::ZedFree => Plan::ZedFree,
-                    SubscriptionKind::ZedPro => Plan::ZedPro,
-                    SubscriptionKind::ZedProTrial => Plan::ZedProTrial,
-                })
-        };
-        let subscription_period =
-            billing_subscription::Model::current_period(subscription, is_staff)
-                .map(|(start, end)| (start.naive_utc(), end.naive_utc()))
-                .ok_or_else(|| anyhow!("A plan is required to use Zed's hosted models or edit predictions. Visit https://zed.dev/account to get started."))?;
-
        let now = Utc::now();
        let claims = Self {
            iat: now.timestamp() as u64,
@@ -85,13 +83,38 @@ impl LlmTokenClaims {
            bypass_account_age_check: feature_flags
                .iter()
                .any(|flag| flag == "bypass-account-age-check"),
-            can_use_web_search_tool: true,
+            can_use_web_search_tool: feature_flags.iter().any(|flag| flag == "assistant2"),
+            has_llm_subscription: has_legacy_llm_subscription,
+            max_monthly_spend_in_cents: billing_preferences
+                .as_ref()
+                .map_or(DEFAULT_MAX_MONTHLY_SPEND.0, |preferences| {
+                    preferences.max_monthly_llm_usage_spending_in_cents as u32
+                }),
+            custom_llm_monthly_allowance_in_cents: user
+                .custom_llm_monthly_allowance_in_cents
+                .map(|allowance| allowance as u32),
+            use_new_billing: feature_flags.iter().any(|flag| flag == "new-billing"),
            use_llm_request_queue: feature_flags.iter().any(|flag| flag == "llm-request-queue"),
-            plan,
+            plan: if is_staff {
+                Plan::ZedPro
+            } else {
+                subscription
+                    .as_ref()
+                    .and_then(|subscription| subscription.kind)
+                    .map_or(Plan::Free, |kind| match kind {
+                        SubscriptionKind::ZedFree => Plan::Free,
+                        SubscriptionKind::ZedPro => Plan::ZedPro,
+                        SubscriptionKind::ZedProTrial => Plan::ZedProTrial,
+                    })
+            },
            has_extended_trial: feature_flags
                .iter()
                .any(|flag| flag == AGENT_EXTENDED_TRIAL_FEATURE_FLAG),
-            subscription_period,
+            subscription_period: billing_subscription::Model::current_period(
+                subscription,
+                is_staff,
+            )
+            .map(|(start, end)| (start.naive_utc(), end.naive_utc())),
            enable_model_request_overages: billing_preferences
                .as_ref()
                .map_or(false, |preferences| {
@@ -132,6 +155,12 @@ impl LlmTokenClaims {
            }
        }
    }
+
+    pub fn free_tier_monthly_spending_limit(&self) -> Cents {
+        self.custom_llm_monthly_allowance_in_cents
+            .map(Cents)
+            .unwrap_or(FREE_TIER_MONTHLY_SPENDING_LIMIT)
+    }
 }

 #[derive(Error, Debug)]
--- a/crates/collab/src/main.rs
+++ b/crates/collab/src/main.rs
@@ -8,7 +8,9 @@ use axum::{
 };

 use collab::api::CloudflareIpCountryHeader;
-use collab::api::billing::sync_llm_request_usage_with_stripe_periodically;
+use collab::api::billing::{
+    sync_llm_request_usage_with_stripe_periodically, sync_llm_token_usage_with_stripe_periodically,
+};
 use collab::llm::db::LlmDatabase;
 use collab::migrations::run_database_migrations;
 use collab::user_backfiller::spawn_user_backfiller;
@@ -153,6 +155,7 @@ async fn main() -> Result<()> {
                    if let Some(mut llm_db) = llm_db {
                        llm_db.initialize().await?;
                        sync_llm_request_usage_with_stripe_periodically(state.clone());
+                        sync_llm_token_usage_with_stripe_periodically(state.clone());
                    }

                    app = app
--- a/crates/collab/src/rpc.rs
+++ b/crates/collab/src/rpc.rs
@@ -2,7 +2,6 @@ mod connection_pool;

 use crate::api::{CloudflareIpCountryHeader, SystemIdHeader};
 use crate::db::billing_subscription::SubscriptionKind;
-use crate::llm::db::LlmDatabase;
 use crate::llm::{AGENT_EXTENDED_TRIAL_FEATURE_FLAG, LlmTokenClaims};
 use crate::{
    AppState, Error, Result, auth,
@@ -68,7 +67,7 @@ use std::{
    time::{Duration, Instant},
 };
 use time::OffsetDateTime;
-use tokio::sync::{Semaphore, watch};
+use tokio::sync::{MutexGuard, Semaphore, watch};
 use tower::ServiceBuilder;
 use tracing::{
    Instrument,
@@ -167,6 +166,42 @@ impl Session {
        }
    }

+    pub async fn has_llm_subscription(
+        &self,
+        db: &MutexGuard<'_, DbHandle>,
+    ) -> anyhow::Result<bool> {
+        if self.is_staff() {
+            return Ok(true);
+        }
+
+        let user_id = self.user_id();
+
+        Ok(db.has_active_billing_subscription(user_id).await?)
+    }
+
+    pub async fn current_plan(&self, db: &MutexGuard<'_, DbHandle>) -> anyhow::Result<proto::Plan> {
+        if self.is_staff() {
+            return Ok(proto::Plan::ZedPro);
+        }
+
+        let user_id = self.user_id();
+
+        let subscription = db.get_active_billing_subscription(user_id).await?;
+        let subscription_kind = subscription.and_then(|subscription| subscription.kind);
+
+        let plan = if let Some(subscription_kind) = subscription_kind {
+            match subscription_kind {
+                SubscriptionKind::ZedPro => proto::Plan::ZedPro,
+                SubscriptionKind::ZedProTrial => proto::Plan::ZedProTrial,
+                SubscriptionKind::ZedFree => proto::Plan::Free,
+            }
+        } else {
+            proto::Plan::Free
+        };
+
+        Ok(plan)
+    }
+
    fn user_id(&self) -> UserId {
        match &self.principal {
            Principal::User(user) => user.id,
@@ -931,32 +966,6 @@ impl Server {
        Ok(())
    }

-    pub async fn update_plan_for_user(self: &Arc<Self>, user_id: UserId) -> Result<()> {
-        let user = self
-            .app_state
-            .db
-            .get_user_by_id(user_id)
-            .await?
-            .ok_or_else(|| anyhow!("user not found"))?;
-
-        let update_user_plan = make_update_user_plan_message(
-            &self.app_state.db,
-            self.app_state.llm_db.clone(),
-            user_id,
-            user.admin,
-        )
-        .await?;
-
-        let pool = self.connection_pool.lock();
-        for connection_id in pool.user_connection_ids(user_id) {
-            self.peer
-                .send(connection_id, update_user_plan.clone())
-                .trace_err();
-        }
-
-        Ok(())
-    }
-
    pub async fn refresh_llm_tokens_for_user(self: &Arc<Self>, user_id: UserId) {
        let pool = self.connection_pool.lock();
        for connection_id in pool.user_connection_ids(user_id) {
@@ -2692,43 +2701,21 @@ fn should_auto_subscribe_to_channels(version: ZedVersion) -> bool {
    version.0.minor() < 139
 }

-async fn current_plan(db: &Arc<Database>, user_id: UserId, is_staff: bool) -> Result<proto::Plan> {
-    if is_staff {
-        return Ok(proto::Plan::ZedPro);
-    }
+async fn update_user_plan(user_id: UserId, session: &Session) -> Result<()> {
+    let db = session.db().await;

-    let subscription = db.get_active_billing_subscription(user_id).await?;
-    let subscription_kind = subscription.and_then(|subscription| subscription.kind);
-
-    let plan = if let Some(subscription_kind) = subscription_kind {
-        match subscription_kind {
-            SubscriptionKind::ZedPro => proto::Plan::ZedPro,
-            SubscriptionKind::ZedProTrial => proto::Plan::ZedProTrial,
-            SubscriptionKind::ZedFree => proto::Plan::Free,
-        }
-    } else {
-        proto::Plan::Free
-    };
-
-    Ok(plan)
-}
-
-async fn make_update_user_plan_message(
-    db: &Arc<Database>,
-    llm_db: Option<Arc<LlmDatabase>>,
-    user_id: UserId,
-    is_staff: bool,
-) -> Result<proto::UpdateUserPlan> {
    let feature_flags = db.get_user_flags(user_id).await?;
-    let plan = current_plan(db, user_id, is_staff).await?;
+    let plan = session.current_plan(&db).await?;
    let billing_customer = db.get_billing_customer_by_user_id(user_id).await?;
    let billing_preferences = db.get_billing_preferences(user_id).await?;

-    let (subscription_period, usage) = if let Some(llm_db) = llm_db {
+    let (subscription_period, usage) = if let Some(llm_db) = session.app_state.llm_db.clone() {
        let subscription = db.get_active_billing_subscription(user_id).await?;

-        let subscription_period =
-            crate::db::billing_subscription::Model::current_period(subscription, is_staff);
+        let subscription_period = crate::db::billing_subscription::Model::current_period(
+            subscription,
+            session.is_staff(),
+        );

        let usage = if let Some((period_start_at, period_end_at)) = subscription_period {
            llm_db
@@ -2743,92 +2730,92 @@ async fn make_update_user_plan_message(
        (None, None)
    };

-    Ok(proto::UpdateUserPlan {
-        plan: plan.into(),
-        trial_started_at: billing_customer
-            .and_then(|billing_customer| billing_customer.trial_started_at)
-            .map(|trial_started_at| trial_started_at.and_utc().timestamp() as u64),
-        is_usage_based_billing_enabled: if is_staff {
-            Some(true)
-        } else {
-            billing_preferences.map(|preferences| preferences.model_request_overages_enabled)
-        },
-        subscription_period: subscription_period.map(|(started_at, ended_at)| {
-            proto::SubscriptionPeriod {
-                started_at: started_at.timestamp() as u64,
-                ended_at: ended_at.timestamp() as u64,
-            }
-        }),
-        usage: usage.map(|usage| {
-            let plan = match plan {
-                proto::Plan::Free => zed_llm_client::Plan::ZedFree,
-                proto::Plan::ZedPro => zed_llm_client::Plan::ZedPro,
-                proto::Plan::ZedProTrial => zed_llm_client::Plan::ZedProTrial,
-            };
-
-            let model_requests_limit = match plan.model_requests_limit() {
-                zed_llm_client::UsageLimit::Limited(limit) => {
-                    let limit = if plan == zed_llm_client::Plan::ZedProTrial
-                        && feature_flags
-                            .iter()
-                            .any(|flag| flag == AGENT_EXTENDED_TRIAL_FEATURE_FLAG)
-                    {
-                        1_000
-                    } else {
-                        limit
-                    };
-
-                    zed_llm_client::UsageLimit::Limited(limit)
-                }
-                zed_llm_client::UsageLimit::Unlimited => zed_llm_client::UsageLimit::Unlimited,
-            };
-
-            proto::SubscriptionUsage {
-                model_requests_usage_amount: usage.model_requests as u32,
-                model_requests_usage_limit: Some(proto::UsageLimit {
-                    variant: Some(match model_requests_limit {
-                        zed_llm_client::UsageLimit::Limited(limit) => {
-                            proto::usage_limit::Variant::Limited(proto::usage_limit::Limited {
-                                limit: limit as u32,
-                            })
-                        }
-                        zed_llm_client::UsageLimit::Unlimited => {
-                            proto::usage_limit::Variant::Unlimited(proto::usage_limit::Unlimited {})
-                        }
-                    }),
-                }),
-                edit_predictions_usage_amount: usage.edit_predictions as u32,
-                edit_predictions_usage_limit: Some(proto::UsageLimit {
-                    variant: Some(match plan.edit_predictions_limit() {
-                        zed_llm_client::UsageLimit::Limited(limit) => {
-                            proto::usage_limit::Variant::Limited(proto::usage_limit::Limited {
-                                limit: limit as u32,
-                            })
-                        }
-                        zed_llm_client::UsageLimit::Unlimited => {
-                            proto::usage_limit::Variant::Unlimited(proto::usage_limit::Unlimited {})
-                        }
-                    }),
-                }),
-            }
-        }),
-    })
-}
-
-async fn update_user_plan(user_id: UserId, session: &Session) -> Result<()> {
-    let db = session.db().await;
-
-    let update_user_plan = make_update_user_plan_message(
-        &db.0,
-        session.app_state.llm_db.clone(),
-        user_id,
-        session.is_staff(),
-    )
-    .await?;
-
    session
        .peer
-        .send(session.connection_id, update_user_plan)
+        .send(
+            session.connection_id,
+            proto::UpdateUserPlan {
+                plan: plan.into(),
+                trial_started_at: billing_customer
+                    .and_then(|billing_customer| billing_customer.trial_started_at)
+                    .map(|trial_started_at| trial_started_at.and_utc().timestamp() as u64),
+                is_usage_based_billing_enabled: if session.is_staff() {
+                    Some(true)
+                } else {
+                    billing_preferences
+                        .map(|preferences| preferences.model_request_overages_enabled)
+                },
+                subscription_period: subscription_period.map(|(started_at, ended_at)| {
+                    proto::SubscriptionPeriod {
+                        started_at: started_at.timestamp() as u64,
+                        ended_at: ended_at.timestamp() as u64,
+                    }
+                }),
+                usage: usage.map(|usage| {
+                    let plan = match plan {
+                        proto::Plan::Free => zed_llm_client::Plan::Free,
+                        proto::Plan::ZedPro => zed_llm_client::Plan::ZedPro,
+                        proto::Plan::ZedProTrial => zed_llm_client::Plan::ZedProTrial,
+                    };
+
+                    let model_requests_limit = match plan.model_requests_limit() {
+                        zed_llm_client::UsageLimit::Limited(limit) => {
+                            let limit = if plan == zed_llm_client::Plan::ZedProTrial
+                                && feature_flags
+                                    .iter()
+                                    .any(|flag| flag == AGENT_EXTENDED_TRIAL_FEATURE_FLAG)
+                            {
+                                1_000
+                            } else {
+                                limit
+                            };
+
+                            zed_llm_client::UsageLimit::Limited(limit)
+                        }
+                        zed_llm_client::UsageLimit::Unlimited => {
+                            zed_llm_client::UsageLimit::Unlimited
+                        }
+                    };
+
+                    proto::SubscriptionUsage {
+                        model_requests_usage_amount: usage.model_requests as u32,
+                        model_requests_usage_limit: Some(proto::UsageLimit {
+                            variant: Some(match model_requests_limit {
+                                zed_llm_client::UsageLimit::Limited(limit) => {
+                                    proto::usage_limit::Variant::Limited(
+                                        proto::usage_limit::Limited {
+                                            limit: limit as u32,
+                                        },
+                                    )
+                                }
+                                zed_llm_client::UsageLimit::Unlimited => {
+                                    proto::usage_limit::Variant::Unlimited(
+                                        proto::usage_limit::Unlimited {},
+                                    )
+                                }
+                            }),
+                        }),
+                        edit_predictions_usage_amount: usage.edit_predictions as u32,
+                        edit_predictions_usage_limit: Some(proto::UsageLimit {
+                            variant: Some(match plan.edit_predictions_limit() {
+                                zed_llm_client::UsageLimit::Limited(limit) => {
+                                    proto::usage_limit::Variant::Limited(
+                                        proto::usage_limit::Limited {
+                                            limit: limit as u32,
+                                        },
+                                    )
+                                }
+                                zed_llm_client::UsageLimit::Unlimited => {
+                                    proto::usage_limit::Variant::Unlimited(
+                                        proto::usage_limit::Unlimited {},
+                                    )
+                                }
+                            }),
+                        }),
+                    }
+                }),
+            },
+        )
        .trace_err();

    Ok(())
@@ -4013,6 +4000,11 @@ async fn get_llm_api_token(
    let db = session.db().await;

    let flags = db.get_user_flags(session.user_id()).await?;
+    let has_language_models_feature_flag = flags.iter().any(|flag| flag == "language-models");
+
+    if !session.is_staff() && !has_language_models_feature_flag {
+        Err(anyhow!("permission denied"))?
+    }

    let user_id = session.user_id();
    let user = db
@@ -4024,6 +4016,7 @@ async fn get_llm_api_token(
        Err(anyhow!("terms of service not accepted"))?
    }

+    let has_legacy_llm_subscription = session.has_llm_subscription(&db).await?;
    let billing_subscription = db.get_active_billing_subscription(user.id).await?;
    let billing_preferences = db.get_billing_preferences(user.id).await?;

@@ -4032,6 +4025,7 @@ async fn get_llm_api_token(
        session.is_staff(),
        billing_preferences,
        &flags,
+        has_legacy_llm_subscription,
        billing_subscription,
        session.system_id.clone(),
        &session.app_state.config,
--- a/crates/collab/src/stripe_billing.rs
+++ b/crates/collab/src/stripe_billing.rs
@@ -1,9 +1,9 @@
 use std::sync::Arc;

-use crate::Result;
-use crate::llm::AGENT_EXTENDED_TRIAL_FEATURE_FLAG;
+use crate::llm::{self, AGENT_EXTENDED_TRIAL_FEATURE_FLAG};
+use crate::{Cents, Result};
 use anyhow::{Context as _, anyhow};
-use chrono::Utc;
+use chrono::{Datelike, Utc};
 use collections::HashMap;
 use serde::{Deserialize, Serialize};
 use stripe::PriceId;
@@ -22,6 +22,18 @@ struct StripeBillingState {
    prices_by_lookup_key: HashMap<String, stripe::Price>,
 }

+pub struct StripeModelTokenPrices {
+    input_tokens_price: StripeBillingPrice,
+    input_cache_creation_tokens_price: StripeBillingPrice,
+    input_cache_read_tokens_price: StripeBillingPrice,
+    output_tokens_price: StripeBillingPrice,
+}
+
+struct StripeBillingPrice {
+    id: stripe::PriceId,
+    meter_event_name: String,
+}
+
 impl StripeBilling {
    pub fn new(client: Arc<stripe::Client>) -> Self {
        Self {
@@ -97,6 +109,142 @@ impl StripeBilling {
            .ok_or_else(|| crate::Error::Internal(anyhow!("no price found for {lookup_key:?}")))
    }

+    pub async fn register_model_for_token_based_usage(
+        &self,
+        model: &llm::db::model::Model,
+    ) -> Result<StripeModelTokenPrices> {
+        let input_tokens_price = self
+            .get_or_insert_token_price(
+                &format!("model_{}/input_tokens", model.id),
+                &format!("{} (Input Tokens)", model.name),
+                Cents::new(model.price_per_million_input_tokens as u32),
+            )
+            .await?;
+        let input_cache_creation_tokens_price = self
+            .get_or_insert_token_price(
+                &format!("model_{}/input_cache_creation_tokens", model.id),
+                &format!("{} (Input Cache Creation Tokens)", model.name),
+                Cents::new(model.price_per_million_cache_creation_input_tokens as u32),
+            )
+            .await?;
+        let input_cache_read_tokens_price = self
+            .get_or_insert_token_price(
+                &format!("model_{}/input_cache_read_tokens", model.id),
+                &format!("{} (Input Cache Read Tokens)", model.name),
+                Cents::new(model.price_per_million_cache_read_input_tokens as u32),
+            )
+            .await?;
+        let output_tokens_price = self
+            .get_or_insert_token_price(
+                &format!("model_{}/output_tokens", model.id),
+                &format!("{} (Output Tokens)", model.name),
+                Cents::new(model.price_per_million_output_tokens as u32),
+            )
+            .await?;
+        Ok(StripeModelTokenPrices {
+            input_tokens_price,
+            input_cache_creation_tokens_price,
+            input_cache_read_tokens_price,
+            output_tokens_price,
+        })
+    }
+
+    async fn get_or_insert_token_price(
+        &self,
+        meter_event_name: &str,
+        price_description: &str,
+        price_per_million_tokens: Cents,
+    ) -> Result<StripeBillingPrice> {
+        // Fast code path when the meter and the price already exist.
+        {
+            let state = self.state.read().await;
+            if let Some(meter) = state.meters_by_event_name.get(meter_event_name) {
+                if let Some(price_id) = state.price_ids_by_meter_id.get(&meter.id) {
+                    return Ok(StripeBillingPrice {
+                        id: price_id.clone(),
+                        meter_event_name: meter_event_name.to_string(),
+                    });
+                }
+            }
+        }
+
+        let mut state = self.state.write().await;
+        let meter = if let Some(meter) = state.meters_by_event_name.get(meter_event_name) {
+            meter.clone()
+        } else {
+            let meter = StripeMeter::create(
+                &self.client,
+                StripeCreateMeterParams {
+                    default_aggregation: DefaultAggregation { formula: "sum" },
+                    display_name: price_description.to_string(),
+                    event_name: meter_event_name,
+                },
+            )
+            .await?;
+            state
+                .meters_by_event_name
+                .insert(meter_event_name.to_string(), meter.clone());
+            meter
+        };
+
+        let price_id = if let Some(price_id) = state.price_ids_by_meter_id.get(&meter.id) {
+            price_id.clone()
+        } else {
+            let price = stripe::Price::create(
+                &self.client,
+                stripe::CreatePrice {
+                    active: Some(true),
+                    billing_scheme: Some(stripe::PriceBillingScheme::PerUnit),
+                    currency: stripe::Currency::USD,
+                    currency_options: None,
+                    custom_unit_amount: None,
+                    expand: &[],
+                    lookup_key: None,
+                    metadata: None,
+                    nickname: None,
+                    product: None,
+                    product_data: Some(stripe::CreatePriceProductData {
+                        id: None,
+                        active: Some(true),
+                        metadata: None,
+                        name: price_description.to_string(),
+                        statement_descriptor: None,
+                        tax_code: None,
+                        unit_label: None,
+                    }),
+                    recurring: Some(stripe::CreatePriceRecurring {
+                        aggregate_usage: None,
+                        interval: stripe::CreatePriceRecurringInterval::Month,
+                        interval_count: None,
+                        trial_period_days: None,
+                        usage_type: Some(stripe::CreatePriceRecurringUsageType::Metered),
+                        meter: Some(meter.id.clone()),
+                    }),
+                    tax_behavior: None,
+                    tiers: None,
+                    tiers_mode: None,
+                    transfer_lookup_key: None,
+                    transform_quantity: None,
+                    unit_amount: None,
+                    unit_amount_decimal: Some(&format!(
+                        "{:.12}",
+                        price_per_million_tokens.0 as f64 / 1_000_000f64
+                    )),
+                },
+            )
+            .await?;
+            state
+                .price_ids_by_meter_id
+                .insert(meter.id, price.id.clone());
+            price.id
+        };
+
+        Ok(StripeBillingPrice {
+            id: price_id,
+            meter_event_name: meter_event_name.to_string(),
+        })
+    }
+
    pub async fn subscribe_to_price(
        &self,
        subscription_id: &stripe::SubscriptionId,
@@ -135,6 +283,142 @@ impl StripeBilling {
        Ok(())
    }

+    pub async fn subscribe_to_model(
+        &self,
+        subscription_id: &stripe::SubscriptionId,
+        model: &StripeModelTokenPrices,
+    ) -> Result<()> {
+        let subscription =
+            stripe::Subscription::retrieve(&self.client, &subscription_id, &[]).await?;
+
+        let mut items = Vec::new();
+
+        if !subscription_contains_price(&subscription, &model.input_tokens_price.id) {
+            items.push(stripe::UpdateSubscriptionItems {
+                price: Some(model.input_tokens_price.id.to_string()),
+                ..Default::default()
+            });
+        }
+
+        if !subscription_contains_price(&subscription, &model.input_cache_creation_tokens_price.id)
+        {
+            items.push(stripe::UpdateSubscriptionItems {
+                price: Some(model.input_cache_creation_tokens_price.id.to_string()),
+                ..Default::default()
+            });
+        }
+
+        if !subscription_contains_price(&subscription, &model.input_cache_read_tokens_price.id) {
+            items.push(stripe::UpdateSubscriptionItems {
+                price: Some(model.input_cache_read_tokens_price.id.to_string()),
+                ..Default::default()
+            });
+        }
+
+        if !subscription_contains_price(&subscription, &model.output_tokens_price.id) {
+            items.push(stripe::UpdateSubscriptionItems {
+                price: Some(model.output_tokens_price.id.to_string()),
+                ..Default::default()
+            });
+        }
+
+        if !items.is_empty() {
+            items.extend(subscription.items.data.iter().map(|item| {
+                stripe::UpdateSubscriptionItems {
+                    id: Some(item.id.to_string()),
+                    ..Default::default()
+                }
+            }));
+
+            stripe::Subscription::update(
+                &self.client,
+                subscription_id,
+                stripe::UpdateSubscription {
+                    items: Some(items),
+                    ..Default::default()
+                },
+            )
+            .await?;
+        }
+
+        Ok(())
+    }
+
+    pub async fn bill_model_token_usage(
+        &self,
+        customer_id: &stripe::CustomerId,
+        model: &StripeModelTokenPrices,
+        event: &llm::db::billing_event::Model,
+    ) -> Result<()> {
+        let timestamp = Utc::now().timestamp();
+
+        if event.input_tokens > 0 {
+            StripeMeterEvent::create(
+                &self.client,
+                StripeCreateMeterEventParams {
+                    identifier: &format!("input_tokens/{}", event.idempotency_key),
+                    event_name: &model.input_tokens_price.meter_event_name,
+                    payload: StripeCreateMeterEventPayload {
+                        value: event.input_tokens as u64,
+                        stripe_customer_id: customer_id,
+                    },
+                    timestamp: Some(timestamp),
+                },
+            )
+            .await?;
+        }
+
+        if event.input_cache_creation_tokens > 0 {
+            StripeMeterEvent::create(
+                &self.client,
+                StripeCreateMeterEventParams {
+                    identifier: &format!("input_cache_creation_tokens/{}", event.idempotency_key),
+                    event_name: &model.input_cache_creation_tokens_price.meter_event_name,
+                    payload: StripeCreateMeterEventPayload {
+                        value: event.input_cache_creation_tokens as u64,
+                        stripe_customer_id: customer_id,
+                    },
+                    timestamp: Some(timestamp),
+                },
+            )
+            .await?;
+        }
+
+        if event.input_cache_read_tokens > 0 {
+            StripeMeterEvent::create(
+                &self.client,
+                StripeCreateMeterEventParams {
+                    identifier: &format!("input_cache_read_tokens/{}", event.idempotency_key),
+                    event_name: &model.input_cache_read_tokens_price.meter_event_name,
+                    payload: StripeCreateMeterEventPayload {
+                        value: event.input_cache_read_tokens as u64,
+                        stripe_customer_id: customer_id,
+                    },
+                    timestamp: Some(timestamp),
+                },
+            )
+            .await?;
+        }
+
+        if event.output_tokens > 0 {
+            StripeMeterEvent::create(
+                &self.client,
+                StripeCreateMeterEventParams {
+                    identifier: &format!("output_tokens/{}", event.idempotency_key),
+                    event_name: &model.output_tokens_price.meter_event_name,
+                    payload: StripeCreateMeterEventPayload {
+                        value: event.output_tokens as u64,
+                        stripe_customer_id: customer_id,
+                    },
+                    timestamp: Some(timestamp),
+                },
+            )
+            .await?;
+        }
+
+        Ok(())
+    }
+
    pub async fn bill_model_request_usage(
        &self,
        customer_id: &stripe::CustomerId,
@@ -161,6 +445,47 @@ impl StripeBilling {
        Ok(())
    }

+    pub async fn checkout(
+        &self,
+        customer_id: stripe::CustomerId,
+        github_login: &str,
+        model: &StripeModelTokenPrices,
+        success_url: &str,
+    ) -> Result<String> {
+        let first_of_next_month = Utc::now()
+            .checked_add_months(chrono::Months::new(1))
+            .unwrap()
+            .with_day(1)
+            .unwrap();
+
+        let mut params = stripe::CreateCheckoutSession::new();
+        params.mode = Some(stripe::CheckoutSessionMode::Subscription);
+        params.customer = Some(customer_id);
+        params.client_reference_id = Some(github_login);
+        params.subscription_data = Some(stripe::CreateCheckoutSessionSubscriptionData {
+            billing_cycle_anchor: Some(first_of_next_month.timestamp()),
+            ..Default::default()
+        });
+        params.line_items = Some(
+            [
+                &model.input_tokens_price.id,
+                &model.input_cache_creation_tokens_price.id,
+                &model.input_cache_read_tokens_price.id,
+                &model.output_tokens_price.id,
+            ]
+            .into_iter()
+            .map(|price_id| stripe::CreateCheckoutSessionLineItems {
+                price: Some(price_id.to_string()),
+                ..Default::default()
+            })
+            .collect(),
+        );
+        params.success_url = Some(success_url);
+
+        let session = stripe::CheckoutSession::create(&self.client, params).await?;
+        Ok(session.url.context("no checkout session URL")?)
+    }
+
    pub async fn checkout_with_zed_pro(
        &self,
        customer_id: stripe::CustomerId,
@@ -248,8 +573,6 @@ impl StripeBilling {

        let mut params = stripe::CreateCheckoutSession::new();
        params.mode = Some(stripe::CheckoutSessionMode::Subscription);
-        params.payment_method_collection =
-            Some(stripe::CheckoutSessionPaymentMethodCollection::IfRequired);
        params.customer = Some(customer_id);
        params.client_reference_id = Some(github_login);
        params.line_items = Some(vec![stripe::CreateCheckoutSessionLineItems {
@@ -264,6 +587,18 @@ impl StripeBilling {
    }
 }

+#[derive(Serialize)]
+struct DefaultAggregation {
+    formula: &'static str,
+}
+
+#[derive(Serialize)]
+struct StripeCreateMeterParams<'a> {
+    default_aggregation: DefaultAggregation,
+    display_name: String,
+    event_name: &'a str,
+}
+
 #[derive(Clone, Deserialize)]
 struct StripeMeter {
    id: String,
@@ -271,6 +606,13 @@ struct StripeMeter {
 }

 impl StripeMeter {
+    pub fn create(
+        client: &stripe::Client,
+        params: StripeCreateMeterParams,
+    ) -> stripe::Response<Self> {
+        client.post_form("/billing/meters", params)
+    }
+
    pub fn list(client: &stripe::Client) -> stripe::Response<stripe::List<Self>> {
        #[derive(Serialize)]
        struct Params {
--- a/crates/collab/src/tests/editor_tests.rs
+++ b/crates/collab/src/tests/editor_tests.rs
@@ -1740,7 +1740,6 @@ async fn test_mutual_editor_inlay_hint_cache_update(
    fake_language_server
        .request::<lsp::request::InlayHintRefreshRequest>(())
        .await
-        .into_response()
        .expect("inlay refresh request failed");

    executor.run_until_parked();
@@ -1931,7 +1930,6 @@ async fn test_inlay_hint_refresh_is_forwarded(
    fake_language_server
        .request::<lsp::request::InlayHintRefreshRequest>(())
        .await
-        .into_response()
        .expect("inlay refresh request failed");
    executor.run_until_parked();
    editor_a.update(cx_a, |editor, _| {
--- a/crates/collab/src/tests/integration_tests.rs
+++ b/crates/collab/src/tests/integration_tests.rs
@@ -1253,7 +1253,6 @@ async fn test_calls_on_multiple_connections(
    client_b1
        .authenticate_and_connect(false, &cx_b1.to_async())
        .await
-        .into_response()
        .unwrap();

    // User B hangs up, and user A calls them again.
@@ -1634,7 +1633,6 @@ async fn test_project_reconnect(
    client_a
        .authenticate_and_connect(false, &cx_a.to_async())
        .await
-        .into_response()
        .unwrap();
    executor.run_until_parked();

@@ -1763,7 +1761,6 @@ async fn test_project_reconnect(
    client_b
        .authenticate_and_connect(false, &cx_b.to_async())
        .await
-        .into_response()
        .unwrap();
    executor.run_until_parked();

@@ -4320,7 +4317,6 @@ async fn test_collaborating_with_lsp_progress_updates_and_diagnostics_ordering(
            token: lsp::NumberOrString::String("the-disk-based-token".to_string()),
        })
        .await
-        .into_response()
        .unwrap();
    fake_language_server.notify::<lsp::notification::Progress>(&lsp::ProgressParams {
        token: lsp::NumberOrString::String("the-disk-based-token".to_string()),
@@ -5703,7 +5699,6 @@ async fn test_contacts(
    client_c
        .authenticate_and_connect(false, &cx_c.to_async())
        .await
-        .into_response()
        .unwrap();

    executor.run_until_parked();
@@ -6234,7 +6229,6 @@ async fn test_contact_requests(
        client
            .authenticate_and_connect(false, &cx.to_async())
            .await
-            .into_response()
            .unwrap();
    }
 }
--- a/crates/collab/src/tests/remote_editing_collaboration_tests.rs
+++ b/crates/collab/src/tests/remote_editing_collaboration_tests.rs
@@ -581,11 +581,7 @@ async fn test_ssh_collaboration_formatting_with_prettier(
 }

 #[gpui::test]
-async fn test_remote_server_debugger(
-    cx_a: &mut TestAppContext,
-    server_cx: &mut TestAppContext,
-    executor: BackgroundExecutor,
-) {
+async fn test_remote_server_debugger(cx_a: &mut TestAppContext, server_cx: &mut TestAppContext) {
    cx_a.update(|cx| {
        release_channel::init(SemanticVersion::default(), cx);
        command_palette_hooks::init(cx);
@@ -683,7 +679,7 @@ async fn test_remote_server_debugger(
    });

    client_ssh.update(cx_a, |a, _| {
-        a.shutdown_processes(Some(proto::ShutdownRemoteServer {}), executor)
+        a.shutdown_processes(Some(proto::ShutdownRemoteServer {}))
    });

    shutdown_session.await.unwrap();
--- a/crates/collab/src/tests/test_server.rs
+++ b/crates/collab/src/tests/test_server.rs
@@ -313,7 +313,6 @@ impl TestServer {
        client
            .authenticate_and_connect(false, &cx.to_async())
            .await
-            .into_response()
            .unwrap();

        let client = TestClient {
--- a/crates/collab_ui/Cargo.toml
+++ b/crates/collab_ui/Cargo.toml
@@ -42,7 +42,6 @@ futures.workspace = true
 fuzzy.workspace = true
 gpui.workspace = true
 language.workspace = true
-log.workspace = true
 menu.workspace = true
 notifications.workspace = true
 picker.workspace = true
--- a/crates/collab_ui/src/collab_panel.rs
+++ b/crates/collab_ui/src/collab_panel.rs
@@ -1463,9 +1463,7 @@ impl CollabPanel {
    }

    fn cancel(&mut self, _: &Cancel, window: &mut Window, cx: &mut Context<Self>) {
-        if cx.stop_active_drag(window) {
-            return;
-        } else if self.take_editing_state(window, cx) {
+        if self.take_editing_state(window, cx) {
            window.focus(&self.filter_editor.focus_handle(cx));
        } else if !self.reset_filter_editor_text(window, cx) {
            self.focus_handle.focus(window);
@@ -2227,7 +2225,6 @@ impl CollabPanel {
                                    client
                                        .authenticate_and_connect(true, &cx)
                                        .await
-                                        .into_response()
                                        .notify_async_err(cx);
                                })
                                .detach()
--- a/crates/collab_ui/src/notification_panel.rs
+++ b/crates/collab_ui/src/notification_panel.rs
@@ -6,8 +6,8 @@ use collections::HashMap;
 use db::kvp::KEY_VALUE_STORE;
 use futures::StreamExt;
 use gpui::{
-    AnyElement, App, AsyncWindowContext, ClickEvent, Context, CursorStyle, DismissEvent, Element,
-    Entity, EventEmitter, FocusHandle, Focusable, InteractiveElement, IntoElement, ListAlignment,
+    AnyElement, App, AsyncWindowContext, Context, CursorStyle, DismissEvent, Element, Entity,
+    EventEmitter, FocusHandle, Focusable, InteractiveElement, IntoElement, ListAlignment,
    ListScrollEvent, ListState, ParentElement, Render, StatefulInteractiveElement, Styled, Task,
    WeakEntity, Window, actions, div, img, list, px,
 };
@@ -22,6 +22,7 @@ use ui::{
    Avatar, Button, Icon, IconButton, IconName, Label, Tab, Tooltip, h_flex, prelude::*, v_flex,
 };
 use util::{ResultExt, TryFutureExt};
+use workspace::SuppressNotification;
 use workspace::notifications::{
    Notification as WorkspaceNotification, NotificationId, SuppressEvent,
 };
@@ -646,20 +647,10 @@ impl Render for NotificationPanel {
                                            let client = client.clone();
                                            window
                                                .spawn(cx, async move |cx| {
-                                                    match client
+                                                    client
                                                        .authenticate_and_connect(true, &cx)
-                                                        .await
-                                                    {
-                                                        util::ConnectionResult::Timeout => {
-                                                            log::error!("Connection timeout");
-                                                        }
-                                                        util::ConnectionResult::ConnectionReset => {
-                                                            log::error!("Connection reset");
-                                                        }
-                                                        util::ConnectionResult::Result(r) => {
-                                                            r.log_err();
-                                                        }
-                                                    }
+                                                        .log_err()
+                                                        .await;
                                                })
                                                .detach()
                                        }
@@ -821,50 +812,32 @@ impl NotificationToast {
 }

 impl Render for NotificationToast {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
        let user = self.actor.clone();

-        let suppress = window.modifiers().shift;
-        let (close_id, close_icon) = if suppress {
-            ("suppress", IconName::Minimize)
-        } else {
-            ("close", IconName::Close)
-        };
-
        h_flex()
            .id("notification_panel_toast")
            .elevation_3(cx)
            .p_2()
-            .justify_between()
+            .gap_2()
            .children(user.map(|user| Avatar::new(user.avatar_uri.clone())))
            .child(Label::new(self.text.clone()))
-            .on_modifiers_changed(cx.listener(|_, _, _, cx| cx.notify()))
            .child(
-                IconButton::new(close_id, close_icon)
-                    .tooltip(move |window, cx| {
-                        if suppress {
-                            Tooltip::for_action(
-                                "Suppress.\nClose with click.",
-                                &workspace::SuppressNotification,
-                                window,
-                                cx,
-                            )
-                        } else {
-                            Tooltip::for_action(
-                                "Close.\nSuppress with shift-click",
-                                &menu::Cancel,
-                                window,
-                                cx,
-                            )
-                        }
+                IconButton::new("close", IconName::Close)
+                    .tooltip(|window, cx| Tooltip::for_action("Close", &menu::Cancel, window, cx))
+                    .on_click(cx.listener(|_, _, _, cx| cx.emit(DismissEvent))),
+            )
+            .child(
+                IconButton::new("suppress", IconName::SquareMinus)
+                    .tooltip(|window, cx| {
+                        Tooltip::for_action(
+                            "Do not show until restart",
+                            &SuppressNotification,
+                            window,
+                            cx,
+                        )
                    })
-                    .on_click(cx.listener(move |_, _: &ClickEvent, _, cx| {
-                        if suppress {
-                            cx.emit(SuppressEvent);
-                        } else {
-                            cx.emit(DismissEvent);
-                        }
-                    })),
+                    .on_click(cx.listener(|_, _, _, cx| cx.emit(SuppressEvent))),
            )
            .on_click(cx.listener(|this, _, window, cx| {
                this.focus_notification_panel(window, cx);
--- a/crates/component_preview/Cargo.toml
+++ b/crates/component_preview/Cargo.toml
@@ -0,0 +1,37 @@
+[package]
+name = "component_preview"
+version = "0.1.0"
+edition.workspace = true
+publish.workspace = true
+license = "GPL-3.0-or-later"
+
+[lints]
+workspace = true
+
+[lib]
+path = "src/component_preview.rs"
+
+[features]
+default = []
+
+[dependencies]
+agent.workspace = true
+anyhow.workspace = true
+client.workspace = true
+collections.workspace = true
+component.workspace = true
+db.workspace = true
+futures.workspace = true
+gpui.workspace = true
+languages.workspace = true
+log.workspace = true
+notifications.workspace = true
+project.workspace = true
+prompt_store.workspace = true
+serde.workspace = true
+ui.workspace = true
+ui_input.workspace = true
+util.workspace = true
+workspace-hack.workspace = true
+workspace.workspace = true
+assistant_tool.workspace = true
--- a/crates/component_preview/LICENSE-GPL
+++ b/crates/component_preview/LICENSE-GPL
@@ -0,0 +1 @@
+../../LICENSE-GPL
--- a/crates/component_preview/src/component_preview.rs
+++ b/crates/component_preview/src/component_preview.rs
--- a/crates/zed/src/zed/component_preview/persistence.rs
+++ b/crates/zed/src/zed/component_preview/persistence.rs
--- a/crates/zed/src/zed/component_preview/preview_support.rs
+++ b/crates/zed/src/zed/component_preview/preview_support.rs
--- a/crates/zed/src/zed/component_preview/preview_support/active_thread.rs
+++ b/crates/zed/src/zed/component_preview/preview_support/active_thread.rs
@@ -1,12 +1,12 @@
+use languages::LanguageRegistry;
+use project::Project;
+use std::sync::Arc;
+
 use agent::{ActiveThread, ContextStore, MessageSegment, TextThreadStore, ThreadStore};
 use anyhow::{Result, anyhow};
 use assistant_tool::ToolWorkingSet;
 use gpui::{AppContext, AsyncApp, Entity, Task, WeakEntity};
-use indoc::indoc;
-use languages::LanguageRegistry;
-use project::Project;
 use prompt_store::PromptBuilder;
-use std::sync::Arc;
 use ui::{App, Window};
 use workspace::Workspace;

@@ -60,30 +60,16 @@ pub fn static_active_thread(
    let thread = thread_store.update(cx, |thread_store, cx| thread_store.create_thread(cx));
    thread.update(cx, |thread, cx| {
        thread.insert_assistant_message(vec![
-            MessageSegment::Text(indoc! {"
-                I'll help you fix the lifetime error in your `cx.spawn` call. When working with async operations in GPUI, there are specific patterns to follow for proper lifetime management.
-
-                Let's look at what's happening in your code:
-
-                ---
-
-                Let's check the current state of the active_thread.rs file to understand what might have changed:
-
-                ---
-
-                Looking at the implementation of `load_preview_thread_store` and understanding GPUI's async patterns, here's the issue:
-
-                1. `load_preview_thread_store` returns a `Task<anyhow::Result<Entity<ThreadStore>>>`, which means it's already a task.
-                2. When you call this function inside another `spawn` call, you're nesting tasks incorrectly.
-
-                Here's the correct way to implement this:
-
-                ---
-
-                The problem is in how you're setting up the async closure and trying to reference variables like `window` and `language_registry` that aren't accessible in that scope.
-
-                Here's how to fix it:
-            "}.to_string()),
+            MessageSegment::Text("I'll help you fix the lifetime error in your `cx.spawn` call. When working with async operations in GPUI, there are specific patterns to follow for proper lifetime management.".to_string()),
+            MessageSegment::Text("\n\nLet's look at what's happening in your code:".to_string()),
+            MessageSegment::Text("\n\n---\n\nLet's check the current state of the active_thread.rs file to understand what might have changed:".to_string()),
+            MessageSegment::Text("\n\n---\n\nLooking at the implementation of `load_preview_thread_store` and understanding GPUI's async patterns, here's the issue:".to_string()),
+            MessageSegment::Text("\n\n1. `load_preview_thread_store` returns a `Task<anyhow::Result<Entity<ThreadStore>>>`, which means it's already a task".to_string()),
+            MessageSegment::Text("\n2. When you call this function inside another `spawn` call, you're nesting tasks incorrectly".to_string()),
+            MessageSegment::Text("\n3. The `this` parameter you're trying to use in your closure has the wrong context".to_string()),
+            MessageSegment::Text("\n\nHere's the correct way to implement this:".to_string()),
+            MessageSegment::Text("\n\n---\n\nThe problem is in how you're setting up the async closure and trying to reference variables like `window` and `language_registry` that aren't accessible in that scope.".to_string()),
+            MessageSegment::Text("\n\nHere's how to fix it:".to_string()),
        ], cx);
    });
    cx.new(|cx| {
--- a/crates/copilot/src/copilot.rs
+++ b/crates/copilot/src/copilot.rs
@@ -3,9 +3,8 @@ mod copilot_completion_provider;
 pub mod request;
 mod sign_in;

-use crate::sign_in::initiate_sign_in_within_workspace;
 use ::fs::Fs;
-use anyhow::{Context as _, Result, anyhow};
+use anyhow::{Result, anyhow};
 use collections::{HashMap, HashSet};
 use command_palette_hooks::CommandPaletteFilter;
 use futures::{Future, FutureExt, TryFutureExt, channel::oneshot, future::Shared};
@@ -25,7 +24,6 @@ use node_runtime::NodeRuntime;
 use parking_lot::Mutex;
 use request::StatusNotification;
 use settings::SettingsStore;
-use sign_in::{reinstall_and_sign_in_within_workspace, sign_out_within_workspace};
 use std::{
    any::TypeId,
    env,
@@ -36,10 +34,9 @@ use std::{
    sync::Arc,
 };
 use util::{ResultExt, fs::remove_matching};
-use workspace::Workspace;

 pub use crate::copilot_completion_provider::CopilotCompletionProvider;
-pub use crate::sign_in::{CopilotCodeVerification, initiate_sign_in, reinstall_and_sign_in};
+pub use crate::sign_in::{CopilotCodeVerification, initiate_sign_in};

 actions!(
    copilot,
@@ -102,25 +99,27 @@ pub fn init(
    })
    .detach();

-    cx.observe_new(|workspace: &mut Workspace, _window, _cx| {
-        workspace.register_action(|workspace, _: &SignIn, window, cx| {
-            if let Some(copilot) = Copilot::global(cx) {
-                let is_reinstall = false;
-                initiate_sign_in_within_workspace(workspace, copilot, is_reinstall, window, cx);
-            }
-        });
-        workspace.register_action(|workspace, _: &Reinstall, window, cx| {
-            if let Some(copilot) = Copilot::global(cx) {
-                reinstall_and_sign_in_within_workspace(workspace, copilot, window, cx);
-            }
-        });
-        workspace.register_action(|workspace, _: &SignOut, _window, cx| {
-            if let Some(copilot) = Copilot::global(cx) {
-                sign_out_within_workspace(workspace, copilot, cx);
-            }
-        });
-    })
-    .detach();
+    cx.on_action(|_: &SignIn, cx| {
+        if let Some(copilot) = Copilot::global(cx) {
+            copilot
+                .update(cx, |copilot, cx| copilot.sign_in(cx))
+                .detach_and_log_err(cx);
+        }
+    });
+    cx.on_action(|_: &SignOut, cx| {
+        if let Some(copilot) = Copilot::global(cx) {
+            copilot
+                .update(cx, |copilot, cx| copilot.sign_out(cx))
+                .detach_and_log_err(cx);
+        }
+    });
+    cx.on_action(|_: &Reinstall, cx| {
+        if let Some(copilot) = Copilot::global(cx) {
+            copilot
+                .update(cx, |copilot, cx| copilot.reinstall(cx))
+                .detach();
+        }
+    });
 }

 enum CopilotServer {
@@ -531,15 +530,11 @@ impl Copilot {
                .request::<request::CheckStatus>(request::CheckStatusParams {
                    local_checks_only: false,
                })
-                .await
-                .into_response()
-                .context("copilot: check status")?;
+                .await?;

            server
                .request::<request::SetEditorInfo>(editor_info)
-                .await
-                .into_response()
-                .context("copilot: set editor info")?;
+                .await?;

            anyhow::Ok((server, status))
        };
@@ -568,7 +563,7 @@ impl Copilot {
        .ok();
    }

-    pub(crate) fn sign_in(&mut self, cx: &mut Context<Self>) -> Task<Result<()>> {
+    pub fn sign_in(&mut self, cx: &mut Context<Self>) -> Task<Result<()>> {
        if let CopilotServer::Running(server) = &mut self.server {
            let task = match &server.sign_in_status {
                SignInStatus::Authorized { .. } => Task::ready(Ok(())).shared(),
@@ -585,9 +580,7 @@ impl Copilot {
                                    .request::<request::SignInInitiate>(
                                        request::SignInInitiateParams {},
                                    )
-                                    .await
-                                    .into_response()
-                                    .context("copilot sign-in")?;
+                                    .await?;
                                match sign_in {
                                    request::SignInInitiateResult::AlreadySignedIn { user } => {
                                        Ok(request::SignInStatus::Ok { user: Some(user) })
@@ -615,9 +608,7 @@ impl Copilot {
                                                    user_code: flow.user_code,
                                                },
                                            )
-                                            .await
-                                            .into_response()
-                                            .context("copilot: sign in confirm")?;
+                                            .await?;
                                        Ok(response)
                                    }
                                }
@@ -656,7 +647,7 @@ impl Copilot {
        }
    }

-    pub(crate) fn sign_out(&mut self, cx: &mut Context<Self>) -> Task<Result<()>> {
+    pub fn sign_out(&mut self, cx: &mut Context<Self>) -> Task<Result<()>> {
        self.update_sign_in_status(request::SignInStatus::NotSignedIn, cx);
        match &self.server {
            CopilotServer::Running(RunningCopilotServer { lsp: server, .. }) => {
@@ -664,9 +655,7 @@ impl Copilot {
                cx.background_spawn(async move {
                    server
                        .request::<request::SignOut>(request::SignOutParams {})
-                        .await
-                        .into_response()
-                        .context("copilot: sign in confirm")?;
+                        .await?;
                    anyhow::Ok(())
                })
            }
@@ -678,7 +667,7 @@ impl Copilot {
        }
    }

-    pub(crate) fn reinstall(&mut self, cx: &mut Context<Self>) -> Shared<Task<()>> {
+    pub fn reinstall(&mut self, cx: &mut Context<Self>) -> Task<()> {
        let language_settings = all_language_settings(None, cx);
        let env = self.build_env(&language_settings.edit_predictions.copilot);
        let start_task = cx
@@ -700,7 +689,7 @@ impl Copilot {

        cx.notify();

-        start_task
+        cx.background_spawn(start_task)
    }

    pub fn language_server(&self) -> Option<&Arc<LanguageServer>> {
@@ -883,10 +872,7 @@ impl Copilot {
                    uuid: completion.uuid.clone(),
                });
        cx.background_spawn(async move {
-            request
-                .await
-                .into_response()
-                .context("copilot: notify accepted")?;
+            request.await?;
            Ok(())
        })
    }
@@ -910,10 +896,7 @@ impl Copilot {
                        .collect(),
                });
        cx.background_spawn(async move {
-            request
-                .await
-                .into_response()
-                .context("copilot: notify rejected")?;
+            request.await?;
            Ok(())
        })
    }
@@ -973,9 +956,7 @@ impl Copilot {
                        version: version.try_into().unwrap(),
                    },
                })
-                .await
-                .into_response()
-                .context("copilot: get completions")?;
+                .await?;
            let completions = result
                .completions
                .into_iter()
--- a/crates/copilot/src/sign_in.rs
+++ b/crates/copilot/src/sign_in.rs
@@ -12,7 +12,7 @@ use workspace::{ModalView, Toast, Workspace};

 const COPILOT_SIGN_UP_URL: &str = "https://github.com/features/copilot";

-struct CopilotStatusToast;
+struct CopilotStartingToast;

 pub fn initiate_sign_in(window: &mut Window, cx: &mut App) {
    let Some(copilot) = Copilot::global(cx) else {
@@ -21,83 +21,50 @@ pub fn initiate_sign_in(window: &mut Window, cx: &mut App) {
    let Some(workspace) = window.root::<Workspace>().flatten() else {
        return;
    };
-    workspace.update(cx, |workspace, cx| {
-        let is_reinstall = false;
-        initiate_sign_in_within_workspace(workspace, copilot, is_reinstall, window, cx)
-    });
-}
-
-pub fn reinstall_and_sign_in(window: &mut Window, cx: &mut App) {
-    let Some(copilot) = Copilot::global(cx) else {
-        return;
-    };
-    let Some(workspace) = window.root::<Workspace>().flatten() else {
-        return;
-    };
-    workspace.update(cx, |workspace, cx| {
-        reinstall_and_sign_in_within_workspace(workspace, copilot, window, cx);
-    });
-}
-
-pub fn reinstall_and_sign_in_within_workspace(
-    workspace: &mut Workspace,
-    copilot: Entity<Copilot>,
-    window: &mut Window,
-    cx: &mut Context<Workspace>,
-) {
-    let _ = copilot.update(cx, |copilot, cx| copilot.reinstall(cx));
-    let is_reinstall = true;
-    initiate_sign_in_within_workspace(workspace, copilot, is_reinstall, window, cx);
-}
-
-pub fn initiate_sign_in_within_workspace(
-    workspace: &mut Workspace,
-    copilot: Entity<Copilot>,
-    is_reinstall: bool,
-    window: &mut Window,
-    cx: &mut Context<Workspace>,
-) {
    if matches!(copilot.read(cx).status(), Status::Disabled) {
-        copilot.update(cx, |copilot, cx| copilot.start_copilot(false, true, cx));
+        copilot.update(cx, |this, cx| this.start_copilot(false, true, cx));
    }
    match copilot.read(cx).status() {
        Status::Starting { task } => {
-            workspace.show_toast(
-                Toast::new(
-                    NotificationId::unique::<CopilotStatusToast>(),
-                    if is_reinstall {
-                        "Copilot is reinstalling..."
-                    } else {
-                        "Copilot is starting..."
-                    },
-                ),
-                cx,
-            );
+            workspace.update(cx, |workspace, cx| {
+                workspace.show_toast(
+                    Toast::new(
+                        NotificationId::unique::<CopilotStartingToast>(),
+                        "Copilot is starting...",
+                    ),
+                    cx,
+                );
+            });

-            cx.spawn_in(window, async move |workspace, cx| {
+            let workspace = workspace.downgrade();
+            cx.spawn(async move |cx| {
                task.await;
-                if let Some(copilot) = cx.update(|_window, cx| Copilot::global(cx)).ok().flatten() {
+                if let Some(copilot) = cx.update(|cx| Copilot::global(cx)).ok().flatten() {
                    workspace
-                        .update_in(cx, |workspace, window, cx| {
-                            match copilot.read(cx).status() {
-                                Status::Authorized => workspace.show_toast(
-                                    Toast::new(
-                                        NotificationId::unique::<CopilotStatusToast>(),
-                                        "Copilot has started.",
-                                    ),
-                                    cx,
+                        .update(cx, |workspace, cx| match copilot.read(cx).status() {
+                            Status::Authorized => workspace.show_toast(
+                                Toast::new(
+                                    NotificationId::unique::<CopilotStartingToast>(),
+                                    "Copilot has started!",
                                ),
-                                _ => {
-                                    workspace.dismiss_toast(
-                                        &NotificationId::unique::<CopilotStatusToast>(),
-                                        cx,
-                                    );
-                                    copilot
-                                        .update(cx, |copilot, cx| copilot.sign_in(cx))
-                                        .detach_and_log_err(cx);
-                                    workspace.toggle_modal(window, cx, |_, cx| {
-                                        CopilotCodeVerification::new(&copilot, cx)
-                                    });
+                                cx,
+                            ),
+                            _ => {
+                                workspace.dismiss_toast(
+                                    &NotificationId::unique::<CopilotStartingToast>(),
+                                    cx,
+                                );
+                                copilot
+                                    .update(cx, |copilot, cx| copilot.sign_in(cx))
+                                    .detach_and_log_err(cx);
+                                if let Some(window_handle) = cx.active_window() {
+                                    window_handle
+                                        .update(cx, |_, window, cx| {
+                                            workspace.toggle_modal(window, cx, |_, cx| {
+                                                CopilotCodeVerification::new(&copilot, cx)
+                                            });
+                                        })
+                                        .log_err();
                                }
                            }
                        })
@@ -107,54 +74,16 @@ pub fn initiate_sign_in_within_workspace(
            .detach();
        }
        _ => {
-            copilot
-                .update(cx, |copilot, cx| copilot.sign_in(cx))
-                .detach();
-            workspace.toggle_modal(window, cx, |_, cx| {
-                CopilotCodeVerification::new(&copilot, cx)
+            copilot.update(cx, |this, cx| this.sign_in(cx)).detach();
+            workspace.update(cx, |this, cx| {
+                this.toggle_modal(window, cx, |_, cx| {
+                    CopilotCodeVerification::new(&copilot, cx)
+                });
            });
        }
    }
 }

-pub fn sign_out_within_workspace(
-    workspace: &mut Workspace,
-    copilot: Entity<Copilot>,
-    cx: &mut Context<Workspace>,
-) {
-    workspace.show_toast(
-        Toast::new(
-            NotificationId::unique::<CopilotStatusToast>(),
-            "Signing out of Copilot...",
-        ),
-        cx,
-    );
-    let sign_out_task = copilot.update(cx, |copilot, cx| copilot.sign_out(cx));
-    cx.spawn(async move |workspace, cx| match sign_out_task.await {
-        Ok(()) => {
-            workspace
-                .update(cx, |workspace, cx| {
-                    workspace.show_toast(
-                        Toast::new(
-                            NotificationId::unique::<CopilotStatusToast>(),
-                            "Signed out of Copilot.",
-                        ),
-                        cx,
-                    )
-                })
-                .ok();
-        }
-        Err(err) => {
-            workspace
-                .update(cx, |workspace, cx| {
-                    workspace.show_error(&err, cx);
-                })
-                .ok();
-        }
-    })
-    .detach();
-}
-
 pub struct CopilotCodeVerification {
    status: Status,
    connect_clicked: bool,
--- a/crates/dap/Cargo.toml
+++ b/crates/dap/Cargo.toml
@@ -36,6 +36,7 @@ gpui.workspace = true
 http_client.workspace = true
 language.workspace = true
 log.workspace = true
+lsp-types.workspace = true
 node_runtime.workspace = true
 parking_lot.workspace = true
 paths.workspace = true
--- a/crates/dap/src/adapters.rs
+++ b/crates/dap/src/adapters.rs
@@ -78,11 +78,6 @@ impl From<DebugAdapterName> for SharedString {
        name.0
    }
 }
-impl From<SharedString> for DebugAdapterName {
-    fn from(name: SharedString) -> Self {
-        DebugAdapterName(name)
-    }
-}

 impl<'a> From<&'a str> for DebugAdapterName {
    fn from(str: &'a str) -> DebugAdapterName {
@@ -407,6 +402,10 @@ pub async fn fetch_latest_adapter_version_from_github(
    })
 }

+pub trait InlineValueProvider {
+    fn provide(&self, variables: Vec<(String, lsp_types::Range)>) -> Vec<lsp_types::InlineValue>;
+}
+
 #[async_trait(?Send)]
 pub trait DebugAdapter: 'static + Send + Sync {
    fn name(&self) -> DebugAdapterName;
@@ -418,6 +417,10 @@ pub trait DebugAdapter: 'static + Send + Sync {
        user_installed_path: Option<PathBuf>,
        cx: &mut AsyncApp,
    ) -> Result<DebugAdapterBinary>;
+
+    fn inline_value_provider(&self) -> Option<Box<dyn InlineValueProvider>> {
+        None
+    }
 }

 #[cfg(any(test, feature = "test-support"))]
--- a/crates/dap/src/dap.rs
+++ b/crates/dap/src/dap.rs
@@ -1,7 +1,6 @@
 pub mod adapters;
 pub mod client;
 pub mod debugger_settings;
-pub mod inline_value;
 pub mod proto_conversions;
 mod registry;
 pub mod transport;
--- a/crates/dap/src/inline_value.rs
+++ b/crates/dap/src/inline_value.rs
@@ -1,277 +0,0 @@
-use std::collections::{HashMap, HashSet};
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum VariableLookupKind {
-    Variable,
-    Expression,
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum VariableScope {
-    Local,
-    Global,
-}
-
-#[derive(Debug, Clone)]
-pub struct InlineValueLocation {
-    pub variable_name: String,
-    pub scope: VariableScope,
-    pub lookup: VariableLookupKind,
-    pub row: usize,
-    pub column: usize,
-}
-
-/// A trait for providing inline values for debugging purposes.
-///
-/// Implementors of this trait are responsible for analyzing a given node in the
-/// source code and extracting variable information, including their names,
-/// scopes, and positions. This information is used to display inline values
-/// during debugging sessions. Implementors must also handle variable scoping
-/// themselves by traversing the syntax tree upwards to determine whether a
-/// variable is local or global.
-pub trait InlineValueProvider {
-    /// Provides a list of inline value locations based on the given node and source code.
-    ///
-    /// # Parameters
-    /// - `node`: The root node of the active debug line. Implementors should traverse
-    ///   upwards from this node to gather variable information and determine their scope.
-    /// - `source`: The source code as a string slice, used to extract variable names.
-    /// - `max_row`: The maximum row to consider when collecting variables. Variables
-    ///   declared beyond this row should be ignored.
-    ///
-    /// # Returns
-    /// A vector of `InlineValueLocation` instances, each representing a variable's
-    /// name, scope, and the position of the inline value should be shown.
-    fn provide(
-        &self,
-        node: language::Node,
-        source: &str,
-        max_row: usize,
-    ) -> Vec<InlineValueLocation>;
-}
-
-pub struct RustInlineValueProvider;
-
-impl InlineValueProvider for RustInlineValueProvider {
-    fn provide(
-        &self,
-        mut node: language::Node,
-        source: &str,
-        max_row: usize,
-    ) -> Vec<InlineValueLocation> {
-        let mut variables = Vec::new();
-        let mut variable_names = HashSet::new();
-        let mut scope = VariableScope::Local;
-
-        loop {
-            let mut variable_names_in_scope = HashMap::new();
-            for child in node.named_children(&mut node.walk()) {
-                if child.start_position().row >= max_row {
-                    break;
-                }
-
-                if scope == VariableScope::Local && child.kind() == "let_declaration" {
-                    if let Some(identifier) = child.child_by_field_name("pattern") {
-                        let variable_name = source[identifier.byte_range()].to_string();
-
-                        if variable_names.contains(&variable_name) {
-                            continue;
-                        }
-
-                        if let Some(index) = variable_names_in_scope.get(&variable_name) {
-                            variables.remove(*index);
-                        }
-
-                        variable_names_in_scope.insert(variable_name.clone(), variables.len());
-                        variables.push(InlineValueLocation {
-                            variable_name,
-                            scope: VariableScope::Local,
-                            lookup: VariableLookupKind::Variable,
-                            row: identifier.end_position().row,
-                            column: identifier.end_position().column,
-                        });
-                    }
-                } else if child.kind() == "static_item" {
-                    if let Some(name) = child.child_by_field_name("name") {
-                        let variable_name = source[name.byte_range()].to_string();
-                        variables.push(InlineValueLocation {
-                            variable_name,
-                            scope: scope.clone(),
-                            lookup: VariableLookupKind::Expression,
-                            row: name.end_position().row,
-                            column: name.end_position().column,
-                        });
-                    }
-                }
-            }
-
-            variable_names.extend(variable_names_in_scope.keys().cloned());
-
-            if matches!(node.kind(), "function_item" | "closure_expression") {
-                scope = VariableScope::Global;
-            }
-
-            if let Some(parent) = node.parent() {
-                node = parent;
-            } else {
-                break;
-            }
-        }
-
-        variables
-    }
-}
-
-pub struct PythonInlineValueProvider;
-
-impl InlineValueProvider for PythonInlineValueProvider {
-    fn provide(
-        &self,
-        mut node: language::Node,
-        source: &str,
-        max_row: usize,
-    ) -> Vec<InlineValueLocation> {
-        let mut variables = Vec::new();
-        let mut variable_names = HashSet::new();
-        let mut scope = VariableScope::Local;
-
-        loop {
-            let mut variable_names_in_scope = HashMap::new();
-            for child in node.named_children(&mut node.walk()) {
-                if child.start_position().row >= max_row {
-                    break;
-                }
-
-                if scope == VariableScope::Local {
-                    match child.kind() {
-                        "expression_statement" => {
-                            if let Some(expr) = child.child(0) {
-                                if expr.kind() == "assignment" {
-                                    if let Some(param) = expr.child(0) {
-                                        let param_identifier = if param.kind() == "identifier" {
-                                            Some(param)
-                                        } else if param.kind() == "typed_parameter" {
-                                            param.child(0)
-                                        } else {
-                                            None
-                                        };
-
-                                        if let Some(identifier) = param_identifier {
-                                            if identifier.kind() == "identifier" {
-                                                let variable_name =
-                                                    source[identifier.byte_range()].to_string();
-
-                                                if variable_names.contains(&variable_name) {
-                                                    continue;
-                                                }
-
-                                                if let Some(index) =
-                                                    variable_names_in_scope.get(&variable_name)
-                                                {
-                                                    variables.remove(*index);
-                                                }
-
-                                                variable_names_in_scope
-                                                    .insert(variable_name.clone(), variables.len());
-                                                variables.push(InlineValueLocation {
-                                                    variable_name,
-                                                    scope: VariableScope::Local,
-                                                    lookup: VariableLookupKind::Variable,
-                                                    row: identifier.end_position().row,
-                                                    column: identifier.end_position().column,
-                                                });
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                        "function_definition" => {
-                            if let Some(params) = child.child_by_field_name("parameters") {
-                                for param in params.named_children(&mut params.walk()) {
-                                    let param_identifier = if param.kind() == "identifier" {
-                                        Some(param)
-                                    } else if param.kind() == "typed_parameter" {
-                                        param.child(0)
-                                    } else {
-                                        None
-                                    };
-
-                                    if let Some(identifier) = param_identifier {
-                                        if identifier.kind() == "identifier" {
-                                            let variable_name =
-                                                source[identifier.byte_range()].to_string();
-
-                                            if variable_names.contains(&variable_name) {
-                                                continue;
-                                            }
-
-                                            if let Some(index) =
-                                                variable_names_in_scope.get(&variable_name)
-                                            {
-                                                variables.remove(*index);
-                                            }
-
-                                            variable_names_in_scope
-                                                .insert(variable_name.clone(), variables.len());
-                                            variables.push(InlineValueLocation {
-                                                variable_name,
-                                                scope: VariableScope::Local,
-                                                lookup: VariableLookupKind::Variable,
-                                                row: identifier.end_position().row,
-                                                column: identifier.end_position().column,
-                                            });
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                        "for_statement" => {
-                            if let Some(target) = child.child_by_field_name("left") {
-                                if target.kind() == "identifier" {
-                                    let variable_name = source[target.byte_range()].to_string();
-
-                                    if variable_names.contains(&variable_name) {
-                                        continue;
-                                    }
-
-                                    if let Some(index) = variable_names_in_scope.get(&variable_name)
-                                    {
-                                        variables.remove(*index);
-                                    }
-
-                                    variable_names_in_scope
-                                        .insert(variable_name.clone(), variables.len());
-                                    variables.push(InlineValueLocation {
-                                        variable_name,
-                                        scope: VariableScope::Local,
-                                        lookup: VariableLookupKind::Variable,
-                                        row: target.end_position().row,
-                                        column: target.end_position().column,
-                                    });
-                                }
-                            }
-                        }
-                        _ => {}
-                    }
-                }
-            }
-
-            variable_names.extend(variable_names_in_scope.keys().cloned());
-
-            if matches!(node.kind(), "function_definition" | "module")
-                && node.range().end_point.row < max_row
-            {
-                scope = VariableScope::Global;
-            }
-
-            if let Some(parent) = node.parent() {
-                node = parent;
-            } else {
-                break;
-            }
-        }
-
-        variables
-    }
-}
--- a/crates/dap/src/registry.rs
+++ b/crates/dap/src/registry.rs
@@ -5,10 +5,7 @@ use gpui::{App, Global, SharedString};
 use parking_lot::RwLock;
 use task::{DebugRequest, DebugScenario, SpawnInTerminal, TaskTemplate};

-use crate::{
-    adapters::{DebugAdapter, DebugAdapterName},
-    inline_value::InlineValueProvider,
-};
+use crate::adapters::{DebugAdapter, DebugAdapterName};
 use std::{collections::BTreeMap, sync::Arc};

 /// Given a user build configuration, locator creates a fill-in debug target ([DebugRequest]) on behalf of the user.
@@ -16,12 +13,7 @@ use std::{collections::BTreeMap, sync::Arc};
 pub trait DapLocator: Send + Sync {
    fn name(&self) -> SharedString;
    /// Determines whether this locator can generate debug target for given task.
-    fn create_scenario(
-        &self,
-        build_config: &TaskTemplate,
-        resolved_label: &str,
-        adapter: DebugAdapterName,
-    ) -> Option<DebugScenario>;
+    fn create_scenario(&self, build_config: &TaskTemplate, adapter: &str) -> Option<DebugScenario>;

    async fn run(&self, build_config: SpawnInTerminal) -> Result<DebugRequest>;
 }
@@ -30,7 +22,6 @@ pub trait DapLocator: Send + Sync {
 struct DapRegistryState {
    adapters: BTreeMap<DebugAdapterName, Arc<dyn DebugAdapter>>,
    locators: FxHashMap<SharedString, Arc<dyn DapLocator>>,
-    inline_value_providers: FxHashMap<String, Arc<dyn InlineValueProvider>>,
 }

 #[derive(Clone, Default)]
@@ -67,22 +58,6 @@ impl DapRegistry {
        );
    }

-    pub fn add_inline_value_provider(
-        &self,
-        language: String,
-        provider: Arc<dyn InlineValueProvider>,
-    ) {
-        let _previous_value = self
-            .0
-            .write()
-            .inline_value_providers
-            .insert(language, provider);
-        debug_assert!(
-            _previous_value.is_none(),
-            "Attempted to insert a new inline value provider when one is already registered"
-        );
-    }
-
    pub fn locators(&self) -> FxHashMap<SharedString, Arc<dyn DapLocator>> {
        self.0.read().locators.clone()
    }
@@ -91,10 +66,6 @@ impl DapRegistry {
        self.0.read().adapters.get(name).cloned()
    }

-    pub fn inline_value_provider(&self, language: &str) -> Option<Arc<dyn InlineValueProvider>> {
-        self.0.read().inline_value_providers.get(language).cloned()
-    }
-
    pub fn enumerate_adapters(&self) -> Vec<DebugAdapterName> {
        self.0.read().adapters.keys().cloned().collect()
    }
--- a/crates/dap/src/transport.rs
+++ b/crates/dap/src/transport.rs
@@ -580,31 +580,21 @@ impl TcpTransport {
                .unwrap_or(2000u64)
        });

-        let (mut process, (rx, tx)) = select! {
+        let (rx, tx) = select! {
            _ = cx.background_executor().timer(Duration::from_millis(timeout)).fuse() => {
                return Err(anyhow!(format!("Connection to TCP DAP timeout {}:{}", host, port)))
            },
            result = cx.spawn(async move |cx| {
                loop {
                    match TcpStream::connect(address).await {
-                        Ok(stream) => return Ok((process, stream.split())),
+                        Ok(stream) => return stream.split(),
                        Err(_) => {
-                            if let Ok(Some(_)) = process.try_status() {
-                                let output = process.output().await?;
-                                let output = if output.stderr.is_empty() {
-                                    String::from_utf8_lossy(&output.stdout).to_string()
-                                } else {
-                                    String::from_utf8_lossy(&output.stderr).to_string()
-                                };
-                                return Err(anyhow!("{}\nerror: process exited before debugger attached.", output));
-                            }
                            cx.background_executor().timer(Duration::from_millis(100)).await;
                        }
                    }
                }
-            }).fuse() => result?
+            }).fuse() => result
        };
-
        log::info!(
            "Debug adapter has connected to TCP server {}:{}",
            host,
--- a/crates/dap_adapters/Cargo.toml
+++ b/crates/dap_adapters/Cargo.toml
@@ -27,6 +27,7 @@ dap.workspace = true
 futures.workspace = true
 gpui.workspace = true
 language.workspace = true
+lsp-types.workspace = true
 paths.workspace = true
 serde.workspace = true
 serde_json.workspace = true
--- a/crates/dap_adapters/src/codelldb.rs
+++ b/crates/dap_adapters/src/codelldb.rs
@@ -2,7 +2,7 @@ use std::{collections::HashMap, path::PathBuf, sync::OnceLock};

 use anyhow::Result;
 use async_trait::async_trait;
-use dap::adapters::{DebugTaskDefinition, latest_github_release};
+use dap::adapters::{DebugTaskDefinition, InlineValueProvider, latest_github_release};
 use futures::StreamExt;
 use gpui::AsyncApp;
 use task::DebugRequest;
@@ -159,4 +159,25 @@ impl DebugAdapter for CodeLldbDebugAdapter {
            connection: None,
        })
    }
+
+    fn inline_value_provider(&self) -> Option<Box<dyn InlineValueProvider>> {
+        Some(Box::new(CodeLldbInlineValueProvider))
+    }
+}
+
+struct CodeLldbInlineValueProvider;
+
+impl InlineValueProvider for CodeLldbInlineValueProvider {
+    fn provide(&self, variables: Vec<(String, lsp_types::Range)>) -> Vec<lsp_types::InlineValue> {
+        variables
+            .into_iter()
+            .map(|(variable, range)| {
+                lsp_types::InlineValue::VariableLookup(lsp_types::InlineValueVariableLookup {
+                    range,
+                    variable_name: Some(variable),
+                    case_sensitive_lookup: true,
+                })
+            })
+            .collect()
+    }
 }
--- a/crates/dap_adapters/src/dap_adapters.rs
+++ b/crates/dap_adapters/src/dap_adapters.rs
@@ -4,7 +4,6 @@ mod go;
 mod javascript;
 mod php;
 mod python;
-mod ruby;

 use std::{net::Ipv4Addr, sync::Arc};

@@ -17,7 +16,6 @@ use dap::{
        self, AdapterVersion, DapDelegate, DebugAdapter, DebugAdapterBinary, DebugAdapterName,
        GithubRepo,
    },
-    inline_value::{PythonInlineValueProvider, RustInlineValueProvider},
 };
 use gdb::GdbDebugAdapter;
 use go::GoDebugAdapter;
@@ -25,7 +23,6 @@ use gpui::{App, BorrowAppContext};
 use javascript::JsDebugAdapter;
 use php::PhpDebugAdapter;
 use python::PythonDebugAdapter;
-use ruby::RubyDebugAdapter;
 use serde_json::{Value, json};
 use task::TcpArgumentsTemplate;

@@ -35,13 +32,8 @@ pub fn init(cx: &mut App) {
        registry.add_adapter(Arc::from(PythonDebugAdapter::default()));
        registry.add_adapter(Arc::from(PhpDebugAdapter::default()));
        registry.add_adapter(Arc::from(JsDebugAdapter::default()));
-        registry.add_adapter(Arc::from(RubyDebugAdapter));
        registry.add_adapter(Arc::from(GoDebugAdapter));
        registry.add_adapter(Arc::from(GdbDebugAdapter));
-
-        registry.add_inline_value_provider("Rust".to_string(), Arc::from(RustInlineValueProvider));
-        registry
-            .add_inline_value_provider("Python".to_string(), Arc::from(PythonInlineValueProvider));
    })
 }

--- a/crates/dap_adapters/src/python.rs
+++ b/crates/dap_adapters/src/python.rs
@@ -1,5 +1,8 @@
 use crate::*;
-use dap::{DebugRequest, StartDebuggingRequestArguments, adapters::DebugTaskDefinition};
+use dap::{
+    DebugRequest, StartDebuggingRequestArguments, adapters::DebugTaskDefinition,
+    adapters::InlineValueProvider,
+};
 use gpui::AsyncApp;
 use std::{collections::HashMap, ffi::OsStr, path::PathBuf, sync::OnceLock};
 use util::ResultExt;
@@ -179,4 +182,34 @@ impl DebugAdapter for PythonDebugAdapter {
        self.get_installed_binary(delegate, &config, user_installed_path, cx)
            .await
    }
+
+    fn inline_value_provider(&self) -> Option<Box<dyn InlineValueProvider>> {
+        Some(Box::new(PythonInlineValueProvider))
+    }
+}
+
+struct PythonInlineValueProvider;
+
+impl InlineValueProvider for PythonInlineValueProvider {
+    fn provide(&self, variables: Vec<(String, lsp_types::Range)>) -> Vec<lsp_types::InlineValue> {
+        variables
+            .into_iter()
+            .map(|(variable, range)| {
+                if variable.contains(".") || variable.contains("[") {
+                    lsp_types::InlineValue::EvaluatableExpression(
+                        lsp_types::InlineValueEvaluatableExpression {
+                            range,
+                            expression: Some(variable),
+                        },
+                    )
+                } else {
+                    lsp_types::InlineValue::VariableLookup(lsp_types::InlineValueVariableLookup {
+                        range,
+                        variable_name: Some(variable),
+                        case_sensitive_lookup: true,
+                    })
+                }
+            })
+            .collect()
+    }
 }
--- a/crates/dap_adapters/src/ruby.rs
+++ b/crates/dap_adapters/src/ruby.rs
@@ -1,102 +0,0 @@
-use anyhow::{Result, anyhow};
-use async_trait::async_trait;
-use dap::{
-    DebugRequest, StartDebuggingRequestArguments,
-    adapters::{
-        self, DapDelegate, DebugAdapter, DebugAdapterBinary, DebugAdapterName, DebugTaskDefinition,
-    },
-};
-use gpui::AsyncApp;
-use std::path::PathBuf;
-use util::command::new_smol_command;
-
-use crate::ToDap;
-
-#[derive(Default)]
-pub(crate) struct RubyDebugAdapter;
-
-impl RubyDebugAdapter {
-    const ADAPTER_NAME: &'static str = "Ruby";
-}
-
-#[async_trait(?Send)]
-impl DebugAdapter for RubyDebugAdapter {
-    fn name(&self) -> DebugAdapterName {
-        DebugAdapterName(Self::ADAPTER_NAME.into())
-    }
-
-    async fn get_binary(
-        &self,
-        delegate: &dyn DapDelegate,
-        definition: &DebugTaskDefinition,
-        _user_installed_path: Option<PathBuf>,
-        _cx: &mut AsyncApp,
-    ) -> Result<DebugAdapterBinary> {
-        let adapter_path = paths::debug_adapters_dir().join(self.name().as_ref());
-        let mut rdbg_path = adapter_path.join("rdbg");
-        if !delegate.fs().is_file(&rdbg_path).await {
-            match delegate.which("rdbg".as_ref()) {
-                Some(path) => rdbg_path = path,
-                None => {
-                    delegate.output_to_console(
-                        "rdbg not found on path, trying `gem install debug`".to_string(),
-                    );
-                    let output = new_smol_command("gem")
-                        .arg("install")
-                        .arg("--no-document")
-                        .arg("--bindir")
-                        .arg(adapter_path)
-                        .arg("debug")
-                        .output()
-                        .await?;
-                    if !output.status.success() {
-                        return Err(anyhow!(
-                            "Failed to install rdbg:\n{}",
-                            String::from_utf8_lossy(&output.stderr).to_string()
-                        ));
-                    }
-                }
-            }
-        }
-
-        let tcp_connection = definition.tcp_connection.clone().unwrap_or_default();
-        let (host, port, timeout) = crate::configure_tcp_connection(tcp_connection).await?;
-
-        let DebugRequest::Launch(mut launch) = definition.request.clone() else {
-            anyhow::bail!("rdbg does not yet support attaching");
-        };
-
-        let mut arguments = vec![
-            "--open".to_string(),
-            format!("--port={}", port),
-            format!("--host={}", host),
-        ];
-        if launch.args.is_empty() {
-            let program = launch.program.clone();
-            let mut split = program.split(" ");
-            launch.program = split.next().unwrap().to_string();
-            launch.args = split.map(|s| s.to_string()).collect();
-        }
-        if delegate.which(launch.program.as_ref()).is_some() {
-            arguments.push("--command".to_string())
-        }
-        arguments.push(launch.program);
-        arguments.extend(launch.args);
-
-        Ok(DebugAdapterBinary {
-            command: rdbg_path.to_string_lossy().to_string(),
-            arguments,
-            connection: Some(adapters::TcpArguments {
-                host,
-                port,
-                timeout,
-            }),
-            cwd: launch.cwd,
-            envs: launch.env.into_iter().collect(),
-            request_args: StartDebuggingRequestArguments {
-                configuration: serde_json::Value::Object(Default::default()),
-                request: definition.request.to_dap(),
-            },
-        })
-    }
-}
--- a/crates/debugger_ui/Cargo.toml
+++ b/crates/debugger_ui/Cargo.toml
@@ -15,7 +15,6 @@ doctest = false
 [features]
 test-support = [
    "dap/test-support",
-    "dap_adapters/test-support",
    "editor/test-support",
    "gpui/test-support",
    "project/test-support",
@@ -32,7 +31,6 @@ client.workspace = true
 collections.workspace = true
 command_palette_hooks.workspace = true
 dap.workspace = true
-dap_adapters = { workspace = true, optional = true }
 db.workspace = true
 editor.workspace = true
 feature_flags.workspace = true
@@ -43,7 +41,6 @@ language.workspace = true
 log.workspace = true
 menu.workspace = true
 parking_lot.workspace = true
-paths.workspace = true
 picker.workspace = true
 pretty_assertions.workspace = true
 project.workspace = true
@@ -66,7 +63,6 @@ unindent = { workspace = true, optional = true }

 [dev-dependencies]
 dap = { workspace = true, features = ["test-support"] }
-dap_adapters = { workspace = true, features = ["test-support"] }
 debugger_tools = { workspace = true, features = ["test-support"] }
 editor = { workspace = true, features = ["test-support"] }
 env_logger.workspace = true
--- a/crates/debugger_ui/src/attach_modal.rs
+++ b/crates/debugger_ui/src/attach_modal.rs
@@ -32,12 +32,12 @@ pub(crate) struct AttachModalDelegate {

 impl AttachModalDelegate {
    fn new(
-        workspace: WeakEntity<Workspace>,
+        workspace: Entity<Workspace>,
        definition: DebugTaskDefinition,
        candidates: Arc<[Candidate]>,
    ) -> Self {
        Self {
-            workspace,
+            workspace: workspace.downgrade(),
            definition,
            candidates,
            selected_index: 0,
@@ -55,7 +55,7 @@ pub struct AttachModal {
 impl AttachModal {
    pub fn new(
        definition: DebugTaskDefinition,
-        workspace: WeakEntity<Workspace>,
+        workspace: Entity<Workspace>,
        modal: bool,
        window: &mut Window,
        cx: &mut Context<Self>,
@@ -82,7 +82,7 @@ impl AttachModal {
    }

    pub(super) fn with_processes(
-        workspace: WeakEntity<Workspace>,
+        workspace: Entity<Workspace>,
        definition: DebugTaskDefinition,
        processes: Arc<[Candidate]>,
        modal: bool,
--- a/crates/debugger_ui/src/debugger_panel.rs
+++ b/crates/debugger_ui/src/debugger_panel.rs
@@ -5,15 +5,15 @@ use crate::{
    FocusLoadedSources, FocusModules, FocusTerminal, FocusVariables, Pause, Restart, StepBack,
    StepInto, StepOut, StepOver, Stop, ToggleIgnoreBreakpoints, persistence,
 };
-use anyhow::{Result, anyhow};
+use anyhow::Result;
 use command_palette_hooks::CommandPaletteFilter;
-use dap::StartDebuggingRequestArguments;
 use dap::adapters::DebugAdapterName;
 use dap::debugger_settings::DebugPanelDockPosition;
 use dap::{
    ContinuedEvent, LoadedSourceEvent, ModuleEvent, OutputEvent, StoppedEvent, ThreadEvent,
    client::SessionId, debugger_settings::DebuggerSettings,
 };
+use dap::{StartDebuggingRequestArguments, adapters::DebugTaskDefinition};
 use gpui::{
    Action, App, AsyncWindowContext, Context, DismissEvent, Entity, EntityId, EventEmitter,
    FocusHandle, Focusable, MouseButton, MouseDownEvent, Point, Subscription, Task, WeakEntity,
@@ -54,11 +54,12 @@ pub enum DebugPanelEvent {
 }

 actions!(debug_panel, [ToggleFocus]);
-
 pub struct DebugPanel {
    size: Pixels,
    sessions: Vec<Entity<DebugSession>>,
    active_session: Option<Entity<DebugSession>>,
+    /// This represents the last debug definition that was created in the new session modal
+    pub(crate) past_debug_definition: Option<DebugTaskDefinition>,
    project: Entity<Project>,
    workspace: WeakEntity<Workspace>,
    focus_handle: FocusHandle,
@@ -79,6 +80,7 @@ impl DebugPanel {
                size: px(300.),
                sessions: vec![],
                active_session: None,
+                past_debug_definition: None,
                focus_handle: cx.focus_handle(),
                project,
                workspace: workspace.weak_handle(),
@@ -210,6 +212,7 @@ impl DebugPanel {
        cx: &mut Context<Self>,
    ) {
        let dap_store = self.project.read(cx).dap_store();
+        let workspace = self.workspace.clone();
        let session = dap_store.update(cx, |dap_store, cx| {
            dap_store.new_session(
                scenario.label.clone(),
@@ -248,14 +251,14 @@ impl DebugPanel {

        cx.spawn(async move |_, cx| {
            if let Err(error) = task.await {
+                log::error!("{:?}", error);
+                workspace
+                    .update(cx, |workspace, cx| {
+                        workspace.show_error(&error, cx);
+                    })
+                    .ok();
                session
-                    .update(cx, |session, cx| {
-                        session
-                            .console_output(cx)
-                            .unbounded_send(format!("error: {}", error))
-                            .ok();
-                        session.shutdown(cx)
-                    })?
+                    .update(cx, |session, cx| session.shutdown(cx))?
                    .await;
            }
            anyhow::Ok(())
@@ -291,7 +294,7 @@ impl DebugPanel {

        let (debug_session, workspace) = this.update_in(cx, |this, window, cx| {
            this.sessions.retain(|session| {
-                !session
+                session
                    .read(cx)
                    .running_state()
                    .read(cx)
@@ -990,69 +993,6 @@ impl DebugPanel {
        self.active_session = Some(session_item);
        cx.notify();
    }
-
-    pub(crate) fn save_scenario(
-        &self,
-        scenario: &DebugScenario,
-        worktree_id: WorktreeId,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Task<Result<()>> {
-        self.workspace
-            .update(cx, |workspace, cx| {
-                let Some(mut path) = workspace.absolute_path_of_worktree(worktree_id, cx) else {
-                    return Task::ready(Err(anyhow!("Couldn't get worktree path")));
-                };
-
-                let serialized_scenario = serde_json::to_value(scenario);
-
-                path.push(paths::local_debug_file_relative_path());
-
-                cx.spawn_in(window, async move |workspace, cx| {
-                    let serialized_scenario = serialized_scenario?;
-                    let path = path.as_path();
-                    let fs =
-                        workspace.update(cx, |workspace, _| workspace.app_state().fs.clone())?;
-
-                    if !fs.is_file(path).await {
-                        let content =
-                            serde_json::to_string_pretty(&serde_json::Value::Array(vec![
-                                serialized_scenario,
-                            ]))?;
-
-                        fs.create_file(path, Default::default()).await?;
-                        fs.save(path, &content.into(), Default::default()).await?;
-                    } else {
-                        let content = fs.load(path).await?;
-                        let mut values = serde_json::from_str::<Vec<serde_json::Value>>(&content)?;
-                        values.push(serialized_scenario);
-                        fs.save(
-                            path,
-                            &serde_json::to_string_pretty(&values).map(Into::into)?,
-                            Default::default(),
-                        )
-                        .await?;
-                    }
-
-                    workspace.update_in(cx, |workspace, window, cx| {
-                        if let Some(project_path) = workspace
-                            .project()
-                            .read(cx)
-                            .project_path_for_absolute_path(&path, cx)
-                        {
-                            workspace.open_path(project_path, None, true, window, cx)
-                        } else {
-                            Task::ready(Err(anyhow!(
-                                "Couldn't get project path for .zed/debug.json in active worktree"
-                            )))
-                        }
-                    })?.await?;
-
-                    anyhow::Ok(())
-                })
-            })
-            .unwrap_or_else(|err| Task::ready(Err(err)))
-    }
 }

 impl EventEmitter<PanelEvent> for DebugPanel {}
--- a/crates/debugger_ui/src/debugger_ui.rs
+++ b/crates/debugger_ui/src/debugger_ui.rs
@@ -147,7 +147,36 @@ pub fn init(cx: &mut App) {
                    },
                )
                .register_action(|workspace: &mut Workspace, _: &Start, window, cx| {
-                    NewSessionModal::show(workspace, window, cx);
+                    if let Some(debug_panel) = workspace.panel::<DebugPanel>(cx) {
+                        let weak_panel = debug_panel.downgrade();
+                        let weak_workspace = cx.weak_entity();
+                        let task_store = workspace.project().read(cx).task_store().clone();
+
+                        cx.spawn_in(window, async move |this, cx| {
+                            let task_contexts = this
+                                .update_in(cx, |workspace, window, cx| {
+                                    tasks_ui::task_contexts(workspace, window, cx)
+                                })?
+                                .await;
+
+                            this.update_in(cx, |workspace, window, cx| {
+                                workspace.toggle_modal(window, cx, |window, cx| {
+                                    NewSessionModal::new(
+                                        debug_panel.read(cx).past_debug_definition.clone(),
+                                        weak_panel,
+                                        weak_workspace,
+                                        Some(task_store),
+                                        task_contexts,
+                                        window,
+                                        cx,
+                                    )
+                                });
+                            })?;
+
+                            anyhow::Ok(())
+                        })
+                        .detach()
+                    }
                });
        })
    })
--- a/crates/debugger_ui/src/new_session_modal.rs
+++ b/crates/debugger_ui/src/new_session_modal.rs
--- a/crates/debugger_ui/src/session/running.rs
+++ b/crates/debugger_ui/src/session/running.rs
@@ -352,13 +352,6 @@ pub(crate) fn new_debugger_pane(
                    .px_2()
                    .border_color(cx.theme().colors().border)
                    .track_focus(&focus_handle)
-                    .on_action(|_: &menu::Cancel, window, cx| {
-                        if cx.stop_active_drag(window) {
-                            return;
-                        } else {
-                            cx.propagate();
-                        }
-                    })
                    .child(
                        h_flex()
                            .w_full()
@@ -738,30 +731,19 @@ impl RunningState {
                        (task, None)
                    }
                };
-                let Some(task) = task.resolve_task("debug-build-task", &task_context) else {
-                    anyhow::bail!("Could not resolve task variables within a debug scenario");
-                };
-
                let locator_name = if let Some(locator_name) = locator_name {
                    debug_assert!(request.is_none());
                    Some(locator_name)
                } else if request.is_none() {
                    dap_store
                        .update(cx, |this, cx| {
-                            this.debug_scenario_for_build_task(
-                                task.original_task().clone(),
-                                adapter.clone().into(),
-                                task.display_label().to_owned().into(),
-                                cx,
-                            )
-                            .and_then(|scenario| {
-                                match scenario.build {
+                            this.debug_scenario_for_build_task(task.clone(), adapter.clone(), cx)
+                                .and_then(|scenario| match scenario.build {
                                    Some(BuildTaskDefinition::Template {
                                        locator_name, ..
                                    }) => locator_name,
                                    _ => None,
-                                }
-                            })
+                                })
                        })
                        .ok()
                        .flatten()
@@ -769,6 +751,10 @@ impl RunningState {
                    None
                };

+                let Some(task) = task.resolve_task("debug-build-task", &task_context) else {
+                    anyhow::bail!("Could not resolve task variables within a debug scenario");
+                };
+
                let builder = ShellBuilder::new(is_local, &task.resolved.shell);
                let command_label = builder.command_label(&task.resolved.command_label);
                let (command, args) =
@@ -871,7 +857,7 @@ impl RunningState {

                    dap::DebugRequest::Launch(new_launch_request)
                }
-                request @ dap::DebugRequest::Attach(_) => request, // todo(debugger): We should check that process_id is valid and if not show the modal
+                request @ dap::DebugRequest::Attach(_) => request,
            };
            Ok(DebugTaskDefinition {
                label,
--- a/crates/debugger_ui/src/session/running/console.rs
+++ b/crates/debugger_ui/src/session/running/console.rs
@@ -152,7 +152,7 @@ impl Console {
            session
                .evaluate(
                    expression,
-                    Some(dap::EvaluateArgumentsContext::Repl),
+                    Some(dap::EvaluateArgumentsContext::Variables),
                    self.stack_frame_list.read(cx).selected_stack_frame_id(),
                    None,
                    cx,
--- a/crates/debugger_ui/src/session/running/variable_list.rs
+++ b/crates/debugger_ui/src/session/running/variable_list.rs
@@ -675,7 +675,6 @@ impl VariableList {
        div()
            .id(var_ref as usize)
            .group("variable_list_entry")
-            .pl_2()
            .border_1()
            .border_r_2()
            .border_color(border_color)
@@ -693,8 +692,8 @@ impl VariableList {
                ListItem::new(SharedString::from(format!("scope-{}", var_ref)))
                    .selectable(false)
                    .disabled(self.disabled)
-                    .indent_level(state.depth)
-                    .indent_step_size(px(10.))
+                    .indent_level(state.depth + 1)
+                    .indent_step_size(px(20.))
                    .always_show_disclosure_icon(true)
                    .toggle(state.is_expanded)
                    .on_toggle({
@@ -773,7 +772,6 @@ impl VariableList {
        div()
            .id(variable.item_id())
            .group("variable_list_entry")
-            .pl_2()
            .border_1()
            .border_r_2()
            .border_color(border_color)
@@ -793,8 +791,8 @@ impl VariableList {
                )))
                .disabled(self.disabled)
                .selectable(false)
-                .indent_level(state.depth)
-                .indent_step_size(px(10.))
+                .indent_level(state.depth + 1_usize)
+                .indent_step_size(px(20.))
                .always_show_disclosure_icon(true)
                .when(var_ref > 0, |list_item| {
                    list_item.toggle(state.is_expanded).on_toggle(cx.listener({
--- a/crates/debugger_ui/src/tests.rs
+++ b/crates/debugger_ui/src/tests.rs
@@ -21,8 +21,6 @@ mod dap_logger;
 #[cfg(test)]
 mod debugger_panel;
 #[cfg(test)]
-mod inline_values;
-#[cfg(test)]
 mod module_list;
 #[cfg(test)]
 mod persistence;
@@ -47,7 +45,6 @@ pub fn init_test(cx: &mut gpui::TestAppContext) {
        Project::init_settings(cx);
        editor::init(cx);
        crate::init(cx);
-        dap_adapters::init(cx);
    });
 }

--- a/crates/debugger_ui/src/tests/attach_modal.rs
+++ b/crates/debugger_ui/src/tests/attach_modal.rs
@@ -103,7 +103,7 @@ async fn test_show_attach_modal_and_select_process(
        });
    let attach_modal = workspace
        .update(cx, |workspace, window, cx| {
-            let workspace_handle = cx.weak_entity();
+            let workspace_handle = cx.entity();
            workspace.toggle_modal(window, cx, |window, cx| {
                AttachModal::with_processes(
                    workspace_handle,
--- a/crates/debugger_ui/src/tests/inline_values.rs
+++ b/crates/debugger_ui/src/tests/inline_values.rs
--- a/crates/diagnostics/src/diagnostic_renderer.rs
+++ b/crates/diagnostics/src/diagnostic_renderer.rs
@@ -145,7 +145,6 @@ impl editor::DiagnosticRenderer for DiagnosticRenderer {
                    style: BlockStyle::Flex,
                    render: Arc::new(move |bcx| block.render_block(editor.clone(), bcx)),
                    priority: 1,
-                    render_in_minimap: false,
                }
            })
            .collect()
--- a/crates/diagnostics/src/diagnostics.rs
+++ b/crates/diagnostics/src/diagnostics.rs
@@ -23,10 +23,11 @@ use gpui::{
 use language::{
    Bias, Buffer, BufferRow, BufferSnapshot, DiagnosticEntry, Point, ToTreeSitterPoint,
 };
+use lsp::DiagnosticSeverity;
 use project::{
    DiagnosticSummary, Project, ProjectPath,
    lsp_store::rust_analyzer_ext::{cancel_flycheck, run_flycheck},
-    project_settings::{DiagnosticSeverity, ProjectSettings},
+    project_settings::ProjectSettings,
 };
 use settings::Settings;
 use std::{
@@ -202,14 +203,6 @@ impl ProjectDiagnosticsEditor {
                Editor::for_multibuffer(excerpts.clone(), Some(project_handle.clone()), window, cx);
            editor.set_vertical_scroll_margin(5, cx);
            editor.disable_inline_diagnostics();
-            editor.set_max_diagnostics_severity(
-                if include_warnings {
-                    DiagnosticSeverity::Warning
-                } else {
-                    DiagnosticSeverity::Error
-                },
-                cx,
-            );
            editor.set_all_diagnostics_active(cx);
            editor
        });
@@ -231,18 +224,7 @@ impl ProjectDiagnosticsEditor {
        )
        .detach();
        cx.observe_global_in::<IncludeWarnings>(window, |this, window, cx| {
-            let include_warnings = cx.global::<IncludeWarnings>().0;
-            this.include_warnings = include_warnings;
-            this.editor.update(cx, |editor, cx| {
-                editor.set_max_diagnostics_severity(
-                    if include_warnings {
-                        DiagnosticSeverity::Warning
-                    } else {
-                        DiagnosticSeverity::Error
-                    },
-                    cx,
-                )
-            });
+            this.include_warnings = cx.global::<IncludeWarnings>().0;
            this.diagnostics.clear();
            this.update_all_diagnostics(false, window, cx);
        })
@@ -506,9 +488,9 @@ impl ProjectDiagnosticsEditor {
        let buffer_snapshot = buffer.read(cx).snapshot();
        let buffer_id = buffer_snapshot.remote_id();
        let max_severity = if self.include_warnings {
-            lsp::DiagnosticSeverity::WARNING
+            DiagnosticSeverity::WARNING
        } else {
-            lsp::DiagnosticSeverity::ERROR
+            DiagnosticSeverity::ERROR
        };

        cx.spawn_in(window, async move |this, mut cx| {
@@ -650,7 +632,6 @@ impl ProjectDiagnosticsEditor {
                                    block.render_block(editor.clone(), bcx)
                                }),
                                priority: 1,
-                                render_in_minimap: false,
                            }
                        });
                let block_ids = this.editor.update(cx, |editor, cx| {
--- a/crates/editor/src/actions.rs
+++ b/crates/editor/src/actions.rs
@@ -425,14 +425,12 @@ actions!(
        ToggleAutoSignatureHelp,
        ToggleGitBlameInline,
        OpenGitBlameCommit,
-        ToggleDiagnostics,
        ToggleIndentGuides,
        ToggleInlayHints,
        ToggleInlineValues,
        ToggleInlineDiagnostics,
        ToggleEditPrediction,
        ToggleLineNumbers,
-        ToggleMinimap,
        SwapSelectionEnds,
        SetMark,
        ToggleRelativeLineNumbers,
--- a/crates/editor/src/code_context_menus.rs
+++ b/crates/editor/src/code_context_menus.rs
@@ -640,7 +640,6 @@ impl CompletionsMenu {
                    MarkdownElement::new(markdown.clone(), hover_markdown_style(window, cx))
                        .code_block_renderer(markdown::CodeBlockRenderer::Default {
                            copy_button: false,
-                            copy_button_on_hover: false,
                            border: false,
                        })
                        .on_url_click(open_markdown_url),
--- a/crates/editor/src/display_map.rs
+++ b/crates/editor/src/display_map.rs
@@ -31,7 +31,7 @@ use crate::{
 };
 pub use block_map::{
    Block, BlockChunks as DisplayChunks, BlockContext, BlockId, BlockMap, BlockPlacement,
-    BlockPoint, BlockProperties, BlockRows, BlockStyle, CustomBlockId, EditorMargins, RenderBlock,
+    BlockPoint, BlockProperties, BlockRows, BlockStyle, CustomBlockId, RenderBlock,
    StickyHeaderExcerpt,
 };
 use block_map::{BlockRow, BlockSnapshot};
@@ -47,13 +47,12 @@ pub use invisibles::{is_invisible, replacement};
 use language::{
    OffsetUtf16, Point, Subscription as BufferSubscription, language_settings::language_settings,
 };
+use lsp::DiagnosticSeverity;
 use multi_buffer::{
    Anchor, AnchorRangeExt, ExcerptId, MultiBuffer, MultiBufferPoint, MultiBufferRow,
    MultiBufferSnapshot, RowInfo, ToOffset, ToPoint,
 };
-use project::project_settings::DiagnosticSeverity;
 use serde::Deserialize;
-
 use std::{
    any::TypeId,
    borrow::Cow,
@@ -110,7 +109,6 @@ pub struct DisplayMap {
    pub(crate) fold_placeholder: FoldPlaceholder,
    pub clip_at_line_ends: bool,
    pub(crate) masked: bool,
-    pub(crate) diagnostics_max_severity: DiagnosticSeverity,
 }

 impl DisplayMap {
@@ -122,7 +120,6 @@ impl DisplayMap {
        buffer_header_height: u32,
        excerpt_header_height: u32,
        fold_placeholder: FoldPlaceholder,
-        diagnostics_max_severity: DiagnosticSeverity,
        cx: &mut Context<Self>,
    ) -> Self {
        let buffer_subscription = buffer.update(cx, |buffer, _| buffer.subscribe());
@@ -148,7 +145,6 @@ impl DisplayMap {
            block_map,
            crease_map,
            fold_placeholder,
-            diagnostics_max_severity,
            text_highlights: Default::default(),
            inlay_highlights: Default::default(),
            clip_at_line_ends: false,
@@ -175,7 +171,6 @@ impl DisplayMap {
            tab_snapshot,
            wrap_snapshot,
            block_snapshot,
-            diagnostics_max_severity: self.diagnostics_max_severity,
            crease_snapshot: self.crease_map.snapshot(),
            text_highlights: self.text_highlights.clone(),
            inlay_highlights: self.inlay_highlights.clone(),
@@ -263,7 +258,6 @@ impl DisplayMap {
                        height: Some(height),
                        style,
                        priority,
-                        render_in_minimap: true,
                    }
                }),
        );
@@ -750,7 +744,6 @@ pub struct DisplaySnapshot {
    inlay_highlights: InlayHighlights,
    clip_at_line_ends: bool,
    masked: bool,
-    diagnostics_max_severity: DiagnosticSeverity,
    pub(crate) fold_placeholder: FoldPlaceholder,
 }

@@ -953,15 +946,13 @@ impl DisplaySnapshot {

            let mut diagnostic_highlight = HighlightStyle::default();

-            if let Some(severity) = chunk.diagnostic_severity.filter(|severity| {
-                self.diagnostics_max_severity
-                    .into_lsp()
-                    .map_or(false, |max_severity| severity <= &max_severity)
-            }) {
-                if chunk.is_unnecessary {
-                    diagnostic_highlight.fade_out = Some(editor_style.unnecessary_code_fade);
-                }
-                if editor_style.show_underlines {
+            if chunk.is_unnecessary {
+                diagnostic_highlight.fade_out = Some(editor_style.unnecessary_code_fade);
+            }
+
+            if let Some(severity) = chunk.diagnostic_severity {
+                // Omit underlines for HINT/INFO diagnostics on 'unnecessary' code.
+                if severity <= DiagnosticSeverity::WARNING || !chunk.is_unnecessary {
                    let diagnostic_color = super::diagnostic_style(severity, &editor_style.status);
                    diagnostic_highlight.underline = Some(UnderlineStyle {
                        color: Some(diagnostic_color),
@@ -1553,7 +1544,6 @@ pub mod tests {
                buffer_start_excerpt_header_height,
                excerpt_header_height,
                FoldPlaceholder::test(),
-                DiagnosticSeverity::Warning,
                cx,
            )
        });
@@ -1623,7 +1613,6 @@ pub mod tests {
                                        height: Some(height),
                                        render: Arc::new(|_| div().into_any()),
                                        priority,
-                                        render_in_minimap: true,
                                    }
                                })
                                .collect::<Vec<_>>();
@@ -1802,7 +1791,6 @@ pub mod tests {
                    1,
                    1,
                    FoldPlaceholder::test(),
-                    DiagnosticSeverity::Warning,
                    cx,
                )
            });
@@ -1912,7 +1900,6 @@ pub mod tests {
                1,
                1,
                FoldPlaceholder::test(),
-                DiagnosticSeverity::Warning,
                cx,
            )
        });
@@ -1974,7 +1961,6 @@ pub mod tests {
                1,
                1,
                FoldPlaceholder::test(),
-                DiagnosticSeverity::Warning,
                cx,
            )
        });
@@ -1989,7 +1975,6 @@ pub mod tests {
                    style: BlockStyle::Sticky,
                    render: Arc::new(|_| div().into_any()),
                    priority: 0,
-                    render_in_minimap: true,
                }],
                cx,
            );
@@ -2068,7 +2053,6 @@ pub mod tests {
                1,
                1,
                FoldPlaceholder::test(),
-                DiagnosticSeverity::Warning,
                cx,
            )
        });
@@ -2169,7 +2153,6 @@ pub mod tests {
                1,
                1,
                FoldPlaceholder::test(),
-                DiagnosticSeverity::Warning,
                cx,
            )
        });
@@ -2187,7 +2170,6 @@ pub mod tests {
                        style: BlockStyle::Sticky,
                        render: Arc::new(|_| div().into_any()),
                        priority: 0,
-                        render_in_minimap: true,
                    },
                    BlockProperties {
                        placement: BlockPlacement::Below(
@@ -2197,7 +2179,6 @@ pub mod tests {
                        style: BlockStyle::Sticky,
                        render: Arc::new(|_| div().into_any()),
                        priority: 0,
-                        render_in_minimap: true,
                    },
                ],
                cx,
@@ -2251,7 +2232,7 @@ pub mod tests {
                    [DiagnosticEntry {
                        range: PointUtf16::new(0, 0)..PointUtf16::new(2, 1),
                        diagnostic: Diagnostic {
-                            severity: lsp::DiagnosticSeverity::ERROR,
+                            severity: DiagnosticSeverity::ERROR,
                            group_id: 1,
                            message: "hi".into(),
                            ..Default::default()
@@ -2275,7 +2256,6 @@ pub mod tests {
                1,
                1,
                FoldPlaceholder::test(),
-                DiagnosticSeverity::Warning,
                cx,
            )
        });
@@ -2304,14 +2284,13 @@ pub mod tests {
                    style: BlockStyle::Sticky,
                    render: Arc::new(|_| div().into_any()),
                    priority: 0,
-                    render_in_minimap: true,
                }],
                cx,
            )
        });

        let snapshot = map.update(cx, |map, cx| map.snapshot(cx));
-        let mut chunks = Vec::<(String, Option<lsp::DiagnosticSeverity>, Rgba)>::new();
+        let mut chunks = Vec::<(String, Option<DiagnosticSeverity>, Rgba)>::new();
        for chunk in snapshot.chunks(DisplayRow(0)..DisplayRow(5), true, Default::default()) {
            let color = chunk
                .highlight_style
@@ -2332,11 +2311,11 @@ pub mod tests {
            [
                (
                    "struct A {\n    b: usize;\n".into(),
-                    Some(lsp::DiagnosticSeverity::ERROR),
+                    Some(DiagnosticSeverity::ERROR),
                    black
                ),
                ("\n".into(), None, black),
-                ("}".into(), Some(lsp::DiagnosticSeverity::ERROR), black),
+                ("}".into(), Some(DiagnosticSeverity::ERROR), black),
                ("\nconst c: ".into(), None, black),
                ("usize".into(), None, red),
                (" = ".into(), None, black),
@@ -2364,7 +2343,6 @@ pub mod tests {
                1,
                1,
                FoldPlaceholder::test(),
-                DiagnosticSeverity::Warning,
                cx,
            )
        });
@@ -2380,7 +2358,6 @@ pub mod tests {
                    style: BlockStyle::Fixed,
                    render: Arc::new(|_| div().into_any()),
                    priority: 0,
-                    render_in_minimap: true,
                }],
                cx,
            );
@@ -2506,7 +2483,6 @@ pub mod tests {
                1,
                1,
                FoldPlaceholder::test(),
-                DiagnosticSeverity::Warning,
                cx,
            )
        });
@@ -2589,7 +2565,6 @@ pub mod tests {
                1,
                1,
                FoldPlaceholder::test(),
-                DiagnosticSeverity::Warning,
                cx,
            )
        });
@@ -2714,7 +2689,6 @@ pub mod tests {
                1,
                1,
                FoldPlaceholder::test(),
-                DiagnosticSeverity::Warning,
                cx,
            );
            let snapshot = map.buffer.read(cx).snapshot(cx);
@@ -2752,7 +2726,6 @@ pub mod tests {
                1,
                1,
                FoldPlaceholder::test(),
-                DiagnosticSeverity::Warning,
                cx,
            )
        });
@@ -2828,7 +2801,6 @@ pub mod tests {
                1,
                1,
                FoldPlaceholder::test(),
-                DiagnosticSeverity::Warning,
                cx,
            )
        });
--- a/crates/editor/src/display_map/block_map.rs
+++ b/crates/editor/src/display_map/block_map.rs
@@ -193,7 +193,6 @@ pub struct CustomBlock {
    style: BlockStyle,
    render: Arc<Mutex<RenderBlock>>,
    priority: usize,
-    pub(crate) render_in_minimap: bool,
 }

 #[derive(Clone)]
@@ -205,7 +204,6 @@ pub struct BlockProperties<P> {
    pub style: BlockStyle,
    pub render: RenderBlock,
    pub priority: usize,
-    pub render_in_minimap: bool,
 }

 impl<P: Debug> Debug for BlockProperties<P> {
@@ -225,12 +223,6 @@ pub enum BlockStyle {
    Sticky,
 }

-#[derive(Debug, Default, Copy, Clone)]
-pub struct EditorMargins {
-    pub gutter: GutterDimensions,
-    pub right: Pixels,
-}
-
 #[derive(gpui::AppContext, gpui::VisualContext)]
 pub struct BlockContext<'a, 'b> {
    #[window]
@@ -239,7 +231,7 @@ pub struct BlockContext<'a, 'b> {
    pub app: &'b mut App,
    pub anchor_x: Pixels,
    pub max_width: Pixels,
-    pub margins: &'b EditorMargins,
+    pub gutter_dimensions: &'b GutterDimensions,
    pub em_width: Pixels,
    pub line_height: Pixels,
    pub block_id: BlockId,
@@ -1045,7 +1037,6 @@ impl BlockMapWriter<'_> {
                render: Arc::new(Mutex::new(block.render)),
                style: block.style,
                priority: block.priority,
-                render_in_minimap: block.render_in_minimap,
            });
            self.0.custom_blocks.insert(block_ix, new_block.clone());
            self.0.custom_blocks_by_id.insert(id, new_block);
@@ -1080,7 +1071,6 @@ impl BlockMapWriter<'_> {
                        style: block.style,
                        render: block.render.clone(),
                        priority: block.priority,
-                        render_in_minimap: block.render_in_minimap,
                    };
                    let new_block = Arc::new(new_block);
                    *block = new_block.clone();
@@ -1977,7 +1967,6 @@ mod tests {
                height: Some(1),
                render: Arc::new(|_| div().into_any()),
                priority: 0,
-                render_in_minimap: true,
            },
            BlockProperties {
                style: BlockStyle::Fixed,
@@ -1985,7 +1974,6 @@ mod tests {
                height: Some(2),
                render: Arc::new(|_| div().into_any()),
                priority: 0,
-                render_in_minimap: true,
            },
            BlockProperties {
                style: BlockStyle::Fixed,
@@ -1993,7 +1981,6 @@ mod tests {
                height: Some(3),
                render: Arc::new(|_| div().into_any()),
                priority: 0,
-                render_in_minimap: true,
            },
        ]);

@@ -2218,7 +2205,6 @@ mod tests {
                height: Some(1),
                render: Arc::new(|_| div().into_any()),
                priority: 0,
-                render_in_minimap: true,
            },
            BlockProperties {
                style: BlockStyle::Fixed,
@@ -2226,7 +2212,6 @@ mod tests {
                height: Some(2),
                render: Arc::new(|_| div().into_any()),
                priority: 0,
-                render_in_minimap: true,
            },
            BlockProperties {
                style: BlockStyle::Fixed,
@@ -2234,7 +2219,6 @@ mod tests {
                height: Some(3),
                render: Arc::new(|_| div().into_any()),
                priority: 0,
-                render_in_minimap: true,
            },
        ]);

@@ -2323,7 +2307,6 @@ mod tests {
                render: Arc::new(|_| div().into_any()),
                height: Some(1),
                priority: 0,
-                render_in_minimap: true,
            },
            BlockProperties {
                style: BlockStyle::Fixed,
@@ -2331,7 +2314,6 @@ mod tests {
                render: Arc::new(|_| div().into_any()),
                height: Some(1),
                priority: 0,
-                render_in_minimap: true,
            },
        ]);

@@ -2371,7 +2353,6 @@ mod tests {
            height: Some(4),
            render: Arc::new(|_| div().into_any()),
            priority: 0,
-            render_in_minimap: true,
        }])[0];

        let blocks_snapshot = block_map.read(wraps_snapshot, Default::default());
@@ -2425,7 +2406,6 @@ mod tests {
                height: Some(1),
                render: Arc::new(|_| div().into_any()),
                priority: 0,
-                render_in_minimap: true,
            },
            BlockProperties {
                style: BlockStyle::Fixed,
@@ -2433,7 +2413,6 @@ mod tests {
                height: Some(1),
                render: Arc::new(|_| div().into_any()),
                priority: 0,
-                render_in_minimap: true,
            },
            BlockProperties {
                style: BlockStyle::Fixed,
@@ -2441,7 +2420,6 @@ mod tests {
                height: Some(1),
                render: Arc::new(|_| div().into_any()),
                priority: 0,
-                render_in_minimap: true,
            },
        ]);
        let blocks_snapshot = block_map.read(wraps_snapshot.clone(), Default::default());
@@ -2456,7 +2434,6 @@ mod tests {
                height: Some(1),
                render: Arc::new(|_| div().into_any()),
                priority: 0,
-                render_in_minimap: true,
            },
            BlockProperties {
                style: BlockStyle::Fixed,
@@ -2464,7 +2441,6 @@ mod tests {
                height: Some(1),
                render: Arc::new(|_| div().into_any()),
                priority: 0,
-                render_in_minimap: true,
            },
            BlockProperties {
                style: BlockStyle::Fixed,
@@ -2472,7 +2448,6 @@ mod tests {
                height: Some(1),
                render: Arc::new(|_| div().into_any()),
                priority: 0,
-                render_in_minimap: true,
            },
        ]);
        let blocks_snapshot = block_map.read(wraps_snapshot.clone(), Default::default());
@@ -2572,7 +2547,6 @@ mod tests {
                height: Some(1),
                render: Arc::new(|_| div().into_any()),
                priority: 0,
-                render_in_minimap: true,
            },
            BlockProperties {
                style: BlockStyle::Fixed,
@@ -2580,7 +2554,6 @@ mod tests {
                height: Some(1),
                render: Arc::new(|_| div().into_any()),
                priority: 0,
-                render_in_minimap: true,
            },
            BlockProperties {
                style: BlockStyle::Fixed,
@@ -2588,7 +2561,6 @@ mod tests {
                height: Some(1),
                render: Arc::new(|_| div().into_any()),
                priority: 0,
-                render_in_minimap: true,
            },
        ]);
        let excerpt_blocks_3 = writer.insert(vec![
@@ -2598,7 +2570,6 @@ mod tests {
                height: Some(1),
                render: Arc::new(|_| div().into_any()),
                priority: 0,
-                render_in_minimap: true,
            },
            BlockProperties {
                style: BlockStyle::Fixed,
@@ -2606,7 +2577,6 @@ mod tests {
                height: Some(1),
                render: Arc::new(|_| div().into_any()),
                priority: 0,
-                render_in_minimap: true,
            },
        ]);

@@ -2654,7 +2624,6 @@ mod tests {
            height: Some(1),
            render: Arc::new(|_| div().into_any()),
            priority: 0,
-            render_in_minimap: true,
        }]);
        let blocks_snapshot = block_map.read(wrap_snapshot.clone(), Patch::default());
        let blocks = blocks_snapshot
@@ -3012,7 +2981,6 @@ mod tests {
                                height: Some(height),
                                render: Arc::new(|_| div().into_any()),
                                priority: 0,
-                                render_in_minimap: true,
                            }
                        })
                        .collect::<Vec<_>>();
@@ -3033,7 +3001,6 @@ mod tests {
                            style: props.style,
                            render: Arc::new(|_| div().into_any()),
                            priority: 0,
-                            render_in_minimap: true,
                        }));

                    for (block_properties, block_id) in block_properties.iter().zip(block_ids) {
@@ -3558,7 +3525,6 @@ mod tests {
            height: Some(1),
            render: Arc::new(|_| div().into_any()),
            priority: 0,
-            render_in_minimap: true,
        }])[0];

        let blocks_snapshot = block_map.read(wraps_snapshot.clone(), Default::default());
--- a/crates/editor/src/display_map/fold_map.rs
+++ b/crates/editor/src/display_map/fold_map.rs
@@ -4,6 +4,7 @@ use super::{
 };
 use gpui::{AnyElement, App, ElementId, HighlightStyle, Pixels, Window};
 use language::{Edit, HighlightId, Point, TextSummary};
+use lsp::DiagnosticSeverity;
 use multi_buffer::{
    Anchor, AnchorRangeExt, MultiBufferRow, MultiBufferSnapshot, RowInfo, ToOffset,
 };
@@ -1252,7 +1253,7 @@ pub struct Chunk<'a> {
    /// the editor.
    pub highlight_style: Option<HighlightStyle>,
    /// The severity of diagnostic associated with this chunk, if any.
-    pub diagnostic_severity: Option<lsp::DiagnosticSeverity>,
+    pub diagnostic_severity: Option<DiagnosticSeverity>,
    /// Whether this chunk of text is marked as unnecessary.
    pub is_unnecessary: bool,
    /// Whether this chunk of text was originally a tab character.
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
--- a/crates/editor/src/editor_settings.rs
+++ b/crates/editor/src/editor_settings.rs
@@ -1,6 +1,5 @@
 use gpui::App;
 use language::CursorShape;
-use project::project_settings::DiagnosticSeverity;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use settings::{Settings, SettingsSources, VsCodeSettings};
@@ -16,7 +15,6 @@ pub struct EditorSettings {
    pub hover_popover_delay: u64,
    pub toolbar: Toolbar,
    pub scrollbar: Scrollbar,
-    pub minimap: Minimap,
    pub gutter: Gutter,
    pub scroll_beyond_last_line: ScrollBeyondLastLine,
    pub vertical_scroll_margin: f32,
@@ -42,8 +40,6 @@ pub struct EditorSettings {
    pub jupyter: Jupyter,
    pub hide_mouse: Option<HideMouseMode>,
    pub snippet_sort_order: SnippetSortOrder,
-    #[serde(default)]
-    pub diagnostics_max_severity: Option<DiagnosticSeverity>,
 }

 #[derive(Copy, Clone, Debug, Serialize, Deserialize, PartialEq, Eq, JsonSchema)]
@@ -120,30 +116,10 @@ pub struct Scrollbar {
    pub axes: ScrollbarAxes,
 }

-#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq)]
-pub struct Minimap {
-    pub show: ShowMinimap,
-    pub thumb: MinimapThumb,
-    pub thumb_border: MinimapThumbBorder,
-    pub current_line_highlight: Option<CurrentLineHighlight>,
-}
-
-impl Minimap {
-    pub fn minimap_enabled(&self) -> bool {
-        self.show != ShowMinimap::Never
-    }
-
-    pub fn with_show_override(self) -> Self {
-        Self {
-            show: ShowMinimap::Always,
-            ..self
-        }
-    }
-}
-
 #[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq, Eq)]
 pub struct Gutter {
    pub line_numbers: bool,
+    pub code_actions: bool,
    pub runnables: bool,
    pub breakpoints: bool,
    pub folds: bool,
@@ -166,53 +142,6 @@ pub enum ShowScrollbar {
    Never,
 }

-/// When to show the minimap in the editor.
-///
-/// Default: never
-#[derive(Copy, Clone, Debug, Default, Serialize, Deserialize, JsonSchema, PartialEq, Eq)]
-#[serde(rename_all = "snake_case")]
-pub enum ShowMinimap {
-    /// Follow the visibility of the scrollbar.
-    Auto,
-    /// Always show the minimap.
-    Always,
-    /// Never show the minimap.
-    #[default]
-    Never,
-}
-
-/// When to show the minimap thumb.
-///
-/// Default: always
-#[derive(Copy, Clone, Debug, Default, Serialize, Deserialize, JsonSchema, PartialEq, Eq)]
-#[serde(rename_all = "snake_case")]
-pub enum MinimapThumb {
-    /// Show the minimap thumb only when the mouse is hovering over the minimap.
-    Hover,
-    /// Always show the minimap thumb.
-    #[default]
-    Always,
-}
-
-/// Defines the border style for the minimap's scrollbar thumb.
-///
-/// Default: left_open
-#[derive(Copy, Clone, Debug, Default, Serialize, Deserialize, JsonSchema, PartialEq, Eq)]
-#[serde(rename_all = "snake_case")]
-pub enum MinimapThumbBorder {
-    /// Displays a border on all sides of the thumb.
-    Full,
-    /// Displays a border on all sides except the left side of the thumb.
-    #[default]
-    LeftOpen,
-    /// Displays a border on all sides except the right side of the thumb.
-    RightOpen,
-    /// Displays a border only on the left side of the thumb.
-    LeftOnly,
-    /// Displays the thumb without any border.
-    None,
-}
-
 /// Forcefully enable or disable the scrollbar for each axis
 #[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq, Eq)]
 #[serde(rename_all = "lowercase")]
@@ -372,8 +301,6 @@ pub struct EditorSettingsContent {
    pub toolbar: Option<ToolbarContent>,
    /// Scrollbar related settings
    pub scrollbar: Option<ScrollbarContent>,
-    /// Minimap related settings
-    pub minimap: Option<MinimapContent>,
    /// Gutter related settings
    pub gutter: Option<GutterContent>,
    /// Whether the editor will scroll beyond the last line.
@@ -461,19 +388,6 @@ pub struct EditorSettingsContent {

    /// Jupyter REPL settings.
    pub jupyter: Option<JupyterContent>,
-
-    /// Which level to use to filter out diagnostics displayed in the editor.
-    ///
-    /// Affects the editor rendering only, and does not interrupt
-    /// the functionality of diagnostics fetching and project diagnostics editor.
-    /// Which files containing diagnostic errors/warnings to mark in the tabs.
-    /// Diagnostics are only shown when file icons are also active.
-    ///
-    /// Shows all diagnostics if not specified.
-    ///
-    /// Default: warning
-    #[serde(default)]
-    pub diagnostics_max_severity: Option<DiagnosticSeverity>,
 }

 // Toolbar related settings
@@ -533,30 +447,6 @@ pub struct ScrollbarContent {
    pub axes: Option<ScrollbarAxesContent>,
 }

-/// Minimap related settings
-#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq)]
-pub struct MinimapContent {
-    /// When to show the minimap in the editor.
-    ///
-    /// Default: never
-    pub show: Option<ShowMinimap>,
-
-    /// When to show the minimap thumb.
-    ///
-    /// Default: always
-    pub thumb: Option<MinimapThumb>,
-
-    /// Defines the border style for the minimap's scrollbar thumb.
-    ///
-    /// Default: left_open
-    pub thumb_border: Option<MinimapThumbBorder>,
-
-    /// How to highlight the current line in the minimap.
-    ///
-    /// Default: inherits editor line highlights setting
-    pub current_line_highlight: Option<Option<CurrentLineHighlight>>,
-}
-
 /// Forcefully enable or disable the scrollbar for each axis
 #[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq, Default)]
 pub struct ScrollbarAxesContent {
@@ -578,6 +468,10 @@ pub struct GutterContent {
    ///
    /// Default: true
    pub line_numbers: Option<bool>,
+    /// Whether to show code action buttons in the gutter.
+    ///
+    /// Default: true
+    pub code_actions: Option<bool>,
    /// Whether to show runnable buttons in the gutter.
    ///
    /// Default: true
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -2871,8 +2871,7 @@ async fn test_tab_in_leading_whitespace_auto_indents_lines(cx: &mut TestAppConte
    );
    cx.update_buffer(|buffer, cx| buffer.set_language(Some(language), cx));

-    // test when all cursors are not at suggested indent
-    // then simply move to their suggested indent location
+    // when all cursors are to the left of the suggested indent, then auto-indent all.
    cx.set_state(indoc! {"
        const a: B = (
            c(
@@ -2889,8 +2888,9 @@ async fn test_tab_in_leading_whitespace_auto_indents_lines(cx: &mut TestAppConte
        );
    "});

-    // test cursor already at suggested indent not moving when
-    // other cursors are yet to reach their suggested indents
+    // cursors that are already at the suggested indent level do not move
+    // until other cursors that are to the left of the suggested indent
+    // auto-indent.
    cx.set_state(indoc! {"
        ˇ
        const a: B = (
@@ -2914,7 +2914,8 @@ async fn test_tab_in_leading_whitespace_auto_indents_lines(cx: &mut TestAppConte
            ˇ)
        );
    "});
-    // test when all cursors are at suggested indent then tab is inserted
+    // once all multi-cursors are at the suggested
+    // indent level, they all insert a soft tab together.
    cx.update_editor(|e, window, cx| e.tab(&Tab, window, cx));
    cx.assert_editor_state(indoc! {"
            ˇ
@@ -2928,112 +2929,6 @@ async fn test_tab_in_leading_whitespace_auto_indents_lines(cx: &mut TestAppConte
        );
    "});

-    // test when current indent is less than suggested indent,
-    // we adjust line to match suggested indent and move cursor to it
-    //
-    // when no other cursor is at word boundary, all of them should move
-    cx.set_state(indoc! {"
-        const a: B = (
-            c(
-                d(
-        ˇ
-        ˇ   )
-        ˇ   )
-        );
-    "});
-    cx.update_editor(|e, window, cx| e.tab(&Tab, window, cx));
-    cx.assert_editor_state(indoc! {"
-        const a: B = (
-            c(
-                d(
-                    ˇ
-                ˇ)
-            ˇ)
-        );
-    "});
-
-    // test when current indent is less than suggested indent,
-    // we adjust line to match suggested indent and move cursor to it
-    //
-    // when some other cursor is at word boundary, it should not move
-    cx.set_state(indoc! {"
-        const a: B = (
-            c(
-                d(
-        ˇ
-        ˇ   )
-           ˇ)
-        );
-    "});
-    cx.update_editor(|e, window, cx| e.tab(&Tab, window, cx));
-    cx.assert_editor_state(indoc! {"
-        const a: B = (
-            c(
-                d(
-                    ˇ
-                ˇ)
-            ˇ)
-        );
-    "});
-
-    // test when current indent is more than suggested indent,
-    // we just move cursor to current indent instead of suggested indent
-    //
-    // when no other cursor is at word boundary, all of them should move
-    cx.set_state(indoc! {"
-        const a: B = (
-            c(
-                d(
-        ˇ
-        ˇ                )
-        ˇ   )
-        );
-    "});
-    cx.update_editor(|e, window, cx| e.tab(&Tab, window, cx));
-    cx.assert_editor_state(indoc! {"
-        const a: B = (
-            c(
-                d(
-                    ˇ
-                        ˇ)
-            ˇ)
-        );
-    "});
-    cx.update_editor(|e, window, cx| e.tab(&Tab, window, cx));
-    cx.assert_editor_state(indoc! {"
-        const a: B = (
-            c(
-                d(
-                        ˇ
-                            ˇ)
-                ˇ)
-        );
-    "});
-
-    // test when current indent is more than suggested indent,
-    // we just move cursor to current indent instead of suggested indent
-    //
-    // when some other cursor is at word boundary, it doesn't move
-    cx.set_state(indoc! {"
-        const a: B = (
-            c(
-                d(
-        ˇ
-        ˇ                )
-            ˇ)
-        );
-    "});
-    cx.update_editor(|e, window, cx| e.tab(&Tab, window, cx));
-    cx.assert_editor_state(indoc! {"
-        const a: B = (
-            c(
-                d(
-                    ˇ
-                        ˇ)
-            ˇ)
-        );
-    "});
-
    // handle auto-indent when there are multiple cursors on the same line
    cx.set_state(indoc! {"
        const a: B = (
@@ -4432,7 +4327,6 @@ fn test_move_line_up_down_with_blocks(cx: &mut TestAppContext) {
                height: Some(1),
                render: Arc::new(|_| div().into_any()),
                priority: 0,
-                render_in_minimap: true,
            }],
            Some(Autoscroll::fit()),
            cx,
@@ -4475,7 +4369,6 @@ async fn test_selections_and_replace_blocks(cx: &mut TestAppContext) {
                style: BlockStyle::Sticky,
                render: Arc::new(|_| gpui::div().into_any_element()),
                priority: 0,
-                render_in_minimap: true,
            }],
            None,
            cx,
@@ -9005,7 +8898,6 @@ async fn test_multiple_formatters(cx: &mut TestAppContext) {
                        },
                    })
                    .await
-                    .into_response()
                    .unwrap();
                Ok(Some(json!(null)))
            }
@@ -19259,7 +19151,6 @@ async fn test_apply_code_lens_actions_with_commands(cx: &mut gpui::TestAppContex
                            },
                        )
                        .await
-                        .into_response()
                        .unwrap();
                    Ok(Some(json!(null)))
                }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Joseph T. Lyons	762fc428a5	zed 0.186.4	2025-05-08 09:28:53 -04:00
Marshall Bowers	0490d255c6	language_models: Improve subscription states in the Agent configuration view (#30252 ) This PR improves the subscription states in the Agent configuration view to the new billing system. Zed Free (legacy): <img width="638" alt="Screenshot 2025-05-08 at 8 42 59 AM" src="https://github.com/user-attachments/assets/7b62d4c1-2a9c-4c6a-aa8f-060730b6d7b3" /> Zed Free (new): <img width="640" alt="Screenshot 2025-05-08 at 8 43 56 AM" src="https://github.com/user-attachments/assets/8a48448e-813e-4633-955d-623d3e6d603c" /> Zed Pro trial: <img width="641" alt="Screenshot 2025-05-08 at 8 45 52 AM" src="https://github.com/user-attachments/assets/1ec7ee62-e954-48e7-8447-4584527307c9" /> Zed Pro: <img width="636" alt="Screenshot 2025-05-08 at 8 47 21 AM" src="https://github.com/user-attachments/assets/f934b2e3-0943-4b78-b8dc-0a31e731d8fb" /> Release Notes: - agent: Improved the subscription-related information in the configuration view.	2025-05-08 09:15:48 -04:00
Ben Brandt	1d9c2ddbc7	Improve token counting for OpenAI models (#30242 ) tiktoken_rs is a bit behind (and even upstream tiktoken doesn't have all of these models) We were incorrectly using the cl100k tokenizer for some models that actually use the o200k tokenizers. So that is updated. I also made the match arms specific so that we do a better job of catching whether or not tiktoken-rs accurately supports new models we add in. I will also do a PR upstream to see if we can move some of this logic back out if tiktoken better supports the newer models. Release Notes: - Improved tokenizer support for openai models.	2025-05-08 09:13:13 -04:00
Antonio Scandurra	8594cefc97	Reuse conversation cache when streaming edits (#30245 ) Release Notes: - Improved latency when the agent applies edits.	2025-05-08 09:05:30 -04:00
gcp-cherry-pick-bot[bot]	1afd18629b	debugger/extensions: Revert changes to extension store related to language config (cherry-pick #30225 ) (#30244 ) Cherry-picked debugger/extensions: Revert changes to extension store related to language config (#30225) Revert #29945 Release Notes: - Fixed extension suggestions popping up over and over for recommended extensions like Ruby or Nix. --------- Co-authored-by: Conrad <conrad@zed.dev> Co-authored-by: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com> Co-authored-by: Conrad <conrad@zed.dev>	2025-05-08 14:42:45 +02:00
Marshall Bowers	4aa38ce39a	agent: Rename a number of constructs from Assistant to Agent (#30196 ) This PR renames a number of constructs in the `agent` crate from the "Assistant" terminology to "Agent". Not comprehensive, but it's a start. Release Notes: - N/A	2025-05-08 08:34:29 -04:00
Marshall Bowers	8a742fba43	Remove `assistant` crate (#30168 ) This PR removes the `assistant` crate, as it is no longer used. Release Notes: - N/A	2025-05-08 08:31:59 -04:00
Bennet Bo Fenner	055e35e2b9	agent: Tweak wording when configuring profiles (#30027 ) cc @danilo-leal Release Notes: - N/A Co-authored-by: Danilo Leal <daniloleal09@gmail.com>	2025-05-08 08:28:04 -04:00
Ben Brandt	2c131c3d34	Use fit instead of center for Agent following (#30228 ) Makes it easier to review the Agent edits since more of the previous edits will be visible on screen. Release Notes: - N/A	2025-05-08 08:05:52 -04:00
Bennet Bo Fenner	206d7341a1	agent: Improve Gemini tool schema compatibility (#30216 ) Closes #30056 Apparently the API supports the "default" field now, so we can remove that transformation. However, optional is not supported See https://ai.google.dev/api/caching#Schema Release Notes: - agent: Improve tool schema compatibility for Gemini models	2025-05-08 08:05:16 -04:00
versecafe	efbe678dcd	mistral: Add new Mistral medium model (#30171 ) Release Notes: - Added `mistral-medium` to the Mistral provider.	2025-05-08 08:04:58 -04:00
Ben Brandt	0f9607710b	Load Profile state from Thread and tie visibility to the thread's model (#30090 ) When deciding if a model supports tools or not, we weren't reading from the configured model in a given thread. This also stores the profile on the thread, which matches the behavior of the Model and Max Mode, which we also already store per thread. Hopefully this helps alleviate some confusion. Release Notes: - agent: Save profile selection per-Agent thread	2025-05-08 08:03:26 -04:00
gcp-cherry-pick-bot[bot]	91b1f60e5b	Fix workspace update notifications not being suppressed (cherry-pick #30180 ) (#30205 ) Cherry-picked Fix workspace update notifications not being suppressed (#30180) Follow-up of https://github.com/zed-industries/zed/pull/30015 Release Notes: - N/A Co-authored-by: Kirill Bulatov <kirill@zed.dev>	2025-05-08 09:20:02 +03:00
gcp-cherry-pick-bot[bot]	29bb9aaf76	Better match path-like strings in terminal (cherry-pick #30087 ) (#30207 ) Cherry-picked Better match path-like strings in terminal (#30087) Start to capture `foo/bar:20:in`-like strings as valid pointers to line 20 in a file Closes https://github.com/zed-industries/zed/issues/28194 Release Notes: - Fixed terminal cmd-click not registering `foo/bar:20:in`-like paths Co-authored-by: Kirill Bulatov <kirill@zed.dev>	2025-05-08 09:19:48 +03:00
gcp-cherry-pick-bot[bot]	9cd2806ce1	Do not flicker when switching cmd-hovered words in terminal (cherry-pick #30098 ) (#30206 ) Cherry-picked Do not flicker when switching cmd-hovered words in terminal (#30098) Closes https://github.com/zed-industries/zed/issues/25110 https://github.com/user-attachments/assets/4624c256-8dfb-48eb-a726-6cf130d946da Terminal may update its hovered word way before reporting it to the terminal view, and that processing the file check later. Hence, store the terminal hover data in the terminal view and avoid highlights when it's different from what the terminal has (as the source of truth here). In addition, now only does hover refreshes when the terminal hover actually changes, not on every event report. Release Notes: - Fixed underline flicker when switching cmd-hovered words in terminal Co-authored-by: Kirill Bulatov <kirill@zed.dev>	2025-05-08 09:17:44 +03:00
gcp-cherry-pick-bot[bot]	96b328d0ff	Add a way to clear activity indicator (cherry-pick #30156 ) (#30204 ) Cherry-picked Add a way to clear activity indicator (#30156) Follow-up of https://github.com/zed-industries/zed/pull/30015 * Restyles the dismiss and close buttons a bit: change the dismiss icon and add tooltips with the bindings to both * Allows ESC to clear any status that's in the activity indicator now, if all notifications are cleared: this won't suppress any further status additions though, so statuses may resurface later Release Notes: - Added a way to clear activity indicator Co-authored-by: Kirill Bulatov <kirill@zed.dev>	2025-05-08 09:16:16 +03:00
Joseph T. Lyons	da333757f1	zed 0.186.3	2025-05-07 21:07:58 -04:00
Max Brunsfeld	fb1ac6ef61	Allow opening the FS root dir as a remote project (#30190 ) ### Todo * [x] Allow opening `ssh://username@host:/` from the CLI * [x] Allow selecting `/` in the `open path` picker * [x] Allow selecting the home directory in the `open path` picker Release Notes: - Changed the initial state of the SSH project picker to show the full path to your home directory on the remote machine, instead of `~`. - Added the ability to open `/` as a project folder over SSH --------- Co-authored-by: Agus Zubiaga <hi@aguz.me>	2025-05-07 17:54:25 -07:00
Michael Sloan	190d6129bb	Use agent panel font size for all content in thread / history views and fix text thread font size adjust (#30041 ) Release Notes: - N/A	2025-05-07 17:15:14 -04:00
Max Brunsfeld	a206c31e97	Avoid empty schema in copilot dummy tool (#30178 ) Copilot chat still returns a 400 if the dummy tool uses the `{}` schema. This is a follow-up to https://github.com/zed-industries/zed/pull/30007. Release Notes: - Fixed a bug where agent edits would fail when using GitHub Copilot Chat. Co-authored-by: Agus Zubiaga <hi@aguz.me>	2025-05-07 16:31:30 -04:00
Peter Tripp	e0b27290f3	zed 0.186.2	2025-05-07 14:09:43 -04:00
Danilo Leal	78f9852eda	agent: Improve onboarding modal background illustration (#30137 ) Tone down the grid background a bit more so text is more legible. Release Notes: - N/A	2025-05-07 14:05:59 -04:00
Agus Zubiaga	6eee3440e7	agent: Improve consecutive tool use callout spacing (#30145 ) Release Notes: - agent: Fix "consecutive tool use limit" callout spacing	2025-05-07 14:05:56 -04:00
Finn Evers	080ef043c3	agent: Fix profile menu hover flicker after settings update (#30109 ) Closes #30091 Follow-up to #29958 This PR fixes the profile menu flickering due to the documentation aside after updating the agent dock position over the settings file. The problem arose because the `documentation_side` could get out of sync with the actual agent panel dock position. The `documentation_side` was only updated whenever the user changed the agent panel position using the UI, but not when updating the position in the settings file. You can reproduce this easily by changing the `agent.dock` position to the opposite site in your settings, which will make the profile menu flicker again in some scenarios due to the de-sync. This PR fixes this behavior by computing the position during render, thus the actual set panel position and the documentation position can never get out of sync Release Notes: - Fixed the agent profile menu flickering after updating the assistant panel dock position in the settings.	2025-05-07 14:05:53 -04:00
Marshall Bowers	a7b882c1cb	language_models: Update copy for Zed Pro subscription (#30152 ) This PR updates the copy around the Zed Pro description to be more accurate. Release Notes: - agent: Updated some copy about Zed Pro in the configuration view.	2025-05-07 14:05:47 -04:00
Peter Tripp	202a19e0ed	Legal Terms: May 6th 2025 update (#30151 ) Updated terms for Agent panel launch. Release Notes: - N/A	2025-05-07 14:05:44 -04:00
Marshall Bowers	ace7f573c3	Send up Zed version with edit prediction and completion requests (#30136 ) This PR makes it so we send up an `x-zed-version` header with the client's version when making a request to llm.zed.dev for edit predictions and completions. Release Notes: - N/A	2025-05-07 14:05:29 -04:00
Agus Zubiaga	d0da6f75d7	agent: Use correct timezone for thread history separators (#30059 ) Turns out `naive_local` doesn't actually offset a `DateTime<Utc>` to the local timezone before creating a `NaiveDate`. Release Notes: - agent: Use correct timezone for thread history separators	2025-05-07 14:05:26 -04:00
Antonio Scandurra	13743ef2ef	Fix agent reading and editing files over SSH (#30144 ) Release Notes: - Fixed a bug that would prevent the agent from working over SSH. --------- Co-authored-by: Nathan Sobo <nathan@zed.dev> Co-authored-by: Richard Feldman <oss@rtfeldman.com> Co-authored-by: Max Brunsfeld <maxbrunsfeld@gmail.com> Co-authored-by: Cole Miller <m@cole-miller.net>	2025-05-07 14:05:22 -04:00
Mikayla Maki	03f9b1e74e	Restore tool cards on thread deserialization (#30053 ) Release Notes: - N/A --------- Co-authored-by: Julia Ryan <juliaryan3.14@gmail.com>	2025-05-07 14:05:19 -04:00
Danilo Leal	453125eb03	agent: Make feedback buttons more minimal (#30133 ) Also swapped out the svgs for `ThumbsDown` and `ThumbsUp`, and added `DocumentText`. Release Notes: - N/A	2025-05-07 11:55:47 -04:00
Richard Feldman	e8dadb16c3	Improve Ollama tool use (#30120 ) <img width="458" alt="Screenshot 2025-05-07 at 9 37 39 AM" src="https://github.com/user-attachments/assets/80f8a9b8-6a13-4e84-b91d-140e11475638" /> <img width="603" alt="Screenshot 2025-05-07 at 9 37 33 AM" src="https://github.com/user-attachments/assets/7fe67a68-3885-4a0e-a282-aad37e92068b" /> Release Notes: - Ollama models no longer require the supports_tools field in settings (defaults to false) --------- Co-authored-by: Antonio Scandurra <me@as-cii.com>	2025-05-07 11:41:52 -04:00
Antonio Scandurra	a1c5a58521	zed 0.186.1	2025-05-07 13:27:45 +02:00
gcp-cherry-pick-bot[bot]	703af39558	Fix zero-sized message editors when context strip is empty (cherry-pick #30079 ) (#30086 ) Cherry-picked Fix zero-sized message editors when context strip is empty (#30079) Release Notes: - Fixed a bug that would cause the message composer in the agent panel to not render when the context strip was empty. Co-authored-by: Ben Brandt <benjamin.j.brandt@gmail.com> Co-authored-by: Nathan Sobo <nathan@zed.dev> Co-authored-by: Antonio Scandurra <me@as-cii.com> Co-authored-by: Ben Brandt <benjamin.j.brandt@gmail.com> Co-authored-by: Nathan Sobo <nathan@zed.dev>	2025-05-07 13:12:48 +02:00
gcp-cherry-pick-bot[bot]	dc9b1d316d	Avoid panic when opening thread as markdown in non-local project (cherry-pick #30061 ) (#30063 ) Cherry-picked Avoid panic when opening thread as markdown in non-local project (#30061) Right now `agent: open active thread as markdown` will always panic when you try to use it over collab or when SSH remoting. This PR makes it log an error instead (we should follow up by restoring full remote support). Release Notes: - Prevented `agent: open active thread as markdown` from panicking when used in a non-local project. Co-authored-by: Cole Miller <cole@zed.dev>	2025-05-07 09:02:52 +03:00
Marshall Bowers	affec54b8e	Update onboading modal copy	2025-05-06 21:55:20 -04:00
Marshall Bowers	4cde597d39	agent: Remove feature flag checks (#30055 ) This PR removes all of the feature flag checks related to the Agent. Tried to do this in the least invasive way possible; we can follow up with a full removal. Release Notes: - N/A	2025-05-06 21:44:39 -04:00
Joseph T. Lyons	2e2ad6c80e	v0.186.x preview	2025-05-06 19:49:40 -04:00
				`@@ -1 +0,0 @@`
				`<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-loader-circle-icon lucide-loader-circle"><path d="M21 12a9 9 0 1 1-6.219-8.56"/></svg>`