zed 0.186.9

Fix rejecting overwritten files if the agent previously edited them (cherry-pick #30744 ) (#30746 )
Cherry-picked Fix rejecting overwritten files if the agent previously edited them (#30744) Release Notes: - Fixed rejecting overwritten files if the agent had previously edited them. Co-authored-by: Antonio Scandurra <me@as-cii.com>
2025-05-15 12:43:57 +02:00 · 2025-05-15 11:48:24 +02:00 · 2025-05-14 16:15:56 +02:00 · 2025-05-14 15:59:24 +02:00 · 2025-05-14 15:58:54 +02:00 · 2025-05-14 15:56:14 +02:00
250 changed files with 8557 additions and 8531 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -513,6 +513,7 @@ dependencies = [
 "settings",
 "smallvec",
 "smol",
+ "strum 0.27.1",
 "telemetry_events",
 "text",
 "theme",
@@ -1270,9 +1271,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 +1281,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 +2030,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 +2049,6 @@ dependencies = [
 "naga",
 "objc2",
 "objc2-app-kit",
- "objc2-core-foundation",
 "objc2-foundation",
 "objc2-metal",
 "objc2-quartz-core",
@@ -2062,7 +2062,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 +2072,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 +2119,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 +3068,6 @@ dependencies = [
 "gpui",
 "http_client",
 "language",
- "log",
 "menu",
 "notifications",
 "picker",
@@ -3184,6 +3183,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"
@@ -3309,6 +3334,7 @@ dependencies = [
 "http_client",
 "indoc",
 "inline_completion",
+ "itertools 0.14.0",
 "language",
 "log",
 "lsp",
@@ -3318,11 +3344,9 @@ dependencies = [
 "paths",
 "project",
 "rpc",
- "schemars",
 "serde",
 "serde_json",
 "settings",
- "strum 0.27.1",
 "task",
 "theme",
 "ui",
@@ -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]]
@@ -7225,7 +7238,6 @@ dependencies = [
 "lsp",
 "paths",
 "project",
- "proto",
 "regex",
 "serde_json",
 "settings",
@@ -7233,7 +7245,6 @@ dependencies = [
 "telemetry",
 "theme",
 "ui",
- "util",
 "workspace",
 "workspace-hack",
 "zed_actions",
@@ -7723,7 +7734,6 @@ dependencies = [
 "tree-sitter-html",
 "tree-sitter-json",
 "tree-sitter-md",
- "tree-sitter-python",
 "tree-sitter-ruby",
 "tree-sitter-rust",
 "tree-sitter-typescript",
@@ -8507,7 +8517,6 @@ version = "0.1.0"
 dependencies = [
 "anyhow",
 "assets",
- "base64 0.22.1",
 "env_logger 0.11.8",
 "gpui",
 "language",
@@ -8896,27 +8905,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 +9376,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 +9475,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 +11953,6 @@ version = "0.1.0"
 dependencies = [
 "anyhow",
 "askpass",
- "assistant_tool",
- "assistant_tools",
 "async-watch",
 "backtrace",
 "cargo_toml",
@@ -11860,7 +11975,6 @@ dependencies = [
 "http_client",
 "language",
 "language_extension",
- "language_model",
 "languages",
 "libc",
 "log",
@@ -18035,7 +18149,6 @@ dependencies = [
 "base64ct",
 "bigdecimal",
 "bit-set 0.8.0",
- "bit-vec 0.8.0",
 "bitflags 2.9.0",
 "bstr",
 "bytemuck",
@@ -18047,7 +18160,6 @@ dependencies = [
 "clang-sys",
 "clap",
 "clap_builder",
- "codespan-reporting 0.12.0",
 "concurrent-queue",
 "core-foundation 0.9.4",
 "core-foundation-sys",
@@ -18076,7 +18188,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 +18221,6 @@ dependencies = [
 "num-iter",
 "num-rational",
 "num-traits",
- "objc2",
- "objc2-foundation",
- "objc2-metal",
 "object",
 "once_cell",
 "percent-encoding",
@@ -18131,7 +18239,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 +18634,7 @@ dependencies = [

 [[package]]
 name = "zed"
-version = "0.187.0"
+version = "0.186.9"
 dependencies = [
 "activity_indicator",
 "agent",
@@ -18537,7 +18644,6 @@ dependencies = [
 "assets",
 "assistant_context_editor",
 "assistant_settings",
- "assistant_tool",
 "assistant_tools",
 "async-watch",
 "audio",
@@ -18554,7 +18660,7 @@ dependencies = [
 "collab_ui",
 "collections",
 "command_palette",
- "component",
+ "component_preview",
 "copilot",
 "dap",
 "dap_adapters",
@@ -18580,7 +18686,6 @@ dependencies = [
 "gpui_tokio",
 "http_client",
 "image_viewer",
- "indoc",
 "inline_completion_button",
 "install_cli",
 "journal",
@@ -18644,7 +18749,6 @@ dependencies = [
 "tree-sitter-md",
 "tree-sitter-rust",
 "ui",
- "ui_input",
 "ui_prompt",
 "url",
 "urlencoding",
@@ -18719,9 +18823,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",
--- 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/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",
@@ -244,7 +245,7 @@
      "ctrl-shift-a": "agent::ToggleContextPicker",
      "ctrl-shift-o": "agent::ToggleNavigationMenu",
      "ctrl-shift-i": "agent::ToggleOptionsMenu",
-      "shift-escape": "agent::ExpandMessageEditor",
+      "shift-alt-escape": "agent::ExpandMessageEditor",
      "ctrl-alt-e": "agent::RemoveAllContext",
      "ctrl-shift-e": "project_panel::ToggleFocus"
    }
@@ -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",
@@ -290,7 +291,7 @@
      "cmd-shift-a": "agent::ToggleContextPicker",
      "cmd-shift-o": "agent::ToggleNavigationMenu",
      "cmd-shift-i": "agent::ToggleOptionsMenu",
-      "shift-escape": "agent::ExpandMessageEditor",
+      "shift-alt-escape": "agent::ExpandMessageEditor",
      "cmd-alt-e": "agent::RemoveAllContext",
      "cmd-shift-e": "project_panel::ToggleFocus"
    }
@@ -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": {
--- a/crates/agent/src/active_thread.rs
+++ b/crates/agent/src/active_thread.rs
@@ -6,7 +6,7 @@ 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,
+    ThreadEvent, ThreadFeedback, ThreadSummary,
 };
 use crate::thread_store::{RulesLoadingError, TextThreadStore, ThreadStore};
 use crate::tool_use::{PendingToolUseStatus, ToolUse};
@@ -823,12 +823,12 @@ impl ActiveThread {
        self.messages.is_empty()
    }

-    pub fn summary(&self, cx: &App) -> Option<SharedString> {
+    pub fn summary<'a>(&'a self, cx: &'a App) -> &'a ThreadSummary {
        self.thread.read(cx).summary()
    }

-    pub fn summary_or_default(&self, cx: &App) -> SharedString {
-        self.thread.read(cx).summary_or_default()
+    pub fn regenerate_summary(&self, cx: &mut App) {
+        self.thread.update(cx, |thread, cx| thread.summarize(cx))
    }

    pub fn cancel_last_completion(&mut self, window: &mut Window, cx: &mut App) -> bool {
@@ -1134,11 +1134,7 @@ impl ActiveThread {
            return;
        }

-        let title = self
-            .thread
-            .read(cx)
-            .summary()
-            .unwrap_or("Agent Panel".into());
+        let title = self.thread.read(cx).summary().unwrap_or("Agent Panel");

        match AssistantSettings::get_global(cx).notify_when_agent_waiting {
            NotifyWhenAgentWaiting::PrimaryScreen => {
@@ -3442,10 +3438,7 @@ pub(crate) fn open_active_thread_as_markdown(
        workspace.update_in(cx, |workspace, window, cx| {
            let thread = thread.read(cx);
            let markdown = thread.to_markdown(cx)?;
-            let thread_summary = thread
-                .summary()
-                .map(|summary| summary.to_string())
-                .unwrap_or_else(|| "Thread".to_string());
+            let thread_summary = thread.summary().or_default().to_string();

            let project = workspace.project().clone();

--- a/crates/agent/src/agent.rs
+++ b/crates/agent/src/agent.rs
@@ -49,7 +49,7 @@ pub use crate::context::{ContextLoadResult, LoadedContext};
 pub use crate::inline_assistant::InlineAssistant;
 use crate::slash_command_settings::SlashCommandSettings;
 pub use crate::thread::{Message, MessageSegment, Thread, ThreadEvent};
-pub use crate::thread_store::{TextThreadStore, ThreadStore};
+pub use crate::thread_store::{SerializedThread, TextThreadStore, ThreadStore};
 pub use agent_diff::{AgentDiffPane, AgentDiffToolbar};
 pub use context_store::ContextStore;
 pub use ui::preview::{all_agent_previews, get_agent_preview};
--- a/crates/agent/src/agent_configuration.rs
+++ b/crates/agent/src/agent_configuration.rs
@@ -36,6 +36,7 @@ pub struct AgentConfiguration {
    configuration_views_by_provider: HashMap<LanguageModelProviderId, AnyView>,
    context_server_store: Entity<ContextServerStore>,
    expanded_context_server_tools: HashMap<ContextServerId, bool>,
+    expanded_provider_configurations: HashMap<LanguageModelProviderId, bool>,
    tools: Entity<ToolWorkingSet>,
    _registry_subscription: Subscription,
    scroll_handle: ScrollHandle,
@@ -78,6 +79,7 @@ impl AgentConfiguration {
            configuration_views_by_provider: HashMap::default(),
            context_server_store,
            expanded_context_server_tools: HashMap::default(),
+            expanded_provider_configurations: HashMap::default(),
            tools,
            _registry_subscription: registry_subscription,
            scroll_handle,
@@ -96,6 +98,7 @@ impl AgentConfiguration {

    fn remove_provider_configuration_view(&mut self, provider_id: &LanguageModelProviderId) {
        self.configuration_views_by_provider.remove(provider_id);
+        self.expanded_provider_configurations.remove(provider_id);
    }

    fn add_provider_configuration_view(
@@ -135,9 +138,14 @@ impl AgentConfiguration {
            .get(&provider.id())
            .cloned();

+        let is_expanded = self
+            .expanded_provider_configurations
+            .get(&provider.id())
+            .copied()
+            .unwrap_or(true);
+
        v_flex()
            .pt_3()
-            .pb_1()
            .gap_1p5()
            .border_t_1()
            .border_color(cx.theme().colors().border.opacity(0.6))
@@ -152,32 +160,59 @@ impl AgentConfiguration {
                                    .size(IconSize::Small)
                                    .color(Color::Muted),
                            )
-                            .child(Label::new(provider_name.clone()).size(LabelSize::Large)),
+                            .child(Label::new(provider_name.clone()).size(LabelSize::Large))
+                            .when(provider.is_authenticated(cx) && !is_expanded, |parent| {
+                                parent.child(Icon::new(IconName::Check).color(Color::Success))
+                            }),
                    )
-                    .when(provider.is_authenticated(cx), |parent| {
-                        parent.child(
-                            Button::new(
-                                SharedString::from(format!("new-thread-{provider_id}")),
-                                "Start New Thread",
-                            )
-                            .icon_position(IconPosition::Start)
-                            .icon(IconName::Plus)
-                            .icon_size(IconSize::Small)
-                            .style(ButtonStyle::Filled)
-                            .layer(ElevationIndex::ModalSurface)
-                            .label_size(LabelSize::Small)
-                            .on_click(cx.listener({
-                                let provider = provider.clone();
-                                move |_this, _event, _window, cx| {
-                                    cx.emit(AssistantConfigurationEvent::NewThread(
-                                        provider.clone(),
-                                    ))
-                                }
-                            })),
-                        )
-                    }),
+                    .child(
+                        h_flex()
+                            .gap_1()
+                            .when(provider.is_authenticated(cx), |parent| {
+                                parent.child(
+                                    Button::new(
+                                        SharedString::from(format!("new-thread-{provider_id}")),
+                                        "Start New Thread",
+                                    )
+                                    .icon_position(IconPosition::Start)
+                                    .icon(IconName::Plus)
+                                    .icon_size(IconSize::Small)
+                                    .layer(ElevationIndex::ModalSurface)
+                                    .label_size(LabelSize::Small)
+                                    .on_click(cx.listener({
+                                        let provider = provider.clone();
+                                        move |_this, _event, _window, cx| {
+                                            cx.emit(AssistantConfigurationEvent::NewThread(
+                                                provider.clone(),
+                                            ))
+                                        }
+                                    })),
+                                )
+                            })
+                            .child(
+                                Disclosure::new(
+                                    SharedString::from(format!(
+                                        "provider-disclosure-{provider_id}"
+                                    )),
+                                    is_expanded,
+                                )
+                                .opened_icon(IconName::ChevronUp)
+                                .closed_icon(IconName::ChevronDown)
+                                .on_click(cx.listener({
+                                    let provider_id = provider.id().clone();
+                                    move |this, _event, _window, _cx| {
+                                        let is_open = this
+                                            .expanded_provider_configurations
+                                            .entry(provider_id.clone())
+                                            .or_insert(true);
+
+                                        *is_open = !*is_open;
+                                    }
+                                })),
+                            ),
+                    ),
            )
-            .map(|parent| match configuration_view {
+            .when(is_expanded, |parent| match configuration_view {
                Some(configuration_view) => parent.child(configuration_view),
                None => parent.child(div().child(Label::new(format!(
                    "No configuration view for {provider_name}",
--- a/crates/agent/src/agent_diff.rs
+++ b/crates/agent/src/agent_diff.rs
@@ -215,11 +215,7 @@ impl AgentDiffPane {
    }

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

    fn tab_content(&self, params: TabContentParams, _window: &Window, cx: &App) -> AnyElement {
-        let summary = self
-            .thread
-            .read(cx)
-            .summary()
-            .unwrap_or("Agent Changes".into());
+        let summary = self.thread.read(cx).summary().unwrap_or("Agent Changes");
        Label::new(format!("Review: {}", summary))
            .color(if params.selected {
                Color::Default
--- a/crates/agent/src/agent_panel.rs
+++ b/crates/agent/src/agent_panel.rs
@@ -10,8 +10,8 @@ use serde::{Deserialize, Serialize};
 use anyhow::{Result, anyhow};
 use assistant_context_editor::{
    AgentPanelDelegate, AssistantContext, ConfigurationError, ContextEditor, ContextEvent,
-    SlashCommandCompletionProvider, humanize_token_count, make_lsp_adapter_delegate,
-    render_remaining_tokens,
+    ContextSummary, SlashCommandCompletionProvider, humanize_token_count,
+    make_lsp_adapter_delegate, render_remaining_tokens,
 };
 use assistant_settings::{AssistantDockPosition, AssistantSettings};
 use assistant_slash_command::SlashCommandWorkingSet;
@@ -59,7 +59,7 @@ use crate::agent_configuration::{AgentConfiguration, AssistantConfigurationEvent
 use crate::agent_diff::AgentDiff;
 use crate::history_store::{HistoryStore, RecentEntry};
 use crate::message_editor::{MessageEditor, MessageEditorEvent};
-use crate::thread::{Thread, ThreadError, ThreadId, TokenUsageRatio};
+use crate::thread::{Thread, ThreadError, ThreadId, ThreadSummary, TokenUsageRatio};
 use crate::thread_history::{HistoryEntryElement, ThreadHistory};
 use crate::thread_store::ThreadStore;
 use crate::ui::AgentOnboardingModal;
@@ -196,7 +196,7 @@ impl ActiveView {
    }

    pub fn thread(thread: Entity<Thread>, window: &mut Window, cx: &mut App) -> Self {
-        let summary = thread.read(cx).summary_or_default();
+        let summary = thread.read(cx).summary().or_default();

        let editor = cx.new(|cx| {
            let mut editor = Editor::single_line(window, cx);
@@ -218,7 +218,7 @@ impl ActiveView {
                        }
                        EditorEvent::Blurred => {
                            if editor.read(cx).text(cx).is_empty() {
-                                let summary = thread.read(cx).summary_or_default();
+                                let summary = thread.read(cx).summary().or_default();

                                editor.update(cx, |editor, cx| {
                                    editor.set_text(summary, window, cx);
@@ -233,7 +233,7 @@ impl ActiveView {
                let editor = editor.clone();
                move |thread, event, window, cx| match event {
                    ThreadEvent::SummaryGenerated => {
-                        let summary = thread.read(cx).summary_or_default();
+                        let summary = thread.read(cx).summary().or_default();

                        editor.update(cx, |editor, cx| {
                            editor.set_text(summary, window, cx);
@@ -296,7 +296,8 @@ impl ActiveView {
                                    .read(cx)
                                    .context()
                                    .read(cx)
-                                    .summary_or_default();
+                                    .summary()
+                                    .or_default();

                                editor.update(cx, |editor, cx| {
                                    editor.set_text(summary, window, cx);
@@ -311,7 +312,7 @@ impl ActiveView {
                let editor = editor.clone();
                move |assistant_context, event, window, cx| match event {
                    ContextEvent::SummaryGenerated => {
-                        let summary = assistant_context.read(cx).summary_or_default();
+                        let summary = assistant_context.read(cx).summary().or_default();

                        editor.update(cx, |editor, cx| {
                            editor.set_text(summary, window, cx);
@@ -1452,23 +1453,45 @@ impl AgentPanel {
                ..
            } => {
                let active_thread = self.thread.read(cx);
-                let is_empty = active_thread.is_empty();
-
-                let summary = active_thread.summary(cx);
-
-                if is_empty {
-                    Label::new(Thread::DEFAULT_SUMMARY.clone())
-                        .truncate()
-                        .into_any_element()
-                } else if summary.is_none() {
-                    Label::new(LOADING_SUMMARY_PLACEHOLDER)
-                        .truncate()
-                        .into_any_element()
+                let state = if active_thread.is_empty() {
+                    &ThreadSummary::Pending
                } else {
-                    div()
+                    active_thread.summary(cx)
+                };
+
+                match state {
+                    ThreadSummary::Pending => Label::new(ThreadSummary::DEFAULT.clone())
+                        .truncate()
+                        .into_any_element(),
+                    ThreadSummary::Generating => Label::new(LOADING_SUMMARY_PLACEHOLDER)
+                        .truncate()
+                        .into_any_element(),
+                    ThreadSummary::Ready(_) => div()
                        .w_full()
                        .child(change_title_editor.clone())
-                        .into_any_element()
+                        .into_any_element(),
+                    ThreadSummary::Error => h_flex()
+                        .w_full()
+                        .child(change_title_editor.clone())
+                        .child(
+                            ui::IconButton::new("retry-summary-generation", IconName::RotateCcw)
+                                .on_click({
+                                    let active_thread = self.thread.clone();
+                                    move |_, _window, cx| {
+                                        active_thread.update(cx, |thread, cx| {
+                                            thread.regenerate_summary(cx);
+                                        });
+                                    }
+                                })
+                                .tooltip(move |_window, cx| {
+                                    cx.new(|_| {
+                                        Tooltip::new("Failed to generate title")
+                                            .meta("Click to try again")
+                                    })
+                                    .into()
+                                }),
+                        )
+                        .into_any_element(),
                }
            }
            ActiveView::PromptEditor {
@@ -1476,14 +1499,13 @@ impl AgentPanel {
                context_editor,
                ..
            } => {
-                let context_editor = context_editor.read(cx);
-                let summary = context_editor.context().read(cx).summary();
+                let summary = context_editor.read(cx).context().read(cx).summary();

                match summary {
-                    None => Label::new(AssistantContext::DEFAULT_SUMMARY.clone())
+                    ContextSummary::Pending => Label::new(ContextSummary::DEFAULT)
                        .truncate()
                        .into_any_element(),
-                    Some(summary) => {
+                    ContextSummary::Content(summary) => {
                        if summary.done {
                            div()
                                .w_full()
@@ -1495,6 +1517,28 @@ impl AgentPanel {
                                .into_any_element()
                        }
                    }
+                    ContextSummary::Error => h_flex()
+                        .w_full()
+                        .child(title_editor.clone())
+                        .child(
+                            ui::IconButton::new("retry-summary-generation", IconName::RotateCcw)
+                                .on_click({
+                                    let context_editor = context_editor.clone();
+                                    move |_, _window, cx| {
+                                        context_editor.update(cx, |context_editor, cx| {
+                                            context_editor.regenerate_summary(cx);
+                                        });
+                                    }
+                                })
+                                .tooltip(move |_window, cx| {
+                                    cx.new(|_| {
+                                        Tooltip::new("Failed to generate title")
+                                            .meta("Click to try again")
+                                    })
+                                    .into()
+                                }),
+                        )
+                        .into_any_element(),
                }
            }
            ActiveView::History => Label::new("History").truncate().into_any_element(),
@@ -1604,6 +1648,12 @@ impl AgentPanel {
                }),
        );

+        let zoom_in_label = if self.is_zoomed(window, cx) {
+            "Zoom Out"
+        } else {
+            "Zoom In"
+        };
+
        let agent_extra_menu = PopoverMenu::new("agent-options-menu")
            .trigger_with_tooltip(
                IconButton::new("agent-options-menu", IconName::Ellipsis)
@@ -1690,7 +1740,8 @@ impl AgentPanel {

                    menu = menu
                        .action("Rules…", Box::new(OpenRulesLibrary::default()))
-                        .action("Settings", Box::new(OpenConfiguration));
+                        .action("Settings", Box::new(OpenConfiguration))
+                        .action(zoom_in_label, Box::new(ToggleZoom));
                    menu
                }))
            });
--- a/crates/agent/src/context.rs
+++ b/crates/agent/src/context.rs
@@ -586,10 +586,7 @@ impl ThreadContextHandle {
    }

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

    fn load(self, cx: &App) -> Task<Option<(AgentContext, Vec<Entity<Buffer>>)>> {
@@ -597,9 +594,7 @@ impl ThreadContextHandle {
            let text = Thread::wait_for_detailed_summary_or_text(&self.thread, cx).await?;
            let title = self
                .thread
-                .read_with(cx, |thread, _cx| {
-                    thread.summary().unwrap_or_else(|| "New thread".into())
-                })
+                .read_with(cx, |thread, _cx| thread.summary().or_default())
                .ok()?;
            let context = AgentContext::Thread(ThreadContext {
                title,
@@ -642,7 +637,7 @@ impl TextThreadContextHandle {
    }

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

    fn load(self, cx: &App) -> Task<Option<(AgentContext, Vec<Entity<Buffer>>)>> {
@@ -754,11 +749,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> {
--- a/crates/agent/src/context_strip.rs
+++ b/crates/agent/src/context_strip.rs
@@ -160,7 +160,7 @@ impl ContextStrip {
            }

            Some(SuggestedContext::Thread {
-                name: active_thread.summary_or_default(),
+                name: active_thread.summary().or_default(),
                thread: weak_active_thread,
            })
        } else if let Some(active_context_editor) = panel.active_context_editor() {
@@ -174,7 +174,7 @@ impl ContextStrip {
            }

            Some(SuggestedContext::TextThread {
-                name: context.summary_or_default(),
+                name: context.summary().or_default(),
                context: weak_context,
            })
        } else {
--- 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
@@ -71,8 +71,8 @@ impl Eq for RecentEntry {}
 impl RecentEntry {
    pub(crate) fn summary(&self, cx: &App) -> SharedString {
        match self {
-            RecentEntry::Thread(_, thread) => thread.read(cx).summary_or_default(),
-            RecentEntry::Context(context) => context.read(cx).summary_or_default(),
+            RecentEntry::Thread(_, thread) => thread.read(cx).summary().or_default(),
+            RecentEntry::Context(context) => context.read(cx).summary().or_default(),
        }
    }
 }
--- 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
@@ -1085,11 +1085,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/thread.rs
+++ b/crates/agent/src/thread.rs
@@ -36,7 +36,7 @@ use serde::{Deserialize, Serialize};
 use settings::Settings;
 use thiserror::Error;
 use ui::Window;
-use util::{ResultExt as _, TryFutureExt as _, post_inc};
+use util::{ResultExt as _, post_inc};
 use uuid::Uuid;
 use zed_llm_client::CompletionRequestStatus;

@@ -324,7 +324,7 @@ pub enum QueueState {
 pub struct Thread {
    id: ThreadId,
    updated_at: DateTime<Utc>,
-    summary: Option<SharedString>,
+    summary: ThreadSummary,
    pending_summary: Task<Option<()>>,
    detailed_summary_task: Task<Option<()>>,
    detailed_summary_tx: postage::watch::Sender<DetailedSummaryState>,
@@ -361,6 +361,33 @@ pub struct Thread {
    configured_model: Option<ConfiguredModel>,
 }

+#[derive(Clone, Debug, PartialEq, Eq)]
+pub enum ThreadSummary {
+    Pending,
+    Generating,
+    Ready(SharedString),
+    Error,
+}
+
+impl ThreadSummary {
+    pub const DEFAULT: SharedString = SharedString::new_static("New Thread");
+
+    pub fn or_default(&self) -> SharedString {
+        self.unwrap_or(Self::DEFAULT)
+    }
+
+    pub fn unwrap_or(&self, message: impl Into<SharedString>) -> SharedString {
+        self.ready().unwrap_or_else(|| message.into())
+    }
+
+    pub fn ready(&self) -> Option<SharedString> {
+        match self {
+            ThreadSummary::Ready(summary) => Some(summary.clone()),
+            ThreadSummary::Pending | ThreadSummary::Generating | ThreadSummary::Error => None,
+        }
+    }
+}
+
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct ExceededWindowError {
    /// Model used when last message exceeded context window
@@ -383,7 +410,7 @@ impl Thread {
        Self {
            id: ThreadId::new(),
            updated_at: Utc::now(),
-            summary: None,
+            summary: ThreadSummary::Pending,
            pending_summary: Task::ready(None),
            detailed_summary_task: Task::ready(None),
            detailed_summary_tx,
@@ -431,7 +458,7 @@ impl Thread {
        tools: Entity<ToolWorkingSet>,
        prompt_builder: Arc<PromptBuilder>,
        project_context: SharedProjectContext,
-        window: &mut Window,
+        window: Option<&mut Window>, // None in headless mode
        cx: &mut Context<Self>,
    ) -> Self {
        let next_message_id = MessageId(
@@ -471,7 +498,7 @@ impl Thread {
        Self {
            id,
            updated_at: serialized.updated_at,
-            summary: Some(serialized.summary),
+            summary: ThreadSummary::Ready(serialized.summary),
            pending_summary: Task::ready(None),
            detailed_summary_task: Task::ready(None),
            detailed_summary_tx,
@@ -572,10 +599,6 @@ impl Thread {
        self.last_prompt_id = PromptId::new();
    }

-    pub fn summary(&self) -> Option<SharedString> {
-        self.summary.clone()
-    }
-
    pub fn project_context(&self) -> SharedProjectContext {
        self.project_context.clone()
    }
@@ -596,26 +619,25 @@ impl Thread {
        cx.notify();
    }

-    pub const DEFAULT_SUMMARY: SharedString = SharedString::new_static("New Thread");
-
-    pub fn summary_or_default(&self) -> SharedString {
-        self.summary.clone().unwrap_or(Self::DEFAULT_SUMMARY)
+    pub fn summary(&self) -> &ThreadSummary {
+        &self.summary
    }

    pub fn set_summary(&mut self, new_summary: impl Into<SharedString>, cx: &mut Context<Self>) {
-        let Some(current_summary) = &self.summary else {
-            // Don't allow setting summary until generated
-            return;
+        let current_summary = match &self.summary {
+            ThreadSummary::Pending | ThreadSummary::Generating => return,
+            ThreadSummary::Ready(summary) => summary,
+            ThreadSummary::Error => &ThreadSummary::DEFAULT,
        };

        let mut new_summary = new_summary.into();

        if new_summary.is_empty() {
-            new_summary = Self::DEFAULT_SUMMARY;
+            new_summary = ThreadSummary::DEFAULT;
        }

        if current_summary != &new_summary {
-            self.summary = Some(new_summary);
+            self.summary = ThreadSummary::Ready(new_summary);
            cx.emit(ThreadEvent::SummaryChanged);
        }
    }
@@ -1029,7 +1051,7 @@ impl Thread {
            let initial_project_snapshot = initial_project_snapshot.await;
            this.read_with(cx, |this, cx| SerializedThread {
                version: SerializedThread::VERSION.to_string(),
-                summary: this.summary_or_default(),
+                summary: this.summary().or_default(),
                updated_at: this.updated_at(),
                messages: this
                    .messages()
@@ -1625,7 +1647,7 @@ impl Thread {

                    // If there is a response without tool use, summarize the message. Otherwise,
                    // allow two tool uses before summarizing.
-                    if thread.summary.is_none()
+                    if matches!(thread.summary, ThreadSummary::Pending)
                        && thread.messages.len() >= 2
                        && (!thread.has_pending_tool_uses() || thread.messages.len() >= 6)
                    {
@@ -1739,6 +1761,7 @@ impl Thread {

    pub fn summarize(&mut self, cx: &mut Context<Self>) {
        let Some(model) = LanguageModelRegistry::read_global(cx).thread_summary_model() else {
+            println!("No thread summary model");
            return;
        };

@@ -1753,13 +1776,17 @@ impl Thread {

        let request = self.to_summarize_request(&model.model, added_user_message.into(), cx);

+        self.summary = ThreadSummary::Generating;
+
        self.pending_summary = cx.spawn(async move |this, cx| {
-            async move {
+            let result = async {
                let mut messages = model.model.stream_completion(request, &cx).await?;

                let mut new_summary = String::new();
                while let Some(event) = messages.next().await {
-                    let event = event?;
+                    let Ok(event) = event else {
+                        continue;
+                    };
                    let text = match event {
                        LanguageModelCompletionEvent::Text(text) => text,
                        LanguageModelCompletionEvent::StatusUpdate(
@@ -1785,18 +1812,29 @@ impl Thread {
                    }
                }

-                this.update(cx, |this, cx| {
-                    if !new_summary.is_empty() {
-                        this.summary = Some(new_summary.into());
-                    }
-
-                    cx.emit(ThreadEvent::SummaryGenerated);
-                })?;
-
-                anyhow::Ok(())
+                anyhow::Ok(new_summary)
            }
-            .log_err()
-            .await
+            .await;
+
+            this.update(cx, |this, cx| {
+                match result {
+                    Ok(new_summary) => {
+                        if new_summary.is_empty() {
+                            this.summary = ThreadSummary::Error;
+                        } else {
+                            this.summary = ThreadSummary::Ready(new_summary.into());
+                        }
+                    }
+                    Err(err) => {
+                        this.summary = ThreadSummary::Error;
+                        log::error!("Failed to generate thread summary: {}", err);
+                    }
+                }
+                cx.emit(ThreadEvent::SummaryGenerated);
+            })
+            .log_err()?;
+
+            Some(())
        });
    }

@@ -2406,9 +2444,8 @@ impl Thread {
    pub fn to_markdown(&self, cx: &App) -> Result<String> {
        let mut markdown = Vec::new();

-        if let Some(summary) = self.summary() {
-            writeln!(markdown, "# {summary}\n")?;
-        };
+        let summary = self.summary().or_default();
+        writeln!(markdown, "# {summary}\n")?;

        for message in self.messages() {
            writeln!(
@@ -2725,7 +2762,7 @@ mod tests {
    use assistant_tool::ToolRegistry;
    use editor::EditorSettings;
    use gpui::TestAppContext;
-    use language_model::fake_provider::FakeLanguageModel;
+    use language_model::fake_provider::{FakeLanguageModel, FakeLanguageModelProvider};
    use project::{FakeFs, Project};
    use prompt_store::PromptBuilder;
    use serde_json::json;
@@ -3226,6 +3263,196 @@ fn main() {{
        assert_eq!(request.temperature, None);
    }

+    #[gpui::test]
+    async fn test_thread_summary(cx: &mut TestAppContext) {
+        init_test_settings(cx);
+
+        let project = create_test_project(cx, json!({})).await;
+
+        let (_, _thread_store, thread, _context_store, model) =
+            setup_test_environment(cx, project.clone()).await;
+
+        // Initial state should be pending
+        thread.read_with(cx, |thread, _| {
+            assert!(matches!(thread.summary(), ThreadSummary::Pending));
+            assert_eq!(thread.summary().or_default(), ThreadSummary::DEFAULT);
+        });
+
+        // Manually setting the summary should not be allowed in this state
+        thread.update(cx, |thread, cx| {
+            thread.set_summary("This should not work", cx);
+        });
+
+        thread.read_with(cx, |thread, _| {
+            assert!(matches!(thread.summary(), ThreadSummary::Pending));
+        });
+
+        // Send a message
+        thread.update(cx, |thread, cx| {
+            thread.insert_user_message("Hi!", ContextLoadResult::default(), None, vec![], cx);
+            thread.send_to_model(model.clone(), None, cx);
+        });
+
+        let fake_model = model.as_fake();
+        simulate_successful_response(&fake_model, cx);
+
+        // Should start generating summary when there are >= 2 messages
+        thread.read_with(cx, |thread, _| {
+            assert_eq!(*thread.summary(), ThreadSummary::Generating);
+        });
+
+        // Should not be able to set the summary while generating
+        thread.update(cx, |thread, cx| {
+            thread.set_summary("This should not work either", cx);
+        });
+
+        thread.read_with(cx, |thread, _| {
+            assert!(matches!(thread.summary(), ThreadSummary::Generating));
+            assert_eq!(thread.summary().or_default(), ThreadSummary::DEFAULT);
+        });
+
+        cx.run_until_parked();
+        fake_model.stream_last_completion_response("Brief".into());
+        fake_model.stream_last_completion_response(" Introduction".into());
+        fake_model.end_last_completion_stream();
+        cx.run_until_parked();
+
+        // Summary should be set
+        thread.read_with(cx, |thread, _| {
+            assert!(matches!(thread.summary(), ThreadSummary::Ready(_)));
+            assert_eq!(thread.summary().or_default(), "Brief Introduction");
+        });
+
+        // Now we should be able to set a summary
+        thread.update(cx, |thread, cx| {
+            thread.set_summary("Brief Intro", cx);
+        });
+
+        thread.read_with(cx, |thread, _| {
+            assert_eq!(thread.summary().or_default(), "Brief Intro");
+        });
+
+        // Test setting an empty summary (should default to DEFAULT)
+        thread.update(cx, |thread, cx| {
+            thread.set_summary("", cx);
+        });
+
+        thread.read_with(cx, |thread, _| {
+            assert!(matches!(thread.summary(), ThreadSummary::Ready(_)));
+            assert_eq!(thread.summary().or_default(), ThreadSummary::DEFAULT);
+        });
+    }
+
+    #[gpui::test]
+    async fn test_thread_summary_error_set_manually(cx: &mut TestAppContext) {
+        init_test_settings(cx);
+
+        let project = create_test_project(cx, json!({})).await;
+
+        let (_, _thread_store, thread, _context_store, model) =
+            setup_test_environment(cx, project.clone()).await;
+
+        test_summarize_error(&model, &thread, cx);
+
+        // Now we should be able to set a summary
+        thread.update(cx, |thread, cx| {
+            thread.set_summary("Brief Intro", cx);
+        });
+
+        thread.read_with(cx, |thread, _| {
+            assert!(matches!(thread.summary(), ThreadSummary::Ready(_)));
+            assert_eq!(thread.summary().or_default(), "Brief Intro");
+        });
+    }
+
+    #[gpui::test]
+    async fn test_thread_summary_error_retry(cx: &mut TestAppContext) {
+        init_test_settings(cx);
+
+        let project = create_test_project(cx, json!({})).await;
+
+        let (_, _thread_store, thread, _context_store, model) =
+            setup_test_environment(cx, project.clone()).await;
+
+        test_summarize_error(&model, &thread, cx);
+
+        // Sending another message should not trigger another summarize request
+        thread.update(cx, |thread, cx| {
+            thread.insert_user_message(
+                "How are you?",
+                ContextLoadResult::default(),
+                None,
+                vec![],
+                cx,
+            );
+            thread.send_to_model(model.clone(), None, cx);
+        });
+
+        let fake_model = model.as_fake();
+        simulate_successful_response(&fake_model, cx);
+
+        thread.read_with(cx, |thread, _| {
+            // State is still Error, not Generating
+            assert!(matches!(thread.summary(), ThreadSummary::Error));
+        });
+
+        // But the summarize request can be invoked manually
+        thread.update(cx, |thread, cx| {
+            thread.summarize(cx);
+        });
+
+        thread.read_with(cx, |thread, _| {
+            assert!(matches!(thread.summary(), ThreadSummary::Generating));
+        });
+
+        cx.run_until_parked();
+        fake_model.stream_last_completion_response("A successful summary".into());
+        fake_model.end_last_completion_stream();
+        cx.run_until_parked();
+
+        thread.read_with(cx, |thread, _| {
+            assert!(matches!(thread.summary(), ThreadSummary::Ready(_)));
+            assert_eq!(thread.summary().or_default(), "A successful summary");
+        });
+    }
+
+    fn test_summarize_error(
+        model: &Arc<dyn LanguageModel>,
+        thread: &Entity<Thread>,
+        cx: &mut TestAppContext,
+    ) {
+        thread.update(cx, |thread, cx| {
+            thread.insert_user_message("Hi!", ContextLoadResult::default(), None, vec![], cx);
+            thread.send_to_model(model.clone(), None, cx);
+        });
+
+        let fake_model = model.as_fake();
+        simulate_successful_response(&fake_model, cx);
+
+        thread.read_with(cx, |thread, _| {
+            assert!(matches!(thread.summary(), ThreadSummary::Generating));
+            assert_eq!(thread.summary().or_default(), ThreadSummary::DEFAULT);
+        });
+
+        // Simulate summary request ending
+        cx.run_until_parked();
+        fake_model.end_last_completion_stream();
+        cx.run_until_parked();
+
+        // State is set to Error and default message
+        thread.read_with(cx, |thread, _| {
+            assert!(matches!(thread.summary(), ThreadSummary::Error));
+            assert_eq!(thread.summary().or_default(), ThreadSummary::DEFAULT);
+        });
+    }
+
+    fn simulate_successful_response(fake_model: &FakeLanguageModel, cx: &mut TestAppContext) {
+        cx.run_until_parked();
+        fake_model.stream_last_completion_response("Assistant response".into());
+        fake_model.end_last_completion_stream();
+        cx.run_until_parked();
+    }
+
    fn init_test_settings(cx: &mut TestAppContext) {
        cx.update(|cx| {
            let settings_store = SettingsStore::test(cx);
@@ -3282,9 +3509,29 @@ fn main() {{
        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 provider = Arc::new(FakeLanguageModelProvider);
+        let model = provider.test_model();
        let model: Arc<dyn LanguageModel> = Arc::new(model);

+        cx.update(|_, cx| {
+            LanguageModelRegistry::global(cx).update(cx, |registry, cx| {
+                registry.set_default_model(
+                    Some(ConfiguredModel {
+                        provider: provider.clone(),
+                        model: model.clone(),
+                    }),
+                    cx,
+                );
+                registry.set_thread_summary_model(
+                    Some(ConfiguredModel {
+                        provider,
+                        model: model.clone(),
+                    }),
+                    cx,
+                );
+            })
+        });
+
        (workspace, thread_store, thread, context_store, model)
    }

--- a/crates/agent/src/thread_store.rs
+++ b/crates/agent/src/thread_store.rs
@@ -386,6 +386,25 @@ impl ThreadStore {
        })
    }

+    pub fn create_thread_from_serialized(
+        &mut self,
+        serialized: SerializedThread,
+        cx: &mut Context<Self>,
+    ) -> Entity<Thread> {
+        cx.new(|cx| {
+            Thread::deserialize(
+                ThreadId::new(),
+                serialized,
+                self.project.clone(),
+                self.tools.clone(),
+                self.prompt_builder.clone(),
+                self.project_context.clone(),
+                None,
+                cx,
+            )
+        })
+    }
+
    pub fn open_thread(
        &self,
        id: &ThreadId,
@@ -411,7 +430,7 @@ impl ThreadStore {
                        this.tools.clone(),
                        this.prompt_builder.clone(),
                        this.project_context.clone(),
-                        window,
+                        Some(window),
                        cx,
                    )
                })
--- a/crates/agent/src/tool_use.rs
+++ b/crates/agent/src/tool_use.rs
@@ -52,15 +52,19 @@ impl ToolUseState {
    /// Constructs a [`ToolUseState`] from the given list of [`SerializedMessage`]s.
    ///
    /// Accepts a function to filter the tools that should be used to populate the state.
+    ///
+    /// If `window` is `None` (e.g., when in headless mode or when running evals),
+    /// tool cards won't be deserialized
    pub fn from_serialized_messages(
        tools: Entity<ToolWorkingSet>,
        messages: &[SerializedMessage],
        project: Entity<Project>,
-        window: &mut Window,
+        window: Option<&mut Window>, // None in headless mode
        cx: &mut App,
    ) -> Self {
        let mut this = Self::new(tools);
        let mut tool_names_by_id = HashMap::default();
+        let mut window = window;

        for message in messages {
            match message.role {
@@ -105,12 +109,17 @@ impl ToolUseState {
                                },
                            );

-                            if let Some(tool) = this.tools.read(cx).tool(tool_use, cx) {
-                                if let Some(output) = tool_result.output.clone() {
-                                    if let Some(card) =
-                                        tool.deserialize_card(output, project.clone(), window, cx)
-                                    {
-                                        this.tool_result_cards.insert(tool_use_id, card);
+                            if let Some(window) = &mut window {
+                                if let Some(tool) = this.tools.read(cx).tool(tool_use, cx) {
+                                    if let Some(output) = tool_result.output.clone() {
+                                        if let Some(card) = tool.deserialize_card(
+                                            output,
+                                            project.clone(),
+                                            window,
+                                            cx,
+                                        ) {
+                                            this.tool_result_cards.insert(tool_use_id, card);
+                                        }
                                    }
                                }
                            }
--- 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/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,6 +2,7 @@ mod context;
 mod context_editor;
 mod context_history;
 mod context_store;
+mod patch;
 mod slash_command;
 mod slash_command_picker;

@@ -15,6 +16,7 @@ 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) {
--- a/crates/assistant_context_editor/src/context.rs
+++ b/crates/assistant_context_editor/src/context.rs
@@ -1,7 +1,8 @@
 #[cfg(test)]
 mod context_tests;

-use anyhow::{Context as _, Result, anyhow};
+use crate::patch::{AssistantEdit, AssistantPatch, AssistantPatchStatus};
+use anyhow::{Context as _, Result, anyhow, bail};
 use assistant_settings::AssistantSettings;
 use assistant_slash_command::{
    SlashCommandContent, SlashCommandEvent, SlashCommandLine, SlashCommandOutputSection,
@@ -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 {
@@ -133,7 +143,7 @@ pub enum ContextOperation {
        version: clock::Global,
    },
    UpdateSummary {
-        summary: ContextSummary,
+        summary: ContextSummaryContent,
        version: clock::Global,
    },
    SlashCommandStarted {
@@ -203,7 +213,7 @@ impl ContextOperation {
                version: language::proto::deserialize_version(&update.version),
            }),
            proto::context_operation::Variant::UpdateSummary(update) => Ok(Self::UpdateSummary {
-                summary: ContextSummary {
+                summary: ContextSummaryContent {
                    text: update.summary,
                    done: update.done,
                    timestamp: language::proto::deserialize_timestamp(
@@ -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,
    },
@@ -467,11 +481,73 @@ pub enum ContextEvent {
    Operation(ContextOperation),
 }

-#[derive(Clone, Default, Debug)]
-pub struct ContextSummary {
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub enum ContextSummary {
+    Pending,
+    Content(ContextSummaryContent),
+    Error,
+}
+
+#[derive(Default, Clone, Debug, Eq, PartialEq)]
+pub struct ContextSummaryContent {
    pub text: String,
    pub done: bool,
-    timestamp: clock::Lamport,
+    pub timestamp: clock::Lamport,
+}
+
+impl ContextSummary {
+    pub const DEFAULT: &str = "New Text Thread";
+
+    pub fn or_default(&self) -> SharedString {
+        self.unwrap_or(Self::DEFAULT)
+    }
+
+    pub fn unwrap_or(&self, message: impl Into<SharedString>) -> SharedString {
+        self.content()
+            .map_or_else(|| message.into(), |content| content.text.clone().into())
+    }
+
+    pub fn content(&self) -> Option<&ContextSummaryContent> {
+        match self {
+            ContextSummary::Content(content) => Some(content),
+            ContextSummary::Pending | ContextSummary::Error => None,
+        }
+    }
+
+    fn content_as_mut(&mut self) -> Option<&mut ContextSummaryContent> {
+        match self {
+            ContextSummary::Content(content) => Some(content),
+            ContextSummary::Pending | ContextSummary::Error => None,
+        }
+    }
+
+    fn content_or_set_empty(&mut self) -> &mut ContextSummaryContent {
+        match self {
+            ContextSummary::Content(content) => content,
+            ContextSummary::Pending | ContextSummary::Error => {
+                let content = ContextSummaryContent::default();
+                *self = ContextSummary::Content(content);
+                self.content_as_mut().unwrap()
+            }
+        }
+    }
+
+    pub fn is_pending(&self) -> bool {
+        matches!(self, ContextSummary::Pending)
+    }
+
+    fn timestamp(&self) -> Option<clock::Lamport> {
+        match self {
+            ContextSummary::Content(content) => Some(content.timestamp),
+            ContextSummary::Pending | ContextSummary::Error => None,
+        }
+    }
+}
+
+impl PartialOrd for ContextSummary {
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+        self.timestamp().partial_cmp(&other.timestamp())
+    }
 }

 #[derive(Clone, Debug, Eq, PartialEq)]
@@ -591,6 +667,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,
@@ -607,7 +703,7 @@ pub struct AssistantContext {
    message_anchors: Vec<MessageAnchor>,
    contents: Vec<Content>,
    messages_metadata: HashMap<MessageId, MessageMetadata>,
-    summary: Option<ContextSummary>,
+    summary: ContextSummary,
    summary_task: Task<Option<()>>,
    completion_count: usize,
    pending_completions: Vec<PendingCompletion>,
@@ -619,6 +715,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 +731,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 {
@@ -694,7 +804,7 @@ impl AssistantContext {
            slash_command_output_sections: Vec::new(),
            thought_process_output_sections: Vec::new(),
            edits_since_last_parse: edits_since_last_slash_command_parse,
-            summary: None,
+            summary: ContextSummary::Pending,
            summary_task: Task::ready(None),
            completion_count: Default::default(),
            pending_completions: Default::default(),
@@ -709,6 +819,8 @@ impl AssistantContext {
            project,
            language_registry,
            slash_commands,
+            patches: Vec::new(),
+            xml_tags: Vec::new(),
            prompt_builder,
        };

@@ -753,7 +865,7 @@ impl AssistantContext {
                .collect(),
            summary: self
                .summary
-                .as_ref()
+                .content()
                .map(|summary| summary.text.clone())
                .unwrap_or_default(),
            slash_command_output_sections: self
@@ -939,12 +1051,10 @@ impl AssistantContext {
                    summary: new_summary,
                    ..
                } => {
-                    if self
-                        .summary
-                        .as_ref()
-                        .map_or(true, |summary| new_summary.timestamp > summary.timestamp)
-                    {
-                        self.summary = Some(new_summary);
+                    if self.summary.timestamp().map_or(true, |current_timestamp| {
+                        new_summary.timestamp > current_timestamp
+                    }) {
+                        self.summary = ContextSummary::Content(new_summary);
                        summary_generated = true;
                    }
                }
@@ -1102,8 +1212,50 @@ impl AssistantContext {
        self.path.as_ref()
    }

-    pub fn summary(&self) -> Option<&ContextSummary> {
-        self.summary.as_ref()
+    pub fn summary(&self) -> &ContextSummary {
+        &self.summary
+    }
+
+    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] {
@@ -1185,7 +1337,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 +1483,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 +1558,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 +1584,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 +1601,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 +1698,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 +2363,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 +2382,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 +2623,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 +2704,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 +2757,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(
@@ -2576,12 +3040,12 @@ impl AssistantContext {
            return;
        };

-        if replace_old || (self.message_anchors.len() >= 2 && self.summary.is_none()) {
+        if replace_old || (self.message_anchors.len() >= 2 && self.summary.is_pending()) {
            if !model.provider.is_authenticated(cx) {
                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![
@@ -2593,17 +3057,20 @@ impl AssistantContext {

            // If there is no summary, it is set with `done: false` so that "Loading Summary…" can
            // be displayed.
-            if self.summary.is_none() {
-                self.summary = Some(ContextSummary {
-                    text: "".to_string(),
-                    done: false,
-                    timestamp: clock::Lamport::default(),
-                });
-                replace_old = true;
+            match self.summary {
+                ContextSummary::Pending | ContextSummary::Error => {
+                    self.summary = ContextSummary::Content(ContextSummaryContent {
+                        text: "".to_string(),
+                        done: false,
+                        timestamp: clock::Lamport::default(),
+                    });
+                    replace_old = true;
+                }
+                ContextSummary::Content(_) => {}
            }

            self.summary_task = cx.spawn(async move |this, cx| {
-                async move {
+                let result = async {
                    let stream = model.model.stream_completion_text(request, &cx);
                    let mut messages = stream.await?;

@@ -2614,7 +3081,7 @@ impl AssistantContext {
                        this.update(cx, |this, cx| {
                            let version = this.version.clone();
                            let timestamp = this.next_timestamp();
-                            let summary = this.summary.get_or_insert(ContextSummary::default());
+                            let summary = this.summary.content_or_set_empty();
                            if !replaced && replace_old {
                                summary.text.clear();
                                replaced = true;
@@ -2636,10 +3103,19 @@ impl AssistantContext {
                        }
                    }

+                    this.read_with(cx, |this, _cx| {
+                        if let Some(summary) = this.summary.content() {
+                            if summary.text.is_empty() {
+                                bail!("Model generated an empty summary");
+                            }
+                        }
+                        Ok(())
+                    })??;
+
                    this.update(cx, |this, cx| {
                        let version = this.version.clone();
                        let timestamp = this.next_timestamp();
-                        if let Some(summary) = this.summary.as_mut() {
+                        if let Some(summary) = this.summary.content_as_mut() {
                            summary.done = true;
                            summary.timestamp = timestamp;
                            let operation = ContextOperation::UpdateSummary {
@@ -2654,8 +3130,18 @@ impl AssistantContext {

                    anyhow::Ok(())
                }
-                .log_err()
-                .await
+                .await;
+
+                if let Err(err) = result {
+                    this.update(cx, |this, cx| {
+                        this.summary = ContextSummary::Error;
+                        cx.emit(ContextEvent::SummaryChanged);
+                    })
+                    .log_err();
+                    log::error!("Error generating context summary: {}", err);
+                }
+
+                Some(())
            });
        }
    }
@@ -2769,7 +3255,7 @@ impl AssistantContext {

            let (old_path, summary) = this.read_with(cx, |this, _| {
                let path = this.path.clone();
-                let summary = if let Some(summary) = this.summary.as_ref() {
+                let summary = if let Some(summary) = this.summary.content() {
                    if summary.done {
                        Some(summary.text.clone())
                    } else {
@@ -2823,21 +3309,30 @@ impl AssistantContext {

    pub fn set_custom_summary(&mut self, custom_summary: String, cx: &mut Context<Self>) {
        let timestamp = self.next_timestamp();
-        let summary = self.summary.get_or_insert(ContextSummary::default());
+        let summary = self.summary.content_or_set_empty();
        summary.timestamp = timestamp;
        summary.done = true;
        summary.text = custom_summary;
        cx.emit(ContextEvent::SummaryChanged);
    }
+}

-    pub const DEFAULT_SUMMARY: SharedString = SharedString::new_static("New Text Thread");
-
-    pub fn summary_or_default(&self) -> SharedString {
-        self.summary
-            .as_ref()
-            .map(|summary| summary.text.clone().into())
-            .unwrap_or(Self::DEFAULT_SUMMARY)
-    }
+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)]
@@ -3053,7 +3548,7 @@ impl SavedContext {

        let timestamp = next_timestamp.tick();
        operations.push(ContextOperation::UpdateSummary {
-            summary: ContextSummary {
+            summary: ContextSummaryContent {
                text: self.summary,
                done: true,
                timestamp,
--- a/crates/assistant_context_editor/src/context/context_tests.rs
+++ b/crates/assistant_context_editor/src/context/context_tests.rs
@@ -1,6 +1,7 @@
 use crate::{
-    AssistantContext, CacheStatus, ContextEvent, ContextId, ContextOperation,
-    InvokedSlashCommandId, MessageCacheMetadata, MessageId, MessageStatus,
+    AssistantContext, AssistantEdit, AssistantEditKind, CacheStatus, ContextEvent, ContextId,
+    ContextOperation, ContextSummary, InvokedSlashCommandId, MessageCacheMetadata, MessageId,
+    MessageStatus, RequestType,
 };
 use anyhow::Result;
 use assistant_slash_command::{
@@ -16,7 +17,10 @@ use futures::{
 };
 use gpui::{App, Entity, SharedString, Task, TestAppContext, WeakEntity, prelude::*};
 use language::{Buffer, BufferSnapshot, LanguageRegistry, LspAdapterDelegate};
-use language_model::{LanguageModelCacheConfiguration, LanguageModelRegistry, Role};
+use language_model::{
+    ConfiguredModel, LanguageModelCacheConfiguration, LanguageModelRegistry, Role,
+    fake_provider::{FakeLanguageModel, FakeLanguageModelProvider},
+};
 use parking_lot::Mutex;
 use pretty_assertions::assert_eq;
 use project::Project;
@@ -32,10 +36,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 +668,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);
@@ -1177,6 +1579,187 @@ fn test_mark_cache_anchors(cx: &mut App) {
    );
 }

+#[gpui::test]
+async fn test_summarization(cx: &mut TestAppContext) {
+    let (context, fake_model) = setup_context_editor_with_fake_model(cx);
+
+    // Initial state should be pending
+    context.read_with(cx, |context, _| {
+        assert!(matches!(context.summary(), ContextSummary::Pending));
+        assert_eq!(context.summary().or_default(), ContextSummary::DEFAULT);
+    });
+
+    let message_1 = context.read_with(cx, |context, _cx| context.message_anchors[0].clone());
+    context.update(cx, |context, cx| {
+        context
+            .insert_message_after(message_1.id, Role::Assistant, MessageStatus::Done, cx)
+            .unwrap();
+    });
+
+    // Send a message
+    context.update(cx, |context, cx| {
+        context.assist(RequestType::Chat, cx);
+    });
+
+    simulate_successful_response(&fake_model, cx);
+
+    // Should start generating summary when there are >= 2 messages
+    context.read_with(cx, |context, _| {
+        assert!(!context.summary().content().unwrap().done);
+    });
+
+    cx.run_until_parked();
+    fake_model.stream_last_completion_response("Brief".into());
+    fake_model.stream_last_completion_response(" Introduction".into());
+    fake_model.end_last_completion_stream();
+    cx.run_until_parked();
+
+    // Summary should be set
+    context.read_with(cx, |context, _| {
+        assert_eq!(context.summary().or_default(), "Brief Introduction");
+    });
+
+    // We should be able to manually set a summary
+    context.update(cx, |context, cx| {
+        context.set_custom_summary("Brief Intro".into(), cx);
+    });
+
+    context.read_with(cx, |context, _| {
+        assert_eq!(context.summary().or_default(), "Brief Intro");
+    });
+}
+
+#[gpui::test]
+async fn test_thread_summary_error_set_manually(cx: &mut TestAppContext) {
+    let (context, fake_model) = setup_context_editor_with_fake_model(cx);
+
+    test_summarize_error(&fake_model, &context, cx);
+
+    // Now we should be able to set a summary
+    context.update(cx, |context, cx| {
+        context.set_custom_summary("Brief Intro".into(), cx);
+    });
+
+    context.read_with(cx, |context, _| {
+        assert_eq!(context.summary().or_default(), "Brief Intro");
+    });
+}
+
+#[gpui::test]
+async fn test_thread_summary_error_retry(cx: &mut TestAppContext) {
+    let (context, fake_model) = setup_context_editor_with_fake_model(cx);
+
+    test_summarize_error(&fake_model, &context, cx);
+
+    // Sending another message should not trigger another summarize request
+    context.update(cx, |context, cx| {
+        context.assist(RequestType::Chat, cx);
+    });
+
+    simulate_successful_response(&fake_model, cx);
+
+    context.read_with(cx, |context, _| {
+        // State is still Error, not Generating
+        assert!(matches!(context.summary(), ContextSummary::Error));
+    });
+
+    // But the summarize request can be invoked manually
+    context.update(cx, |context, cx| {
+        context.summarize(true, cx);
+    });
+
+    context.read_with(cx, |context, _| {
+        assert!(!context.summary().content().unwrap().done);
+    });
+
+    cx.run_until_parked();
+    fake_model.stream_last_completion_response("A successful summary".into());
+    fake_model.end_last_completion_stream();
+    cx.run_until_parked();
+
+    context.read_with(cx, |context, _| {
+        assert_eq!(context.summary().or_default(), "A successful summary");
+    });
+}
+
+fn test_summarize_error(
+    model: &Arc<FakeLanguageModel>,
+    context: &Entity<AssistantContext>,
+    cx: &mut TestAppContext,
+) {
+    let message_1 = context.read_with(cx, |context, _cx| context.message_anchors[0].clone());
+    context.update(cx, |context, cx| {
+        context
+            .insert_message_after(message_1.id, Role::Assistant, MessageStatus::Done, cx)
+            .unwrap();
+    });
+
+    // Send a message
+    context.update(cx, |context, cx| {
+        context.assist(RequestType::Chat, cx);
+    });
+
+    simulate_successful_response(&model, cx);
+
+    context.read_with(cx, |context, _| {
+        assert!(!context.summary().content().unwrap().done);
+    });
+
+    // Simulate summary request ending
+    cx.run_until_parked();
+    model.end_last_completion_stream();
+    cx.run_until_parked();
+
+    // State is set to Error and default message
+    context.read_with(cx, |context, _| {
+        assert_eq!(*context.summary(), ContextSummary::Error);
+        assert_eq!(context.summary().or_default(), ContextSummary::DEFAULT);
+    });
+}
+
+fn setup_context_editor_with_fake_model(
+    cx: &mut TestAppContext,
+) -> (Entity<AssistantContext>, Arc<FakeLanguageModel>) {
+    let registry = Arc::new(LanguageRegistry::test(cx.executor().clone()));
+
+    let fake_provider = Arc::new(FakeLanguageModelProvider);
+    let fake_model = Arc::new(fake_provider.test_model());
+
+    cx.update(|cx| {
+        init_test(cx);
+        LanguageModelRegistry::global(cx).update(cx, |registry, cx| {
+            registry.set_default_model(
+                Some(ConfiguredModel {
+                    provider: fake_provider.clone(),
+                    model: fake_model.clone(),
+                }),
+                cx,
+            )
+        })
+    });
+
+    let prompt_builder = Arc::new(PromptBuilder::new(None).unwrap());
+    let context = cx.new(|cx| {
+        AssistantContext::local(
+            registry,
+            None,
+            None,
+            prompt_builder.clone(),
+            Arc::new(SlashCommandWorkingSet::default()),
+            cx,
+        )
+    });
+
+    (context, fake_model)
+}
+
+fn simulate_successful_response(fake_model: &FakeLanguageModel, cx: &mut TestAppContext) {
+    cx.run_until_parked();
+    fake_model.stream_last_completion_response("Assistant response".into());
+    fake_model.end_last_completion_stream();
+    cx.run_until_parked();
+}
+
 fn messages(context: &Entity<AssistantContext>, cx: &App) -> Vec<(MessageId, Role, Range<usize>)> {
    context
        .read(cx)
--- 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<_>>();
@@ -1860,7 +2202,124 @@ impl ContextEditor {
    }

    pub fn title(&self, cx: &App) -> SharedString {
-        self.context.read(cx).summary_or_default()
+        self.context.read(cx).summary().or_default()
+    }
+
+    pub fn regenerate_summary(&mut self, cx: &mut Context<Self>) {
+        self.context
+            .update(cx, |context, cx| context.summarize(true, cx));
+    }
+
+    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> {
@@ -1894,24 +2353,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 +2441,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 +2473,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 +2603,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 +2616,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 +3091,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 +3144,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/context_store.rs
+++ b/crates/assistant_context_editor/src/context_store.rs
@@ -648,7 +648,10 @@ impl ContextStore {
                if context.replica_id() == ReplicaId::default() {
                    Some(proto::ContextMetadata {
                        context_id: context.id().to_proto(),
-                        summary: context.summary().map(|summary| summary.text.clone()),
+                        summary: context
+                            .summary()
+                            .content()
+                            .map(|summary| summary.text.clone()),
                    })
                } else {
                    None
--- 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_tool/src/action_log.rs
+++ b/crates/assistant_tool/src/action_log.rs
@@ -49,6 +49,37 @@ impl ActionLog {
        is_created: bool,
        cx: &mut Context<Self>,
    ) -> &mut TrackedBuffer {
+        let status = if is_created {
+            if let Some(tracked) = self.tracked_buffers.remove(&buffer) {
+                match tracked.status {
+                    TrackedBufferStatus::Created {
+                        existing_file_content,
+                    } => TrackedBufferStatus::Created {
+                        existing_file_content,
+                    },
+                    TrackedBufferStatus::Modified | TrackedBufferStatus::Deleted => {
+                        TrackedBufferStatus::Created {
+                            existing_file_content: Some(tracked.diff_base),
+                        }
+                    }
+                }
+            } else if buffer
+                .read(cx)
+                .file()
+                .map_or(false, |file| file.disk_state().exists())
+            {
+                TrackedBufferStatus::Created {
+                    existing_file_content: Some(buffer.read(cx).as_rope().clone()),
+                }
+            } else {
+                TrackedBufferStatus::Created {
+                    existing_file_content: None,
+                }
+            }
+        } else {
+            TrackedBufferStatus::Modified
+        };
+
        let tracked_buffer = self
            .tracked_buffers
            .entry(buffer.clone())
@@ -60,36 +91,21 @@ impl ActionLog {
                let text_snapshot = buffer.read(cx).text_snapshot();
                let diff = cx.new(|cx| BufferDiff::new(&text_snapshot, cx));
                let (diff_update_tx, diff_update_rx) = mpsc::unbounded();
-                let base_text;
-                let status;
+                let diff_base;
                let unreviewed_changes;
                if is_created {
-                    let existing_file_content = if buffer
-                        .read(cx)
-                        .file()
-                        .map_or(false, |file| file.disk_state().exists())
-                    {
-                        Some(text_snapshot.as_rope().clone())
-                    } else {
-                        None
-                    };
-
-                    base_text = Rope::default();
-                    status = TrackedBufferStatus::Created {
-                        existing_file_content,
-                    };
+                    diff_base = Rope::default();
                    unreviewed_changes = Patch::new(vec![Edit {
                        old: 0..1,
                        new: 0..text_snapshot.max_point().row + 1,
                    }])
                } else {
-                    base_text = buffer.read(cx).as_rope().clone();
-                    status = TrackedBufferStatus::Modified;
+                    diff_base = buffer.read(cx).as_rope().clone();
                    unreviewed_changes = Patch::default();
                }
                TrackedBuffer {
                    buffer: buffer.clone(),
-                    base_text,
+                    diff_base,
                    unreviewed_changes,
                    snapshot: text_snapshot.clone(),
                    status,
@@ -184,7 +200,7 @@ impl ActionLog {
                        .context("buffer not tracked")?;

                    let rebase = cx.background_spawn({
-                        let mut base_text = tracked_buffer.base_text.clone();
+                        let mut base_text = tracked_buffer.diff_base.clone();
                        let old_snapshot = tracked_buffer.snapshot.clone();
                        let new_snapshot = buffer_snapshot.clone();
                        let unreviewed_changes = tracked_buffer.unreviewed_changes.clone();
@@ -210,7 +226,7 @@ impl ActionLog {
                    ))
                })??;

-            let (new_base_text, new_base_text_rope) = rebase.await;
+            let (new_base_text, new_diff_base) = rebase.await;
            let diff_snapshot = BufferDiff::update_diff(
                diff.clone(),
                buffer_snapshot.clone(),
@@ -229,24 +245,23 @@ impl ActionLog {
                    .background_spawn({
                        let diff_snapshot = diff_snapshot.clone();
                        let buffer_snapshot = buffer_snapshot.clone();
-                        let new_base_text_rope = new_base_text_rope.clone();
+                        let new_diff_base = new_diff_base.clone();
                        async move {
                            let mut unreviewed_changes = Patch::default();
                            for hunk in diff_snapshot.hunks_intersecting_range(
                                Anchor::MIN..Anchor::MAX,
                                &buffer_snapshot,
                            ) {
-                                let old_range = new_base_text_rope
+                                let old_range = new_diff_base
                                    .offset_to_point(hunk.diff_base_byte_range.start)
-                                    ..new_base_text_rope
-                                        .offset_to_point(hunk.diff_base_byte_range.end);
+                                    ..new_diff_base.offset_to_point(hunk.diff_base_byte_range.end);
                                let new_range = hunk.range.start..hunk.range.end;
                                unreviewed_changes.push(point_to_row_edit(
                                    Edit {
                                        old: old_range,
                                        new: new_range,
                                    },
-                                    &new_base_text_rope,
+                                    &new_diff_base,
                                    &buffer_snapshot.as_rope(),
                                ));
                            }
@@ -264,7 +279,7 @@ impl ActionLog {
                    .tracked_buffers
                    .get_mut(&buffer)
                    .context("buffer not tracked")?;
-                tracked_buffer.base_text = new_base_text_rope;
+                tracked_buffer.diff_base = new_diff_base;
                tracked_buffer.snapshot = buffer_snapshot;
                tracked_buffer.unreviewed_changes = unreviewed_changes;
                cx.notify();
@@ -283,7 +298,6 @@ impl ActionLog {
    /// Mark a buffer as edited, so we can refresh it in the context
    pub fn buffer_created(&mut self, buffer: Entity<Buffer>, cx: &mut Context<Self>) {
        self.edited_since_project_diagnostics_check = true;
-        self.tracked_buffers.remove(&buffer);
        self.track_buffer_internal(buffer.clone(), true, cx);
    }

@@ -346,11 +360,11 @@ impl ActionLog {
                        true
                    } else {
                        let old_range = tracked_buffer
-                            .base_text
+                            .diff_base
                            .point_to_offset(Point::new(edit.old.start, 0))
-                            ..tracked_buffer.base_text.point_to_offset(cmp::min(
+                            ..tracked_buffer.diff_base.point_to_offset(cmp::min(
                                Point::new(edit.old.end, 0),
-                                tracked_buffer.base_text.max_point(),
+                                tracked_buffer.diff_base.max_point(),
                            ));
                        let new_range = tracked_buffer
                            .snapshot
@@ -359,7 +373,7 @@ impl ActionLog {
                                Point::new(edit.new.end, 0),
                                tracked_buffer.snapshot.max_point(),
                            ));
-                        tracked_buffer.base_text.replace(
+                        tracked_buffer.diff_base.replace(
                            old_range,
                            &tracked_buffer
                                .snapshot
@@ -417,7 +431,7 @@ impl ActionLog {
            }
            TrackedBufferStatus::Deleted => {
                buffer.update(cx, |buffer, cx| {
-                    buffer.set_text(tracked_buffer.base_text.to_string(), cx)
+                    buffer.set_text(tracked_buffer.diff_base.to_string(), cx)
                });
                let save = self
                    .project
@@ -464,14 +478,14 @@ impl ActionLog {

                        if revert {
                            let old_range = tracked_buffer
-                                .base_text
+                                .diff_base
                                .point_to_offset(Point::new(edit.old.start, 0))
-                                ..tracked_buffer.base_text.point_to_offset(cmp::min(
+                                ..tracked_buffer.diff_base.point_to_offset(cmp::min(
                                    Point::new(edit.old.end, 0),
-                                    tracked_buffer.base_text.max_point(),
+                                    tracked_buffer.diff_base.max_point(),
                                ));
                            let old_text = tracked_buffer
-                                .base_text
+                                .diff_base
                                .chunks_in_range(old_range)
                                .collect::<String>();
                            edits_to_revert.push((new_range, old_text));
@@ -492,7 +506,7 @@ impl ActionLog {
                TrackedBufferStatus::Deleted => false,
                _ => {
                    tracked_buffer.unreviewed_changes.clear();
-                    tracked_buffer.base_text = tracked_buffer.snapshot.as_rope().clone();
+                    tracked_buffer.diff_base = tracked_buffer.snapshot.as_rope().clone();
                    tracked_buffer.schedule_diff_update(ChangeAuthor::User, cx);
                    true
                }
@@ -655,7 +669,7 @@ enum TrackedBufferStatus {

 struct TrackedBuffer {
    buffer: Entity<Buffer>,
-    base_text: Rope,
+    diff_base: Rope,
    unreviewed_changes: Patch<u32>,
    status: TrackedBufferStatus,
    version: clock::Global,
@@ -1094,6 +1108,86 @@ mod tests {
        );
    }

+    #[gpui::test(iterations = 10)]
+    async fn test_overwriting_previously_edited_files(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        let fs = FakeFs::new(cx.executor());
+        fs.insert_tree(
+            path!("/dir"),
+            json!({
+                "file1": "Lorem ipsum dolor"
+            }),
+        )
+        .await;
+        let project = Project::test(fs.clone(), [path!("/dir").as_ref()], cx).await;
+        let action_log = cx.new(|_| ActionLog::new(project.clone()));
+        let file_path = project
+            .read_with(cx, |project, cx| project.find_project_path("dir/file1", cx))
+            .unwrap();
+
+        let buffer = project
+            .update(cx, |project, cx| project.open_buffer(file_path, cx))
+            .await
+            .unwrap();
+        cx.update(|cx| {
+            action_log.update(cx, |log, cx| log.buffer_read(buffer.clone(), cx));
+            buffer.update(cx, |buffer, cx| buffer.append(" sit amet consecteur", cx));
+            action_log.update(cx, |log, cx| log.buffer_edited(buffer.clone(), cx));
+        });
+        project
+            .update(cx, |project, cx| project.save_buffer(buffer.clone(), cx))
+            .await
+            .unwrap();
+        cx.run_until_parked();
+        assert_eq!(
+            unreviewed_hunks(&action_log, cx),
+            vec![(
+                buffer.clone(),
+                vec![HunkStatus {
+                    range: Point::new(0, 0)..Point::new(0, 37),
+                    diff_status: DiffHunkStatusKind::Modified,
+                    old_text: "Lorem ipsum dolor".into(),
+                }],
+            )]
+        );
+
+        cx.update(|cx| {
+            action_log.update(cx, |log, cx| log.buffer_created(buffer.clone(), cx));
+            buffer.update(cx, |buffer, cx| buffer.set_text("rewritten", cx));
+            action_log.update(cx, |log, cx| log.buffer_edited(buffer.clone(), cx));
+        });
+        project
+            .update(cx, |project, cx| project.save_buffer(buffer.clone(), cx))
+            .await
+            .unwrap();
+        cx.run_until_parked();
+        assert_eq!(
+            unreviewed_hunks(&action_log, cx),
+            vec![(
+                buffer.clone(),
+                vec![HunkStatus {
+                    range: Point::new(0, 0)..Point::new(0, 9),
+                    diff_status: DiffHunkStatusKind::Added,
+                    old_text: "".into(),
+                }],
+            )]
+        );
+
+        action_log
+            .update(cx, |log, cx| {
+                log.reject_edits_in_ranges(buffer.clone(), vec![2..5], cx)
+            })
+            .await
+            .unwrap();
+        cx.run_until_parked();
+        assert_eq!(unreviewed_hunks(&action_log, cx), vec![]);
+        assert_eq!(
+            buffer.read_with(cx, |buffer, _cx| buffer.text()),
+            "Lorem ipsum dolor"
+        );
+    }
+
    #[gpui::test(iterations = 10)]
    async fn test_deleting_files(cx: &mut TestAppContext) {
        init_test(cx);
@@ -1601,7 +1695,7 @@ mod tests {
            cx.run_until_parked();
            action_log.update(cx, |log, cx| {
                let tracked_buffer = log.tracked_buffers.get(&buffer).unwrap();
-                let mut old_text = tracked_buffer.base_text.clone();
+                let mut old_text = tracked_buffer.diff_base.clone();
                let new_text = buffer.read(cx).as_rope();
                for edit in tracked_buffer.unreviewed_changes.edits() {
                    let old_start = old_text.point_to_offset(Point::new(edit.new.start, 0));
--- 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 edit_file_tool::{EditFileMode, 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/evals.rs
+++ b/crates/assistant_tools/src/edit_agent/evals.rs
@@ -1,5 +1,9 @@
 use super::*;
-use crate::{ReadFileToolInput, edit_file_tool::EditFileToolInput, grep_tool::GrepToolInput};
+use crate::{
+    ReadFileToolInput,
+    edit_file_tool::{EditFileMode, EditFileToolInput},
+    grep_tool::GrepToolInput,
+};
 use Role::*;
 use anyhow::anyhow;
 use assistant_tool::ToolRegistry;
@@ -71,7 +75,7 @@ fn eval_extract_handle_command_output() {
                        EditFileToolInput {
                            display_description: edit_description.into(),
                            path: input_file_path.into(),
-                            create_or_overwrite: false,
+                            mode: EditFileMode::Edit,
                        },
                    )],
                ),
@@ -127,7 +131,7 @@ fn eval_delete_run_git_blame() {
                        EditFileToolInput {
                            display_description: edit_description.into(),
                            path: input_file_path.into(),
-                            create_or_overwrite: false,
+                            mode: EditFileMode::Edit,
                        },
                    )],
                ),
@@ -182,7 +186,7 @@ fn eval_translate_doc_comments() {
                        EditFileToolInput {
                            display_description: edit_description.into(),
                            path: input_file_path.into(),
-                            create_or_overwrite: false,
+                            mode: EditFileMode::Edit,
                        },
                    )],
                ),
@@ -297,7 +301,7 @@ fn eval_use_wasi_sdk_in_compile_parser_to_wasm() {
                        EditFileToolInput {
                            display_description: edit_description.into(),
                            path: input_file_path.into(),
-                            create_or_overwrite: false,
+                            mode: EditFileMode::Edit,
                        },
                    )],
                ),
@@ -372,7 +376,7 @@ fn eval_disable_cursor_blinking() {
                        EditFileToolInput {
                            display_description: edit_description.into(),
                            path: input_file_path.into(),
-                            create_or_overwrite: false,
+                            mode: EditFileMode::Edit,
                        },
                    )],
                ),
@@ -566,7 +570,7 @@ fn eval_from_pixels_constructor() {
                        EditFileToolInput {
                            display_description: edit_description.into(),
                            path: input_file_path.into(),
-                            create_or_overwrite: false,
+                            mode: EditFileMode::Edit,
                        },
                    )],
                ),
@@ -643,7 +647,7 @@ fn eval_zode() {
                            EditFileToolInput {
                                display_description: edit_description.into(),
                                path: input_file_path.into(),
-                                create_or_overwrite: true,
+                                mode: EditFileMode::Create,
                            },
                        ),
                    ],
@@ -888,7 +892,7 @@ fn eval_add_overwrite_test() {
                            EditFileToolInput {
                                display_description: edit_description.into(),
                                path: input_file_path.into(),
-                                create_or_overwrite: false,
+                                mode: EditFileMode::Edit,
                            },
                        ),
                    ],
--- a/crates/assistant_tools/src/edit_file_tool.rs
+++ b/crates/assistant_tools/src/edit_file_tool.rs
@@ -75,12 +75,22 @@ pub struct EditFileToolInput {
    /// </example>
    pub path: PathBuf,

-    /// If true, this tool will recreate the file from scratch.
-    /// If false, this tool will produce granular edits to an existing file.
+    /// The mode of operation on the file. Possible values:
+    /// - 'edit': Make granular edits to an existing file.
+    /// - 'create': Create a new file if it doesn't exist.
+    /// - 'overwrite': Replace the entire contents of an existing file.
    ///
-    /// When a file already exists or you just created it, always prefer editing
+    /// When a file already exists or you just created it, prefer editing
    /// it as opposed to recreating it from scratch.
-    pub create_or_overwrite: bool,
+    pub mode: EditFileMode,
+}
+
+#[derive(Debug, Serialize, Deserialize, JsonSchema)]
+#[serde(rename_all = "lowercase")]
+pub enum EditFileMode {
+    Edit,
+    Create,
+    Overwrite,
 }

 #[derive(Debug, Serialize, Deserialize, JsonSchema)]
@@ -194,7 +204,11 @@ impl Tool for EditFileTool {
                    .as_ref()
                    .map_or(false, |file| file.disk_state().exists())
            })?;
-            if !input.create_or_overwrite && !exists {
+            let create_or_overwrite = match input.mode {
+                EditFileMode::Create | EditFileMode::Overwrite => true,
+                _ => false,
+            };
+            if !create_or_overwrite && !exists {
                return Err(anyhow!("{} not found", input.path.display()));
            }

@@ -206,7 +220,7 @@ impl Tool for EditFileTool {
                })
                .await;

-            let (output, mut events) = if input.create_or_overwrite {
+            let (output, mut events) = if create_or_overwrite {
                edit_agent.overwrite(
                    buffer.clone(),
                    input.display_description.clone(),
@@ -362,9 +376,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);
@@ -872,7 +886,7 @@ mod tests {
                let input = serde_json::to_value(EditFileToolInput {
                    display_description: "Some edit".into(),
                    path: "root/nonexistent_file.txt".into(),
-                    create_or_overwrite: false,
+                    mode: EditFileMode::Edit,
                })
                .unwrap();
                Arc::new(EditFileTool)
--- a/crates/bedrock/src/models.rs
+++ b/crates/bedrock/src/models.rs
@@ -38,6 +38,7 @@ pub enum Model {
    AmazonNovaLite,
    AmazonNovaMicro,
    AmazonNovaPro,
+    AmazonNovaPremier,
    // AI21 models
    AI21J2GrandeInstruct,
    AI21J2JumboInstruct,
@@ -72,6 +73,10 @@ pub enum Model {
    MistralMixtral8x7BInstructV0,
    MistralMistralLarge2402V1,
    MistralMistralSmall2402V1,
+    MistralPixtralLarge2502V1,
+    // Writer models
+    PalmyraWriterX5,
+    PalmyraWriterX4,
    #[serde(rename = "custom")]
    Custom {
        name: String,
@@ -120,6 +125,7 @@ impl Model {
            Model::AmazonNovaLite => "amazon.nova-lite-v1:0",
            Model::AmazonNovaMicro => "amazon.nova-micro-v1:0",
            Model::AmazonNovaPro => "amazon.nova-pro-v1:0",
+            Model::AmazonNovaPremier => "amazon.nova-premier-v1:0",
            Model::DeepSeekR1 => "us.deepseek.r1-v1:0",
            Model::AI21J2GrandeInstruct => "ai21.j2-grande-instruct",
            Model::AI21J2JumboInstruct => "ai21.j2-jumbo-instruct",
@@ -149,6 +155,9 @@ impl Model {
            Model::MistralMixtral8x7BInstructV0 => "mistral.mixtral-8x7b-instruct-v0:1",
            Model::MistralMistralLarge2402V1 => "mistral.mistral-large-2402-v1:0",
            Model::MistralMistralSmall2402V1 => "mistral.mistral-small-2402-v1:0",
+            Model::MistralPixtralLarge2502V1 => "mistral.pixtral-large-2502-v1:0",
+            Model::PalmyraWriterX4 => "writer.palmyra-x4-v1:0",
+            Model::PalmyraWriterX5 => "writer.palmyra-x5-v1:0",
            Self::Custom { name, .. } => name,
        }
    }
@@ -166,6 +175,7 @@ impl Model {
            Self::AmazonNovaLite => "Amazon Nova Lite",
            Self::AmazonNovaMicro => "Amazon Nova Micro",
            Self::AmazonNovaPro => "Amazon Nova Pro",
+            Self::AmazonNovaPremier => "Amazon Nova Premier",
            Self::DeepSeekR1 => "DeepSeek R1",
            Self::AI21J2GrandeInstruct => "AI21 Jurassic2 Grande Instruct",
            Self::AI21J2JumboInstruct => "AI21 Jurassic2 Jumbo Instruct",
@@ -195,6 +205,9 @@ impl Model {
            Self::MistralMixtral8x7BInstructV0 => "Mistral Mixtral 8x7B Instruct V0",
            Self::MistralMistralLarge2402V1 => "Mistral Large 2402 V1",
            Self::MistralMistralSmall2402V1 => "Mistral Small 2402 V1",
+            Self::MistralPixtralLarge2502V1 => "Pixtral Large 25.02 V1",
+            Self::PalmyraWriterX5 => "Writer Palmyra X5",
+            Self::PalmyraWriterX4 => "Writer Palmyra X4",
            Self::Custom {
                display_name, name, ..
            } => display_name.as_deref().unwrap_or(name),
@@ -208,8 +221,11 @@ impl Model {
            | Self::Claude3Sonnet
            | Self::Claude3_5Haiku
            | Self::Claude3_7Sonnet => 200_000,
+            Self::AmazonNovaPremier => 1_000_000,
+            Self::PalmyraWriterX5 => 1_000_000,
+            Self::PalmyraWriterX4 => 128_000,
            Self::Custom { max_tokens, .. } => *max_tokens,
-            _ => 200_000,
+            _ => 128_000,
        }
    }

@@ -217,7 +233,7 @@ impl Model {
        match self {
            Self::Claude3Opus | Self::Claude3Sonnet | Self::Claude3_5Haiku => 4_096,
            Self::Claude3_7Sonnet | Self::Claude3_7SonnetThinking => 128_000,
-            Self::Claude3_5SonnetV2 => 8_192,
+            Self::Claude3_5SonnetV2 | Self::PalmyraWriterX4 | Self::PalmyraWriterX5 => 8_192,
            Self::Custom {
                max_output_tokens, ..
            } => max_output_tokens.unwrap_or(4_096),
@@ -252,7 +268,10 @@ impl Model {
            | Self::Claude3_5Haiku => true,

            // Amazon Nova models (all support tool use)
-            Self::AmazonNovaPro | Self::AmazonNovaLite | Self::AmazonNovaMicro => true,
+            Self::AmazonNovaPremier
+            | Self::AmazonNovaPro
+            | Self::AmazonNovaLite
+            | Self::AmazonNovaMicro => true,

            // AI21 Jamba 1.5 models support tool use
            Self::AI21Jamba15LargeV1 | Self::AI21Jamba15MiniV1 => true,
@@ -305,8 +324,11 @@ impl Model {

            // Models available only in US
            (Model::Claude3Opus, "us")
+            | (Model::Claude3_5Haiku, "us")
            | (Model::Claude3_7Sonnet, "us")
-            | (Model::Claude3_7SonnetThinking, "us") => {
+            | (Model::Claude3_7SonnetThinking, "us")
+            | (Model::AmazonNovaPremier, "us")
+            | (Model::MistralPixtralLarge2502V1, "us") => {
                Ok(format!("{}.{}", region_group, model_id))
            }

@@ -340,6 +362,12 @@ impl Model {
                Ok(format!("{}.{}", region_group, model_id))
            }

+            // Writer models only available in the US
+            (Model::PalmyraWriterX4, "us") | (Model::PalmyraWriterX5, "us") => {
+                // They have some goofiness
+                Ok(format!("{}.{}", region_group, model_id))
+            }
+
            // Any other combination is not supported
            _ => Ok(self.id().into()),
        }
--- 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
@@ -646,20 +646,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()
                                        }
--- 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/Cargo.toml
+++ b/crates/copilot/Cargo.toml
@@ -14,7 +14,6 @@ doctest = false

 [features]
 default = []
-schemars = ["dep:schemars"]
 test-support = [
    "collections/test-support",
    "gpui/test-support",
@@ -43,16 +42,15 @@ node_runtime.workspace = true
 parking_lot.workspace = true
 paths.workspace = true
 project.workspace = true
-schemars = { workspace = true, optional = true }
 serde.workspace = true
 serde_json.workspace = true
 settings.workspace = true
-strum.workspace = true
 task.workspace = true
 ui.workspace = true
 util.workspace = true
 workspace.workspace = true
 workspace-hack.workspace = true
+itertools.workspace = true

 [target.'cfg(windows)'.dependencies]
 async-std = { version = "1.12.0", features = ["unstable"] }
--- a/crates/copilot/src/copilot.rs
+++ b/crates/copilot/src/copilot.rs
@@ -5,7 +5,7 @@ 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};
@@ -531,15 +531,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))
        };
@@ -585,9 +581,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 +609,7 @@ impl Copilot {
                                                    user_code: flow.user_code,
                                                },
                                            )
-                                            .await
-                                            .into_response()
-                                            .context("copilot: sign in confirm")?;
+                                            .await?;
                                        Ok(response)
                                    }
                                }
@@ -664,9 +656,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(())
                })
            }
@@ -883,10 +873,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 +897,7 @@ impl Copilot {
                        .collect(),
                });
        cx.background_spawn(async move {
-            request
-                .await
-                .into_response()
-                .context("copilot: notify rejected")?;
+            request.await?;
            Ok(())
        })
    }
@@ -973,9 +957,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/copilot_chat.rs
+++ b/crates/copilot/src/copilot_chat.rs
@@ -9,13 +9,20 @@ use fs::Fs;
 use futures::{AsyncBufReadExt, AsyncReadExt, StreamExt, io::BufReader, stream::BoxStream};
 use gpui::{App, AsyncApp, Global, prelude::*};
 use http_client::{AsyncBody, HttpClient, Method, Request as HttpRequest};
+use itertools::Itertools;
 use paths::home_dir;
 use serde::{Deserialize, Serialize};
 use settings::watch_config_dir;
-use strum::EnumIter;

 pub const COPILOT_CHAT_COMPLETION_URL: &str = "https://api.githubcopilot.com/chat/completions";
 pub const COPILOT_CHAT_AUTH_URL: &str = "https://api.github.com/copilot_internal/v2/token";
+pub const COPILOT_CHAT_MODELS_URL: &str = "https://api.githubcopilot.com/models";
+
+// Copilot's base model; defined by Microsoft in premium requests table
+// This will be moved to the front of the Copilot model list, and will be used for
+// 'fast' requests (e.g. title generation)
+// https://docs.github.com/en/copilot/managing-copilot/monitoring-usage-and-entitlements/about-premium-requests
+const DEFAULT_MODEL_ID: &str = "gpt-4.1";

 #[derive(Clone, Copy, Serialize, Deserialize, Debug, Eq, PartialEq)]
 #[serde(rename_all = "lowercase")]
@@ -25,132 +32,130 @@ pub enum Role {
    System,
 }

-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
-#[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq, EnumIter)]
-pub enum Model {
-    #[default]
-    #[serde(alias = "gpt-4o", rename = "gpt-4o-2024-05-13")]
-    Gpt4o,
-    #[serde(alias = "gpt-4", rename = "gpt-4")]
-    Gpt4,
-    #[serde(alias = "gpt-4.1", rename = "gpt-4.1")]
-    Gpt4_1,
-    #[serde(alias = "gpt-3.5-turbo", rename = "gpt-3.5-turbo")]
-    Gpt3_5Turbo,
-    #[serde(alias = "o1", rename = "o1")]
-    O1,
-    #[serde(alias = "o1-mini", rename = "o3-mini")]
-    O3Mini,
-    #[serde(alias = "o3", rename = "o3")]
-    O3,
-    #[serde(alias = "o4-mini", rename = "o4-mini")]
-    O4Mini,
-    #[serde(alias = "claude-3-5-sonnet", rename = "claude-3.5-sonnet")]
-    Claude3_5Sonnet,
-    #[serde(alias = "claude-3-7-sonnet", rename = "claude-3.7-sonnet")]
-    Claude3_7Sonnet,
-    #[serde(
-        alias = "claude-3.7-sonnet-thought",
-        rename = "claude-3.7-sonnet-thought"
-    )]
-    Claude3_7SonnetThinking,
-    #[serde(alias = "gemini-2.0-flash", rename = "gemini-2.0-flash-001")]
-    Gemini20Flash,
-    #[serde(alias = "gemini-2.5-pro", rename = "gemini-2.5-pro")]
-    Gemini25Pro,
+#[derive(Deserialize)]
+struct ModelSchema {
+    #[serde(deserialize_with = "deserialize_models_skip_errors")]
+    data: Vec<Model>,
+}
+
+fn deserialize_models_skip_errors<'de, D>(deserializer: D) -> Result<Vec<Model>, D::Error>
+where
+    D: serde::Deserializer<'de>,
+{
+    let raw_values = Vec::<serde_json::Value>::deserialize(deserializer)?;
+    let models = raw_values
+        .into_iter()
+        .filter_map(|value| match serde_json::from_value::<Model>(value) {
+            Ok(model) => Some(model),
+            Err(err) => {
+                log::warn!("GitHub Copilot Chat model failed to deserialize: {:?}", err);
+                None
+            }
+        })
+        .collect();
+
+    Ok(models)
+}
+
+#[derive(Clone, Serialize, Deserialize, Debug, Eq, PartialEq)]
+pub struct Model {
+    capabilities: ModelCapabilities,
+    id: String,
+    name: String,
+    policy: Option<ModelPolicy>,
+    vendor: ModelVendor,
+    model_picker_enabled: bool,
+}
+
+#[derive(Clone, Serialize, Deserialize, Debug, Eq, PartialEq)]
+struct ModelCapabilities {
+    family: String,
+    #[serde(default)]
+    limits: ModelLimits,
+    supports: ModelSupportedFeatures,
+}
+
+#[derive(Default, Clone, Serialize, Deserialize, Debug, Eq, PartialEq)]
+struct ModelLimits {
+    #[serde(default)]
+    max_context_window_tokens: usize,
+    #[serde(default)]
+    max_output_tokens: usize,
+    #[serde(default)]
+    max_prompt_tokens: usize,
+}
+
+#[derive(Clone, Serialize, Deserialize, Debug, Eq, PartialEq)]
+struct ModelPolicy {
+    state: String,
+}
+
+#[derive(Clone, Serialize, Deserialize, Debug, Eq, PartialEq)]
+struct ModelSupportedFeatures {
+    #[serde(default)]
+    streaming: bool,
+    #[serde(default)]
+    tool_calls: bool,
+    #[serde(default)]
+    parallel_tool_calls: bool,
+    #[serde(default)]
+    vision: bool,
+}
+
+#[derive(Clone, Copy, Serialize, Deserialize, Debug, Eq, PartialEq)]
+pub enum ModelVendor {
+    // Azure OpenAI should have no functional difference from OpenAI in Copilot Chat
+    #[serde(alias = "Azure OpenAI")]
+    OpenAI,
+    Google,
+    Anthropic,
+}
+
+#[derive(Serialize, Deserialize, Debug, Eq, PartialEq, Clone)]
+#[serde(tag = "type")]
+pub enum ChatMessageContent {
+    #[serde(rename = "text")]
+    Text { text: String },
+    #[serde(rename = "image_url")]
+    Image { image_url: ImageUrl },
+}
+
+#[derive(Serialize, Deserialize, Debug, Eq, PartialEq, Clone)]
+pub struct ImageUrl {
+    pub url: String,
 }

 impl Model {
-    pub fn default_fast() -> Self {
-        Self::Claude3_7Sonnet
-    }
-
    pub fn uses_streaming(&self) -> bool {
-        match self {
-            Self::Gpt4o
-            | Self::Gpt4
-            | Self::Gpt4_1
-            | Self::Gpt3_5Turbo
-            | Self::O3
-            | Self::O4Mini
-            | Self::Claude3_5Sonnet
-            | Self::Claude3_7Sonnet
-            | Self::Claude3_7SonnetThinking => true,
-            Self::O3Mini | Self::O1 | Self::Gemini20Flash | Self::Gemini25Pro => false,
-        }
+        self.capabilities.supports.streaming
    }

-    pub fn from_id(id: &str) -> Result<Self> {
-        match id {
-            "gpt-4o" => Ok(Self::Gpt4o),
-            "gpt-4" => Ok(Self::Gpt4),
-            "gpt-4.1" => Ok(Self::Gpt4_1),
-            "gpt-3.5-turbo" => Ok(Self::Gpt3_5Turbo),
-            "o1" => Ok(Self::O1),
-            "o3-mini" => Ok(Self::O3Mini),
-            "o3" => Ok(Self::O3),
-            "o4-mini" => Ok(Self::O4Mini),
-            "claude-3-5-sonnet" => Ok(Self::Claude3_5Sonnet),
-            "claude-3-7-sonnet" => Ok(Self::Claude3_7Sonnet),
-            "claude-3.7-sonnet-thought" => Ok(Self::Claude3_7SonnetThinking),
-            "gemini-2.0-flash-001" => Ok(Self::Gemini20Flash),
-            "gemini-2.5-pro" => Ok(Self::Gemini25Pro),
-            _ => Err(anyhow!("Invalid model id: {}", id)),
-        }
+    pub fn id(&self) -> &str {
+        self.id.as_str()
    }

-    pub fn id(&self) -> &'static str {
-        match self {
-            Self::Gpt3_5Turbo => "gpt-3.5-turbo",
-            Self::Gpt4 => "gpt-4",
-            Self::Gpt4_1 => "gpt-4.1",
-            Self::Gpt4o => "gpt-4o",
-            Self::O3Mini => "o3-mini",
-            Self::O1 => "o1",
-            Self::O3 => "o3",
-            Self::O4Mini => "o4-mini",
-            Self::Claude3_5Sonnet => "claude-3-5-sonnet",
-            Self::Claude3_7Sonnet => "claude-3-7-sonnet",
-            Self::Claude3_7SonnetThinking => "claude-3.7-sonnet-thought",
-            Self::Gemini20Flash => "gemini-2.0-flash-001",
-            Self::Gemini25Pro => "gemini-2.5-pro",
-        }
-    }
-
-    pub fn display_name(&self) -> &'static str {
-        match self {
-            Self::Gpt3_5Turbo => "GPT-3.5",
-            Self::Gpt4 => "GPT-4",
-            Self::Gpt4_1 => "GPT-4.1",
-            Self::Gpt4o => "GPT-4o",
-            Self::O3Mini => "o3-mini",
-            Self::O1 => "o1",
-            Self::O3 => "o3",
-            Self::O4Mini => "o4-mini",
-            Self::Claude3_5Sonnet => "Claude 3.5 Sonnet",
-            Self::Claude3_7Sonnet => "Claude 3.7 Sonnet",
-            Self::Claude3_7SonnetThinking => "Claude 3.7 Sonnet Thinking",
-            Self::Gemini20Flash => "Gemini 2.0 Flash",
-            Self::Gemini25Pro => "Gemini 2.5 Pro",
-        }
+    pub fn display_name(&self) -> &str {
+        self.name.as_str()
    }

    pub fn max_token_count(&self) -> usize {
-        match self {
-            Self::Gpt4o => 64_000,
-            Self::Gpt4 => 32_768,
-            Self::Gpt4_1 => 128_000,
-            Self::Gpt3_5Turbo => 12_288,
-            Self::O3Mini => 64_000,
-            Self::O1 => 20_000,
-            Self::O3 => 128_000,
-            Self::O4Mini => 128_000,
-            Self::Claude3_5Sonnet => 200_000,
-            Self::Claude3_7Sonnet => 90_000,
-            Self::Claude3_7SonnetThinking => 90_000,
-            Self::Gemini20Flash => 128_000,
-            Self::Gemini25Pro => 128_000,
-        }
+        self.capabilities.limits.max_prompt_tokens
+    }
+
+    pub fn supports_tools(&self) -> bool {
+        self.capabilities.supports.tool_calls
+    }
+
+    pub fn vendor(&self) -> ModelVendor {
+        self.vendor
+    }
+
+    pub fn supports_vision(&self) -> bool {
+        self.capabilities.supports.vision
+    }
+
+    pub fn supports_parallel_tool_calls(&self) -> bool {
+        self.capabilities.supports.parallel_tool_calls
    }
 }

@@ -160,7 +165,7 @@ pub struct Request {
    pub n: usize,
    pub stream: bool,
    pub temperature: f32,
-    pub model: Model,
+    pub model: String,
    pub messages: Vec<ChatMessage>,
    #[serde(default, skip_serializing_if = "Vec::is_empty")]
    pub tools: Vec<Tool>,
@@ -198,7 +203,7 @@ pub enum ChatMessage {
        tool_calls: Vec<ToolCall>,
    },
    User {
-        content: String,
+        content: Vec<ChatMessageContent>,
    },
    System {
        content: String,
@@ -306,6 +311,7 @@ impl Global for GlobalCopilotChat {}
 pub struct CopilotChat {
    oauth_token: Option<String>,
    api_token: Option<ApiToken>,
+    models: Option<Vec<Model>>,
    client: Arc<dyn HttpClient>,
 }

@@ -342,31 +348,56 @@ impl CopilotChat {
        let config_paths: HashSet<PathBuf> = copilot_chat_config_paths().into_iter().collect();
        let dir_path = copilot_chat_config_dir();

-        cx.spawn(async move |cx| {
-            let mut parent_watch_rx = watch_config_dir(
-                cx.background_executor(),
-                fs.clone(),
-                dir_path.clone(),
-                config_paths,
-            );
-            while let Some(contents) = parent_watch_rx.next().await {
-                let oauth_token = extract_oauth_token(contents);
-                cx.update(|cx| {
-                    if let Some(this) = Self::global(cx).as_ref() {
-                        this.update(cx, |this, cx| {
-                            this.oauth_token = oauth_token;
-                            cx.notify();
-                        });
+        cx.spawn({
+            let client = client.clone();
+            async move |cx| {
+                let mut parent_watch_rx = watch_config_dir(
+                    cx.background_executor(),
+                    fs.clone(),
+                    dir_path.clone(),
+                    config_paths,
+                );
+                while let Some(contents) = parent_watch_rx.next().await {
+                    let oauth_token = extract_oauth_token(contents);
+                    cx.update(|cx| {
+                        if let Some(this) = Self::global(cx).as_ref() {
+                            this.update(cx, |this, cx| {
+                                this.oauth_token = oauth_token.clone();
+                                cx.notify();
+                            });
+                        }
+                    })?;
+
+                    if let Some(ref oauth_token) = oauth_token {
+                        let api_token = request_api_token(oauth_token, client.clone()).await?;
+                        cx.update(|cx| {
+                            if let Some(this) = Self::global(cx).as_ref() {
+                                this.update(cx, |this, cx| {
+                                    this.api_token = Some(api_token.clone());
+                                    cx.notify();
+                                });
+                            }
+                        })?;
+                        let models = get_models(api_token.api_key, client.clone()).await?;
+                        cx.update(|cx| {
+                            if let Some(this) = Self::global(cx).as_ref() {
+                                this.update(cx, |this, cx| {
+                                    this.models = Some(models);
+                                    cx.notify();
+                                });
+                            }
+                        })?;
                    }
-                })?;
+                }
+                anyhow::Ok(())
            }
-            anyhow::Ok(())
        })
        .detach_and_log_err(cx);

        Self {
            oauth_token: None,
            api_token: None,
+            models: None,
            client,
        }
    }
@@ -375,6 +406,10 @@ impl CopilotChat {
        self.oauth_token.is_some()
    }

+    pub fn models(&self) -> Option<&[Model]> {
+        self.models.as_deref()
+    }
+
    pub async fn stream_completion(
        request: Request,
        mut cx: AsyncApp,
@@ -409,6 +444,61 @@ impl CopilotChat {
    }
 }

+async fn get_models(api_token: String, client: Arc<dyn HttpClient>) -> Result<Vec<Model>> {
+    let all_models = request_models(api_token, client).await?;
+
+    let mut models: Vec<Model> = all_models
+        .into_iter()
+        .filter(|model| {
+            // Ensure user has access to the model; Policy is present only for models that must be
+            // enabled in the GitHub dashboard
+            model.model_picker_enabled
+                && model
+                    .policy
+                    .as_ref()
+                    .is_none_or(|policy| policy.state == "enabled")
+        })
+        // The first model from the API response, in any given family, appear to be the non-tagged
+        // models, which are likely the best choice (e.g. gpt-4o rather than gpt-4o-2024-11-20)
+        .dedup_by(|a, b| a.capabilities.family == b.capabilities.family)
+        .collect();
+
+    if let Some(default_model_position) =
+        models.iter().position(|model| model.id == DEFAULT_MODEL_ID)
+    {
+        let default_model = models.remove(default_model_position);
+        models.insert(0, default_model);
+    }
+
+    Ok(models)
+}
+
+async fn request_models(api_token: String, client: Arc<dyn HttpClient>) -> Result<Vec<Model>> {
+    let request_builder = HttpRequest::builder()
+        .method(Method::GET)
+        .uri(COPILOT_CHAT_MODELS_URL)
+        .header("Authorization", format!("Bearer {}", api_token))
+        .header("Content-Type", "application/json")
+        .header("Copilot-Integration-Id", "vscode-chat");
+
+    let request = request_builder.body(AsyncBody::empty())?;
+
+    let mut response = client.send(request).await?;
+
+    if response.status().is_success() {
+        let mut body = Vec::new();
+        response.body_mut().read_to_end(&mut body).await?;
+
+        let body_str = std::str::from_utf8(&body)?;
+
+        let models = serde_json::from_str::<ModelSchema>(body_str)?.data;
+
+        Ok(models)
+    } else {
+        Err(anyhow!("Failed to request models: {}", response.status()))
+    }
+}
+
 async fn request_api_token(oauth_token: &str, client: Arc<dyn HttpClient>) -> Result<ApiToken> {
    let request_builder = HttpRequest::builder()
        .method(Method::GET)
@@ -472,7 +562,8 @@ async fn stream_completion(
        )
        .header("Authorization", format!("Bearer {}", api_key))
        .header("Content-Type", "application/json")
-        .header("Copilot-Integration-Id", "vscode-chat");
+        .header("Copilot-Integration-Id", "vscode-chat")
+        .header("Copilot-Vision-Request", "true");

    let is_streaming = request.stream;

@@ -527,3 +618,82 @@ async fn stream_completion(
        Ok(futures::stream::once(async move { Ok(response) }).boxed())
    }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_resilient_model_schema_deserialize() {
+        let json = r#"{
+              "data": [
+                {
+                  "capabilities": {
+                    "family": "gpt-4",
+                    "limits": {
+                      "max_context_window_tokens": 32768,
+                      "max_output_tokens": 4096,
+                      "max_prompt_tokens": 32768
+                    },
+                    "object": "model_capabilities",
+                    "supports": { "streaming": true, "tool_calls": true },
+                    "tokenizer": "cl100k_base",
+                    "type": "chat"
+                  },
+                  "id": "gpt-4",
+                  "model_picker_enabled": false,
+                  "name": "GPT 4",
+                  "object": "model",
+                  "preview": false,
+                  "vendor": "Azure OpenAI",
+                  "version": "gpt-4-0613"
+                },
+                {
+                    "some-unknown-field": 123
+                },
+                {
+                  "capabilities": {
+                    "family": "claude-3.7-sonnet",
+                    "limits": {
+                      "max_context_window_tokens": 200000,
+                      "max_output_tokens": 16384,
+                      "max_prompt_tokens": 90000,
+                      "vision": {
+                        "max_prompt_image_size": 3145728,
+                        "max_prompt_images": 1,
+                        "supported_media_types": ["image/jpeg", "image/png", "image/webp"]
+                      }
+                    },
+                    "object": "model_capabilities",
+                    "supports": {
+                      "parallel_tool_calls": true,
+                      "streaming": true,
+                      "tool_calls": true,
+                      "vision": true
+                    },
+                    "tokenizer": "o200k_base",
+                    "type": "chat"
+                  },
+                  "id": "claude-3.7-sonnet",
+                  "model_picker_enabled": true,
+                  "name": "Claude 3.7 Sonnet",
+                  "object": "model",
+                  "policy": {
+                    "state": "enabled",
+                    "terms": "Enable access to the latest Claude 3.7 Sonnet model from Anthropic. [Learn more about how GitHub Copilot serves Claude 3.7 Sonnet](https://docs.github.com/copilot/using-github-copilot/using-claude-sonnet-in-github-copilot)."
+                  },
+                  "preview": false,
+                  "vendor": "Anthropic",
+                  "version": "claude-3.7-sonnet"
+                }
+              ],
+              "object": "list"
+            }"#;
+
+        let schema: ModelSchema = serde_json::from_str(&json).unwrap();
+
+        assert_eq!(schema.data.len(), 2);
+        assert_eq!(schema.data[0].id, "gpt-4");
+        assert_eq!(schema.data[1].id, "claude-3.7-sonnet");
+    }
+}
--- 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/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/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
--- a/crates/editor/src/inlay_hint_cache.rs
+++ b/crates/editor/src/inlay_hint_cache.rs
@@ -1409,7 +1409,6 @@ pub mod tests {
        fake_server
            .request::<lsp::request::InlayHintRefreshRequest>(())
            .await
-            .into_response()
            .expect("inlay refresh request failed");
        cx.executor().run_until_parked();
        editor
@@ -1493,7 +1492,6 @@ pub mod tests {
                token: lsp::ProgressToken::String(progress_token.to_string()),
            })
            .await
-            .into_response()
            .expect("work done progress create request failed");
        cx.executor().run_until_parked();
        fake_server.notify::<lsp::notification::Progress>(&lsp::ProgressParams {
@@ -1865,7 +1863,6 @@ pub mod tests {
        fake_server
            .request::<lsp::request::InlayHintRefreshRequest>(())
            .await
-            .into_response()
            .expect("inlay refresh request failed");
        cx.executor().run_until_parked();
        editor
@@ -2011,7 +2008,6 @@ pub mod tests {
        fake_server
            .request::<lsp::request::InlayHintRefreshRequest>(())
            .await
-            .into_response()
            .expect("inlay refresh request failed");
        cx.executor().run_until_parked();
        editor
@@ -2074,7 +2070,6 @@ pub mod tests {
        fake_server
            .request::<lsp::request::InlayHintRefreshRequest>(())
            .await
-            .into_response()
            .expect("inlay refresh request failed");
        cx.executor().run_until_parked();
        editor
--- a/crates/editor/src/items.rs
+++ b/crates/editor/src/items.rs
@@ -1225,9 +1225,6 @@ impl SerializableItem for Editor {
        window: &mut Window,
        cx: &mut Context<Self>,
    ) -> Option<Task<Result<()>>> {
-        if self.mode.is_minimap() {
-            return None;
-        }
        let mut serialize_dirty_buffers = self.serialize_dirty_buffers;

        let project = self.project.clone()?;
@@ -1385,7 +1382,7 @@ impl Editor {
        cx: &mut Context<Self>,
        write: impl for<'a> FnOnce(&'a mut RestorationData) + 'static,
    ) {
-        if self.mode.is_minimap() || !WorkspaceSettings::get(None, cx).restore_on_file_reopen {
+        if !WorkspaceSettings::get(None, cx).restore_on_file_reopen {
            return;
        }

--- a/crates/editor/src/movement.rs
+++ b/crates/editor/src/movement.rs
@@ -772,7 +772,7 @@ mod tests {
    };
    use gpui::{AppContext as _, font, px};
    use language::Capability;
-    use project::{Project, project_settings::DiagnosticSeverity};
+    use project::Project;
    use settings::SettingsStore;
    use util::post_inc;

@@ -896,7 +896,6 @@ mod tests {
                1,
                1,
                FoldPlaceholder::test(),
-                DiagnosticSeverity::Warning,
                cx,
            )
        });
@@ -1106,7 +1105,6 @@ mod tests {
                    0,
                    1,
                    FoldPlaceholder::test(),
-                    DiagnosticSeverity::Warning,
                    cx,
                )
            });
--- a/Show More
+++ b/Show More