agent: Add action to close agent panel

Adds an action to close the Agent panel, as well as binds it to cmd-w when focused on the panel.
search: Ensure inputs located in the toolbar match the background color of the toolbar (#30355 )
2025-05-09 12:00:16 +02:00 · 2025-05-09 12:47:26 +03:00 · 2025-05-09 09:24:28 +00:00 · 2025-05-09 14:52:52 +05:30 · 2025-05-09 11:40:12 +03:00 · 2025-05-09 07:33:20 +00:00
272 changed files with 8787 additions and 37246 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -56,6 +56,7 @@ dependencies = [
 "assistant_context_editor",
 "assistant_settings",
 "assistant_slash_command",
+ "assistant_slash_commands",
 "assistant_tool",
 "async-watch",
 "buffer_diff",
@@ -78,6 +79,7 @@ dependencies = [
 "heed",
 "html_to_markdown",
 "http_client",
+ "indexed_docs",
 "indoc",
 "itertools 0.14.0",
 "jsonschema",
@@ -470,68 +472,6 @@ dependencies = [
 "workspace-hack",
 ]

-[[package]]
-name = "assistant"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "assistant_context_editor",
- "assistant_settings",
- "assistant_slash_command",
- "assistant_slash_commands",
- "assistant_tool",
- "async-watch",
- "client",
- "collections",
- "command_palette_hooks",
- "ctor",
- "db",
- "editor",
- "env_logger 0.11.8",
- "feature_flags",
- "fs",
- "futures 0.3.31",
- "gpui",
- "indexed_docs",
- "indoc",
- "language",
- "language_model",
- "language_model_selector",
- "languages",
- "log",
- "lsp",
- "menu",
- "multi_buffer",
- "parking_lot",
- "pretty_assertions",
- "project",
- "prompt_store",
- "proto",
- "rand 0.8.5",
- "rope",
- "rules_library",
- "schemars",
- "search",
- "serde",
- "serde_json_lenient",
- "settings",
- "smol",
- "streaming_diff",
- "telemetry",
- "telemetry_events",
- "terminal",
- "terminal_view",
- "text",
- "theme",
- "tree-sitter-md",
- "ui",
- "unindent",
- "util",
- "workspace",
- "workspace-hack",
- "zed_actions",
-]
-
 [[package]]
 name = "assistant_context_editor"
 version = "0.1.0"
@@ -573,7 +513,6 @@ dependencies = [
 "settings",
 "smallvec",
 "smol",
- "strum 0.27.1",
 "telemetry_events",
 "text",
 "theme",
@@ -737,6 +676,7 @@ dependencies = [
 "language_models",
 "linkme",
 "log",
+ "markdown",
 "open",
 "paths",
 "portable-pty",
@@ -1330,9 +1270,9 @@ dependencies = [

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

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

 [[package]]
 name = "block2"
-version = "0.5.1"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f"
+checksum = "340d2f0bdb2a43c1d3cd40513185b2bd7def0aa1052f956455114bc98f82dcf2"
 dependencies = [
 "objc2",
 ]
@@ -3002,7 +2943,6 @@ name = "collab"
 version = "0.44.0"
 dependencies = [
 "anyhow",
- "assistant",
 "assistant_context_editor",
 "assistant_settings",
 "assistant_slash_command",
@@ -4068,7 +4008,6 @@ dependencies = [
 "http_client",
 "language",
 "log",
- "lsp-types",
 "node_runtime",
 "parking_lot",
 "paths",
@@ -4104,7 +4043,6 @@ dependencies = [
 "futures 0.3.31",
 "gpui",
 "language",
- "lsp-types",
 "paths",
 "serde",
 "serde_json",
@@ -4249,6 +4187,7 @@ dependencies = [
 "collections",
 "command_palette_hooks",
 "dap",
+ "dap_adapters",
 "db",
 "debugger_tools",
 "editor",
@@ -4261,6 +4200,7 @@ dependencies = [
 "log",
 "menu",
 "parking_lot",
+ "paths",
 "picker",
 "pretty_assertions",
 "project",
@@ -4518,6 +4458,16 @@ 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"
@@ -6408,6 +6358,7 @@ checksum = "459196ed295495a68f7d7fe1d84f6c4b7ff0e21fe3017b2f283c6fac3ad803c9"
 dependencies = [
 "cfg-if",
 "crunchy",
+ "num-traits",
 ]

 [[package]]
@@ -7797,6 +7748,7 @@ dependencies = [
 "tree-sitter-html",
 "tree-sitter-json",
 "tree-sitter-md",
+ "tree-sitter-python",
 "tree-sitter-ruby",
 "tree-sitter-rust",
 "tree-sitter-typescript",
@@ -7904,6 +7856,7 @@ dependencies = [
 "partial-json-fixer",
 "project",
 "proto",
+ "release_channel",
 "schemars",
 "serde",
 "serde_json",
@@ -8576,6 +8529,7 @@ version = "0.1.0"
 dependencies = [
 "anyhow",
 "assets",
+ "base64 0.22.1",
 "env_logger 0.11.8",
 "gpui",
 "language",
@@ -8964,23 +8918,27 @@ checksum = "defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03"

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

 [[package]]
@@ -9434,96 +9392,37 @@ dependencies = [
 "objc_id",
 ]

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

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

 [[package]]
-name = "objc2-cloud-kit"
-version = "0.2.2"
+name = "objc2-core-foundation"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009"
+checksum = "1c10c2894a6fed806ade6027bcd50662746363a9589d3ec9d9bef30a4e4bc166"
 dependencies = [
 "bitflags 2.9.0",
- "block2",
+ "dispatch2",
 "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]]
@@ -9534,106 +9433,53 @@ checksum = "ef25abbcd74fb2609453eb695bd2f860d389e457f67dc17cafc8b8cbc89d0c33"

 [[package]]
 name = "objc2-foundation"
-version = "0.2.2"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8"
+checksum = "900831247d2fe1a09a683278e5384cfb8c80c79fe6b166f9d14bfdde0ea1b03c"
 dependencies = [
 "bitflags 2.9.0",
- "block2",
- "libc",
 "objc2",
-]
-
-[[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",
+ "objc2-core-foundation",
 ]

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

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

-[[package]]
-name = "objc2-symbols"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a684efe3dec1b305badae1a28f6555f6ddd3bb2c2267896782858d5a78404dc"
-dependencies = [
- "objc2",
- "objc2-foundation",
-]
-
 [[package]]
 name = "objc2-ui-kit"
-version = "0.2.2"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f"
+checksum = "25b1312ad7bc8a0e92adae17aa10f90aae1fb618832f9b993b022b591027daed"
 dependencies = [
 "bitflags 2.9.0",
- "block2",
 "objc2",
- "objc2-cloud-kit",
- "objc2-core-data",
- "objc2-core-image",
- "objc2-core-location",
+ "objc2-core-foundation",
 "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]]
@@ -12012,6 +11858,8 @@ version = "0.1.0"
 dependencies = [
 "anyhow",
 "askpass",
+ "assistant_tool",
+ "assistant_tools",
 "async-watch",
 "backtrace",
 "cargo_toml",
@@ -12034,6 +11882,7 @@ dependencies = [
 "http_client",
 "language",
 "language_extension",
+ "language_model",
 "languages",
 "libc",
 "log",
@@ -18208,6 +18057,7 @@ dependencies = [
 "base64ct",
 "bigdecimal",
 "bit-set 0.8.0",
+ "bit-vec 0.8.0",
 "bitflags 2.9.0",
 "bstr",
 "bytemuck",
@@ -18219,6 +18069,7 @@ dependencies = [
 "clang-sys",
 "clap",
 "clap_builder",
+ "codespan-reporting 0.12.0",
 "concurrent-queue",
 "core-foundation 0.9.4",
 "core-foundation-sys",
@@ -18247,6 +18098,7 @@ dependencies = [
 "getrandom 0.2.15",
 "getrandom 0.3.2",
 "gimli",
+ "half",
 "handlebars 4.5.0",
 "hashbrown 0.14.5",
 "hashbrown 0.15.2",
@@ -18280,6 +18132,9 @@ dependencies = [
 "num-iter",
 "num-rational",
 "num-traits",
+ "objc2",
+ "objc2-foundation",
+ "objc2-metal",
 "object",
 "once_cell",
 "percent-encoding",
@@ -18298,6 +18153,7 @@ 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",
@@ -18701,7 +18557,6 @@ dependencies = [
 "ashpd",
 "askpass",
 "assets",
- "assistant",
 "assistant_context_editor",
 "assistant_settings",
 "assistant_tools",
@@ -18883,9 +18738,9 @@ dependencies = [

 [[package]]
 name = "zed_llm_client"
-version = "0.7.5"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fe0d60001c02d0d21a4114a13bee3a905fbb9e146ada80a90435c05fda18852"
+checksum = "a23b2fd00776b0c55072f389654910ceb501eb0083d7f78905ab0e5cc86949ec"
 dependencies = [
 "anyhow",
 "serde",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,7 +6,6 @@ members = [
    "crates/anthropic",
    "crates/askpass",
    "crates/assets",
-    "crates/assistant",
    "crates/assistant_context_editor",
    "crates/assistant_settings",
    "crates/assistant_slash_command",
@@ -214,7 +213,6 @@ ai = { path = "crates/ai" }
 anthropic = { path = "crates/anthropic" }
 askpass = { path = "crates/askpass" }
 assets = { path = "crates/assets" }
-assistant = { path = "crates/assistant" }
 assistant_context_editor = { path = "crates/assistant_context_editor" }
 assistant_settings = { path = "crates/assistant_settings" }
 assistant_slash_command = { path = "crates/assistant_slash_command" }
@@ -412,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 = "b16f5c7bd873c7126f48c82c39e7ae64602ae74f" }
-blade-macros = { git = "https://github.com/kvark/blade", rev = "b16f5c7bd873c7126f48c82c39e7ae64602ae74f" }
-blade-util = { git = "https://github.com/kvark/blade", rev = "b16f5c7bd873c7126f48c82c39e7ae64602ae74f" }
+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" }
 blake3 = "1.5.3"
 bytes = "1.0"
 cargo_metadata = "0.19"
@@ -473,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 = "23.1.0", features = ["wgsl-in"] }
+naga = { version = "25.0", features = ["wgsl-in"] }
 nanoid = "0.4"
 nbformat = {  git = "https://github.com/ConradIrwin/runtimed", rev = "7130c804216b6914355d15d0b91ea91f6babd734" }
 nix = "0.29"
@@ -610,7 +608,7 @@ wasmtime-wasi = "29"
 which = "6.0.0"
 wit-component = "0.221"
 workspace-hack = "0.1.0"
-zed_llm_client = "0.7.5"
+zed_llm_client = "0.8.0"
 zstd = "0.11"

 [workspace.dependencies.async-stripe]
--- a/assets/icons/document_text.svg
+++ b/assets/icons/document_text.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="size-5">
+  <path fill-rule="evenodd" d="M4.5 2A1.5 1.5 0 0 0 3 3.5v13A1.5 1.5 0 0 0 4.5 18h11a1.5 1.5 0 0 0 1.5-1.5V7.621a1.5 1.5 0 0 0-.44-1.06l-4.12-4.122A1.5 1.5 0 0 0 11.378 2H4.5Zm2.25 8.5a.75.75 0 0 0 0 1.5h6.5a.75.75 0 0 0 0-1.5h-6.5Zm0 3a.75.75 0 0 0 0 1.5h6.5a.75.75 0 0 0 0-1.5h-6.5Z" clip-rule="evenodd" />
+</svg>
--- a/assets/icons/thumbs_down.svg
+++ b/assets/icons/thumbs_down.svg
@@ -1 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-thumbs-down"><path d="M17 14V2"/><path d="M9 18.12 10 14H4.17a2 2 0 0 1-1.92-2.56l2.33-8A2 2 0 0 1 6.5 2H20a2 2 0 0 1 2 2v8a2 2 0 0 1-2 2h-2.76a2 2 0 0 0-1.79 1.11L12 22a3.13 3.13 0 0 1-3-3.88Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="size-5">
+  <path d="M18.905 12.75a1.25 1.25 0 1 1-2.5 0v-7.5a1.25 1.25 0 0 1 2.5 0v7.5ZM8.905 17v1.3c0 .268-.14.526-.395.607A2 2 0 0 1 5.905 17c0-.995.182-1.948.514-2.826.204-.54-.166-1.174-.744-1.174h-2.52c-1.243 0-2.261-1.01-2.146-2.247.193-2.08.651-4.082 1.341-5.974C2.752 3.678 3.833 3 5.005 3h3.192a3 3 0 0 1 1.341.317l2.734 1.366A3 3 0 0 0 13.613 5h1.292v7h-.963c-.685 0-1.258.482-1.612 1.068a4.01 4.01 0 0 1-2.166 1.73c-.432.143-.853.386-1.011.814-.16.432-.248.9-.248 1.388Z" />
+</svg>
--- a/assets/icons/thumbs_up.svg
+++ b/assets/icons/thumbs_up.svg
@@ -1 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-thumbs-up"><path d="M7 10v12"/><path d="M15 5.88 14 10h5.83a2 2 0 0 1 1.92 2.56l-2.33 8A2 2 0 0 1 17.5 22H4a2 2 0 0 1-2-2v-8a2 2 0 0 1 2-2h2.76a2 2 0 0 0 1.79-1.11L12 2a3.13 3.13 0 0 1 3 3.88Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="size-5">
+  <path d="M1 8.25a1.25 1.25 0 1 1 2.5 0v7.5a1.25 1.25 0 1 1-2.5 0v-7.5ZM11 3V1.7c0-.268.14-.526.395-.607A2 2 0 0 1 14 3c0 .995-.182 1.948-.514 2.826-.204.54.166 1.174.744 1.174h2.52c1.243 0 2.261 1.01 2.146 2.247a23.864 23.864 0 0 1-1.341 5.974C17.153 16.323 16.072 17 14.9 17h-3.192a3 3 0 0 1-1.341-.317l-2.734-1.366A3 3 0 0 0 6.292 15H5V8h.963c.685 0 1.258-.483 1.612-1.068a4.011 4.011 0 0 1 2.166-1.73c.432-.143.853-.386 1.011-.814.16-.432.248-.9.248-1.388Z" />
+</svg>
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -213,26 +213,10 @@
      "ctrl-shift-n": "agent::RejectAll"
    }
  },
-  {
-    "context": "AssistantPanel",
-    "bindings": {
-      "ctrl-k c": "assistant::CopyCode",
-      "ctrl-shift-e": "project_panel::ToggleFocus",
-      "ctrl-g": "search::SelectNextMatch",
-      "ctrl-shift-g": "search::SelectPreviousMatch",
-      "ctrl-alt-/": "agent::ToggleModelSelector",
-      "ctrl-k h": "assistant::DeployHistory",
-      "ctrl-k l": "agent::OpenRulesLibrary",
-      "new": "assistant::NewChat",
-      "ctrl-t": "assistant::NewChat",
-      "ctrl-n": "assistant::NewChat"
-    }
-  },
  {
    "context": "ContextEditor > Editor",
    "bindings": {
      "ctrl-enter": "assistant::Assist",
-      "ctrl-shift-enter": "assistant::Edit",
      "ctrl-s": "workspace::Save",
      "save": "workspace::Save",
      "ctrl->": "assistant::QuoteSelection",
@@ -258,6 +242,7 @@
      "ctrl-i": "agent::ToggleProfileSelector",
      "ctrl-alt-/": "agent::ToggleModelSelector",
      "ctrl-shift-a": "agent::ToggleContextPicker",
+      "ctrl-w": "agent::Close",
      "ctrl-shift-o": "agent::ToggleNavigationMenu",
      "ctrl-shift-i": "agent::ToggleOptionsMenu",
      "shift-escape": "agent::ExpandMessageEditor",
@@ -713,8 +698,8 @@
  {
    "context": "PromptEditor",
    "bindings": {
-      "ctrl-[": "assistant::CyclePreviousInlineAssist",
-      "ctrl-]": "assistant::CycleNextInlineAssist",
+      "ctrl-[": "agent::CyclePreviousInlineAssist",
+      "ctrl-]": "agent::CycleNextInlineAssist",
      "ctrl-alt-e": "agent::RemoveAllContext"
    }
  },
@@ -950,6 +935,7 @@
      "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",
@@ -967,7 +953,10 @@
      "shift-down": "terminal::ScrollLineDown",
      "shift-home": "terminal::ScrollToTop",
      "shift-end": "terminal::ScrollToBottom",
-      "ctrl-shift-space": "terminal::ToggleViMode"
+      "ctrl-shift-space": "terminal::ToggleViMode",
+      "ctrl-shift-r": "terminal::RerunTask",
+      "ctrl-alt-r": "terminal::RerunTask",
+      "alt-t": "terminal::RerunTask"
    }
  },
  {
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -258,27 +258,11 @@
      "shift-ctrl-r": "agent::OpenAgentDiff"
    }
  },
-  {
-    "context": "AssistantPanel",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd-k c": "assistant::CopyCode",
-      "cmd-shift-e": "project_panel::ToggleFocus",
-      "cmd-g": "search::SelectNextMatch",
-      "cmd-shift-g": "search::SelectPreviousMatch",
-      "cmd-alt-/": "agent::ToggleModelSelector",
-      "cmd-k h": "assistant::DeployHistory",
-      "cmd-k l": "agent::OpenRulesLibrary",
-      "cmd-t": "assistant::NewChat",
-      "cmd-n": "assistant::NewChat"
-    }
-  },
  {
    "context": "ContextEditor > Editor",
    "use_key_equivalents": true,
    "bindings": {
      "cmd-enter": "assistant::Assist",
-      "cmd-shift-enter": "assistant::Edit",
      "cmd-s": "workspace::Save",
      "cmd->": "assistant::QuoteSelection",
      "cmd-<": "assistant::InsertIntoEditor",
@@ -304,6 +288,7 @@
      "cmd-i": "agent::ToggleProfileSelector",
      "cmd-alt-/": "agent::ToggleModelSelector",
      "cmd-shift-a": "agent::ToggleContextPicker",
+      "cmd-w": "agent::Close",
      "cmd-shift-o": "agent::ToggleNavigationMenu",
      "cmd-shift-i": "agent::ToggleOptionsMenu",
      "shift-escape": "agent::ExpandMessageEditor",
@@ -780,8 +765,8 @@
      "cmd-shift-a": "agent::ToggleContextPicker",
      "cmd-alt-/": "agent::ToggleModelSelector",
      "cmd-alt-e": "agent::RemoveAllContext",
-      "ctrl-[": "assistant::CyclePreviousInlineAssist",
-      "ctrl-]": "assistant::CycleNextInlineAssist"
+      "ctrl-[": "agent::CyclePreviousInlineAssist",
+      "ctrl-]": "agent::CycleNextInlineAssist"
    }
  },
  {
@@ -1037,6 +1022,7 @@
      "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",
@@ -1053,7 +1039,8 @@
      "ctrl-alt-up": "pane::SplitUp",
      "ctrl-alt-down": "pane::SplitDown",
      "ctrl-alt-left": "pane::SplitLeft",
-      "ctrl-alt-right": "pane::SplitRight"
+      "ctrl-alt-right": "pane::SplitRight",
+      "cmd-alt-r": "terminal::RerunTask"
    }
  },
  {
--- a/assets/prompts/suggest_edits.hbs
+++ b/assets/prompts/suggest_edits.hbs
@@ -1,206 +0,0 @@
-<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,6 +218,23 @@
  // 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
@@ -356,6 +373,45 @@
      "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
@@ -370,8 +426,6 @@
  "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.
@@ -965,7 +1019,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.
-      // Shows all diagnostics when not specified.
+      // Inherits editor's diagnostics' max severity settings when `null`.
      "max_severity": null
    },
    "cargo": {
--- a/crates/activity_indicator/src/activity_indicator.rs
+++ b/crates/activity_indicator/src/activity_indicator.rs
@@ -43,6 +43,7 @@ pub struct ActivityIndicator {
    context_menu_handle: PopoverMenuHandle<ContextMenu>,
 }

+#[derive(Debug)]
 struct ServerStatus {
    name: SharedString,
    status: BinaryStatus,
@@ -70,6 +71,7 @@ impl ActivityIndicator {
    ) -> Entity<ActivityIndicator> {
        let project = workspace.project().clone();
        let auto_updater = AutoUpdater::get(cx);
+        let workspace_handle = cx.entity();
        let this = cx.new(|cx| {
            let mut status_events = languages.language_server_binary_statuses();
            cx.spawn(async move |this, cx| {
@@ -84,6 +86,25 @@ impl ActivityIndicator {
            })
            .detach();

+            cx.subscribe_in(
+                &workspace_handle,
+                window,
+                |activity_indicator, _, event, window, cx| match event {
+                    workspace::Event::ClearActivityIndicator { .. } => {
+                        if activity_indicator.statuses.pop().is_some() {
+                            activity_indicator.dismiss_error_message(
+                                &DismissErrorMessage,
+                                window,
+                                cx,
+                            );
+                            cx.notify();
+                        }
+                    }
+                    _ => {}
+                },
+            )
+            .detach();
+
            cx.subscribe(
                &project.read(cx).lsp_store(),
                |_, _, event, cx| match event {
@@ -115,7 +136,7 @@ impl ActivityIndicator {
            }

            Self {
-                statuses: Default::default(),
+                statuses: Vec::new(),
                project: project.clone(),
                auto_updater,
                context_menu_handle: Default::default(),
@@ -185,11 +206,8 @@ impl ActivityIndicator {
        cx: &mut Context<Self>,
    ) {
        if let Some(updater) = &self.auto_updater {
-            updater.update(cx, |updater, cx| {
-                updater.dismiss_error(cx);
-            });
+            updater.update(cx, |updater, cx| updater.dismiss_error(cx));
        }
-        cx.notify();
    }

    fn pending_language_server_work<'a>(
--- a/crates/agent/Cargo.toml
+++ b/crates/agent/Cargo.toml
@@ -9,7 +9,7 @@ license = "GPL-3.0-or-later"
 workspace = true

 [lib]
-path = "src/assistant.rs"
+path = "src/agent.rs"
 doctest = false

 [features]
@@ -23,6 +23,7 @@ anyhow.workspace = true
 assistant_context_editor.workspace = true
 assistant_settings.workspace = true
 assistant_slash_command.workspace = true
+assistant_slash_commands.workspace = true
 assistant_tool.workspace = true
 async-watch.workspace = true
 buffer_diff.workspace = true
@@ -45,6 +46,7 @@ gpui.workspace = true
 heed.workspace = true
 html_to_markdown.workspace = true
 http_client.workspace = true
+indexed_docs.workspace = true
 itertools.workspace = true
 jsonschema.workspace = true
 language.workspace = true
--- a/crates/agent/src/active_thread.rs
+++ b/crates/agent/src/active_thread.rs
@@ -1,4 +1,4 @@
-use crate::AssistantPanel;
+use crate::AgentPanel;
 use crate::context::{AgentContextHandle, RULES_ICON};
 use crate::context_picker::{ContextPicker, MentionLink};
 use crate::context_store::ContextStore;
@@ -712,7 +712,7 @@ fn open_markdown_link(
                .detach_and_log_err(cx);
        }
        Some(MentionLink::Thread(thread_id)) => workspace.update(cx, |workspace, cx| {
-            if let Some(panel) = workspace.panel::<AssistantPanel>(cx) {
+            if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
                panel.update(cx, |panel, cx| {
                    panel
                        .open_thread_by_id(&thread_id, window, cx)
@@ -721,7 +721,7 @@ fn open_markdown_link(
            }
        }),
        Some(MentionLink::TextThread(path)) => workspace.update(cx, |workspace, cx| {
-            if let Some(panel) = workspace.panel::<AssistantPanel>(cx) {
+            if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
                panel.update(cx, |panel, cx| {
                    panel
                        .open_saved_prompt_editor(path, window, cx)
@@ -1211,8 +1211,7 @@ impl ActiveThread {

                                            if let Some(workspace) = workspace_handle.upgrade() {
                                                workspace.update(_cx, |workspace, cx| {
-                                                    workspace
-                                                        .focus_panel::<AssistantPanel>(window, cx);
+                                                    workspace.focus_panel::<AgentPanel>(window, cx);
                                                });
                                            }
                                        })
@@ -1412,6 +1411,7 @@ impl ActiveThread {
                        mode: None,
                        messages: vec![request_message],
                        tools: vec![],
+                        tool_choice: None,
                        stop: vec![],
                        temperature: AssistantSettings::temperature_for_model(
                            &configured_model.model,
@@ -1780,8 +1780,7 @@ impl ActiveThread {
        let colors = cx.theme().colors();
        let editor_bg_color = colors.editor_background;

-        let open_as_markdown = IconButton::new(("open-as-markdown", ix), IconName::FileCode)
-            .shape(ui::IconButtonShape::Square)
+        let open_as_markdown = IconButton::new(("open-as-markdown", ix), IconName::DocumentText)
            .icon_size(IconSize::XSmall)
            .icon_color(Color::Ignored)
            .tooltip(Tooltip::text("Open Thread as Markdown"))
@@ -1806,13 +1805,16 @@ impl ActiveThread {
            .mt_1()
            .py_2()
            .px(RESPONSE_PADDING_X)
-            .gap_1()
+            .mr_1()
+            .opacity(0.4)
+            .hover(|style| style.opacity(1.))
+            .gap_1p5()
            .flex_wrap()
            .justify_end();
        let feedback_items = match self.thread.read(cx).message_feedback(message_id) {
            Some(feedback) => feedback_container
                .child(
-                    div().mr_1().visible_on_hover("feedback_container").child(
+                    div().visible_on_hover("feedback_container").child(
                        Label::new(match feedback {
                            ThreadFeedback::Positive => "Thanks for your feedback!",
                            ThreadFeedback::Negative => {
@@ -1825,11 +1827,8 @@ impl ActiveThread {
                )
                .child(
                    h_flex()
-                        .pr_1()
-                        .gap_1()
                        .child(
                            IconButton::new(("feedback-thumbs-up", ix), IconName::ThumbsUp)
-                                .shape(ui::IconButtonShape::Square)
                                .icon_size(IconSize::XSmall)
                                .icon_color(match feedback {
                                    ThreadFeedback::Positive => Color::Accent,
@@ -1847,7 +1846,6 @@ impl ActiveThread {
                        )
                        .child(
                            IconButton::new(("feedback-thumbs-down", ix), IconName::ThumbsDown)
-                                .shape(ui::IconButtonShape::Square)
                                .icon_size(IconSize::XSmall)
                                .icon_color(match feedback {
                                    ThreadFeedback::Positive => Color::Ignored,
@@ -1868,7 +1866,7 @@ impl ActiveThread {
                .into_any_element(),
            None => feedback_container
                .child(
-                    div().mr_1().visible_on_hover("feedback_container").child(
+                    div().visible_on_hover("feedback_container").child(
                        Label::new(
                            "Rating the thread sends all of your current conversation to the Zed team.",
                        )
@@ -1878,13 +1876,10 @@ impl ActiveThread {
                )
                .child(
                    h_flex()
-                        .pr_1()
-                        .gap_1()
                        .child(
                            IconButton::new(("feedback-thumbs-up", ix), IconName::ThumbsUp)
                                .icon_size(IconSize::XSmall)
                                .icon_color(Color::Ignored)
-                                .shape(ui::IconButtonShape::Square)
                                .tooltip(Tooltip::text("Helpful Response"))
                                .on_click(cx.listener(move |this, _, window, cx| {
                                    this.handle_feedback_click(
@@ -1899,7 +1894,6 @@ impl ActiveThread {
                            IconButton::new(("feedback-thumbs-down", ix), IconName::ThumbsDown)
                                .icon_size(IconSize::XSmall)
                                .icon_color(Color::Ignored)
-                                .shape(ui::IconButtonShape::Square)
                                .tooltip(Tooltip::text("Not Helpful"))
                                .on_click(cx.listener(move |this, _, window, cx| {
                                    this.handle_feedback_click(
@@ -3258,15 +3252,18 @@ impl ActiveThread {
            .map(|tool_use| tool_use.status.clone())
        {
            self.thread.update(cx, |thread, cx| {
-                thread.run_tool(
-                    c.tool_use_id.clone(),
-                    c.ui_text.clone(),
-                    c.input.clone(),
-                    &c.messages,
-                    c.tool.clone(),
-                    Some(window.window_handle()),
-                    cx,
-                );
+                if let Some(configured) = thread.get_or_init_configured_model(cx) {
+                    thread.run_tool(
+                        c.tool_use_id.clone(),
+                        c.ui_text.clone(),
+                        c.input.clone(),
+                        c.request.clone(),
+                        c.tool.clone(),
+                        configured.model,
+                        Some(window.window_handle()),
+                        cx,
+                    );
+                }
            });
        }
    }
@@ -3527,7 +3524,7 @@ pub(crate) fn open_context(
        }

        AgentContextHandle::Thread(thread_context) => workspace.update(cx, |workspace, cx| {
-            if let Some(panel) = workspace.panel::<AssistantPanel>(cx) {
+            if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
                panel.update(cx, |panel, cx| {
                    panel.open_thread(thread_context.thread.clone(), window, cx);
                });
@@ -3536,7 +3533,7 @@ pub(crate) fn open_context(

        AgentContextHandle::TextThread(text_thread_context) => {
            workspace.update(cx, |workspace, cx| {
-                if let Some(panel) = workspace.panel::<AssistantPanel>(cx) {
+                if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
                    panel.update(cx, |panel, cx| {
                        panel.open_prompt_editor(text_thread_context.context.clone(), window, cx)
                    });
--- a/crates/assistant/src/assistant.rs
+++ b/crates/assistant/src/assistant.rs
@@ -1,102 +1,124 @@
-#![cfg_attr(target_os = "windows", allow(unused, dead_code))]
-
-mod assistant_configuration;
-pub mod assistant_panel;
+mod active_thread;
+mod agent_configuration;
+mod agent_diff;
+mod agent_model_selector;
+mod agent_panel;
+mod buffer_codegen;
+mod context;
+mod context_picker;
+mod context_server_configuration;
+mod context_server_tool;
+mod context_store;
+mod context_strip;
+mod debug;
+mod history_store;
 mod inline_assistant;
-pub mod slash_command_settings;
+mod inline_prompt_editor;
+mod message_editor;
+mod profile_selector;
+mod slash_command_settings;
+mod terminal_codegen;
 mod terminal_inline_assistant;
+mod thread;
+mod thread_history;
+mod thread_store;
+mod tool_compatibility;
+mod tool_use;
+mod ui;

 use std::sync::Arc;

-use assistant_settings::{AssistantSettings, LanguageModelSelection};
+use assistant_settings::{AgentProfileId, AssistantSettings, LanguageModelSelection};
 use assistant_slash_command::SlashCommandRegistry;
 use client::Client;
-use command_palette_hooks::CommandPaletteFilter;
-use feature_flags::FeatureFlagAppExt;
+use feature_flags::FeatureFlagAppExt as _;
 use fs::Fs;
-use gpui::{App, Global, ReadGlobal, UpdateGlobal, actions};
-use language_model::{
-    LanguageModelId, LanguageModelProviderId, LanguageModelRegistry, LanguageModelResponseMessage,
-};
+use gpui::{App, actions, impl_actions};
+use language::LanguageRegistry;
+use language_model::{LanguageModelId, LanguageModelProviderId, LanguageModelRegistry};
 use prompt_store::PromptBuilder;
+use schemars::JsonSchema;
 use serde::Deserialize;
-use settings::{Settings, SettingsStore};
+use settings::{Settings as _, SettingsStore};
+use thread::ThreadId;

-pub use crate::assistant_panel::{AssistantPanel, AssistantPanelEvent};
-pub(crate) use crate::inline_assistant::*;
+pub use crate::active_thread::ActiveThread;
+use crate::agent_configuration::{AddContextServerModal, ManageProfilesModal};
+pub use crate::agent_panel::{AgentPanel, ConcreteAssistantPanelDelegate};
+pub use crate::context::{ContextLoadResult, LoadedContext};
+pub use crate::inline_assistant::InlineAssistant;
 use crate::slash_command_settings::SlashCommandSettings;
+pub use crate::thread::{Message, MessageSegment, Thread, ThreadEvent};
+pub use crate::thread_store::{TextThreadStore, ThreadStore};
+pub use agent_diff::{AgentDiffPane, AgentDiffToolbar};
+pub use context_store::ContextStore;
+pub use ui::preview::{all_agent_previews, get_agent_preview};

 actions!(
-    assistant,
+    agent,
    [
-        InsertActivePrompt,
-        DeployHistory,
-        NewChat,
+        NewTextThread,
+        ToggleContextPicker,
+        ToggleNavigationMenu,
+        ToggleOptionsMenu,
+        DeleteRecentlyOpenThread,
+        ToggleProfileSelector,
+        RemoveAllContext,
+        ExpandMessageEditor,
+        OpenHistory,
+        AddContextServer,
+        RemoveSelectedThread,
+        Chat,
        CycleNextInlineAssist,
-        CyclePreviousInlineAssist
+        CyclePreviousInlineAssist,
+        FocusUp,
+        FocusDown,
+        FocusLeft,
+        FocusRight,
+        RemoveFocusedContext,
+        AcceptSuggestedContext,
+        OpenActiveThreadAsMarkdown,
+        OpenAgentDiff,
+        Keep,
+        Reject,
+        RejectAll,
+        KeepAll,
+        Follow,
+        ResetTrialUpsell,
+        Close,
    ]
 );

-const DEFAULT_CONTEXT_LINES: usize = 50;
-
-#[derive(Deserialize, Debug)]
-pub struct LanguageModelUsage {
-    pub prompt_tokens: u32,
-    pub completion_tokens: u32,
-    pub total_tokens: u32,
+#[derive(Default, Clone, PartialEq, Deserialize, JsonSchema)]
+pub struct NewThread {
+    #[serde(default)]
+    from_thread_id: Option<ThreadId>,
 }

-#[derive(Deserialize, Debug)]
-pub struct LanguageModelChoiceDelta {
-    pub index: u32,
-    pub delta: LanguageModelResponseMessage,
-    pub finish_reason: Option<String>,
+#[derive(PartialEq, Clone, Default, Debug, Deserialize, JsonSchema)]
+pub struct ManageProfiles {
+    #[serde(default)]
+    pub customize_tools: Option<AgentProfileId>,
 }

-/// The state pertaining to the Assistant.
-#[derive(Default)]
-struct Assistant {
-    /// Whether the Assistant is enabled.
-    enabled: bool,
-}
-
-impl Global for Assistant {}
-
-impl Assistant {
-    const NAMESPACE: &'static str = "assistant";
-
-    fn set_enabled(&mut self, enabled: bool, cx: &mut App) {
-        if self.enabled == enabled {
-            return;
+impl ManageProfiles {
+    pub fn customize_tools(profile_id: AgentProfileId) -> Self {
+        Self {
+            customize_tools: Some(profile_id),
        }
-
-        self.enabled = enabled;
-
-        if !enabled {
-            CommandPaletteFilter::update_global(cx, |filter, _cx| {
-                filter.hide_namespace(Self::NAMESPACE);
-            });
-
-            return;
-        }
-
-        CommandPaletteFilter::update_global(cx, |filter, _cx| {
-            filter.show_namespace(Self::NAMESPACE);
-        });
-    }
-
-    pub fn enabled(cx: &App) -> bool {
-        Self::global(cx).enabled
    }
 }

+impl_actions!(agent, [NewThread, ManageProfiles]);
+
+/// Initializes the `agent` crate.
 pub fn init(
    fs: Arc<dyn Fs>,
    client: Arc<Client>,
    prompt_builder: Arc<PromptBuilder>,
+    language_registry: Arc<LanguageRegistry>,
    cx: &mut App,
 ) {
-    cx.set_global(Assistant::default());
    AssistantSettings::register(cx);
    SlashCommandSettings::register(cx);

@@ -104,8 +126,9 @@ pub fn init(
    rules_library::init(cx);
    init_language_model_settings(cx);
    assistant_slash_command::init(cx);
-    assistant_tool::init(cx);
-    assistant_panel::init(cx);
+    thread_store::init(cx);
+    agent_panel::init(cx);
+    context_server_configuration::init(language_registry, cx);

    register_slash_commands(cx);
    inline_assistant::init(
@@ -121,22 +144,8 @@ pub fn init(
        cx,
    );
    indexed_docs::init(cx);
-
-    CommandPaletteFilter::update_global(cx, |filter, _cx| {
-        filter.hide_namespace(Assistant::NAMESPACE);
-    });
-    Assistant::update_global(cx, |assistant, cx| {
-        let settings = AssistantSettings::get_global(cx);
-
-        assistant.set_enabled(settings.enabled, cx);
-    });
-    cx.observe_global::<SettingsStore>(|cx| {
-        Assistant::update_global(cx, |assistant, cx| {
-            let settings = AssistantSettings::get_global(cx);
-            assistant.set_enabled(settings.enabled, cx);
-        });
-    })
-    .detach();
+    cx.observe_new(AddContextServerModal::register).detach();
+    cx.observe_new(ManageProfilesModal::register).detach();
 }

 fn init_language_model_settings(cx: &mut App) {
@@ -250,11 +259,3 @@ fn update_slash_commands_from_settings(cx: &mut App) {
            .unregister_command(assistant_slash_commands::CargoWorkspaceSlashCommand);
    }
 }
-
-#[cfg(test)]
-#[ctor::ctor]
-fn init_logger() {
-    if std::env::var("RUST_LOG").is_ok() {
-        env_logger::init();
-    }
-}
--- a/crates/agent/src/assistant_configuration.rs
+++ b/crates/agent/src/assistant_configuration.rs
@@ -30,7 +30,7 @@ pub(crate) use manage_profiles_modal::ManageProfilesModal;

 use crate::AddContextServer;

-pub struct AssistantConfiguration {
+pub struct AgentConfiguration {
    fs: Arc<dyn Fs>,
    focus_handle: FocusHandle,
    configuration_views_by_provider: HashMap<LanguageModelProviderId, AnyView>,
@@ -42,7 +42,7 @@ pub struct AssistantConfiguration {
    scrollbar_state: ScrollbarState,
 }

-impl AssistantConfiguration {
+impl AgentConfiguration {
    pub fn new(
        fs: Arc<dyn Fs>,
        context_server_store: Entity<ContextServerStore>,
@@ -110,7 +110,7 @@ impl AssistantConfiguration {
    }
 }

-impl Focusable for AssistantConfiguration {
+impl Focusable for AgentConfiguration {
    fn focus_handle(&self, _: &App) -> FocusHandle {
        self.focus_handle.clone()
    }
@@ -120,9 +120,9 @@ pub enum AssistantConfigurationEvent {
    NewThread(Arc<dyn LanguageModelProvider>),
 }

-impl EventEmitter<AssistantConfigurationEvent> for AssistantConfiguration {}
+impl EventEmitter<AssistantConfigurationEvent> for AgentConfiguration {}

-impl AssistantConfiguration {
+impl AgentConfiguration {
    fn render_provider_configuration_block(
        &mut self,
        provider: &Arc<dyn LanguageModelProvider>,
@@ -571,7 +571,7 @@ impl AssistantConfiguration {
    }
 }

-impl Render for AssistantConfiguration {
+impl Render for AgentConfiguration {
    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
        v_flex()
            .id("assistant-configuration")
--- a/crates/agent/src/assistant_configuration/add_context_server_modal.rs
+++ b/crates/agent/src/assistant_configuration/add_context_server_modal.rs
--- a/crates/agent/src/assistant_configuration/configure_context_server_modal.rs
+++ b/crates/agent/src/assistant_configuration/configure_context_server_modal.rs
--- a/crates/agent/src/assistant_configuration/manage_profiles_modal.rs
+++ b/crates/agent/src/assistant_configuration/manage_profiles_modal.rs
@@ -18,9 +18,9 @@ use ui::{
 use util::ResultExt as _;
 use workspace::{ModalView, Workspace};

-use crate::assistant_configuration::manage_profiles_modal::profile_modal_header::ProfileModalHeader;
-use crate::assistant_configuration::tool_picker::{ToolPicker, ToolPickerDelegate};
-use crate::{AssistantPanel, ManageProfiles, ThreadStore};
+use crate::agent_configuration::manage_profiles_modal::profile_modal_header::ProfileModalHeader;
+use crate::agent_configuration::tool_picker::{ToolPicker, ToolPickerDelegate};
+use crate::{AgentPanel, ManageProfiles, ThreadStore};

 use super::tool_picker::ToolPickerMode;

@@ -115,7 +115,7 @@ impl ManageProfilesModal {
        _cx: &mut Context<Workspace>,
    ) {
        workspace.register_action(|workspace, action: &ManageProfiles, window, cx| {
-            if let Some(panel) = workspace.panel::<AssistantPanel>(cx) {
+            if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
                let fs = workspace.app_state().fs.clone();
                let thread_store = panel.read(cx).thread_store();
                let tools = thread_store.read(cx).tools();
@@ -124,7 +124,7 @@ impl ManageProfilesModal {
                    let mut this = Self::new(fs, tools, thread_store, window, cx);

                    if let Some(profile_id) = action.customize_tools.clone() {
-                        this.configure_tools(profile_id, window, cx);
+                        this.configure_builtin_tools(profile_id, window, cx);
                    }

                    this
@@ -190,7 +190,7 @@ impl ManageProfilesModal {
        self.focus_handle(cx).focus(window);
    }

-    fn configure_mcps(
+    fn configure_mcp_tools(
        &mut self,
        profile_id: AgentProfileId,
        window: &mut Window,
@@ -228,7 +228,7 @@ impl ManageProfilesModal {
        self.focus_handle(cx).focus(window);
    }

-    fn configure_tools(
+    fn configure_builtin_tools(
        &mut self,
        profile_id: AgentProfileId,
        window: &mut Window,
@@ -581,16 +581,20 @@ impl ManageProfilesModal {
                        )
                        .child(
                            div()
-                                .id("configure-tools")
+                                .id("configure-builtin-tools")
                                .track_focus(&mode.configure_tools.focus_handle)
                                .on_action({
                                    let profile_id = mode.profile_id.clone();
                                    cx.listener(move |this, _: &menu::Confirm, window, cx| {
-                                        this.configure_tools(profile_id.clone(), window, cx);
+                                        this.configure_builtin_tools(
+                                            profile_id.clone(),
+                                            window,
+                                            cx,
+                                        );
                                    })
                                })
                                .child(
-                                    ListItem::new("configure-tools")
+                                    ListItem::new("configure-builtin-tools-item")
                                        .toggle_state(
                                            mode.configure_tools
                                                .focus_handle
@@ -603,11 +607,11 @@ impl ManageProfilesModal {
                                                .size(IconSize::Small)
                                                .color(Color::Muted),
                                        )
-                                        .child(Label::new("Configure Tools"))
+                                        .child(Label::new("Configure Built-in Tools"))
                                        .on_click({
                                            let profile_id = mode.profile_id.clone();
                                            cx.listener(move |this, _, window, cx| {
-                                                this.configure_tools(
+                                                this.configure_builtin_tools(
                                                    profile_id.clone(),
                                                    window,
                                                    cx,
@@ -623,11 +627,11 @@ impl ManageProfilesModal {
                                .on_action({
                                    let profile_id = mode.profile_id.clone();
                                    cx.listener(move |this, _: &menu::Confirm, window, cx| {
-                                        this.configure_mcps(profile_id.clone(), window, cx);
+                                        this.configure_mcp_tools(profile_id.clone(), window, cx);
                                    })
                                })
                                .child(
-                                    ListItem::new("configure-mcps")
+                                    ListItem::new("configure-mcp-tools")
                                        .toggle_state(
                                            mode.configure_mcps
                                                .focus_handle
@@ -640,11 +644,15 @@ impl ManageProfilesModal {
                                                .size(IconSize::Small)
                                                .color(Color::Muted),
                                        )
-                                        .child(Label::new("Configure MCP Servers"))
+                                        .child(Label::new("Configure MCP Tools"))
                                        .on_click({
                                            let profile_id = mode.profile_id.clone();
                                            cx.listener(move |this, _, window, cx| {
-                                                this.configure_mcps(profile_id.clone(), window, cx);
+                                                this.configure_mcp_tools(
+                                                    profile_id.clone(),
+                                                    window,
+                                                    cx,
+                                                );
                                            })
                                        }),
                                ),
@@ -777,7 +785,7 @@ impl Render for ManageProfilesModal {
                    v_flex()
                        .pb_1()
                        .child(ProfileModalHeader::new(
-                            format!("{profile_name} — Configure Tools"),
+                            format!("{profile_name} — Configure Built-in Tools"),
                            Some(IconName::Cog),
                        ))
                        .child(ListSeparator)
@@ -800,7 +808,7 @@ impl Render for ManageProfilesModal {
                    v_flex()
                        .pb_1()
                        .child(ProfileModalHeader::new(
-                            format!("{profile_name} — Configure MCP Servers"),
+                            format!("{profile_name} — Configure MCP Tools"),
                            Some(IconName::Hammer),
                        ))
                        .child(ListSeparator)
--- a/crates/agent/src/assistant_configuration/manage_profiles_modal/profile_modal_header.rs
+++ b/crates/agent/src/assistant_configuration/manage_profiles_modal/profile_modal_header.rs
--- a/crates/agent/src/assistant_configuration/tool_picker.rs
+++ b/crates/agent/src/assistant_configuration/tool_picker.rs
@@ -176,7 +176,7 @@ impl PickerDelegate for ToolPickerDelegate {
    fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
        match self.mode {
            ToolPickerMode::BuiltinTools => "Search built-in tools…",
-            ToolPickerMode::McpTools => "Search MCP servers…",
+            ToolPickerMode::McpTools => "Search MCP tools…",
        }
        .into()
    }
--- a/crates/agent/src/assistant_model_selector.rs
+++ b/crates/agent/src/assistant_model_selector.rs
@@ -17,13 +17,13 @@ pub enum ModelType {
    InlineAssistant,
 }

-pub struct AssistantModelSelector {
+pub struct AgentModelSelector {
    selector: Entity<LanguageModelSelector>,
    menu_handle: PopoverMenuHandle<LanguageModelSelector>,
    focus_handle: FocusHandle,
 }

-impl AssistantModelSelector {
+impl AgentModelSelector {
    pub(crate) fn new(
        fs: Arc<dyn Fs>,
        menu_handle: PopoverMenuHandle<LanguageModelSelector>,
@@ -99,7 +99,7 @@ impl AssistantModelSelector {
    }
 }

-impl Render for AssistantModelSelector {
+impl Render for AgentModelSelector {
    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
        let focus_handle = self.focus_handle.clone();

--- a/crates/agent/src/assistant_panel.rs
+++ b/crates/agent/src/assistant_panel.rs
@@ -9,7 +9,7 @@ use serde::{Deserialize, Serialize};

 use anyhow::{Result, anyhow};
 use assistant_context_editor::{
-    AssistantContext, AssistantPanelDelegate, ConfigurationError, ContextEditor, ContextEvent,
+    AgentPanelDelegate, AssistantContext, ConfigurationError, ContextEditor, ContextEvent,
    SlashCommandCompletionProvider, humanize_token_count, make_lsp_adapter_delegate,
    render_remaining_tokens,
 };
@@ -53,8 +53,8 @@ use zed_actions::{DecreaseBufferFontSize, IncreaseBufferFontSize, ResetBufferFon
 use zed_llm_client::UsageLimit;

 use crate::active_thread::{self, ActiveThread, ActiveThreadEvent};
+use crate::agent_configuration::{AgentConfiguration, AssistantConfigurationEvent};
 use crate::agent_diff::AgentDiff;
-use crate::assistant_configuration::{AssistantConfiguration, AssistantConfigurationEvent};
 use crate::history_store::{HistoryEntry, HistoryStore, RecentEntry};
 use crate::message_editor::{MessageEditor, MessageEditorEvent};
 use crate::thread::{Thread, ThreadError, ThreadId, TokenUsageRatio};
@@ -62,16 +62,16 @@ use crate::thread_history::{EntryTimeFormat, PastContext, PastThread, ThreadHist
 use crate::thread_store::ThreadStore;
 use crate::ui::AgentOnboardingModal;
 use crate::{
-    AddContextServer, AgentDiffPane, ContextStore, DeleteRecentlyOpenThread, ExpandMessageEditor,
-    Follow, InlineAssistant, NewTextThread, NewThread, OpenActiveThreadAsMarkdown, OpenAgentDiff,
-    OpenHistory, ResetTrialUpsell, TextThreadStore, ThreadEvent, ToggleContextPicker,
-    ToggleNavigationMenu, ToggleOptionsMenu,
+    AddContextServer, AgentDiffPane, Close, ContextStore, DeleteRecentlyOpenThread,
+    ExpandMessageEditor, Follow, InlineAssistant, NewTextThread, NewThread,
+    OpenActiveThreadAsMarkdown, OpenAgentDiff, OpenHistory, ResetTrialUpsell, TextThreadStore,
+    ThreadEvent, ToggleContextPicker, ToggleNavigationMenu, ToggleOptionsMenu,
 };

 const AGENT_PANEL_KEY: &str = "agent_panel";

 #[derive(Serialize, Deserialize)]
-struct SerializedAssistantPanel {
+struct SerializedAgentPanel {
    width: Option<Pixels>,
 }

@@ -80,40 +80,40 @@ pub fn init(cx: &mut App) {
        |workspace: &mut Workspace, _window, _cx: &mut Context<Workspace>| {
            workspace
                .register_action(|workspace, action: &NewThread, window, cx| {
-                    if let Some(panel) = workspace.panel::<AssistantPanel>(cx) {
+                    if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
                        panel.update(cx, |panel, cx| panel.new_thread(action, window, cx));
-                        workspace.focus_panel::<AssistantPanel>(window, cx);
+                        workspace.focus_panel::<AgentPanel>(window, cx);
                    }
                })
                .register_action(|workspace, _: &OpenHistory, window, cx| {
-                    if let Some(panel) = workspace.panel::<AssistantPanel>(cx) {
-                        workspace.focus_panel::<AssistantPanel>(window, cx);
+                    if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
+                        workspace.focus_panel::<AgentPanel>(window, cx);
                        panel.update(cx, |panel, cx| panel.open_history(window, cx));
                    }
                })
                .register_action(|workspace, _: &OpenConfiguration, window, cx| {
-                    if let Some(panel) = workspace.panel::<AssistantPanel>(cx) {
-                        workspace.focus_panel::<AssistantPanel>(window, cx);
+                    if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
+                        workspace.focus_panel::<AgentPanel>(window, cx);
                        panel.update(cx, |panel, cx| panel.open_configuration(window, cx));
                    }
                })
                .register_action(|workspace, _: &NewTextThread, window, cx| {
-                    if let Some(panel) = workspace.panel::<AssistantPanel>(cx) {
-                        workspace.focus_panel::<AssistantPanel>(window, cx);
+                    if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
+                        workspace.focus_panel::<AgentPanel>(window, cx);
                        panel.update(cx, |panel, cx| panel.new_prompt_editor(window, cx));
                    }
                })
                .register_action(|workspace, action: &OpenRulesLibrary, window, cx| {
-                    if let Some(panel) = workspace.panel::<AssistantPanel>(cx) {
-                        workspace.focus_panel::<AssistantPanel>(window, cx);
+                    if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
+                        workspace.focus_panel::<AgentPanel>(window, cx);
                        panel.update(cx, |panel, cx| {
                            panel.deploy_rules_library(action, window, cx)
                        });
                    }
                })
                .register_action(|workspace, _: &OpenAgentDiff, window, cx| {
-                    if let Some(panel) = workspace.panel::<AssistantPanel>(cx) {
-                        workspace.focus_panel::<AssistantPanel>(window, cx);
+                    if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
+                        workspace.focus_panel::<AgentPanel>(window, cx);
                        let thread = panel.read(cx).thread.read(cx).thread().clone();
                        AgentDiffPane::deploy_in_workspace(thread, workspace, window, cx);
                    }
@@ -122,8 +122,8 @@ pub fn init(cx: &mut App) {
                    workspace.follow(CollaboratorId::Agent, window, cx);
                })
                .register_action(|workspace, _: &ExpandMessageEditor, window, cx| {
-                    if let Some(panel) = workspace.panel::<AssistantPanel>(cx) {
-                        workspace.focus_panel::<AssistantPanel>(window, cx);
+                    if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
+                        workspace.focus_panel::<AgentPanel>(window, cx);
                        panel.update(cx, |panel, cx| {
                            panel.message_editor.update(cx, |editor, cx| {
                                editor.expand_message_editor(&ExpandMessageEditor, window, cx);
@@ -132,16 +132,16 @@ pub fn init(cx: &mut App) {
                    }
                })
                .register_action(|workspace, _: &ToggleNavigationMenu, window, cx| {
-                    if let Some(panel) = workspace.panel::<AssistantPanel>(cx) {
-                        workspace.focus_panel::<AssistantPanel>(window, cx);
+                    if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
+                        workspace.focus_panel::<AgentPanel>(window, cx);
                        panel.update(cx, |panel, cx| {
                            panel.toggle_navigation_menu(&ToggleNavigationMenu, window, cx);
                        });
                    }
                })
                .register_action(|workspace, _: &ToggleOptionsMenu, window, cx| {
-                    if let Some(panel) = workspace.panel::<AssistantPanel>(cx) {
-                        workspace.focus_panel::<AssistantPanel>(window, cx);
+                    if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
+                        workspace.focus_panel::<AgentPanel>(window, cx);
                        panel.update(cx, |panel, cx| {
                            panel.toggle_options_menu(&ToggleOptionsMenu, window, cx);
                        });
@@ -156,6 +156,11 @@ pub fn init(cx: &mut App) {
                })
                .register_action(|_workspace, _: &ResetTrialUpsell, _window, cx| {
                    set_trial_upsell_dismissed(false, cx);
+                })
+                .register_action(|workspace, _: &Close, window, cx| {
+                    if let Some(panel) = workspace.panel::<AgentPanel>(cx) {
+                        panel.update(cx, |panel, cx| panel.close_panel(window, cx));
+                    }
                });
        },
    )
@@ -335,7 +340,7 @@ impl ActiveView {
    }
 }

-pub struct AssistantPanel {
+pub struct AgentPanel {
    workspace: WeakEntity<Workspace>,
    user_store: Entity<UserStore>,
    project: Entity<Project>,
@@ -349,7 +354,7 @@ pub struct AssistantPanel {
    context_store: Entity<TextThreadStore>,
    prompt_store: Option<Entity<PromptStore>>,
    inline_assist_context_store: Entity<crate::context_store::ContextStore>,
-    configuration: Option<Entity<AssistantConfiguration>>,
+    configuration: Option<Entity<AgentConfiguration>>,
    configuration_subscription: Option<Subscription>,
    local_timezone: UtcOffset,
    active_view: ActiveView,
@@ -366,14 +371,18 @@ pub struct AssistantPanel {
    _trial_markdown: Entity<Markdown>,
 }

-impl AssistantPanel {
+impl AgentPanel {
+    fn close_panel(&mut self, _window: &mut Window, cx: &mut Context<Self>) {
+        cx.emit(PanelEvent::Close);
+    }
+
    fn serialize(&mut self, cx: &mut Context<Self>) {
        let width = self.width;
        self.pending_serialization = Some(cx.background_spawn(async move {
            KEY_VALUE_STORE
                .write_kvp(
                    AGENT_PANEL_KEY.into(),
-                    serde_json::to_string(&SerializedAssistantPanel { width })?,
+                    serde_json::to_string(&SerializedAgentPanel { width })?,
                )
                .await?;
            anyhow::Ok(())
@@ -423,7 +432,7 @@ impl AssistantPanel {
                .log_err()
                .flatten()
            {
-                Some(serde_json::from_str::<SerializedAssistantPanel>(&panel)?)
+                Some(serde_json::from_str::<SerializedAgentPanel>(&panel)?)
            } else {
                None
            };
@@ -491,7 +500,6 @@ impl AssistantPanel {
                thread_store.downgrade(),
                context_store.downgrade(),
                thread.clone(),
-                agent_panel_dock_position(cx),
                window,
                cx,
            )
@@ -822,7 +830,6 @@ impl AssistantPanel {
                self.thread_store.downgrade(),
                self.context_store.downgrade(),
                thread,
-                agent_panel_dock_position(cx),
                window,
                cx,
            )
@@ -1031,7 +1038,6 @@ impl AssistantPanel {
                self.thread_store.downgrade(),
                self.context_store.downgrade(),
                thread,
-                agent_panel_dock_position(cx),
                window,
                cx,
            )
@@ -1166,15 +1172,13 @@ impl AssistantPanel {

        self.set_active_view(ActiveView::Configuration, window, cx);
        self.configuration =
-            Some(cx.new(|cx| {
-                AssistantConfiguration::new(fs, context_server_store, tools, window, cx)
-            }));
+            Some(cx.new(|cx| AgentConfiguration::new(fs, context_server_store, tools, window, cx)));

        if let Some(configuration) = self.configuration.as_ref() {
            self.configuration_subscription = Some(cx.subscribe_in(
                configuration,
                window,
-                Self::handle_assistant_configuration_event,
+                Self::handle_agent_configuration_event,
            ));

            configuration.focus_handle(cx).focus(window);
@@ -1204,9 +1208,9 @@ impl AssistantPanel {
            .detach_and_log_err(cx);
    }

-    fn handle_assistant_configuration_event(
+    fn handle_agent_configuration_event(
        &mut self,
-        _entity: &Entity<AssistantConfiguration>,
+        _entity: &Entity<AgentConfiguration>,
        event: &AssistantConfigurationEvent,
        window: &mut Window,
        cx: &mut Context<Self>,
@@ -1319,7 +1323,7 @@ impl AssistantPanel {
    }
 }

-impl Focusable for AssistantPanel {
+impl Focusable for AgentPanel {
    fn focus_handle(&self, cx: &App) -> FocusHandle {
        match &self.active_view {
            ActiveView::Thread { .. } => self.message_editor.focus_handle(cx),
@@ -1344,9 +1348,9 @@ fn agent_panel_dock_position(cx: &App) -> DockPosition {
    }
 }

-impl EventEmitter<PanelEvent> for AssistantPanel {}
+impl EventEmitter<PanelEvent> for AgentPanel {}

-impl Panel for AssistantPanel {
+impl Panel for AgentPanel {
    fn persistent_name() -> &'static str {
        "AgentPanel"
    }
@@ -1360,10 +1364,6 @@ impl Panel for AssistantPanel {
    }

    fn set_position(&mut self, position: DockPosition, _: &mut Window, cx: &mut Context<Self>) {
-        self.message_editor.update(cx, |message_editor, cx| {
-            message_editor.set_dock_position(position, cx);
-        });
-
        settings::update_settings_file::<AssistantSettings>(
            self.fs.clone(),
            cx,
@@ -1425,7 +1425,7 @@ impl Panel for AssistantPanel {
    }
 }

-impl AssistantPanel {
+impl AgentPanel {
    fn render_title_view(&self, _window: &mut Window, cx: &Context<Self>) -> AnyElement {
        const LOADING_SUMMARY_PLACEHOLDER: &str = "Loading Summary…";

@@ -1984,9 +1984,9 @@ impl AssistantPanel {
                                                    .style(ButtonStyle::Transparent)
                                                    .color(Color::Muted)
                                                    .on_click({
-                                                        let assistant_panel = cx.entity();
+                                                        let agent_panel = cx.entity();
                                                        move |_, _, cx| {
-                                                            assistant_panel.update(
+                                                            agent_panel.update(
                                                                cx,
                                                                |this, cx| {
                                                                    let hidden =
@@ -2345,14 +2345,13 @@ impl AssistantPanel {
            ""
        };

-        Some(
-            Banner::new()
-                .severity(ui::Severity::Info)
-                .child(h_flex().child(Label::new(format!(
-                    "Consecutive tool use limit reached.{max_mode_upsell}"
-                ))))
-                .into_any_element(),
-        )
+        let banner = Banner::new()
+            .severity(ui::Severity::Info)
+            .child(h_flex().child(Label::new(format!(
+                "Consecutive tool use limit reached.{max_mode_upsell}"
+            ))));
+
+        Some(div().px_2().pb_2().child(banner).into_any_element())
    }

    fn render_last_error(&self, cx: &mut Context<Self>) -> Option<AnyElement> {
@@ -2752,44 +2751,18 @@ impl AssistantPanel {
    }
 }

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

@@ -2863,28 +2866,26 @@ impl rules_library::InlineAssistDelegate for PromptLibraryInlineAssist {
        })
    }

-    fn focus_assistant_panel(
+    fn focus_agent_panel(
        &self,
        workspace: &mut Workspace,
        window: &mut Window,
        cx: &mut Context<Workspace>,
    ) -> bool {
-        workspace
-            .focus_panel::<AssistantPanel>(window, cx)
-            .is_some()
+        workspace.focus_panel::<AgentPanel>(window, cx).is_some()
    }
 }

 pub struct ConcreteAssistantPanelDelegate;

-impl AssistantPanelDelegate for ConcreteAssistantPanelDelegate {
+impl AgentPanelDelegate for ConcreteAssistantPanelDelegate {
    fn active_context_editor(
        &self,
        workspace: &mut Workspace,
        _window: &mut Window,
        cx: &mut Context<Workspace>,
    ) -> Option<Entity<ContextEditor>> {
-        let panel = workspace.panel::<AssistantPanel>(cx)?;
+        let panel = workspace.panel::<AgentPanel>(cx)?;
        panel.read(cx).active_context_editor()
    }

@@ -2895,7 +2896,7 @@ impl AssistantPanelDelegate for ConcreteAssistantPanelDelegate {
        window: &mut Window,
        cx: &mut Context<Workspace>,
    ) -> Task<Result<()>> {
-        let Some(panel) = workspace.panel::<AssistantPanel>(cx) else {
+        let Some(panel) = workspace.panel::<AgentPanel>(cx) else {
            return Task::ready(Err(anyhow!("Agent panel not found")));
        };

@@ -2922,12 +2923,12 @@ impl AssistantPanelDelegate for ConcreteAssistantPanelDelegate {
        window: &mut Window,
        cx: &mut Context<Workspace>,
    ) {
-        let Some(panel) = workspace.panel::<AssistantPanel>(cx) else {
+        let Some(panel) = workspace.panel::<AgentPanel>(cx) else {
            return;
        };

        if !panel.focus_handle(cx).contains_focused(window, cx) {
-            workspace.toggle_panel_focus::<AssistantPanel>(window, cx);
+            workspace.toggle_panel_focus::<AgentPanel>(window, cx);
        }

        panel.update(cx, |_, cx| {
--- a/crates/agent/src/assistant.rs
+++ b/crates/agent/src/assistant.rs
@@ -1,135 +0,0 @@
-mod active_thread;
-mod agent_diff;
-mod assistant_configuration;
-mod assistant_model_selector;
-mod assistant_panel;
-mod buffer_codegen;
-mod context;
-mod context_picker;
-mod context_server_configuration;
-mod context_server_tool;
-mod context_store;
-mod context_strip;
-mod debug;
-mod history_store;
-mod inline_assistant;
-mod inline_prompt_editor;
-mod message_editor;
-mod profile_selector;
-mod terminal_codegen;
-mod terminal_inline_assistant;
-mod thread;
-mod thread_history;
-mod thread_store;
-mod tool_compatibility;
-mod tool_use;
-mod ui;
-
-use std::sync::Arc;
-
-use assistant_settings::{AgentProfileId, AssistantSettings};
-use client::Client;
-use fs::Fs;
-use gpui::{App, actions, impl_actions};
-use language::LanguageRegistry;
-use prompt_store::PromptBuilder;
-use schemars::JsonSchema;
-use serde::Deserialize;
-use settings::Settings as _;
-use thread::ThreadId;
-
-pub use crate::active_thread::ActiveThread;
-use crate::assistant_configuration::{AddContextServerModal, ManageProfilesModal};
-pub use crate::assistant_panel::{AssistantPanel, ConcreteAssistantPanelDelegate};
-pub use crate::context::{ContextLoadResult, LoadedContext};
-pub use crate::inline_assistant::InlineAssistant;
-pub use crate::thread::{Message, MessageSegment, Thread, ThreadEvent};
-pub use crate::thread_store::{TextThreadStore, ThreadStore};
-pub use agent_diff::{AgentDiffPane, AgentDiffToolbar};
-pub use context_store::ContextStore;
-pub use ui::preview::{all_agent_previews, get_agent_preview};
-
-actions!(
-    agent,
-    [
-        NewTextThread,
-        ToggleContextPicker,
-        ToggleNavigationMenu,
-        ToggleOptionsMenu,
-        DeleteRecentlyOpenThread,
-        ToggleProfileSelector,
-        RemoveAllContext,
-        ExpandMessageEditor,
-        OpenHistory,
-        AddContextServer,
-        RemoveSelectedThread,
-        Chat,
-        CycleNextInlineAssist,
-        CyclePreviousInlineAssist,
-        FocusUp,
-        FocusDown,
-        FocusLeft,
-        FocusRight,
-        RemoveFocusedContext,
-        AcceptSuggestedContext,
-        OpenActiveThreadAsMarkdown,
-        OpenAgentDiff,
-        Keep,
-        Reject,
-        RejectAll,
-        KeepAll,
-        Follow,
-        ResetTrialUpsell,
-    ]
-);
-
-#[derive(Default, Clone, PartialEq, Deserialize, JsonSchema)]
-pub struct NewThread {
-    #[serde(default)]
-    from_thread_id: Option<ThreadId>,
-}
-
-#[derive(PartialEq, Clone, Default, Debug, Deserialize, JsonSchema)]
-pub struct ManageProfiles {
-    #[serde(default)]
-    pub customize_tools: Option<AgentProfileId>,
-}
-
-impl ManageProfiles {
-    pub fn customize_tools(profile_id: AgentProfileId) -> Self {
-        Self {
-            customize_tools: Some(profile_id),
-        }
-    }
-}
-
-impl_actions!(agent, [NewThread, ManageProfiles]);
-
-/// Initializes the `agent` crate.
-pub fn init(
-    fs: Arc<dyn Fs>,
-    client: Arc<Client>,
-    prompt_builder: Arc<PromptBuilder>,
-    language_registry: Arc<LanguageRegistry>,
-    cx: &mut App,
-) {
-    AssistantSettings::register(cx);
-    thread_store::init(cx);
-    assistant_panel::init(cx);
-    context_server_configuration::init(language_registry, cx);
-
-    inline_assistant::init(
-        fs.clone(),
-        prompt_builder.clone(),
-        client.telemetry().clone(),
-        cx,
-    );
-    terminal_inline_assistant::init(
-        fs.clone(),
-        prompt_builder.clone(),
-        client.telemetry().clone(),
-        cx,
-    );
-    cx.observe_new(AddContextServerModal::register).detach();
-    cx.observe_new(ManageProfilesModal::register).detach();
-}
--- a/crates/agent/src/buffer_codegen.rs
+++ b/crates/agent/src/buffer_codegen.rs
@@ -466,6 +466,7 @@ impl CodegenAlternative {
                prompt_id: None,
                mode: None,
                tools: Vec::new(),
+                tool_choice: None,
                stop: Vec::new(),
                temperature,
                messages: vec![request_message],
--- a/crates/agent/src/context.rs
+++ b/crates/agent/src/context.rs
@@ -754,11 +754,11 @@ pub enum ImageStatus {

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

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

    pub fn image(&self) -> Option<LanguageModelImage> {
--- a/crates/agent/src/context_picker.rs
+++ b/crates/agent/src/context_picker.rs
@@ -36,7 +36,7 @@ use ui::{
 use uuid::Uuid;
 use workspace::{Workspace, notifications::NotifyResultExt};

-use crate::AssistantPanel;
+use crate::AgentPanel;
 use crate::context::RULES_ICON;
 use crate::context_store::ContextStore;
 use crate::thread::ThreadId;
@@ -648,7 +648,7 @@ fn recent_context_picker_entries(
    let current_threads = context_store.read(cx).thread_ids();

    let active_thread_id = workspace
-        .panel::<AssistantPanel>(cx)
+        .panel::<AgentPanel>(cx)
        .and_then(|panel| Some(panel.read(cx).active_thread()?.read(cx).id()));

    if let Some((thread_store, text_thread_store)) = thread_store
--- a/crates/agent/src/context_server_configuration.rs
+++ b/crates/agent/src/context_server_configuration.rs
@@ -10,7 +10,7 @@ use ui::prelude::*;
 use util::ResultExt;
 use workspace::Workspace;

-use crate::assistant_configuration::ConfigureContextServerModal;
+use crate::agent_configuration::ConfigureContextServerModal;

 pub(crate) fn init(language_registry: Arc<LanguageRegistry>, cx: &mut App) {
    cx.observe_new(move |_: &mut Workspace, window, cx| {
--- a/crates/agent/src/context_server_tool.rs
+++ b/crates/agent/src/context_server_tool.rs
@@ -4,7 +4,7 @@ use anyhow::{Result, anyhow, bail};
 use assistant_tool::{ActionLog, Tool, ToolResult, ToolSource};
 use context_server::{ContextServerId, types};
 use gpui::{AnyWindowHandle, App, Entity, Task};
-use language_model::{LanguageModelRequestMessage, LanguageModelToolSchemaFormat};
+use language_model::{LanguageModel, LanguageModelRequest, LanguageModelToolSchemaFormat};
 use project::{Project, context_server_store::ContextServerStore};
 use ui::IconName;

@@ -72,9 +72,10 @@ impl Tool for ContextServerTool {
    fn run(
        self: Arc<Self>,
        input: serde_json::Value,
-        _messages: &[LanguageModelRequestMessage],
+        _request: Arc<LanguageModelRequest>,
        _project: Entity<Project>,
        _action_log: Entity<ActionLog>,
+        _model: Arc<dyn LanguageModel>,
        _window: Option<AnyWindowHandle>,
        cx: &mut App,
    ) -> ToolResult {
--- a/crates/agent/src/context_strip.rs
+++ b/crates/agent/src/context_strip.rs
@@ -22,7 +22,7 @@ use crate::thread::Thread;
 use crate::thread_store::{TextThreadStore, ThreadStore};
 use crate::ui::{AddedContext, ContextPill};
 use crate::{
-    AcceptSuggestedContext, AssistantPanel, FocusDown, FocusLeft, FocusRight, FocusUp,
+    AcceptSuggestedContext, AgentPanel, FocusDown, FocusLeft, FocusRight, FocusUp,
    RemoveAllContext, RemoveFocusedContext, ToggleContextPicker,
 };

@@ -144,7 +144,7 @@ impl ContextStrip {
        }

        let workspace = self.workspace.upgrade()?;
-        let panel = workspace.read(cx).panel::<AssistantPanel>(cx)?.read(cx);
+        let panel = workspace.read(cx).panel::<AgentPanel>(cx)?.read(cx);

        if let Some(active_thread) = panel.active_thread() {
            let weak_active_thread = active_thread.downgrade();
--- a/crates/agent/src/inline_assistant.rs
+++ b/crates/agent/src/inline_assistant.rs
@@ -8,9 +8,10 @@ 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,
-    GutterDimensions, MultiBuffer, MultiBufferSnapshot, ToOffset as _, ToPoint,
+    MultiBuffer, MultiBufferSnapshot, ToOffset as _, ToPoint,
    actions::SelectAll,
    display_map::{
        BlockContext, BlockPlacement, BlockProperties, BlockStyle, CustomBlockId, RenderBlock,
@@ -42,7 +43,7 @@ use util::ResultExt;
 use workspace::{ItemHandle, Toast, Workspace, dock::Panel, notifications::NotificationId};
 use zed_actions::agent::OpenConfiguration;

-use crate::AssistantPanel;
+use crate::AgentPanel;
 use crate::buffer_codegen::{BufferCodegen, CodegenAlternative, CodegenEvent};
 use crate::context_store::ContextStore;
 use crate::inline_prompt_editor::{CodegenStatus, InlineAssistId, PromptEditor, PromptEditorEvent};
@@ -181,13 +182,12 @@ impl InlineAssistant {
        if let Some(editor) = item.act_as::<Editor>(cx) {
            editor.update(cx, |editor, cx| {
                if is_assistant2_enabled {
-                    let panel = workspace.read(cx).panel::<AssistantPanel>(cx);
+                    let panel = workspace.read(cx).panel::<AgentPanel>(cx);
                    let thread_store = panel
                        .as_ref()
-                        .map(|assistant_panel| assistant_panel.read(cx).thread_store().downgrade());
-                    let text_thread_store = panel.map(|assistant_panel| {
-                        assistant_panel.read(cx).text_thread_store().downgrade()
-                    });
+                        .map(|agent_panel| agent_panel.read(cx).thread_store().downgrade());
+                    let text_thread_store = panel
+                        .map(|agent_panel| agent_panel.read(cx).text_thread_store().downgrade());

                    editor.add_code_action_provider(
                        Rc::new(AssistantCodeActionProvider {
@@ -226,7 +226,7 @@ impl InlineAssistant {

        let Some(inline_assist_target) = Self::resolve_inline_assist_target(
            workspace,
-            workspace.panel::<AssistantPanel>(cx),
+            workspace.panel::<AgentPanel>(cx),
            window,
            cx,
        ) else {
@@ -239,15 +239,15 @@ impl InlineAssistant {
                .map_or(false, |model| model.provider.is_authenticated(cx))
        };

-        let Some(assistant_panel) = workspace.panel::<AssistantPanel>(cx) else {
+        let Some(agent_panel) = workspace.panel::<AgentPanel>(cx) else {
            return;
        };
-        let assistant_panel = assistant_panel.read(cx);
+        let agent_panel = agent_panel.read(cx);

-        let prompt_store = assistant_panel.prompt_store().as_ref().cloned();
-        let thread_store = Some(assistant_panel.thread_store().downgrade());
-        let text_thread_store = Some(assistant_panel.text_thread_store().downgrade());
-        let context_store = assistant_panel.inline_assist_context_store().clone();
+        let prompt_store = agent_panel.prompt_store().as_ref().cloned();
+        let thread_store = Some(agent_panel.thread_store().downgrade());
+        let text_thread_store = Some(agent_panel.text_thread_store().downgrade());
+        let context_store = agent_panel.inline_assist_context_store().clone();

        let handle_assist =
            |window: &mut Window, cx: &mut Context<Workspace>| match inline_assist_target {
@@ -458,11 +458,11 @@ impl InlineAssistant {
                )
            });

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

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

@@ -1405,11 +1407,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>(
@@ -1433,11 +1435,12 @@ impl InlineAssistant {
                            .bg(cx.theme().status().deleted_background)
                            .size_full()
                            .h(height as f32 * cx.window.line_height())
-                            .pl(cx.gutter_dimensions.full_width())
+                            .pl(cx.margins.gutter.full_width())
                            .child(deleted_lines_editor.clone())
                            .into_any_element()
                    }),
                    priority: 0,
+                    render_in_minimap: false,
                });
            }

@@ -1450,7 +1453,7 @@ impl InlineAssistant {

    fn resolve_inline_assist_target(
        workspace: &mut Workspace,
-        assistant_panel: Option<Entity<AssistantPanel>>,
+        agent_panel: Option<Entity<AgentPanel>>,
        window: &mut Window,
        cx: &mut App,
    ) -> Option<InlineAssistTarget> {
@@ -1470,7 +1473,7 @@ impl InlineAssistant {
            }
        }

-        let context_editor = assistant_panel
+        let context_editor = agent_panel
            .and_then(|panel| panel.read(cx).active_context_editor())
            .and_then(|editor| {
                let editor = &editor.read(cx).editor().clone();
@@ -1595,9 +1598,9 @@ fn build_assist_editor_renderer(editor: &Entity<PromptEditor<BufferCodegen>>) ->
    let editor = editor.clone();

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

-        *gutter_dimensions.lock() = *cx.gutter_dimensions;
+        *editor_margins.lock() = *cx.margins;
        editor.clone().into_any_element()
    })
 }
--- a/crates/agent/src/inline_prompt_editor.rs
+++ b/crates/agent/src/inline_prompt_editor.rs
@@ -1,4 +1,4 @@
-use crate::assistant_model_selector::{AssistantModelSelector, ModelType};
+use crate::agent_model_selector::{AgentModelSelector, ModelType};
 use crate::buffer_codegen::BufferCodegen;
 use crate::context::ContextCreasesAddon;
 use crate::context_picker::{ContextPicker, ContextPickerCompletionProvider};
@@ -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,
-    GutterDimensions, MultiBuffer,
+    ContextMenuOptions, Editor, EditorElement, EditorEvent, EditorMode, EditorStyle, MultiBuffer,
    actions::{MoveDown, MoveUp},
 };
 use feature_flags::{FeatureFlagAppExt as _, ZedProFeatureFlag};
@@ -42,7 +42,7 @@ pub struct PromptEditor<T> {
    context_store: Entity<ContextStore>,
    context_strip: Entity<ContextStrip>,
    context_picker_menu_handle: PopoverMenuHandle<ContextPicker>,
-    model_selector: Entity<AssistantModelSelector>,
+    model_selector: Entity<AgentModelSelector>,
    edited_since_done: bool,
    prompt_history: VecDeque<String>,
    prompt_history_ix: Option<usize>,
@@ -61,11 +61,13 @@ impl<T: 'static> Render for PromptEditor<T> {
        let ui_font_size = ThemeSettings::get_global(cx).ui_font_size(cx);
        let mut buttons = Vec::new();

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

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

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

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

@@ -100,7 +106,7 @@ impl<T: 'static> Render for PromptEditor<T> {
            .size_full()
            .pt_0p5()
            .pb(bottom_padding)
-            .pr_6()
+            .pr(right_padding)
            .child(
                h_flex()
                    .items_start()
@@ -284,12 +290,12 @@ impl<T: 'static> PromptEditor<T> {
            PromptEditorMode::Terminal { .. } => "Generate",
        };

-        let assistant_panel_keybinding =
+        let agent_panel_keybinding =
            ui::text_for_action(&zed_actions::assistant::ToggleFocus, window, cx)
                .map(|keybinding| format!("{keybinding} to chat ― "))
                .unwrap_or_default();

-        format!("{action}… ({assistant_panel_keybinding}↓↑ for history)")
+        format!("{action}… ({agent_panel_keybinding}↓↑ for history)")
    }

    pub fn prompt(&self, cx: &App) -> String {
@@ -806,7 +812,7 @@ pub enum PromptEditorMode {
    Buffer {
        id: InlineAssistId,
        codegen: Entity<BufferCodegen>,
-        gutter_dimensions: Arc<Mutex<GutterDimensions>>,
+        editor_margins: Arc<Mutex<EditorMargins>>,
    },
    Terminal {
        id: TerminalInlineAssistId,
@@ -838,7 +844,7 @@ impl InlineAssistId {
 impl PromptEditor<BufferCodegen> {
    pub fn new_buffer(
        id: InlineAssistId,
-        gutter_dimensions: Arc<Mutex<GutterDimensions>>,
+        editor_margins: Arc<Mutex<EditorMargins>>,
        prompt_history: VecDeque<String>,
        prompt_buffer: Entity<MultiBuffer>,
        codegen: Entity<BufferCodegen>,
@@ -855,7 +861,7 @@ impl PromptEditor<BufferCodegen> {
        let mode = PromptEditorMode::Buffer {
            id,
            codegen,
-            gutter_dimensions,
+            editor_margins,
        };

        let prompt_editor = cx.new(|cx| {
@@ -921,7 +927,7 @@ impl PromptEditor<BufferCodegen> {
            context_strip,
            context_picker_menu_handle,
            model_selector: cx.new(|cx| {
-                AssistantModelSelector::new(
+                AgentModelSelector::new(
                    fs,
                    model_selector_menu_handle,
                    prompt_editor.focus_handle(cx),
@@ -995,11 +1001,9 @@ impl PromptEditor<BufferCodegen> {
        }
    }

-    pub fn gutter_dimensions(&self) -> &Arc<Mutex<GutterDimensions>> {
+    pub fn editor_margins(&self) -> &Arc<Mutex<EditorMargins>> {
        match &self.mode {
-            PromptEditorMode::Buffer {
-                gutter_dimensions, ..
-            } => gutter_dimensions,
+            PromptEditorMode::Buffer { editor_margins, .. } => editor_margins,
            PromptEditorMode::Terminal { .. } => unreachable!(),
        }
    }
@@ -1094,7 +1098,7 @@ impl PromptEditor<TerminalCodegen> {
            context_strip,
            context_picker_menu_handle,
            model_selector: cx.new(|cx| {
-                AssistantModelSelector::new(
+                AgentModelSelector::new(
                    fs,
                    model_selector_menu_handle.clone(),
                    prompt_editor.focus_handle(cx),
--- a/crates/agent/src/message_editor.rs
+++ b/crates/agent/src/message_editor.rs
@@ -1,7 +1,7 @@
 use std::collections::BTreeMap;
 use std::sync::Arc;

-use crate::assistant_model_selector::{AssistantModelSelector, ModelType};
+use crate::agent_model_selector::{AgentModelSelector, ModelType};
 use crate::context::{AgentContextKey, ContextCreasesAddon, ContextLoadResult, load_context};
 use crate::tool_compatibility::{IncompatibleToolsState, IncompatibleToolsTooltip};
 use crate::ui::{
@@ -38,9 +38,8 @@ use proto::Plan;
 use settings::Settings;
 use std::time::Duration;
 use theme::ThemeSettings;
-use ui::{Disclosure, DocumentationSide, KeyBinding, PopoverMenuHandle, Tooltip, prelude::*};
+use ui::{Disclosure, KeyBinding, PopoverMenuHandle, Tooltip, prelude::*};
 use util::{ResultExt as _, maybe};
-use workspace::dock::DockPosition;
 use workspace::{CollaboratorId, Workspace};

 use crate::context_picker::{ContextPicker, ContextPickerCompletionProvider, crease_for_mention};
@@ -66,7 +65,7 @@ pub struct MessageEditor {
    prompt_store: Option<Entity<PromptStore>>,
    context_strip: Entity<ContextStrip>,
    context_picker_menu_handle: PopoverMenuHandle<ContextPicker>,
-    model_selector: Entity<AssistantModelSelector>,
+    model_selector: Entity<AgentModelSelector>,
    last_loaded_context: Option<ContextLoadResult>,
    load_context_task: Option<Shared<Task<()>>>,
    profile_selector: Entity<ProfileSelector>,
@@ -133,14 +132,6 @@ pub(crate) fn create_editor(
    editor
 }

-fn documentation_side(position: DockPosition) -> DocumentationSide {
-    match position {
-        DockPosition::Left => DocumentationSide::Right,
-        DockPosition::Bottom => DocumentationSide::Left,
-        DockPosition::Right => DocumentationSide::Left,
-    }
-}
-
 impl MessageEditor {
    pub fn new(
        fs: Arc<dyn Fs>,
@@ -151,7 +142,6 @@ impl MessageEditor {
        thread_store: WeakEntity<ThreadStore>,
        text_thread_store: WeakEntity<TextThreadStore>,
        thread: Entity<Thread>,
-        dock_position: DockPosition,
        window: &mut Window,
        cx: &mut Context<Self>,
    ) -> Self {
@@ -199,7 +189,7 @@ impl MessageEditor {
        ];

        let model_selector = cx.new(|cx| {
-            AssistantModelSelector::new(
+            AgentModelSelector::new(
                fs.clone(),
                model_selector_menu_handle,
                editor.focus_handle(cx),
@@ -209,6 +199,10 @@ impl MessageEditor {
            )
        });

+        let profile_selector = cx.new(|cx| {
+            ProfileSelector::new(thread.clone(), thread_store, editor.focus_handle(cx), cx)
+        });
+
        Self {
            editor: editor.clone(),
            project: thread.read(cx).project().clone(),
@@ -225,15 +219,7 @@ impl MessageEditor {
            model_selector,
            edits_expanded: false,
            editor_is_expanded: false,
-            profile_selector: cx.new(|cx| {
-                ProfileSelector::new(
-                    fs,
-                    thread_store,
-                    editor.focus_handle(cx),
-                    documentation_side(dock_position),
-                    cx,
-                )
-            }),
+            profile_selector,
            last_estimated_token_count: None,
            update_token_count_task: None,
            _subscriptions: subscriptions,
@@ -1259,6 +1245,7 @@ impl MessageEditor {
                        mode: None,
                        messages: vec![request_message],
                        tools: vec![],
+                        tool_choice: None,
                        stop: vec![],
                        temperature: AssistantSettings::temperature_for_model(&model.model, cx),
                    };
@@ -1283,12 +1270,6 @@ impl MessageEditor {
            .ok();
        }));
    }
-
-    pub fn set_dock_position(&mut self, position: DockPosition, cx: &mut Context<Self>) {
-        self.profile_selector.update(cx, |profile_selector, cx| {
-            profile_selector.set_documentation_side(documentation_side(position), cx)
-        });
-    }
 }

 pub fn extract_message_creases(
@@ -1462,7 +1443,6 @@ impl AgentPreview for MessageEditor {
                    thread_store.downgrade(),
                    text_thread_store.downgrade(),
                    thread,
-                    DockPosition::Left,
                    window,
                    cx,
                )
--- a/crates/agent/src/profile_selector.rs
+++ b/crates/agent/src/profile_selector.rs
@@ -1,36 +1,32 @@
-use std::sync::Arc;
-
 use assistant_settings::{
-    AgentProfile, AgentProfileId, AssistantSettings, GroupedAgentProfiles, builtin_profiles,
+    AgentProfile, AgentProfileId, AssistantDockPosition, AssistantSettings, GroupedAgentProfiles,
+    builtin_profiles,
 };
-use fs::Fs;
 use gpui::{Action, Entity, FocusHandle, Subscription, WeakEntity, prelude::*};
 use language_model::LanguageModelRegistry;
-use settings::{Settings as _, SettingsStore, update_settings_file};
+use settings::{Settings as _, SettingsStore};
 use ui::{
    ContextMenu, ContextMenuEntry, DocumentationSide, PopoverMenu, PopoverMenuHandle, Tooltip,
    prelude::*,
 };
 use util::ResultExt as _;

-use crate::{ManageProfiles, ThreadStore, ToggleProfileSelector};
+use crate::{ManageProfiles, Thread, ThreadStore, ToggleProfileSelector};

 pub struct ProfileSelector {
    profiles: GroupedAgentProfiles,
-    fs: Arc<dyn Fs>,
+    thread: Entity<Thread>,
    thread_store: WeakEntity<ThreadStore>,
    menu_handle: PopoverMenuHandle<ContextMenu>,
    focus_handle: FocusHandle,
    _subscriptions: Vec<Subscription>,
-    documentation_side: DocumentationSide,
 }

 impl ProfileSelector {
    pub fn new(
-        fs: Arc<dyn Fs>,
+        thread: Entity<Thread>,
        thread_store: WeakEntity<ThreadStore>,
        focus_handle: FocusHandle,
-        documentation_side: DocumentationSide,
        cx: &mut Context<Self>,
    ) -> Self {
        let settings_subscription = cx.observe_global::<SettingsStore>(move |this, cx| {
@@ -39,20 +35,14 @@ impl ProfileSelector {

        Self {
            profiles: GroupedAgentProfiles::from_settings(AssistantSettings::get_global(cx)),
-            fs,
+            thread,
            thread_store,
            menu_handle: PopoverMenuHandle::default(),
            focus_handle,
            _subscriptions: vec![settings_subscription],
-            documentation_side,
        }
    }

-    pub fn set_documentation_side(&mut self, side: DocumentationSide, cx: &mut Context<Self>) {
-        self.documentation_side = side;
-        cx.notify();
-    }
-
    pub fn menu_handle(&self) -> PopoverMenuHandle<ContextMenu> {
        self.menu_handle.clone()
    }
@@ -69,8 +59,12 @@ impl ProfileSelector {
        ContextMenu::build(window, cx, |mut menu, _window, cx| {
            let settings = AssistantSettings::get_global(cx);
            for (profile_id, profile) in self.profiles.builtin.iter() {
-                menu =
-                    menu.item(self.menu_entry_for_profile(profile_id.clone(), profile, settings));
+                menu = menu.item(self.menu_entry_for_profile(
+                    profile_id.clone(),
+                    profile,
+                    settings,
+                    cx,
+                ));
            }

            if !self.profiles.custom.is_empty() {
@@ -80,6 +74,7 @@ impl ProfileSelector {
                        profile_id.clone(),
                        profile,
                        settings,
+                        cx,
                    ));
                }
            }
@@ -100,6 +95,7 @@ impl ProfileSelector {
        profile_id: AgentProfileId,
        profile: &AgentProfile,
        settings: &AssistantSettings,
+        cx: &App,
    ) -> ContextMenuEntry {
        let documentation = match profile.name.to_lowercase().as_str() {
            builtin_profiles::WRITE => Some("Get help to write anything."),
@@ -108,11 +104,15 @@ impl ProfileSelector {
            _ => None,
        };

-        let entry = ContextMenuEntry::new(profile.name.clone())
-            .toggleable(IconPosition::End, profile_id == settings.default_profile);
+        let current_profile_id = self.thread.read(cx).configured_profile_id();
+
+        let entry = ContextMenuEntry::new(profile.name.clone()).toggleable(
+            IconPosition::End,
+            Some(profile_id.clone()) == current_profile_id,
+        );

        let entry = if let Some(doc_text) = documentation {
-            entry.documentation_aside(self.documentation_side, move |_| {
+            entry.documentation_aside(documentation_side(settings.dock), move |_| {
                Label::new(doc_text).into_any_element()
            })
        } else {
@@ -120,15 +120,13 @@ impl ProfileSelector {
        };

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

                thread_store
@@ -144,58 +142,78 @@ impl ProfileSelector {
 impl Render for ProfileSelector {
    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
        let settings = AssistantSettings::get_global(cx);
-        let profile_id = &settings.default_profile;
-        let profile = settings.profiles.get(profile_id);
+        let profile_id = self
+            .thread
+            .read(cx)
+            .configured_profile_id()
+            .unwrap_or(settings.default_profile.clone());
+        let profile = settings.profiles.get(&profile_id).cloned();

        let selected_profile = profile
            .map(|profile| profile.name.clone())
            .unwrap_or_else(|| "Unknown".into());

-        let model_registry = LanguageModelRegistry::read_global(cx);
-        let supports_tools = model_registry
-            .default_model()
-            .map_or(false, |default| default.model.supports_tools());
+        let configured_model = self
+            .thread
+            .read_with(cx, |thread, _cx| thread.configured_model())
+            .or_else(|| {
+                let model_registry = LanguageModelRegistry::read_global(cx);
+                model_registry.default_model()
+            });
+        let supports_tools =
+            configured_model.map_or(false, |default| default.model.supports_tools());

-        let this = cx.entity().clone();
-        let focus_handle = self.focus_handle.clone();
-
-        let trigger_button = if supports_tools {
-            Button::new("profile-selector-model", selected_profile)
+        if supports_tools {
+            let this = cx.entity().clone();
+            let focus_handle = self.focus_handle.clone();
+            let trigger_button = Button::new("profile-selector-model", selected_profile)
                .label_size(LabelSize::Small)
                .color(Color::Muted)
                .icon(IconName::ChevronDown)
                .icon_size(IconSize::XSmall)
                .icon_position(IconPosition::End)
-                .icon_color(Color::Muted)
+                .icon_color(Color::Muted);
+
+            PopoverMenu::new("profile-selector")
+                .trigger_with_tooltip(trigger_button, {
+                    let focus_handle = focus_handle.clone();
+                    move |window, cx| {
+                        Tooltip::for_action_in(
+                            "Toggle Profile Menu",
+                            &ToggleProfileSelector,
+                            &focus_handle,
+                            window,
+                            cx,
+                        )
+                    }
+                })
+                .anchor(
+                    if documentation_side(settings.dock) == DocumentationSide::Left {
+                        gpui::Corner::BottomRight
+                    } else {
+                        gpui::Corner::BottomLeft
+                    },
+                )
+                .with_handle(self.menu_handle.clone())
+                .menu(move |window, cx| {
+                    Some(this.update(cx, |this, cx| this.build_context_menu(window, cx)))
+                })
+                .into_any_element()
        } else {
-            Button::new("tools-not-supported-button", "No Tools")
+            Button::new("tools-not-supported-button", "Tools Unsupported")
                .disabled(true)
                .label_size(LabelSize::Small)
                .color(Color::Muted)
-                .tooltip(Tooltip::text("The current model does not support tools."))
-        };
-
-        PopoverMenu::new("profile-selector")
-            .trigger_with_tooltip(trigger_button, {
-                let focus_handle = focus_handle.clone();
-                move |window, cx| {
-                    Tooltip::for_action_in(
-                        "Toggle Profile Menu",
-                        &ToggleProfileSelector,
-                        &focus_handle,
-                        window,
-                        cx,
-                    )
-                }
-            })
-            .anchor(if self.documentation_side == DocumentationSide::Left {
-                gpui::Corner::BottomRight
-            } else {
-                gpui::Corner::BottomLeft
-            })
-            .with_handle(self.menu_handle.clone())
-            .menu(move |window, cx| {
-                Some(this.update(cx, |this, cx| this.build_context_menu(window, cx)))
-            })
+                .tooltip(Tooltip::text("This model does not support tools."))
+                .into_any_element()
+        }
+    }
+}
+
+fn documentation_side(position: AssistantDockPosition) -> DocumentationSide {
+    match position {
+        AssistantDockPosition::Left => DocumentationSide::Right,
+        AssistantDockPosition::Bottom => DocumentationSide::Left,
+        AssistantDockPosition::Right => DocumentationSide::Left,
    }
 }
--- a/crates/assistant/src/slash_command_settings.rs
+++ b/crates/assistant/src/slash_command_settings.rs
--- a/crates/agent/src/terminal_inline_assistant.rs
+++ b/crates/agent/src/terminal_inline_assistant.rs
@@ -293,6 +293,7 @@ impl TerminalInlineAssistant {
                mode: None,
                messages: vec![request_message],
                tools: Vec::new(),
+                tool_choice: None,
                stop: Vec::new(),
                temperature,
            }
--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
@@ -5,7 +5,7 @@ use std::sync::Arc;
 use std::time::Instant;

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

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

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

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

+        let configured_profile_id = serialized.profile.clone();
+
        Self {
            id,
            updated_at: serialized.updated_at,
@@ -541,6 +547,7 @@ impl Thread {
            request_callback: None,
            remaining_turns: u32::MAX,
            configured_model,
+            configured_profile_id,
        }
    }

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

+    pub fn configured_profile_id(&self) -> Option<AgentProfileId> {
+        self.configured_profile_id.clone()
+    }
+
+    pub fn set_configured_profile_id(
+        &mut self,
+        id: Option<AgentProfileId>,
+        cx: &mut Context<Self>,
+    ) {
+        self.configured_profile_id = id;
+        cx.notify();
+    }
+
    pub const DEFAULT_SUMMARY: SharedString = SharedString::new_static("New Thread");

    pub fn summary_or_default(&self) -> SharedString {
@@ -1100,6 +1120,7 @@ impl Thread {
                        provider: model.provider.id().0.to_string(),
                        model: model.model.id().0.to_string(),
                    }),
+                profile: this.configured_profile_id.clone(),
                completion_mode: Some(this.completion_mode),
            })
        })
@@ -1153,6 +1174,7 @@ impl Thread {
            mode: None,
            messages: vec![],
            tools: Vec::new(),
+            tool_choice: None,
            stop: Vec::new(),
            temperature: AssistantSettings::temperature_for_model(&model, cx),
        };
@@ -1197,6 +1219,7 @@ impl Thread {
            }));
        }

+        let mut message_ix_to_cache = None;
        for message in &self.messages {
            let mut request_message = LanguageModelRequestMessage {
                role: message.role,
@@ -1233,19 +1256,57 @@ impl Thread {
                };
            }

-            self.tool_use
-                .attach_tool_uses(message.id, &mut request_message);
+            let mut cache_message = true;
+            let mut tool_results_message = LanguageModelRequestMessage {
+                role: Role::User,
+                content: Vec::new(),
+                cache: false,
+            };
+            for (tool_use, tool_result) in self.tool_use.tool_results(message.id) {
+                if let Some(tool_result) = tool_result {
+                    request_message
+                        .content
+                        .push(MessageContent::ToolUse(tool_use.clone()));
+                    tool_results_message
+                        .content
+                        .push(MessageContent::ToolResult(LanguageModelToolResult {
+                            tool_use_id: tool_use.id.clone(),
+                            tool_name: tool_result.tool_name.clone(),
+                            is_error: tool_result.is_error,
+                            content: if tool_result.content.is_empty() {
+                                // Surprisingly, the API fails if we return an empty string here.
+                                // It thinks we are sending a tool use without a tool result.
+                                "<Tool returned an empty string>".into()
+                            } else {
+                                tool_result.content.clone()
+                            },
+                            output: None,
+                        }));
+                } else {
+                    cache_message = false;
+                    log::debug!(
+                        "skipped tool use {:?} because it is still pending",
+                        tool_use
+                    );
+                }
+            }

+            if cache_message {
+                message_ix_to_cache = Some(request.messages.len());
+            }
            request.messages.push(request_message);

-            if let Some(tool_results_message) = self.tool_use.tool_results_message(message.id) {
+            if !tool_results_message.content.is_empty() {
+                if cache_message {
+                    message_ix_to_cache = Some(request.messages.len());
+                }
                request.messages.push(tool_results_message);
            }
        }

        // https://docs.anthropic.com/en/docs/build-with-claude/prompt-caching
-        if let Some(last) = request.messages.last_mut() {
-            last.cache = true;
+        if let Some(message_ix_to_cache) = message_ix_to_cache {
+            request.messages[message_ix_to_cache].cache = true;
        }

        self.attached_tracked_files_state(&mut request.messages, cx);
@@ -1272,6 +1333,7 @@ impl Thread {
            mode: None,
            messages: vec![],
            tools: Vec::new(),
+            tool_choice: None,
            stop: Vec::new(),
            temperature: AssistantSettings::temperature_for_model(model, cx),
        };
@@ -1546,9 +1608,9 @@ impl Thread {
                                            completion.queue_state =  QueueState::Started;
                                        }
                                        CompletionRequestStatus::Failed {
-                                            code, message
+                                            code, message, request_id
                                        } => {
-                                            return Err(anyhow!("completion request failed. code: {code}, message: {message}"));
+                                            return Err(anyhow!("completion request failed. request_id: {request_id}, code: {code}, message: {message}"));
                                        }
                                        CompletionRequestStatus::UsageUpdated {
                                            amount, limit
@@ -1888,8 +1950,7 @@ impl Thread {
        model: Arc<dyn LanguageModel>,
    ) -> Vec<PendingToolUse> {
        self.auto_capture_telemetry(cx);
-        let request = self.to_completion_request(model, cx);
-        let messages = Arc::new(request.messages);
+        let request = Arc::new(self.to_completion_request(model.clone(), cx));
        let pending_tool_uses = self
            .tool_use
            .pending_tool_uses()
@@ -1907,7 +1968,7 @@ impl Thread {
                        tool_use.id.clone(),
                        tool_use.ui_text.clone(),
                        tool_use.input.clone(),
-                        messages.clone(),
+                        request.clone(),
                        tool,
                    );
                    cx.emit(ThreadEvent::ToolConfirmationNeeded);
@@ -1916,8 +1977,9 @@ impl Thread {
                        tool_use.id.clone(),
                        tool_use.ui_text.clone(),
                        tool_use.input.clone(),
-                        &messages,
+                        request.clone(),
                        tool,
+                        model.clone(),
                        window,
                        cx,
                    );
@@ -2010,12 +2072,14 @@ impl Thread {
        tool_use_id: LanguageModelToolUseId,
        ui_text: impl Into<SharedString>,
        input: serde_json::Value,
-        messages: &[LanguageModelRequestMessage],
+        request: Arc<LanguageModelRequest>,
        tool: Arc<dyn Tool>,
+        model: Arc<dyn LanguageModel>,
        window: Option<AnyWindowHandle>,
        cx: &mut Context<Thread>,
    ) {
-        let task = self.spawn_tool_use(tool_use_id.clone(), messages, input, tool, window, cx);
+        let task =
+            self.spawn_tool_use(tool_use_id.clone(), request, input, tool, model, window, cx);
        self.tool_use
            .run_pending_tool(tool_use_id, ui_text.into(), task);
    }
@@ -2023,9 +2087,10 @@ impl Thread {
    fn spawn_tool_use(
        &mut self,
        tool_use_id: LanguageModelToolUseId,
-        messages: &[LanguageModelRequestMessage],
+        request: Arc<LanguageModelRequest>,
        input: serde_json::Value,
        tool: Arc<dyn Tool>,
+        model: Arc<dyn LanguageModel>,
        window: Option<AnyWindowHandle>,
        cx: &mut Context<Thread>,
    ) -> Task<()> {
@@ -2036,9 +2101,10 @@ impl Thread {
        } else {
            tool.run(
                input,
-                messages,
+                request,
                self.project.clone(),
                self.action_log.clone(),
+                model,
                window,
                cx,
            )
@@ -2421,6 +2487,13 @@ impl Thread {

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

--- a/crates/agent/src/thread_history.rs
+++ b/crates/agent/src/thread_history.rs
@@ -19,10 +19,10 @@ use util::ResultExt;

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

 pub struct ThreadHistory {
-    assistant_panel: WeakEntity<AssistantPanel>,
+    agent_panel: WeakEntity<AgentPanel>,
    history_store: Entity<HistoryStore>,
    scroll_handle: UniformListScrollHandle,
    selected_index: usize,
@@ -31,6 +31,8 @@ pub struct ThreadHistory {
    // When the search is empty, we display date separators between history entries
    // This vector contains an enum of either a separator or an actual entry
    separated_items: Vec<HistoryListItem>,
+    // Maps entry indexes to list item indexes
+    separated_item_indexes: Vec<u32>,
    _separated_items_task: Option<Task<()>>,
    search_state: SearchState,
    scrollbar_visibility: bool,
@@ -69,7 +71,7 @@ impl HistoryListItem {

 impl ThreadHistory {
    pub(crate) fn new(
-        assistant_panel: WeakEntity<AssistantPanel>,
+        agent_panel: WeakEntity<AgentPanel>,
        history_store: Entity<HistoryStore>,
        window: &mut Window,
        cx: &mut Context<Self>,
@@ -96,13 +98,14 @@ impl ThreadHistory {
        let scrollbar_state = ScrollbarState::new(scroll_handle.clone());

        let mut this = Self {
-            assistant_panel,
+            agent_panel,
            history_store,
            scroll_handle,
            selected_index: 0,
            search_state: SearchState::Empty,
            all_entries: Default::default(),
            separated_items: Default::default(),
+            separated_item_indexes: Default::default(),
            search_editor,
            scrollbar_visibility: true,
            scrollbar_state,
@@ -119,7 +122,7 @@ impl ThreadHistory {
            .update(cx, |store, cx| store.entries(cx))
            .into();

-        self.set_selected_index(0, cx);
+        self.set_selected_entry_index(0, cx);
        self.update_separated_items(cx);

        match &self.search_state {
@@ -133,11 +136,16 @@ impl ThreadHistory {

    fn update_separated_items(&mut self, cx: &mut Context<Self>) {
        self._separated_items_task.take();
-
-        let mut separated_items = std::mem::take(&mut self.separated_items);
-        separated_items.clear();
        let all_entries = self.all_entries.clone();

+        let mut items = std::mem::take(&mut self.separated_items);
+        let mut indexes = std::mem::take(&mut self.separated_item_indexes);
+        items.clear();
+        indexes.clear();
+        // We know there's going to be at least one bucket separator
+        items.reserve(all_entries.len() + 1);
+        indexes.reserve(all_entries.len() + 1);
+
        let bg_task = cx.background_spawn(async move {
            let mut bucket = None;
            let today = Local::now().naive_local().date();
@@ -152,20 +160,23 @@ impl ThreadHistory {

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

        let task = cx.spawn(async move |this, cx| {
-            let separated_items = bg_task.await;
+            let (items, indexes) = bg_task.await;
            this.update(cx, |this, cx| {
-                this.separated_items = separated_items;
+                this.separated_items = items;
+                this.separated_item_indexes = indexes;
                cx.notify();
            })
            .log_err();
@@ -233,7 +244,7 @@ impl ThreadHistory {
                            matches,
                        };

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

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

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

@@ -380,14 +402,12 @@ impl ThreadHistory {
    fn confirm(&mut self, _: &menu::Confirm, window: &mut Window, cx: &mut Context<Self>) {
        if let Some(entry) = self.get_match(self.selected_index) {
            let task_result = match entry {
-                HistoryEntry::Thread(thread) => self.assistant_panel.update(cx, move |this, cx| {
+                HistoryEntry::Thread(thread) => self.agent_panel.update(cx, move |this, cx| {
                    this.open_thread_by_id(&thread.id, window, cx)
                }),
-                HistoryEntry::Context(context) => {
-                    self.assistant_panel.update(cx, move |this, cx| {
-                        this.open_saved_prompt_editor(context.path.clone(), window, cx)
-                    })
-                }
+                HistoryEntry::Context(context) => self.agent_panel.update(cx, move |this, cx| {
+                    this.open_saved_prompt_editor(context.path.clone(), window, cx)
+                }),
            };

            if let Some(task) = task_result.log_err() {
@@ -407,10 +427,10 @@ impl ThreadHistory {
        if let Some(entry) = self.get_match(self.selected_index) {
            let task_result = match entry {
                HistoryEntry::Thread(thread) => self
-                    .assistant_panel
+                    .agent_panel
                    .update(cx, |this, cx| this.delete_thread(&thread.id, cx)),
                HistoryEntry::Context(context) => self
-                    .assistant_panel
+                    .agent_panel
                    .update(cx, |this, cx| this.delete_context(context.path.clone(), cx)),
            };

@@ -506,7 +526,7 @@ impl ThreadHistory {
        match entry {
            HistoryEntry::Thread(thread) => PastThread::new(
                thread.clone(),
-                self.assistant_panel.clone(),
+                self.agent_panel.clone(),
                is_active,
                highlight_positions,
                format,
@@ -514,7 +534,7 @@ impl ThreadHistory {
            .into_any_element(),
            HistoryEntry::Context(context) => PastContext::new(
                context.clone(),
-                self.assistant_panel.clone(),
+                self.agent_panel.clone(),
                is_active,
                highlight_positions,
                format,
@@ -605,7 +625,7 @@ impl Render for ThreadHistory {
 #[derive(IntoElement)]
 pub struct PastThread {
    thread: SerializedThreadMetadata,
-    assistant_panel: WeakEntity<AssistantPanel>,
+    agent_panel: WeakEntity<AgentPanel>,
    selected: bool,
    highlight_positions: Vec<usize>,
    timestamp_format: EntryTimeFormat,
@@ -614,14 +634,14 @@ pub struct PastThread {
 impl PastThread {
    pub fn new(
        thread: SerializedThreadMetadata,
-        assistant_panel: WeakEntity<AssistantPanel>,
+        agent_panel: WeakEntity<AgentPanel>,
        selected: bool,
        highlight_positions: Vec<usize>,
        timestamp_format: EntryTimeFormat,
    ) -> Self {
        Self {
            thread,
-            assistant_panel,
+            agent_panel,
            selected,
            highlight_positions,
            timestamp_format,
@@ -634,7 +654,7 @@ impl RenderOnce for PastThread {
        let summary = self.thread.summary;

        let thread_timestamp = self.timestamp_format.format_timestamp(
-            &self.assistant_panel,
+            &self.agent_panel,
            self.thread.updated_at.timestamp(),
            cx,
        );
@@ -667,10 +687,10 @@ impl RenderOnce for PastThread {
                                Tooltip::for_action("Delete", &RemoveSelectedThread, window, cx)
                            })
                            .on_click({
-                                let assistant_panel = self.assistant_panel.clone();
+                                let agent_panel = self.agent_panel.clone();
                                let id = self.thread.id.clone();
                                move |_event, _window, cx| {
-                                    assistant_panel
+                                    agent_panel
                                        .update(cx, |this, cx| {
                                            this.delete_thread(&id, cx).detach_and_log_err(cx);
                                        })
@@ -680,10 +700,10 @@ impl RenderOnce for PastThread {
                    ),
            )
            .on_click({
-                let assistant_panel = self.assistant_panel.clone();
+                let agent_panel = self.agent_panel.clone();
                let id = self.thread.id.clone();
                move |_event, window, cx| {
-                    assistant_panel
+                    agent_panel
                        .update(cx, |this, cx| {
                            this.open_thread_by_id(&id, window, cx)
                                .detach_and_log_err(cx);
@@ -697,7 +717,7 @@ impl RenderOnce for PastThread {
 #[derive(IntoElement)]
 pub struct PastContext {
    context: SavedContextMetadata,
-    assistant_panel: WeakEntity<AssistantPanel>,
+    agent_panel: WeakEntity<AgentPanel>,
    selected: bool,
    highlight_positions: Vec<usize>,
    timestamp_format: EntryTimeFormat,
@@ -706,14 +726,14 @@ pub struct PastContext {
 impl PastContext {
    pub fn new(
        context: SavedContextMetadata,
-        assistant_panel: WeakEntity<AssistantPanel>,
+        agent_panel: WeakEntity<AgentPanel>,
        selected: bool,
        highlight_positions: Vec<usize>,
        timestamp_format: EntryTimeFormat,
    ) -> Self {
        Self {
            context,
-            assistant_panel,
+            agent_panel,
            selected,
            highlight_positions,
            timestamp_format,
@@ -725,7 +745,7 @@ impl RenderOnce for PastContext {
    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
        let summary = self.context.title;
        let context_timestamp = self.timestamp_format.format_timestamp(
-            &self.assistant_panel,
+            &self.agent_panel,
            self.context.mtime.timestamp(),
            cx,
        );
@@ -760,10 +780,10 @@ impl RenderOnce for PastContext {
                            Tooltip::for_action("Delete", &RemoveSelectedThread, window, cx)
                        })
                        .on_click({
-                            let assistant_panel = self.assistant_panel.clone();
+                            let agent_panel = self.agent_panel.clone();
                            let path = self.context.path.clone();
                            move |_event, _window, cx| {
-                                assistant_panel
+                                agent_panel
                                    .update(cx, |this, cx| {
                                        this.delete_context(path.clone(), cx)
                                            .detach_and_log_err(cx);
@@ -774,10 +794,10 @@ impl RenderOnce for PastContext {
                ),
        )
        .on_click({
-            let assistant_panel = self.assistant_panel.clone();
+            let agent_panel = self.agent_panel.clone();
            let path = self.context.path.clone();
            move |_event, window, cx| {
-                assistant_panel
+                agent_panel
                    .update(cx, |this, cx| {
                        this.open_saved_prompt_editor(path.clone(), window, cx)
                            .detach_and_log_err(cx);
@@ -797,12 +817,12 @@ pub enum EntryTimeFormat {
 impl EntryTimeFormat {
    fn format_timestamp(
        &self,
-        assistant_panel: &WeakEntity<AssistantPanel>,
+        agent_panel: &WeakEntity<AgentPanel>,
        timestamp: i64,
        cx: &App,
    ) -> String {
        let timestamp = OffsetDateTime::from_unix_timestamp(timestamp).unwrap();
-        let timezone = assistant_panel
+        let timezone = agent_panel
            .read_with(cx, |this, _cx| this.local_timezone())
            .unwrap_or(UtcOffset::UTC);

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

 #[derive(Serialize, Deserialize, Debug)]
@@ -802,6 +804,7 @@ impl LegacySerializedThread {
            exceeded_window_error: None,
            model: None,
            completion_mode: None,
+            profile: None,
        }
    }
 }
--- a/crates/agent/src/tool_use.rs
+++ b/crates/agent/src/tool_use.rs
@@ -7,8 +7,8 @@ use futures::FutureExt as _;
 use futures::future::Shared;
 use gpui::{App, Entity, SharedString, Task};
 use language_model::{
-    ConfiguredModel, LanguageModel, LanguageModelRequestMessage, LanguageModelToolResult,
-    LanguageModelToolUse, LanguageModelToolUseId, MessageContent, Role,
+    ConfiguredModel, LanguageModel, LanguageModelRequest, LanguageModelToolResult,
+    LanguageModelToolUse, LanguageModelToolUseId, Role,
 };
 use project::Project;
 use ui::{IconName, Window};
@@ -354,7 +354,7 @@ impl ToolUseState {
        tool_use_id: LanguageModelToolUseId,
        ui_text: impl Into<Arc<str>>,
        input: serde_json::Value,
-        messages: Arc<Vec<LanguageModelRequestMessage>>,
+        request: Arc<LanguageModelRequest>,
        tool: Arc<dyn Tool>,
    ) {
        if let Some(tool_use) = self.pending_tool_uses_by_id.get_mut(&tool_use_id) {
@@ -363,7 +363,7 @@ impl ToolUseState {
            let confirmation = Confirmation {
                tool_use_id,
                input,
-                messages,
+                request,
                tool,
                ui_text,
            };
@@ -449,72 +449,20 @@ impl ToolUseState {
        }
    }

-    pub fn attach_tool_uses(
-        &self,
-        message_id: MessageId,
-        request_message: &mut LanguageModelRequestMessage,
-    ) {
-        if let Some(tool_uses) = self.tool_uses_by_assistant_message.get(&message_id) {
-            for tool_use in tool_uses {
-                if self.tool_results.contains_key(&tool_use.id) {
-                    // Do not send tool uses until they are completed
-                    request_message
-                        .content
-                        .push(MessageContent::ToolUse(tool_use.clone()));
-                } else {
-                    log::debug!(
-                        "skipped tool use {:?} because it is still pending",
-                        tool_use
-                    );
-                }
-            }
-        }
-    }
-
    pub fn has_tool_results(&self, assistant_message_id: MessageId) -> bool {
        self.tool_uses_by_assistant_message
            .contains_key(&assistant_message_id)
    }

-    pub fn tool_results_message(
+    pub fn tool_results(
        &self,
        assistant_message_id: MessageId,
-    ) -> Option<LanguageModelRequestMessage> {
-        let tool_uses = self
-            .tool_uses_by_assistant_message
-            .get(&assistant_message_id)?;
-
-        if tool_uses.is_empty() {
-            return None;
-        }
-
-        let mut request_message = LanguageModelRequestMessage {
-            role: Role::User,
-            content: vec![],
-            cache: false,
-        };
-
-        for tool_use in tool_uses {
-            if let Some(tool_result) = self.tool_results.get(&tool_use.id) {
-                request_message
-                    .content
-                    .push(MessageContent::ToolResult(LanguageModelToolResult {
-                        tool_use_id: tool_use.id.clone(),
-                        tool_name: tool_result.tool_name.clone(),
-                        is_error: tool_result.is_error,
-                        content: if tool_result.content.is_empty() {
-                            // Surprisingly, the API fails if we return an empty string here.
-                            // It thinks we are sending a tool use without a tool result.
-                            "<Tool returned an empty string>".into()
-                        } else {
-                            tool_result.content.clone()
-                        },
-                        output: None,
-                    }));
-            }
-        }
-
-        Some(request_message)
+    ) -> impl Iterator<Item = (&LanguageModelToolUse, Option<&LanguageModelToolResult>)> {
+        self.tool_uses_by_assistant_message
+            .get(&assistant_message_id)
+            .into_iter()
+            .flatten()
+            .map(|tool_use| (tool_use, self.tool_results.get(&tool_use.id)))
    }
 }

@@ -535,7 +483,7 @@ pub struct Confirmation {
    pub tool_use_id: LanguageModelToolUseId,
    pub input: serde_json::Value,
    pub ui_text: Arc<str>,
-    pub messages: Arc<Vec<LanguageModelRequestMessage>>,
+    pub request: Arc<LanguageModelRequest>,
    pub tool: Arc<dyn Tool>,
 }

--- a/crates/agent/src/ui/onboarding_modal.rs
+++ b/crates/agent/src/ui/onboarding_modal.rs
@@ -4,7 +4,7 @@ use gpui::{
 use ui::{TintColor, Vector, VectorName, prelude::*};
 use workspace::{ModalView, Workspace};

-use crate::assistant_panel::AssistantPanel;
+use crate::agent_panel::AgentPanel;

 macro_rules! agent_onboarding_event {
    ($name:expr) => {
@@ -31,7 +31,7 @@ impl AgentOnboardingModal {

    fn open_panel(&mut self, _: &ClickEvent, window: &mut Window, cx: &mut Context<Self>) {
        self.workspace.update(cx, |workspace, cx| {
-            workspace.focus_panel::<AssistantPanel>(window, cx);
+            workspace.focus_panel::<AgentPanel>(window, cx);
        });

        cx.emit(DismissEvent);
@@ -92,10 +92,10 @@ impl Render for AgentOnboardingModal {
                    .top_0()
                    .right(px(-1.0))
                    .w(px(441.))
-                    .h(px(167.))
+                    .h(px(240.))
                    .child(
-                        Vector::new(VectorName::Grid, rems_from_px(441.), rems_from_px(167.))
-                            .color(ui::Color::Custom(cx.theme().colors().text.alpha(0.1))),
+                        Vector::new(VectorName::Grid, rems_from_px(441.), rems_from_px(240.))
+                            .color(ui::Color::Custom(cx.theme().colors().text.alpha(0.05))),
                    ),
            )
            .child(
@@ -110,6 +110,23 @@ impl Render for AgentOnboardingModal {
                            .color(ui::Color::Custom(cx.theme().colors().text.alpha(0.32))),
                    ),
            )
+            .child(
+                div()
+                    .absolute()
+                    .inset_0()
+                    .size_full()
+                    .bg(gpui::linear_gradient(
+                        175.,
+                        gpui::linear_color_stop(
+                            cx.theme().colors().elevated_surface_background,
+                            0.,
+                        ),
+                        gpui::linear_color_stop(
+                            cx.theme().colors().elevated_surface_background.opacity(0.),
+                            0.8,
+                        ),
+                    )),
+            )
            .child(
                v_flex()
                    .w_full()
--- a/crates/anthropic/src/anthropic.rs
+++ b/crates/anthropic/src/anthropic.rs
@@ -578,6 +578,7 @@ pub enum ToolChoice {
    Auto,
    Any,
    Tool { name: String },
+    None,
 }

 #[derive(Debug, Serialize, Deserialize)]
--- a/crates/assistant/Cargo.toml
+++ b/crates/assistant/Cargo.toml
@@ -1,88 +0,0 @@
-[package]
-name = "assistant"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/assistant.rs"
-doctest = false
-
-[features]
-test-support = [
-    "editor/test-support",
-    "language/test-support",
-    "project/test-support",
-    "text/test-support",
-]
-
-[dependencies]
-anyhow.workspace = true
-assistant_context_editor.workspace = true
-assistant_settings.workspace = true
-assistant_slash_command.workspace = true
-assistant_slash_commands.workspace = true
-assistant_tool.workspace = true
-async-watch.workspace = true
-client.workspace = true
-collections.workspace = true
-command_palette_hooks.workspace = true
-db.workspace = true
-editor.workspace = true
-feature_flags.workspace = true
-fs.workspace = true
-futures.workspace = true
-gpui.workspace = true
-indexed_docs.workspace = true
-indoc.workspace = true
-language.workspace = true
-language_model.workspace = true
-language_model_selector.workspace = true
-log.workspace = true
-lsp.workspace = true
-menu.workspace = true
-multi_buffer.workspace = true
-parking_lot.workspace = true
-project.workspace = true
-rules_library.workspace = true
-prompt_store.workspace = true
-proto.workspace = true
-rope.workspace = true
-schemars.workspace = true
-search.workspace = true
-serde.workspace = true
-settings.workspace = true
-smol.workspace = true
-streaming_diff.workspace = true
-telemetry.workspace = true
-telemetry_events.workspace = true
-terminal.workspace = true
-terminal_view.workspace = true
-text.workspace = true
-theme.workspace = true
-ui.workspace = true
-util.workspace = true
-workspace.workspace = true
-zed_actions.workspace = true
-workspace-hack.workspace = true
-
-[dev-dependencies]
-ctor.workspace = true
-editor = { workspace = true, features = ["test-support"] }
-env_logger.workspace = true
-language = { workspace = true, features = ["test-support"] }
-language_model = { workspace = true, features = ["test-support"] }
-languages = { workspace = true, features = ["test-support"] }
-log.workspace = true
-pretty_assertions.workspace = true
-project = { workspace = true, features = ["test-support"] }
-rand.workspace = true
-serde_json_lenient.workspace = true
-terminal_view = { workspace = true, features = ["test-support"] }
-text = { workspace = true, features = ["test-support"] }
-tree-sitter-md.workspace = true
-unindent.workspace = true
--- a/crates/assistant/LICENSE-GPL
+++ b/crates/assistant/LICENSE-GPL
@@ -1 +0,0 @@
-../../LICENSE-GPL
--- a/crates/assistant/src/assistant_configuration.rs
+++ b/crates/assistant/src/assistant_configuration.rs
@@ -1,199 +0,0 @@
-use std::sync::Arc;
-
-use collections::HashMap;
-use gpui::{AnyView, App, EventEmitter, FocusHandle, Focusable, Subscription, canvas};
-use language_model::{LanguageModelProvider, LanguageModelProviderId, LanguageModelRegistry};
-use ui::{ElevationIndex, prelude::*};
-use workspace::Item;
-
-pub struct ConfigurationView {
-    focus_handle: FocusHandle,
-    configuration_views: HashMap<LanguageModelProviderId, AnyView>,
-    _registry_subscription: Subscription,
-}
-
-impl ConfigurationView {
-    pub fn new(window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let focus_handle = cx.focus_handle();
-
-        let registry_subscription = cx.subscribe_in(
-            &LanguageModelRegistry::global(cx),
-            window,
-            |this, _, event: &language_model::Event, window, cx| match event {
-                language_model::Event::AddedProvider(provider_id) => {
-                    let provider = LanguageModelRegistry::read_global(cx).provider(provider_id);
-                    if let Some(provider) = provider {
-                        this.add_configuration_view(&provider, window, cx);
-                    }
-                }
-                language_model::Event::RemovedProvider(provider_id) => {
-                    this.remove_configuration_view(provider_id);
-                }
-                _ => {}
-            },
-        );
-
-        let mut this = Self {
-            focus_handle,
-            configuration_views: HashMap::default(),
-            _registry_subscription: registry_subscription,
-        };
-        this.build_configuration_views(window, cx);
-        this
-    }
-
-    fn build_configuration_views(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let providers = LanguageModelRegistry::read_global(cx).providers();
-        for provider in providers {
-            self.add_configuration_view(&provider, window, cx);
-        }
-    }
-
-    fn remove_configuration_view(&mut self, provider_id: &LanguageModelProviderId) {
-        self.configuration_views.remove(provider_id);
-    }
-
-    fn add_configuration_view(
-        &mut self,
-        provider: &Arc<dyn LanguageModelProvider>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let configuration_view = provider.configuration_view(window, cx);
-        self.configuration_views
-            .insert(provider.id(), configuration_view);
-    }
-
-    fn render_provider_view(
-        &mut self,
-        provider: &Arc<dyn LanguageModelProvider>,
-        cx: &mut Context<Self>,
-    ) -> Div {
-        let provider_id = provider.id().0.clone();
-        let provider_name = provider.name().0.clone();
-        let configuration_view = self.configuration_views.get(&provider.id()).cloned();
-
-        let open_new_context = cx.listener({
-            let provider = provider.clone();
-            move |_, _, _window, cx| {
-                cx.emit(ConfigurationViewEvent::NewProviderContextEditor(
-                    provider.clone(),
-                ))
-            }
-        });
-
-        v_flex()
-            .gap_2()
-            .child(
-                h_flex()
-                    .justify_between()
-                    .child(Headline::new(provider_name.clone()).size(HeadlineSize::Small))
-                    .when(provider.is_authenticated(cx), move |this| {
-                        this.child(
-                            h_flex().justify_end().child(
-                                Button::new(
-                                    SharedString::from(format!("new-context-{provider_id}")),
-                                    "Open New Chat",
-                                )
-                                .icon_position(IconPosition::Start)
-                                .icon(IconName::Plus)
-                                .style(ButtonStyle::Filled)
-                                .layer(ElevationIndex::ModalSurface)
-                                .on_click(open_new_context),
-                            ),
-                        )
-                    }),
-            )
-            .child(
-                div()
-                    .p(DynamicSpacing::Base08.rems(cx))
-                    .bg(cx.theme().colors().surface_background)
-                    .border_1()
-                    .border_color(cx.theme().colors().border_variant)
-                    .rounded_sm()
-                    .when(configuration_view.is_none(), |this| {
-                        this.child(div().child(Label::new(format!(
-                            "No configuration view for {}",
-                            provider_name
-                        ))))
-                    })
-                    .when_some(configuration_view, |this, configuration_view| {
-                        this.child(configuration_view)
-                    }),
-            )
-    }
-}
-
-impl Render for ConfigurationView {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let providers = LanguageModelRegistry::read_global(cx).providers();
-        let provider_views = providers
-            .into_iter()
-            .map(|provider| self.render_provider_view(&provider, cx))
-            .collect::<Vec<_>>();
-
-        let mut element = v_flex()
-            .id("assistant-configuration-view")
-            .track_focus(&self.focus_handle(cx))
-            .bg(cx.theme().colors().editor_background)
-            .size_full()
-            .overflow_y_scroll()
-            .child(
-                v_flex()
-                    .p(DynamicSpacing::Base16.rems(cx))
-                    .border_b_1()
-                    .border_color(cx.theme().colors().border)
-                    .gap_1()
-                    .child(Headline::new("Configure your Assistant").size(HeadlineSize::Medium))
-                    .child(
-                        Label::new(
-                            "At least one LLM provider must be configured to use the Assistant.",
-                        )
-                        .color(Color::Muted),
-                    ),
-            )
-            .child(
-                v_flex()
-                    .p(DynamicSpacing::Base16.rems(cx))
-                    .mt_1()
-                    .gap_6()
-                    .flex_1()
-                    .children(provider_views),
-            )
-            .into_any();
-
-        // We use a canvas here to get scrolling to work in the ConfigurationView. It's a workaround
-        // because we couldn't the element to take up the size of the parent.
-        canvas(
-            move |bounds, window, cx| {
-                element.prepaint_as_root(bounds.origin, bounds.size.into(), window, cx);
-                element
-            },
-            |_, mut element, window, cx| {
-                element.paint(window, cx);
-            },
-        )
-        .flex_1()
-        .w_full()
-    }
-}
-
-pub enum ConfigurationViewEvent {
-    NewProviderContextEditor(Arc<dyn LanguageModelProvider>),
-}
-
-impl EventEmitter<ConfigurationViewEvent> for ConfigurationView {}
-
-impl Focusable for ConfigurationView {
-    fn focus_handle(&self, _: &App) -> FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl Item for ConfigurationView {
-    type Event = ConfigurationViewEvent;
-
-    fn tab_content_text(&self, _detail: usize, _cx: &App) -> SharedString {
-        "Configuration".into()
-    }
-}
--- a/crates/assistant/src/assistant_panel.rs
+++ b/crates/assistant/src/assistant_panel.rs
--- a/crates/assistant/src/inline_assistant.rs
+++ b/crates/assistant/src/inline_assistant.rs
--- a/crates/assistant/src/terminal_inline_assistant.rs
+++ b/crates/assistant/src/terminal_inline_assistant.rs
--- a/crates/assistant_context_editor/Cargo.toml
+++ b/crates/assistant_context_editor/Cargo.toml
@@ -46,7 +46,6 @@ 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,7 +2,6 @@ mod context;
 mod context_editor;
 mod context_history;
 mod context_store;
-mod patch;
 mod slash_command;
 mod slash_command_picker;

@@ -15,7 +14,6 @@ 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,6 @@
 #[cfg(test)]
 mod context_tests;

-use crate::patch::{AssistantEdit, AssistantPatch, AssistantPatchStatus};
 use anyhow::{Context as _, Result, anyhow};
 use assistant_settings::AssistantSettings;
 use assistant_slash_command::{
@@ -37,7 +36,6 @@ use std::{
    iter, mem,
    ops::Range,
    path::Path,
-    str::FromStr as _,
    sync::Arc,
    time::{Duration, Instant},
 };
@@ -122,14 +120,6 @@ 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 {
@@ -464,10 +454,6 @@ 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,
    },
@@ -605,26 +591,6 @@ 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,
@@ -653,8 +619,6 @@ 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>,
 }
@@ -669,18 +633,6 @@ 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 {
@@ -757,8 +709,6 @@ impl AssistantContext {
            project,
            language_registry,
            slash_commands,
-            patches: Vec::new(),
-            xml_tags: Vec::new(),
            prompt_builder,
        };

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

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

        let request = {
-            let mut req = self.to_completion_request(Some(&model), RequestType::Chat, cx);
+            let mut req = self.to_completion_request(Some(&model), cx);
            // Skip the last message because it's likely to change and
            // therefore would be a waste to cache.
            req.messages.pop();
@@ -1498,8 +1406,6 @@ 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 {
@@ -1524,13 +1430,6 @@ 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()
@@ -1541,13 +1440,6 @@ 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(
@@ -1638,267 +1530,6 @@ 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,
@@ -2303,11 +1934,7 @@ impl AssistantContext {
        })
    }

-    pub fn assist(
-        &mut self,
-        request_type: RequestType,
-        cx: &mut Context<Self>,
-    ) -> Option<MessageAnchor> {
+    pub fn assist(&mut self, 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)?;
@@ -2322,7 +1949,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), request_type, cx);
+        let request = self.to_completion_request(Some(&model), cx);

        let assistant_message = self
            .insert_message_after(last_message_id, Role::Assistant, MessageStatus::Pending, cx)
@@ -2563,7 +2190,6 @@ 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);
@@ -2585,6 +2211,7 @@ impl AssistantContext {
            mode: None,
            messages: Vec::new(),
            tools: Vec::new(),
+            tool_choice: None,
            stop: Vec::new(),
            temperature: model
                .and_then(|model| AssistantSettings::temperature_for_model(model, cx)),
@@ -2643,25 +2270,6 @@ 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
    }

@@ -2696,17 +2304,6 @@ 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(
@@ -2984,7 +2581,7 @@ impl AssistantContext {
                return;
            }

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

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

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

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

 use crate::{
-    AssistantContext, AssistantPatch, AssistantPatchStatus, CacheStatus, Content, ContextEvent,
-    ContextId, InvokedSlashCommandId, InvokedSlashCommandStatus, Message, MessageId,
-    MessageMetadata, MessageStatus, ParsedSlashCommand, PendingSlashCommandStatus, RequestType,
+    AssistantContext, CacheStatus, Content, ContextEvent, ContextId, InvokedSlashCommandId,
+    InvokedSlashCommandStatus, Message, MessageId, MessageMetadata, MessageStatus,
+    ParsedSlashCommand, PendingSlashCommandStatus,
 };
 use crate::{
    ThoughtProcessOutputSection, slash_command::SlashCommandCompletionProvider,
@@ -90,7 +89,6 @@ actions!(
        ConfirmCommand,
        CopyCode,
        CycleMessageRole,
-        Edit,
        InsertIntoEditor,
        QuoteSelection,
        Split,
@@ -111,22 +109,10 @@ 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),
@@ -137,7 +123,7 @@ pub enum ThoughtProcessStatus {
    Completed,
 }

-pub trait AssistantPanelDelegate {
+pub trait AgentPanelDelegate {
    fn active_context_editor(
        &self,
        workspace: &mut Workspace,
@@ -171,7 +157,7 @@ pub trait AssistantPanelDelegate {
    );
 }

-impl dyn AssistantPanelDelegate {
+impl dyn AgentPanelDelegate {
    /// Returns the global [`AssistantPanelDelegate`], if it exists.
    pub fn try_global(cx: &App) -> Option<Arc<Self>> {
        cx.try_global::<GlobalAssistantPanelDelegate>()
@@ -184,7 +170,7 @@ impl dyn AssistantPanelDelegate {
    }
 }

-struct GlobalAssistantPanelDelegate(Arc<dyn AssistantPanelDelegate>);
+struct GlobalAssistantPanelDelegate(Arc<dyn AgentPanelDelegate>);

 impl Global for GlobalAssistantPanelDelegate {}

@@ -204,8 +190,6 @@ 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:
@@ -242,9 +226,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);
@@ -274,7 +258,6 @@ 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,
@@ -292,8 +275,6 @@ 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(),
@@ -324,7 +305,6 @@ impl ContextEditor {
            window,
            cx,
        );
-        this.patches_updated(&Vec::new(), &patch_ranges, window, cx);
        this
    }

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

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

-    fn send_to_model(
-        &mut self,
-        request_type: RequestType,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
+    fn send_to_model(&mut self, window: &mut Window, cx: &mut Context<Self>) {
        let provider = LanguageModelRegistry::read_global(cx)
            .default_model()
            .map(|default| default.provider);
@@ -407,19 +366,9 @@ impl ContextEditor {
            return;
        }

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

-        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))
-        {
+        if let Some(user_message) = self.context.update(cx, |context, cx| context.assist(cx)) {
            let new_selection = {
                let cursor = user_message
                    .start
@@ -684,9 +633,6 @@ 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);
@@ -891,131 +837,6 @@ 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<
@@ -1144,177 +965,12 @@ 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>,
@@ -1488,7 +1144,7 @@ impl ContextEditor {

                        h_flex()
                            .id(("message_header", message_id.as_u64()))
-                            .pl(cx.gutter_dimensions.full_width())
+                            .pl(cx.margins.gutter.full_width())
                            .h_11()
                            .w_full()
                            .relative()
@@ -1583,6 +1239,7 @@ 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![];
@@ -1665,11 +1322,11 @@ impl ContextEditor {
        window: &mut Window,
        cx: &mut Context<Workspace>,
    ) {
-        let Some(assistant_panel_delegate) = <dyn AssistantPanelDelegate>::try_global(cx) else {
+        let Some(agent_panel_delegate) = <dyn AgentPanelDelegate>::try_global(cx) else {
            return;
        };
        let Some(context_editor_view) =
-            assistant_panel_delegate.active_context_editor(workspace, window, cx)
+            agent_panel_delegate.active_context_editor(workspace, window, cx)
        else {
            return;
        };
@@ -1695,9 +1352,9 @@ impl ContextEditor {
        cx: &mut Context<Workspace>,
    ) {
        let result = maybe!({
-            let assistant_panel_delegate = <dyn AssistantPanelDelegate>::try_global(cx)?;
+            let agent_panel_delegate = <dyn AgentPanelDelegate>::try_global(cx)?;
            let context_editor_view =
-                assistant_panel_delegate.active_context_editor(workspace, window, cx)?;
+                agent_panel_delegate.active_context_editor(workspace, window, cx)?;
            Self::get_selection_or_code_block(&context_editor_view, cx)
        });
        let Some((text, is_code_block)) = result else {
@@ -1730,11 +1387,11 @@ impl ContextEditor {
        window: &mut Window,
        cx: &mut Context<Workspace>,
    ) {
-        let Some(assistant_panel_delegate) = <dyn AssistantPanelDelegate>::try_global(cx) else {
+        let Some(agent_panel_delegate) = <dyn AgentPanelDelegate>::try_global(cx) else {
            return;
        };
        let Some(context_editor_view) =
-            assistant_panel_delegate.active_context_editor(workspace, window, cx)
+            agent_panel_delegate.active_context_editor(workspace, window, cx)
        else {
            return;
        };
@@ -1820,7 +1477,7 @@ impl ContextEditor {
        window: &mut Window,
        cx: &mut Context<Workspace>,
    ) {
-        let Some(assistant_panel_delegate) = <dyn AssistantPanelDelegate>::try_global(cx) else {
+        let Some(agent_panel_delegate) = <dyn AgentPanelDelegate>::try_global(cx) else {
            return;
        };

@@ -1851,7 +1508,7 @@ impl ContextEditor {
            return;
        }

-        assistant_panel_delegate.quote_selection(workspace, selections, buffer, window, cx);
+        agent_panel_delegate.quote_selection(workspace, selections, buffer, window, cx);
    }

    pub fn quote_ranges(
@@ -2157,12 +1814,12 @@ impl ContextEditor {
                            let image_size = size_for_image(
                                &image,
                                size(
-                                    cx.max_width - cx.gutter_dimensions.full_width(),
+                                    cx.max_width - cx.margins.gutter.full_width(),
                                    MAX_HEIGHT_IN_LINES as f32 * cx.line_height,
                                ),
                            );
                            h_flex()
-                                .pl(cx.gutter_dimensions.full_width())
+                                .pl(cx.margins.gutter.full_width())
                                .child(
                                    img(image.clone())
                                        .object_fit(gpui::ObjectFit::ScaleDown)
@@ -2172,6 +1829,7 @@ impl ContextEditor {
                                .into_any_element()
                        }),
                        priority: 0,
+                        render_in_minimap: false,
                    })
                })
                .collect::<Vec<_>>();
@@ -2205,118 +1863,6 @@ impl ContextEditor {
        self.context.read(cx).summary_or_default()
    }

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

-    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);
+    /// 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();

        let has_configuration_error = configuration_error(cx).is_some();
        let needs_to_accept_terms = self.show_accept_terms
-            && provider
+            && model
                .as_ref()
-                .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);
-            })
+                .map_or(false, |model| model.provider.must_accept_terms(cx));
+        has_configuration_error || needs_to_accept_terms
    }

    fn render_inject_context_menu(&self, cx: &mut Context<Self>) -> impl IntoElement {
@@ -2598,7 +2088,6 @@ 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)
@@ -2611,41 +2100,6 @@ 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.";

@@ -3086,7 +2540,6 @@ 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| {
@@ -3139,20 +2592,6 @@ 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)),
                        ),
                ),
@@ -3359,10 +2798,10 @@ impl FollowableItem for ContextEditor {
        let editor_state = state.editor?;

        let project = workspace.read(cx).project().clone();
-        let assistant_panel_delegate = <dyn AssistantPanelDelegate>::try_global(cx)?;
+        let agent_panel_delegate = <dyn AgentPanelDelegate>::try_global(cx)?;

        let context_editor_task = workspace.update(cx, |workspace, cx| {
-            assistant_panel_delegate.open_remote_context(workspace, context_id, window, cx)
+            agent_panel_delegate.open_remote_context(workspace, context_id, window, cx)
        });

        Some(window.spawn(cx, async move |cx| {
--- a/crates/assistant_context_editor/src/context_history.rs
+++ b/crates/assistant_context_editor/src/context_history.rs
@@ -8,7 +8,7 @@ use ui::{Avatar, ListItem, ListItemSpacing, prelude::*};
 use workspace::{Item, Workspace};

 use crate::{
-    AssistantPanelDelegate, ContextStore, DEFAULT_TAB_TITLE, RemoteContextMetadata,
+    AgentPanelDelegate, ContextStore, DEFAULT_TAB_TITLE, RemoteContextMetadata,
    SavedContextMetadata,
 };

@@ -70,19 +70,19 @@ impl ContextHistory {
    ) {
        let SavedContextPickerEvent::Confirmed(context) = event;

-        let Some(assistant_panel_delegate) = <dyn AssistantPanelDelegate>::try_global(cx) else {
+        let Some(agent_panel_delegate) = <dyn AgentPanelDelegate>::try_global(cx) else {
            return;
        };

        self.workspace
            .update(cx, |workspace, cx| match context {
                ContextMetadata::Remote(metadata) => {
-                    assistant_panel_delegate
+                    agent_panel_delegate
                        .open_remote_context(workspace, metadata.id.clone(), window, cx)
                        .detach_and_log_err(cx);
                }
                ContextMetadata::Saved(metadata) => {
-                    assistant_panel_delegate
+                    agent_panel_delegate
                        .open_saved_context(workspace, metadata.path.clone(), window, cx)
                        .detach_and_log_err(cx);
                }
--- a/crates/assistant_context_editor/src/patch.rs
+++ b/crates/assistant_context_editor/src/patch.rs
@@ -1,957 +0,0 @@
-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,7 +85,6 @@ 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,
@@ -106,15 +105,6 @@ impl AssistantSettings {
            .and_then(|m| m.temperature)
    }

-    pub fn stream_edits(&self, _cx: &App) -> bool {
-        // TODO: Remove the `stream_edits` setting.
-        true
-    }
-
-    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(),
@@ -262,7 +252,6 @@ 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,
@@ -293,7 +282,6 @@ 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,
@@ -366,7 +354,7 @@ impl AssistantSettingsContent {
                                    &model,
                                    None,
                                    None,
-                                    language_model.supports_tools(),
+                                    Some(language_model.supports_tools()),
                                )),
                                api_url,
                            });
@@ -575,7 +563,6 @@ 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,
@@ -620,10 +607,6 @@ 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
@@ -850,10 +833,6 @@ 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,
@@ -999,7 +978,6 @@ 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/assistant_tool.rs
+++ b/crates/assistant_tool/src/assistant_tool.rs
@@ -18,7 +18,8 @@ use gpui::IntoElement;
 use gpui::Window;
 use gpui::{App, Entity, SharedString, Task, WeakEntity};
 use icons::IconName;
-use language_model::LanguageModelRequestMessage;
+use language_model::LanguageModel;
+use language_model::LanguageModelRequest;
 use language_model::LanguageModelToolSchemaFormat;
 use project::Project;
 use workspace::Workspace;
@@ -205,9 +206,10 @@ pub trait Tool: 'static + Send + Sync {
    fn run(
        self: Arc<Self>,
        input: serde_json::Value,
-        messages: &[LanguageModelRequestMessage],
+        request: Arc<LanguageModelRequest>,
        project: Entity<Project>,
        action_log: Entity<ActionLog>,
+        model: Arc<dyn LanguageModel>,
        window: Option<AnyWindowHandle>,
        cx: &mut App,
    ) -> ToolResult;
--- a/crates/assistant_tool/src/tool_schema.rs
+++ b/crates/assistant_tool/src/tool_schema.rs
@@ -35,25 +35,17 @@ fn adapt_to_json_schema_subset(json: &mut Value) -> Result<()> {
            }
        }

-        const KEYS_TO_REMOVE: [&str; 4] = [
+        const KEYS_TO_REMOVE: [&str; 5] = [
            "format",
            "additionalProperties",
            "exclusiveMinimum",
            "exclusiveMaximum",
+            "optional",
        ];
        for key in KEYS_TO_REMOVE {
            obj.remove(key);
        }

-        if let Some(default) = obj.get("default") {
-            let is_null = default.is_null();
-            // Default is not supported, so we need to remove it
-            obj.remove("default");
-            if is_null {
-                obj.insert("nullable".to_string(), Value::Bool(true));
-            }
-        }
-
        // If a type is not specified for an input parameter, add a default type
        if matches!(obj.get("description"), Some(Value::String(_)))
            && !obj.contains_key("type")
@@ -92,26 +84,6 @@ mod tests {
    use super::*;
    use serde_json::json;

-    #[test]
-    fn test_transform_default_null_to_nullable() {
-        let mut json = json!({
-            "description": "A test field",
-            "type": "string",
-            "default": null
-        });
-
-        adapt_to_json_schema_subset(&mut json).unwrap();
-
-        assert_eq!(
-            json,
-            json!({
-                "description": "A test field",
-                "type": "string",
-                "nullable": true
-            })
-        );
-    }
-
    #[test]
    fn test_transform_adds_type_when_missing() {
        let mut json = json!({
@@ -157,7 +129,8 @@ mod tests {
            "format": "uint32",
            "exclusiveMinimum": 0,
            "exclusiveMaximum": 100,
-            "additionalProperties": false
+            "additionalProperties": false,
+            "optional": true
        });

        adapt_to_json_schema_subset(&mut json).unwrap();
--- a/crates/assistant_tools/Cargo.toml
+++ b/crates/assistant_tools/Cargo.toml
@@ -17,14 +17,14 @@ eval = []
 [dependencies]
 aho-corasick.workspace = true
 anyhow.workspace = true
-assistant_tool.workspace = true
 assistant_settings.workspace = true
+assistant_tool.workspace = true
 buffer_diff.workspace = true
 chrono.workspace = true
 collections.workspace = true
 component.workspace = true
-editor.workspace = true
 derive_more.workspace = true
+editor.workspace = true
 feature_flags.workspace = true
 futures.workspace = true
 gpui.workspace = true
@@ -35,8 +35,9 @@ indoc.workspace = true
 itertools.workspace = true
 language.workspace = true
 language_model.workspace = true
-log.workspace = true
 linkme.workspace = true
+log.workspace = true
+markdown.workspace = true
 open.workspace = true
 paths.workspace = true
 portable-pty.workspace = true
--- a/crates/assistant_tools/src/assistant_tools.rs
+++ b/crates/assistant_tools/src/assistant_tools.rs
@@ -1,6 +1,5 @@
 mod copy_path_tool;
 mod create_directory_tool;
-mod create_file_tool;
 mod delete_path_tool;
 mod diagnostics_tool;
 mod edit_agent;
@@ -13,9 +12,7 @@ mod move_path_tool;
 mod now_tool;
 mod open_tool;
 mod read_file_tool;
-mod replace;
 mod schema;
-mod streaming_edit_file_tool;
 mod templates;
 mod terminal_tool;
 mod thinking_tool;
@@ -24,14 +21,12 @@ mod web_search_tool;

 use std::sync::Arc;

-use assistant_settings::AssistantSettings;
 use assistant_tool::ToolRegistry;
 use copy_path_tool::CopyPathTool;
 use gpui::{App, Entity};
 use http_client::HttpClientWithUrl;
 use language_model::LanguageModelRegistry;
 use move_path_tool::MovePathTool;
-use settings::{Settings, SettingsStore};
 use web_search_tool::WebSearchTool;

 pub(crate) use templates::*;
@@ -39,21 +34,18 @@ pub(crate) use templates::*;
 use crate::create_directory_tool::CreateDirectoryTool;
 use crate::delete_path_tool::DeletePathTool;
 use crate::diagnostics_tool::DiagnosticsTool;
+use crate::edit_file_tool::EditFileTool;
 use crate::fetch_tool::FetchTool;
 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::streaming_edit_file_tool::StreamingEditFileTool;
 use crate::thinking_tool::ThinkingTool;

-pub use create_file_tool::{CreateFileTool, CreateFileToolInput};
-pub use edit_file_tool::{EditFileTool, EditFileToolInput};
+pub use edit_file_tool::EditFileToolInput;
 pub use find_path_tool::FindPathToolInput;
 pub use open_tool::OpenTool;
-pub use read_file_tool::ReadFileToolInput;
-pub use streaming_edit_file_tool::StreamingEditFileToolInput;
+pub use read_file_tool::{ReadFileTool, ReadFileToolInput};
 pub use terminal_tool::TerminalTool;

 pub fn init(http_client: Arc<HttpClientWithUrl>, cx: &mut App) {
@@ -74,10 +66,7 @@ pub fn init(http_client: Arc<HttpClientWithUrl>, cx: &mut App) {
    registry.register_tool(GrepTool);
    registry.register_tool(ThinkingTool);
    registry.register_tool(FetchTool::new(http_client));
-
-    register_edit_file_tool(cx);
-    cx.observe_global::<SettingsStore>(register_edit_file_tool)
-        .detach();
+    registry.register_tool(EditFileTool);

    register_web_search_tool(&LanguageModelRegistry::global(cx), cx);
    cx.subscribe(
@@ -104,29 +93,16 @@ fn register_web_search_tool(registry: &Entity<LanguageModelRegistry>, cx: &mut A
    }
 }

-fn register_edit_file_tool(cx: &mut App) {
-    let registry = ToolRegistry::global(cx);
-
-    registry.unregister_tool(CreateFileTool);
-    registry.unregister_tool(EditFileTool);
-    registry.unregister_tool(StreamingEditFileTool);
-
-    if AssistantSettings::get_global(cx).stream_edits(cx) {
-        registry.register_tool(StreamingEditFileTool);
-    } else {
-        registry.register_tool(CreateFileTool);
-        registry.register_tool(EditFileTool);
-    }
-}
-
 #[cfg(test)]
 mod tests {
    use super::*;
+    use assistant_settings::AssistantSettings;
    use client::Client;
    use clock::FakeSystemClock;
    use http_client::FakeHttpClient;
    use schemars::JsonSchema;
    use serde::Serialize;
+    use settings::Settings;

    #[test]
    fn test_json_schema() {
--- a/crates/assistant_tools/src/copy_path_tool.rs
+++ b/crates/assistant_tools/src/copy_path_tool.rs
@@ -3,8 +3,8 @@ use anyhow::{Result, anyhow};
 use assistant_tool::{ActionLog, Tool, ToolResult};
 use gpui::AnyWindowHandle;
 use gpui::{App, AppContext, Entity, Task};
-use language_model::LanguageModelRequestMessage;
-use language_model::LanguageModelToolSchemaFormat;
+use language_model::LanguageModel;
+use language_model::{LanguageModelRequest, LanguageModelToolSchemaFormat};
 use project::Project;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
@@ -74,9 +74,10 @@ impl Tool for CopyPathTool {
    fn run(
        self: Arc<Self>,
        input: serde_json::Value,
-        _messages: &[LanguageModelRequestMessage],
+        _request: Arc<LanguageModelRequest>,
        project: Entity<Project>,
        _action_log: Entity<ActionLog>,
+        _model: Arc<dyn LanguageModel>,
        _window: Option<AnyWindowHandle>,
        cx: &mut App,
    ) -> ToolResult {
--- a/crates/assistant_tools/src/create_directory_tool.rs
+++ b/crates/assistant_tools/src/create_directory_tool.rs
@@ -3,8 +3,7 @@ use anyhow::{Result, anyhow};
 use assistant_tool::{ActionLog, Tool, ToolResult};
 use gpui::AnyWindowHandle;
 use gpui::{App, Entity, Task};
-use language_model::LanguageModelRequestMessage;
-use language_model::LanguageModelToolSchemaFormat;
+use language_model::{LanguageModel, LanguageModelRequest, LanguageModelToolSchemaFormat};
 use project::Project;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
@@ -62,9 +61,10 @@ impl Tool for CreateDirectoryTool {
    fn run(
        self: Arc<Self>,
        input: serde_json::Value,
-        _messages: &[LanguageModelRequestMessage],
+        _request: Arc<LanguageModelRequest>,
        project: Entity<Project>,
        _action_log: Entity<ActionLog>,
+        _model: Arc<dyn LanguageModel>,
        _window: Option<AnyWindowHandle>,
        cx: &mut App,
    ) -> ToolResult {
--- a/crates/assistant_tools/src/create_file_tool.rs
+++ b/crates/assistant_tools/src/create_file_tool.rs
@@ -1,195 +0,0 @@
-use crate::schema::json_schema_for;
-use anyhow::{Result, anyhow};
-use assistant_tool::{ActionLog, Tool, ToolResult};
-use gpui::AnyWindowHandle;
-use gpui::{App, Entity, Task};
-use language_model::LanguageModelRequestMessage;
-use language_model::LanguageModelToolSchemaFormat;
-use project::Project;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use std::sync::Arc;
-use ui::IconName;
-use util::markdown::MarkdownInlineCode;
-
-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
-pub struct CreateFileToolInput {
-    /// The path where the file should be created.
-    ///
-    /// <example>
-    /// If the project has the following structure:
-    ///
-    /// - directory1/
-    /// - directory2/
-    ///
-    /// You can create a new file by providing a path of "directory1/new_file.txt"
-    /// </example>
-    ///
-    /// Make sure to include this field before the `contents` field in the input object
-    /// so that we can display it immediately.
-    pub path: String,
-
-    /// The text contents of the file to create.
-    ///
-    /// <example>
-    /// To create a file with the text "Hello, World!", provide contents of "Hello, World!"
-    /// </example>
-    pub contents: String,
-}
-
-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
-struct PartialInput {
-    #[serde(default)]
-    path: String,
-    #[serde(default)]
-    contents: String,
-}
-
-pub struct CreateFileTool;
-
-const DEFAULT_UI_TEXT: &str = "Create file";
-
-impl Tool for CreateFileTool {
-    fn name(&self) -> String {
-        "create_file".into()
-    }
-
-    fn needs_confirmation(&self, _: &serde_json::Value, _: &App) -> bool {
-        false
-    }
-
-    fn description(&self) -> String {
-        include_str!("./create_file_tool/description.md").into()
-    }
-
-    fn icon(&self) -> IconName {
-        IconName::FileCreate
-    }
-
-    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
-        json_schema_for::<CreateFileToolInput>(format)
-    }
-
-    fn ui_text(&self, input: &serde_json::Value) -> String {
-        match serde_json::from_value::<CreateFileToolInput>(input.clone()) {
-            Ok(input) => {
-                let path = MarkdownInlineCode(&input.path);
-                format!("Create file {path}")
-            }
-            Err(_) => DEFAULT_UI_TEXT.to_string(),
-        }
-    }
-
-    fn still_streaming_ui_text(&self, input: &serde_json::Value) -> String {
-        match serde_json::from_value::<PartialInput>(input.clone()).ok() {
-            Some(input) if !input.path.is_empty() => input.path,
-            _ => DEFAULT_UI_TEXT.to_string(),
-        }
-    }
-
-    fn run(
-        self: Arc<Self>,
-        input: serde_json::Value,
-        _messages: &[LanguageModelRequestMessage],
-        project: Entity<Project>,
-        action_log: Entity<ActionLog>,
-        _window: Option<AnyWindowHandle>,
-        cx: &mut App,
-    ) -> ToolResult {
-        let input = match serde_json::from_value::<CreateFileToolInput>(input) {
-            Ok(input) => input,
-            Err(err) => return Task::ready(Err(anyhow!(err))).into(),
-        };
-        let project_path = match project.read(cx).find_project_path(&input.path, cx) {
-            Some(project_path) => project_path,
-            None => {
-                return Task::ready(Err(anyhow!("Path to create was outside the project"))).into();
-            }
-        };
-        let contents: Arc<str> = input.contents.as_str().into();
-        let destination_path: Arc<str> = input.path.as_str().into();
-
-        cx.spawn(async move |cx| {
-            let buffer = project
-                .update(cx, |project, cx| {
-                    project.open_buffer(project_path.clone(), cx)
-                })?
-                .await
-                .map_err(|err| anyhow!("Unable to open buffer for {destination_path}: {err}"))?;
-            cx.update(|cx| {
-                action_log.update(cx, |action_log, cx| {
-                    action_log.buffer_created(buffer.clone(), cx)
-                });
-                buffer.update(cx, |buffer, cx| buffer.set_text(contents, cx));
-                action_log.update(cx, |action_log, cx| {
-                    action_log.buffer_edited(buffer.clone(), cx)
-                });
-            })?;
-
-            project
-                .update(cx, |project, cx| project.save_buffer(buffer, cx))?
-                .await
-                .map_err(|err| anyhow!("Unable to save buffer for {destination_path}: {err}"))?;
-
-            Ok(format!("Created file {destination_path}").into())
-        })
-        .into()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use serde_json::json;
-
-    #[test]
-    fn still_streaming_ui_text_with_path() {
-        let tool = CreateFileTool;
-        let input = json!({
-            "path": "src/main.rs",
-            "contents": "fn main() {\n    println!(\"Hello, world!\");\n}"
-        });
-
-        assert_eq!(tool.still_streaming_ui_text(&input), "src/main.rs");
-    }
-
-    #[test]
-    fn still_streaming_ui_text_without_path() {
-        let tool = CreateFileTool;
-        let input = json!({
-            "path": "",
-            "contents": "fn main() {\n    println!(\"Hello, world!\");\n}"
-        });
-
-        assert_eq!(tool.still_streaming_ui_text(&input), DEFAULT_UI_TEXT);
-    }
-
-    #[test]
-    fn still_streaming_ui_text_with_null() {
-        let tool = CreateFileTool;
-        let input = serde_json::Value::Null;
-
-        assert_eq!(tool.still_streaming_ui_text(&input), DEFAULT_UI_TEXT);
-    }
-
-    #[test]
-    fn ui_text_with_valid_input() {
-        let tool = CreateFileTool;
-        let input = json!({
-            "path": "src/main.rs",
-            "contents": "fn main() {\n    println!(\"Hello, world!\");\n}"
-        });
-
-        assert_eq!(tool.ui_text(&input), "Create file `src/main.rs`");
-    }
-
-    #[test]
-    fn ui_text_with_invalid_input() {
-        let tool = CreateFileTool;
-        let input = json!({
-            "invalid": "field"
-        });
-
-        assert_eq!(tool.ui_text(&input), DEFAULT_UI_TEXT);
-    }
-}
--- a/crates/assistant_tools/src/create_file_tool/description.md
+++ b/crates/assistant_tools/src/create_file_tool/description.md
@@ -1,3 +0,0 @@
-Creates a new file at the specified path within the project, containing the given text content. Returns confirmation that the file was created.
-
-This tool is the most efficient way to create new files within the project, so it should always be chosen whenever it's necessary to create a new file in the project with specific text content, or whenever a file in the project needs such a drastic change that you would prefer to replace the entire thing instead of making individual edits. This tool should not be used when making changes to parts of an existing file but not all of it. In those cases, it's better to use another approach to edit the file.
--- a/crates/assistant_tools/src/delete_path_tool.rs
+++ b/crates/assistant_tools/src/delete_path_tool.rs
@@ -3,7 +3,7 @@ use anyhow::{Result, anyhow};
 use assistant_tool::{ActionLog, Tool, ToolResult};
 use futures::{SinkExt, StreamExt, channel::mpsc};
 use gpui::{AnyWindowHandle, App, AppContext, Entity, Task};
-use language_model::{LanguageModelRequestMessage, LanguageModelToolSchemaFormat};
+use language_model::{LanguageModel, LanguageModelRequest, LanguageModelToolSchemaFormat};
 use project::{Project, ProjectPath};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
@@ -59,9 +59,10 @@ impl Tool for DeletePathTool {
    fn run(
        self: Arc<Self>,
        input: serde_json::Value,
-        _messages: &[LanguageModelRequestMessage],
+        _request: Arc<LanguageModelRequest>,
        project: Entity<Project>,
        action_log: Entity<ActionLog>,
+        _model: Arc<dyn LanguageModel>,
        _window: Option<AnyWindowHandle>,
        cx: &mut App,
    ) -> ToolResult {
--- a/crates/assistant_tools/src/diagnostics_tool.rs
+++ b/crates/assistant_tools/src/diagnostics_tool.rs
@@ -3,7 +3,7 @@ use anyhow::{Result, anyhow};
 use assistant_tool::{ActionLog, Tool, ToolResult};
 use gpui::{AnyWindowHandle, App, Entity, Task};
 use language::{DiagnosticSeverity, OffsetRangeExt};
-use language_model::{LanguageModelRequestMessage, LanguageModelToolSchemaFormat};
+use language_model::{LanguageModel, LanguageModelRequest, LanguageModelToolSchemaFormat};
 use project::Project;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
@@ -79,9 +79,10 @@ impl Tool for DiagnosticsTool {
    fn run(
        self: Arc<Self>,
        input: serde_json::Value,
-        _messages: &[LanguageModelRequestMessage],
+        _request: Arc<LanguageModelRequest>,
        project: Entity<Project>,
        action_log: Entity<ActionLog>,
+        _model: Arc<dyn LanguageModel>,
        _window: Option<AnyWindowHandle>,
        cx: &mut App,
    ) -> ToolResult {
--- a/crates/assistant_tools/src/edit_agent.rs
+++ b/crates/assistant_tools/src/edit_agent.rs
@@ -17,10 +17,11 @@ use gpui::{AppContext, AsyncApp, Entity, SharedString, Task};
 use language::{Bias, Buffer, BufferSnapshot, LineIndent, Point};
 use language_model::{
    LanguageModel, LanguageModelCompletionError, LanguageModelRequest, LanguageModelRequestMessage,
-    MessageContent, Role,
+    LanguageModelToolChoice, MessageContent, Role,
 };
 use project::{AgentLocation, Project};
-use serde::Serialize;
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
 use std::{cmp, iter, mem, ops::Range, path::PathBuf, sync::Arc, task::Poll};
 use streaming_diff::{CharOperation, StreamingDiff};

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

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

 #[derive(Clone)]
@@ -83,7 +84,7 @@ impl EditAgent {
        &self,
        buffer: Entity<Buffer>,
        edit_description: String,
-        previous_messages: Vec<LanguageModelRequestMessage>,
+        conversation: &LanguageModelRequest,
        cx: &mut AsyncApp,
    ) -> (
        Task<Result<EditAgentOutput>>,
@@ -91,6 +92,7 @@ impl EditAgent {
    ) {
        let this = self.clone();
        let (events_tx, events_rx) = mpsc::unbounded();
+        let conversation = conversation.clone();
        let output = cx.spawn(async move |cx| {
            let snapshot = buffer.read_with(cx, |buffer, _| buffer.snapshot())?;
            let path = cx.update(|cx| snapshot.resolve_file_path(cx, true))?;
@@ -99,7 +101,7 @@ impl EditAgent {
                edit_description,
            }
            .render(&this.templates)?;
-            let new_chunks = this.request(previous_messages, prompt, cx).await?;
+            let new_chunks = this.request(conversation, prompt, cx).await?;

            let (output, mut inner_events) = this.overwrite_with_chunks(buffer, new_chunks, cx);
            while let Some(event) = inner_events.next().await {
@@ -185,8 +187,8 @@ impl EditAgent {
        }

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

@@ -194,7 +196,7 @@ impl EditAgent {
        &self,
        buffer: Entity<Buffer>,
        edit_description: String,
-        previous_messages: Vec<LanguageModelRequestMessage>,
+        conversation: &LanguageModelRequest,
        cx: &mut AsyncApp,
    ) -> (
        Task<Result<EditAgentOutput>>,
@@ -214,6 +216,7 @@ impl EditAgent {

        let this = self.clone();
        let (events_tx, events_rx) = mpsc::unbounded();
+        let conversation = conversation.clone();
        let output = cx.spawn(async move |cx| {
            let snapshot = buffer.read_with(cx, |buffer, _| buffer.snapshot())?;
            let path = cx.update(|cx| snapshot.resolve_file_path(cx, true))?;
@@ -222,7 +225,7 @@ impl EditAgent {
                edit_description,
            }
            .render(&this.templates)?;
-            let edit_chunks = this.request(previous_messages, prompt, cx).await?;
+            let edit_chunks = this.request(conversation, prompt, cx).await?;

            let (output, mut inner_events) = this.apply_edit_chunks(buffer, edit_chunks, cx);
            while let Some(event) = inner_events.next().await {
@@ -424,8 +427,8 @@ impl EditAgent {
                }
            }
            Ok(EditAgentOutput {
-                _raw_edits: raw_edits,
-                _parser_metrics: parser.finish(),
+                raw_edits,
+                parser_metrics: parser.finish(),
            })
        });
        (output, rx)
@@ -512,32 +515,67 @@ impl EditAgent {

    async fn request(
        &self,
-        mut messages: Vec<LanguageModelRequestMessage>,
+        mut conversation: LanguageModelRequest,
        prompt: String,
        cx: &mut AsyncApp,
    ) -> Result<BoxStream<'static, Result<String, LanguageModelCompletionError>>> {
-        let mut message_content = Vec::new();
-        if let Some(last_message) = messages.last_mut() {
+        let mut messages_iter = conversation.messages.iter_mut();
+        if let Some(last_message) = messages_iter.next_back() {
            if last_message.role == Role::Assistant {
+                let old_content_len = last_message.content.len();
                last_message
                    .content
                    .retain(|content| !matches!(content, MessageContent::ToolUse(_)));
+                let new_content_len = last_message.content.len();
+
+                // We just removed pending tool uses from the content of the
+                // last message, so it doesn't make sense to cache it anymore
+                // (e.g., the message will look very different on the next
+                // request). Thus, we move the flag to the message prior to it,
+                // as it will still be a valid prefix of the conversation.
+                if old_content_len != new_content_len && last_message.cache {
+                    if let Some(prev_message) = messages_iter.next_back() {
+                        last_message.cache = false;
+                        prev_message.cache = true;
+                    }
+                }
+
                if last_message.content.is_empty() {
-                    messages.pop();
+                    conversation.messages.pop();
                }
            }
        }
-        message_content.push(MessageContent::Text(prompt));
-        messages.push(LanguageModelRequestMessage {
+
+        conversation.messages.push(LanguageModelRequestMessage {
            role: Role::User,
-            content: message_content,
+            content: vec![MessageContent::Text(prompt)],
            cache: false,
        });

+        // Include tools in the request so that we can take advantage of
+        // caching when ToolChoice::None is supported.
+        let mut tool_choice = None;
+        let mut tools = Vec::new();
+        if !conversation.tools.is_empty()
+            && self
+                .model
+                .supports_tool_choice(LanguageModelToolChoice::None)
+        {
+            tool_choice = Some(LanguageModelToolChoice::None);
+            tools = conversation.tools.clone();
+        }
+
        let request = LanguageModelRequest {
-            messages,
-            ..Default::default()
+            thread_id: conversation.thread_id,
+            prompt_id: conversation.prompt_id,
+            mode: conversation.mode,
+            messages: conversation.messages,
+            tool_choice,
+            tools,
+            stop: Vec::new(),
+            temperature: None,
        };
+
        Ok(self.model.stream_completion_text(request, cx).await?.stream)
    }

--- a/crates/assistant_tools/src/edit_agent/edit_parser.rs
+++ b/crates/assistant_tools/src/edit_agent/edit_parser.rs
@@ -1,4 +1,6 @@
 use derive_more::{Add, AddAssign};
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
 use smallvec::SmallVec;
 use std::{cmp, mem, ops::Range};

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

-#[derive(Clone, Debug, Default, PartialEq, Eq, Add, AddAssign)]
+#[derive(
+    Clone, Debug, Default, PartialEq, Eq, Add, AddAssign, Serialize, Deserialize, JsonSchema,
+)]
 pub struct EditParserMetrics {
    pub tags: usize,
    pub mismatched_tags: usize,
--- a/crates/assistant_tools/src/edit_agent/evals.rs
+++ b/crates/assistant_tools/src/edit_agent/evals.rs
@@ -1,18 +1,17 @@
 use super::*;
-use crate::{
-    ReadFileToolInput, grep_tool::GrepToolInput,
-    streaming_edit_file_tool::StreamingEditFileToolInput,
-};
+use crate::{ReadFileToolInput, edit_file_tool::EditFileToolInput, grep_tool::GrepToolInput};
 use Role::*;
 use anyhow::anyhow;
+use assistant_tool::ToolRegistry;
 use client::{Client, UserStore};
 use collections::HashMap;
 use fs::FakeFs;
 use futures::{FutureExt, future::LocalBoxFuture};
 use gpui::{AppContext, TestAppContext};
-use indoc::indoc;
+use indoc::{formatdoc, indoc};
 use language_model::{
-    LanguageModelRegistry, LanguageModelToolResult, LanguageModelToolUse, LanguageModelToolUseId,
+    LanguageModelRegistry, LanguageModelRequestTool, LanguageModelToolResult, LanguageModelToolUse,
+    LanguageModelToolUseId,
 };
 use project::Project;
 use rand::prelude::*;
@@ -40,7 +39,7 @@ fn eval_extract_handle_command_output() {
            conversation: vec![
                message(
                    User,
-                    [text(indoc! {"
+                    [text(formatdoc! {"
                        Read the `{input_file_path}` file and extract a method in
                        the final stanza of `run_git_blame` to deal with command failures,
                        call it `handle_command_output` and take the std::process::Output as the only parameter.
@@ -69,7 +68,7 @@ fn eval_extract_handle_command_output() {
                    [tool_use(
                        "tool_2",
                        "edit_file",
-                        StreamingEditFileToolInput {
+                        EditFileToolInput {
                            display_description: edit_description.into(),
                            path: input_file_path.into(),
                            create_or_overwrite: false,
@@ -99,7 +98,7 @@ fn eval_delete_run_git_blame() {
            conversation: vec![
                message(
                    User,
-                    [text(indoc! {"
+                    [text(formatdoc! {"
                        Read the `{input_file_path}` file and delete `run_git_blame`. Just that
                        one function, not its usages.
                    "})],
@@ -125,7 +124,7 @@ fn eval_delete_run_git_blame() {
                    [tool_use(
                        "tool_2",
                        "edit_file",
-                        StreamingEditFileToolInput {
+                        EditFileToolInput {
                            display_description: edit_description.into(),
                            path: input_file_path.into(),
                            create_or_overwrite: false,
@@ -141,6 +140,61 @@ fn eval_delete_run_git_blame() {
    );
 }

+#[test]
+#[cfg_attr(not(feature = "eval"), ignore)]
+fn eval_translate_doc_comments() {
+    let input_file_path = "root/canvas.rs";
+    let input_file_content = include_str!("evals/fixtures/translate_doc_comments/before.rs");
+    let edit_description = "Translate all doc comments to Italian";
+    eval(
+        200,
+        1.,
+        EvalInput {
+            conversation: vec![
+                message(
+                    User,
+                    [text(formatdoc! {"
+                        Read the {input_file_path} file and edit it (without overwriting it),
+                        translating all the doc comments to italian.
+                    "})],
+                ),
+                message(
+                    Assistant,
+                    [tool_use(
+                        "tool_1",
+                        "read_file",
+                        ReadFileToolInput {
+                            path: input_file_path.into(),
+                            start_line: None,
+                            end_line: None,
+                        },
+                    )],
+                ),
+                message(
+                    User,
+                    [tool_result("tool_1", "read_file", input_file_content)],
+                ),
+                message(
+                    Assistant,
+                    [tool_use(
+                        "tool_2",
+                        "edit_file",
+                        EditFileToolInput {
+                            display_description: edit_description.into(),
+                            path: input_file_path.into(),
+                            create_or_overwrite: false,
+                        },
+                    )],
+                ),
+            ],
+            input_path: input_file_path.into(),
+            input_content: Some(input_file_content.into()),
+            edit_description: edit_description.into(),
+            assertion: EvalAssertion::judge_diff("Doc comments were translated to Italian"),
+        },
+    );
+}
+
 #[test]
 #[cfg_attr(not(feature = "eval"), ignore)]
 fn eval_use_wasi_sdk_in_compile_parser_to_wasm() {
@@ -155,7 +209,7 @@ fn eval_use_wasi_sdk_in_compile_parser_to_wasm() {
            conversation: vec![
                message(
                    User,
-                    [text(indoc! {"
+                    [text(formatdoc! {"
                        Read the `{input_file_path}` file and change `compile_parser_to_wasm` to use `wasi-sdk` instead of emscripten.
                        Use `ureq` to download the SDK for the current platform and architecture.
                        Extract the archive into a sibling of `lib` inside the `tree-sitter` directory in the cache_dir.
@@ -163,7 +217,7 @@ fn eval_use_wasi_sdk_in_compile_parser_to_wasm() {
                        that's inside of the archive.
                        Don't re-download the SDK if that executable already exists.

-                        Use these clang flags: -fPIC -shared -Os -Wl,--export=tree_sitter_{language_name}
+                        Use these clang flags: -fPIC -shared -Os -Wl,--export=tree_sitter_{{language_name}}

                        Here are the available wasi-sdk assets:
                        - wasi-sdk-25.0-x86_64-macos.tar.gz
@@ -240,7 +294,7 @@ fn eval_use_wasi_sdk_in_compile_parser_to_wasm() {
                    [tool_use(
                        "tool_4",
                        "edit_file",
-                        StreamingEditFileToolInput {
+                        EditFileToolInput {
                            display_description: edit_description.into(),
                            path: input_file_path.into(),
                            create_or_overwrite: false,
@@ -264,11 +318,10 @@ fn eval_use_wasi_sdk_in_compile_parser_to_wasm() {
 fn eval_disable_cursor_blinking() {
    let input_file_path = "root/editor.rs";
    let input_file_content = include_str!("evals/fixtures/disable_cursor_blinking/before.rs");
-    let output_file_content = include_str!("evals/fixtures/disable_cursor_blinking/after.rs");
    let edit_description = "Comment out the call to `BlinkManager::enable`";
    eval(
        200,
-        0.6, // TODO: make this eval better
+        0.95,
        EvalInput {
            conversation: vec![
                message(User, [text("Let's research how to cursor blinking works.")]),
@@ -316,7 +369,7 @@ fn eval_disable_cursor_blinking() {
                    [tool_use(
                        "tool_4",
                        "edit_file",
-                        StreamingEditFileToolInput {
+                        EditFileToolInput {
                            display_description: edit_description.into(),
                            path: input_file_path.into(),
                            create_or_overwrite: false,
@@ -327,7 +380,11 @@ fn eval_disable_cursor_blinking() {
            input_path: input_file_path.into(),
            input_content: Some(input_file_content.into()),
            edit_description: edit_description.into(),
-            assertion: EvalAssertion::assert_eq(output_file_content),
+            assertion: EvalAssertion::judge_diff(indoc! {"
+                - Calls to BlinkManager in `observe_window_activation` were commented out
+                - The call to `blink_manager.enable` above the call to show_cursor_names was commented out
+                - All the edits have valid indentation
+            "}),
        },
    );
 }
@@ -506,7 +563,7 @@ fn eval_from_pixels_constructor() {
                    [tool_use(
                        "tool_5",
                        "edit_file",
-                        StreamingEditFileToolInput {
+                        EditFileToolInput {
                            display_description: edit_description.into(),
                            path: input_file_path.into(),
                            create_or_overwrite: false,
@@ -583,7 +640,7 @@ fn eval_zode() {
                        tool_use(
                            "tool_3",
                            "edit_file",
-                            StreamingEditFileToolInput {
+                            EditFileToolInput {
                                display_description: edit_description.into(),
                                path: input_file_path.into(),
                                create_or_overwrite: true,
@@ -828,7 +885,7 @@ fn eval_add_overwrite_test() {
                        tool_use(
                            "tool_5",
                            "edit_file",
-                            StreamingEditFileToolInput {
+                            EditFileToolInput {
                                display_description: edit_description.into(),
                                path: input_file_path.into(),
                                create_or_overwrite: false,
@@ -1034,7 +1091,8 @@ impl EvalAssertion {

 fn eval(iterations: usize, expected_pass_ratio: f32, mut eval: EvalInput) {
    let mut evaluated_count = 0;
-    report_progress(evaluated_count, iterations);
+    let mut failed_count = 0;
+    report_progress(evaluated_count, failed_count, iterations);

    let (tx, rx) = mpsc::channel();

@@ -1051,7 +1109,6 @@ fn eval(iterations: usize, expected_pass_ratio: f32, mut eval: EvalInput) {
    }
    drop(tx);

-    let mut failed_count = 0;
    let mut failed_evals = HashMap::default();
    let mut errored_evals = HashMap::default();
    let mut eval_outputs = Vec::new();
@@ -1059,7 +1116,7 @@ fn eval(iterations: usize, expected_pass_ratio: f32, mut eval: EvalInput) {
    while let Ok(output) = rx.recv() {
        match output {
            Ok(output) => {
-                cumulative_parser_metrics += output.sample.edit_output._parser_metrics.clone();
+                cumulative_parser_metrics += output.sample.edit_output.parser_metrics.clone();
                eval_outputs.push(output.clone());
                if output.assertion.score < 80 {
                    failed_count += 1;
@@ -1076,7 +1133,7 @@ fn eval(iterations: usize, expected_pass_ratio: f32, mut eval: EvalInput) {
        }

        evaluated_count += 1;
-        report_progress(evaluated_count, iterations);
+        report_progress(evaluated_count, failed_count, iterations);
    }

    let actual_pass_ratio = (iterations - failed_count) as f32 / iterations as f32;
@@ -1140,15 +1197,26 @@ impl Display for EvalOutput {
        writeln!(
            f,
            "Parser Metrics:\n{:#?}",
-            self.sample.edit_output._parser_metrics
+            self.sample.edit_output.parser_metrics
        )?;
-        writeln!(f, "Raw Edits:\n{}", self.sample.edit_output._raw_edits)?;
+        writeln!(f, "Raw Edits:\n{}", self.sample.edit_output.raw_edits)?;
        Ok(())
    }
 }

-fn report_progress(evaluated_count: usize, iterations: usize) {
-    print!("\r\x1b[KEvaluated {}/{}", evaluated_count, iterations);
+fn report_progress(evaluated_count: usize, failed_count: usize, iterations: usize) {
+    let passed_count = evaluated_count - failed_count;
+    let passed_ratio = if evaluated_count == 0 {
+        0.0
+    } else {
+        passed_count as f64 / evaluated_count as f64
+    };
+    print!(
+        "\r\x1b[KEvaluated {}/{} ({:.2}%)",
+        evaluated_count,
+        iterations,
+        passed_ratio * 100.0
+    );
    std::io::stdout().flush().unwrap();
 }

@@ -1161,25 +1229,30 @@ struct EditAgentTest {
 impl EditAgentTest {
    async fn new(cx: &mut TestAppContext) -> Self {
        cx.executor().allow_parking();
-        cx.update(settings::init);
-        cx.update(Project::init_settings);
-        cx.update(language::init);
-        cx.update(gpui_tokio::init);
-        cx.update(client::init_settings);

        let fs = FakeFs::new(cx.executor().clone());
+        cx.update(|cx| {
+            settings::init(cx);
+            gpui_tokio::init(cx);
+            let http_client = Arc::new(ReqwestClient::user_agent("agent tests").unwrap());
+            cx.set_http_client(http_client);
+
+            client::init_settings(cx);
+            let client = Client::production(cx);
+            let user_store = cx.new(|cx| UserStore::new(client.clone(), cx));
+
+            settings::init(cx);
+            Project::init_settings(cx);
+            language::init(cx);
+            language_model::init(client.clone(), cx);
+            language_models::init(user_store.clone(), client.clone(), fs.clone(), cx);
+            crate::init(client.http_client(), cx);
+        });
+
        fs.insert_tree("/root", json!({})).await;
        let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
        let (agent_model, judge_model) = cx
            .update(|cx| {
-                let http_client = ReqwestClient::user_agent("agent tests").unwrap();
-                cx.set_http_client(Arc::new(http_client));
-
-                let client = Client::production(cx);
-                let user_store = cx.new(|cx| UserStore::new(client.clone(), cx));
-                language_model::init(client.clone(), cx);
-                language_models::init(user_store.clone(), client.clone(), fs.clone(), cx);
-
                cx.spawn(async move |cx| {
                    let agent_model =
                        Self::load_model("anthropic", "claude-3-7-sonnet-latest", cx).await;
@@ -1228,12 +1301,32 @@ impl EditAgentTest {
            .update(cx, |project, cx| project.open_buffer(path, cx))
            .await
            .unwrap();
+        let conversation = LanguageModelRequest {
+            messages: eval.conversation,
+            tools: cx.update(|cx| {
+                ToolRegistry::default_global(cx)
+                    .tools()
+                    .into_iter()
+                    .filter_map(|tool| {
+                        let input_schema = tool
+                            .input_schema(self.agent.model.tool_input_format())
+                            .ok()?;
+                        Some(LanguageModelRequestTool {
+                            name: tool.name(),
+                            description: tool.description(),
+                            input_schema,
+                        })
+                    })
+                    .collect()
+            }),
+            ..Default::default()
+        };
        let edit_output = if let Some(input_content) = eval.input_content.as_deref() {
            buffer.update(cx, |buffer, cx| buffer.set_text(input_content, cx));
            let (edit_output, _) = self.agent.edit(
                buffer.clone(),
                eval.edit_description,
-                eval.conversation,
+                &conversation,
                &mut cx.to_async(),
            );
            edit_output.await?
@@ -1241,7 +1334,7 @@ impl EditAgentTest {
            let (edit_output, _) = self.agent.overwrite(
                buffer.clone(),
                eval.edit_description,
-                eval.conversation,
+                &conversation,
                &mut cx.to_async(),
            );
            edit_output.await?
--- a/crates/assistant_tools/src/edit_agent/evals/fixtures/disable_cursor_blinking/after.rs
+++ b/crates/assistant_tools/src/edit_agent/evals/fixtures/disable_cursor_blinking/after.rs
--- a/crates/assistant_tools/src/edit_agent/evals/fixtures/translate_doc_comments/before.rs
+++ b/crates/assistant_tools/src/edit_agent/evals/fixtures/translate_doc_comments/before.rs
@@ -0,0 +1,339 @@
+// font-kit/src/canvas.rs
+//
+// Copyright © 2018 The Pathfinder Project Developers.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+//! An in-memory bitmap surface for glyph rasterization.
+
+use lazy_static::lazy_static;
+use pathfinder_geometry::rect::RectI;
+use pathfinder_geometry::vector::Vector2I;
+use std::cmp;
+use std::fmt;
+
+use crate::utils;
+
+lazy_static! {
+    static ref BITMAP_1BPP_TO_8BPP_LUT: [[u8; 8]; 256] = {
+        let mut lut = [[0; 8]; 256];
+        for byte in 0..0x100 {
+            let mut value = [0; 8];
+            for bit in 0..8 {
+                if (byte & (0x80 >> bit)) != 0 {
+                    value[bit] = 0xff;
+                }
+            }
+            lut[byte] = value
+        }
+        lut
+    };
+}
+
+/// An in-memory bitmap surface for glyph rasterization.
+pub struct Canvas {
+    /// The raw pixel data.
+    pub pixels: Vec<u8>,
+    /// The size of the buffer, in pixels.
+    pub size: Vector2I,
+    /// The number of *bytes* between successive rows.
+    pub stride: usize,
+    /// The image format of the canvas.
+    pub format: Format,
+}
+
+impl Canvas {
+    /// Creates a new blank canvas with the given pixel size and format.
+    ///
+    /// Stride is automatically calculated from width.
+    ///
+    /// The canvas is initialized with transparent black (all values 0).
+    #[inline]
+    pub fn new(size: Vector2I, format: Format) -> Canvas {
+        Canvas::with_stride(
+            size,
+            size.x() as usize * format.bytes_per_pixel() as usize,
+            format,
+        )
+    }
+
+    /// Creates a new blank canvas with the given pixel size, stride (number of bytes between
+    /// successive rows), and format.
+    ///
+    /// The canvas is initialized with transparent black (all values 0).
+    pub fn with_stride(size: Vector2I, stride: usize, format: Format) -> Canvas {
+        Canvas {
+            pixels: vec![0; stride * size.y() as usize],
+            size,
+            stride,
+            format,
+        }
+    }
+
+    #[allow(dead_code)]
+    pub(crate) fn blit_from_canvas(&mut self, src: &Canvas) {
+        self.blit_from(
+            Vector2I::default(),
+            &src.pixels,
+            src.size,
+            src.stride,
+            src.format,
+        )
+    }
+
+    /// Blits to a rectangle with origin at `dst_point` and size according to `src_size`.
+    /// If the target area overlaps the boundaries of the canvas, only the drawable region is blitted.
+    /// `dst_point` and `src_size` are specified in pixels. `src_stride` is specified in bytes.
+    /// `src_stride` must be equal or larger than the actual data length.
+    #[allow(dead_code)]
+    pub(crate) fn blit_from(
+        &mut self,
+        dst_point: Vector2I,
+        src_bytes: &[u8],
+        src_size: Vector2I,
+        src_stride: usize,
+        src_format: Format,
+    ) {
+        assert_eq!(
+            src_stride * src_size.y() as usize,
+            src_bytes.len(),
+            "Number of pixels in src_bytes does not match stride and size."
+        );
+        assert!(
+            src_stride >= src_size.x() as usize * src_format.bytes_per_pixel() as usize,
+            "src_stride must be >= than src_size.x()"
+        );
+
+        let dst_rect = RectI::new(dst_point, src_size);
+        let dst_rect = dst_rect.intersection(RectI::new(Vector2I::default(), self.size));
+        let dst_rect = match dst_rect {
+            Some(dst_rect) => dst_rect,
+            None => return,
+        };
+
+        match (self.format, src_format) {
+            (Format::A8, Format::A8)
+            | (Format::Rgb24, Format::Rgb24)
+            | (Format::Rgba32, Format::Rgba32) => {
+                self.blit_from_with::<BlitMemcpy>(dst_rect, src_bytes, src_stride, src_format)
+            }
+            (Format::A8, Format::Rgb24) => {
+                self.blit_from_with::<BlitRgb24ToA8>(dst_rect, src_bytes, src_stride, src_format)
+            }
+            (Format::Rgb24, Format::A8) => {
+                self.blit_from_with::<BlitA8ToRgb24>(dst_rect, src_bytes, src_stride, src_format)
+            }
+            (Format::Rgb24, Format::Rgba32) => self
+                .blit_from_with::<BlitRgba32ToRgb24>(dst_rect, src_bytes, src_stride, src_format),
+            (Format::Rgba32, Format::Rgb24) => self
+                .blit_from_with::<BlitRgb24ToRgba32>(dst_rect, src_bytes, src_stride, src_format),
+            (Format::Rgba32, Format::A8) | (Format::A8, Format::Rgba32) => unimplemented!(),
+        }
+    }
+
+    #[allow(dead_code)]
+    pub(crate) fn blit_from_bitmap_1bpp(
+        &mut self,
+        dst_point: Vector2I,
+        src_bytes: &[u8],
+        src_size: Vector2I,
+        src_stride: usize,
+    ) {
+        if self.format != Format::A8 {
+            unimplemented!()
+        }
+
+        let dst_rect = RectI::new(dst_point, src_size);
+        let dst_rect = dst_rect.intersection(RectI::new(Vector2I::default(), self.size));
+        let dst_rect = match dst_rect {
+            Some(dst_rect) => dst_rect,
+            None => return,
+        };
+
+        let size = dst_rect.size();
+
+        let dest_bytes_per_pixel = self.format.bytes_per_pixel() as usize;
+        let dest_row_stride = size.x() as usize * dest_bytes_per_pixel;
+        let src_row_stride = utils::div_round_up(size.x() as usize, 8);
+
+        for y in 0..size.y() {
+            let (dest_row_start, src_row_start) = (
+                (y + dst_rect.origin_y()) as usize * self.stride
+                    + dst_rect.origin_x() as usize * dest_bytes_per_pixel,
+                y as usize * src_stride,
+            );
+            let dest_row_end = dest_row_start + dest_row_stride;
+            let src_row_end = src_row_start + src_row_stride;
+            let dest_row_pixels = &mut self.pixels[dest_row_start..dest_row_end];
+            let src_row_pixels = &src_bytes[src_row_start..src_row_end];
+            for x in 0..src_row_stride {
+                let pattern = &BITMAP_1BPP_TO_8BPP_LUT[src_row_pixels[x] as usize];
+                let dest_start = x * 8;
+                let dest_end = cmp::min(dest_start + 8, dest_row_stride);
+                let src = &pattern[0..(dest_end - dest_start)];
+                dest_row_pixels[dest_start..dest_end].clone_from_slice(src);
+            }
+        }
+    }
+
+    /// Blits to area `rect` using the data given in the buffer `src_bytes`.
+    /// `src_stride` must be specified in bytes.
+    /// The dimensions of `rect` must be in pixels.
+    fn blit_from_with<B: Blit>(
+        &mut self,
+        rect: RectI,
+        src_bytes: &[u8],
+        src_stride: usize,
+        src_format: Format,
+    ) {
+        let src_bytes_per_pixel = src_format.bytes_per_pixel() as usize;
+        let dest_bytes_per_pixel = self.format.bytes_per_pixel() as usize;
+
+        for y in 0..rect.height() {
+            let (dest_row_start, src_row_start) = (
+                (y + rect.origin_y()) as usize * self.stride
+                    + rect.origin_x() as usize * dest_bytes_per_pixel,
+                y as usize * src_stride,
+            );
+            let dest_row_end = dest_row_start + rect.width() as usize * dest_bytes_per_pixel;
+            let src_row_end = src_row_start + rect.width() as usize * src_bytes_per_pixel;
+            let dest_row_pixels = &mut self.pixels[dest_row_start..dest_row_end];
+            let src_row_pixels = &src_bytes[src_row_start..src_row_end];
+            B::blit(dest_row_pixels, src_row_pixels)
+        }
+    }
+}
+
+impl fmt::Debug for Canvas {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        f.debug_struct("Canvas")
+            .field("pixels", &self.pixels.len()) // Do not dump a vector content.
+            .field("size", &self.size)
+            .field("stride", &self.stride)
+            .field("format", &self.format)
+            .finish()
+    }
+}
+
+/// The image format for the canvas.
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub enum Format {
+    /// Premultiplied R8G8B8A8, little-endian.
+    Rgba32,
+    /// R8G8B8, little-endian.
+    Rgb24,
+    /// A8.
+    A8,
+}
+
+impl Format {
+    /// Returns the number of bits per pixel that this image format corresponds to.
+    #[inline]
+    pub fn bits_per_pixel(self) -> u8 {
+        match self {
+            Format::Rgba32 => 32,
+            Format::Rgb24 => 24,
+            Format::A8 => 8,
+        }
+    }
+
+    /// Returns the number of color channels per pixel that this image format corresponds to.
+    #[inline]
+    pub fn components_per_pixel(self) -> u8 {
+        match self {
+            Format::Rgba32 => 4,
+            Format::Rgb24 => 3,
+            Format::A8 => 1,
+        }
+    }
+
+    /// Returns the number of bits per color channel that this image format contains.
+    #[inline]
+    pub fn bits_per_component(self) -> u8 {
+        self.bits_per_pixel() / self.components_per_pixel()
+    }
+
+    /// Returns the number of bytes per pixel that this image format corresponds to.
+    #[inline]
+    pub fn bytes_per_pixel(self) -> u8 {
+        self.bits_per_pixel() / 8
+    }
+}
+
+/// The antialiasing strategy that should be used when rasterizing glyphs.
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub enum RasterizationOptions {
+    /// "Black-and-white" rendering. Each pixel is either entirely on or off.
+    Bilevel,
+    /// Grayscale antialiasing. Only one channel is used.
+    GrayscaleAa,
+    /// Subpixel RGB antialiasing, for LCD screens.
+    SubpixelAa,
+}
+
+trait Blit {
+    fn blit(dest: &mut [u8], src: &[u8]);
+}
+
+struct BlitMemcpy;
+
+impl Blit for BlitMemcpy {
+    #[inline]
+    fn blit(dest: &mut [u8], src: &[u8]) {
+        dest.clone_from_slice(src)
+    }
+}
+
+struct BlitRgb24ToA8;
+
+impl Blit for BlitRgb24ToA8 {
+    #[inline]
+    fn blit(dest: &mut [u8], src: &[u8]) {
+        // TODO(pcwalton): SIMD.
+        for (dest, src) in dest.iter_mut().zip(src.chunks(3)) {
+            *dest = src[1]
+        }
+    }
+}
+
+struct BlitA8ToRgb24;
+
+impl Blit for BlitA8ToRgb24 {
+    #[inline]
+    fn blit(dest: &mut [u8], src: &[u8]) {
+        for (dest, src) in dest.chunks_mut(3).zip(src.iter()) {
+            dest[0] = *src;
+            dest[1] = *src;
+            dest[2] = *src;
+        }
+    }
+}
+
+struct BlitRgba32ToRgb24;
+
+impl Blit for BlitRgba32ToRgb24 {
+    #[inline]
+    fn blit(dest: &mut [u8], src: &[u8]) {
+        // TODO(pcwalton): SIMD.
+        for (dest, src) in dest.chunks_mut(3).zip(src.chunks(4)) {
+            dest.copy_from_slice(&src[0..3])
+        }
+    }
+}
+
+struct BlitRgb24ToRgba32;
+
+impl Blit for BlitRgb24ToRgba32 {
+    fn blit(dest: &mut [u8], src: &[u8]) {
+        for (dest, src) in dest.chunks_mut(4).zip(src.chunks(3)) {
+            dest[0] = src[0];
+            dest[1] = src[1];
+            dest[2] = src[2];
+            dest[3] = 255;
+        }
+    }
+}
--- a/crates/assistant_tools/src/edit_file_tool.rs
+++ b/crates/assistant_tools/src/edit_file_tool.rs
@@ -1,24 +1,27 @@
 use crate::{
-    replace::{replace_exact, replace_with_flexible_indent},
+    Templates,
+    edit_agent::{EditAgent, EditAgentOutput, EditAgentOutputEvent},
    schema::json_schema_for,
-    streaming_edit_file_tool::StreamingEditFileToolOutput,
 };
-use anyhow::{Context as _, Result, anyhow};
+use anyhow::{Result, anyhow};
 use assistant_tool::{
    ActionLog, AnyToolCard, Tool, ToolCard, ToolResult, ToolResultOutput, ToolUseStatus,
 };
 use buffer_diff::{BufferDiff, BufferDiffSnapshot};
-use editor::{Editor, EditorElement, EditorMode, EditorStyle, MultiBuffer, PathKey};
+use editor::{Editor, EditorMode, MultiBuffer, PathKey};
+use futures::StreamExt;
 use gpui::{
-    Animation, AnimationExt, AnyWindowHandle, App, AppContext, AsyncApp, Context, Entity, EntityId,
-    Task, TextStyle, WeakEntity, pulsating_between,
+    Animation, AnimationExt, AnyWindowHandle, App, AppContext, AsyncApp, Entity, EntityId, Task,
+    TextStyleRefinement, WeakEntity, pulsating_between,
 };
+use indoc::formatdoc;
 use language::{
    Anchor, Buffer, Capability, LanguageRegistry, LineEnding, OffsetRangeExt, Rope, TextBuffer,
    language_settings::SoftWrap,
 };
-use language_model::{LanguageModelRequestMessage, LanguageModelToolSchemaFormat};
-use project::{AgentLocation, Project};
+use language_model::{LanguageModel, LanguageModelRequest, LanguageModelToolSchemaFormat};
+use markdown::{Markdown, MarkdownElement, MarkdownStyle};
+use project::Project;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use settings::Settings;
@@ -28,7 +31,7 @@ use std::{
    time::Duration,
 };
 use theme::ThemeSettings;
-use ui::{Disclosure, Tooltip, Window, prelude::*};
+use ui::{Disclosure, Tooltip, prelude::*};
 use util::ResultExt;
 use workspace::Workspace;

@@ -36,7 +39,13 @@ pub struct EditFileTool;

 #[derive(Debug, Serialize, Deserialize, JsonSchema)]
 pub struct EditFileToolInput {
-    /// A user-friendly markdown description of what's being replaced. This will be shown in the UI.
+    /// A one-line, user-friendly markdown description of the edit. This will be
+    /// shown in the UI and also passed to another model to perform the edit.
+    ///
+    /// Be terse, but also descriptive in what you want to achieve with this
+    /// edit. Avoid generic instructions.
+    ///
+    /// NEVER mention the file path in this description.
    ///
    /// <example>Fix API endpoint URLs</example>
    /// <example>Update copyright year in `page_footer`</example>
@@ -45,7 +54,7 @@ pub struct EditFileToolInput {
    /// so that we can display it immediately.
    pub display_description: String,

-    /// The full path of the file to modify in the project.
+    /// The full path of the file to create or modify in the project.
    ///
    /// WARNING: When specifying which file path need changing, you MUST
    /// start each path with one of the project's root directories.
@@ -66,11 +75,20 @@ pub struct EditFileToolInput {
    /// </example>
    pub path: PathBuf,

-    /// The text to replace.
-    pub old_string: String,
+    /// If true, this tool will recreate the file from scratch.
+    /// If false, this tool will produce granular edits to an existing file.
+    ///
+    /// When a file already exists or you just created it, always prefer editing
+    /// it as opposed to recreating it from scratch.
+    pub create_or_overwrite: bool,
+}

-    /// The text to replace it with.
-    pub new_string: String,
+#[derive(Debug, Serialize, Deserialize, JsonSchema)]
+pub struct EditFileToolOutput {
+    pub original_path: PathBuf,
+    pub new_text: String,
+    pub old_text: String,
+    pub raw_output: Option<EditAgentOutput>,
 }

 #[derive(Debug, Serialize, Deserialize, JsonSchema)]
@@ -79,10 +97,6 @@ struct PartialInput {
    path: String,
    #[serde(default)]
    display_description: String,
-    #[serde(default)]
-    old_string: String,
-    #[serde(default)]
-    new_string: String,
 }

 const DEFAULT_UI_TEXT: &str = "Editing file";
@@ -134,9 +148,10 @@ impl Tool for EditFileTool {
    fn run(
        self: Arc<Self>,
        input: serde_json::Value,
-        _messages: &[LanguageModelRequestMessage],
+        request: Arc<LanguageModelRequest>,
        project: Entity<Project>,
        action_log: Entity<ActionLog>,
+        model: Arc<dyn LanguageModel>,
        window: Option<AnyWindowHandle>,
        cx: &mut App,
    ) -> ToolResult {
@@ -145,6 +160,14 @@ impl Tool for EditFileTool {
            Err(err) => return Task::ready(Err(anyhow!(err))).into(),
        };

+        let Some(project_path) = project.read(cx).find_project_path(&input.path, cx) else {
+            return Task::ready(Err(anyhow!(
+                "Path {} not found in project",
+                input.path.display()
+            )))
+            .into();
+        };
+
        let card = window.and_then(|window| {
            window
                .update(cx, |_, window, cx| {
@@ -156,12 +179,8 @@ impl Tool for EditFileTool {
        });

        let card_clone = card.clone();
-        let task: Task<Result<ToolResultOutput, _>> = cx.spawn(async move |cx: &mut AsyncApp| {
-            let project_path = project.read_with(cx, |project, cx| {
-                project
-                    .find_project_path(&input.path, cx)
-                    .context("Path not found in project")
-            })??;
+        let task = cx.spawn(async move |cx: &mut AsyncApp| {
+            let edit_agent = EditAgent::new(model, project.clone(), action_log, Templates::new());

            let buffer = project
                .update(cx, |project, cx| {
@@ -169,144 +188,114 @@ impl Tool for EditFileTool {
                })?
                .await?;

-            // Set the agent's location to the top of the file
-            project
-                .update(cx, |project, cx| {
-                    project.set_agent_location(
-                        Some(AgentLocation {
-                            buffer: buffer.downgrade(),
-                            position: language::Anchor::MIN,
-                        }),
-                        cx,
-                    );
-                })
-                .ok();
-
-            let snapshot = buffer.read_with(cx, |buffer, _cx| buffer.snapshot())?;
-
-            if input.old_string.is_empty() {
-                return Err(anyhow!(
-                    "`old_string` can't be empty, use another tool if you want to create a file."
-                ));
+            let exists = buffer.read_with(cx, |buffer, _| {
+                buffer
+                    .file()
+                    .as_ref()
+                    .map_or(false, |file| file.disk_state().exists())
+            })?;
+            if !input.create_or_overwrite && !exists {
+                return Err(anyhow!("{} not found", input.path.display()));
            }

-            if input.old_string == input.new_string {
-                return Err(anyhow!(
-                    "The `old_string` and `new_string` are identical, so no changes would be made."
-                ));
-            }
-
-            let result = cx
-                .background_spawn(async move {
-                    // Try to match exactly
-                    let diff = replace_exact(&input.old_string, &input.new_string, &snapshot)
-                        .await
-                        // If that fails, try being flexible about indentation
-                        .or_else(|| {
-                            replace_with_flexible_indent(
-                                &input.old_string,
-                                &input.new_string,
-                                &snapshot,
-                            )
-                        })?;
-
-                    if diff.edits.is_empty() {
-                        return None;
-                    }
-
-                    let old_text = snapshot.text();
-
-                    Some((old_text, diff))
+            let old_snapshot = buffer.read_with(cx, |buffer, _cx| buffer.snapshot())?;
+            let old_text = cx
+                .background_spawn({
+                    let old_snapshot = old_snapshot.clone();
+                    async move { old_snapshot.text() }
                })
                .await;

-            let Some((old_text, diff)) = result else {
-                let err = buffer.read_with(cx, |buffer, _cx| {
-                    let file_exists = buffer
-                        .file()
-                        .map_or(false, |file| file.disk_state().exists());
-
-                    if !file_exists {
-                        anyhow!("{} does not exist", input.path.display())
-                    } else if buffer.is_empty() {
-                        anyhow!(
-                            "{} is empty, so the provided `old_string` wasn't found.",
-                            input.path.display()
-                        )
-                    } else {
-                        anyhow!("Failed to match the provided `old_string`")
-                    }
-                })?;
-
-                return Err(err);
+            let (output, mut events) = if input.create_or_overwrite {
+                edit_agent.overwrite(
+                    buffer.clone(),
+                    input.display_description.clone(),
+                    &request,
+                    cx,
+                )
+            } else {
+                edit_agent.edit(
+                    buffer.clone(),
+                    input.display_description.clone(),
+                    &request,
+                    cx,
+                )
            };

-            let snapshot = cx.update(|cx| {
-                action_log.update(cx, |log, cx| log.buffer_read(buffer.clone(), cx));
-                let base_version = diff.base_version.clone();
-                let snapshot = buffer.update(cx, |buffer, cx| {
-                    buffer.finalize_last_transaction();
-                    buffer.apply_diff(diff, cx);
-                    buffer.finalize_last_transaction();
-                    buffer.snapshot()
-                });
-                action_log.update(cx, |log, cx| log.buffer_edited(buffer.clone(), cx));
-
-                // Set the agent's location to the position of the first edit
-                if let Some(first_edit) = snapshot.edits_since::<usize>(&base_version).next() {
-                    let position = snapshot.anchor_before(first_edit.new.start);
-                    project.update(cx, |project, cx| {
-                        project.set_agent_location(
-                            Some(AgentLocation {
-                                buffer: buffer.downgrade(),
-                                position,
-                            }),
-                            cx,
-                        );
-                    })
+            let mut hallucinated_old_text = false;
+            while let Some(event) = events.next().await {
+                match event {
+                    EditAgentOutputEvent::Edited => {
+                        if let Some(card) = card_clone.as_ref() {
+                            let new_snapshot =
+                                buffer.read_with(cx, |buffer, _cx| buffer.snapshot())?;
+                            let new_text = cx
+                                .background_spawn({
+                                    let new_snapshot = new_snapshot.clone();
+                                    async move { new_snapshot.text() }
+                                })
+                                .await;
+                            card.update(cx, |card, cx| {
+                                card.set_diff(
+                                    project_path.path.clone(),
+                                    old_text.clone(),
+                                    new_text,
+                                    cx,
+                                );
+                            })
+                            .log_err();
+                        }
+                    }
+                    EditAgentOutputEvent::OldTextNotFound(_) => hallucinated_old_text = true,
                }
-
-                snapshot
-            })?;
+            }
+            let agent_output = output.await?;

            project
-                .update(cx, |project, cx| project.save_buffer(buffer, cx))?
+                .update(cx, |project, cx| project.save_buffer(buffer.clone(), cx))?
                .await?;

-            let new_text = snapshot.text();
-            let diff_str = cx
-                .background_spawn({
-                    let old_text = old_text.clone();
-                    let new_text = new_text.clone();
-                    async move { language::unified_diff(&old_text, &new_text) }
-                })
-                .await;
+            let new_snapshot = buffer.read_with(cx, |buffer, _cx| buffer.snapshot())?;
+            let new_text = cx.background_spawn({
+                let new_snapshot = new_snapshot.clone();
+                async move { new_snapshot.text() }
+            });
+            let diff = cx.background_spawn(async move {
+                language::unified_diff(&old_snapshot.text(), &new_snapshot.text())
+            });
+            let (new_text, diff) = futures::join!(new_text, diff);
+
+            let output = EditFileToolOutput {
+                original_path: project_path.path.to_path_buf(),
+                new_text: new_text.clone(),
+                old_text: old_text.clone(),
+                raw_output: Some(agent_output),
+            };

            if let Some(card) = card_clone {
                card.update(cx, |card, cx| {
-                    card.set_diff(
-                        project_path.path.clone(),
-                        old_text.clone(),
-                        new_text.clone(),
-                        cx,
-                    );
+                    card.set_diff(project_path.path.clone(), old_text, new_text, cx);
                })
                .log_err();
            }

-            Ok(ToolResultOutput {
-                content: format!(
-                    "Edited {}:\n\n```diff\n{}\n```",
-                    input.path.display(),
-                    diff_str
-                ),
-                output: serde_json::to_value(StreamingEditFileToolOutput {
-                    original_path: input.path,
-                    new_text,
-                    old_text,
+            let input_path = input.path.display();
+            if diff.is_empty() {
+                if hallucinated_old_text {
+                    Err(anyhow!(formatdoc! {"
+                        Some edits were produced but none of them could be applied.
+                        Read the relevant sections of {input_path} again so that
+                        I can perform the requested edits.
+                    "}))
+                } else {
+                    Ok("No edits were made.".to_string().into())
+                }
+            } else {
+                Ok(ToolResultOutput {
+                    content: format!("Edited {}:\n\n```diff\n{}\n```", input_path, diff),
+                    output: serde_json::to_value(output).ok(),
                })
-                .ok(),
-            })
+            }
        });

        ToolResult {
@@ -322,7 +311,7 @@ impl Tool for EditFileTool {
        window: &mut Window,
        cx: &mut App,
    ) -> Option<AnyToolCard> {
-        let output = match serde_json::from_value::<StreamingEditFileToolOutput>(output) {
+        let output = match serde_json::from_value::<EditFileToolOutput>(output) {
            Ok(output) => output,
            Err(_) => return None,
        };
@@ -349,7 +338,7 @@ pub struct EditFileToolCard {
    project: Entity<Project>,
    diff_task: Option<Task<Result<()>>>,
    preview_expanded: bool,
-    error_expanded: bool,
+    error_expanded: Option<Entity<Markdown>>,
    full_height_expanded: bool,
    total_lines: Option<u32>,
    editor_unique_id: EntityId,
@@ -373,9 +362,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);
@@ -392,7 +381,7 @@ impl EditFileToolCard {
            multibuffer,
            diff_task: None,
            preview_expanded: true,
-            error_expanded: false,
+            error_expanded: None,
            full_height_expanded: false,
            total_lines: None,
        }
@@ -449,9 +438,9 @@ impl ToolCard for EditFileToolCard {
        workspace: WeakEntity<Workspace>,
        cx: &mut Context<Self>,
    ) -> impl IntoElement {
-        let (failed, error_message) = match status {
-            ToolUseStatus::Error(err) => (true, Some(err.to_string())),
-            _ => (false, None),
+        let error_message = match status {
+            ToolUseStatus::Error(err) => Some(err),
+            _ => None,
        };

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

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

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

@@ -852,7 +851,48 @@ async fn build_buffer_diff(
 #[cfg(test)]
 mod tests {
    use super::*;
+    use fs::FakeFs;
+    use gpui::TestAppContext;
+    use language_model::fake_provider::FakeLanguageModel;
    use serde_json::json;
+    use settings::SettingsStore;
+    use util::path;
+
+    #[gpui::test]
+    async fn test_edit_nonexistent_file(cx: &mut TestAppContext) {
+        init_test(cx);
+
+        let fs = FakeFs::new(cx.executor());
+        fs.insert_tree("/root", json!({})).await;
+        let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
+        let action_log = cx.new(|_| ActionLog::new(project.clone()));
+        let model = Arc::new(FakeLanguageModel::default());
+        let result = cx
+            .update(|cx| {
+                let input = serde_json::to_value(EditFileToolInput {
+                    display_description: "Some edit".into(),
+                    path: "root/nonexistent_file.txt".into(),
+                    create_or_overwrite: false,
+                })
+                .unwrap();
+                Arc::new(EditFileTool)
+                    .run(
+                        input,
+                        Arc::default(),
+                        project.clone(),
+                        action_log,
+                        model,
+                        None,
+                        cx,
+                    )
+                    .output
+            })
+            .await;
+        assert_eq!(
+            result.unwrap_err().to_string(),
+            "root/nonexistent_file.txt not found"
+        );
+    }

    #[test]
    fn still_streaming_ui_text_with_path() {
@@ -920,4 +960,13 @@ mod tests {
            DEFAULT_UI_TEXT,
        );
    }
+
+    fn init_test(cx: &mut TestAppContext) {
+        cx.update(|cx| {
+            let settings_store = SettingsStore::test(cx);
+            cx.set_global(settings_store);
+            language::init(cx);
+            Project::init_settings(cx);
+        });
+    }
 }
--- a/crates/assistant_tools/src/edit_file_tool/description.md
+++ b/crates/assistant_tools/src/edit_file_tool/description.md
@@ -1,4 +1,4 @@
-This is a tool for editing files. For moving or renaming files, you should generally use the `terminal` tool with the 'mv' command instead. For larger edits, use the `create_file` tool to overwrite files.
+This is a tool for creating a new file or editing an existing file. For moving or renaming files, you should generally use the `terminal` tool with the 'mv' command instead.

 Before using this tool:

@@ -6,40 +6,3 @@ Before using this tool:

 2. Verify the directory path is correct (only applicable when creating new files):
   - Use the `list_directory` tool to verify the parent directory exists and is the correct location
-
-To make a file edit, provide the following:
-1. path: The full path to the file you wish to modify in the project. This path must include the root directory in the project.
-2. old_string: The text to replace (must be unique within the file, and must match the file contents exactly, including all whitespace and indentation)
-3. new_string: The edited text, which will replace the old_string in the file.
-
-The tool will replace ONE occurrence of old_string with new_string in the specified file.
-
-CRITICAL REQUIREMENTS FOR USING THIS TOOL:
-
-1. UNIQUENESS: The old_string MUST uniquely identify the specific instance you want to change. This means:
-   - Include AT LEAST 3-5 lines of context BEFORE the change point
-   - Include AT LEAST 3-5 lines of context AFTER the change point
-   - Include all whitespace, indentation, and surrounding code exactly as it appears in the file
-
-2. SINGLE INSTANCE: This tool can only change ONE instance at a time. If you need to change multiple instances:
-   - Make separate calls to this tool for each instance
-   - Each call must uniquely identify its specific instance using extensive context
-
-3. VERIFICATION: Before using this tool:
-   - Check how many instances of the target text exist in the file
-   - If multiple instances exist, gather enough context to uniquely identify each one
-   - Plan separate tool calls for each instance
-
-WARNING: If you do not follow these requirements:
-   - The tool will fail if old_string matches multiple locations
-   - The tool will fail if old_string doesn't match exactly (including whitespace)
-   - You may change the wrong instance if you don't include enough context
-
-When making edits:
-   - Ensure the edit results in idiomatic, correct code
-   - Do not leave the code in a broken state
-   - Always use fully-qualified project paths (starting with the name of one of the project's root directories)
-
-If you want to create a new file, use the `create_file` tool instead of this tool. Don't pass an empty `old_string`.
-
-Remember: when making multiple file edits in a row to the same file, you should prefer to send all edits in a single message with multiple calls to this tool, rather than multiple messages with a single call each.
--- a/crates/assistant_tools/src/fetch_tool.rs
+++ b/crates/assistant_tools/src/fetch_tool.rs
@@ -9,7 +9,7 @@ use futures::AsyncReadExt as _;
 use gpui::{AnyWindowHandle, App, AppContext as _, Entity, Task};
 use html_to_markdown::{TagHandler, convert_html_to_markdown, markdown};
 use http_client::{AsyncBody, HttpClientWithUrl};
-use language_model::{LanguageModelRequestMessage, LanguageModelToolSchemaFormat};
+use language_model::{LanguageModel, LanguageModelRequest, LanguageModelToolSchemaFormat};
 use project::Project;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
@@ -142,9 +142,10 @@ impl Tool for FetchTool {
    fn run(
        self: Arc<Self>,
        input: serde_json::Value,
-        _messages: &[LanguageModelRequestMessage],
+        _request: Arc<LanguageModelRequest>,
        _project: Entity<Project>,
        _action_log: Entity<ActionLog>,
+        _model: Arc<dyn LanguageModel>,
        _window: Option<AnyWindowHandle>,
        cx: &mut App,
    ) -> ToolResult {
--- a/crates/assistant_tools/src/find_path_tool.rs
+++ b/crates/assistant_tools/src/find_path_tool.rs
@@ -7,7 +7,7 @@ use gpui::{
    AnyWindowHandle, App, AppContext, Context, Entity, IntoElement, Task, WeakEntity, Window,
 };
 use language;
-use language_model::{LanguageModelRequestMessage, LanguageModelToolSchemaFormat};
+use language_model::{LanguageModel, LanguageModelRequest, LanguageModelToolSchemaFormat};
 use project::Project;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
@@ -73,9 +73,10 @@ impl Tool for FindPathTool {
    fn run(
        self: Arc<Self>,
        input: serde_json::Value,
-        _messages: &[LanguageModelRequestMessage],
+        _request: Arc<LanguageModelRequest>,
        project: Entity<Project>,
        _action_log: Entity<ActionLog>,
+        _model: Arc<dyn LanguageModel>,
        _window: Option<AnyWindowHandle>,
        cx: &mut App,
    ) -> ToolResult {
--- a/crates/assistant_tools/src/grep_tool.rs
+++ b/crates/assistant_tools/src/grep_tool.rs
@@ -4,7 +4,7 @@ use assistant_tool::{ActionLog, Tool, ToolResult};
 use futures::StreamExt;
 use gpui::{AnyWindowHandle, App, Entity, Task};
 use language::{OffsetRangeExt, ParseStatus, Point};
-use language_model::{LanguageModelRequestMessage, LanguageModelToolSchemaFormat};
+use language_model::{LanguageModel, LanguageModelRequest, LanguageModelToolSchemaFormat};
 use project::{
    Project,
    search::{SearchQuery, SearchResult},
@@ -96,9 +96,10 @@ impl Tool for GrepTool {
    fn run(
        self: Arc<Self>,
        input: serde_json::Value,
-        _messages: &[LanguageModelRequestMessage],
+        _request: Arc<LanguageModelRequest>,
        project: Entity<Project>,
        _action_log: Entity<ActionLog>,
+        _model: Arc<dyn LanguageModel>,
        _window: Option<AnyWindowHandle>,
        cx: &mut App,
    ) -> ToolResult {
@@ -281,6 +282,7 @@ mod tests {
    use assistant_tool::Tool;
    use gpui::{AppContext, TestAppContext};
    use language::{Language, LanguageConfig, LanguageMatcher};
+    use language_model::fake_provider::FakeLanguageModel;
    use project::{FakeFs, Project};
    use settings::SettingsStore;
    use unindent::Unindent;
@@ -743,7 +745,9 @@ mod tests {
    ) -> String {
        let tool = Arc::new(GrepTool);
        let action_log = cx.new(|_cx| ActionLog::new(project.clone()));
-        let task = cx.update(|cx| tool.run(input, &[], project, action_log, None, cx));
+        let model = Arc::new(FakeLanguageModel::default());
+        let task =
+            cx.update(|cx| tool.run(input, Arc::default(), project, action_log, model, None, cx));

        match task.output.await {
            Ok(result) => {
--- a/crates/assistant_tools/src/list_directory_tool.rs
+++ b/crates/assistant_tools/src/list_directory_tool.rs
@@ -2,7 +2,7 @@ use crate::schema::json_schema_for;
 use anyhow::{Result, anyhow};
 use assistant_tool::{ActionLog, Tool, ToolResult};
 use gpui::{AnyWindowHandle, App, Entity, Task};
-use language_model::{LanguageModelRequestMessage, LanguageModelToolSchemaFormat};
+use language_model::{LanguageModel, LanguageModelRequest, LanguageModelToolSchemaFormat};
 use project::Project;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
@@ -73,9 +73,10 @@ impl Tool for ListDirectoryTool {
    fn run(
        self: Arc<Self>,
        input: serde_json::Value,
-        _messages: &[LanguageModelRequestMessage],
+        _request: Arc<LanguageModelRequest>,
        project: Entity<Project>,
        _action_log: Entity<ActionLog>,
+        _model: Arc<dyn LanguageModel>,
        _window: Option<AnyWindowHandle>,
        cx: &mut App,
    ) -> ToolResult {
--- a/crates/assistant_tools/src/move_path_tool.rs
+++ b/crates/assistant_tools/src/move_path_tool.rs
@@ -2,7 +2,7 @@ use crate::schema::json_schema_for;
 use anyhow::{Result, anyhow};
 use assistant_tool::{ActionLog, Tool, ToolResult};
 use gpui::{AnyWindowHandle, App, AppContext, Entity, Task};
-use language_model::{LanguageModelRequestMessage, LanguageModelToolSchemaFormat};
+use language_model::{LanguageModel, LanguageModelRequest, LanguageModelToolSchemaFormat};
 use project::Project;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
@@ -86,9 +86,10 @@ impl Tool for MovePathTool {
    fn run(
        self: Arc<Self>,
        input: serde_json::Value,
-        _messages: &[LanguageModelRequestMessage],
+        _request: Arc<LanguageModelRequest>,
        project: Entity<Project>,
        _action_log: Entity<ActionLog>,
+        _model: Arc<dyn LanguageModel>,
        _window: Option<AnyWindowHandle>,
        cx: &mut App,
    ) -> ToolResult {
--- a/crates/assistant_tools/src/now_tool.rs
+++ b/crates/assistant_tools/src/now_tool.rs
@@ -5,7 +5,7 @@ use anyhow::{Result, anyhow};
 use assistant_tool::{ActionLog, Tool, ToolResult};
 use chrono::{Local, Utc};
 use gpui::{AnyWindowHandle, App, Entity, Task};
-use language_model::{LanguageModelRequestMessage, LanguageModelToolSchemaFormat};
+use language_model::{LanguageModel, LanguageModelRequest, LanguageModelToolSchemaFormat};
 use project::Project;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
@@ -56,9 +56,10 @@ impl Tool for NowTool {
    fn run(
        self: Arc<Self>,
        input: serde_json::Value,
-        _messages: &[LanguageModelRequestMessage],
+        _request: Arc<LanguageModelRequest>,
        _project: Entity<Project>,
        _action_log: Entity<ActionLog>,
+        _model: Arc<dyn LanguageModel>,
        _window: Option<AnyWindowHandle>,
        _cx: &mut App,
    ) -> ToolResult {
--- a/crates/assistant_tools/src/open_tool.rs
+++ b/crates/assistant_tools/src/open_tool.rs
@@ -2,7 +2,7 @@ use crate::schema::json_schema_for;
 use anyhow::{Context as _, Result, anyhow};
 use assistant_tool::{ActionLog, Tool, ToolResult};
 use gpui::{AnyWindowHandle, App, AppContext, Entity, Task};
-use language_model::{LanguageModelRequestMessage, LanguageModelToolSchemaFormat};
+use language_model::{LanguageModel, LanguageModelRequest, LanguageModelToolSchemaFormat};
 use project::Project;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
@@ -49,9 +49,10 @@ impl Tool for OpenTool {
    fn run(
        self: Arc<Self>,
        input: serde_json::Value,
-        _messages: &[LanguageModelRequestMessage],
+        _request: Arc<LanguageModelRequest>,
        project: Entity<Project>,
        _action_log: Entity<ActionLog>,
+        _model: Arc<dyn LanguageModel>,
        _window: Option<AnyWindowHandle>,
        cx: &mut App,
    ) -> ToolResult {
--- a/crates/assistant_tools/src/read_file_tool.rs
+++ b/crates/assistant_tools/src/read_file_tool.rs
@@ -7,7 +7,7 @@ use gpui::{AnyWindowHandle, App, Entity, Task};
 use indoc::formatdoc;
 use itertools::Itertools;
 use language::{Anchor, Point};
-use language_model::{LanguageModelRequestMessage, LanguageModelToolSchemaFormat};
+use language_model::{LanguageModel, LanguageModelRequest, LanguageModelToolSchemaFormat};
 use project::{AgentLocation, Project};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
@@ -83,9 +83,10 @@ impl Tool for ReadFileTool {
    fn run(
        self: Arc<Self>,
        input: serde_json::Value,
-        _messages: &[LanguageModelRequestMessage],
+        _request: Arc<LanguageModelRequest>,
        project: Entity<Project>,
        action_log: Entity<ActionLog>,
+        _model: Arc<dyn LanguageModel>,
        _window: Option<AnyWindowHandle>,
        cx: &mut App,
    ) -> ToolResult {
@@ -97,27 +98,22 @@ impl Tool for ReadFileTool {
        let Some(project_path) = project.read(cx).find_project_path(&input.path, cx) else {
            return Task::ready(Err(anyhow!("Path {} not found in project", &input.path))).into();
        };
-        let Some(worktree) = project
-            .read(cx)
-            .worktree_for_id(project_path.worktree_id, cx)
-        else {
-            return Task::ready(Err(anyhow!("Worktree not found for project path"))).into();
-        };
-        let exists = worktree.update(cx, |worktree, cx| {
-            worktree.file_exists(&project_path.path, cx)
-        });

        let file_path = input.path.clone();
        cx.spawn(async move |cx| {
-            if !exists.await? {
-                return Err(anyhow!("{} not found", file_path));
-            }
-
            let buffer = cx
                .update(|cx| {
                    project.update(cx, |project, cx| project.open_buffer(project_path, cx))
                })?
                .await?;
+            if buffer.read_with(cx, |buffer, _| {
+                buffer
+                    .file()
+                    .as_ref()
+                    .map_or(true, |file| !file.disk_state().exists())
+            })? {
+                return Err(anyhow!("{} not found", file_path));
+            }

            project.update(cx, |project, cx| {
                project.set_agent_location(
@@ -145,9 +141,13 @@ impl Tool for ReadFileTool {
                    let lines = text.split('\n').skip(start_row as usize);
                    if let Some(end) = input.end_line {
                        let count = end.saturating_sub(start).saturating_add(1); // Ensure at least 1 line
-                        Itertools::intersperse(lines.take(count as usize), "\n").collect::<String>().into()
+                        Itertools::intersperse(lines.take(count as usize), "\n")
+                            .collect::<String>()
+                            .into()
                    } else {
-                        Itertools::intersperse(lines, "\n").collect::<String>().into()
+                        Itertools::intersperse(lines, "\n")
+                            .collect::<String>()
+                            .into()
                    }
                })?;

@@ -184,15 +184,20 @@ impl Tool for ReadFileTool {
                } else {
                    // File is too big, so return the outline
                    // and a suggestion to read again with line numbers.
-                    let outline = outline::file_outline(project, file_path, action_log, None, cx).await?;
+                    let outline =
+                        outline::file_outline(project, file_path, action_log, None, cx).await?;
                    Ok(formatdoc! {"
-                        This file was too big to read all at once. Here is an outline of its symbols:
+                        This file was too big to read all at once.
+
+                        Here is an outline of its symbols:

                        {outline}

-                        Using the line numbers in this outline, you can call this tool again while specifying
-                        the start_line and end_line fields to see the implementations of symbols in the outline."
-                    }.into())
+                        Using the line numbers in this outline, you can call this tool again
+                        while specifying the start_line and end_line fields to see the
+                        implementations of symbols in the outline."
+                    }
+                    .into())
                }
            }
        })
@@ -205,6 +210,7 @@ mod test {
    use super::*;
    use gpui::{AppContext, TestAppContext};
    use language::{Language, LanguageConfig, LanguageMatcher};
+    use language_model::fake_provider::FakeLanguageModel;
    use project::{FakeFs, Project};
    use serde_json::json;
    use settings::SettingsStore;
@@ -218,13 +224,22 @@ mod test {
        fs.insert_tree("/root", json!({})).await;
        let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
        let action_log = cx.new(|_| ActionLog::new(project.clone()));
+        let model = Arc::new(FakeLanguageModel::default());
        let result = cx
            .update(|cx| {
                let input = json!({
                    "path": "root/nonexistent_file.txt"
                });
                Arc::new(ReadFileTool)
-                    .run(input, &[], project.clone(), action_log, None, cx)
+                    .run(
+                        input,
+                        Arc::default(),
+                        project.clone(),
+                        action_log,
+                        model,
+                        None,
+                        cx,
+                    )
                    .output
            })
            .await;
@@ -248,13 +263,22 @@ mod test {
        .await;
        let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
        let action_log = cx.new(|_| ActionLog::new(project.clone()));
+        let model = Arc::new(FakeLanguageModel::default());
        let result = cx
            .update(|cx| {
                let input = json!({
                    "path": "root/small_file.txt"
                });
                Arc::new(ReadFileTool)
-                    .run(input, &[], project.clone(), action_log, None, cx)
+                    .run(
+                        input,
+                        Arc::default(),
+                        project.clone(),
+                        action_log,
+                        model,
+                        None,
+                        cx,
+                    )
                    .output
            })
            .await;
@@ -277,6 +301,7 @@ mod test {
        let language_registry = project.read_with(cx, |project, _| project.languages().clone());
        language_registry.add(Arc::new(rust_lang()));
        let action_log = cx.new(|_| ActionLog::new(project.clone()));
+        let model = Arc::new(FakeLanguageModel::default());

        let result = cx
            .update(|cx| {
@@ -284,13 +309,21 @@ mod test {
                    "path": "root/large_file.rs"
                });
                Arc::new(ReadFileTool)
-                    .run(input, &[], project.clone(), action_log.clone(), None, cx)
+                    .run(
+                        input,
+                        Arc::default(),
+                        project.clone(),
+                        action_log.clone(),
+                        model.clone(),
+                        None,
+                        cx,
+                    )
                    .output
            })
            .await;
        let content = result.unwrap();
        assert_eq!(
-            content.lines().skip(2).take(6).collect::<Vec<_>>(),
+            content.lines().skip(4).take(6).collect::<Vec<_>>(),
            vec![
                "struct Test0 [L1-4]",
                " a [L2]",
@@ -308,7 +341,15 @@ mod test {
                    "offset": 1
                });
                Arc::new(ReadFileTool)
-                    .run(input, &[], project.clone(), action_log, None, cx)
+                    .run(
+                        input,
+                        Arc::default(),
+                        project.clone(),
+                        action_log,
+                        model,
+                        None,
+                        cx,
+                    )
                    .output
            })
            .await;
@@ -325,7 +366,7 @@ mod test {
        pretty_assertions::assert_eq!(
            content
                .lines()
-                .skip(2)
+                .skip(4)
                .take(expected_content.len())
                .collect::<Vec<_>>(),
            expected_content
@@ -346,6 +387,7 @@ mod test {
        .await;
        let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
        let action_log = cx.new(|_| ActionLog::new(project.clone()));
+        let model = Arc::new(FakeLanguageModel::default());
        let result = cx
            .update(|cx| {
                let input = json!({
@@ -354,7 +396,15 @@ mod test {
                    "end_line": 4
                });
                Arc::new(ReadFileTool)
-                    .run(input, &[], project.clone(), action_log, None, cx)
+                    .run(
+                        input,
+                        Arc::default(),
+                        project.clone(),
+                        action_log,
+                        model,
+                        None,
+                        cx,
+                    )
                    .output
            })
            .await;
@@ -375,6 +425,7 @@ mod test {
        .await;
        let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
        let action_log = cx.new(|_| ActionLog::new(project.clone()));
+        let model = Arc::new(FakeLanguageModel::default());

        // start_line of 0 should be treated as 1
        let result = cx
@@ -385,7 +436,15 @@ mod test {
                    "end_line": 2
                });
                Arc::new(ReadFileTool)
-                    .run(input, &[], project.clone(), action_log.clone(), None, cx)
+                    .run(
+                        input,
+                        Arc::default(),
+                        project.clone(),
+                        action_log.clone(),
+                        model.clone(),
+                        None,
+                        cx,
+                    )
                    .output
            })
            .await;
@@ -400,7 +459,15 @@ mod test {
                    "end_line": 0
                });
                Arc::new(ReadFileTool)
-                    .run(input, &[], project.clone(), action_log.clone(), None, cx)
+                    .run(
+                        input,
+                        Arc::default(),
+                        project.clone(),
+                        action_log.clone(),
+                        model.clone(),
+                        None,
+                        cx,
+                    )
                    .output
            })
            .await;
@@ -415,7 +482,15 @@ mod test {
                    "end_line": 2
                });
                Arc::new(ReadFileTool)
-                    .run(input, &[], project.clone(), action_log, None, cx)
+                    .run(
+                        input,
+                        Arc::default(),
+                        project.clone(),
+                        action_log,
+                        model,
+                        None,
+                        cx,
+                    )
                    .output
            })
            .await;
--- a/crates/assistant_tools/src/replace.rs
+++ b/crates/assistant_tools/src/replace.rs
@@ -1,872 +0,0 @@
-use language::{BufferSnapshot, Diff, Point, ToOffset};
-use project::search::SearchQuery;
-use std::iter;
-use util::{ResultExt as _, paths::PathMatcher};
-
-/// Performs an exact string replacement in a buffer, requiring precise character-for-character matching.
-/// Uses the search functionality to locate the first occurrence of the exact string.
-/// Returns None if no exact match is found in the buffer.
-pub async fn replace_exact(old: &str, new: &str, snapshot: &BufferSnapshot) -> Option<Diff> {
-    let query = SearchQuery::text(
-        old,
-        false,
-        true,
-        true,
-        PathMatcher::new(iter::empty::<&str>()).ok()?,
-        PathMatcher::new(iter::empty::<&str>()).ok()?,
-        false,
-        None,
-    )
-    .log_err()?;
-
-    let matches = query.search(&snapshot, None).await;
-
-    if matches.is_empty() {
-        return None;
-    }
-
-    let edit_range = matches[0].clone();
-    let diff = language::text_diff(&old, &new);
-
-    let edits = diff
-        .into_iter()
-        .map(|(old_range, text)| {
-            let start = edit_range.start + old_range.start;
-            let end = edit_range.start + old_range.end;
-            (start..end, text)
-        })
-        .collect::<Vec<_>>();
-
-    let diff = language::Diff {
-        base_version: snapshot.version().clone(),
-        line_ending: snapshot.line_ending(),
-        edits,
-    };
-
-    Some(diff)
-}
-
-/// Performs a replacement that's indentation-aware - matches text content ignoring leading whitespace differences.
-/// When replacing, preserves the indentation level found in the buffer at each matching line.
-/// Returns None if no match found or if indentation is offset inconsistently across matched lines.
-pub fn replace_with_flexible_indent(old: &str, new: &str, buffer: &BufferSnapshot) -> Option<Diff> {
-    let (old_lines, old_min_indent) = lines_with_min_indent(old);
-    let (new_lines, new_min_indent) = lines_with_min_indent(new);
-    let min_indent = old_min_indent.min(new_min_indent);
-
-    let old_lines = drop_lines_prefix(&old_lines, min_indent);
-    let new_lines = drop_lines_prefix(&new_lines, min_indent);
-
-    let max_row = buffer.max_point().row;
-
-    'windows: for start_row in 0..max_row + 1 {
-        let end_row = start_row + old_lines.len().saturating_sub(1) as u32;
-
-        if end_row > max_row {
-            // The buffer ends before fully matching the pattern
-            return None;
-        }
-
-        let start_point = Point::new(start_row, 0);
-        let end_point = Point::new(end_row, buffer.line_len(end_row));
-        let range = start_point.to_offset(buffer)..end_point.to_offset(buffer);
-
-        let window_text = buffer.text_for_range(range.clone());
-        let mut window_lines = window_text.lines();
-        let mut old_lines_iter = old_lines.iter();
-
-        let mut common_mismatch = None;
-
-        #[derive(Eq, PartialEq)]
-        enum Mismatch {
-            OverIndented(String),
-            UnderIndented(String),
-        }
-
-        while let (Some(window_line), Some(old_line)) = (window_lines.next(), old_lines_iter.next())
-        {
-            let line_trimmed = window_line.trim_start();
-
-            if line_trimmed != old_line.trim_start() {
-                continue 'windows;
-            }
-
-            if line_trimmed.is_empty() {
-                continue;
-            }
-
-            let line_mismatch = if window_line.len() > old_line.len() {
-                let prefix = window_line[..window_line.len() - old_line.len()].to_string();
-                Mismatch::UnderIndented(prefix)
-            } else {
-                let prefix = old_line[..old_line.len() - window_line.len()].to_string();
-                Mismatch::OverIndented(prefix)
-            };
-
-            match &common_mismatch {
-                Some(common_mismatch) if common_mismatch != &line_mismatch => {
-                    continue 'windows;
-                }
-                Some(_) => (),
-                None => common_mismatch = Some(line_mismatch),
-            }
-        }
-
-        if let Some(common_mismatch) = &common_mismatch {
-            let line_ending = buffer.line_ending();
-            let replacement = new_lines
-                .iter()
-                .map(|new_line| {
-                    if new_line.trim().is_empty() {
-                        new_line.to_string()
-                    } else {
-                        match common_mismatch {
-                            Mismatch::UnderIndented(prefix) => prefix.to_string() + new_line,
-                            Mismatch::OverIndented(prefix) => new_line
-                                .strip_prefix(prefix)
-                                .unwrap_or(new_line)
-                                .to_string(),
-                        }
-                    }
-                })
-                .collect::<Vec<_>>()
-                .join(line_ending.as_str());
-
-            let diff = Diff {
-                base_version: buffer.version().clone(),
-                line_ending,
-                edits: vec![(range, replacement.into())],
-            };
-
-            return Some(diff);
-        }
-    }
-
-    None
-}
-
-fn drop_lines_prefix<'a>(lines: &'a [&str], prefix_len: usize) -> Vec<&'a str> {
-    lines
-        .iter()
-        .map(|line| line.get(prefix_len..).unwrap_or(""))
-        .collect()
-}
-
-fn lines_with_min_indent(input: &str) -> (Vec<&str>, usize) {
-    let mut lines = Vec::new();
-    let mut min_indent: Option<usize> = None;
-
-    for line in input.lines() {
-        lines.push(line);
-        if !line.trim().is_empty() {
-            let indent = line.len() - line.trim_start().len();
-            min_indent = Some(min_indent.map_or(indent, |m| m.min(indent)));
-        }
-    }
-
-    (lines, min_indent.unwrap_or(0))
-}
-
-#[cfg(test)]
-mod replace_exact_tests {
-    use super::*;
-    use gpui::TestAppContext;
-    use gpui::prelude::*;
-
-    #[gpui::test]
-    async fn basic(cx: &mut TestAppContext) {
-        let result = test_replace_exact(cx, "let x = 41;", "let x = 41;", "let x = 42;").await;
-        assert_eq!(result, Some("let x = 42;".to_string()));
-    }
-
-    #[gpui::test]
-    async fn no_match(cx: &mut TestAppContext) {
-        let result = test_replace_exact(cx, "let x = 41;", "let y = 42;", "let y = 43;").await;
-        assert_eq!(result, None);
-    }
-
-    #[gpui::test]
-    async fn multi_line(cx: &mut TestAppContext) {
-        let whole = "fn example() {\n    let x = 41;\n    println!(\"x = {}\", x);\n}";
-        let old_text = "    let x = 41;\n    println!(\"x = {}\", x);";
-        let new_text = "    let x = 42;\n    println!(\"x = {}\", x);";
-        let result = test_replace_exact(cx, whole, old_text, new_text).await;
-        assert_eq!(
-            result,
-            Some("fn example() {\n    let x = 42;\n    println!(\"x = {}\", x);\n}".to_string())
-        );
-    }
-
-    #[gpui::test]
-    async fn multiple_occurrences(cx: &mut TestAppContext) {
-        let whole = "let x = 41;\nlet y = 41;\nlet z = 41;";
-        let result = test_replace_exact(cx, whole, "let x = 41;", "let x = 42;").await;
-        assert_eq!(
-            result,
-            Some("let x = 42;\nlet y = 41;\nlet z = 41;".to_string())
-        );
-    }
-
-    #[gpui::test]
-    async fn empty_buffer(cx: &mut TestAppContext) {
-        let result = test_replace_exact(cx, "", "let x = 41;", "let x = 42;").await;
-        assert_eq!(result, None);
-    }
-
-    #[gpui::test]
-    async fn partial_match(cx: &mut TestAppContext) {
-        let whole = "let x = 41; let y = 42;";
-        let result = test_replace_exact(cx, whole, "let x = 41", "let x = 42").await;
-        assert_eq!(result, Some("let x = 42; let y = 42;".to_string()));
-    }
-
-    #[gpui::test]
-    async fn whitespace_sensitive(cx: &mut TestAppContext) {
-        let result = test_replace_exact(cx, "let x = 41;", " let x = 41;", "let x = 42;").await;
-        assert_eq!(result, None);
-    }
-
-    #[gpui::test]
-    async fn entire_buffer(cx: &mut TestAppContext) {
-        let result = test_replace_exact(cx, "let x = 41;", "let x = 41;", "let x = 42;").await;
-        assert_eq!(result, Some("let x = 42;".to_string()));
-    }
-
-    async fn test_replace_exact(
-        cx: &mut TestAppContext,
-        whole: &str,
-        old: &str,
-        new: &str,
-    ) -> Option<String> {
-        let buffer = cx.new(|cx| language::Buffer::local(whole, cx));
-
-        let buffer_snapshot = buffer.read_with(cx, |buffer, _cx| buffer.snapshot());
-
-        let diff = replace_exact(old, new, &buffer_snapshot).await;
-        diff.map(|diff| {
-            buffer.update(cx, |buffer, cx| {
-                let _ = buffer.apply_diff(diff, cx);
-                buffer.text()
-            })
-        })
-    }
-}
-
-#[cfg(test)]
-mod flexible_indent_tests {
-    use super::*;
-    use gpui::TestAppContext;
-    use gpui::prelude::*;
-    use unindent::Unindent;
-
-    #[gpui::test]
-    fn test_underindented_single_line(cx: &mut TestAppContext) {
-        let cur = "        let a = 41;".to_string();
-        let old = "    let a = 41;".to_string();
-        let new = "    let a = 42;".to_string();
-        let exp = "        let a = 42;".to_string();
-
-        let result = test_replace_with_flexible_indent(cx, &cur, &old, &new);
-
-        assert_eq!(result, Some(exp.to_string()))
-    }
-
-    #[gpui::test]
-    fn test_overindented_single_line(cx: &mut TestAppContext) {
-        let cur = "    let a = 41;".to_string();
-        let old = "        let a = 41;".to_string();
-        let new = "        let a = 42;".to_string();
-        let exp = "    let a = 42;".to_string();
-
-        let result = test_replace_with_flexible_indent(cx, &cur, &old, &new);
-
-        assert_eq!(result, Some(exp.to_string()))
-    }
-
-    #[gpui::test]
-    fn test_underindented_multi_line(cx: &mut TestAppContext) {
-        let whole = r#"
-            fn test() {
-                let x = 5;
-                println!("x = {}", x);
-                let y = 10;
-            }
-        "#
-        .unindent();
-
-        let old = r#"
-            let x = 5;
-            println!("x = {}", x);
-        "#
-        .unindent();
-
-        let new = r#"
-            let x = 42;
-            println!("New value: {}", x);
-        "#
-        .unindent();
-
-        let expected = r#"
-            fn test() {
-                let x = 42;
-                println!("New value: {}", x);
-                let y = 10;
-            }
-        "#
-        .unindent();
-
-        assert_eq!(
-            test_replace_with_flexible_indent(cx, &whole, &old, &new),
-            Some(expected.to_string())
-        );
-    }
-
-    #[gpui::test]
-    fn test_overindented_multi_line(cx: &mut TestAppContext) {
-        let cur = r#"
-            fn foo() {
-                let a = 41;
-                let b = 3.13;
-            }
-        "#
-        .unindent();
-
-        // 6 space indent instead of 4
-        let old = "      let a = 41;\n      let b = 3.13;";
-        let new = "      let a = 42;\n      let b = 3.14;";
-
-        let expected = r#"
-            fn foo() {
-                let a = 42;
-                let b = 3.14;
-            }
-        "#
-        .unindent();
-
-        let result = test_replace_with_flexible_indent(cx, &cur, &old, &new);
-
-        assert_eq!(result, Some(expected.to_string()))
-    }
-
-    #[gpui::test]
-    fn test_replace_inconsistent_indentation(cx: &mut TestAppContext) {
-        let whole = r#"
-            fn test() {
-                if condition {
-                    println!("{}", 43);
-                }
-            }
-        "#
-        .unindent();
-
-        let old = r#"
-            if condition {
-            println!("{}", 43);
-        "#
-        .unindent();
-
-        let new = r#"
-            if condition {
-            println!("{}", 42);
-        "#
-        .unindent();
-
-        assert_eq!(
-            test_replace_with_flexible_indent(cx, &whole, &old, &new),
-            None
-        );
-    }
-
-    #[gpui::test]
-    fn test_replace_with_empty_lines(cx: &mut TestAppContext) {
-        // Test with empty lines
-        let whole = r#"
-            fn test() {
-                let x = 5;
-
-                println!("x = {}", x);
-            }
-        "#
-        .unindent();
-
-        let old = r#"
-            let x = 5;
-
-            println!("x = {}", x);
-        "#
-        .unindent();
-
-        let new = r#"
-            let x = 10;
-
-            println!("New x: {}", x);
-        "#
-        .unindent();
-
-        let expected = r#"
-            fn test() {
-                let x = 10;
-
-                println!("New x: {}", x);
-            }
-        "#
-        .unindent();
-
-        assert_eq!(
-            test_replace_with_flexible_indent(cx, &whole, &old, &new),
-            Some(expected.to_string())
-        );
-    }
-
-    #[gpui::test]
-    fn test_replace_no_match(cx: &mut TestAppContext) {
-        let whole = r#"
-            fn test() {
-                let x = 5;
-            }
-        "#
-        .unindent();
-
-        let old = r#"
-            let y = 10;
-        "#
-        .unindent();
-
-        let new = r#"
-            let y = 20;
-        "#
-        .unindent();
-
-        assert_eq!(
-            test_replace_with_flexible_indent(cx, &whole, &old, &new),
-            None
-        );
-    }
-
-    #[gpui::test]
-    fn test_replace_whole_ends_before_matching_old(cx: &mut TestAppContext) {
-        let whole = r#"
-            fn test() {
-                let x = 5;
-        "#
-        .unindent();
-
-        let old = r#"
-            let x = 5;
-            println!("x = {}", x);
-        "#
-        .unindent();
-
-        let new = r#"
-            let x = 10;
-            println!("x = {}", x);
-        "#
-        .unindent();
-
-        // Should return None because whole doesn't fully contain the old text
-        assert_eq!(
-            test_replace_with_flexible_indent(cx, &whole, &old, &new),
-            None
-        );
-    }
-
-    #[gpui::test]
-    fn test_replace_whole_is_shorter_than_old(cx: &mut TestAppContext) {
-        let whole = r#"
-            let x = 5;
-        "#
-        .unindent();
-
-        let old = r#"
-            let x = 5;
-            let y = 10;
-        "#
-        .unindent();
-
-        let new = r#"
-            let x = 5;
-            let y = 20;
-        "#
-        .unindent();
-
-        assert_eq!(
-            test_replace_with_flexible_indent(cx, &whole, &old, &new),
-            None
-        );
-    }
-
-    #[gpui::test]
-    fn test_replace_old_is_empty(cx: &mut TestAppContext) {
-        let whole = r#"
-            fn test() {
-                let x = 5;
-            }
-        "#
-        .unindent();
-
-        let old = "";
-        let new = r#"
-            let y = 10;
-        "#
-        .unindent();
-
-        assert_eq!(
-            test_replace_with_flexible_indent(cx, &whole, &old, &new),
-            None
-        );
-    }
-
-    #[gpui::test]
-    fn test_replace_whole_is_empty(cx: &mut TestAppContext) {
-        let whole = "";
-        let old = r#"
-            let x = 5;
-        "#
-        .unindent();
-
-        let new = r#"
-            let x = 10;
-        "#
-        .unindent();
-
-        assert_eq!(
-            test_replace_with_flexible_indent(cx, &whole, &old, &new),
-            None
-        );
-    }
-
-    #[test]
-    fn test_lines_with_min_indent() {
-        // Empty string
-        assert_eq!(lines_with_min_indent(""), (vec![], 0));
-
-        // Single line without indentation
-        assert_eq!(lines_with_min_indent("hello"), (vec!["hello"], 0));
-
-        // Multiple lines with no indentation
-        assert_eq!(
-            lines_with_min_indent("line1\nline2\nline3"),
-            (vec!["line1", "line2", "line3"], 0)
-        );
-
-        // Multiple lines with consistent indentation
-        assert_eq!(
-            lines_with_min_indent("  line1\n  line2\n  line3"),
-            (vec!["  line1", "  line2", "  line3"], 2)
-        );
-
-        // Multiple lines with varying indentation
-        assert_eq!(
-            lines_with_min_indent("    line1\n  line2\n      line3"),
-            (vec!["    line1", "  line2", "      line3"], 2)
-        );
-
-        // Lines with mixed indentation and empty lines
-        assert_eq!(
-            lines_with_min_indent("    line1\n\n  line2"),
-            (vec!["    line1", "", "  line2"], 2)
-        );
-    }
-
-    #[gpui::test]
-    fn test_replace_with_missing_indent_uneven_match(cx: &mut TestAppContext) {
-        let whole = r#"
-            fn test() {
-                if true {
-                        let x = 5;
-                        println!("x = {}", x);
-                }
-            }
-        "#
-        .unindent();
-
-        let old = r#"
-            let x = 5;
-            println!("x = {}", x);
-        "#
-        .unindent();
-
-        let new = r#"
-            let x = 42;
-            println!("x = {}", x);
-        "#
-        .unindent();
-
-        let expected = r#"
-            fn test() {
-                if true {
-                        let x = 42;
-                        println!("x = {}", x);
-                }
-            }
-        "#
-        .unindent();
-
-        assert_eq!(
-            test_replace_with_flexible_indent(cx, &whole, &old, &new),
-            Some(expected.to_string())
-        );
-    }
-
-    #[gpui::test]
-    fn test_replace_big_example(cx: &mut TestAppContext) {
-        let whole = r#"
-            #[cfg(test)]
-            mod tests {
-                use super::*;
-
-                #[test]
-                fn test_is_valid_age() {
-                    assert!(is_valid_age(0));
-                    assert!(!is_valid_age(151));
-                }
-            }
-        "#
-        .unindent();
-
-        let old = r#"
-            #[test]
-            fn test_is_valid_age() {
-                assert!(is_valid_age(0));
-                assert!(!is_valid_age(151));
-            }
-        "#
-        .unindent();
-
-        let new = r#"
-            #[test]
-            fn test_is_valid_age() {
-                assert!(is_valid_age(0));
-                assert!(!is_valid_age(151));
-            }
-
-            #[test]
-            fn test_group_people_by_age() {
-                let people = vec![
-                    Person::new("Young One", 5, "young@example.com").unwrap(),
-                    Person::new("Teen One", 15, "teen@example.com").unwrap(),
-                    Person::new("Teen Two", 18, "teen2@example.com").unwrap(),
-                    Person::new("Adult One", 25, "adult@example.com").unwrap(),
-                ];
-
-                let groups = group_people_by_age(&people);
-
-                assert_eq!(groups.get(&0).unwrap().len(), 1);  // One person in 0-9
-                assert_eq!(groups.get(&10).unwrap().len(), 2); // Two people in 10-19
-                assert_eq!(groups.get(&20).unwrap().len(), 1); // One person in 20-29
-            }
-        "#
-        .unindent();
-        let expected = r#"
-            #[cfg(test)]
-            mod tests {
-                use super::*;
-
-                #[test]
-                fn test_is_valid_age() {
-                    assert!(is_valid_age(0));
-                    assert!(!is_valid_age(151));
-                }
-
-                #[test]
-                fn test_group_people_by_age() {
-                    let people = vec![
-                        Person::new("Young One", 5, "young@example.com").unwrap(),
-                        Person::new("Teen One", 15, "teen@example.com").unwrap(),
-                        Person::new("Teen Two", 18, "teen2@example.com").unwrap(),
-                        Person::new("Adult One", 25, "adult@example.com").unwrap(),
-                    ];
-
-                    let groups = group_people_by_age(&people);
-
-                    assert_eq!(groups.get(&0).unwrap().len(), 1);  // One person in 0-9
-                    assert_eq!(groups.get(&10).unwrap().len(), 2); // Two people in 10-19
-                    assert_eq!(groups.get(&20).unwrap().len(), 1); // One person in 20-29
-                }
-            }
-        "#
-        .unindent();
-        assert_eq!(
-            test_replace_with_flexible_indent(cx, &whole, &old, &new),
-            Some(expected.to_string())
-        );
-    }
-
-    #[test]
-    fn test_drop_lines_prefix() {
-        // Empty array
-        assert_eq!(drop_lines_prefix(&[], 2), Vec::<&str>::new());
-
-        // Zero prefix length
-        assert_eq!(
-            drop_lines_prefix(&["line1", "line2"], 0),
-            vec!["line1", "line2"]
-        );
-
-        // Normal prefix drop
-        assert_eq!(
-            drop_lines_prefix(&["  line1", "  line2"], 2),
-            vec!["line1", "line2"]
-        );
-
-        // Prefix longer than some lines
-        assert_eq!(drop_lines_prefix(&["  line1", "a"], 2), vec!["line1", ""]);
-
-        // Prefix longer than all lines
-        assert_eq!(drop_lines_prefix(&["a", "b"], 5), vec!["", ""]);
-
-        // Mixed length lines
-        assert_eq!(
-            drop_lines_prefix(&["    line1", "  line2", "      line3"], 2),
-            vec!["  line1", "line2", "    line3"]
-        );
-    }
-
-    #[gpui::test]
-    async fn test_replace_exact_basic(cx: &mut TestAppContext) {
-        let buffer = cx.new(|cx| language::Buffer::local("let x = 41;", cx));
-        let snapshot = buffer.read_with(cx, |buffer, _cx| buffer.snapshot());
-
-        let diff = replace_exact("let x = 41;", "let x = 42;", &snapshot).await;
-        assert!(diff.is_some());
-
-        let diff = diff.unwrap();
-        assert_eq!(diff.edits.len(), 1);
-
-        let result = buffer.update(cx, |buffer, cx| {
-            let _ = buffer.apply_diff(diff, cx);
-            buffer.text()
-        });
-
-        assert_eq!(result, "let x = 42;");
-    }
-
-    #[gpui::test]
-    async fn test_replace_exact_no_match(cx: &mut TestAppContext) {
-        let buffer = cx.new(|cx| language::Buffer::local("let x = 41;", cx));
-        let snapshot = buffer.read_with(cx, |buffer, _cx| buffer.snapshot());
-
-        let diff = replace_exact("let y = 42;", "let y = 43;", &snapshot).await;
-        assert!(diff.is_none());
-    }
-
-    #[gpui::test]
-    async fn test_replace_exact_multi_line(cx: &mut TestAppContext) {
-        let buffer = cx.new(|cx| {
-            language::Buffer::local(
-                "fn example() {\n    let x = 41;\n    println!(\"x = {}\", x);\n}",
-                cx,
-            )
-        });
-        let snapshot = buffer.read_with(cx, |buffer, _cx| buffer.snapshot());
-
-        let old_text = "    let x = 41;\n    println!(\"x = {}\", x);";
-        let new_text = "    let x = 42;\n    println!(\"x = {}\", x);";
-        let diff = replace_exact(old_text, new_text, &snapshot).await;
-        assert!(diff.is_some());
-
-        let diff = diff.unwrap();
-        let result = buffer.update(cx, |buffer, cx| {
-            let _ = buffer.apply_diff(diff, cx);
-            buffer.text()
-        });
-
-        assert_eq!(
-            result,
-            "fn example() {\n    let x = 42;\n    println!(\"x = {}\", x);\n}"
-        );
-    }
-
-    #[gpui::test]
-    async fn test_replace_exact_multiple_occurrences(cx: &mut TestAppContext) {
-        let buffer =
-            cx.new(|cx| language::Buffer::local("let x = 41;\nlet y = 41;\nlet z = 41;", cx));
-        let snapshot = buffer.read_with(cx, |buffer, _cx| buffer.snapshot());
-
-        // Should replace only the first occurrence
-        let diff = replace_exact("let x = 41;", "let x = 42;", &snapshot).await;
-        assert!(diff.is_some());
-
-        let diff = diff.unwrap();
-        let result = buffer.update(cx, |buffer, cx| {
-            let _ = buffer.apply_diff(diff, cx);
-            buffer.text()
-        });
-
-        assert_eq!(result, "let x = 42;\nlet y = 41;\nlet z = 41;");
-    }
-
-    #[gpui::test]
-    async fn test_replace_exact_empty_buffer(cx: &mut TestAppContext) {
-        let buffer = cx.new(|cx| language::Buffer::local("", cx));
-        let snapshot = buffer.read_with(cx, |buffer, _cx| buffer.snapshot());
-
-        let diff = replace_exact("let x = 41;", "let x = 42;", &snapshot).await;
-        assert!(diff.is_none());
-    }
-
-    #[gpui::test]
-    async fn test_replace_exact_partial_match(cx: &mut TestAppContext) {
-        let buffer = cx.new(|cx| language::Buffer::local("let x = 41; let y = 42;", cx));
-        let snapshot = buffer.read_with(cx, |buffer, _cx| buffer.snapshot());
-
-        // Verify substring replacement actually works
-        let diff = replace_exact("let x = 41", "let x = 42", &snapshot).await;
-        assert!(diff.is_some());
-
-        let diff = diff.unwrap();
-        let result = buffer.update(cx, |buffer, cx| {
-            let _ = buffer.apply_diff(diff, cx);
-            buffer.text()
-        });
-
-        assert_eq!(result, "let x = 42; let y = 42;");
-    }
-
-    #[gpui::test]
-    async fn test_replace_exact_whitespace_sensitive(cx: &mut TestAppContext) {
-        let buffer = cx.new(|cx| language::Buffer::local("let x = 41;", cx));
-        let snapshot = buffer.read_with(cx, |buffer, _cx| buffer.snapshot());
-
-        let diff = replace_exact(" let x = 41;", "let x = 42;", &snapshot).await;
-        assert!(diff.is_none());
-    }
-
-    #[gpui::test]
-    async fn test_replace_exact_entire_buffer(cx: &mut TestAppContext) {
-        let buffer = cx.new(|cx| language::Buffer::local("let x = 41;", cx));
-        let snapshot = buffer.read_with(cx, |buffer, _cx| buffer.snapshot());
-
-        let diff = replace_exact("let x = 41;", "let x = 42;", &snapshot).await;
-        assert!(diff.is_some());
-
-        let diff = diff.unwrap();
-        let result = buffer.update(cx, |buffer, cx| {
-            let _ = buffer.apply_diff(diff, cx);
-            buffer.text()
-        });
-
-        assert_eq!(result, "let x = 42;");
-    }
-
-    fn test_replace_with_flexible_indent(
-        cx: &mut TestAppContext,
-        whole: &str,
-        old: &str,
-        new: &str,
-    ) -> Option<String> {
-        // Create a local buffer with the test content
-        let buffer = cx.new(|cx| language::Buffer::local(whole, cx));
-
-        // Get the buffer snapshot
-        let buffer_snapshot = buffer.read_with(cx, |buffer, _cx| buffer.snapshot());
-
-        // Call replace_flexible and transform the result
-        replace_with_flexible_indent(old, new, &buffer_snapshot).map(|diff| {
-            buffer.update(cx, |buffer, cx| {
-                let _ = buffer.apply_diff(diff, cx);
-                buffer.text()
-            })
-        })
-    }
-}
--- a/crates/assistant_tools/src/streaming_edit_file_tool.rs
+++ b/crates/assistant_tools/src/streaming_edit_file_tool.rs
@@ -1,397 +0,0 @@
-use crate::{
-    Templates,
-    edit_agent::{EditAgent, EditAgentOutputEvent},
-    edit_file_tool::EditFileToolCard,
-    schema::json_schema_for,
-};
-use anyhow::{Context as _, Result, anyhow};
-use assistant_tool::{ActionLog, AnyToolCard, Tool, ToolResult, ToolResultOutput};
-use futures::StreamExt;
-use gpui::{AnyWindowHandle, App, AppContext, AsyncApp, Entity, Task};
-use indoc::formatdoc;
-use language_model::{
-    LanguageModelRegistry, LanguageModelRequestMessage, LanguageModelToolSchemaFormat,
-};
-use project::Project;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use std::{path::PathBuf, sync::Arc};
-use ui::prelude::*;
-use util::ResultExt;
-
-pub struct StreamingEditFileTool;
-
-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
-pub struct StreamingEditFileToolInput {
-    /// A one-line, user-friendly markdown description of the edit. This will be
-    /// shown in the UI and also passed to another model to perform the edit.
-    ///
-    /// Be terse, but also descriptive in what you want to achieve with this
-    /// edit. Avoid generic instructions.
-    ///
-    /// NEVER mention the file path in this description.
-    ///
-    /// <example>Fix API endpoint URLs</example>
-    /// <example>Update copyright year in `page_footer`</example>
-    ///
-    /// Make sure to include this field before all the others in the input object
-    /// so that we can display it immediately.
-    pub display_description: String,
-
-    /// The full path of the file to create or modify in the project.
-    ///
-    /// WARNING: When specifying which file path need changing, you MUST
-    /// start each path with one of the project's root directories.
-    ///
-    /// The following examples assume we have two root directories in the project:
-    /// - backend
-    /// - frontend
-    ///
-    /// <example>
-    /// `backend/src/main.rs`
-    ///
-    /// Notice how the file path starts with root-1. Without that, the path
-    /// would be ambiguous and the call would fail!
-    /// </example>
-    ///
-    /// <example>
-    /// `frontend/db.js`
-    /// </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.
-    ///
-    /// When a file already exists or you just created it, always prefer editing
-    /// it as opposed to recreating it from scratch.
-    pub create_or_overwrite: bool,
-}
-
-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
-pub struct StreamingEditFileToolOutput {
-    pub original_path: PathBuf,
-    pub new_text: String,
-    pub old_text: String,
-}
-
-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
-struct PartialInput {
-    #[serde(default)]
-    path: String,
-    #[serde(default)]
-    display_description: String,
-}
-
-const DEFAULT_UI_TEXT: &str = "Editing file";
-
-impl Tool for StreamingEditFileTool {
-    fn name(&self) -> String {
-        "edit_file".into()
-    }
-
-    fn needs_confirmation(&self, _: &serde_json::Value, _: &App) -> bool {
-        false
-    }
-
-    fn description(&self) -> String {
-        include_str!("streaming_edit_file_tool/description.md").to_string()
-    }
-
-    fn icon(&self) -> IconName {
-        IconName::Pencil
-    }
-
-    fn input_schema(&self, format: LanguageModelToolSchemaFormat) -> Result<serde_json::Value> {
-        json_schema_for::<StreamingEditFileToolInput>(format)
-    }
-
-    fn ui_text(&self, input: &serde_json::Value) -> String {
-        match serde_json::from_value::<StreamingEditFileToolInput>(input.clone()) {
-            Ok(input) => input.display_description,
-            Err(_) => "Editing file".to_string(),
-        }
-    }
-
-    fn still_streaming_ui_text(&self, input: &serde_json::Value) -> String {
-        if let Some(input) = serde_json::from_value::<PartialInput>(input.clone()).ok() {
-            let description = input.display_description.trim();
-            if !description.is_empty() {
-                return description.to_string();
-            }
-
-            let path = input.path.trim();
-            if !path.is_empty() {
-                return path.to_string();
-            }
-        }
-
-        DEFAULT_UI_TEXT.to_string()
-    }
-
-    fn run(
-        self: Arc<Self>,
-        input: serde_json::Value,
-        messages: &[LanguageModelRequestMessage],
-        project: Entity<Project>,
-        action_log: Entity<ActionLog>,
-        window: Option<AnyWindowHandle>,
-        cx: &mut App,
-    ) -> ToolResult {
-        let input = match serde_json::from_value::<StreamingEditFileToolInput>(input) {
-            Ok(input) => input,
-            Err(err) => return Task::ready(Err(anyhow!(err))).into(),
-        };
-
-        let Some(project_path) = project.read(cx).find_project_path(&input.path, cx) else {
-            return Task::ready(Err(anyhow!(
-                "Path {} not found in project",
-                input.path.display()
-            )))
-            .into();
-        };
-        let Some(worktree) = project
-            .read(cx)
-            .worktree_for_id(project_path.worktree_id, cx)
-        else {
-            return Task::ready(Err(anyhow!("Worktree not found for project path"))).into();
-        };
-        let exists = worktree.update(cx, |worktree, cx| {
-            worktree.file_exists(&project_path.path, cx)
-        });
-
-        let card = window.and_then(|window| {
-            window
-                .update(cx, |_, window, cx| {
-                    cx.new(|cx| {
-                        EditFileToolCard::new(input.path.clone(), project.clone(), window, cx)
-                    })
-                })
-                .ok()
-        });
-
-        let card_clone = card.clone();
-        let messages = messages.to_vec();
-        let task = cx.spawn(async move |cx: &mut AsyncApp| {
-            if !input.create_or_overwrite && !exists.await? {
-                return Err(anyhow!("{} not found", input.path.display()));
-            }
-
-            let model = cx
-                .update(|cx| LanguageModelRegistry::read_global(cx).default_model())?
-                .context("default model not set")?
-                .model;
-            let edit_agent = EditAgent::new(model, project.clone(), action_log, Templates::new());
-
-            let buffer = project
-                .update(cx, |project, cx| {
-                    project.open_buffer(project_path.clone(), cx)
-                })?
-                .await?;
-
-            let old_snapshot = buffer.read_with(cx, |buffer, _cx| buffer.snapshot())?;
-            let old_text = cx
-                .background_spawn({
-                    let old_snapshot = old_snapshot.clone();
-                    async move { old_snapshot.text() }
-                })
-                .await;
-
-            let (output, mut events) = if input.create_or_overwrite {
-                edit_agent.overwrite(
-                    buffer.clone(),
-                    input.display_description.clone(),
-                    messages,
-                    cx,
-                )
-            } else {
-                edit_agent.edit(
-                    buffer.clone(),
-                    input.display_description.clone(),
-                    messages,
-                    cx,
-                )
-            };
-
-            let mut hallucinated_old_text = false;
-            while let Some(event) = events.next().await {
-                match event {
-                    EditAgentOutputEvent::Edited => {
-                        if let Some(card) = card_clone.as_ref() {
-                            let new_snapshot =
-                                buffer.read_with(cx, |buffer, _cx| buffer.snapshot())?;
-                            let new_text = cx
-                                .background_spawn({
-                                    let new_snapshot = new_snapshot.clone();
-                                    async move { new_snapshot.text() }
-                                })
-                                .await;
-                            card.update(cx, |card, cx| {
-                                card.set_diff(
-                                    project_path.path.clone(),
-                                    old_text.clone(),
-                                    new_text,
-                                    cx,
-                                );
-                            })
-                            .log_err();
-                        }
-                    }
-                    EditAgentOutputEvent::OldTextNotFound(_) => hallucinated_old_text = true,
-                }
-            }
-            output.await?;
-
-            project
-                .update(cx, |project, cx| project.save_buffer(buffer.clone(), cx))?
-                .await?;
-
-            let new_snapshot = buffer.read_with(cx, |buffer, _cx| buffer.snapshot())?;
-            let new_text = cx.background_spawn({
-                let new_snapshot = new_snapshot.clone();
-                async move { new_snapshot.text() }
-            });
-            let diff = cx.background_spawn(async move {
-                language::unified_diff(&old_snapshot.text(), &new_snapshot.text())
-            });
-            let (new_text, diff) = futures::join!(new_text, diff);
-
-            let output = StreamingEditFileToolOutput {
-                original_path: project_path.path.to_path_buf(),
-                new_text: new_text.clone(),
-                old_text: old_text.clone(),
-            };
-
-            if let Some(card) = card_clone {
-                card.update(cx, |card, cx| {
-                    card.set_diff(project_path.path.clone(), old_text, new_text, cx);
-                })
-                .log_err();
-            }
-
-            let input_path = input.path.display();
-            if diff.is_empty() {
-                if hallucinated_old_text {
-                    Err(anyhow!(formatdoc! {"
-                        Some edits were produced but none of them could be applied.
-                        Read the relevant sections of {input_path} again so that
-                        I can perform the requested edits.
-                    "}))
-                } else {
-                    Ok("No edits were made.".to_string().into())
-                }
-            } else {
-                Ok(ToolResultOutput {
-                    content: format!("Edited {}:\n\n```diff\n{}\n```", input_path, diff),
-                    output: serde_json::to_value(output).ok(),
-                })
-            }
-        });
-
-        ToolResult {
-            output: task,
-            card: card.map(AnyToolCard::from),
-        }
-    }
-
-    fn deserialize_card(
-        self: Arc<Self>,
-        output: serde_json::Value,
-        project: Entity<Project>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Option<AnyToolCard> {
-        let output = match serde_json::from_value::<StreamingEditFileToolOutput>(output) {
-            Ok(output) => output,
-            Err(_) => return None,
-        };
-
-        let card = cx.new(|cx| {
-            let mut card = EditFileToolCard::new(output.original_path.clone(), project, window, cx);
-            card.set_diff(
-                output.original_path.into(),
-                output.old_text,
-                output.new_text,
-                cx,
-            );
-            card
-        });
-
-        Some(card.into())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use serde_json::json;
-
-    #[test]
-    fn still_streaming_ui_text_with_path() {
-        let input = json!({
-            "path": "src/main.rs",
-            "display_description": "",
-            "old_string": "old code",
-            "new_string": "new code"
-        });
-
-        assert_eq!(
-            StreamingEditFileTool.still_streaming_ui_text(&input),
-            "src/main.rs"
-        );
-    }
-
-    #[test]
-    fn still_streaming_ui_text_with_description() {
-        let input = json!({
-            "path": "",
-            "display_description": "Fix error handling",
-            "old_string": "old code",
-            "new_string": "new code"
-        });
-
-        assert_eq!(
-            StreamingEditFileTool.still_streaming_ui_text(&input),
-            "Fix error handling",
-        );
-    }
-
-    #[test]
-    fn still_streaming_ui_text_with_path_and_description() {
-        let input = json!({
-            "path": "src/main.rs",
-            "display_description": "Fix error handling",
-            "old_string": "old code",
-            "new_string": "new code"
-        });
-
-        assert_eq!(
-            StreamingEditFileTool.still_streaming_ui_text(&input),
-            "Fix error handling",
-        );
-    }
-
-    #[test]
-    fn still_streaming_ui_text_no_path_or_description() {
-        let input = json!({
-            "path": "",
-            "display_description": "",
-            "old_string": "old code",
-            "new_string": "new code"
-        });
-
-        assert_eq!(
-            StreamingEditFileTool.still_streaming_ui_text(&input),
-            DEFAULT_UI_TEXT,
-        );
-    }
-
-    #[test]
-    fn still_streaming_ui_text_with_null() {
-        let input = serde_json::Value::Null;
-
-        assert_eq!(
-            StreamingEditFileTool.still_streaming_ui_text(&input),
-            DEFAULT_UI_TEXT,
-        );
-    }
-}
--- a/crates/assistant_tools/src/streaming_edit_file_tool/description.md
+++ b/crates/assistant_tools/src/streaming_edit_file_tool/description.md
@@ -1,8 +0,0 @@
-This is a tool for creating a new file or editing an existing file. For moving or renaming files, you should generally use the `terminal` tool with the 'mv' command instead.
-
-Before using this tool:
-
-1. Use the `read_file` tool to understand the file's contents and context
-
-2. Verify the directory path is correct (only applicable when creating new files):
-   - Use the `list_directory` tool to verify the parent directory exists and is the correct location
--- a/crates/assistant_tools/src/templates/edit_file_prompt.hbs
+++ b/crates/assistant_tools/src/templates/edit_file_prompt.hbs
@@ -1,6 +1,4 @@
-You are an expert text editor and your task is to produce a series of edits to a file given a description of the changes you need to make.
-
-You MUST respond with a series of edits to that one file in the following format:
+You MUST respond with a series of edits to a file, using the following format:

 ```
 <edits>
@@ -51,3 +49,5 @@ Rules for editing:
 <edit_description>
 {{edit_description}}
 </edit_description>
+
+Tool calls have been disabled. You MUST start your response with <edits>.
--- a/crates/assistant_tools/src/terminal_tool.rs
+++ b/crates/assistant_tools/src/terminal_tool.rs
@@ -4,7 +4,7 @@ use assistant_tool::{ActionLog, Tool, ToolCard, ToolResult, ToolUseStatus};
 use futures::{FutureExt as _, future::Shared};
 use gpui::{AnyWindowHandle, App, AppContext, Empty, Entity, EntityId, Task, WeakEntity, Window};
 use language::LineEnding;
-use language_model::{LanguageModelRequestMessage, LanguageModelToolSchemaFormat};
+use language_model::{LanguageModel, LanguageModelRequest, LanguageModelToolSchemaFormat};
 use portable_pty::{CommandBuilder, PtySize, native_pty_system};
 use project::{Project, terminals::TerminalKind};
 use schemars::JsonSchema;
@@ -107,9 +107,10 @@ impl Tool for TerminalTool {
    fn run(
        self: Arc<Self>,
        input: serde_json::Value,
-        _messages: &[LanguageModelRequestMessage],
+        _request: Arc<LanguageModelRequest>,
        project: Entity<Project>,
        _action_log: Entity<ActionLog>,
+        _model: Arc<dyn LanguageModel>,
        window: Option<AnyWindowHandle>,
        cx: &mut App,
    ) -> ToolResult {
@@ -598,6 +599,7 @@ mod tests {
    use editor::EditorSettings;
    use fs::RealFs;
    use gpui::{BackgroundExecutor, TestAppContext};
+    use language_model::fake_provider::FakeLanguageModel;
    use pretty_assertions::assert_eq;
    use serde_json::json;
    use settings::{Settings, SettingsStore};
@@ -639,6 +641,7 @@ mod tests {
        let project: Entity<Project> =
            Project::test(fs, [tree.path().join("project").as_path()], cx).await;
        let action_log = cx.update(|cx| cx.new(|_| ActionLog::new(project.clone())));
+        let model = Arc::new(FakeLanguageModel::default());

        let input = TerminalToolInput {
            command: "cat".to_owned(),
@@ -653,9 +656,10 @@ mod tests {
            TerminalTool::run(
                Arc::new(TerminalTool::new(cx)),
                serde_json::to_value(input).unwrap(),
-                &[],
+                Arc::default(),
                project.clone(),
                action_log.clone(),
+                model,
                None,
                cx,
            )
@@ -681,14 +685,16 @@ mod tests {
        let project: Entity<Project> =
            Project::test(fs, [tree.path().join("project").as_path()], cx).await;
        let action_log = cx.update(|cx| cx.new(|_| ActionLog::new(project.clone())));
+        let model = Arc::new(FakeLanguageModel::default());

        let check = |input, expected, cx: &mut App| {
            let headless_result = TerminalTool::run(
                Arc::new(TerminalTool::new(cx)),
                serde_json::to_value(input).unwrap(),
-                &[],
+                Arc::default(),
                project.clone(),
                action_log.clone(),
+                model.clone(),
                None,
                cx,
            );
--- a/crates/assistant_tools/src/thinking_tool.rs
+++ b/crates/assistant_tools/src/thinking_tool.rs
@@ -4,7 +4,7 @@ use crate::schema::json_schema_for;
 use anyhow::{Result, anyhow};
 use assistant_tool::{ActionLog, Tool, ToolResult};
 use gpui::{AnyWindowHandle, App, Entity, Task};
-use language_model::{LanguageModelRequestMessage, LanguageModelToolSchemaFormat};
+use language_model::{LanguageModel, LanguageModelRequest, LanguageModelToolSchemaFormat};
 use project::Project;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
@@ -47,9 +47,10 @@ impl Tool for ThinkingTool {
    fn run(
        self: Arc<Self>,
        input: serde_json::Value,
-        _messages: &[LanguageModelRequestMessage],
+        _request: Arc<LanguageModelRequest>,
        _project: Entity<Project>,
        _action_log: Entity<ActionLog>,
+        _model: Arc<dyn LanguageModel>,
        _window: Option<AnyWindowHandle>,
        _cx: &mut App,
    ) -> ToolResult {
--- a/crates/assistant_tools/src/web_search_tool.rs
+++ b/crates/assistant_tools/src/web_search_tool.rs
@@ -8,7 +8,7 @@ use futures::{Future, FutureExt, TryFutureExt};
 use gpui::{
    AnyWindowHandle, App, AppContext, Context, Entity, IntoElement, Task, WeakEntity, Window,
 };
-use language_model::{LanguageModelRequestMessage, LanguageModelToolSchemaFormat};
+use language_model::{LanguageModel, LanguageModelRequest, LanguageModelToolSchemaFormat};
 use project::Project;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
@@ -53,9 +53,10 @@ impl Tool for WebSearchTool {
    fn run(
        self: Arc<Self>,
        input: serde_json::Value,
-        _messages: &[LanguageModelRequestMessage],
+        _request: Arc<LanguageModelRequest>,
        _project: Entity<Project>,
        _action_log: Entity<ActionLog>,
+        _model: Arc<dyn LanguageModel>,
        _window: Option<AnyWindowHandle>,
        cx: &mut App,
    ) -> ToolResult {
--- a/crates/auto_update/src/auto_update.rs
+++ b/crates/auto_update/src/auto_update.rs
@@ -335,9 +335,13 @@ impl AutoUpdater {
        self.status.clone()
    }

-    pub fn dismiss_error(&mut self, cx: &mut Context<Self>) {
+    pub fn dismiss_error(&mut self, cx: &mut Context<Self>) -> bool {
+        if self.status == AutoUpdateStatus::Idle {
+            return false;
+        }
        self.status = AutoUpdateStatus::Idle;
        cx.notify();
+        true
    }

    // If you are packaging Zed and need to override the place it downloads SSH remotes from,
--- a/crates/auto_update_ui/src/auto_update_ui.rs
+++ b/crates/auto_update_ui/src/auto_update_ui.rs
@@ -155,6 +155,7 @@ pub fn notify_if_app_was_updated(cx: &mut App) {
                                }
                                cx.emit(DismissEvent);
                            })
+                            .show_suppress_button(false)
                        })
                    },
                );
--- a/crates/bedrock/src/bedrock.rs
+++ b/crates/bedrock/src/bedrock.rs
@@ -7,9 +7,10 @@ use anyhow::{Error, Result, anyhow};
 use aws_sdk_bedrockruntime as bedrock;
 pub use aws_sdk_bedrockruntime as bedrock_client;
 pub use aws_sdk_bedrockruntime::types::{
-    AutoToolChoice as BedrockAutoToolChoice, ContentBlock as BedrockInnerContent,
-    Tool as BedrockTool, ToolChoice as BedrockToolChoice, ToolConfiguration as BedrockToolConfig,
-    ToolInputSchema as BedrockToolInputSchema, ToolSpecification as BedrockToolSpec,
+    AnyToolChoice as BedrockAnyToolChoice, AutoToolChoice as BedrockAutoToolChoice,
+    ContentBlock as BedrockInnerContent, Tool as BedrockTool, ToolChoice as BedrockToolChoice,
+    ToolConfiguration as BedrockToolConfig, ToolInputSchema as BedrockToolInputSchema,
+    ToolSpecification as BedrockToolSpec,
 };
 pub use aws_smithy_types::Blob as BedrockBlob;
 use aws_smithy_types::{Document, Number as AwsNumber};
--- a/crates/client/src/user.rs
+++ b/crates/client/src/user.rs
@@ -11,7 +11,7 @@ use postage::{sink::Sink, watch};
 use rpc::proto::{RequestMessage, UsersResponse};
 use std::sync::{Arc, Weak};
 use text::ReplicaId;
-use util::TryFutureExt as _;
+use util::{TryFutureExt as _, maybe};

 pub type UserId = u64;

@@ -101,6 +101,7 @@ pub struct UserStore {
    participant_indices: HashMap<u64, ParticipantIndex>,
    update_contacts_tx: mpsc::UnboundedSender<UpdateContacts>,
    current_plan: Option<proto::Plan>,
+    subscription_period: Option<(DateTime<Utc>, DateTime<Utc>)>,
    trial_started_at: Option<DateTime<Utc>>,
    model_request_usage_amount: Option<u32>,
    model_request_usage_limit: Option<proto::UsageLimit>,
@@ -166,6 +167,7 @@ impl UserStore {
            by_github_login: Default::default(),
            current_user: current_user_rx,
            current_plan: None,
+            subscription_period: None,
            trial_started_at: None,
            model_request_usage_amount: None,
            model_request_usage_limit: None,
@@ -333,6 +335,13 @@ impl UserStore {
    ) -> Result<()> {
        this.update(&mut cx, |this, cx| {
            this.current_plan = Some(message.payload.plan());
+            this.subscription_period = maybe!({
+                let period = message.payload.subscription_period?;
+                let started_at = DateTime::from_timestamp(period.started_at as i64, 0)?;
+                let ended_at = DateTime::from_timestamp(period.ended_at as i64, 0)?;
+
+                Some((started_at, ended_at))
+            });
            this.trial_started_at = message
                .payload
                .trial_started_at
@@ -713,6 +722,10 @@ impl UserStore {
        self.current_plan
    }

+    pub fn subscription_period(&self) -> Option<(DateTime<Utc>, DateTime<Utc>)> {
+        self.subscription_period
+    }
+
    pub fn trial_started_at(&self) -> Option<DateTime<Utc>> {
        self.trial_started_at
    }
--- a/crates/collab/Cargo.toml
+++ b/crates/collab/Cargo.toml
@@ -76,7 +76,6 @@ workspace-hack.workspace = true
 zed_llm_client.workspace = true

 [dev-dependencies]
-assistant = { workspace = true, features = ["test-support"] }
 assistant_context_editor.workspace = true
 assistant_settings.workspace = true
 assistant_slash_command.workspace = true
--- a/crates/collab/src/api/billing.rs
+++ b/crates/collab/src/api/billing.rs
@@ -18,7 +18,8 @@ use stripe::{
    CreateBillingPortalSessionFlowDataSubscriptionUpdateConfirm,
    CreateBillingPortalSessionFlowDataSubscriptionUpdateConfirmItems,
    CreateBillingPortalSessionFlowDataType, CreateCustomer, Customer, CustomerId, EventObject,
-    EventType, Expandable, ListEvents, Subscription, SubscriptionId, SubscriptionStatus,
+    EventType, Expandable, ListEvents, PaymentMethod, Subscription, SubscriptionId,
+    SubscriptionStatus,
 };
 use util::{ResultExt, maybe};

@@ -71,6 +72,7 @@ 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,
@@ -86,9 +88,17 @@ 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| {
@@ -127,6 +137,8 @@ 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 =
@@ -182,6 +194,13 @@ 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,
@@ -301,13 +320,6 @@ 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(
@@ -399,16 +411,10 @@ async fn create_billing_subscription(
                .await?
        }
        None => {
-            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?
+            return Err(Error::http(
+                StatusCode::BAD_REQUEST,
+                "No product selected".into(),
+            ));
        }
    };

@@ -424,6 +430,8 @@ 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.
@@ -438,6 +446,7 @@ struct ManageBillingSubscriptionBody {
    intent: ManageSubscriptionIntent,
    /// The ID of the subscription to manage.
    subscription_id: BillingSubscriptionId,
+    redirect_to: Option<String>,
 }

 #[derive(Debug, Serialize)]
@@ -535,6 +544,23 @@ 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,
@@ -584,6 +610,21 @@ 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 {
@@ -1381,81 +1422,6 @@ 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/llm/db/queries.rs
+++ b/crates/collab/src/llm/db/queries.rs
@@ -1,6 +1,5 @@
 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
@@ -1,31 +0,0 @@
-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,4 +1,3 @@
-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
@@ -1,37 +0,0 @@
-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,8 +31,6 @@ 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 {
@@ -47,10 +45,4 @@ 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,9 +1,6 @@
-use crate::Cents;
 use crate::db::billing_subscription::SubscriptionKind;
 use crate::db::{billing_subscription, user};
-use crate::llm::{
-    AGENT_EXTENDED_TRIAL_FEATURE_FLAG, DEFAULT_MAX_MONTHLY_SPEND, FREE_TIER_MONTHLY_SPENDING_LIMIT,
-};
+use crate::llm::AGENT_EXTENDED_TRIAL_FEATURE_FLAG;
 use crate::{Config, db::billing_preference};
 use anyhow::{Result, anyhow};
 use chrono::{NaiveDateTime, Utc};
@@ -28,13 +25,8 @@ 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,
@@ -56,7 +48,6 @@ 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,
@@ -83,17 +74,7 @@ impl LlmTokenClaims {
            bypass_account_age_check: feature_flags
                .iter()
                .any(|flag| flag == "bypass-account-age-check"),
-            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"),
+            can_use_web_search_tool: true,
            use_llm_request_queue: feature_flags.iter().any(|flag| flag == "llm-request-queue"),
            plan: if is_staff {
                Plan::ZedPro
@@ -155,12 +136,6 @@ 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,9 +8,7 @@ use axum::{
 };

 use collab::api::CloudflareIpCountryHeader;
-use collab::api::billing::{
-    sync_llm_request_usage_with_stripe_periodically, sync_llm_token_usage_with_stripe_periodically,
-};
+use collab::api::billing::sync_llm_request_usage_with_stripe_periodically;
 use collab::llm::db::LlmDatabase;
 use collab::migrations::run_database_migrations;
 use collab::user_backfiller::spawn_user_backfiller;
@@ -155,7 +153,6 @@ 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
@@ -166,19 +166,6 @@ 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);
@@ -2709,7 +2696,7 @@ async fn update_user_plan(user_id: UserId, session: &Session) -> Result<()> {
    let billing_customer = db.get_billing_customer_by_user_id(user_id).await?;
    let billing_preferences = db.get_billing_preferences(user_id).await?;

-    let usage = if let Some(llm_db) = session.app_state.llm_db.clone() {
+    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(
@@ -2717,15 +2704,17 @@ async fn update_user_plan(user_id: UserId, session: &Session) -> Result<()> {
            session.is_staff(),
        );

-        if let Some((period_start_at, period_end_at)) = subscription_period {
+        let usage = if let Some((period_start_at, period_end_at)) = subscription_period {
            llm_db
                .get_subscription_usage_for_period(user_id, period_start_at, period_end_at)
                .await?
        } else {
            None
-        }
+        };
+
+        (subscription_period, usage)
    } else {
-        None
+        (None, None)
    };

    session
@@ -2743,6 +2732,12 @@ async fn update_user_plan(user_id: UserId, session: &Session) -> Result<()> {
                    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,
@@ -3992,11 +3987,6 @@ 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
@@ -4008,7 +3998,6 @@ 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?;

@@ -4017,7 +4006,6 @@ 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/Show More
+++ b/Show More