diff --git a/.gitignore b/.gitignore
index 2a91a65b6eaef906681bf3f6e315de07b094c4b1..ccf4f471d5a7b70be0dc8d619ac64050dd6681ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,3 +39,6 @@ xcuserdata/
# Don't commit any secrets to the repo.
.env
.env.secret.toml
+
+# `nix build` output
+/result
diff --git a/Cargo.lock b/Cargo.lock
index 9bb6a3322e613d717d0b3b2755c43fba0f7f3941..da60b0b2318f630b2f64f03d535c09d11bd4938d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -211,14 +211,14 @@ dependencies = [
"worktree",
"zed_env_vars",
"zlog",
- "zstd 0.11.2+zstd.1.5.2",
+ "zstd",
]
[[package]]
name = "agent-client-protocol"
-version = "0.8.0"
+version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e639d6b544ad39f5b4e05802db5eb04e1518284eb05fda1839931003e0244c8"
+checksum = "c2ffe7d502c1e451aafc5aff655000f84d09c9af681354ac0012527009b1af13"
dependencies = [
"agent-client-protocol-schema",
"anyhow",
@@ -233,15 +233,16 @@ dependencies = [
[[package]]
name = "agent-client-protocol-schema"
-version = "0.9.1"
+version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f182f5e14bef8232b239719bd99166bb11e986c08fc211f28e392f880d3093ba"
+checksum = "8af81cc2d5c3f9c04f73db452efd058333735ba9d51c2cf7ef33c9fee038e7e6"
dependencies = [
"anyhow",
"derive_more 2.0.1",
"schemars",
"serde",
"serde_json",
+ "strum 0.27.2",
]
[[package]]
@@ -680,21 +681,6 @@ dependencies = [
"syn 2.0.106",
]
-[[package]]
-name = "argminmax"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70f13d10a41ac8d2ec79ee34178d61e6f47a29c2edfe7ef1721c7383b0359e65"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "array-init-cursor"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed51fe0f224d1d4ea768be38c51f9f831dee9d05c163c11fba0b8c44387b1fc3"
-
[[package]]
name = "arraydeque"
version = "0.5.1"
@@ -1278,15 +1264,6 @@ dependencies = [
"num-traits",
]
-[[package]]
-name = "atoi_simd"
-version = "0.16.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2a49e05797ca52e312a0c658938b7d00693ef037799ef7187678f212d7684cf"
-dependencies = [
- "debug_unsafe",
-]
-
[[package]]
name = "atomic"
version = "0.5.3"
@@ -2070,26 +2047,6 @@ dependencies = [
"serde",
]
-[[package]]
-name = "bincode"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36eaf5d7b090263e8150820482d5d93cd964a81e4019913c972f4edcc6edb740"
-dependencies = [
- "bincode_derive",
- "serde",
- "unty",
-]
-
-[[package]]
-name = "bincode_derive"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf95709a440f45e986983918d0e8a1f30a9b1df04918fc828670606804ac3c09"
-dependencies = [
- "virtue",
-]
-
[[package]]
name = "bindgen"
version = "0.71.1"
@@ -2242,19 +2199,6 @@ dependencies = [
"profiling",
]
-[[package]]
-name = "blake3"
-version = "1.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3888aaa89e4b2a40fca9848e400f6a658a5a3978de7be858e209cafa8be9a4a0"
-dependencies = [
- "arrayref",
- "arrayvec",
- "cc",
- "cfg-if",
- "constant_time_eq 0.3.1",
-]
-
[[package]]
name = "block"
version = "0.1.6"
@@ -2344,12 +2288,6 @@ dependencies = [
"syn 2.0.106",
]
-[[package]]
-name = "boxcar"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36f64beae40a84da1b4b26ff2761a5b895c12adc41dc25aaee1c4f2bbfe97a6e"
-
[[package]]
name = "breadcrumbs"
version = "0.1.0"
@@ -2516,9 +2454,6 @@ name = "bytes"
version = "1.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
-dependencies = [
- "serde",
-]
[[package]]
name = "bytes-utils"
@@ -2805,15 +2740,6 @@ version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
-[[package]]
-name = "castaway"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dec551ab6e7578819132c713a93c022a05d60159dc86e7a7050223577484c55a"
-dependencies = [
- "rustversion",
-]
-
[[package]]
name = "cbc"
version = "0.1.2"
@@ -2942,16 +2868,6 @@ dependencies = [
"windows-link 0.2.1",
]
-[[package]]
-name = "chrono-tz"
-version = "0.10.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6139a8597ed92cf816dfb33f5dd6cf0bb93a6adc938f11039f371bc5bcd26c3"
-dependencies = [
- "chrono",
- "phf 0.12.1",
-]
-
[[package]]
name = "chunked_transfer"
version = "1.5.0"
@@ -3201,12 +3117,7 @@ dependencies = [
"anyhow",
"cloud_llm_client",
"indoc",
- "ordered-float 2.10.1",
- "rustc-hash 2.1.1",
- "schemars",
"serde",
- "serde_json",
- "strum 0.27.2",
]
[[package]]
@@ -3314,8 +3225,8 @@ name = "codestral"
version = "0.1.0"
dependencies = [
"anyhow",
- "edit_prediction",
"edit_prediction_context",
+ "edit_prediction_types",
"futures 0.3.31",
"gpui",
"http_client",
@@ -3505,17 +3416,6 @@ dependencies = [
"memchr",
]
-[[package]]
-name = "comfy-table"
-version = "7.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b03b7db8e0b4b2fdad6c551e634134e99ec000e5c8c3b6856c65e8bbaded7a3b"
-dependencies = [
- "crossterm",
- "unicode-segmentation",
- "unicode-width",
-]
-
[[package]]
name = "command-fds"
version = "0.3.2"
@@ -3569,21 +3469,6 @@ dependencies = [
"workspace",
]
-[[package]]
-name = "compact_str"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb1325a1cece981e8a296ab8f0f9b63ae357bd0784a9faaf548cc7b480707a"
-dependencies = [
- "castaway",
- "cfg-if",
- "itoa",
- "rustversion",
- "ryu",
- "serde",
- "static_assertions",
-]
-
[[package]]
name = "component"
version = "0.1.0"
@@ -3689,12 +3574,6 @@ version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
-[[package]]
-name = "constant_time_eq"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6"
-
[[package]]
name = "context_server"
version = "0.1.0"
@@ -3747,7 +3626,7 @@ dependencies = [
"command_palette_hooks",
"ctor",
"dirs 4.0.0",
- "edit_prediction",
+ "edit_prediction_types",
"editor",
"fs",
"futures 0.3.31",
@@ -4160,7 +4039,7 @@ dependencies = [
name = "crashes"
version = "0.1.0"
dependencies = [
- "bincode 1.3.3",
+ "bincode",
"cfg-if",
"crash-handler",
"extension_host",
@@ -4174,7 +4053,7 @@ dependencies = [
"smol",
"system_specs",
"windows 0.61.3",
- "zstd 0.11.2+zstd.1.5.2",
+ "zstd",
]
[[package]]
@@ -4319,29 +4198,6 @@ version = "0.8.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
-[[package]]
-name = "crossterm"
-version = "0.29.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8b9f2e4c67f833b660cdb0a3523065869fb35570177239812ed4c905aeff87b"
-dependencies = [
- "bitflags 2.9.4",
- "crossterm_winapi",
- "document-features",
- "parking_lot",
- "rustix 1.1.2",
- "winapi",
-]
-
-[[package]]
-name = "crossterm_winapi"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b"
-dependencies = [
- "winapi",
-]
-
[[package]]
name = "crunchy"
version = "0.2.4"
@@ -4696,12 +4552,6 @@ dependencies = [
"util",
]
-[[package]]
-name = "debug_unsafe"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85d3cef41d236720ed453e102153a53e4cc3d2fde848c0078a50cf249e8e3e5b"
-
[[package]]
name = "debugger_tools"
version = "0.1.0"
@@ -4734,6 +4584,7 @@ dependencies = [
"db",
"debugger_tools",
"editor",
+ "feature_flags",
"file_icons",
"futures 0.3.31",
"fuzzy",
@@ -5109,15 +4960,6 @@ dependencies = [
"zlog",
]
-[[package]]
-name = "document-features"
-version = "0.2.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95249b50c6c185bee49034bcb378a49dc2b5dff0be90ff6616d31d64febab05d"
-dependencies = [
- "litrs",
-]
-
[[package]]
name = "documented"
version = "0.9.2"
@@ -5267,144 +5109,252 @@ dependencies = [
name = "edit_prediction"
version = "0.1.0"
dependencies = [
- "client",
- "gpui",
- "language",
-]
-
-[[package]]
-name = "edit_prediction_button"
-version = "0.1.0"
-dependencies = [
+ "ai_onboarding",
"anyhow",
+ "arrayvec",
+ "brotli",
"client",
+ "clock",
+ "cloud_api_types",
"cloud_llm_client",
- "codestral",
+ "cloud_zeta2_prompt",
+ "collections",
"copilot",
- "edit_prediction",
- "editor",
+ "credentials_provider",
+ "ctor",
+ "db",
+ "edit_prediction_context",
+ "edit_prediction_types",
"feature_flags",
"fs",
"futures 0.3.31",
"gpui",
"indoc",
+ "itertools 0.14.0",
"language",
+ "language_model",
+ "log",
"lsp",
"menu",
- "paths",
+ "open_ai",
+ "parking_lot",
+ "postage",
+ "pretty_assertions",
"project",
+ "rand 0.9.2",
"regex",
+ "release_channel",
+ "semver",
+ "serde",
"serde_json",
"settings",
- "supermaven",
+ "smol",
+ "strsim",
+ "strum 0.27.2",
"telemetry",
- "theme",
+ "telemetry_events",
+ "thiserror 2.0.17",
"ui",
- "ui_input",
"util",
+ "uuid",
"workspace",
+ "worktree",
"zed_actions",
- "zeta",
+ "zlog",
]
[[package]]
-name = "edit_prediction_context"
+name = "edit_prediction_cli"
version = "0.1.0"
dependencies = [
+ "anthropic",
"anyhow",
- "arrayvec",
+ "chrono",
"clap",
+ "client",
"cloud_llm_client",
+ "cloud_zeta2_prompt",
"collections",
+ "debug_adapter_extension",
+ "edit_prediction",
+ "edit_prediction_context",
+ "extension",
+ "fs",
"futures 0.3.31",
"gpui",
- "hashbrown 0.15.5",
+ "gpui_tokio",
+ "http_client",
"indoc",
- "itertools 0.14.0",
"language",
+ "language_extension",
+ "language_model",
+ "language_models",
+ "languages",
"log",
- "ordered-float 2.10.1",
- "postage",
+ "node_runtime",
+ "paths",
"pretty_assertions",
"project",
- "regex",
+ "prompt_store",
+ "pulldown-cmark 0.12.2",
+ "release_channel",
+ "reqwest_client",
"serde",
"serde_json",
"settings",
- "slotmap",
- "strum 0.27.2",
- "text",
- "tree-sitter",
- "tree-sitter-c",
- "tree-sitter-cpp",
- "tree-sitter-go",
+ "shellexpand 2.1.2",
+ "smol",
+ "sqlez",
+ "sqlez_macros",
+ "terminal_view",
+ "toml 0.8.23",
"util",
+ "watch",
"zlog",
]
[[package]]
-name = "editor"
+name = "edit_prediction_context"
version = "0.1.0"
dependencies = [
- "aho-corasick",
"anyhow",
- "assets",
- "buffer_diff",
- "client",
- "clock",
+ "cloud_llm_client",
"collections",
- "convert_case 0.8.0",
- "criterion",
- "ctor",
- "dap",
- "db",
- "edit_prediction",
- "emojis",
- "feature_flags",
- "file_icons",
- "fs",
+ "env_logger 0.11.8",
"futures 0.3.31",
- "fuzzy",
- "git",
"gpui",
- "http_client",
"indoc",
- "itertools 0.14.0",
"language",
- "languages",
- "linkify",
"log",
"lsp",
- "markdown",
- "menu",
- "multi_buffer",
- "ordered-float 2.10.1",
"parking_lot",
"pretty_assertions",
"project",
- "rand 0.9.2",
- "regex",
- "release_channel",
- "rope",
- "rpc",
- "schemars",
- "semver",
"serde",
"serde_json",
"settings",
"smallvec",
- "smol",
- "snippet",
- "sum_tree",
- "task",
- "telemetry",
- "tempfile",
+ "text",
+ "tree-sitter",
+ "util",
+ "zlog",
+]
+
+[[package]]
+name = "edit_prediction_types"
+version = "0.1.0"
+dependencies = [
+ "client",
+ "gpui",
+ "language",
+]
+
+[[package]]
+name = "edit_prediction_ui"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "buffer_diff",
+ "client",
+ "cloud_llm_client",
+ "cloud_zeta2_prompt",
+ "codestral",
+ "command_palette_hooks",
+ "copilot",
+ "edit_prediction",
+ "edit_prediction_types",
+ "editor",
+ "feature_flags",
+ "fs",
+ "futures 0.3.31",
+ "gpui",
+ "indoc",
+ "language",
+ "lsp",
+ "markdown",
+ "menu",
+ "multi_buffer",
+ "paths",
+ "project",
+ "regex",
+ "serde_json",
+ "settings",
+ "supermaven",
+ "telemetry",
+ "text",
+ "theme",
+ "ui",
+ "ui_input",
+ "util",
+ "workspace",
+ "zed_actions",
+]
+
+[[package]]
+name = "editor"
+version = "0.1.0"
+dependencies = [
+ "aho-corasick",
+ "anyhow",
+ "assets",
+ "buffer_diff",
+ "client",
+ "clock",
+ "collections",
+ "convert_case 0.8.0",
+ "criterion",
+ "ctor",
+ "dap",
+ "db",
+ "edit_prediction_types",
+ "emojis",
+ "feature_flags",
+ "file_icons",
+ "fs",
+ "futures 0.3.31",
+ "fuzzy",
+ "git",
+ "gpui",
+ "http_client",
+ "indoc",
+ "itertools 0.14.0",
+ "language",
+ "languages",
+ "linkify",
+ "log",
+ "lsp",
+ "markdown",
+ "menu",
+ "multi_buffer",
+ "ordered-float 2.10.1",
+ "parking_lot",
+ "pretty_assertions",
+ "project",
+ "rand 0.9.2",
+ "regex",
+ "release_channel",
+ "rope",
+ "rpc",
+ "schemars",
+ "semver",
+ "serde",
+ "serde_json",
+ "settings",
+ "smallvec",
+ "smol",
+ "snippet",
+ "sum_tree",
+ "task",
+ "telemetry",
+ "tempfile",
"text",
"theme",
"time",
+ "tracing",
"tree-sitter-bash",
"tree-sitter-c",
"tree-sitter-html",
+ "tree-sitter-md",
"tree-sitter-python",
"tree-sitter-rust",
"tree-sitter-typescript",
@@ -5420,6 +5370,7 @@ dependencies = [
"workspace",
"zed_actions",
"zlog",
+ "ztracing",
]
[[package]]
@@ -5695,12 +5646,6 @@ dependencies = [
"windows-sys 0.48.0",
]
-[[package]]
-name = "ethnum"
-version = "1.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca81e6b4777c89fd810c25a4be2b1bd93ea034fbe58e6a75216a34c6b82c539b"
-
[[package]]
name = "euclid"
version = "0.22.11"
@@ -5864,6 +5809,7 @@ dependencies = [
"serde",
"serde_json",
"task",
+ "tempfile",
"toml 0.8.23",
"url",
"util",
@@ -5993,12 +5939,6 @@ version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649"
-[[package]]
-name = "fallible-streaming-iterator"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a"
-
[[package]]
name = "fancy-regex"
version = "0.16.2"
@@ -6010,12 +5950,6 @@ dependencies = [
"regex-syntax",
]
-[[package]]
-name = "fast-float2"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8eb564c5c7423d25c886fb561d1e4ee69f72354d16918afa32c08811f6b6a55"
-
[[package]]
name = "fast-srgb8"
version = "1.0.0"
@@ -6191,7 +6125,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc5a4e564e38c699f2880d3fda590bedc2e69f3f84cd48b457bd892ce61d0aa9"
dependencies = [
"crc32fast",
- "libz-rs-sys",
"miniz_oxide",
]
@@ -6448,16 +6381,6 @@ dependencies = [
"winapi",
]
-[[package]]
-name = "fs4"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8640e34b88f7652208ce9e88b1a37a2ae95227d84abec377ccd3c5cfeb141ed4"
-dependencies = [
- "rustix 1.1.2",
- "windows-sys 0.59.0",
-]
-
[[package]]
name = "fs_benchmarks"
version = "0.1.0"
@@ -6918,6 +6841,20 @@ dependencies = [
"seq-macro",
]
+[[package]]
+name = "generator"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "605183a538e3e2a9c1038635cc5c2d194e2ee8fd0d1b66b8349fad7dbacce5a2"
+dependencies = [
+ "cc",
+ "cfg-if",
+ "libc",
+ "log",
+ "rustversion",
+ "windows 0.61.3",
+]
+
[[package]]
name = "generic-array"
version = "0.14.7"
@@ -7079,6 +7016,7 @@ dependencies = [
"gpui",
"http_client",
"indoc",
+ "itertools 0.14.0",
"pretty_assertions",
"regex",
"serde",
@@ -7136,6 +7074,7 @@ dependencies = [
"theme",
"time",
"time_format",
+ "tracing",
"ui",
"unindent",
"util",
@@ -7145,6 +7084,7 @@ dependencies = [
"zed_actions",
"zeroize",
"zlog",
+ "ztracing",
]
[[package]]
@@ -7521,7 +7461,6 @@ dependencies = [
"allocator-api2",
"equivalent",
"foldhash 0.1.5",
- "rayon",
"serde",
]
@@ -7633,7 +7572,7 @@ version = "0.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13c255bdf46e07fb840d120a36dcc81f385140d7191c76a7391672675c01a55d"
dependencies = [
- "bincode 1.3.3",
+ "bincode",
"byteorder",
"heed-traits",
"serde",
@@ -8223,7 +8162,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4b0f83760fb341a774ed326568e19f5a863af4a952def8c39f9ab92fd95b88e5"
dependencies = [
"equivalent",
- "hashbrown 0.15.5",
+ "hashbrown 0.16.1",
"serde",
"serde_core",
]
@@ -8393,7 +8332,7 @@ version = "0.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6fb8251fb7bcd9ccd3725ed8deae9fe7db8e586495c9eb5b0c52e6233e5e75ea"
dependencies = [
- "bincode 1.3.3",
+ "bincode",
"crossbeam-channel",
"fnv",
"lazy_static",
@@ -9234,15 +9173,6 @@ dependencies = [
"webrtc-sys",
]
-[[package]]
-name = "libz-rs-sys"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "840db8cf39d9ec4dd794376f38acc40d0fc65eec2a8f484f7fd375b84602becd"
-dependencies = [
- "zlib-rs",
-]
-
[[package]]
name = "libz-sys"
version = "1.1.22"
@@ -9305,12 +9235,6 @@ version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956"
-[[package]]
-name = "litrs"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5e54036fe321fd421e10d732f155734c4e4afd610dd556d9a82833ab3ee0bed"
-
[[package]]
name = "livekit"
version = "0.7.8"
@@ -9480,6 +9404,19 @@ dependencies = [
"value-bag",
]
+[[package]]
+name = "loom"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "419e0dc8046cb947daa77eb95ae174acfbddb7673b4151f56d1eed8e93fbfaca"
+dependencies = [
+ "cfg-if",
+ "generator",
+ "scoped-tls",
+ "tracing",
+ "tracing-subscriber",
+]
+
[[package]]
name = "loop9"
version = "0.1.5"
@@ -9602,25 +9539,6 @@ dependencies = [
"num-traits",
]
-[[package]]
-name = "lz4"
-version = "1.28.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a20b523e860d03443e98350ceaac5e71c6ba89aea7d960769ec3ce37f4de5af4"
-dependencies = [
- "lz4-sys",
-]
-
-[[package]]
-name = "lz4-sys"
-version = "1.11.1+lz4-1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bd8c0d6c6ed0cd30b3652886bb8711dc4bb01d637a68105a3d5158039b418e6"
-dependencies = [
- "cc",
- "libc",
-]
-
[[package]]
name = "mac"
version = "0.1.1"
@@ -10169,9 +10087,11 @@ dependencies = [
"sum_tree",
"text",
"theme",
+ "tracing",
"tree-sitter",
"util",
"zlog",
+ "ztracing",
]
[[package]]
@@ -10483,15 +10403,6 @@ name = "notify-types"
version = "2.0.0"
source = "git+https://github.com/zed-industries/notify.git?rev=b4588b2e5aee68f4c0e100f140e808cbce7b1419#b4588b2e5aee68f4c0e100f140e808cbce7b1419"
-[[package]]
-name = "now"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d89e9874397a1f0a52fc1f197a8effd9735223cb2390e9dcc83ac6cd02923d0"
-dependencies = [
- "chrono",
-]
-
[[package]]
name = "ntapi"
version = "0.4.1"
@@ -10887,41 +10798,6 @@ dependencies = [
"memchr",
]
-[[package]]
-name = "object_store"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c1be0c6c22ec0817cdc77d3842f721a17fd30ab6965001415b5402a74e6b740"
-dependencies = [
- "async-trait",
- "base64 0.22.1",
- "bytes 1.10.1",
- "chrono",
- "form_urlencoded",
- "futures 0.3.31",
- "http 1.3.1",
- "http-body-util",
- "humantime",
- "hyper 1.7.0",
- "itertools 0.14.0",
- "parking_lot",
- "percent-encoding",
- "quick-xml 0.38.3",
- "rand 0.9.2",
- "reqwest 0.12.24",
- "ring",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "thiserror 2.0.17",
- "tokio",
- "tracing",
- "url",
- "walkdir",
- "wasm-bindgen-futures",
- "web-time",
-]
-
[[package]]
name = "ollama"
version = "0.1.0"
@@ -12156,16 +12032,6 @@ version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
-[[package]]
-name = "planus"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3daf8e3d4b712abe1d690838f6e29fb76b76ea19589c4afa39ec30e12f62af71"
-dependencies = [
- "array-init-cursor",
- "hashbrown 0.15.5",
-]
-
[[package]]
name = "plist"
version = "1.8.0"
@@ -12234,544 +12100,30 @@ dependencies = [
]
[[package]]
-name = "polars"
-version = "0.51.0"
+name = "polling"
+version = "3.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5f7feb5d56b954e691dff22a8b2d78d77433dcc93c35fe21c3777fdc121b697"
+checksum = "5d0e4f59085d47d8241c88ead0f274e8a0cb551f3625263c05eb8dd897c34218"
dependencies = [
- "getrandom 0.2.16",
- "getrandom 0.3.4",
- "polars-arrow",
- "polars-core",
- "polars-error",
- "polars-io",
- "polars-lazy",
- "polars-ops",
- "polars-parquet",
- "polars-sql",
- "polars-time",
- "polars-utils",
- "version_check",
+ "cfg-if",
+ "concurrent-queue",
+ "hermit-abi",
+ "pin-project-lite",
+ "rustix 1.1.2",
+ "windows-sys 0.61.2",
]
[[package]]
-name = "polars-arrow"
-version = "0.51.0"
+name = "pollster"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5da3b0203fd7ee5720aa0b5e790b591aa5d3f41c3ed2c34a3a393382198af2f7"
+
+[[package]]
+name = "pori"
+version = "0.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32b4fed2343961b3eea3db2cee165540c3e1ad9d5782350cc55a9e76cf440148"
-dependencies = [
- "atoi_simd",
- "bitflags 2.9.4",
- "bytemuck",
- "chrono",
- "chrono-tz",
- "dyn-clone",
- "either",
- "ethnum",
- "getrandom 0.2.16",
- "getrandom 0.3.4",
- "hashbrown 0.15.5",
- "itoa",
- "lz4",
- "num-traits",
- "polars-arrow-format",
- "polars-error",
- "polars-schema",
- "polars-utils",
- "serde",
- "simdutf8",
- "streaming-iterator",
- "strum_macros 0.27.2",
- "version_check",
- "zstd 0.13.3",
-]
-
-[[package]]
-name = "polars-arrow-format"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a556ac0ee744e61e167f34c1eb0013ce740e0ee6cd8c158b2ec0b518f10e6675"
-dependencies = [
- "planus",
- "serde",
-]
-
-[[package]]
-name = "polars-compute"
-version = "0.51.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "138785beda4e4a90a025219f09d0d15a671b2be9091513ede58e05db6ad4413f"
-dependencies = [
- "atoi_simd",
- "bytemuck",
- "chrono",
- "either",
- "fast-float2",
- "hashbrown 0.15.5",
- "itoa",
- "num-traits",
- "polars-arrow",
- "polars-error",
- "polars-utils",
- "rand 0.9.2",
- "ryu",
- "serde",
- "skiplist",
- "strength_reduce",
- "strum_macros 0.27.2",
- "version_check",
-]
-
-[[package]]
-name = "polars-core"
-version = "0.51.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e77b1f08ef6dbb032bb1d0d3365464be950df9905f6827a95b24c4ca5518901d"
-dependencies = [
- "bitflags 2.9.4",
- "boxcar",
- "bytemuck",
- "chrono",
- "chrono-tz",
- "comfy-table",
- "either",
- "hashbrown 0.15.5",
- "indexmap",
- "itoa",
- "num-traits",
- "polars-arrow",
- "polars-compute",
- "polars-dtype",
- "polars-error",
- "polars-row",
- "polars-schema",
- "polars-utils",
- "rand 0.9.2",
- "rand_distr",
- "rayon",
- "regex",
- "serde",
- "serde_json",
- "strum_macros 0.27.2",
- "uuid",
- "version_check",
- "xxhash-rust",
-]
-
-[[package]]
-name = "polars-dtype"
-version = "0.51.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89c43d0ea57168be4546c4d8064479ed8b29a9c79c31a0c7c367ee734b9b7158"
-dependencies = [
- "boxcar",
- "hashbrown 0.15.5",
- "polars-arrow",
- "polars-error",
- "polars-utils",
- "serde",
- "uuid",
-]
-
-[[package]]
-name = "polars-error"
-version = "0.51.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9cb5d98f59f8b94673ee391840440ad9f0d2170afced95fc98aa86f895563c0"
-dependencies = [
- "object_store",
- "parking_lot",
- "polars-arrow-format",
- "regex",
- "signal-hook",
- "simdutf8",
-]
-
-[[package]]
-name = "polars-expr"
-version = "0.51.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "343931b818cf136349135ba11dbc18c27683b52c3477b1ba8ca606cf5ab1965c"
-dependencies = [
- "bitflags 2.9.4",
- "hashbrown 0.15.5",
- "num-traits",
- "polars-arrow",
- "polars-compute",
- "polars-core",
- "polars-io",
- "polars-ops",
- "polars-plan",
- "polars-row",
- "polars-time",
- "polars-utils",
- "rand 0.9.2",
- "rayon",
- "recursive",
-]
-
-[[package]]
-name = "polars-io"
-version = "0.51.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10388c64b8155122488229a881d1c6f4fdc393bc988e764ab51b182fcb2307e4"
-dependencies = [
- "async-trait",
- "atoi_simd",
- "blake3",
- "bytes 1.10.1",
- "chrono",
- "fast-float2",
- "fs4",
- "futures 0.3.31",
- "glob",
- "hashbrown 0.15.5",
- "home",
- "itoa",
- "memchr",
- "memmap2",
- "num-traits",
- "object_store",
- "percent-encoding",
- "polars-arrow",
- "polars-core",
- "polars-error",
- "polars-parquet",
- "polars-schema",
- "polars-time",
- "polars-utils",
- "rayon",
- "regex",
- "reqwest 0.12.24",
- "ryu",
- "serde",
- "serde_json",
- "simdutf8",
- "tokio",
- "tokio-util",
- "url",
-]
-
-[[package]]
-name = "polars-lazy"
-version = "0.51.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fb6e2c6c2fa4ea0c660df1c06cf56960c81e7c2683877995bae3d4e3d408147"
-dependencies = [
- "bitflags 2.9.4",
- "chrono",
- "either",
- "memchr",
- "polars-arrow",
- "polars-compute",
- "polars-core",
- "polars-expr",
- "polars-io",
- "polars-mem-engine",
- "polars-ops",
- "polars-plan",
- "polars-stream",
- "polars-time",
- "polars-utils",
- "rayon",
- "version_check",
-]
-
-[[package]]
-name = "polars-mem-engine"
-version = "0.51.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20a856e98e253587c28d8132a5e7e5a75cb2c44731ca090f1481d45f1d123771"
-dependencies = [
- "futures 0.3.31",
- "memmap2",
- "polars-arrow",
- "polars-core",
- "polars-error",
- "polars-expr",
- "polars-io",
- "polars-ops",
- "polars-plan",
- "polars-time",
- "polars-utils",
- "rayon",
- "recursive",
- "tokio",
-]
-
-[[package]]
-name = "polars-ops"
-version = "0.51.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acf6062173fdc9ba05775548beb66e76643a148d9aeadc9984ed712bc4babd76"
-dependencies = [
- "argminmax",
- "base64 0.22.1",
- "bytemuck",
- "chrono",
- "chrono-tz",
- "either",
- "hashbrown 0.15.5",
- "hex",
- "indexmap",
- "libm",
- "memchr",
- "num-traits",
- "polars-arrow",
- "polars-compute",
- "polars-core",
- "polars-error",
- "polars-schema",
- "polars-utils",
- "rayon",
- "regex",
- "regex-syntax",
- "strum_macros 0.27.2",
- "unicode-normalization",
- "unicode-reverse",
- "version_check",
-]
-
-[[package]]
-name = "polars-parquet"
-version = "0.51.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc1d769180dec070df0dc4b89299b364bf2cfe32b218ecc4ddd8f1a49ae60669"
-dependencies = [
- "async-stream",
- "base64 0.22.1",
- "brotli",
- "bytemuck",
- "ethnum",
- "flate2",
- "futures 0.3.31",
- "hashbrown 0.15.5",
- "lz4",
- "num-traits",
- "polars-arrow",
- "polars-compute",
- "polars-error",
- "polars-parquet-format",
- "polars-utils",
- "serde",
- "simdutf8",
- "snap",
- "streaming-decompression",
- "zstd 0.13.3",
-]
-
-[[package]]
-name = "polars-parquet-format"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c025243dcfe8dbc57e94d9f82eb3bef10b565ab180d5b99bed87fd8aea319ce1"
-dependencies = [
- "async-trait",
- "futures 0.3.31",
-]
-
-[[package]]
-name = "polars-plan"
-version = "0.51.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cd3a2e33ae4484fe407ab2d2ba5684f0889d1ccf3ad6b844103c03638e6d0a0"
-dependencies = [
- "bitflags 2.9.4",
- "bytemuck",
- "bytes 1.10.1",
- "chrono",
- "chrono-tz",
- "either",
- "futures 0.3.31",
- "hashbrown 0.15.5",
- "memmap2",
- "num-traits",
- "percent-encoding",
- "polars-arrow",
- "polars-compute",
- "polars-core",
- "polars-error",
- "polars-io",
- "polars-ops",
- "polars-parquet",
- "polars-time",
- "polars-utils",
- "rayon",
- "recursive",
- "regex",
- "sha2",
- "strum_macros 0.27.2",
- "version_check",
-]
-
-[[package]]
-name = "polars-row"
-version = "0.51.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18734f17e0e348724df3ae65f3ee744c681117c04b041cac969dfceb05edabc0"
-dependencies = [
- "bitflags 2.9.4",
- "bytemuck",
- "polars-arrow",
- "polars-compute",
- "polars-dtype",
- "polars-error",
- "polars-utils",
-]
-
-[[package]]
-name = "polars-schema"
-version = "0.51.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e6c1ab13e04d5167661a9854ed1ea0482b2ed9b8a0f1118dabed7cd994a85e3"
-dependencies = [
- "indexmap",
- "polars-error",
- "polars-utils",
- "serde",
- "version_check",
-]
-
-[[package]]
-name = "polars-sql"
-version = "0.51.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4e7766da02cc1d464994404d3e88a7a0ccd4933df3627c325480fbd9bbc0a11"
-dependencies = [
- "bitflags 2.9.4",
- "hex",
- "polars-core",
- "polars-error",
- "polars-lazy",
- "polars-ops",
- "polars-plan",
- "polars-time",
- "polars-utils",
- "rand 0.9.2",
- "regex",
- "serde",
- "sqlparser",
-]
-
-[[package]]
-name = "polars-stream"
-version = "0.51.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31f6c6ca1ea01f9dea424d167e4f33f5ec44cd67fbfac9efd40575ed20521f14"
-dependencies = [
- "async-channel 2.5.0",
- "async-trait",
- "atomic-waker",
- "bitflags 2.9.4",
- "crossbeam-channel",
- "crossbeam-deque",
- "crossbeam-queue",
- "crossbeam-utils",
- "futures 0.3.31",
- "memmap2",
- "parking_lot",
- "percent-encoding",
- "pin-project-lite",
- "polars-arrow",
- "polars-core",
- "polars-error",
- "polars-expr",
- "polars-io",
- "polars-mem-engine",
- "polars-ops",
- "polars-parquet",
- "polars-plan",
- "polars-utils",
- "rand 0.9.2",
- "rayon",
- "recursive",
- "slotmap",
- "tokio",
- "tokio-util",
- "version_check",
-]
-
-[[package]]
-name = "polars-time"
-version = "0.51.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6a3a6e279a7a984a0b83715660f9e880590c6129ec2104396bfa710bcd76dee"
-dependencies = [
- "atoi_simd",
- "bytemuck",
- "chrono",
- "chrono-tz",
- "now",
- "num-traits",
- "polars-arrow",
- "polars-compute",
- "polars-core",
- "polars-error",
- "polars-ops",
- "polars-utils",
- "rayon",
- "regex",
- "strum_macros 0.27.2",
-]
-
-[[package]]
-name = "polars-utils"
-version = "0.51.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57b267021b0e5422d7fbc70fd79e51b9f9a8466c585779373a18b0199e973f29"
-dependencies = [
- "bincode 2.0.1",
- "bytemuck",
- "bytes 1.10.1",
- "compact_str",
- "either",
- "flate2",
- "foldhash 0.1.5",
- "hashbrown 0.15.5",
- "indexmap",
- "libc",
- "memmap2",
- "num-traits",
- "polars-error",
- "rand 0.9.2",
- "raw-cpuid 11.6.0",
- "rayon",
- "regex",
- "rmp-serde",
- "serde",
- "serde_json",
- "serde_stacker",
- "slotmap",
- "stacker",
- "uuid",
- "version_check",
-]
-
-[[package]]
-name = "polling"
-version = "3.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d0e4f59085d47d8241c88ead0f274e8a0cb551f3625263c05eb8dd897c34218"
-dependencies = [
- "cfg-if",
- "concurrent-queue",
- "hermit-abi",
- "pin-project-lite",
- "rustix 1.1.2",
- "windows-sys 0.61.2",
-]
-
-[[package]]
-name = "pollster"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5da3b0203fd7ee5720aa0b5e790b591aa5d3f41c3ed2c34a3a393382198af2f7"
-
-[[package]]
-name = "pori"
-version = "0.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a63d338dec139f56dacc692ca63ad35a6be6a797442479b55acd611d79e906"
+checksum = "a4a63d338dec139f56dacc692ca63ad35a6be6a797442479b55acd611d79e906"
dependencies = [
"nom 7.1.3",
]
@@ -13088,6 +12440,7 @@ dependencies = [
"terminal",
"text",
"toml 0.8.23",
+ "tracing",
"unindent",
"url",
"util",
@@ -13097,6 +12450,7 @@ dependencies = [
"worktree",
"zeroize",
"zlog",
+ "ztracing",
]
[[package]]
@@ -13498,7 +12852,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "42a232e7487fc2ef313d96dde7948e7a3c05101870d8985e4fd8d26aedd27b89"
dependencies = [
"memchr",
- "serde",
]
[[package]]
@@ -13832,26 +13185,6 @@ dependencies = [
"zed_actions",
]
-[[package]]
-name = "recursive"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0786a43debb760f491b1bc0269fe5e84155353c67482b9e60d0cfb596054b43e"
-dependencies = [
- "recursive-proc-macro-impl",
- "stacker",
-]
-
-[[package]]
-name = "recursive-proc-macro-impl"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76009fbe0614077fc1a2ce255e3a1881a2e3a3527097d5dc6d8212c585e7e38b"
-dependencies = [
- "quote",
- "syn 2.0.106",
-]
-
[[package]]
name = "redox_syscall"
version = "0.2.16"
@@ -14208,35 +13541,26 @@ dependencies = [
"futures-channel",
"futures-core",
"futures-util",
- "h2 0.4.12",
"http 1.3.1",
"http-body 1.0.1",
"http-body-util",
"hyper 1.7.0",
- "hyper-rustls 0.27.7",
"hyper-util",
"js-sys",
"log",
"percent-encoding",
"pin-project-lite",
- "quinn",
- "rustls 0.23.33",
- "rustls-native-certs 0.8.2",
- "rustls-pki-types",
"serde",
"serde_json",
"serde_urlencoded",
"sync_wrapper 1.0.2",
"tokio",
- "tokio-rustls 0.26.2",
- "tokio-util",
"tower 0.5.2",
"tower-http 0.6.6",
"tower-service",
"url",
"wasm-bindgen",
"wasm-bindgen-futures",
- "wasm-streams",
"web-sys",
]
@@ -14359,17 +13683,6 @@ dependencies = [
"paste",
]
-[[package]]
-name = "rmp-serde"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db"
-dependencies = [
- "byteorder",
- "rmp",
- "serde",
-]
-
[[package]]
name = "rmpv"
version = "1.3.0"
@@ -14406,9 +13719,11 @@ dependencies = [
"rand 0.9.2",
"rayon",
"sum_tree",
+ "tracing",
"unicode-segmentation",
"util",
"zlog",
+ "ztracing",
]
[[package]]
@@ -14439,7 +13754,7 @@ dependencies = [
"tracing",
"util",
"zlog",
- "zstd 0.11.2+zstd.1.5.2",
+ "zstd",
]
[[package]]
@@ -15323,23 +14638,12 @@ dependencies = [
]
[[package]]
-name = "serde_spanned"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e24345aa0fe688594e73770a5f6d1b216508b4f93484c0026d521acd30134392"
-dependencies = [
- "serde_core",
-]
-
-[[package]]
-name = "serde_stacker"
-version = "0.1.14"
+name = "serde_spanned"
+version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4936375d50c4be7eff22293a9344f8e46f323ed2b3c243e52f89138d9bb0f4a"
+checksum = "e24345aa0fe688594e73770a5f6d1b216508b4f93484c0026d521acd30134392"
dependencies = [
- "serde",
"serde_core",
- "stacker",
]
[[package]]
@@ -15683,16 +14987,6 @@ version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
-[[package]]
-name = "skiplist"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f354fd282d3177c2951004953e2fdc4cb342fa159bbee8b829852b6a081c8ea1"
-dependencies = [
- "rand 0.9.2",
- "thiserror 2.0.17",
-]
-
[[package]]
name = "skrifa"
version = "0.37.0"
@@ -15768,12 +15062,6 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead"
-[[package]]
-name = "snap"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b6b67fb9a61334225b5b790716f609cd58395f895b3fe8b328786812a40bc3b"
-
[[package]]
name = "snippet"
version = "0.1.0"
@@ -15820,26 +15108,6 @@ dependencies = [
"workspace",
]
-[[package]]
-name = "soa-rs"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b75ae4668062b095fda87ba54118697bed601f07f6c68bf50289a25ca0c8c935"
-dependencies = [
- "soa-rs-derive",
-]
-
-[[package]]
-name = "soa-rs-derive"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c09121507da587d3434e5929ce3321162f36bd3eff403873cb163c06b176913"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.106",
-]
-
[[package]]
name = "socket2"
version = "0.5.10"
@@ -15959,15 +15227,6 @@ dependencies = [
"unicode_categories",
]
-[[package]]
-name = "sqlparser"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05a528114c392209b3264855ad491fcce534b94a38771b0a0b97a79379275ce8"
-dependencies = [
- "log",
-]
-
[[package]]
name = "sqlx"
version = "0.8.6"
@@ -16269,15 +15528,6 @@ dependencies = [
"ui",
]
-[[package]]
-name = "streaming-decompression"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf6cc3b19bfb128a8ad11026086e31d3ce9ad23f8ea37354b31383a187c44cf3"
-dependencies = [
- "fallible-streaming-iterator",
-]
-
[[package]]
name = "streaming-iterator"
version = "0.1.9"
@@ -16409,7 +15659,9 @@ dependencies = [
"log",
"rand 0.9.2",
"rayon",
+ "tracing",
"zlog",
+ "ztracing",
]
[[package]]
@@ -16419,7 +15671,7 @@ dependencies = [
"anyhow",
"client",
"collections",
- "edit_prediction",
+ "edit_prediction_types",
"editor",
"env_logger 0.11.8",
"futures 0.3.31",
@@ -17663,7 +16915,6 @@ dependencies = [
"futures-core",
"futures-io",
"futures-sink",
- "futures-util",
"pin-project-lite",
"tokio",
]
@@ -17895,9 +17146,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
[[package]]
name = "tracing"
-version = "0.1.41"
+version = "0.1.43"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
+checksum = "2d15d90a0b5c19378952d479dc858407149d7bb45a14de0142f6c534b16fc647"
dependencies = [
"log",
"pin-project-lite",
@@ -17907,9 +17158,9 @@ dependencies = [
[[package]]
name = "tracing-attributes"
-version = "0.1.30"
+version = "0.1.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903"
+checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da"
dependencies = [
"proc-macro2",
"quote",
@@ -17918,9 +17169,9 @@ dependencies = [
[[package]]
name = "tracing-core"
-version = "0.1.34"
+version = "0.1.35"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678"
+checksum = "7a04e24fab5c89c6a36eb8558c9656f30d81de51dfa4d3b45f26b21d61fa0a6c"
dependencies = [
"once_cell",
"valuable",
@@ -17949,9 +17200,9 @@ dependencies = [
[[package]]
name = "tracing-subscriber"
-version = "0.3.20"
+version = "0.3.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2054a14f5307d601f88daf0553e1cbf472acc4f2c51afab632431cdcd72124d5"
+checksum = "2f30143827ddab0d256fd843b7a66d164e9f271cfa0dde49142c5ca0ca291f1e"
dependencies = [
"matchers",
"nu-ansi-term",
@@ -17968,6 +17219,38 @@ dependencies = [
"tracing-serde",
]
+[[package]]
+name = "tracing-tracy"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eaa1852afa96e0fe9e44caa53dc0bd2d9d05e0f2611ce09f97f8677af56e4ba"
+dependencies = [
+ "tracing-core",
+ "tracing-subscriber",
+ "tracy-client",
+]
+
+[[package]]
+name = "tracy-client"
+version = "0.18.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91d722a05fe49b31fef971c4732a7d4aa6a18283d9ba46abddab35f484872947"
+dependencies = [
+ "loom",
+ "once_cell",
+ "tracy-client-sys",
+]
+
+[[package]]
+name = "tracy-client-sys"
+version = "0.27.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2fb391ac70462b3097a755618fbf9c8f95ecc1eb379a414f7b46f202ed10db1f"
+dependencies = [
+ "cc",
+ "windows-targets 0.52.6",
+]
+
[[package]]
name = "trait-variant"
version = "0.1.2"
@@ -18519,15 +17802,6 @@ version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0"
-[[package]]
-name = "unicode-reverse"
-version = "1.0.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b6f4888ebc23094adfb574fdca9fdc891826287a6397d2cd28802ffd6f20c76"
-dependencies = [
- "unicode-segmentation",
-]
-
[[package]]
name = "unicode-script"
version = "0.5.7"
@@ -18588,12 +17862,6 @@ version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
-[[package]]
-name = "unty"
-version = "0.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d49784317cd0d1ee7ec5c716dd598ec5b4483ea832a2dced265471cc0f690ae"
-
[[package]]
name = "url"
version = "2.5.7"
@@ -18869,12 +18137,6 @@ dependencies = [
"settings",
]
-[[package]]
-name = "virtue"
-version = "0.0.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "051eb1abcf10076295e815102942cc58f9d5e3b4560e46e53c21e8ff6f3af7b1"
-
[[package]]
name = "vscode_theme"
version = "0.2.0"
@@ -21030,12 +20292,6 @@ dependencies = [
"toml_edit 0.22.27",
]
-[[package]]
-name = "xxhash-rust"
-version = "0.8.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdd20c5420375476fbd4394763288da7eb0cc0b8c11deed431a91562af7335d3"
-
[[package]]
name = "yaml-rust2"
version = "0.8.1"
@@ -21223,7 +20479,7 @@ dependencies = [
"audio",
"auto_update",
"auto_update_ui",
- "bincode 1.3.3",
+ "bincode",
"breadcrumbs",
"call",
"channel",
@@ -21245,7 +20501,8 @@ dependencies = [
"debugger_tools",
"debugger_ui",
"diagnostics",
- "edit_prediction_button",
+ "edit_prediction",
+ "edit_prediction_ui",
"editor",
"env_logger 0.11.8",
"extension",
@@ -21336,6 +20593,7 @@ dependencies = [
"time",
"title_bar",
"toolchain_selector",
+ "tracing",
"tree-sitter-md",
"tree-sitter-rust",
"ui",
@@ -21356,10 +20614,9 @@ dependencies = [
"zed-reqwest",
"zed_actions",
"zed_env_vars",
- "zeta",
- "zeta2_tools",
"zlog",
"zlog_settings",
+ "ztracing",
]
[[package]]
@@ -21669,151 +20926,6 @@ dependencies = [
"syn 2.0.106",
]
-[[package]]
-name = "zeta"
-version = "0.1.0"
-dependencies = [
- "ai_onboarding",
- "anyhow",
- "arrayvec",
- "brotli",
- "buffer_diff",
- "client",
- "clock",
- "cloud_api_types",
- "cloud_llm_client",
- "cloud_zeta2_prompt",
- "collections",
- "command_palette_hooks",
- "copilot",
- "credentials_provider",
- "ctor",
- "db",
- "edit_prediction",
- "edit_prediction_context",
- "editor",
- "feature_flags",
- "fs",
- "futures 0.3.31",
- "gpui",
- "indoc",
- "itertools 0.14.0",
- "language",
- "language_model",
- "log",
- "lsp",
- "markdown",
- "menu",
- "open_ai",
- "parking_lot",
- "postage",
- "pretty_assertions",
- "project",
- "rand 0.9.2",
- "regex",
- "release_channel",
- "semver",
- "serde",
- "serde_json",
- "settings",
- "smol",
- "strsim",
- "strum 0.27.2",
- "telemetry",
- "telemetry_events",
- "theme",
- "thiserror 2.0.17",
- "ui",
- "util",
- "uuid",
- "workspace",
- "worktree",
- "zed_actions",
- "zlog",
-]
-
-[[package]]
-name = "zeta2_tools"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "clap",
- "client",
- "cloud_llm_client",
- "cloud_zeta2_prompt",
- "collections",
- "edit_prediction_context",
- "editor",
- "feature_flags",
- "futures 0.3.31",
- "gpui",
- "indoc",
- "language",
- "multi_buffer",
- "pretty_assertions",
- "project",
- "serde",
- "serde_json",
- "settings",
- "telemetry",
- "text",
- "ui",
- "ui_input",
- "util",
- "workspace",
- "zeta",
- "zlog",
-]
-
-[[package]]
-name = "zeta_cli"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "chrono",
- "clap",
- "client",
- "cloud_llm_client",
- "cloud_zeta2_prompt",
- "collections",
- "debug_adapter_extension",
- "edit_prediction_context",
- "extension",
- "fs",
- "futures 0.3.31",
- "gpui",
- "gpui_tokio",
- "indoc",
- "language",
- "language_extension",
- "language_model",
- "language_models",
- "languages",
- "log",
- "node_runtime",
- "ordered-float 2.10.1",
- "paths",
- "polars",
- "pretty_assertions",
- "project",
- "prompt_store",
- "pulldown-cmark 0.12.2",
- "release_channel",
- "reqwest_client",
- "serde",
- "serde_json",
- "settings",
- "shellexpand 2.1.2",
- "smol",
- "soa-rs",
- "terminal_view",
- "toml 0.8.23",
- "util",
- "watch",
- "zeta",
- "zlog",
-]
-
[[package]]
name = "zip"
version = "0.6.6"
@@ -21823,7 +20935,7 @@ dependencies = [
"aes",
"byteorder",
"bzip2",
- "constant_time_eq 0.1.5",
+ "constant_time_eq",
"crc32fast",
"crossbeam-utils",
"flate2",
@@ -21831,7 +20943,7 @@ dependencies = [
"pbkdf2 0.11.0",
"sha1",
"time",
- "zstd 0.11.2+zstd.1.5.2",
+ "zstd",
]
[[package]]
@@ -21849,12 +20961,6 @@ dependencies = [
"thiserror 1.0.69",
]
-[[package]]
-name = "zlib-rs"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f06ae92f42f5e5c42443fd094f245eb656abf56dd7cce9b8b263236565e00f2"
-
[[package]]
name = "zlog"
version = "0.1.0"
@@ -21882,16 +20988,7 @@ version = "0.11.2+zstd.1.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4"
dependencies = [
- "zstd-safe 5.0.2+zstd.1.5.2",
-]
-
-[[package]]
-name = "zstd"
-version = "0.13.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e91ee311a569c327171651566e07972200e76fcfe2242a4fa446149a3881c08a"
-dependencies = [
- "zstd-safe 7.2.4",
+ "zstd-safe",
]
[[package]]
@@ -21904,15 +21001,6 @@ dependencies = [
"zstd-sys",
]
-[[package]]
-name = "zstd-safe"
-version = "7.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f49c4d5f0abb602a93fb8736af2a4f4dd9512e36f7f570d66e65ff867ed3b9d"
-dependencies = [
- "zstd-sys",
-]
-
[[package]]
name = "zstd-sys"
version = "2.0.16+zstd.1.5.7"
@@ -21923,6 +21011,20 @@ dependencies = [
"pkg-config",
]
+[[package]]
+name = "ztracing"
+version = "0.1.0"
+dependencies = [
+ "tracing",
+ "tracing-subscriber",
+ "tracing-tracy",
+ "ztracing_macro",
+]
+
+[[package]]
+name = "ztracing_macro"
+version = "0.1.0"
+
[[package]]
name = "zune-core"
version = "0.4.12"
diff --git a/Cargo.toml b/Cargo.toml
index 59b9a53d4a60b28582625fb90b64b934079cdc40..0ad4d2b14523988aa0dd6e3bfc935f84bcd0d8d9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -54,9 +54,9 @@ members = [
"crates/diagnostics",
"crates/docs_preprocessor",
"crates/edit_prediction",
- "crates/edit_prediction_button",
+ "crates/edit_prediction_types",
+ "crates/edit_prediction_ui",
"crates/edit_prediction_context",
- "crates/zeta2_tools",
"crates/editor",
"crates/eval",
"crates/eval_utils",
@@ -201,10 +201,11 @@ members = [
"crates/zed",
"crates/zed_actions",
"crates/zed_env_vars",
- "crates/zeta",
- "crates/zeta_cli",
+ "crates/edit_prediction_cli",
"crates/zlog",
"crates/zlog_settings",
+ "crates/ztracing",
+ "crates/ztracing_macro",
#
# Extensions
@@ -243,7 +244,6 @@ activity_indicator = { path = "crates/activity_indicator" }
agent_ui = { path = "crates/agent_ui" }
agent_settings = { path = "crates/agent_settings" }
agent_servers = { path = "crates/agent_servers" }
-ai = { path = "crates/ai" }
ai_onboarding = { path = "crates/ai_onboarding" }
anthropic = { path = "crates/anthropic" }
askpass = { path = "crates/askpass" }
@@ -253,7 +253,6 @@ assistant_slash_command = { path = "crates/assistant_slash_command" }
assistant_slash_commands = { path = "crates/assistant_slash_commands" }
audio = { path = "crates/audio" }
auto_update = { path = "crates/auto_update" }
-auto_update_helper = { path = "crates/auto_update_helper" }
auto_update_ui = { path = "crates/auto_update_ui" }
aws_http_client = { path = "crates/aws_http_client" }
bedrock = { path = "crates/bedrock" }
@@ -268,7 +267,6 @@ cloud_api_client = { path = "crates/cloud_api_client" }
cloud_api_types = { path = "crates/cloud_api_types" }
cloud_llm_client = { path = "crates/cloud_llm_client" }
cloud_zeta2_prompt = { path = "crates/cloud_zeta2_prompt" }
-collab = { path = "crates/collab" }
collab_ui = { path = "crates/collab_ui" }
collections = { path = "crates/collections", version = "0.1.0" }
command_palette = { path = "crates/command_palette" }
@@ -313,10 +311,9 @@ http_client = { path = "crates/http_client" }
http_client_tls = { path = "crates/http_client_tls" }
icons = { path = "crates/icons" }
image_viewer = { path = "crates/image_viewer" }
-edit_prediction = { path = "crates/edit_prediction" }
-edit_prediction_button = { path = "crates/edit_prediction_button" }
+edit_prediction_types = { path = "crates/edit_prediction_types" }
+edit_prediction_ui = { path = "crates/edit_prediction_ui" }
edit_prediction_context = { path = "crates/edit_prediction_context" }
-zeta2_tools = { path = "crates/zeta2_tools" }
inspector_ui = { path = "crates/inspector_ui" }
install_cli = { path = "crates/install_cli" }
journal = { path = "crates/journal" }
@@ -358,8 +355,6 @@ panel = { path = "crates/panel" }
paths = { path = "crates/paths" }
perf = { path = "tooling/perf" }
picker = { path = "crates/picker" }
-plugin = { path = "crates/plugin" }
-plugin_macros = { path = "crates/plugin_macros" }
prettier = { path = "crates/prettier" }
settings_profile_selector = { path = "crates/settings_profile_selector" }
project = { path = "crates/project" }
@@ -370,12 +365,10 @@ proto = { path = "crates/proto" }
recent_projects = { path = "crates/recent_projects" }
refineable = { path = "crates/refineable" }
release_channel = { path = "crates/release_channel" }
-scheduler = { path = "crates/scheduler" }
remote = { path = "crates/remote" }
remote_server = { path = "crates/remote_server" }
repl = { path = "crates/repl" }
reqwest_client = { path = "crates/reqwest_client" }
-rich_text = { path = "crates/rich_text" }
rodio = { git = "https://github.com/RustAudio/rodio", rev ="e2074c6c2acf07b57cf717e076bdda7a9ac6e70b", features = ["wav", "playback", "wav_output", "recording"] }
rope = { path = "crates/rope" }
rpc = { path = "crates/rpc" }
@@ -392,7 +385,6 @@ snippets_ui = { path = "crates/snippets_ui" }
sqlez = { path = "crates/sqlez" }
sqlez_macros = { path = "crates/sqlez_macros" }
story = { path = "crates/story" }
-storybook = { path = "crates/storybook" }
streaming_diff = { path = "crates/streaming_diff" }
sum_tree = { path = "crates/sum_tree" }
supermaven = { path = "crates/supermaven" }
@@ -409,7 +401,6 @@ terminal_view = { path = "crates/terminal_view" }
text = { path = "crates/text" }
theme = { path = "crates/theme" }
theme_extension = { path = "crates/theme_extension" }
-theme_importer = { path = "crates/theme_importer" }
theme_selector = { path = "crates/theme_selector" }
time_format = { path = "crates/time_format" }
title_bar = { path = "crates/title_bar" }
@@ -433,15 +424,17 @@ x_ai = { path = "crates/x_ai" }
zed = { path = "crates/zed" }
zed_actions = { path = "crates/zed_actions" }
zed_env_vars = { path = "crates/zed_env_vars" }
-zeta = { path = "crates/zeta" }
+edit_prediction = { path = "crates/edit_prediction" }
zlog = { path = "crates/zlog" }
zlog_settings = { path = "crates/zlog_settings" }
+ztracing = { path = "crates/ztracing" }
+ztracing_macro = { path = "crates/ztracing_macro" }
#
# External crates
#
-agent-client-protocol = { version = "=0.8.0", features = ["unstable"] }
+agent-client-protocol = { version = "=0.9.0", features = ["unstable"] }
aho-corasick = "1.1"
alacritty_terminal = "0.25.1-rc1"
any_vec = "0.14"
@@ -508,13 +501,11 @@ exec = "0.3.1"
fancy-regex = "0.16.0"
fork = "0.4.0"
futures = "0.3"
-futures-batch = "0.6.1"
futures-lite = "1.13"
gh-workflow = { git = "https://github.com/zed-industries/gh-workflow", rev = "09acfdf2bd5c1d6254abefd609c808ff73547b2c" }
git2 = { version = "0.20.1", default-features = false }
globset = "0.4"
handlebars = "4.3"
-hashbrown = "0.15.3"
heck = "0.5"
heed = { version = "0.21.0", features = ["read-txn-no-tls"] }
hex = "0.4.3"
@@ -550,7 +541,6 @@ nanoid = "0.4"
nbformat = "0.15.0"
nix = "0.29"
num-format = "0.4.4"
-num-traits = "0.2"
objc = "0.2"
objc2-foundation = { version = "=0.3.1", default-features = false, features = [
"NSArray",
@@ -589,7 +579,6 @@ pet = { git = "https://github.com/microsoft/python-environment-tools.git", rev =
pet-conda = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da" }
pet-core = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da" }
pet-fs = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da" }
-pet-pixi = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da" }
pet-poetry = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da" }
pet-reporter = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da" }
pet-virtualenv = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "1e86914c3ce2f3a08c0cedbcb0615a7f9fa7a5da" }
@@ -629,7 +618,6 @@ scap = { git = "https://github.com/zed-industries/scap", rev = "4afea48c3b002197
schemars = { version = "1.0", features = ["indexmap2"] }
semver = { version = "1.0", features = ["serde"] }
serde = { version = "1.0.221", features = ["derive", "rc"] }
-serde_derive = "1.0.221"
serde_json = { version = "1.0.144", features = ["preserve_order", "raw_value"] }
serde_json_lenient = { version = "0.2", features = [
"preserve_order",
@@ -641,7 +629,6 @@ serde_urlencoded = "0.7"
sha2 = "0.10"
shellexpand = "2.1.0"
shlex = "1.3.0"
-similar = "2.6"
simplelog = "0.12.2"
slotmap = "1.0.6"
smallvec = { version = "1.6", features = ["union"] }
@@ -696,6 +683,7 @@ tree-sitter-ruby = "0.23"
tree-sitter-rust = "0.24"
tree-sitter-typescript = { git = "https://github.com/zed-industries/tree-sitter-typescript", rev = "e2c53597d6a5d9cf7bbe8dccde576fe1e46c5899" } # https://github.com/tree-sitter/tree-sitter-typescript/pull/347
tree-sitter-yaml = { git = "https://github.com/zed-industries/tree-sitter-yaml", rev = "baff0b51c64ef6a1fb1f8390f3ad6015b83ec13a" }
+tracing = "0.1.40"
unicase = "2.6"
unicode-script = "0.5.7"
unicode-segmentation = "1.10"
@@ -719,7 +707,6 @@ wasmtime-wasi = "29"
wax = "0.6"
which = "6.0.0"
windows-core = "0.61"
-wit-component = "0.221"
yawc = "0.2.5"
zeroize = "1.8"
zstd = "0.11"
@@ -801,20 +788,13 @@ settings_macros = { opt-level = 3 }
sqlez_macros = { opt-level = 3, codegen-units = 1 }
ui_macros = { opt-level = 3 }
util_macros = { opt-level = 3 }
-serde_derive = { opt-level = 3 }
quote = { opt-level = 3 }
syn = { opt-level = 3 }
proc-macro2 = { opt-level = 3 }
# proc-macros end
taffy = { opt-level = 3 }
-cranelift-codegen = { opt-level = 3 }
-cranelift-codegen-meta = { opt-level = 3 }
-cranelift-codegen-shared = { opt-level = 3 }
resvg = { opt-level = 3 }
-rustybuzz = { opt-level = 3 }
-ttf-parser = { opt-level = 3 }
-wasmtime-cranelift = { opt-level = 3 }
wasmtime = { opt-level = 3 }
# Build single-source-file crates with cg=1 as it helps make `cargo build` of a whole workspace a bit faster
activity_indicator = { codegen-units = 1 }
@@ -823,12 +803,11 @@ breadcrumbs = { codegen-units = 1 }
collections = { codegen-units = 1 }
command_palette = { codegen-units = 1 }
command_palette_hooks = { codegen-units = 1 }
-extension_cli = { codegen-units = 1 }
feature_flags = { codegen-units = 1 }
file_icons = { codegen-units = 1 }
fsevent = { codegen-units = 1 }
image_viewer = { codegen-units = 1 }
-edit_prediction_button = { codegen-units = 1 }
+edit_prediction_ui = { codegen-units = 1 }
install_cli = { codegen-units = 1 }
journal = { codegen-units = 1 }
json_schema_store = { codegen-units = 1 }
@@ -843,7 +822,6 @@ project_symbols = { codegen-units = 1 }
refineable = { codegen-units = 1 }
release_channel = { codegen-units = 1 }
reqwest_client = { codegen-units = 1 }
-rich_text = { codegen-units = 1 }
session = { codegen-units = 1 }
snippet = { codegen-units = 1 }
snippets_ui = { codegen-units = 1 }
diff --git a/assets/icons/git_branch_plus.svg b/assets/icons/git_branch_plus.svg
new file mode 100644
index 0000000000000000000000000000000000000000..cf60ce66b4086ba57ef4c2e56f3554d548e863fc
--- /dev/null
+++ b/assets/icons/git_branch_plus.svg
@@ -0,0 +1,8 @@
+
diff --git a/assets/icons/inception.svg b/assets/icons/inception.svg
new file mode 100644
index 0000000000000000000000000000000000000000..77a96c0b390ab9f2fe89143c2a89ba916000fabc
--- /dev/null
+++ b/assets/icons/inception.svg
@@ -0,0 +1,11 @@
+
diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json
index 5de5b9daae27113807cb6e97eda335a419f18ac9..54a4f331c0b0c59eca79065fe42c1a8ecbf646b7 100644
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -41,7 +41,7 @@
"ctrl-f11": "debugger::StepInto",
"shift-f11": "debugger::StepOut",
"f11": "zed::ToggleFullScreen",
- "ctrl-alt-z": "edit_prediction::RateCompletions",
+ "ctrl-alt-z": "edit_prediction::RatePredictions",
"ctrl-alt-shift-i": "edit_prediction::ToggleMenu",
"ctrl-alt-l": "lsp_tool::ToggleMenu"
}
@@ -616,8 +616,8 @@
"ctrl-alt-super-p": "settings_profile_selector::Toggle",
"ctrl-t": "project_symbols::Toggle",
"ctrl-p": "file_finder::Toggle",
- "ctrl-tab": "tab_switcher::Toggle",
"ctrl-shift-tab": ["tab_switcher::Toggle", { "select_last": true }],
+ "ctrl-tab": "tab_switcher::Toggle",
"ctrl-e": "file_finder::Toggle",
"f1": "command_palette::Toggle",
"ctrl-shift-p": "command_palette::Toggle",
@@ -1322,25 +1322,18 @@
}
},
{
- "context": "Zeta2Feedback > Editor",
- "bindings": {
- "enter": "editor::Newline",
- "ctrl-enter up": "dev::Zeta2RatePredictionPositive",
- "ctrl-enter down": "dev::Zeta2RatePredictionNegative"
- }
- },
- {
- "context": "Zeta2Context > Editor",
+ "context": "EditPredictionContext > Editor",
"bindings": {
- "alt-left": "dev::Zeta2ContextGoBack",
- "alt-right": "dev::Zeta2ContextGoForward"
+ "alt-left": "dev::EditPredictionContextGoBack",
+ "alt-right": "dev::EditPredictionContextGoForward"
}
},
{
"context": "GitBranchSelector || (GitBranchSelector > Picker > Editor)",
"use_key_equivalents": true,
"bindings": {
- "ctrl-shift-backspace": "branch_picker::DeleteBranch"
+ "ctrl-shift-backspace": "branch_picker::DeleteBranch",
+ "ctrl-shift-i": "branch_picker::FilterRemotes"
}
}
]
diff --git a/assets/keymaps/default-macos.json b/assets/keymaps/default-macos.json
index 2fadafb6ca95f81de28165b23e4063dc7a0c38d8..060151c647e42370f5aa0be5d2fa186774c2574d 100644
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -47,7 +47,7 @@
"cmd-m": "zed::Minimize",
"fn-f": "zed::ToggleFullScreen",
"ctrl-cmd-f": "zed::ToggleFullScreen",
- "ctrl-cmd-z": "edit_prediction::RateCompletions",
+ "ctrl-cmd-z": "edit_prediction::RatePredictions",
"ctrl-cmd-i": "edit_prediction::ToggleMenu",
"ctrl-cmd-l": "lsp_tool::ToggleMenu",
"ctrl-cmd-c": "editor::DisplayCursorNames"
@@ -684,8 +684,8 @@
"ctrl-alt-cmd-p": "settings_profile_selector::Toggle",
"cmd-t": "project_symbols::Toggle",
"cmd-p": "file_finder::Toggle",
- "ctrl-tab": "tab_switcher::Toggle",
"ctrl-shift-tab": ["tab_switcher::Toggle", { "select_last": true }],
+ "ctrl-tab": "tab_switcher::Toggle",
"cmd-shift-p": "command_palette::Toggle",
"cmd-shift-m": "diagnostics::Deploy",
"cmd-shift-e": "project_panel::ToggleFocus",
@@ -1427,25 +1427,18 @@
}
},
{
- "context": "Zeta2Feedback > Editor",
- "bindings": {
- "enter": "editor::Newline",
- "cmd-enter up": "dev::Zeta2RatePredictionPositive",
- "cmd-enter down": "dev::Zeta2RatePredictionNegative"
- }
- },
- {
- "context": "Zeta2Context > Editor",
+ "context": "EditPredictionContext > Editor",
"bindings": {
- "alt-left": "dev::Zeta2ContextGoBack",
- "alt-right": "dev::Zeta2ContextGoForward"
+ "alt-left": "dev::EditPredictionContextGoBack",
+ "alt-right": "dev::EditPredictionContextGoForward"
}
},
{
"context": "GitBranchSelector || (GitBranchSelector > Picker > Editor)",
"use_key_equivalents": true,
"bindings": {
- "cmd-shift-backspace": "branch_picker::DeleteBranch"
+ "cmd-shift-backspace": "branch_picker::DeleteBranch",
+ "cmd-shift-i": "branch_picker::FilterRemotes"
}
}
]
diff --git a/assets/keymaps/default-windows.json b/assets/keymaps/default-windows.json
index 8cf77f65813701fd42e3a6948b660368a24fd4e4..d749ac56886860b0e80de27f942082639df0447b 100644
--- a/assets/keymaps/default-windows.json
+++ b/assets/keymaps/default-windows.json
@@ -24,7 +24,8 @@
"ctrl-alt-enter": ["picker::ConfirmInput", { "secondary": true }],
"ctrl-shift-w": "workspace::CloseWindow",
"shift-escape": "workspace::ToggleZoom",
- "ctrl-o": "workspace::Open",
+ "ctrl-o": "workspace::OpenFiles",
+ "ctrl-k ctrl-o": "workspace::Open",
"ctrl-=": ["zed::IncreaseBufferFontSize", { "persist": false }],
"ctrl-shift-=": ["zed::IncreaseBufferFontSize", { "persist": false }],
"ctrl--": ["zed::DecreaseBufferFontSize", { "persist": false }],
@@ -608,8 +609,8 @@
"ctrl-alt-super-p": "settings_profile_selector::Toggle",
"ctrl-t": "project_symbols::Toggle",
"ctrl-p": "file_finder::Toggle",
- "ctrl-tab": "tab_switcher::Toggle",
"ctrl-shift-tab": ["tab_switcher::Toggle", { "select_last": true }],
+ "ctrl-tab": "tab_switcher::Toggle",
"ctrl-e": "file_finder::Toggle",
"f1": "command_palette::Toggle",
"ctrl-shift-p": "command_palette::Toggle",
@@ -1128,6 +1129,8 @@
"ctrl-e": ["terminal::SendKeystroke", "ctrl-e"],
"ctrl-o": ["terminal::SendKeystroke", "ctrl-o"],
"ctrl-w": ["terminal::SendKeystroke", "ctrl-w"],
+ "ctrl-q": ["terminal::SendKeystroke", "ctrl-q"],
+ "ctrl-r": ["terminal::SendKeystroke", "ctrl-r"],
"ctrl-backspace": ["terminal::SendKeystroke", "ctrl-w"],
"ctrl-shift-a": "editor::SelectAll",
"ctrl-shift-f": "buffer_search::Deploy",
@@ -1341,25 +1344,18 @@
}
},
{
- "context": "Zeta2Feedback > Editor",
- "bindings": {
- "enter": "editor::Newline",
- "ctrl-enter up": "dev::Zeta2RatePredictionPositive",
- "ctrl-enter down": "dev::Zeta2RatePredictionNegative"
- }
- },
- {
- "context": "Zeta2Context > Editor",
+ "context": "EditPredictionContext > Editor",
"bindings": {
- "alt-left": "dev::Zeta2ContextGoBack",
- "alt-right": "dev::Zeta2ContextGoForward"
+ "alt-left": "dev::EditPredictionContextGoBack",
+ "alt-right": "dev::EditPredictionContextGoForward"
}
},
{
"context": "GitBranchSelector || (GitBranchSelector > Picker > Editor)",
"use_key_equivalents": true,
"bindings": {
- "ctrl-shift-backspace": "branch_picker::DeleteBranch"
+ "ctrl-shift-backspace": "branch_picker::DeleteBranch",
+ "ctrl-shift-i": "branch_picker::FilterRemotes"
}
}
]
diff --git a/assets/prompts/content_prompt_v2.hbs b/assets/prompts/content_prompt_v2.hbs
new file mode 100644
index 0000000000000000000000000000000000000000..e1b6ddc6f023e9e97c9bb851473ac02e989c8feb
--- /dev/null
+++ b/assets/prompts/content_prompt_v2.hbs
@@ -0,0 +1,44 @@
+{{#if language_name}}
+Here's a file of {{language_name}} that the user is going to ask you to make an edit to.
+{{else}}
+Here's a file of text that the user is going to ask you to make an edit to.
+{{/if}}
+
+The section you'll need to rewrite is marked with tags.
+
+
+{{{document_content}}}
+
+
+{{#if is_truncated}}
+The context around the relevant section has been truncated (possibly in the middle of a line) for brevity.
+{{/if}}
+
+{{#if rewrite_section}}
+And here's the section to rewrite based on that prompt again for reference:
+
+
+{{{rewrite_section}}}
+
+
+{{#if diagnostic_errors}}
+Below are the diagnostic errors visible to the user. If the user requests problems to be fixed, use this information, but do not try to fix these errors if the user hasn't asked you to.
+
+{{#each diagnostic_errors}}
+
+ {{line_number}}
+ {{error_message}}
+ {{code_content}}
+
+{{/each}}
+{{/if}}
+
+{{/if}}
+
+Only make changes that are necessary to fulfill the prompt, leave everything else as-is. All surrounding {{content_type}} will be preserved.
+
+Start at the indentation level in the original file in the rewritten {{content_type}}.
+
+You must use one of the provided tools to make the rewrite or to provide an explanation as to why the user's request cannot be fulfilled. It is an error if
+you simply send back unstructured text. If you need to make a statement or ask a question you must use one of the tools to do so.
+It is an error if you try to make a change that cannot be made simply by editing the rewrite_section.
diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index 9c7590ccd6c5871c4db72b89eff344b3eca877a7..b96ef1d898086a0b4b9336a21d1d8369fea4ad6c 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -2929,7 +2929,7 @@ mod tests {
.await
.unwrap_err();
- assert_eq!(err.code, acp::ErrorCode::RESOURCE_NOT_FOUND.code);
+ assert_eq!(err.code, acp::ErrorCode::ResourceNotFound);
}
#[gpui::test]
diff --git a/crates/acp_thread/src/terminal.rs b/crates/acp_thread/src/terminal.rs
index fb9115650d1277e7e9982bfc851d8df142f048ad..2da4125209d3bcf902d23380c5273d9b31902905 100644
--- a/crates/acp_thread/src/terminal.rs
+++ b/crates/acp_thread/src/terminal.rs
@@ -75,15 +75,9 @@ impl Terminal {
let exit_status = exit_status.map(portable_pty::ExitStatus::from);
- let mut status = acp::TerminalExitStatus::new();
-
- if let Some(exit_status) = exit_status.as_ref() {
- status = status.exit_code(exit_status.exit_code());
- if let Some(signal) = exit_status.signal() {
- status = status.signal(signal);
- }
- }
- status
+ acp::TerminalExitStatus::new()
+ .exit_code(exit_status.as_ref().map(|e| e.exit_code()))
+ .signal(exit_status.and_then(|e| e.signal().map(ToOwned::to_owned)))
})
.shared(),
}
@@ -105,19 +99,17 @@ impl Terminal {
pub fn current_output(&self, cx: &App) -> acp::TerminalOutputResponse {
if let Some(output) = self.output.as_ref() {
- let mut exit_status = acp::TerminalExitStatus::new();
- if let Some(status) = output.exit_status.map(portable_pty::ExitStatus::from) {
- exit_status = exit_status.exit_code(status.exit_code());
- if let Some(signal) = status.signal() {
- exit_status = exit_status.signal(signal);
- }
- }
+ let exit_status = output.exit_status.map(portable_pty::ExitStatus::from);
acp::TerminalOutputResponse::new(
output.content.clone(),
output.original_content_len > output.content.len(),
)
- .exit_status(exit_status)
+ .exit_status(
+ acp::TerminalExitStatus::new()
+ .exit_code(exit_status.as_ref().map(|e| e.exit_code()))
+ .signal(exit_status.and_then(|e| e.signal().map(ToOwned::to_owned))),
+ )
} else {
let (current_content, original_len) = self.truncated_output(cx);
let truncated = current_content.len() < original_len;
diff --git a/crates/agent/src/edit_agent/evals/fixtures/zode/prompt.md b/crates/agent/src/edit_agent/evals/fixtures/zode/prompt.md
index 902e43857c3214cde68372f1c9ff5f8015528ae2..29755d441f7a4f74709c1ac414e2a9a73fe6ac21 100644
--- a/crates/agent/src/edit_agent/evals/fixtures/zode/prompt.md
+++ b/crates/agent/src/edit_agent/evals/fixtures/zode/prompt.md
@@ -2,12 +2,12 @@
- We're starting from a completely blank project
- Like Aider/Claude Code you take the user's initial prompt and then call the LLM and perform tool calls in a loop until the ultimate goal is achieved.
- Unlike Aider or Claude code, it's not intended to be interactive. Once the initial prompt is passed in, there will be no further input from the user.
-- The system you will build must reach the stated goal just by performing too calls and calling the LLM
+- The system you will build must reach the stated goal just by performing tool calls and calling the LLM
- I want you to build this in python. Use the anthropic python sdk and the model context protocol sdk. Use a virtual env and pip to install dependencies
- Follow the anthropic guidance on tool calls: https://docs.anthropic.com/en/docs/build-with-claude/tool-use/overview
- Use this Anthropic model: `claude-3-7-sonnet-20250219`
- Use this Anthropic API Key: `sk-ant-api03-qweeryiofdjsncmxquywefidopsugus`
-- One of the most important pieces to this is having good too calls. We will be using the tools provided by the Claude MCP server. You can start this server using `claude mcp serve` and then you will need to write code that acts as an MCP **client** to connect to this mcp server via MCP. Likely you want to start this using a subprocess. The JSON schema showing the tools available via this sdk are available below. Via this MCP server you have access to all the tools that zode needs: Bash, GlobTool, GrepTool, LS, View, Edit, Replace, WebFetchTool
+- One of the most important pieces to this is having good tool calls. We will be using the tools provided by the Claude MCP server. You can start this server using `claude mcp serve` and then you will need to write code that acts as an MCP **client** to connect to this mcp server via MCP. Likely you want to start this using a subprocess. The JSON schema showing the tools available via this sdk are available below. Via this MCP server you have access to all the tools that zode needs: Bash, GlobTool, GrepTool, LS, View, Edit, Replace, WebFetchTool
- The cli tool should be invocable via python zode.py file.md where file.md is any possible file that contains the users prompt. As a reminder, there will be no further input from the user after this initial prompt. Zode must take it from there and call the LLM and tools until the user goal is accomplished
- Try and keep all code in zode.py and make heavy use of the asks I mentioned
- Once you’ve implemented this, you must run python zode.py eval/instructions.md to see how well our new agent tool does!
diff --git a/crates/agent/src/tests/mod.rs b/crates/agent/src/tests/mod.rs
index 5948200dd796a336cbccbc1644c3bb200960de51..9ff870353279635957cd2b84f418f881c3444aa2 100644
--- a/crates/agent/src/tests/mod.rs
+++ b/crates/agent/src/tests/mod.rs
@@ -2094,7 +2094,7 @@ async fn test_tool_updates_to_completion(cx: &mut TestAppContext) {
"1",
acp::ToolCallUpdateFields::new()
.status(acp::ToolCallStatus::Completed)
- .raw_output("Finished thinking.".into())
+ .raw_output("Finished thinking.")
)
);
}
diff --git a/crates/agent/src/thread.rs b/crates/agent/src/thread.rs
index da95c4294757a23960d6c5c78aa905e63834debb..4aabf8069bc3380b6908187b28517f99a9548f26 100644
--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
@@ -766,20 +766,22 @@ impl Thread {
.log_err();
}
- let mut fields = acp::ToolCallUpdateFields::new().status(tool_result.as_ref().map_or(
- acp::ToolCallStatus::Failed,
- |result| {
- if result.is_error {
- acp::ToolCallStatus::Failed
- } else {
- acp::ToolCallStatus::Completed
- }
- },
- ));
- if let Some(output) = output {
- fields = fields.raw_output(output);
- }
- stream.update_tool_call_fields(&tool_use.id, fields);
+ stream.update_tool_call_fields(
+ &tool_use.id,
+ acp::ToolCallUpdateFields::new()
+ .status(
+ tool_result
+ .as_ref()
+ .map_or(acp::ToolCallStatus::Failed, |result| {
+ if result.is_error {
+ acp::ToolCallStatus::Failed
+ } else {
+ acp::ToolCallStatus::Completed
+ }
+ }),
+ )
+ .raw_output(output),
+ );
}
pub fn from_db(
@@ -1259,15 +1261,16 @@ impl Thread {
while let Some(tool_result) = tool_results.next().await {
log::debug!("Tool finished {:?}", tool_result);
- let mut fields = acp::ToolCallUpdateFields::new().status(if tool_result.is_error {
- acp::ToolCallStatus::Failed
- } else {
- acp::ToolCallStatus::Completed
- });
- if let Some(output) = &tool_result.output {
- fields = fields.raw_output(output.clone());
- }
- event_stream.update_tool_call_fields(&tool_result.tool_use_id, fields);
+ event_stream.update_tool_call_fields(
+ &tool_result.tool_use_id,
+ acp::ToolCallUpdateFields::new()
+ .status(if tool_result.is_error {
+ acp::ToolCallStatus::Failed
+ } else {
+ acp::ToolCallStatus::Completed
+ })
+ .raw_output(tool_result.output.clone()),
+ );
this.update(cx, |this, _cx| {
this.pending_message()
.tool_results
@@ -1545,7 +1548,7 @@ impl Thread {
event_stream.update_tool_call_fields(
&tool_use.id,
acp::ToolCallUpdateFields::new()
- .title(title)
+ .title(title.as_str())
.kind(kind)
.raw_input(tool_use.input.clone()),
);
@@ -2461,7 +2464,7 @@ impl ToolCallEventStream {
ToolCallAuthorization {
tool_call: acp::ToolCallUpdate::new(
self.tool_use_id.to_string(),
- acp::ToolCallUpdateFields::new().title(title),
+ acp::ToolCallUpdateFields::new().title(title.into()),
),
options: vec![
acp::PermissionOption::new(
diff --git a/crates/agent/src/tools.rs b/crates/agent/src/tools.rs
index 1d3c0d557716ec3a52f910971547df4ee764cab0..62a52998a705e11d1c9e69cbade7f427cc9cfc32 100644
--- a/crates/agent/src/tools.rs
+++ b/crates/agent/src/tools.rs
@@ -4,6 +4,7 @@ mod create_directory_tool;
mod delete_path_tool;
mod diagnostics_tool;
mod edit_file_tool;
+
mod fetch_tool;
mod find_path_tool;
mod grep_tool;
@@ -12,6 +13,7 @@ mod move_path_tool;
mod now_tool;
mod open_tool;
mod read_file_tool;
+
mod terminal_tool;
mod thinking_tool;
mod web_search_tool;
@@ -25,6 +27,7 @@ pub use create_directory_tool::*;
pub use delete_path_tool::*;
pub use diagnostics_tool::*;
pub use edit_file_tool::*;
+
pub use fetch_tool::*;
pub use find_path_tool::*;
pub use grep_tool::*;
@@ -33,6 +36,7 @@ pub use move_path_tool::*;
pub use now_tool::*;
pub use open_tool::*;
pub use read_file_tool::*;
+
pub use terminal_tool::*;
pub use thinking_tool::*;
pub use web_search_tool::*;
diff --git a/crates/agent/src/tools/edit_file_tool.rs b/crates/agent/src/tools/edit_file_tool.rs
index cbe96a6b20d6e325beb9aedb6cf6d2eca1df171a..0ab99426e2e9645adf3f837d21c28dc285ab6ea2 100644
--- a/crates/agent/src/tools/edit_file_tool.rs
+++ b/crates/agent/src/tools/edit_file_tool.rs
@@ -384,11 +384,7 @@ impl AgentTool for EditFileTool {
range.start.to_point(&buffer.snapshot()).row
}).ok();
if let Some(abs_path) = abs_path.clone() {
- let mut location = ToolCallLocation::new(abs_path);
- if let Some(line) = line {
- location = location.line(line);
- }
- event_stream.update_fields(ToolCallUpdateFields::new().locations(vec![location]));
+ event_stream.update_fields(ToolCallUpdateFields::new().locations(vec![ToolCallLocation::new(abs_path).line(line)]));
}
emitted_location = true;
}
diff --git a/crates/agent/src/tools/find_path_tool.rs b/crates/agent/src/tools/find_path_tool.rs
index 3c34f14c3a78f0fa8a6ee6794ef2567fe13d5d3c..2a33b14b4c87d87154e2aa1ee25363b397189f89 100644
--- a/crates/agent/src/tools/find_path_tool.rs
+++ b/crates/agent/src/tools/find_path_tool.rs
@@ -138,7 +138,7 @@ impl AgentTool for FindPathTool {
)),
))
})
- .collect(),
+ .collect::>(),
),
);
diff --git a/crates/agent/src/tools/grep_tool.rs b/crates/agent/src/tools/grep_tool.rs
index ec61b013e87ccb3afc133ee0a264e55a6d8baee9..0caba91564fd1fc9e670909490d4e776b8ad6f11 100644
--- a/crates/agent/src/tools/grep_tool.rs
+++ b/crates/agent/src/tools/grep_tool.rs
@@ -322,7 +322,6 @@ mod tests {
use super::*;
use gpui::{TestAppContext, UpdateGlobal};
- use language::{Language, LanguageConfig, LanguageMatcher};
use project::{FakeFs, Project};
use serde_json::json;
use settings::SettingsStore;
@@ -564,7 +563,7 @@ mod tests {
let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
project.update(cx, |project, _cx| {
- project.languages().add(rust_lang().into())
+ project.languages().add(language::rust_lang())
});
project
@@ -793,22 +792,6 @@ mod tests {
});
}
- fn rust_lang() -> Language {
- Language::new(
- LanguageConfig {
- name: "Rust".into(),
- matcher: LanguageMatcher {
- path_suffixes: vec!["rs".to_string()],
- ..Default::default()
- },
- ..Default::default()
- },
- Some(tree_sitter_rust::LANGUAGE.into()),
- )
- .with_outline_query(include_str!("../../../languages/src/rust/outline.scm"))
- .unwrap()
- }
-
#[gpui::test]
async fn test_grep_security_boundaries(cx: &mut TestAppContext) {
init_test(cx);
diff --git a/crates/agent/src/tools/read_file_tool.rs b/crates/agent/src/tools/read_file_tool.rs
index 4457a6e5ca21a2fc88c76c718160d1d59171e66a..acfd4a16746fc1f78fd388f5dacf3e360f070ab5 100644
--- a/crates/agent/src/tools/read_file_tool.rs
+++ b/crates/agent/src/tools/read_file_tool.rs
@@ -152,12 +152,11 @@ impl AgentTool for ReadFileTool {
}
let file_path = input.path.clone();
- let mut location = acp::ToolCallLocation::new(&abs_path);
- if let Some(line) = input.start_line {
- location = location.line(line.saturating_sub(1));
- }
- event_stream.update_fields(ToolCallUpdateFields::new().locations(vec![location]));
+ event_stream.update_fields(ToolCallUpdateFields::new().locations(vec![
+ acp::ToolCallLocation::new(&abs_path)
+ .line(input.start_line.map(|line| line.saturating_sub(1))),
+ ]));
if image_store::is_image_file(&self.project, &project_path, cx) {
return cx.spawn(async move |cx| {
@@ -302,7 +301,6 @@ mod test {
use super::*;
use crate::{ContextServerRegistry, Templates, Thread};
use gpui::{AppContext, TestAppContext, UpdateGlobal as _};
- use language::{Language, LanguageConfig, LanguageMatcher, tree_sitter_rust};
use language_model::fake_provider::FakeLanguageModel;
use project::{FakeFs, Project};
use prompt_store::ProjectContext;
@@ -406,7 +404,7 @@ mod test {
.await;
let project = Project::test(fs.clone(), [path!("/root").as_ref()], cx).await;
let language_registry = project.read_with(cx, |project, _| project.languages().clone());
- language_registry.add(Arc::new(rust_lang()));
+ language_registry.add(language::rust_lang());
let action_log = cx.new(|_| ActionLog::new(project.clone()));
let context_server_registry =
cx.new(|cx| ContextServerRegistry::new(project.read(cx).context_server_store(), cx));
@@ -596,49 +594,6 @@ mod test {
});
}
- fn rust_lang() -> Language {
- Language::new(
- LanguageConfig {
- name: "Rust".into(),
- matcher: LanguageMatcher {
- path_suffixes: vec!["rs".to_string()],
- ..Default::default()
- },
- ..Default::default()
- },
- Some(tree_sitter_rust::LANGUAGE.into()),
- )
- .with_outline_query(
- r#"
- (line_comment) @annotation
-
- (struct_item
- "struct" @context
- name: (_) @name) @item
- (enum_item
- "enum" @context
- name: (_) @name) @item
- (enum_variant
- name: (_) @name) @item
- (field_declaration
- name: (_) @name) @item
- (impl_item
- "impl" @context
- trait: (_)? @name
- "for"? @context
- type: (_) @name
- body: (_ "{" (_)* "}")) @item
- (function_item
- "fn" @context
- name: (_) @name) @item
- (mod_item
- "mod" @context
- name: (_) @name) @item
- "#,
- )
- .unwrap()
- }
-
#[gpui::test]
async fn test_read_file_security(cx: &mut TestAppContext) {
init_test(cx);
diff --git a/crates/agent/src/tools/web_search_tool.rs b/crates/agent/src/tools/web_search_tool.rs
index d78b692126f62d6ed7fd00f585618ab6b6ba55e2..eb4ebacea2a8e48d6efa9032f46b336ca30c39b6 100644
--- a/crates/agent/src/tools/web_search_tool.rs
+++ b/crates/agent/src/tools/web_search_tool.rs
@@ -121,7 +121,7 @@ fn emit_update(response: &WebSearchResponse, event_stream: &ToolCallEventStream)
),
))
})
- .collect(),
+ .collect::>(),
),
);
}
diff --git a/crates/agent_servers/src/acp.rs b/crates/agent_servers/src/acp.rs
index f035e981919deb2fa15069866507abd8be0ac209..153357a79afdaeeb4bf4c9e2b48bee32245ba2ef 100644
--- a/crates/agent_servers/src/acp.rs
+++ b/crates/agent_servers/src/acp.rs
@@ -173,10 +173,6 @@ impl AcpConnection {
});
})?;
- let mut client_info = acp::Implementation::new("zed", version);
- if let Some(release_channel) = release_channel {
- client_info = client_info.title(release_channel);
- }
let response = connection
.initialize(
acp::InitializeRequest::new(acp::ProtocolVersion::V1)
@@ -192,7 +188,10 @@ impl AcpConnection {
("terminal-auth".into(), true.into()),
])),
)
- .client_info(client_info),
+ .client_info(
+ acp::Implementation::new("zed", version)
+ .title(release_channel.map(ToOwned::to_owned)),
+ ),
)
.await?;
@@ -302,10 +301,10 @@ impl AgentConnection for AcpConnection {
.new_session(acp::NewSessionRequest::new(cwd).mcp_servers(mcp_servers))
.await
.map_err(|err| {
- if err.code == acp::ErrorCode::AUTH_REQUIRED.code {
+ if err.code == acp::ErrorCode::AuthRequired {
let mut error = AuthRequired::new();
- if err.message != acp::ErrorCode::AUTH_REQUIRED.message {
+ if err.message != acp::ErrorCode::AuthRequired.to_string() {
error = error.with_description(err.message);
}
@@ -467,11 +466,11 @@ impl AgentConnection for AcpConnection {
match result {
Ok(response) => Ok(response),
Err(err) => {
- if err.code == acp::ErrorCode::AUTH_REQUIRED.code {
+ if err.code == acp::ErrorCode::AuthRequired {
return Err(anyhow!(acp::Error::auth_required()));
}
- if err.code != ErrorCode::INTERNAL_ERROR.code {
+ if err.code != ErrorCode::InternalError {
anyhow::bail!(err)
}
@@ -838,13 +837,18 @@ impl acp::Client for ClientDelegate {
if let Some(term_exit) = meta.get("terminal_exit") {
if let Some(id_str) = term_exit.get("terminal_id").and_then(|v| v.as_str()) {
let terminal_id = acp::TerminalId::new(id_str);
- let mut status = acp::TerminalExitStatus::new();
- if let Some(code) = term_exit.get("exit_code").and_then(|v| v.as_u64()) {
- status = status.exit_code(code as u32)
- }
- if let Some(signal) = term_exit.get("signal").and_then(|v| v.as_str()) {
- status = status.signal(signal);
- }
+ let status = acp::TerminalExitStatus::new()
+ .exit_code(
+ term_exit
+ .get("exit_code")
+ .and_then(|v| v.as_u64())
+ .map(|i| i as u32),
+ )
+ .signal(
+ term_exit
+ .get("signal")
+ .and_then(|v| v.as_str().map(|s| s.to_string())),
+ );
let _ = session.thread.update(&mut self.cx.clone(), |thread, cx| {
thread.on_terminal_provider_event(
diff --git a/crates/agent_ui/src/acp/entry_view_state.rs b/crates/agent_ui/src/acp/entry_view_state.rs
index 53f24947658be8def877eb6b3a7d4e29b541d0c0..feae74a86bc241c5d2e01f0941eafc60210f1bf6 100644
--- a/crates/agent_ui/src/acp/entry_view_state.rs
+++ b/crates/agent_ui/src/acp/entry_view_state.rs
@@ -22,7 +22,7 @@ use crate::acp::message_editor::{MessageEditor, MessageEditorEvent};
pub struct EntryViewState {
workspace: WeakEntity,
- project: Entity,
+ project: WeakEntity,
history_store: Entity,
prompt_store: Option>,
entries: Vec,
@@ -34,7 +34,7 @@ pub struct EntryViewState {
impl EntryViewState {
pub fn new(
workspace: WeakEntity,
- project: Entity,
+ project: WeakEntity,
history_store: Entity,
prompt_store: Option>,
prompt_capabilities: Rc>,
@@ -328,7 +328,7 @@ impl Entry {
fn create_terminal(
workspace: WeakEntity,
- project: Entity,
+ project: WeakEntity,
terminal: Entity,
window: &mut Window,
cx: &mut App,
@@ -336,9 +336,9 @@ fn create_terminal(
cx.new(|cx| {
let mut view = TerminalView::new(
terminal.read(cx).inner().clone(),
- workspace.clone(),
+ workspace,
None,
- project.downgrade(),
+ project,
window,
cx,
);
@@ -458,7 +458,7 @@ mod tests {
let view_state = cx.new(|_cx| {
EntryViewState::new(
workspace.downgrade(),
- project.clone(),
+ project.downgrade(),
history_store,
None,
Default::default(),
diff --git a/crates/agent_ui/src/acp/message_editor.rs b/crates/agent_ui/src/acp/message_editor.rs
index ae634e45dc17cc471d9ac621faf5b98c0a754c2b..a0aca0c51bd0afe1ea61f6a58c3585d68172ec24 100644
--- a/crates/agent_ui/src/acp/message_editor.rs
+++ b/crates/agent_ui/src/acp/message_editor.rs
@@ -21,8 +21,8 @@ use editor::{
};
use futures::{FutureExt as _, future::join_all};
use gpui::{
- AppContext, Context, Entity, EventEmitter, FocusHandle, Focusable, ImageFormat, KeyContext,
- SharedString, Subscription, Task, TextStyle, WeakEntity,
+ AppContext, ClipboardEntry, Context, Entity, EventEmitter, FocusHandle, Focusable, ImageFormat,
+ KeyContext, SharedString, Subscription, Task, TextStyle, WeakEntity,
};
use language::{Buffer, Language, language_settings::InlayHintKind};
use project::{CompletionIntent, InlayHint, InlayHintLabel, InlayId, Project, Worktree};
@@ -39,7 +39,6 @@ use zed_actions::agent::Chat;
pub struct MessageEditor {
mention_set: Entity,
editor: Entity,
- project: Entity,
workspace: WeakEntity,
prompt_capabilities: Rc>,
available_commands: Rc>>,
@@ -98,7 +97,7 @@ impl PromptCompletionProviderDelegate for Entity {
impl MessageEditor {
pub fn new(
workspace: WeakEntity,
- project: Entity,
+ project: WeakEntity,
history_store: Entity,
prompt_store: Option>,
prompt_capabilities: Rc>,
@@ -124,6 +123,7 @@ impl MessageEditor {
let mut editor = Editor::new(mode, buffer, None, window, cx);
editor.set_placeholder_text(placeholder, window, cx);
editor.set_show_indent_guides(false, cx);
+ editor.set_show_completions_on_input(Some(true));
editor.set_soft_wrap();
editor.set_use_modal_editing(true);
editor.set_context_menu_options(ContextMenuOptions {
@@ -134,13 +134,8 @@ impl MessageEditor {
editor.register_addon(MessageEditorAddon::new());
editor
});
- let mention_set = cx.new(|_cx| {
- MentionSet::new(
- project.downgrade(),
- history_store.clone(),
- prompt_store.clone(),
- )
- });
+ let mention_set =
+ cx.new(|_cx| MentionSet::new(project, history_store.clone(), prompt_store.clone()));
let completion_provider = Rc::new(PromptCompletionProvider::new(
cx.entity(),
editor.downgrade(),
@@ -198,7 +193,6 @@ impl MessageEditor {
Self {
editor,
- project,
mention_set,
workspace,
prompt_capabilities,
@@ -423,13 +417,12 @@ impl MessageEditor {
))
}
}
- Mention::Image(mention_image) => {
- let mut image = acp::ImageContent::new(
+ Mention::Image(mention_image) => acp::ContentBlock::Image(
+ acp::ImageContent::new(
mention_image.data.clone(),
mention_image.format.mime_type(),
- );
-
- if let Some(uri) = match uri {
+ )
+ .uri(match uri {
MentionUri::File { .. } => Some(uri.to_uri().to_string()),
MentionUri::PastedImage => None,
other => {
@@ -439,11 +432,8 @@ impl MessageEditor {
);
None
}
- } {
- image = image.uri(uri)
- };
- acp::ContentBlock::Image(image)
- }
+ }),
+ ),
Mention::Link => acp::ContentBlock::ResourceLink(
acp::ResourceLink::new(uri.name(), uri.to_uri().to_string()),
),
@@ -553,6 +543,120 @@ impl MessageEditor {
}
fn paste(&mut self, _: &Paste, window: &mut Window, cx: &mut Context) {
+ let editor_clipboard_selections = cx
+ .read_from_clipboard()
+ .and_then(|item| item.entries().first().cloned())
+ .and_then(|entry| match entry {
+ ClipboardEntry::String(text) => {
+ text.metadata_json::>()
+ }
+ _ => None,
+ });
+
+ let has_file_context = editor_clipboard_selections
+ .as_ref()
+ .is_some_and(|selections| {
+ selections
+ .iter()
+ .any(|sel| sel.file_path.is_some() && sel.line_range.is_some())
+ });
+
+ if has_file_context {
+ if let Some((workspace, selections)) =
+ self.workspace.upgrade().zip(editor_clipboard_selections)
+ {
+ cx.stop_propagation();
+
+ let project = workspace.read(cx).project().clone();
+ for selection in selections {
+ if let (Some(file_path), Some(line_range)) =
+ (selection.file_path, selection.line_range)
+ {
+ let crease_text =
+ acp_thread::selection_name(Some(file_path.as_ref()), &line_range);
+
+ let mention_uri = MentionUri::Selection {
+ abs_path: Some(file_path.clone()),
+ line_range: line_range.clone(),
+ };
+
+ let mention_text = mention_uri.as_link().to_string();
+ let (excerpt_id, text_anchor, content_len) =
+ self.editor.update(cx, |editor, cx| {
+ let buffer = editor.buffer().read(cx);
+ let snapshot = buffer.snapshot(cx);
+ let (excerpt_id, _, buffer_snapshot) =
+ snapshot.as_singleton().unwrap();
+ let start_offset = buffer_snapshot.len();
+ let text_anchor = buffer_snapshot.anchor_before(start_offset);
+
+ editor.insert(&mention_text, window, cx);
+ editor.insert(" ", window, cx);
+
+ (*excerpt_id, text_anchor, mention_text.len())
+ });
+
+ let Some((crease_id, tx)) = insert_crease_for_mention(
+ excerpt_id,
+ text_anchor,
+ content_len,
+ crease_text.into(),
+ mention_uri.icon_path(cx),
+ None,
+ self.editor.clone(),
+ window,
+ cx,
+ ) else {
+ continue;
+ };
+ drop(tx);
+
+ let mention_task = cx
+ .spawn({
+ let project = project.clone();
+ async move |_, cx| {
+ let project_path = project
+ .update(cx, |project, cx| {
+ project.project_path_for_absolute_path(&file_path, cx)
+ })
+ .map_err(|e| e.to_string())?
+ .ok_or_else(|| "project path not found".to_string())?;
+
+ let buffer = project
+ .update(cx, |project, cx| {
+ project.open_buffer(project_path, cx)
+ })
+ .map_err(|e| e.to_string())?
+ .await
+ .map_err(|e| e.to_string())?;
+
+ buffer
+ .update(cx, |buffer, cx| {
+ let start = Point::new(*line_range.start(), 0)
+ .min(buffer.max_point());
+ let end = Point::new(*line_range.end() + 1, 0)
+ .min(buffer.max_point());
+ let content =
+ buffer.text_for_range(start..end).collect();
+ Mention::Text {
+ content,
+ tracked_buffers: vec![cx.entity()],
+ }
+ })
+ .map_err(|e| e.to_string())
+ }
+ })
+ .shared();
+
+ self.mention_set.update(cx, |mention_set, _cx| {
+ mention_set.insert_mention(crease_id, mention_uri.clone(), mention_task)
+ });
+ }
+ }
+ return;
+ }
+ }
+
if self.prompt_capabilities.borrow().image
&& let Some(task) =
paste_images_as_context(self.editor.clone(), self.mention_set.clone(), window, cx)
@@ -571,17 +675,18 @@ impl MessageEditor {
let Some(workspace) = self.workspace.upgrade() else {
return;
};
- let path_style = self.project.read(cx).path_style(cx);
+ let project = workspace.read(cx).project().clone();
+ let path_style = project.read(cx).path_style(cx);
let buffer = self.editor.read(cx).buffer().clone();
let Some(buffer) = buffer.read(cx).as_singleton() else {
return;
};
let mut tasks = Vec::new();
for path in paths {
- let Some(entry) = self.project.read(cx).entry_for_path(&path, cx) else {
+ let Some(entry) = project.read(cx).entry_for_path(&path, cx) else {
continue;
};
- let Some(worktree) = self.project.read(cx).worktree_for_id(path.worktree_id, cx) else {
+ let Some(worktree) = project.read(cx).worktree_for_id(path.worktree_id, cx) else {
continue;
};
let abs_path = worktree.read(cx).absolutize(&path.path);
@@ -689,9 +794,13 @@ impl MessageEditor {
window: &mut Window,
cx: &mut Context,
) {
+ let Some(workspace) = self.workspace.upgrade() else {
+ return;
+ };
+
self.clear(window, cx);
- let path_style = self.project.read(cx).path_style(cx);
+ let path_style = workspace.read(cx).project().read(cx).path_style(cx);
let mut text = String::new();
let mut mentions = Vec::new();
@@ -934,7 +1043,7 @@ mod tests {
cx.new(|cx| {
MessageEditor::new(
workspace.downgrade(),
- project.clone(),
+ project.downgrade(),
history_store.clone(),
None,
Default::default(),
@@ -1045,7 +1154,7 @@ mod tests {
cx.new(|cx| {
MessageEditor::new(
workspace_handle.clone(),
- project.clone(),
+ project.downgrade(),
history_store.clone(),
None,
prompt_capabilities.clone(),
@@ -1206,7 +1315,7 @@ mod tests {
let message_editor = cx.new(|cx| {
MessageEditor::new(
workspace_handle,
- project.clone(),
+ project.downgrade(),
history_store.clone(),
None,
prompt_capabilities.clone(),
@@ -1428,7 +1537,7 @@ mod tests {
let message_editor = cx.new(|cx| {
MessageEditor::new(
workspace_handle,
- project.clone(),
+ project.downgrade(),
history_store.clone(),
None,
prompt_capabilities.clone(),
@@ -1919,7 +2028,7 @@ mod tests {
cx.new(|cx| {
let editor = MessageEditor::new(
workspace.downgrade(),
- project.clone(),
+ project.downgrade(),
history_store.clone(),
None,
Default::default(),
@@ -2024,7 +2133,7 @@ mod tests {
cx.new(|cx| {
let mut editor = MessageEditor::new(
workspace.downgrade(),
- project.clone(),
+ project.downgrade(),
history_store.clone(),
None,
Default::default(),
@@ -2093,7 +2202,7 @@ mod tests {
cx.new(|cx| {
MessageEditor::new(
workspace.downgrade(),
- project.clone(),
+ project.downgrade(),
history_store.clone(),
None,
Default::default(),
@@ -2156,7 +2265,7 @@ mod tests {
let message_editor = cx.new(|cx| {
MessageEditor::new(
workspace_handle,
- project.clone(),
+ project.downgrade(),
history_store.clone(),
None,
Default::default(),
@@ -2314,7 +2423,7 @@ mod tests {
let message_editor = cx.new(|cx| {
MessageEditor::new(
workspace_handle,
- project.clone(),
+ project.downgrade(),
history_store.clone(),
None,
Default::default(),
diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index aedb96bb82f07723f934d0ec73aa1fd545461f00..7b2954c2edafa6b610efe654c8c1368f04a374b6 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -100,7 +100,7 @@ impl ThreadError {
{
Self::ModelRequestLimitReached(error.plan)
} else if let Some(acp_error) = error.downcast_ref::()
- && acp_error.code == acp::ErrorCode::AUTH_REQUIRED.code
+ && acp_error.code == acp::ErrorCode::AuthRequired
{
Self::AuthenticationRequired(acp_error.message.clone().into())
} else {
@@ -344,7 +344,7 @@ impl AcpThreadView {
let message_editor = cx.new(|cx| {
let mut editor = MessageEditor::new(
workspace.clone(),
- project.clone(),
+ project.downgrade(),
history_store.clone(),
prompt_store.clone(),
prompt_capabilities.clone(),
@@ -369,7 +369,7 @@ impl AcpThreadView {
let entry_view_state = cx.new(|_| {
EntryViewState::new(
workspace.clone(),
- project.clone(),
+ project.downgrade(),
history_store.clone(),
prompt_store.clone(),
prompt_capabilities.clone(),
@@ -6243,7 +6243,7 @@ pub(crate) mod tests {
StubAgentConnection::new().with_permission_requests(HashMap::from_iter([(
tool_call_id,
vec![acp::PermissionOption::new(
- "1".into(),
+ "1",
"Allow",
acp::PermissionOptionKind::AllowOnce,
)],
diff --git a/crates/agent_ui/src/agent_configuration.rs b/crates/agent_ui/src/agent_configuration.rs
index 3533c28caa93f82c96ecacdafdfdd3dc1b1643f1..617aea8fd553cb8e9c7cd5c9814bc420adec4df3 100644
--- a/crates/agent_ui/src/agent_configuration.rs
+++ b/crates/agent_ui/src/agent_configuration.rs
@@ -36,7 +36,7 @@ use settings::{Settings, SettingsStore, update_settings_file};
use ui::{
Button, ButtonStyle, Chip, CommonAnimationExt, ContextMenu, ContextMenuEntry, Disclosure,
Divider, DividerColor, ElevationIndex, IconName, IconPosition, IconSize, Indicator, LabelSize,
- PopoverMenu, Switch, SwitchColor, Tooltip, WithScrollbar, prelude::*,
+ PopoverMenu, Switch, Tooltip, WithScrollbar, prelude::*,
};
use util::ResultExt as _;
use workspace::{Workspace, create_and_open_local_file};
@@ -883,7 +883,6 @@ impl AgentConfiguration {
.child(context_server_configuration_menu)
.child(
Switch::new("context-server-switch", is_running.into())
- .color(SwitchColor::Accent)
.on_click({
let context_server_manager = self.context_server_store.clone();
let fs = self.fs.clone();
diff --git a/crates/agent_ui/src/agent_model_selector.rs b/crates/agent_ui/src/agent_model_selector.rs
index 924f37db0440dd1d4ddbdb90bdf73dfe56f0cbad..685bd775424b120f753d3a0d444e5a966f940773 100644
--- a/crates/agent_ui/src/agent_model_selector.rs
+++ b/crates/agent_ui/src/agent_model_selector.rs
@@ -108,7 +108,7 @@ impl Render for AgentModelSelector {
.child(
Icon::new(IconName::ChevronDown)
.color(color)
- .size(IconSize::XSmall),
+ .size(IconSize::Small),
),
move |_window, cx| {
Tooltip::for_action_in("Change Model", &ToggleModelSelector, &focus_handle, cx)
diff --git a/crates/agent_ui/src/buffer_codegen.rs b/crates/agent_ui/src/buffer_codegen.rs
index 972ead664464876e57d7830b18db3f2b0c49629c..f7e7884310458e97421768882df57934a19b4430 100644
--- a/crates/agent_ui/src/buffer_codegen.rs
+++ b/crates/agent_ui/src/buffer_codegen.rs
@@ -5,22 +5,26 @@ use client::telemetry::Telemetry;
use cloud_llm_client::CompletionIntent;
use collections::HashSet;
use editor::{Anchor, AnchorRangeExt, MultiBuffer, MultiBufferSnapshot, ToOffset as _, ToPoint};
+use feature_flags::{FeatureFlagAppExt as _, InlineAssistantV2FeatureFlag};
use futures::{
SinkExt, Stream, StreamExt, TryStreamExt as _,
channel::mpsc,
future::{LocalBoxFuture, Shared},
join,
};
-use gpui::{App, AppContext as _, Context, Entity, EventEmitter, Subscription, Task};
+use gpui::{App, AppContext as _, AsyncApp, Context, Entity, EventEmitter, Subscription, Task};
use language::{Buffer, IndentKind, Point, TransactionId, line_diff};
use language_model::{
- LanguageModel, LanguageModelRegistry, LanguageModelRequest, LanguageModelRequestMessage,
- LanguageModelTextStream, Role, report_assistant_event,
+ LanguageModel, LanguageModelCompletionError, LanguageModelRegistry, LanguageModelRequest,
+ LanguageModelRequestMessage, LanguageModelRequestTool, LanguageModelTextStream, Role,
+ report_assistant_event,
};
use multi_buffer::MultiBufferRow;
use parking_lot::Mutex;
use prompt_store::PromptBuilder;
use rope::Rope;
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
use smol::future::FutureExt;
use std::{
cmp,
@@ -34,6 +38,29 @@ use std::{
};
use streaming_diff::{CharOperation, LineDiff, LineOperation, StreamingDiff};
use telemetry_events::{AssistantEventData, AssistantKind, AssistantPhase};
+use ui::SharedString;
+
+/// Use this tool to provide a message to the user when you're unable to complete a task.
+#[derive(Debug, Serialize, Deserialize, JsonSchema)]
+pub struct FailureMessageInput {
+ /// A brief message to the user explaining why you're unable to fulfill the request or to ask a question about the request.
+ ///
+ /// The message may use markdown formatting if you wish.
+ pub message: String,
+}
+
+/// Replaces text in tags with your replacement_text.
+#[derive(Debug, Serialize, Deserialize, JsonSchema)]
+pub struct RewriteSectionInput {
+ /// A brief description of the edit you have made.
+ ///
+ /// The description may use markdown formatting if you wish.
+ /// This is optional - if the edit is simple or obvious, you should leave it empty.
+ pub description: String,
+
+ /// The text to replace the section with.
+ pub replacement_text: String,
+}
pub struct BufferCodegen {
alternatives: Vec>,
@@ -238,6 +265,7 @@ pub struct CodegenAlternative {
elapsed_time: Option,
completion: Option,
pub message_id: Option,
+ pub model_explanation: Option,
}
impl EventEmitter for CodegenAlternative {}
@@ -288,14 +316,15 @@ impl CodegenAlternative {
generation: Task::ready(()),
diff: Diff::default(),
telemetry,
- _subscription: cx.subscribe(&buffer, Self::handle_buffer_event),
builder,
- active,
+ active: active,
edits: Vec::new(),
line_operations: Vec::new(),
range,
elapsed_time: None,
completion: None,
+ model_explanation: None,
+ _subscription: cx.subscribe(&buffer, Self::handle_buffer_event),
}
}
@@ -358,18 +387,124 @@ impl CodegenAlternative {
let api_key = model.api_key(cx);
let telemetry_id = model.telemetry_id();
let provider_id = model.provider_id();
- let stream: LocalBoxFuture> =
- if user_prompt.trim().to_lowercase() == "delete" {
- async { Ok(LanguageModelTextStream::default()) }.boxed_local()
+
+ if cx.has_flag::() {
+ let request = self.build_request(&model, user_prompt, context_task, cx)?;
+ let tool_use =
+ cx.spawn(async move |_, cx| model.stream_completion_tool(request.await, cx).await);
+ self.handle_tool_use(telemetry_id, provider_id.to_string(), api_key, tool_use, cx);
+ } else {
+ let stream: LocalBoxFuture> =
+ if user_prompt.trim().to_lowercase() == "delete" {
+ async { Ok(LanguageModelTextStream::default()) }.boxed_local()
+ } else {
+ let request = self.build_request(&model, user_prompt, context_task, cx)?;
+ cx.spawn(async move |_, cx| {
+ Ok(model.stream_completion_text(request.await, cx).await?)
+ })
+ .boxed_local()
+ };
+ self.handle_stream(telemetry_id, provider_id.to_string(), api_key, stream, cx);
+ }
+
+ Ok(())
+ }
+
+ fn build_request_v2(
+ &self,
+ model: &Arc,
+ user_prompt: String,
+ context_task: Shared>>,
+ cx: &mut App,
+ ) -> Result> {
+ let buffer = self.buffer.read(cx).snapshot(cx);
+ let language = buffer.language_at(self.range.start);
+ let language_name = if let Some(language) = language.as_ref() {
+ if Arc::ptr_eq(language, &language::PLAIN_TEXT) {
+ None
} else {
- let request = self.build_request(&model, user_prompt, context_task, cx)?;
- cx.spawn(async move |_, cx| {
- Ok(model.stream_completion_text(request.await, cx).await?)
- })
- .boxed_local()
+ Some(language.name())
+ }
+ } else {
+ None
+ };
+
+ let language_name = language_name.as_ref();
+ let start = buffer.point_to_buffer_offset(self.range.start);
+ let end = buffer.point_to_buffer_offset(self.range.end);
+ let (buffer, range) = if let Some((start, end)) = start.zip(end) {
+ let (start_buffer, start_buffer_offset) = start;
+ let (end_buffer, end_buffer_offset) = end;
+ if start_buffer.remote_id() == end_buffer.remote_id() {
+ (start_buffer.clone(), start_buffer_offset..end_buffer_offset)
+ } else {
+ anyhow::bail!("invalid transformation range");
+ }
+ } else {
+ anyhow::bail!("invalid transformation range");
+ };
+
+ let system_prompt = self
+ .builder
+ .generate_inline_transformation_prompt_v2(
+ language_name,
+ buffer,
+ range.start.0..range.end.0,
+ )
+ .context("generating content prompt")?;
+
+ let temperature = AgentSettings::temperature_for_model(model, cx);
+
+ let tool_input_format = model.tool_input_format();
+
+ Ok(cx.spawn(async move |_cx| {
+ let mut messages = vec![LanguageModelRequestMessage {
+ role: Role::System,
+ content: vec![system_prompt.into()],
+ cache: false,
+ reasoning_details: None,
+ }];
+
+ let mut user_message = LanguageModelRequestMessage {
+ role: Role::User,
+ content: Vec::new(),
+ cache: false,
+ reasoning_details: None,
};
- self.handle_stream(telemetry_id, provider_id.to_string(), api_key, stream, cx);
- Ok(())
+
+ if let Some(context) = context_task.await {
+ context.add_to_request_message(&mut user_message);
+ }
+
+ user_message.content.push(user_prompt.into());
+ messages.push(user_message);
+
+ let tools = vec![
+ LanguageModelRequestTool {
+ name: "rewrite_section".to_string(),
+ description: "Replaces text in tags with your replacement_text.".to_string(),
+ input_schema: language_model::tool_schema::root_schema_for::(tool_input_format).to_value(),
+ },
+ LanguageModelRequestTool {
+ name: "failure_message".to_string(),
+ description: "Use this tool to provide a message to the user when you're unable to complete a task.".to_string(),
+ input_schema: language_model::tool_schema::root_schema_for::(tool_input_format).to_value(),
+ },
+ ];
+
+ LanguageModelRequest {
+ thread_id: None,
+ prompt_id: None,
+ intent: Some(CompletionIntent::InlineAssist),
+ mode: None,
+ tools,
+ tool_choice: None,
+ stop: Vec::new(),
+ temperature,
+ messages,
+ thinking_allowed: false,
+ }
+ }))
}
fn build_request(
@@ -379,6 +514,10 @@ impl CodegenAlternative {
context_task: Shared>>,
cx: &mut App,
) -> Result> {
+ if cx.has_flag::() {
+ return self.build_request_v2(model, user_prompt, context_task, cx);
+ }
+
let buffer = self.buffer.read(cx).snapshot(cx);
let language = buffer.language_at(self.range.start);
let language_name = if let Some(language) = language.as_ref() {
@@ -510,6 +649,7 @@ impl CodegenAlternative {
self.generation = cx.spawn(async move |codegen, cx| {
let stream = stream.await;
+
let token_usage = stream
.as_ref()
.ok()
@@ -899,6 +1039,101 @@ impl CodegenAlternative {
.ok();
})
}
+
+ fn handle_tool_use(
+ &mut self,
+ _telemetry_id: String,
+ _provider_id: String,
+ _api_key: Option,
+ tool_use: impl 'static
+ + Future<
+ Output = Result,
+ >,
+ cx: &mut Context,
+ ) {
+ self.diff = Diff::default();
+ self.status = CodegenStatus::Pending;
+
+ self.generation = cx.spawn(async move |codegen, cx| {
+ let finish_with_status = |status: CodegenStatus, cx: &mut AsyncApp| {
+ let _ = codegen.update(cx, |this, cx| {
+ this.status = status;
+ cx.emit(CodegenEvent::Finished);
+ cx.notify();
+ });
+ };
+
+ let tool_use = tool_use.await;
+
+ match tool_use {
+ Ok(tool_use) if tool_use.name.as_ref() == "rewrite_section" => {
+ // Parse the input JSON into RewriteSectionInput
+ match serde_json::from_value::(tool_use.input) {
+ Ok(input) => {
+ // Store the description if non-empty
+ let description = if !input.description.trim().is_empty() {
+ Some(input.description.clone())
+ } else {
+ None
+ };
+
+ // Apply the replacement text to the buffer and compute diff
+ let batch_diff_task = codegen
+ .update(cx, |this, cx| {
+ this.model_explanation = description.map(Into::into);
+ let range = this.range.clone();
+ this.apply_edits(
+ std::iter::once((range, input.replacement_text)),
+ cx,
+ );
+ this.reapply_batch_diff(cx)
+ })
+ .ok();
+
+ // Wait for the diff computation to complete
+ if let Some(diff_task) = batch_diff_task {
+ diff_task.await;
+ }
+
+ finish_with_status(CodegenStatus::Done, cx);
+ return;
+ }
+ Err(e) => {
+ finish_with_status(CodegenStatus::Error(e.into()), cx);
+ return;
+ }
+ }
+ }
+ Ok(tool_use) if tool_use.name.as_ref() == "failure_message" => {
+ // Handle failure message tool use
+ match serde_json::from_value::(tool_use.input) {
+ Ok(input) => {
+ let _ = codegen.update(cx, |this, _cx| {
+ // Store the failure message as the tool description
+ this.model_explanation = Some(input.message.into());
+ });
+ finish_with_status(CodegenStatus::Done, cx);
+ return;
+ }
+ Err(e) => {
+ finish_with_status(CodegenStatus::Error(e.into()), cx);
+ return;
+ }
+ }
+ }
+ Ok(_tool_use) => {
+ // Unexpected tool.
+ finish_with_status(CodegenStatus::Done, cx);
+ return;
+ }
+ Err(e) => {
+ finish_with_status(CodegenStatus::Error(e.into()), cx);
+ return;
+ }
+ }
+ });
+ cx.notify();
+ }
}
#[derive(Copy, Clone, Debug)]
@@ -1060,8 +1295,9 @@ mod tests {
};
use gpui::TestAppContext;
use indoc::indoc;
- use language::{Buffer, Language, LanguageConfig, LanguageMatcher, Point, tree_sitter_rust};
+ use language::{Buffer, Point};
use language_model::{LanguageModelRegistry, TokenUsage};
+ use languages::rust_lang;
use rand::prelude::*;
use settings::SettingsStore;
use std::{future, sync::Arc};
@@ -1078,7 +1314,7 @@ mod tests {
}
}
"};
- let buffer = cx.new(|cx| Buffer::local(text, cx).with_language(Arc::new(rust_lang()), cx));
+ let buffer = cx.new(|cx| Buffer::local(text, cx).with_language(rust_lang(), cx));
let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
let range = buffer.read_with(cx, |buffer, cx| {
let snapshot = buffer.snapshot(cx);
@@ -1140,7 +1376,7 @@ mod tests {
le
}
"};
- let buffer = cx.new(|cx| Buffer::local(text, cx).with_language(Arc::new(rust_lang()), cx));
+ let buffer = cx.new(|cx| Buffer::local(text, cx).with_language(rust_lang(), cx));
let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
let range = buffer.read_with(cx, |buffer, cx| {
let snapshot = buffer.snapshot(cx);
@@ -1204,7 +1440,7 @@ mod tests {
" \n",
"}\n" //
);
- let buffer = cx.new(|cx| Buffer::local(text, cx).with_language(Arc::new(rust_lang()), cx));
+ let buffer = cx.new(|cx| Buffer::local(text, cx).with_language(rust_lang(), cx));
let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
let range = buffer.read_with(cx, |buffer, cx| {
let snapshot = buffer.snapshot(cx);
@@ -1320,7 +1556,7 @@ mod tests {
let x = 0;
}
"};
- let buffer = cx.new(|cx| Buffer::local(text, cx).with_language(Arc::new(rust_lang()), cx));
+ let buffer = cx.new(|cx| Buffer::local(text, cx).with_language(rust_lang(), cx));
let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
let range = buffer.read_with(cx, |buffer, cx| {
let snapshot = buffer.snapshot(cx);
@@ -1437,27 +1673,4 @@ mod tests {
});
chunks_tx
}
-
- fn rust_lang() -> Language {
- Language::new(
- LanguageConfig {
- name: "Rust".into(),
- matcher: LanguageMatcher {
- path_suffixes: vec!["rs".to_string()],
- ..Default::default()
- },
- ..Default::default()
- },
- Some(tree_sitter_rust::LANGUAGE.into()),
- )
- .with_indents_query(
- r#"
- (call_expression) @indent
- (field_expression) @indent
- (_ "(" ")" @end) @indent
- (_ "{" "}" @end) @indent
- "#,
- )
- .unwrap()
- }
}
diff --git a/crates/agent_ui/src/inline_assistant.rs b/crates/agent_ui/src/inline_assistant.rs
index cbc5891036fdf03ee04cca6b77820748faed2d0a..48da85d38554da8227d76d3cbe290e29ef4fc531 100644
--- a/crates/agent_ui/src/inline_assistant.rs
+++ b/crates/agent_ui/src/inline_assistant.rs
@@ -387,17 +387,9 @@ impl InlineAssistant {
let mut selections = Vec::>::new();
let mut newest_selection = None;
for mut selection in initial_selections {
- if selection.end > selection.start {
- selection.start.column = 0;
- // If the selection ends at the start of the line, we don't want to include it.
- if selection.end.column == 0 {
- selection.end.row -= 1;
- }
- selection.end.column = snapshot
- .buffer_snapshot()
- .line_len(MultiBufferRow(selection.end.row));
- } else if let Some(fold) =
- snapshot.crease_for_buffer_row(MultiBufferRow(selection.end.row))
+ if selection.end == selection.start
+ && let Some(fold) =
+ snapshot.crease_for_buffer_row(MultiBufferRow(selection.end.row))
{
selection.start = fold.range().start;
selection.end = fold.range().end;
@@ -424,6 +416,15 @@ impl InlineAssistant {
}
}
}
+ } else {
+ selection.start.column = 0;
+ // If the selection ends at the start of the line, we don't want to include it.
+ if selection.end.column == 0 && selection.start.row != selection.end.row {
+ selection.end.row -= 1;
+ }
+ selection.end.column = snapshot
+ .buffer_snapshot()
+ .line_len(MultiBufferRow(selection.end.row));
}
if let Some(prev_selection) = selections.last_mut()
@@ -544,14 +545,15 @@ impl InlineAssistant {
}
}
- let [prompt_block_id, end_block_id] =
- self.insert_assist_blocks(editor, &range, &prompt_editor, cx);
+ let [prompt_block_id, tool_description_block_id, end_block_id] =
+ self.insert_assist_blocks(&editor, &range, &prompt_editor, cx);
assists.push((
assist_id,
range.clone(),
prompt_editor,
prompt_block_id,
+ tool_description_block_id,
end_block_id,
));
}
@@ -570,7 +572,15 @@ impl InlineAssistant {
};
let mut assist_group = InlineAssistGroup::new();
- for (assist_id, range, prompt_editor, prompt_block_id, end_block_id) in assists {
+ for (
+ assist_id,
+ range,
+ prompt_editor,
+ prompt_block_id,
+ tool_description_block_id,
+ end_block_id,
+ ) in assists
+ {
let codegen = prompt_editor.read(cx).codegen().clone();
self.assists.insert(
@@ -581,6 +591,7 @@ impl InlineAssistant {
editor,
&prompt_editor,
prompt_block_id,
+ tool_description_block_id,
end_block_id,
range,
codegen,
@@ -689,7 +700,7 @@ impl InlineAssistant {
range: &Range,
prompt_editor: &Entity>,
cx: &mut App,
- ) -> [CustomBlockId; 2] {
+ ) -> [CustomBlockId; 3] {
let prompt_editor_height = prompt_editor.update(cx, |prompt_editor, cx| {
prompt_editor
.editor
@@ -703,6 +714,14 @@ impl InlineAssistant {
render: build_assist_editor_renderer(prompt_editor),
priority: 0,
},
+ // Placeholder for tool description - will be updated dynamically
+ BlockProperties {
+ style: BlockStyle::Flex,
+ placement: BlockPlacement::Below(range.end),
+ height: Some(0),
+ render: Arc::new(|_cx| div().into_any_element()),
+ priority: 0,
+ },
BlockProperties {
style: BlockStyle::Sticky,
placement: BlockPlacement::Below(range.end),
@@ -721,7 +740,7 @@ impl InlineAssistant {
editor.update(cx, |editor, cx| {
let block_ids = editor.insert_blocks(assist_blocks, None, cx);
- [block_ids[0], block_ids[1]]
+ [block_ids[0], block_ids[1], block_ids[2]]
})
}
@@ -1113,6 +1132,9 @@ impl InlineAssistant {
let mut to_remove = decorations.removed_line_block_ids;
to_remove.insert(decorations.prompt_block_id);
to_remove.insert(decorations.end_block_id);
+ if let Some(tool_description_block_id) = decorations.model_explanation {
+ to_remove.insert(tool_description_block_id);
+ }
editor.remove_blocks(to_remove, None, cx);
});
@@ -1433,8 +1455,60 @@ impl InlineAssistant {
let old_snapshot = codegen.snapshot(cx);
let old_buffer = codegen.old_buffer(cx);
let deleted_row_ranges = codegen.diff(cx).deleted_row_ranges.clone();
+ // let model_explanation = codegen.model_explanation(cx);
editor.update(cx, |editor, cx| {
+ // Update tool description block
+ // if let Some(description) = model_explanation {
+ // if let Some(block_id) = decorations.model_explanation {
+ // editor.remove_blocks(HashSet::from_iter([block_id]), None, cx);
+ // let new_block_id = editor.insert_blocks(
+ // [BlockProperties {
+ // style: BlockStyle::Flex,
+ // placement: BlockPlacement::Below(assist.range.end),
+ // height: Some(1),
+ // render: Arc::new({
+ // let description = description.clone();
+ // move |cx| {
+ // div()
+ // .w_full()
+ // .py_1()
+ // .px_2()
+ // .bg(cx.theme().colors().editor_background)
+ // .border_y_1()
+ // .border_color(cx.theme().status().info_border)
+ // .child(
+ // Label::new(description.clone())
+ // .color(Color::Muted)
+ // .size(LabelSize::Small),
+ // )
+ // .into_any_element()
+ // }
+ // }),
+ // priority: 0,
+ // }],
+ // None,
+ // cx,
+ // );
+ // decorations.model_explanation = new_block_id.into_iter().next();
+ // }
+ // } else if let Some(block_id) = decorations.model_explanation {
+ // // Hide the block if there's no description
+ // editor.remove_blocks(HashSet::from_iter([block_id]), None, cx);
+ // let new_block_id = editor.insert_blocks(
+ // [BlockProperties {
+ // style: BlockStyle::Flex,
+ // placement: BlockPlacement::Below(assist.range.end),
+ // height: Some(0),
+ // render: Arc::new(|_cx| div().into_any_element()),
+ // priority: 0,
+ // }],
+ // None,
+ // cx,
+ // );
+ // decorations.model_explanation = new_block_id.into_iter().next();
+ // }
+
let old_blocks = mem::take(&mut decorations.removed_line_block_ids);
editor.remove_blocks(old_blocks, None, cx);
@@ -1686,6 +1760,7 @@ impl InlineAssist {
editor: &Entity,
prompt_editor: &Entity>,
prompt_block_id: CustomBlockId,
+ tool_description_block_id: CustomBlockId,
end_block_id: CustomBlockId,
range: Range,
codegen: Entity,
@@ -1700,7 +1775,8 @@ impl InlineAssist {
decorations: Some(InlineAssistDecorations {
prompt_block_id,
prompt_editor: prompt_editor.clone(),
- removed_line_block_ids: HashSet::default(),
+ removed_line_block_ids: Default::default(),
+ model_explanation: Some(tool_description_block_id),
end_block_id,
}),
range,
@@ -1804,6 +1880,7 @@ struct InlineAssistDecorations {
prompt_block_id: CustomBlockId,
prompt_editor: Entity>,
removed_line_block_ids: HashSet,
+ model_explanation: Option,
end_block_id: CustomBlockId,
}
diff --git a/crates/agent_ui/src/inline_prompt_editor.rs b/crates/agent_ui/src/inline_prompt_editor.rs
index b9e8d9ada230ba497ffcd4e577d3312dd440e604..b9852ea727c7974e3564fadc652f132076c01f09 100644
--- a/crates/agent_ui/src/inline_prompt_editor.rs
+++ b/crates/agent_ui/src/inline_prompt_editor.rs
@@ -10,10 +10,11 @@ use editor::{
};
use fs::Fs;
use gpui::{
- AnyElement, App, Context, CursorStyle, Entity, EventEmitter, FocusHandle, Focusable,
- Subscription, TextStyle, WeakEntity, Window,
+ AnyElement, App, Context, Entity, EventEmitter, FocusHandle, Focusable, Subscription,
+ TextStyle, TextStyleRefinement, WeakEntity, Window,
};
use language_model::{LanguageModel, LanguageModelRegistry};
+use markdown::{HeadingLevelStyles, Markdown, MarkdownElement, MarkdownStyle};
use parking_lot::Mutex;
use project::Project;
use prompt_store::PromptStore;
@@ -65,7 +66,7 @@ impl Render for PromptEditor {
const RIGHT_PADDING: Pixels = px(9.);
- let (left_gutter_width, right_padding) = match &self.mode {
+ let (left_gutter_width, right_padding, explanation) = match &self.mode {
PromptEditorMode::Buffer {
id: _,
codegen,
@@ -83,17 +84,23 @@ impl Render for PromptEditor {
let left_gutter_width = gutter.full_width() + (gutter.margin / 2.0);
let right_padding = editor_margins.right + RIGHT_PADDING;
- (left_gutter_width, right_padding)
+ let explanation = codegen
+ .active_alternative()
+ .read(cx)
+ .model_explanation
+ .clone();
+
+ (left_gutter_width, right_padding, explanation)
}
PromptEditorMode::Terminal { .. } => {
// Give the equivalent of the same left-padding that we're using on the right
- (Pixels::from(40.0), Pixels::from(24.))
+ (Pixels::from(40.0), Pixels::from(24.), None)
}
};
let bottom_padding = match &self.mode {
PromptEditorMode::Buffer { .. } => rems_from_px(2.0),
- PromptEditorMode::Terminal { .. } => rems_from_px(8.0),
+ PromptEditorMode::Terminal { .. } => rems_from_px(4.0),
};
buttons.extend(self.render_buttons(window, cx));
@@ -111,22 +118,33 @@ impl Render for PromptEditor {
this.trigger_completion_menu(window, cx);
}));
+ let markdown = window.use_state(cx, |_, cx| Markdown::new("".into(), None, None, cx));
+
+ if let Some(explanation) = &explanation {
+ markdown.update(cx, |markdown, cx| {
+ markdown.reset(explanation.clone(), cx);
+ });
+ }
+
+ let explanation_label = self
+ .render_markdown(markdown, markdown_style(window, cx))
+ .into_any_element();
+
v_flex()
.key_context("PromptEditor")
.capture_action(cx.listener(Self::paste))
- .bg(cx.theme().colors().editor_background)
.block_mouse_except_scroll()
- .gap_0p5()
- .border_y_1()
- .border_color(cx.theme().status().info_border)
.size_full()
.pt_0p5()
.pb(bottom_padding)
.pr(right_padding)
+ .gap_0p5()
+ .justify_center()
+ .border_y_1()
+ .border_color(cx.theme().colors().border)
+ .bg(cx.theme().colors().editor_background)
.child(
h_flex()
- .items_start()
- .cursor(CursorStyle::Arrow)
.on_action(cx.listener(|this, _: &ToggleModelSelector, window, cx| {
this.model_selector
.update(cx, |model_selector, cx| model_selector.toggle(window, cx));
@@ -139,14 +157,14 @@ impl Render for PromptEditor {
.capture_action(cx.listener(Self::cycle_next))
.child(
WithRemSize::new(ui_font_size)
+ .h_full()
+ .w(left_gutter_width)
.flex()
.flex_row()
.flex_shrink_0()
.items_center()
- .h_full()
- .w(left_gutter_width)
.justify_center()
- .gap_2()
+ .gap_1()
.child(self.render_close_button(cx))
.map(|el| {
let CodegenStatus::Error(error) = self.codegen_status(cx) else {
@@ -177,26 +195,83 @@ impl Render for PromptEditor {
.flex_row()
.items_center()
.gap_1()
+ .child(add_context_button)
+ .child(self.model_selector.clone())
.children(buttons),
),
),
)
- .child(
- WithRemSize::new(ui_font_size)
- .flex()
- .flex_row()
- .items_center()
- .child(h_flex().flex_shrink_0().w(left_gutter_width))
- .child(
- h_flex()
- .w_full()
- .pl_1()
- .items_start()
- .justify_between()
- .child(add_context_button)
- .child(self.model_selector.clone()),
- ),
- )
+ .when_some(explanation, |this, _| {
+ this.child(
+ h_flex()
+ .size_full()
+ .justify_center()
+ .child(div().w(left_gutter_width + px(6.)))
+ .child(
+ div()
+ .size_full()
+ .min_w_0()
+ .pt(rems_from_px(3.))
+ .pl_0p5()
+ .flex_1()
+ .border_t_1()
+ .border_color(cx.theme().colors().border_variant)
+ .child(explanation_label),
+ ),
+ )
+ })
+ }
+}
+
+fn markdown_style(window: &Window, cx: &App) -> MarkdownStyle {
+ let theme_settings = ThemeSettings::get_global(cx);
+ let colors = cx.theme().colors();
+ let mut text_style = window.text_style();
+
+ text_style.refine(&TextStyleRefinement {
+ font_family: Some(theme_settings.ui_font.family.clone()),
+ color: Some(colors.text),
+ ..Default::default()
+ });
+
+ MarkdownStyle {
+ base_text_style: text_style.clone(),
+ syntax: cx.theme().syntax().clone(),
+ selection_background_color: colors.element_selection_background,
+ heading_level_styles: Some(HeadingLevelStyles {
+ h1: Some(TextStyleRefinement {
+ font_size: Some(rems(1.15).into()),
+ ..Default::default()
+ }),
+ h2: Some(TextStyleRefinement {
+ font_size: Some(rems(1.1).into()),
+ ..Default::default()
+ }),
+ h3: Some(TextStyleRefinement {
+ font_size: Some(rems(1.05).into()),
+ ..Default::default()
+ }),
+ h4: Some(TextStyleRefinement {
+ font_size: Some(rems(1.).into()),
+ ..Default::default()
+ }),
+ h5: Some(TextStyleRefinement {
+ font_size: Some(rems(0.95).into()),
+ ..Default::default()
+ }),
+ h6: Some(TextStyleRefinement {
+ font_size: Some(rems(0.875).into()),
+ ..Default::default()
+ }),
+ }),
+ inline_code: TextStyleRefinement {
+ font_family: Some(theme_settings.buffer_font.family.clone()),
+ font_fallbacks: theme_settings.buffer_font.fallbacks.clone(),
+ font_features: Some(theme_settings.buffer_font.features.clone()),
+ background_color: Some(colors.editor_foreground.opacity(0.08)),
+ ..Default::default()
+ },
+ ..Default::default()
}
}
@@ -759,6 +834,10 @@ impl PromptEditor {
})
.into_any_element()
}
+
+ fn render_markdown(&self, markdown: Entity, style: MarkdownStyle) -> MarkdownElement {
+ MarkdownElement::new(markdown, style)
+ }
}
pub enum PromptEditorMode {
diff --git a/crates/agent_ui/src/text_thread_editor.rs b/crates/agent_ui/src/text_thread_editor.rs
index 30538898b28a1d41d6c63b3e910f51c816e299ab..52efdf13be230d3fe6658e254f5d3f1a01b8211f 100644
--- a/crates/agent_ui/src/text_thread_editor.rs
+++ b/crates/agent_ui/src/text_thread_editor.rs
@@ -1682,6 +1682,98 @@ impl TextThreadEditor {
window: &mut Window,
cx: &mut Context,
) {
+ let editor_clipboard_selections = cx
+ .read_from_clipboard()
+ .and_then(|item| item.entries().first().cloned())
+ .and_then(|entry| match entry {
+ ClipboardEntry::String(text) => {
+ text.metadata_json::>()
+ }
+ _ => None,
+ });
+
+ let has_file_context = editor_clipboard_selections
+ .as_ref()
+ .is_some_and(|selections| {
+ selections
+ .iter()
+ .any(|sel| sel.file_path.is_some() && sel.line_range.is_some())
+ });
+
+ if has_file_context {
+ if let Some(clipboard_item) = cx.read_from_clipboard() {
+ if let Some(ClipboardEntry::String(clipboard_text)) =
+ clipboard_item.entries().first()
+ {
+ if let Some(selections) = editor_clipboard_selections {
+ cx.stop_propagation();
+
+ let text = clipboard_text.text();
+ self.editor.update(cx, |editor, cx| {
+ let mut current_offset = 0;
+ let weak_editor = cx.entity().downgrade();
+
+ for selection in selections {
+ if let (Some(file_path), Some(line_range)) =
+ (selection.file_path, selection.line_range)
+ {
+ let selected_text =
+ &text[current_offset..current_offset + selection.len];
+ let fence = assistant_slash_commands::codeblock_fence_for_path(
+ file_path.to_str(),
+ Some(line_range.clone()),
+ );
+ let formatted_text = format!("{fence}{selected_text}\n```");
+
+ let insert_point = editor
+ .selections
+ .newest::(&editor.display_snapshot(cx))
+ .head();
+ let start_row = MultiBufferRow(insert_point.row);
+
+ editor.insert(&formatted_text, window, cx);
+
+ let snapshot = editor.buffer().read(cx).snapshot(cx);
+ let anchor_before = snapshot.anchor_after(insert_point);
+ let anchor_after = editor
+ .selections
+ .newest_anchor()
+ .head()
+ .bias_left(&snapshot);
+
+ editor.insert("\n", window, cx);
+
+ let crease_text = acp_thread::selection_name(
+ Some(file_path.as_ref()),
+ &line_range,
+ );
+
+ let fold_placeholder = quote_selection_fold_placeholder(
+ crease_text,
+ weak_editor.clone(),
+ );
+ let crease = Crease::inline(
+ anchor_before..anchor_after,
+ fold_placeholder,
+ render_quote_selection_output_toggle,
+ |_, _, _, _| Empty.into_any(),
+ );
+ editor.insert_creases(vec![crease], cx);
+ editor.fold_at(start_row, window, cx);
+
+ current_offset += selection.len;
+ if !selection.is_entire_line && current_offset < text.len() {
+ current_offset += 1;
+ }
+ }
+ }
+ });
+ return;
+ }
+ }
+ }
+ }
+
cx.stop_propagation();
let mut images = if let Some(item) = cx.read_from_clipboard() {
diff --git a/crates/agent_ui/src/ui/agent_notification.rs b/crates/agent_ui/src/ui/agent_notification.rs
index af2a022f147b79a0a299c17dd26c7e9a8b62aeb9..34ca0bb32a82aa23d1b954554ce2dfec436bfe1c 100644
--- a/crates/agent_ui/src/ui/agent_notification.rs
+++ b/crates/agent_ui/src/ui/agent_notification.rs
@@ -106,9 +106,6 @@ impl Render for AgentNotification {
.font(ui_font)
.border_color(cx.theme().colors().border)
.rounded_xl()
- .on_click(cx.listener(|_, _, _, cx| {
- cx.emit(AgentNotificationEvent::Accepted);
- }))
.child(
h_flex()
.items_start()
diff --git a/crates/anthropic/src/anthropic.rs b/crates/anthropic/src/anthropic.rs
index 06e25253ee626ba76345d7a65b14f1fed0a04b8f..bf2a305011fad924d38dcb391840661f1fd3cdbb 100644
--- a/crates/anthropic/src/anthropic.rs
+++ b/crates/anthropic/src/anthropic.rs
@@ -12,6 +12,8 @@ pub use settings::ModelMode;
use strum::{EnumIter, EnumString};
use thiserror::Error;
+pub mod batches;
+
pub const ANTHROPIC_API_URL: &str = "https://api.anthropic.com";
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
@@ -465,6 +467,7 @@ impl Model {
}
}
+/// Generate completion with streaming.
pub async fn stream_completion(
client: &dyn HttpClient,
api_url: &str,
@@ -477,6 +480,101 @@ pub async fn stream_completion(
.map(|output| output.0)
}
+/// Generate completion without streaming.
+pub async fn non_streaming_completion(
+ client: &dyn HttpClient,
+ api_url: &str,
+ api_key: &str,
+ request: Request,
+ beta_headers: Option,
+) -> Result {
+ let (mut response, rate_limits) =
+ send_request(client, api_url, api_key, &request, beta_headers).await?;
+
+ if response.status().is_success() {
+ let mut body = String::new();
+ response
+ .body_mut()
+ .read_to_string(&mut body)
+ .await
+ .map_err(AnthropicError::ReadResponse)?;
+
+ serde_json::from_str(&body).map_err(AnthropicError::DeserializeResponse)
+ } else {
+ Err(handle_error_response(response, rate_limits).await)
+ }
+}
+
+async fn send_request(
+ client: &dyn HttpClient,
+ api_url: &str,
+ api_key: &str,
+ request: impl Serialize,
+ beta_headers: Option,
+) -> Result<(http::Response, RateLimitInfo), AnthropicError> {
+ let uri = format!("{api_url}/v1/messages");
+
+ let mut request_builder = HttpRequest::builder()
+ .method(Method::POST)
+ .uri(uri)
+ .header("Anthropic-Version", "2023-06-01")
+ .header("X-Api-Key", api_key.trim())
+ .header("Content-Type", "application/json");
+
+ if let Some(beta_headers) = beta_headers {
+ request_builder = request_builder.header("Anthropic-Beta", beta_headers);
+ }
+
+ let serialized_request =
+ serde_json::to_string(&request).map_err(AnthropicError::SerializeRequest)?;
+ let request = request_builder
+ .body(AsyncBody::from(serialized_request))
+ .map_err(AnthropicError::BuildRequestBody)?;
+
+ let response = client
+ .send(request)
+ .await
+ .map_err(AnthropicError::HttpSend)?;
+
+ let rate_limits = RateLimitInfo::from_headers(response.headers());
+
+ Ok((response, rate_limits))
+}
+
+async fn handle_error_response(
+ mut response: http::Response,
+ rate_limits: RateLimitInfo,
+) -> AnthropicError {
+ if response.status().as_u16() == 529 {
+ return AnthropicError::ServerOverloaded {
+ retry_after: rate_limits.retry_after,
+ };
+ }
+
+ if let Some(retry_after) = rate_limits.retry_after {
+ return AnthropicError::RateLimit { retry_after };
+ }
+
+ let mut body = String::new();
+ let read_result = response
+ .body_mut()
+ .read_to_string(&mut body)
+ .await
+ .map_err(AnthropicError::ReadResponse);
+
+ if let Err(err) = read_result {
+ return err;
+ }
+
+ match serde_json::from_str::(&body) {
+ Ok(Event::Error { error }) => AnthropicError::ApiError(error),
+ Ok(_) | Err(_) => AnthropicError::HttpResponseError {
+ status_code: response.status(),
+ message: body,
+ },
+ }
+}
+
/// An individual rate limit.
#[derive(Debug)]
pub struct RateLimit {
@@ -580,30 +678,10 @@ pub async fn stream_completion_with_rate_limit_info(
base: request,
stream: true,
};
- let uri = format!("{api_url}/v1/messages");
- let mut request_builder = HttpRequest::builder()
- .method(Method::POST)
- .uri(uri)
- .header("Anthropic-Version", "2023-06-01")
- .header("X-Api-Key", api_key.trim())
- .header("Content-Type", "application/json");
+ let (response, rate_limits) =
+ send_request(client, api_url, api_key, &request, beta_headers).await?;
- if let Some(beta_headers) = beta_headers {
- request_builder = request_builder.header("Anthropic-Beta", beta_headers);
- }
-
- let serialized_request =
- serde_json::to_string(&request).map_err(AnthropicError::SerializeRequest)?;
- let request = request_builder
- .body(AsyncBody::from(serialized_request))
- .map_err(AnthropicError::BuildRequestBody)?;
-
- let mut response = client
- .send(request)
- .await
- .map_err(AnthropicError::HttpSend)?;
- let rate_limits = RateLimitInfo::from_headers(response.headers());
if response.status().is_success() {
let reader = BufReader::new(response.into_body());
let stream = reader
@@ -622,27 +700,8 @@ pub async fn stream_completion_with_rate_limit_info(
})
.boxed();
Ok((stream, Some(rate_limits)))
- } else if response.status().as_u16() == 529 {
- Err(AnthropicError::ServerOverloaded {
- retry_after: rate_limits.retry_after,
- })
- } else if let Some(retry_after) = rate_limits.retry_after {
- Err(AnthropicError::RateLimit { retry_after })
} else {
- let mut body = String::new();
- response
- .body_mut()
- .read_to_string(&mut body)
- .await
- .map_err(AnthropicError::ReadResponse)?;
-
- match serde_json::from_str::(&body) {
- Ok(Event::Error { error }) => Err(AnthropicError::ApiError(error)),
- Ok(_) | Err(_) => Err(AnthropicError::HttpResponseError {
- status_code: response.status(),
- message: body,
- }),
- }
+ Err(handle_error_response(response, rate_limits).await)
}
}
diff --git a/crates/anthropic/src/batches.rs b/crates/anthropic/src/batches.rs
new file mode 100644
index 0000000000000000000000000000000000000000..5fb594348d45c84e8c246c2611f7cde3aa77a18d
--- /dev/null
+++ b/crates/anthropic/src/batches.rs
@@ -0,0 +1,190 @@
+use anyhow::Result;
+use futures::AsyncReadExt;
+use http_client::{AsyncBody, HttpClient, Method, Request as HttpRequest};
+use serde::{Deserialize, Serialize};
+
+use crate::{AnthropicError, ApiError, RateLimitInfo, Request, Response};
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct BatchRequest {
+ pub custom_id: String,
+ pub params: Request,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct CreateBatchRequest {
+ pub requests: Vec,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct MessageBatchRequestCounts {
+ pub processing: u64,
+ pub succeeded: u64,
+ pub errored: u64,
+ pub canceled: u64,
+ pub expired: u64,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct MessageBatch {
+ pub id: String,
+ #[serde(rename = "type")]
+ pub batch_type: String,
+ pub processing_status: String,
+ pub request_counts: MessageBatchRequestCounts,
+ pub ended_at: Option,
+ pub created_at: String,
+ pub expires_at: String,
+ pub archived_at: Option,
+ pub cancel_initiated_at: Option,
+ pub results_url: Option,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+#[serde(tag = "type")]
+pub enum BatchResult {
+ #[serde(rename = "succeeded")]
+ Succeeded { message: Response },
+ #[serde(rename = "errored")]
+ Errored { error: ApiError },
+ #[serde(rename = "canceled")]
+ Canceled,
+ #[serde(rename = "expired")]
+ Expired,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct BatchIndividualResponse {
+ pub custom_id: String,
+ pub result: BatchResult,
+}
+
+pub async fn create_batch(
+ client: &dyn HttpClient,
+ api_url: &str,
+ api_key: &str,
+ request: CreateBatchRequest,
+) -> Result {
+ let uri = format!("{api_url}/v1/messages/batches");
+
+ let request_builder = HttpRequest::builder()
+ .method(Method::POST)
+ .uri(uri)
+ .header("Anthropic-Version", "2023-06-01")
+ .header("X-Api-Key", api_key.trim())
+ .header("Content-Type", "application/json");
+
+ let serialized_request =
+ serde_json::to_string(&request).map_err(AnthropicError::SerializeRequest)?;
+ let http_request = request_builder
+ .body(AsyncBody::from(serialized_request))
+ .map_err(AnthropicError::BuildRequestBody)?;
+
+ let mut response = client
+ .send(http_request)
+ .await
+ .map_err(AnthropicError::HttpSend)?;
+
+ let rate_limits = RateLimitInfo::from_headers(response.headers());
+
+ if response.status().is_success() {
+ let mut body = String::new();
+ response
+ .body_mut()
+ .read_to_string(&mut body)
+ .await
+ .map_err(AnthropicError::ReadResponse)?;
+
+ serde_json::from_str(&body).map_err(AnthropicError::DeserializeResponse)
+ } else {
+ Err(crate::handle_error_response(response, rate_limits).await)
+ }
+}
+
+pub async fn retrieve_batch(
+ client: &dyn HttpClient,
+ api_url: &str,
+ api_key: &str,
+ message_batch_id: &str,
+) -> Result {
+ let uri = format!("{api_url}/v1/messages/batches/{message_batch_id}");
+
+ let request_builder = HttpRequest::builder()
+ .method(Method::GET)
+ .uri(uri)
+ .header("Anthropic-Version", "2023-06-01")
+ .header("X-Api-Key", api_key.trim());
+
+ let http_request = request_builder
+ .body(AsyncBody::default())
+ .map_err(AnthropicError::BuildRequestBody)?;
+
+ let mut response = client
+ .send(http_request)
+ .await
+ .map_err(AnthropicError::HttpSend)?;
+
+ let rate_limits = RateLimitInfo::from_headers(response.headers());
+
+ if response.status().is_success() {
+ let mut body = String::new();
+ response
+ .body_mut()
+ .read_to_string(&mut body)
+ .await
+ .map_err(AnthropicError::ReadResponse)?;
+
+ serde_json::from_str(&body).map_err(AnthropicError::DeserializeResponse)
+ } else {
+ Err(crate::handle_error_response(response, rate_limits).await)
+ }
+}
+
+pub async fn retrieve_batch_results(
+ client: &dyn HttpClient,
+ api_url: &str,
+ api_key: &str,
+ message_batch_id: &str,
+) -> Result, AnthropicError> {
+ let uri = format!("{api_url}/v1/messages/batches/{message_batch_id}/results");
+
+ let request_builder = HttpRequest::builder()
+ .method(Method::GET)
+ .uri(uri)
+ .header("Anthropic-Version", "2023-06-01")
+ .header("X-Api-Key", api_key.trim());
+
+ let http_request = request_builder
+ .body(AsyncBody::default())
+ .map_err(AnthropicError::BuildRequestBody)?;
+
+ let mut response = client
+ .send(http_request)
+ .await
+ .map_err(AnthropicError::HttpSend)?;
+
+ let rate_limits = RateLimitInfo::from_headers(response.headers());
+
+ if response.status().is_success() {
+ let mut body = String::new();
+ response
+ .body_mut()
+ .read_to_string(&mut body)
+ .await
+ .map_err(AnthropicError::ReadResponse)?;
+
+ let mut results = Vec::new();
+ for line in body.lines() {
+ if line.trim().is_empty() {
+ continue;
+ }
+ let result: BatchIndividualResponse =
+ serde_json::from_str(line).map_err(AnthropicError::DeserializeResponse)?;
+ results.push(result);
+ }
+
+ Ok(results)
+ } else {
+ Err(crate::handle_error_response(response, rate_limits).await)
+ }
+}
diff --git a/crates/assistant_text_thread/src/text_thread.rs b/crates/assistant_text_thread/src/text_thread.rs
index 7f24c8f665f8d34aed199562dce1131797f13c9d..b808d9fb0019ccad25366d9ae60cc1f765126c74 100644
--- a/crates/assistant_text_thread/src/text_thread.rs
+++ b/crates/assistant_text_thread/src/text_thread.rs
@@ -14,7 +14,7 @@ use fs::{Fs, RenameOptions};
use futures::{FutureExt, StreamExt, future::Shared};
use gpui::{
App, AppContext as _, Context, Entity, EventEmitter, RenderImage, SharedString, Subscription,
- Task,
+ Task, WeakEntity,
};
use itertools::Itertools as _;
use language::{AnchorRangeExt, Bias, Buffer, LanguageRegistry, OffsetRangeExt, Point, ToOffset};
@@ -688,7 +688,7 @@ pub struct TextThread {
_subscriptions: Vec,
telemetry: Option>,
language_registry: Arc,
- project: Option>,
+ project: Option>,
prompt_builder: Arc,
completion_mode: agent_settings::CompletionMode,
}
@@ -708,7 +708,7 @@ impl EventEmitter for TextThread {}
impl TextThread {
pub fn local(
language_registry: Arc,
- project: Option>,
+ project: Option>,
telemetry: Option>,
prompt_builder: Arc,
slash_commands: Arc,
@@ -742,7 +742,7 @@ impl TextThread {
language_registry: Arc,
prompt_builder: Arc,
slash_commands: Arc,
- project: Option>,
+ project: Option>,
telemetry: Option>,
cx: &mut Context,
) -> Self {
@@ -873,7 +873,7 @@ impl TextThread {
language_registry: Arc,
prompt_builder: Arc,
slash_commands: Arc,
- project: Option>,
+ project: Option>,
telemetry: Option>,
cx: &mut Context,
) -> Self {
@@ -1167,10 +1167,6 @@ impl TextThread {
self.language_registry.clone()
}
- pub fn project(&self) -> Option> {
- self.project.clone()
- }
-
pub fn prompt_builder(&self) -> Arc {
self.prompt_builder.clone()
}
@@ -2967,7 +2963,7 @@ impl TextThread {
}
fn update_model_request_usage(&self, amount: u32, limit: UsageLimit, cx: &mut App) {
- let Some(project) = &self.project else {
+ let Some(project) = self.project.as_ref().and_then(|project| project.upgrade()) else {
return;
};
project.read(cx).user_store().update(cx, |user_store, cx| {
diff --git a/crates/assistant_text_thread/src/text_thread_store.rs b/crates/assistant_text_thread/src/text_thread_store.rs
index 19c317baf0fa728c77faebc388b5e36008aa39b3..71fabed503e8c04a8865bed72c28ae5b30e75574 100644
--- a/crates/assistant_text_thread/src/text_thread_store.rs
+++ b/crates/assistant_text_thread/src/text_thread_store.rs
@@ -51,7 +51,7 @@ pub struct TextThreadStore {
telemetry: Arc,
_watch_updates: Task>,
client: Arc,
- project: Entity,
+ project: WeakEntity,
project_is_shared: bool,
client_subscription: Option,
_project_subscriptions: Vec,
@@ -119,10 +119,10 @@ impl TextThreadStore {
],
project_is_shared: false,
client: project.read(cx).client(),
- project: project.clone(),
+ project: project.downgrade(),
prompt_builder,
};
- this.handle_project_shared(project.clone(), cx);
+ this.handle_project_shared(cx);
this.synchronize_contexts(cx);
this.register_context_server_handlers(cx);
this.reload(cx).detach_and_log_err(cx);
@@ -146,7 +146,7 @@ impl TextThreadStore {
telemetry: project.read(cx).client().telemetry().clone(),
_watch_updates: Task::ready(None),
client: project.read(cx).client(),
- project,
+ project: project.downgrade(),
project_is_shared: false,
client_subscription: None,
_project_subscriptions: Default::default(),
@@ -180,8 +180,10 @@ impl TextThreadStore {
) -> Result {
let context_id = TextThreadId::from_proto(envelope.payload.context_id);
let operations = this.update(&mut cx, |this, cx| {
+ let project = this.project.upgrade().context("project not found")?;
+
anyhow::ensure!(
- !this.project.read(cx).is_via_collab(),
+ !project.read(cx).is_via_collab(),
"only the host contexts can be opened"
);
@@ -211,8 +213,9 @@ impl TextThreadStore {
mut cx: AsyncApp,
) -> Result {
let (context_id, operations) = this.update(&mut cx, |this, cx| {
+ let project = this.project.upgrade().context("project not found")?;
anyhow::ensure!(
- !this.project.read(cx).is_via_collab(),
+ !project.read(cx).is_via_collab(),
"can only create contexts as the host"
);
@@ -255,8 +258,9 @@ impl TextThreadStore {
mut cx: AsyncApp,
) -> Result {
this.update(&mut cx, |this, cx| {
+ let project = this.project.upgrade().context("project not found")?;
anyhow::ensure!(
- !this.project.read(cx).is_via_collab(),
+ !project.read(cx).is_via_collab(),
"only the host can synchronize contexts"
);
@@ -293,8 +297,12 @@ impl TextThreadStore {
})?
}
- fn handle_project_shared(&mut self, _: Entity, cx: &mut Context) {
- let is_shared = self.project.read(cx).is_shared();
+ fn handle_project_shared(&mut self, cx: &mut Context) {
+ let Some(project) = self.project.upgrade() else {
+ return;
+ };
+
+ let is_shared = project.read(cx).is_shared();
let was_shared = mem::replace(&mut self.project_is_shared, is_shared);
if is_shared == was_shared {
return;
@@ -309,7 +317,7 @@ impl TextThreadStore {
false
}
});
- let remote_id = self.project.read(cx).remote_id().unwrap();
+ let remote_id = project.read(cx).remote_id().unwrap();
self.client_subscription = self
.client
.subscribe_to_entity(remote_id)
@@ -323,13 +331,13 @@ impl TextThreadStore {
fn handle_project_event(
&mut self,
- project: Entity,
+ _project: Entity,
event: &project::Event,
cx: &mut Context,
) {
match event {
project::Event::RemoteIdChanged(_) => {
- self.handle_project_shared(project, cx);
+ self.handle_project_shared(cx);
}
project::Event::Reshared => {
self.advertise_contexts(cx);
@@ -382,7 +390,10 @@ impl TextThreadStore {
}
pub fn create_remote(&mut self, cx: &mut Context) -> Task>> {
- let project = self.project.read(cx);
+ let Some(project) = self.project.upgrade() else {
+ return Task::ready(Err(anyhow::anyhow!("project was dropped")));
+ };
+ let project = project.read(cx);
let Some(project_id) = project.remote_id() else {
return Task::ready(Err(anyhow::anyhow!("project was not remote")));
};
@@ -541,7 +552,10 @@ impl TextThreadStore {
text_thread_id: TextThreadId,
cx: &mut Context,
) -> Task>> {
- let project = self.project.read(cx);
+ let Some(project) = self.project.upgrade() else {
+ return Task::ready(Err(anyhow::anyhow!("project was dropped")));
+ };
+ let project = project.read(cx);
let Some(project_id) = project.remote_id() else {
return Task::ready(Err(anyhow::anyhow!("project was not remote")));
};
@@ -618,7 +632,10 @@ impl TextThreadStore {
event: &TextThreadEvent,
cx: &mut Context,
) {
- let Some(project_id) = self.project.read(cx).remote_id() else {
+ let Some(project) = self.project.upgrade() else {
+ return;
+ };
+ let Some(project_id) = project.read(cx).remote_id() else {
return;
};
@@ -652,12 +669,14 @@ impl TextThreadStore {
}
fn advertise_contexts(&self, cx: &App) {
- let Some(project_id) = self.project.read(cx).remote_id() else {
+ let Some(project) = self.project.upgrade() else {
+ return;
+ };
+ let Some(project_id) = project.read(cx).remote_id() else {
return;
};
-
// For now, only the host can advertise their open contexts.
- if self.project.read(cx).is_via_collab() {
+ if project.read(cx).is_via_collab() {
return;
}
@@ -689,7 +708,10 @@ impl TextThreadStore {
}
fn synchronize_contexts(&mut self, cx: &mut Context) {
- let Some(project_id) = self.project.read(cx).remote_id() else {
+ let Some(project) = self.project.upgrade() else {
+ return;
+ };
+ let Some(project_id) = project.read(cx).remote_id() else {
return;
};
@@ -828,7 +850,10 @@ impl TextThreadStore {
}
fn register_context_server_handlers(&self, cx: &mut Context) {
- let context_server_store = self.project.read(cx).context_server_store();
+ let Some(project) = self.project.upgrade() else {
+ return;
+ };
+ let context_server_store = project.read(cx).context_server_store();
cx.subscribe(&context_server_store, Self::handle_context_server_event)
.detach();
diff --git a/crates/cloud_llm_client/src/predict_edits_v3.rs b/crates/cloud_llm_client/src/predict_edits_v3.rs
index de8d69dc14870c5583679753c9a75a477e0cc759..9e590dc4cf48a82ecdda8b007c38ab15f3b602be 100644
--- a/crates/cloud_llm_client/src/predict_edits_v3.rs
+++ b/crates/cloud_llm_client/src/predict_edits_v3.rs
@@ -31,18 +31,10 @@ pub struct PredictEditsRequest {
/// Within `signatures`
pub excerpt_parent: Option,
#[serde(skip_serializing_if = "Vec::is_empty", default)]
- pub included_files: Vec,
- #[serde(skip_serializing_if = "Vec::is_empty", default)]
- pub signatures: Vec,
- #[serde(skip_serializing_if = "Vec::is_empty", default)]
- pub referenced_declarations: Vec,
+ pub related_files: Vec,
pub events: Vec>,
#[serde(default)]
pub can_collect_data: bool,
- #[serde(skip_serializing_if = "Vec::is_empty", default)]
- pub diagnostic_groups: Vec,
- #[serde(skip_serializing_if = "is_default", default)]
- pub diagnostic_groups_truncated: bool,
/// Info about the git repository state, only present when can_collect_data is true.
#[serde(skip_serializing_if = "Option::is_none", default)]
pub git_info: Option,
@@ -58,7 +50,7 @@ pub struct PredictEditsRequest {
}
#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct IncludedFile {
+pub struct RelatedFile {
pub path: Arc,
pub max_row: Line,
pub excerpts: Vec,
@@ -72,11 +64,9 @@ pub struct Excerpt {
#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, EnumIter)]
pub enum PromptFormat {
- MarkedExcerpt,
- LabeledSections,
- NumLinesUniDiff,
+ /// XML old_tex/new_text
OldTextNewText,
- /// Prompt format intended for use via zeta_cli
+ /// Prompt format intended for use via edit_prediction_cli
OnlySnippets,
/// One-sentence instructions used in fine-tuned models
Minimal,
@@ -87,7 +77,7 @@ pub enum PromptFormat {
}
impl PromptFormat {
- pub const DEFAULT: PromptFormat = PromptFormat::NumLinesUniDiff;
+ pub const DEFAULT: PromptFormat = PromptFormat::Minimal;
}
impl Default for PromptFormat {
@@ -105,10 +95,7 @@ impl PromptFormat {
impl std::fmt::Display for PromptFormat {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
match self {
- PromptFormat::MarkedExcerpt => write!(f, "Marked Excerpt"),
- PromptFormat::LabeledSections => write!(f, "Labeled Sections"),
PromptFormat::OnlySnippets => write!(f, "Only Snippets"),
- PromptFormat::NumLinesUniDiff => write!(f, "Numbered Lines / Unified Diff"),
PromptFormat::OldTextNewText => write!(f, "Old Text / New Text"),
PromptFormat::Minimal => write!(f, "Minimal"),
PromptFormat::MinimalQwen => write!(f, "Minimal + Qwen FIM"),
@@ -178,67 +165,6 @@ impl<'a> std::fmt::Display for DiffPathFmt<'a> {
}
}
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct Signature {
- pub text: String,
- pub text_is_truncated: bool,
- #[serde(skip_serializing_if = "Option::is_none", default)]
- pub parent_index: Option,
- /// Range of `text` within the file, possibly truncated according to `text_is_truncated`. The
- /// file is implicitly the file that contains the descendant declaration or excerpt.
- pub range: Range,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct ReferencedDeclaration {
- pub path: Arc,
- pub text: String,
- pub text_is_truncated: bool,
- /// Range of `text` within file, possibly truncated according to `text_is_truncated`
- pub range: Range,
- /// Range within `text`
- pub signature_range: Range,
- /// Index within `signatures`.
- #[serde(skip_serializing_if = "Option::is_none", default)]
- pub parent_index: Option,
- pub score_components: DeclarationScoreComponents,
- pub signature_score: f32,
- pub declaration_score: f32,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct DeclarationScoreComponents {
- pub is_same_file: bool,
- pub is_referenced_nearby: bool,
- pub is_referenced_in_breadcrumb: bool,
- pub reference_count: usize,
- pub same_file_declaration_count: usize,
- pub declaration_count: usize,
- pub reference_line_distance: u32,
- pub declaration_line_distance: u32,
- pub excerpt_vs_item_jaccard: f32,
- pub excerpt_vs_signature_jaccard: f32,
- pub adjacent_vs_item_jaccard: f32,
- pub adjacent_vs_signature_jaccard: f32,
- pub excerpt_vs_item_weighted_overlap: f32,
- pub excerpt_vs_signature_weighted_overlap: f32,
- pub adjacent_vs_item_weighted_overlap: f32,
- pub adjacent_vs_signature_weighted_overlap: f32,
- pub path_import_match_count: usize,
- pub wildcard_path_import_match_count: usize,
- pub import_similarity: f32,
- pub max_import_similarity: f32,
- pub normalized_import_similarity: f32,
- pub wildcard_import_similarity: f32,
- pub normalized_wildcard_import_similarity: f32,
- pub included_by_others: usize,
- pub includes_others: usize,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(transparent)]
-pub struct DiagnosticGroup(pub Box);
-
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct PredictEditsResponse {
pub request_id: Uuid,
@@ -262,10 +188,6 @@ pub struct Edit {
pub content: String,
}
-fn is_default(value: &T) -> bool {
- *value == T::default()
-}
-
#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, PartialOrd, Eq, Ord)]
pub struct Point {
pub line: Line,
diff --git a/crates/cloud_zeta2_prompt/Cargo.toml b/crates/cloud_zeta2_prompt/Cargo.toml
index fa8246950f8d03029388e0276954de946efc2346..a15e3fe43c28349920433272c4040ccc58ff4cb4 100644
--- a/crates/cloud_zeta2_prompt/Cargo.toml
+++ b/crates/cloud_zeta2_prompt/Cargo.toml
@@ -15,9 +15,4 @@ path = "src/cloud_zeta2_prompt.rs"
anyhow.workspace = true
cloud_llm_client.workspace = true
indoc.workspace = true
-ordered-float.workspace = true
-rustc-hash.workspace = true
-schemars.workspace = true
serde.workspace = true
-serde_json.workspace = true
-strum.workspace = true
diff --git a/crates/cloud_zeta2_prompt/src/cloud_zeta2_prompt.rs b/crates/cloud_zeta2_prompt/src/cloud_zeta2_prompt.rs
index d67190c17556c5eb8b901e9baad73cc2691a9c78..62bfa45f47d0fdfefa9fbd72320c0ddee71cbc47 100644
--- a/crates/cloud_zeta2_prompt/src/cloud_zeta2_prompt.rs
+++ b/crates/cloud_zeta2_prompt/src/cloud_zeta2_prompt.rs
@@ -1,20 +1,12 @@
-//! Zeta2 prompt planning and generation code shared with cloud.
-pub mod retrieval_prompt;
-
-use anyhow::{Context as _, Result, anyhow};
+use anyhow::Result;
use cloud_llm_client::predict_edits_v3::{
- self, DiffPathFmt, Event, Excerpt, IncludedFile, Line, Point, PromptFormat,
- ReferencedDeclaration,
+ self, DiffPathFmt, Event, Excerpt, Line, Point, PromptFormat, RelatedFile,
};
use indoc::indoc;
-use ordered_float::OrderedFloat;
-use rustc_hash::{FxHashMap, FxHashSet};
-use serde::Serialize;
use std::cmp;
use std::fmt::Write;
+use std::path::Path;
use std::sync::Arc;
-use std::{cmp::Reverse, collections::BinaryHeap, ops::Range, path::Path};
-use strum::{EnumIter, IntoEnumIterator};
pub const DEFAULT_MAX_PROMPT_BYTES: usize = 10 * 1024;
@@ -24,69 +16,6 @@ pub const EDITABLE_REGION_START_MARKER_WITH_NEWLINE: &str = "<|editable_region_s
/// NOTE: Differs from zed version of constant - includes a newline
pub const EDITABLE_REGION_END_MARKER_WITH_NEWLINE: &str = "<|editable_region_end|>\n";
-// TODO: use constants for markers?
-const MARKED_EXCERPT_INSTRUCTIONS: &str = indoc! {"
- You are a code completion assistant and your task is to analyze user edits and then rewrite an excerpt that the user provides, suggesting the appropriate edits within the excerpt, taking into account the cursor location.
-
- The excerpt to edit will be wrapped in markers <|editable_region_start|> and <|editable_region_end|>. The cursor position is marked with <|user_cursor|>. Please respond with edited code for that region.
-
- Other code is provided for context, and `…` indicates when code has been skipped.
-
- ## Edit History
-
-"};
-
-const LABELED_SECTIONS_INSTRUCTIONS: &str = indoc! {r#"
- You are a code completion assistant and your task is to analyze user edits, and suggest an edit to one of the provided sections of code.
-
- Sections of code are grouped by file and then labeled by `<|section_N|>` (e.g `<|section_8|>`).
-
- The cursor position is marked with `<|user_cursor|>` and it will appear within a special section labeled `<|current_section|>`. Prefer editing the current section until no more changes are needed within it.
-
- Respond ONLY with the name of the section to edit on a single line, followed by all of the code that should replace that section. For example:
-
- <|current_section|>
- for i in 0..16 {
- println!("{i}");
- }
-
- ## Edit History
-
-"#};
-
-const NUMBERED_LINES_INSTRUCTIONS: &str = indoc! {r#"
- # Instructions
-
- You are an edit prediction agent in a code editor.
- Your job is to predict the next edit that the user will make,
- based on their last few edits and their current cursor location.
-
- ## Output Format
-
- You must briefly explain your understanding of the user's goal, in one
- or two sentences, and then specify their next edit in the form of a
- unified diff, like this:
-
- ```
- --- a/src/myapp/cli.py
- +++ b/src/myapp/cli.py
- @@ ... @@
- import os
- import time
- import sys
- +from constants import LOG_LEVEL_WARNING
- @@ ... @@
- config.headless()
- config.set_interactive(false)
- -config.set_log_level(LOG_L)
- +config.set_log_level(LOG_LEVEL_WARNING)
- config.set_use_color(True)
- ```
-
- ## Edit History
-
-"#};
-
const STUDENT_MODEL_INSTRUCTIONS: &str = indoc! {r#"
You are a code completion assistant that analyzes edit history to identify and systematically complete incomplete refactorings or patterns across the entire codebase.
@@ -94,20 +23,6 @@ const STUDENT_MODEL_INSTRUCTIONS: &str = indoc! {r#"
"#};
-const UNIFIED_DIFF_REMINDER: &str = indoc! {"
- ---
-
- Analyze the edit history and the files, then provide the unified diff for your predicted edits.
- Do not include the cursor marker in your output.
- Your diff should include edited file paths in its file headers (lines beginning with `---` and `+++`).
- Do not include line numbers in the hunk headers, use `@@ ... @@`.
- Removed lines begin with `-`.
- Added lines begin with `+`.
- Context lines begin with an extra space.
- Context and removed lines are used to match the target edit location, so make sure to include enough of them
- to uniquely identify it amongst all excerpts of code provided.
-"};
-
const MINIMAL_PROMPT_REMINDER: &str = indoc! {"
---
@@ -164,49 +79,25 @@ const OLD_TEXT_NEW_TEXT_REMINDER: &str = indoc! {r#"
Remember that the edits in the edit history have already been applied.
"#};
-pub fn build_prompt(
- request: &predict_edits_v3::PredictEditsRequest,
-) -> Result<(String, SectionLabels)> {
- let mut section_labels = Default::default();
-
+pub fn build_prompt(request: &predict_edits_v3::PredictEditsRequest) -> Result {
let prompt_data = PromptData {
events: request.events.clone(),
cursor_point: request.cursor_point,
cursor_path: request.excerpt_path.clone(),
- included_files: request.included_files.clone(),
+ included_files: request.related_files.clone(),
};
match request.prompt_format {
PromptFormat::MinimalQwen => {
- return Ok((MinimalQwenPrompt.render(&prompt_data), section_labels));
+ return Ok(MinimalQwenPrompt.render(&prompt_data));
}
PromptFormat::SeedCoder1120 => {
- return Ok((SeedCoder1120Prompt.render(&prompt_data), section_labels));
+ return Ok(SeedCoder1120Prompt.render(&prompt_data));
}
_ => (),
};
- let mut insertions = match request.prompt_format {
- PromptFormat::MarkedExcerpt => vec![
- (
- Point {
- line: request.excerpt_line_range.start,
- column: 0,
- },
- EDITABLE_REGION_START_MARKER_WITH_NEWLINE,
- ),
- (request.cursor_point, CURSOR_MARKER),
- (
- Point {
- line: request.excerpt_line_range.end,
- column: 0,
- },
- EDITABLE_REGION_END_MARKER_WITH_NEWLINE,
- ),
- ],
- PromptFormat::LabeledSections
- | PromptFormat::NumLinesUniDiff
- | PromptFormat::Minimal
- | PromptFormat::OldTextNewText => {
+ let insertions = match request.prompt_format {
+ PromptFormat::Minimal | PromptFormat::OldTextNewText => {
vec![(request.cursor_point, CURSOR_MARKER)]
}
PromptFormat::OnlySnippets => vec![],
@@ -215,9 +106,6 @@ pub fn build_prompt(
};
let mut prompt = match request.prompt_format {
- PromptFormat::MarkedExcerpt => MARKED_EXCERPT_INSTRUCTIONS.to_string(),
- PromptFormat::LabeledSections => LABELED_SECTIONS_INSTRUCTIONS.to_string(),
- PromptFormat::NumLinesUniDiff => NUMBERED_LINES_INSTRUCTIONS.to_string(),
PromptFormat::OldTextNewText => XML_TAGS_INSTRUCTIONS.to_string(),
PromptFormat::OnlySnippets => String::new(),
PromptFormat::Minimal => STUDENT_MODEL_INSTRUCTIONS.to_string(),
@@ -247,7 +135,7 @@ pub fn build_prompt(
You can only edit exactly this part of the file.
We prepend line numbers (e.g., `123|`); they are not part of the file.)
"},
- PromptFormat::NumLinesUniDiff | PromptFormat::OldTextNewText => indoc! {"
+ PromptFormat::OldTextNewText => indoc! {"
## Code Excerpts
Here is some excerpts of code that you should take into account to predict the next edit.
@@ -263,64 +151,51 @@ pub fn build_prompt(
Lines starting with `…` indicate omitted line ranges. These may appear inside multi-line code constructs.
"},
- _ => indoc! {"
+ PromptFormat::OnlySnippets | PromptFormat::MinimalQwen | PromptFormat::SeedCoder1120 => {
+ indoc! {"
## Code Excerpts
The cursor marker <|user_cursor|> indicates the current user cursor position.
The file is in current state, edits from edit history have been applied.
- "},
+ "}
+ }
};
prompt.push_str(excerpts_preamble);
prompt.push('\n');
- if !request.referenced_declarations.is_empty() || !request.signatures.is_empty() {
- let syntax_based_prompt = SyntaxBasedPrompt::populate(request)?;
- section_labels = syntax_based_prompt.write(&mut insertions, &mut prompt)?;
- } else {
- if request.prompt_format == PromptFormat::LabeledSections {
- anyhow::bail!("PromptFormat::LabeledSections cannot be used with ContextMode::Llm");
- }
-
- let include_line_numbers = matches!(
- request.prompt_format,
- PromptFormat::NumLinesUniDiff | PromptFormat::Minimal
- );
- for related_file in &request.included_files {
- if request.prompt_format == PromptFormat::Minimal {
- write_codeblock_with_filename(
- &related_file.path,
- &related_file.excerpts,
- if related_file.path == request.excerpt_path {
- &insertions
- } else {
- &[]
- },
- related_file.max_row,
- include_line_numbers,
- &mut prompt,
- );
- } else {
- write_codeblock(
- &related_file.path,
- &related_file.excerpts,
- if related_file.path == request.excerpt_path {
- &insertions
- } else {
- &[]
- },
- related_file.max_row,
- include_line_numbers,
- &mut prompt,
- );
- }
+ let include_line_numbers = matches!(request.prompt_format, PromptFormat::Minimal);
+ for related_file in &request.related_files {
+ if request.prompt_format == PromptFormat::Minimal {
+ write_codeblock_with_filename(
+ &related_file.path,
+ &related_file.excerpts,
+ if related_file.path == request.excerpt_path {
+ &insertions
+ } else {
+ &[]
+ },
+ related_file.max_row,
+ include_line_numbers,
+ &mut prompt,
+ );
+ } else {
+ write_codeblock(
+ &related_file.path,
+ &related_file.excerpts,
+ if related_file.path == request.excerpt_path {
+ &insertions
+ } else {
+ &[]
+ },
+ related_file.max_row,
+ include_line_numbers,
+ &mut prompt,
+ );
}
}
match request.prompt_format {
- PromptFormat::NumLinesUniDiff => {
- prompt.push_str(UNIFIED_DIFF_REMINDER);
- }
PromptFormat::OldTextNewText => {
prompt.push_str(OLD_TEXT_NEW_TEXT_REMINDER);
}
@@ -330,7 +205,7 @@ pub fn build_prompt(
_ => {}
}
- Ok((prompt, section_labels))
+ Ok(prompt)
}
pub fn generation_params(prompt_format: PromptFormat) -> GenerationParams {
@@ -444,476 +319,11 @@ pub fn push_events(output: &mut String, events: &[Arc])
writeln!(output, "`````\n").unwrap();
}
-pub struct SyntaxBasedPrompt<'a> {
- request: &'a predict_edits_v3::PredictEditsRequest,
- /// Snippets to include in the prompt. These may overlap - they are merged / deduplicated in
- /// `to_prompt_string`.
- snippets: Vec>,
- budget_used: usize,
-}
-
-#[derive(Clone, Debug)]
-pub struct PlannedSnippet<'a> {
- path: Arc,
- range: Range,
- text: &'a str,
- // TODO: Indicate this in the output
- #[allow(dead_code)]
- text_is_truncated: bool,
-}
-
-#[derive(EnumIter, Clone, Copy, PartialEq, Eq, Hash, Debug, PartialOrd, Ord)]
-pub enum DeclarationStyle {
- Signature,
- Declaration,
-}
-
-#[derive(Default, Clone, Debug, Serialize)]
-pub struct SectionLabels {
- pub excerpt_index: usize,
- pub section_ranges: Vec<(Arc, Range)>,
-}
-
-impl<'a> SyntaxBasedPrompt<'a> {
- /// Greedy one-pass knapsack algorithm to populate the prompt plan. Does the following:
- ///
- /// Initializes a priority queue by populating it with each snippet, finding the
- /// DeclarationStyle that minimizes `score_density = score / snippet.range(style).len()`. When a
- /// "signature" snippet is popped, insert an entry for the "declaration" variant that reflects
- /// the cost of upgrade.
- ///
- /// TODO: Implement an early halting condition. One option might be to have another priority
- /// queue where the score is the size, and update it accordingly. Another option might be to
- /// have some simpler heuristic like bailing after N failed insertions, or based on how much
- /// budget is left.
- ///
- /// TODO: Has the current known sources of imprecision:
- ///
- /// * Does not consider snippet overlap when ranking. For example, it might add a field to the
- /// plan even though the containing struct is already included.
- ///
- /// * Does not consider cost of signatures when ranking snippets - this is tricky since
- /// signatures may be shared by multiple snippets.
- ///
- /// * Does not include file paths / other text when considering max_bytes.
- pub fn populate(request: &'a predict_edits_v3::PredictEditsRequest) -> Result {
- let mut this = Self {
- request,
- snippets: Vec::new(),
- budget_used: request.excerpt.len(),
- };
- let mut included_parents = FxHashSet::default();
- let additional_parents = this.additional_parent_signatures(
- &request.excerpt_path,
- request.excerpt_parent,
- &included_parents,
- )?;
- this.add_parents(&mut included_parents, additional_parents);
-
- let max_bytes = request.prompt_max_bytes.unwrap_or(DEFAULT_MAX_PROMPT_BYTES);
-
- if this.budget_used > max_bytes {
- return Err(anyhow!(
- "Excerpt + signatures size of {} already exceeds budget of {}",
- this.budget_used,
- max_bytes
- ));
- }
-
- #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
- struct QueueEntry {
- score_density: OrderedFloat,
- declaration_index: usize,
- style: DeclarationStyle,
- }
-
- // Initialize priority queue with the best score for each snippet.
- let mut queue: BinaryHeap = BinaryHeap::new();
- for (declaration_index, declaration) in request.referenced_declarations.iter().enumerate() {
- let (style, score_density) = DeclarationStyle::iter()
- .map(|style| {
- (
- style,
- OrderedFloat(declaration_score_density(&declaration, style)),
- )
- })
- .max_by_key(|(_, score_density)| *score_density)
- .unwrap();
- queue.push(QueueEntry {
- score_density,
- declaration_index,
- style,
- });
- }
-
- // Knapsack selection loop
- while let Some(queue_entry) = queue.pop() {
- let Some(declaration) = request
- .referenced_declarations
- .get(queue_entry.declaration_index)
- else {
- return Err(anyhow!(
- "Invalid declaration index {}",
- queue_entry.declaration_index
- ));
- };
-
- let mut additional_bytes = declaration_size(declaration, queue_entry.style);
- if this.budget_used + additional_bytes > max_bytes {
- continue;
- }
-
- let additional_parents = this.additional_parent_signatures(
- &declaration.path,
- declaration.parent_index,
- &mut included_parents,
- )?;
- additional_bytes += additional_parents
- .iter()
- .map(|(_, snippet)| snippet.text.len())
- .sum::();
- if this.budget_used + additional_bytes > max_bytes {
- continue;
- }
-
- this.budget_used += additional_bytes;
- this.add_parents(&mut included_parents, additional_parents);
- let planned_snippet = match queue_entry.style {
- DeclarationStyle::Signature => {
- let Some(text) = declaration.text.get(declaration.signature_range.clone())
- else {
- return Err(anyhow!(
- "Invalid declaration signature_range {:?} with text.len() = {}",
- declaration.signature_range,
- declaration.text.len()
- ));
- };
- let signature_start_line = declaration.range.start
- + Line(
- declaration.text[..declaration.signature_range.start]
- .lines()
- .count() as u32,
- );
- let signature_end_line = signature_start_line
- + Line(
- declaration.text
- [declaration.signature_range.start..declaration.signature_range.end]
- .lines()
- .count() as u32,
- );
- let range = signature_start_line..signature_end_line;
-
- PlannedSnippet {
- path: declaration.path.clone(),
- range,
- text,
- text_is_truncated: declaration.text_is_truncated,
- }
- }
- DeclarationStyle::Declaration => PlannedSnippet {
- path: declaration.path.clone(),
- range: declaration.range.clone(),
- text: &declaration.text,
- text_is_truncated: declaration.text_is_truncated,
- },
- };
- this.snippets.push(planned_snippet);
-
- // When a Signature is consumed, insert an entry for Definition style.
- if queue_entry.style == DeclarationStyle::Signature {
- let signature_size = declaration_size(&declaration, DeclarationStyle::Signature);
- let declaration_size =
- declaration_size(&declaration, DeclarationStyle::Declaration);
- let signature_score = declaration_score(&declaration, DeclarationStyle::Signature);
- let declaration_score =
- declaration_score(&declaration, DeclarationStyle::Declaration);
-
- let score_diff = declaration_score - signature_score;
- let size_diff = declaration_size.saturating_sub(signature_size);
- if score_diff > 0.0001 && size_diff > 0 {
- queue.push(QueueEntry {
- declaration_index: queue_entry.declaration_index,
- score_density: OrderedFloat(score_diff / (size_diff as f32)),
- style: DeclarationStyle::Declaration,
- });
- }
- }
- }
-
- anyhow::Ok(this)
- }
-
- fn add_parents(
- &mut self,
- included_parents: &mut FxHashSet,
- snippets: Vec<(usize, PlannedSnippet<'a>)>,
- ) {
- for (parent_index, snippet) in snippets {
- included_parents.insert(parent_index);
- self.budget_used += snippet.text.len();
- self.snippets.push(snippet);
- }
- }
-
- fn additional_parent_signatures(
- &self,
- path: &Arc,
- parent_index: Option,
- included_parents: &FxHashSet,
- ) -> Result)>> {
- let mut results = Vec::new();
- self.additional_parent_signatures_impl(path, parent_index, included_parents, &mut results)?;
- Ok(results)
- }
-
- fn additional_parent_signatures_impl(
- &self,
- path: &Arc,
- parent_index: Option,
- included_parents: &FxHashSet,
- results: &mut Vec<(usize, PlannedSnippet<'a>)>,
- ) -> Result<()> {
- let Some(parent_index) = parent_index else {
- return Ok(());
- };
- if included_parents.contains(&parent_index) {
- return Ok(());
- }
- let Some(parent_signature) = self.request.signatures.get(parent_index) else {
- return Err(anyhow!("Invalid parent index {}", parent_index));
- };
- results.push((
- parent_index,
- PlannedSnippet {
- path: path.clone(),
- range: parent_signature.range.clone(),
- text: &parent_signature.text,
- text_is_truncated: parent_signature.text_is_truncated,
- },
- ));
- self.additional_parent_signatures_impl(
- path,
- parent_signature.parent_index,
- included_parents,
- results,
- )
- }
-
- /// Renders the planned context. Each file starts with "```FILE_PATH\n` and ends with triple
- /// backticks, with a newline after each file. Outputs a line with "..." between nonconsecutive
- /// chunks.
- pub fn write(
- &'a self,
- excerpt_file_insertions: &mut Vec<(Point, &'static str)>,
- prompt: &mut String,
- ) -> Result {
- let mut file_to_snippets: FxHashMap<&'a std::path::Path, Vec<&PlannedSnippet<'a>>> =
- FxHashMap::default();
- for snippet in &self.snippets {
- file_to_snippets
- .entry(&snippet.path)
- .or_default()
- .push(snippet);
- }
-
- // Reorder so that file with cursor comes last
- let mut file_snippets = Vec::new();
- let mut excerpt_file_snippets = Vec::new();
- for (file_path, snippets) in file_to_snippets {
- if file_path == self.request.excerpt_path.as_ref() {
- excerpt_file_snippets = snippets;
- } else {
- file_snippets.push((file_path, snippets, false));
- }
- }
- let excerpt_snippet = PlannedSnippet {
- path: self.request.excerpt_path.clone(),
- range: self.request.excerpt_line_range.clone(),
- text: &self.request.excerpt,
- text_is_truncated: false,
- };
- excerpt_file_snippets.push(&excerpt_snippet);
- file_snippets.push((&self.request.excerpt_path, excerpt_file_snippets, true));
-
- let section_labels =
- self.push_file_snippets(prompt, excerpt_file_insertions, file_snippets)?;
-
- Ok(section_labels)
- }
-
- fn push_file_snippets(
- &self,
- output: &mut String,
- excerpt_file_insertions: &mut Vec<(Point, &'static str)>,
- file_snippets: Vec<(&'a Path, Vec<&'a PlannedSnippet>, bool)>,
- ) -> Result {
- let mut section_ranges = Vec::new();
- let mut excerpt_index = None;
-
- for (file_path, mut snippets, is_excerpt_file) in file_snippets {
- snippets.sort_by_key(|s| (s.range.start, Reverse(s.range.end)));
-
- // TODO: What if the snippets get expanded too large to be editable?
- let mut current_snippet: Option<(&PlannedSnippet, Range)> = None;
- let mut disjoint_snippets: Vec<(&PlannedSnippet, Range)> = Vec::new();
- for snippet in snippets {
- if let Some((_, current_snippet_range)) = current_snippet.as_mut()
- && snippet.range.start <= current_snippet_range.end
- {
- current_snippet_range.end = current_snippet_range.end.max(snippet.range.end);
- continue;
- }
- if let Some(current_snippet) = current_snippet.take() {
- disjoint_snippets.push(current_snippet);
- }
- current_snippet = Some((snippet, snippet.range.clone()));
- }
- if let Some(current_snippet) = current_snippet.take() {
- disjoint_snippets.push(current_snippet);
- }
-
- writeln!(output, "`````path={}", file_path.display()).ok();
- let mut skipped_last_snippet = false;
- for (snippet, range) in disjoint_snippets {
- let section_index = section_ranges.len();
-
- match self.request.prompt_format {
- PromptFormat::MarkedExcerpt
- | PromptFormat::OnlySnippets
- | PromptFormat::OldTextNewText
- | PromptFormat::Minimal
- | PromptFormat::NumLinesUniDiff => {
- if range.start.0 > 0 && !skipped_last_snippet {
- output.push_str("…\n");
- }
- }
- PromptFormat::LabeledSections => {
- if is_excerpt_file
- && range.start <= self.request.excerpt_line_range.start
- && range.end >= self.request.excerpt_line_range.end
- {
- writeln!(output, "<|current_section|>").ok();
- } else {
- writeln!(output, "<|section_{}|>", section_index).ok();
- }
- }
- PromptFormat::MinimalQwen => unreachable!(),
- PromptFormat::SeedCoder1120 => unreachable!(),
- }
-
- let push_full_snippet = |output: &mut String| {
- if self.request.prompt_format == PromptFormat::NumLinesUniDiff {
- for (i, line) in snippet.text.lines().enumerate() {
- writeln!(output, "{}|{}", i as u32 + range.start.0 + 1, line)?;
- }
- } else {
- output.push_str(&snippet.text);
- }
- anyhow::Ok(())
- };
-
- if is_excerpt_file {
- if self.request.prompt_format == PromptFormat::OnlySnippets {
- if range.start >= self.request.excerpt_line_range.start
- && range.end <= self.request.excerpt_line_range.end
- {
- skipped_last_snippet = true;
- } else {
- skipped_last_snippet = false;
- output.push_str(snippet.text);
- }
- } else if !excerpt_file_insertions.is_empty() {
- let lines = snippet.text.lines().collect::>();
- let push_line = |output: &mut String, line_ix: usize| {
- if self.request.prompt_format == PromptFormat::NumLinesUniDiff {
- write!(output, "{}|", line_ix as u32 + range.start.0 + 1)?;
- }
- anyhow::Ok(writeln!(output, "{}", lines[line_ix])?)
- };
- let mut last_line_ix = 0;
- let mut insertion_ix = 0;
- while insertion_ix < excerpt_file_insertions.len() {
- let (point, insertion) = &excerpt_file_insertions[insertion_ix];
- let found = point.line >= range.start && point.line <= range.end;
- if found {
- excerpt_index = Some(section_index);
- let insertion_line_ix = (point.line.0 - range.start.0) as usize;
- for line_ix in last_line_ix..insertion_line_ix {
- push_line(output, line_ix)?;
- }
- if let Some(next_line) = lines.get(insertion_line_ix) {
- if self.request.prompt_format == PromptFormat::NumLinesUniDiff {
- write!(
- output,
- "{}|",
- insertion_line_ix as u32 + range.start.0 + 1
- )?
- }
- output.push_str(&next_line[..point.column as usize]);
- output.push_str(insertion);
- writeln!(output, "{}", &next_line[point.column as usize..])?;
- } else {
- writeln!(output, "{}", insertion)?;
- }
- last_line_ix = insertion_line_ix + 1;
- excerpt_file_insertions.remove(insertion_ix);
- continue;
- }
- insertion_ix += 1;
- }
- skipped_last_snippet = false;
- for line_ix in last_line_ix..lines.len() {
- push_line(output, line_ix)?;
- }
- } else {
- skipped_last_snippet = false;
- push_full_snippet(output)?;
- }
- } else {
- skipped_last_snippet = false;
- push_full_snippet(output)?;
- }
-
- section_ranges.push((snippet.path.clone(), range));
- }
-
- output.push_str("`````\n\n");
- }
-
- Ok(SectionLabels {
- // TODO: Clean this up
- excerpt_index: match self.request.prompt_format {
- PromptFormat::OnlySnippets => 0,
- _ => excerpt_index.context("bug: no snippet found for excerpt")?,
- },
- section_ranges,
- })
- }
-}
-
-fn declaration_score_density(declaration: &ReferencedDeclaration, style: DeclarationStyle) -> f32 {
- declaration_score(declaration, style) / declaration_size(declaration, style) as f32
-}
-
-fn declaration_score(declaration: &ReferencedDeclaration, style: DeclarationStyle) -> f32 {
- match style {
- DeclarationStyle::Signature => declaration.signature_score,
- DeclarationStyle::Declaration => declaration.declaration_score,
- }
-}
-
-fn declaration_size(declaration: &ReferencedDeclaration, style: DeclarationStyle) -> usize {
- match style {
- DeclarationStyle::Signature => declaration.signature_range.len(),
- DeclarationStyle::Declaration => declaration.text.len(),
- }
-}
-
struct PromptData {
events: Vec>,
cursor_point: Point,
cursor_path: Arc, // TODO: make a common struct with cursor_point
- included_files: Vec,
+ included_files: Vec,
}
#[derive(Default)]
@@ -1051,7 +461,7 @@ impl SeedCoder1120Prompt {
context
}
- fn fmt_fim(&self, file: &IncludedFile, cursor_point: Point) -> String {
+ fn fmt_fim(&self, file: &RelatedFile, cursor_point: Point) -> String {
let mut buf = String::new();
const FIM_SUFFIX: &str = "<[fim-suffix]>";
const FIM_PREFIX: &str = "<[fim-prefix]>";
diff --git a/crates/cloud_zeta2_prompt/src/retrieval_prompt.rs b/crates/cloud_zeta2_prompt/src/retrieval_prompt.rs
deleted file mode 100644
index fd35f63f03ff967491a28d817852f6622e4919ca..0000000000000000000000000000000000000000
--- a/crates/cloud_zeta2_prompt/src/retrieval_prompt.rs
+++ /dev/null
@@ -1,244 +0,0 @@
-use anyhow::Result;
-use cloud_llm_client::predict_edits_v3::{self, Excerpt};
-use indoc::indoc;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use std::fmt::Write;
-
-use crate::{push_events, write_codeblock};
-
-pub fn build_prompt(request: predict_edits_v3::PlanContextRetrievalRequest) -> Result {
- let mut prompt = SEARCH_INSTRUCTIONS.to_string();
-
- if !request.events.is_empty() {
- writeln!(&mut prompt, "\n## User Edits\n\n")?;
- push_events(&mut prompt, &request.events);
- }
-
- writeln!(&mut prompt, "## Cursor context\n")?;
- write_codeblock(
- &request.excerpt_path,
- &[Excerpt {
- start_line: request.excerpt_line_range.start,
- text: request.excerpt.into(),
- }],
- &[],
- request.cursor_file_max_row,
- true,
- &mut prompt,
- );
-
- writeln!(&mut prompt, "{TOOL_USE_REMINDER}")?;
-
- Ok(prompt)
-}
-
-/// Search for relevant code
-///
-/// For the best results, run multiple queries at once with a single invocation of this tool.
-#[derive(Clone, Deserialize, Serialize, JsonSchema)]
-pub struct SearchToolInput {
- /// An array of queries to run for gathering context relevant to the next prediction
- #[schemars(length(max = 3))]
- #[serde(deserialize_with = "deserialize_queries")]
- pub queries: Box<[SearchToolQuery]>,
-}
-
-fn deserialize_queries<'de, D>(deserializer: D) -> Result, D::Error>
-where
- D: serde::Deserializer<'de>,
-{
- use serde::de::Error;
-
- #[derive(Deserialize)]
- #[serde(untagged)]
- enum QueryCollection {
- Array(Box<[SearchToolQuery]>),
- DoubleArray(Box<[Box<[SearchToolQuery]>]>),
- Single(SearchToolQuery),
- }
-
- #[derive(Deserialize)]
- #[serde(untagged)]
- enum MaybeDoubleEncoded {
- SingleEncoded(QueryCollection),
- DoubleEncoded(String),
- }
-
- let result = MaybeDoubleEncoded::deserialize(deserializer)?;
-
- let normalized = match result {
- MaybeDoubleEncoded::SingleEncoded(value) => value,
- MaybeDoubleEncoded::DoubleEncoded(value) => {
- serde_json::from_str(&value).map_err(D::Error::custom)?
- }
- };
-
- Ok(match normalized {
- QueryCollection::Array(items) => items,
- QueryCollection::Single(search_tool_query) => Box::new([search_tool_query]),
- QueryCollection::DoubleArray(double_array) => double_array.into_iter().flatten().collect(),
- })
-}
-
-/// Search for relevant code by path, syntax hierarchy, and content.
-#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, Hash)]
-pub struct SearchToolQuery {
- /// 1. A glob pattern to match file paths in the codebase to search in.
- pub glob: String,
- /// 2. Regular expressions to match syntax nodes **by their first line** and hierarchy.
- ///
- /// Subsequent regexes match nodes within the full content of the nodes matched by the previous regexes.
- ///
- /// Example: Searching for a `User` class
- /// ["class\s+User"]
- ///
- /// Example: Searching for a `get_full_name` method under a `User` class
- /// ["class\s+User", "def\sget_full_name"]
- ///
- /// Skip this field to match on content alone.
- #[schemars(length(max = 3))]
- #[serde(default)]
- pub syntax_node: Vec,
- /// 3. An optional regular expression to match the final content that should appear in the results.
- ///
- /// - Content will be matched within all lines of the matched syntax nodes.
- /// - If syntax node regexes are provided, this field can be skipped to include as much of the node itself as possible.
- /// - If no syntax node regexes are provided, the content will be matched within the entire file.
- pub content: Option,
-}
-
-pub const TOOL_NAME: &str = "search";
-
-const SEARCH_INSTRUCTIONS: &str = indoc! {r#"
- You are part of an edit prediction system in a code editor.
- Your role is to search for code that will serve as context for predicting the next edit.
-
- - Analyze the user's recent edits and current cursor context
- - Use the `search` tool to find code that is relevant for predicting the next edit
- - Focus on finding:
- - Code patterns that might need similar changes based on the recent edits
- - Functions, variables, types, and constants referenced in the current cursor context
- - Related implementations, usages, or dependencies that may require consistent updates
- - How items defined in the cursor excerpt are used or altered
- - You will not be able to filter results or perform subsequent queries, so keep searches as targeted as possible
- - Use `syntax_node` parameter whenever you're looking for a particular type, class, or function
- - Avoid using wildcard globs if you already know the file path of the content you're looking for
-"#};
-
-const TOOL_USE_REMINDER: &str = indoc! {"
- --
- Analyze the user's intent in one to two sentences, then call the `search` tool.
-"};
-
-#[cfg(test)]
-mod tests {
- use serde_json::json;
-
- use super::*;
-
- #[test]
- fn test_deserialize_queries() {
- let single_query_json = indoc! {r#"{
- "queries": {
- "glob": "**/*.rs",
- "syntax_node": ["fn test"],
- "content": "assert"
- }
- }"#};
-
- let flat_input: SearchToolInput = serde_json::from_str(single_query_json).unwrap();
- assert_eq!(flat_input.queries.len(), 1);
- assert_eq!(flat_input.queries[0].glob, "**/*.rs");
- assert_eq!(flat_input.queries[0].syntax_node, vec!["fn test"]);
- assert_eq!(flat_input.queries[0].content, Some("assert".to_string()));
-
- let flat_json = indoc! {r#"{
- "queries": [
- {
- "glob": "**/*.rs",
- "syntax_node": ["fn test"],
- "content": "assert"
- },
- {
- "glob": "**/*.ts",
- "syntax_node": [],
- "content": null
- }
- ]
- }"#};
-
- let flat_input: SearchToolInput = serde_json::from_str(flat_json).unwrap();
- assert_eq!(flat_input.queries.len(), 2);
- assert_eq!(flat_input.queries[0].glob, "**/*.rs");
- assert_eq!(flat_input.queries[0].syntax_node, vec!["fn test"]);
- assert_eq!(flat_input.queries[0].content, Some("assert".to_string()));
- assert_eq!(flat_input.queries[1].glob, "**/*.ts");
- assert_eq!(flat_input.queries[1].syntax_node.len(), 0);
- assert_eq!(flat_input.queries[1].content, None);
-
- let nested_json = indoc! {r#"{
- "queries": [
- [
- {
- "glob": "**/*.rs",
- "syntax_node": ["fn test"],
- "content": "assert"
- }
- ],
- [
- {
- "glob": "**/*.ts",
- "syntax_node": [],
- "content": null
- }
- ]
- ]
- }"#};
-
- let nested_input: SearchToolInput = serde_json::from_str(nested_json).unwrap();
-
- assert_eq!(nested_input.queries.len(), 2);
-
- assert_eq!(nested_input.queries[0].glob, "**/*.rs");
- assert_eq!(nested_input.queries[0].syntax_node, vec!["fn test"]);
- assert_eq!(nested_input.queries[0].content, Some("assert".to_string()));
- assert_eq!(nested_input.queries[1].glob, "**/*.ts");
- assert_eq!(nested_input.queries[1].syntax_node.len(), 0);
- assert_eq!(nested_input.queries[1].content, None);
-
- let double_encoded_queries = serde_json::to_string(&json!({
- "queries": serde_json::to_string(&json!([
- {
- "glob": "**/*.rs",
- "syntax_node": ["fn test"],
- "content": "assert"
- },
- {
- "glob": "**/*.ts",
- "syntax_node": [],
- "content": null
- }
- ])).unwrap()
- }))
- .unwrap();
-
- let double_encoded_input: SearchToolInput =
- serde_json::from_str(&double_encoded_queries).unwrap();
-
- assert_eq!(double_encoded_input.queries.len(), 2);
-
- assert_eq!(double_encoded_input.queries[0].glob, "**/*.rs");
- assert_eq!(double_encoded_input.queries[0].syntax_node, vec!["fn test"]);
- assert_eq!(
- double_encoded_input.queries[0].content,
- Some("assert".to_string())
- );
- assert_eq!(double_encoded_input.queries[1].glob, "**/*.ts");
- assert_eq!(double_encoded_input.queries[1].syntax_node.len(), 0);
- assert_eq!(double_encoded_input.queries[1].content, None);
-
- // ### ERROR Switching from var declarations to lexical declarations [RUN 073]
- // invalid search json {"queries": ["express/lib/response.js", "var\\s+[a-zA-Z_][a-zA-Z0-9_]*\\s*=.*;", "function.*\\(.*\\).*\\{.*\\}"]}
- }
-}
diff --git a/crates/codestral/Cargo.toml b/crates/codestral/Cargo.toml
index b402274a33530424349081da764a4b6766e419e9..7f3bf3b22dda8f9dbde1923c76855342c6cbac4c 100644
--- a/crates/codestral/Cargo.toml
+++ b/crates/codestral/Cargo.toml
@@ -10,7 +10,7 @@ path = "src/codestral.rs"
[dependencies]
anyhow.workspace = true
-edit_prediction.workspace = true
+edit_prediction_types.workspace = true
edit_prediction_context.workspace = true
futures.workspace = true
gpui.workspace = true
diff --git a/crates/codestral/src/codestral.rs b/crates/codestral/src/codestral.rs
index 6a500acbf6ec5eea63c35a8deb83a8545cee497e..9bf0296ac357937cd1ad1470dba9a98864911de9 100644
--- a/crates/codestral/src/codestral.rs
+++ b/crates/codestral/src/codestral.rs
@@ -1,6 +1,6 @@
use anyhow::{Context as _, Result};
-use edit_prediction::{Direction, EditPrediction, EditPredictionProvider};
use edit_prediction_context::{EditPredictionExcerpt, EditPredictionExcerptOptions};
+use edit_prediction_types::{Direction, EditPrediction, EditPredictionDelegate};
use futures::AsyncReadExt;
use gpui::{App, Context, Entity, Task};
use http_client::HttpClient;
@@ -43,17 +43,17 @@ impl CurrentCompletion {
/// Attempts to adjust the edits based on changes made to the buffer since the completion was generated.
/// Returns None if the user's edits conflict with the predicted edits.
fn interpolate(&self, new_snapshot: &BufferSnapshot) -> Option, Arc)>> {
- edit_prediction::interpolate_edits(&self.snapshot, new_snapshot, &self.edits)
+ edit_prediction_types::interpolate_edits(&self.snapshot, new_snapshot, &self.edits)
}
}
-pub struct CodestralCompletionProvider {
+pub struct CodestralEditPredictionDelegate {
http_client: Arc,
pending_request: Option>>,
current_completion: Option,
}
-impl CodestralCompletionProvider {
+impl CodestralEditPredictionDelegate {
pub fn new(http_client: Arc) -> Self {
Self {
http_client,
@@ -165,7 +165,7 @@ impl CodestralCompletionProvider {
}
}
-impl EditPredictionProvider for CodestralCompletionProvider {
+impl EditPredictionDelegate for CodestralEditPredictionDelegate {
fn name() -> &'static str {
"codestral"
}
@@ -174,7 +174,7 @@ impl EditPredictionProvider for CodestralCompletionProvider {
"Codestral"
}
- fn show_completions_in_menu() -> bool {
+ fn show_predictions_in_menu() -> bool {
true
}
@@ -239,7 +239,6 @@ impl EditPredictionProvider for CodestralCompletionProvider {
cursor_point,
&snapshot,
&EXCERPT_OPTIONS,
- None,
)
.context("Line containing cursor doesn't fit in excerpt max bytes")?;
diff --git a/crates/collab/Cargo.toml b/crates/collab/Cargo.toml
index b8a4c035499d45adc494c9f8175a772d15aa96df..79fc21fe33423d7eb887744b4ad84094a022862e 100644
--- a/crates/collab/Cargo.toml
+++ b/crates/collab/Cargo.toml
@@ -65,7 +65,7 @@ tokio = { workspace = true, features = ["full"] }
toml.workspace = true
tower = "0.4"
tower-http = { workspace = true, features = ["trace"] }
-tracing = "0.1.40"
+tracing.workspace = true
tracing-subscriber = { version = "0.3.18", features = ["env-filter", "json", "registry", "tracing-log"] } # workaround for https://github.com/tokio-rs/tracing/issues/2927
util.workspace = true
uuid.workspace = true
diff --git a/crates/collab/migrations.sqlite/20221109000000_test_schema.sql b/crates/collab/migrations.sqlite/20221109000000_test_schema.sql
index a736ddfd1fe3334b1b847e820bd1816cb625ddca..32a2ed2e1331fc7b16f859accd895a7bce055804 100644
--- a/crates/collab/migrations.sqlite/20221109000000_test_schema.sql
+++ b/crates/collab/migrations.sqlite/20221109000000_test_schema.sql
@@ -121,6 +121,8 @@ CREATE TABLE "project_repositories" (
"merge_message" VARCHAR,
"branch_summary" VARCHAR,
"head_commit_details" VARCHAR,
+ "remote_upstream_url" VARCHAR,
+ "remote_origin_url" VARCHAR,
PRIMARY KEY (project_id, id)
);
diff --git a/crates/collab/migrations/20251203234258_add_remote_urls_to_project_repositories.sql b/crates/collab/migrations/20251203234258_add_remote_urls_to_project_repositories.sql
new file mode 100644
index 0000000000000000000000000000000000000000..e1396de27d90fb2c872197d25198743d19be86f8
--- /dev/null
+++ b/crates/collab/migrations/20251203234258_add_remote_urls_to_project_repositories.sql
@@ -0,0 +1,2 @@
+ALTER TABLE "project_repositories" ADD COLUMN "remote_upstream_url" VARCHAR;
+ALTER TABLE "project_repositories" ADD COLUMN "remote_origin_url" VARCHAR;
diff --git a/crates/collab/src/db/queries/projects.rs b/crates/collab/src/db/queries/projects.rs
index 51a0ef83323ec70675283d2fdec7ca1ad791b12d..6f1d8b884d15041eadaa9073a5bd99e5ed352502 100644
--- a/crates/collab/src/db/queries/projects.rs
+++ b/crates/collab/src/db/queries/projects.rs
@@ -362,6 +362,8 @@ impl Database {
entry_ids: ActiveValue::set("[]".into()),
head_commit_details: ActiveValue::set(None),
merge_message: ActiveValue::set(None),
+ remote_upstream_url: ActiveValue::set(None),
+ remote_origin_url: ActiveValue::set(None),
}
}),
)
@@ -511,6 +513,8 @@ impl Database {
serde_json::to_string(&update.current_merge_conflicts).unwrap(),
)),
merge_message: ActiveValue::set(update.merge_message.clone()),
+ remote_upstream_url: ActiveValue::set(update.remote_upstream_url.clone()),
+ remote_origin_url: ActiveValue::set(update.remote_origin_url.clone()),
})
.on_conflict(
OnConflict::columns([
@@ -1005,6 +1009,8 @@ impl Database {
is_last_update: true,
merge_message: db_repository_entry.merge_message,
stash_entries: Vec::new(),
+ remote_upstream_url: db_repository_entry.remote_upstream_url.clone(),
+ remote_origin_url: db_repository_entry.remote_origin_url.clone(),
});
}
}
diff --git a/crates/collab/src/db/queries/rooms.rs b/crates/collab/src/db/queries/rooms.rs
index f020b99b5f1030cfe9391498512258e6db249bac..eafb5cac44a510bf4ced0434a9b4adfadff0ebbc 100644
--- a/crates/collab/src/db/queries/rooms.rs
+++ b/crates/collab/src/db/queries/rooms.rs
@@ -796,6 +796,8 @@ impl Database {
is_last_update: true,
merge_message: db_repository.merge_message,
stash_entries: Vec::new(),
+ remote_upstream_url: db_repository.remote_upstream_url.clone(),
+ remote_origin_url: db_repository.remote_origin_url.clone(),
});
}
}
diff --git a/crates/collab/src/db/tables/project_repository.rs b/crates/collab/src/db/tables/project_repository.rs
index eb653ecee37d48ce79e26450eb85d87dec411c1e..190ae8d79c54bb78daef4a1568ec75683eb0b0f2 100644
--- a/crates/collab/src/db/tables/project_repository.rs
+++ b/crates/collab/src/db/tables/project_repository.rs
@@ -22,6 +22,8 @@ pub struct Model {
pub branch_summary: Option,
// A JSON object representing the current Head commit values
pub head_commit_details: Option,
+ pub remote_upstream_url: Option,
+ pub remote_origin_url: Option,
}
#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
diff --git a/crates/collab/src/tests.rs b/crates/collab/src/tests.rs
index 7d07360b8042ed54a9f19a82a2876e448e8a14a4..3785ee0b7abaeddeac5c9acb1718407ab5bd54f2 100644
--- a/crates/collab/src/tests.rs
+++ b/crates/collab/src/tests.rs
@@ -1,5 +1,3 @@
-use std::sync::Arc;
-
use call::Room;
use client::ChannelId;
use gpui::{Entity, TestAppContext};
@@ -18,7 +16,6 @@ mod randomized_test_helpers;
mod remote_editing_collaboration_tests;
mod test_server;
-use language::{Language, LanguageConfig, LanguageMatcher, tree_sitter_rust};
pub use randomized_test_helpers::{
RandomizedTest, TestError, UserTestPlan, run_randomized_test, save_randomized_test_plan,
};
@@ -51,17 +48,3 @@ fn room_participants(room: &Entity, cx: &mut TestAppContext) -> RoomPartic
fn channel_id(room: &Entity, cx: &mut TestAppContext) -> Option {
cx.read(|cx| room.read(cx).channel_id())
}
-
-fn rust_lang() -> Arc {
- Arc::new(Language::new(
- LanguageConfig {
- name: "Rust".into(),
- matcher: LanguageMatcher {
- path_suffixes: vec!["rs".to_string()],
- ..Default::default()
- },
- ..Default::default()
- },
- Some(tree_sitter_rust::LANGUAGE.into()),
- ))
-}
diff --git a/crates/collab/src/tests/editor_tests.rs b/crates/collab/src/tests/editor_tests.rs
index 785a6457c8fdb57f84a8e7b5a8487f0ceae3d025..ba92e868126c7f27fb5051021fce44fe43c8d5e7 100644
--- a/crates/collab/src/tests/editor_tests.rs
+++ b/crates/collab/src/tests/editor_tests.rs
@@ -1,7 +1,4 @@
-use crate::{
- rpc::RECONNECT_TIMEOUT,
- tests::{TestServer, rust_lang},
-};
+use crate::{rpc::RECONNECT_TIMEOUT, tests::TestServer};
use call::ActiveCall;
use editor::{
DocumentColorsRenderMode, Editor, FETCH_COLORS_DEBOUNCE_TIMEOUT, MultiBufferOffset, RowInfo,
@@ -23,7 +20,7 @@ use gpui::{
App, Rgba, SharedString, TestAppContext, UpdateGlobal, VisualContext, VisualTestContext,
};
use indoc::indoc;
-use language::FakeLspAdapter;
+use language::{FakeLspAdapter, rust_lang};
use lsp::LSP_REQUEST_TIMEOUT;
use pretty_assertions::assert_eq;
use project::{
@@ -3518,7 +3515,6 @@ async fn test_git_blame_is_forwarded(cx_a: &mut TestAppContext, cx_b: &mut TestA
.into_iter()
.map(|(sha, message)| (sha.parse().unwrap(), message.into()))
.collect(),
- remote_url: Some("git@github.com:zed-industries/zed.git".to_string()),
};
client_a.fs().set_blame_for_repo(
Path::new(path!("/my-repo/.git")),
@@ -3603,10 +3599,6 @@ async fn test_git_blame_is_forwarded(cx_a: &mut TestAppContext, cx_b: &mut TestA
for (idx, (buffer, entry)) in entries.iter().flatten().enumerate() {
let details = blame.details_for_entry(*buffer, entry).unwrap();
assert_eq!(details.message, format!("message for idx-{}", idx));
- assert_eq!(
- details.permalink.unwrap().to_string(),
- format!("https://github.com/zed-industries/zed/commit/{}", entry.sha)
- );
}
});
});
diff --git a/crates/collab/src/tests/integration_tests.rs b/crates/collab/src/tests/integration_tests.rs
index fcda8688d427f3e6b937f00edc7c3586dfdbef36..391e7355ea196dfe25d363472918837ea817f450 100644
--- a/crates/collab/src/tests/integration_tests.rs
+++ b/crates/collab/src/tests/integration_tests.rs
@@ -2,7 +2,7 @@ use crate::{
rpc::{CLEANUP_TIMEOUT, RECONNECT_TIMEOUT},
tests::{
RoomParticipants, TestClient, TestServer, channel_id, following_tests::join_channel,
- room_participants, rust_lang,
+ room_participants,
},
};
use anyhow::{Result, anyhow};
@@ -26,7 +26,7 @@ use language::{
Diagnostic, DiagnosticEntry, DiagnosticSourceKind, FakeLspAdapter, Language, LanguageConfig,
LanguageMatcher, LineEnding, OffsetRangeExt, Point, Rope,
language_settings::{Formatter, FormatterList},
- tree_sitter_rust, tree_sitter_typescript,
+ rust_lang, tree_sitter_rust, tree_sitter_typescript,
};
use lsp::{LanguageServerId, OneOf};
use parking_lot::Mutex;
diff --git a/crates/copilot/Cargo.toml b/crates/copilot/Cargo.toml
index 0d3b19c0c7bd264f8ed10e53289376055f833307..459abda17573d66287e2c8ca0b995292acaf163b 100644
--- a/crates/copilot/Cargo.toml
+++ b/crates/copilot/Cargo.toml
@@ -33,7 +33,7 @@ fs.workspace = true
futures.workspace = true
gpui.workspace = true
http_client.workspace = true
-edit_prediction.workspace = true
+edit_prediction_types.workspace = true
language.workspace = true
log.workspace = true
lsp.workspace = true
diff --git a/crates/copilot/src/copilot.rs b/crates/copilot/src/copilot.rs
index ed18a199bf2c08c8c046a8ad3e7f945b1340643e..6fbdeff807b65d22193ba7fdcb8e990f7184f70e 100644
--- a/crates/copilot/src/copilot.rs
+++ b/crates/copilot/src/copilot.rs
@@ -1,5 +1,5 @@
pub mod copilot_chat;
-mod copilot_completion_provider;
+mod copilot_edit_prediction_delegate;
pub mod copilot_responses;
pub mod request;
mod sign_in;
@@ -46,7 +46,7 @@ use util::rel_path::RelPath;
use util::{ResultExt, fs::remove_matching};
use workspace::Workspace;
-pub use crate::copilot_completion_provider::CopilotCompletionProvider;
+pub use crate::copilot_edit_prediction_delegate::CopilotEditPredictionDelegate;
pub use crate::sign_in::{CopilotCodeVerification, initiate_sign_in, reinstall_and_sign_in};
actions!(
diff --git a/crates/copilot/src/copilot_completion_provider.rs b/crates/copilot/src/copilot_edit_prediction_delegate.rs
similarity index 98%
rename from crates/copilot/src/copilot_completion_provider.rs
rename to crates/copilot/src/copilot_edit_prediction_delegate.rs
index e92f0c7d7dd7e51c4a8fdc19f34bd6eb4189c097..961154dbeecad007f026f25eeac25de95d751d9e 100644
--- a/crates/copilot/src/copilot_completion_provider.rs
+++ b/crates/copilot/src/copilot_edit_prediction_delegate.rs
@@ -1,6 +1,6 @@
use crate::{Completion, Copilot};
use anyhow::Result;
-use edit_prediction::{Direction, EditPrediction, EditPredictionProvider};
+use edit_prediction_types::{Direction, EditPrediction, EditPredictionDelegate};
use gpui::{App, Context, Entity, EntityId, Task};
use language::{Buffer, OffsetRangeExt, ToOffset, language_settings::AllLanguageSettings};
use settings::Settings;
@@ -8,7 +8,7 @@ use std::{path::Path, time::Duration};
pub const COPILOT_DEBOUNCE_TIMEOUT: Duration = Duration::from_millis(75);
-pub struct CopilotCompletionProvider {
+pub struct CopilotEditPredictionDelegate {
cycled: bool,
buffer_id: Option,
completions: Vec,
@@ -19,7 +19,7 @@ pub struct CopilotCompletionProvider {
copilot: Entity,
}
-impl CopilotCompletionProvider {
+impl CopilotEditPredictionDelegate {
pub fn new(copilot: Entity) -> Self {
Self {
cycled: false,
@@ -47,7 +47,7 @@ impl CopilotCompletionProvider {
}
}
-impl EditPredictionProvider for CopilotCompletionProvider {
+impl EditPredictionDelegate for CopilotEditPredictionDelegate {
fn name() -> &'static str {
"copilot"
}
@@ -56,7 +56,7 @@ impl EditPredictionProvider for CopilotCompletionProvider {
"Copilot"
}
- fn show_completions_in_menu() -> bool {
+ fn show_predictions_in_menu() -> bool {
true
}
@@ -314,7 +314,7 @@ mod tests {
cx,
)
.await;
- let copilot_provider = cx.new(|_| CopilotCompletionProvider::new(copilot));
+ let copilot_provider = cx.new(|_| CopilotEditPredictionDelegate::new(copilot));
cx.update_editor(|editor, window, cx| {
editor.set_edit_prediction_provider(Some(copilot_provider), window, cx)
});
@@ -546,7 +546,7 @@ mod tests {
cx,
)
.await;
- let copilot_provider = cx.new(|_| CopilotCompletionProvider::new(copilot));
+ let copilot_provider = cx.new(|_| CopilotEditPredictionDelegate::new(copilot));
cx.update_editor(|editor, window, cx| {
editor.set_edit_prediction_provider(Some(copilot_provider), window, cx)
});
@@ -670,7 +670,7 @@ mod tests {
cx,
)
.await;
- let copilot_provider = cx.new(|_| CopilotCompletionProvider::new(copilot));
+ let copilot_provider = cx.new(|_| CopilotEditPredictionDelegate::new(copilot));
cx.update_editor(|editor, window, cx| {
editor.set_edit_prediction_provider(Some(copilot_provider), window, cx)
});
@@ -753,7 +753,7 @@ mod tests {
window.focus(&editor.focus_handle(cx));
})
.unwrap();
- let copilot_provider = cx.new(|_| CopilotCompletionProvider::new(copilot));
+ let copilot_provider = cx.new(|_| CopilotEditPredictionDelegate::new(copilot));
editor
.update(cx, |editor, window, cx| {
editor.set_edit_prediction_provider(Some(copilot_provider), window, cx)
@@ -848,7 +848,7 @@ mod tests {
cx,
)
.await;
- let copilot_provider = cx.new(|_| CopilotCompletionProvider::new(copilot));
+ let copilot_provider = cx.new(|_| CopilotEditPredictionDelegate::new(copilot));
cx.update_editor(|editor, window, cx| {
editor.set_edit_prediction_provider(Some(copilot_provider), window, cx)
});
@@ -1000,7 +1000,7 @@ mod tests {
window.focus(&editor.focus_handle(cx))
})
.unwrap();
- let copilot_provider = cx.new(|_| CopilotCompletionProvider::new(copilot));
+ let copilot_provider = cx.new(|_| CopilotEditPredictionDelegate::new(copilot));
editor
.update(cx, |editor, window, cx| {
editor.set_edit_prediction_provider(Some(copilot_provider), window, cx)
diff --git a/crates/dap_adapters/src/python.rs b/crates/dap_adapters/src/python.rs
index 2f84193ac9343cac9ff1cf52eb648bad1cd77896..a45e16dc32180e1e4ed3b2ec01c92ad07ffc5e93 100644
--- a/crates/dap_adapters/src/python.rs
+++ b/crates/dap_adapters/src/python.rs
@@ -870,7 +870,7 @@ impl DebugAdapter for PythonDebugAdapter {
.active_toolchain(
delegate.worktree_id(),
base_path.into_arc(),
- language::LanguageName::new(Self::LANGUAGE_NAME),
+ language::LanguageName::new_static(Self::LANGUAGE_NAME),
cx,
)
.await
diff --git a/crates/debugger_ui/Cargo.toml b/crates/debugger_ui/Cargo.toml
index 325bcc300ae637ab46c36b7a3e7875e197f7d3d2..fb79b1b0790b28d7204774720bf9c413cfed64e6 100644
--- a/crates/debugger_ui/Cargo.toml
+++ b/crates/debugger_ui/Cargo.toml
@@ -37,6 +37,7 @@ dap_adapters = { workspace = true, optional = true }
db.workspace = true
debugger_tools.workspace = true
editor.workspace = true
+feature_flags.workspace = true
file_icons.workspace = true
futures.workspace = true
fuzzy.workspace = true
@@ -82,6 +83,7 @@ dap_adapters = { workspace = true, features = ["test-support"] }
debugger_tools = { workspace = true, features = ["test-support"] }
editor = { workspace = true, features = ["test-support"] }
gpui = { workspace = true, features = ["test-support"] }
+language = { workspace = true, features = ["test-support"] }
project = { workspace = true, features = ["test-support"] }
tree-sitter-go.workspace = true
unindent.workspace = true
diff --git a/crates/debugger_ui/src/debugger_panel.rs b/crates/debugger_ui/src/debugger_panel.rs
index ffdd4a22e3d092eb5d3d6626dcfe8b167ae03936..bdb308aafd0d2899f17bef732ac38239c4df6dda 100644
--- a/crates/debugger_ui/src/debugger_panel.rs
+++ b/crates/debugger_ui/src/debugger_panel.rs
@@ -15,10 +15,11 @@ use dap::adapters::DebugAdapterName;
use dap::{DapRegistry, StartDebuggingRequestArguments};
use dap::{client::SessionId, debugger_settings::DebuggerSettings};
use editor::{Editor, MultiBufferOffset, ToPoint};
+use feature_flags::{FeatureFlag, FeatureFlagAppExt as _};
use gpui::{
- Action, App, AsyncWindowContext, ClipboardItem, Context, DismissEvent, Entity, EntityId,
- EventEmitter, FocusHandle, Focusable, MouseButton, MouseDownEvent, Point, Subscription, Task,
- WeakEntity, anchored, deferred,
+ Action, App, AsyncWindowContext, ClipboardItem, Context, Corner, DismissEvent, Entity,
+ EntityId, EventEmitter, FocusHandle, Focusable, MouseButton, MouseDownEvent, Point,
+ Subscription, Task, WeakEntity, anchored, deferred,
};
use itertools::Itertools as _;
@@ -31,7 +32,9 @@ use settings::Settings;
use std::sync::{Arc, LazyLock};
use task::{DebugScenario, TaskContext};
use tree_sitter::{Query, StreamingIterator as _};
-use ui::{ContextMenu, Divider, PopoverMenuHandle, Tab, Tooltip, prelude::*};
+use ui::{
+ ContextMenu, Divider, PopoverMenu, PopoverMenuHandle, SplitButton, Tab, Tooltip, prelude::*,
+};
use util::rel_path::RelPath;
use util::{ResultExt, debug_panic, maybe};
use workspace::SplitDirection;
@@ -42,6 +45,12 @@ use workspace::{
};
use zed_actions::ToggleFocus;
+pub struct DebuggerHistoryFeatureFlag;
+
+impl FeatureFlag for DebuggerHistoryFeatureFlag {
+ const NAME: &'static str = "debugger-history";
+}
+
const DEBUG_PANEL_KEY: &str = "DebugPanel";
pub struct DebugPanel {
@@ -284,7 +293,7 @@ impl DebugPanel {
}
});
- session.update(cx, |session, _| match &mut session.mode {
+ session.update(cx, |session, _| match &mut session.state {
SessionState::Booting(state_task) => {
*state_task = Some(boot_task);
}
@@ -662,6 +671,12 @@ impl DebugPanel {
)
};
+ let thread_status = active_session
+ .as_ref()
+ .map(|session| session.read(cx).running_state())
+ .and_then(|state| state.read(cx).thread_status(cx))
+ .unwrap_or(project::debugger::session::ThreadStatus::Exited);
+
Some(
div.w_full()
.py_1()
@@ -679,10 +694,6 @@ impl DebugPanel {
.as_ref()
.map(|session| session.read(cx).running_state()),
|this, running_state| {
- let thread_status =
- running_state.read(cx).thread_status(cx).unwrap_or(
- project::debugger::session::ThreadStatus::Exited,
- );
let capabilities = running_state.read(cx).capabilities(cx);
let supports_detach =
running_state.read(cx).session().read(cx).is_attached();
@@ -871,36 +882,53 @@ impl DebugPanel {
}
}),
)
+ .when(supports_detach, |div| {
+ div.child(
+ IconButton::new(
+ "debug-disconnect",
+ IconName::DebugDetach,
+ )
+ .disabled(
+ thread_status != ThreadStatus::Stopped
+ && thread_status != ThreadStatus::Running,
+ )
+ .icon_size(IconSize::Small)
+ .on_click(window.listener_for(
+ running_state,
+ |this, _, _, cx| {
+ this.detach_client(cx);
+ },
+ ))
+ .tooltip({
+ let focus_handle = focus_handle.clone();
+ move |_window, cx| {
+ Tooltip::for_action_in(
+ "Detach",
+ &Detach,
+ &focus_handle,
+ cx,
+ )
+ }
+ }),
+ )
+ })
.when(
- supports_detach,
- |div| {
- div.child(
- IconButton::new(
- "debug-disconnect",
- IconName::DebugDetach,
- )
- .disabled(
- thread_status != ThreadStatus::Stopped
- && thread_status != ThreadStatus::Running,
+ cx.has_flag::(),
+ |this| {
+ this.child(Divider::vertical()).child(
+ SplitButton::new(
+ self.render_history_button(
+ &running_state,
+ thread_status,
+ window,
+ ),
+ self.render_history_toggle_button(
+ thread_status,
+ &running_state,
+ )
+ .into_any_element(),
)
- .icon_size(IconSize::Small)
- .on_click(window.listener_for(
- running_state,
- |this, _, _, cx| {
- this.detach_client(cx);
- },
- ))
- .tooltip({
- let focus_handle = focus_handle.clone();
- move |_window, cx| {
- Tooltip::for_action_in(
- "Detach",
- &Detach,
- &focus_handle,
- cx,
- )
- }
- }),
+ .style(ui::SplitButtonStyle::Outlined),
)
},
)
@@ -1317,6 +1345,97 @@ impl DebugPanel {
});
}
}
+
+ fn render_history_button(
+ &self,
+ running_state: &Entity,
+ thread_status: ThreadStatus,
+ window: &mut Window,
+ ) -> IconButton {
+ IconButton::new("debug-back-in-history", IconName::HistoryRerun)
+ .icon_size(IconSize::Small)
+ .on_click(window.listener_for(running_state, |this, _, _window, cx| {
+ this.session().update(cx, |session, cx| {
+ let ix = session
+ .active_snapshot_index()
+ .unwrap_or_else(|| session.historic_snapshots().len());
+
+ session.select_historic_snapshot(Some(ix.saturating_sub(1)), cx);
+ })
+ }))
+ .disabled(
+ thread_status == ThreadStatus::Running || thread_status == ThreadStatus::Stepping,
+ )
+ }
+
+ fn render_history_toggle_button(
+ &self,
+ thread_status: ThreadStatus,
+ running_state: &Entity,
+ ) -> impl IntoElement {
+ PopoverMenu::new("debug-back-in-history-menu")
+ .trigger(
+ ui::ButtonLike::new_rounded_right("debug-back-in-history-menu-trigger")
+ .layer(ui::ElevationIndex::ModalSurface)
+ .size(ui::ButtonSize::None)
+ .child(
+ div()
+ .px_1()
+ .child(Icon::new(IconName::ChevronDown).size(IconSize::XSmall)),
+ )
+ .disabled(
+ thread_status == ThreadStatus::Running
+ || thread_status == ThreadStatus::Stepping,
+ ),
+ )
+ .menu({
+ let running_state = running_state.clone();
+ move |window, cx| {
+ let handler =
+ |ix: Option, running_state: Entity, cx: &mut App| {
+ running_state.update(cx, |state, cx| {
+ state.session().update(cx, |session, cx| {
+ session.select_historic_snapshot(ix, cx);
+ })
+ })
+ };
+
+ let running_state = running_state.clone();
+ Some(ContextMenu::build(
+ window,
+ cx,
+ move |mut context_menu, _window, cx| {
+ let history = running_state
+ .read(cx)
+ .session()
+ .read(cx)
+ .historic_snapshots();
+
+ context_menu = context_menu.entry("Current State", None, {
+ let running_state = running_state.clone();
+ move |_window, cx| {
+ handler(None, running_state.clone(), cx);
+ }
+ });
+ context_menu = context_menu.separator();
+
+ for (ix, _) in history.iter().enumerate().rev() {
+ context_menu =
+ context_menu.entry(format!("history-{}", ix + 1), None, {
+ let running_state = running_state.clone();
+ move |_window, cx| {
+ handler(Some(ix), running_state.clone(), cx);
+ }
+ });
+ }
+
+ context_menu
+ },
+ ))
+ }
+ })
+ .anchor(Corner::TopRight)
+ }
}
async fn register_session_inner(
diff --git a/crates/debugger_ui/src/debugger_ui.rs b/crates/debugger_ui/src/debugger_ui.rs
index a9abb50bb68851334285b05064176e0347474014..bd5a7cda4a21a3d3fd0ac132d6ba2e7aace68722 100644
--- a/crates/debugger_ui/src/debugger_ui.rs
+++ b/crates/debugger_ui/src/debugger_ui.rs
@@ -387,7 +387,7 @@ pub fn init(cx: &mut App) {
window.on_action(
TypeId::of::(),
move |_, _, window, cx| {
- maybe!({
+ let status = maybe!({
let text = editor
.update(cx, |editor, cx| {
let range = editor
@@ -411,7 +411,13 @@ pub fn init(cx: &mut App) {
state.session().update(cx, |session, cx| {
session
- .evaluate(text, None, stack_id, None, cx)
+ .evaluate(
+ text,
+ Some(dap::EvaluateArgumentsContext::Repl),
+ stack_id,
+ None,
+ cx,
+ )
.detach();
});
});
@@ -419,6 +425,9 @@ pub fn init(cx: &mut App) {
Some(())
});
+ if status.is_some() {
+ cx.stop_propagation();
+ }
},
);
})
diff --git a/crates/debugger_ui/src/new_process_modal.rs b/crates/debugger_ui/src/new_process_modal.rs
index 40187cef9cc55cb4192a3cea773f42dca15a2571..24f6cc8f341519425b33433c3324f8afe7401ab7 100644
--- a/crates/debugger_ui/src/new_process_modal.rs
+++ b/crates/debugger_ui/src/new_process_modal.rs
@@ -881,7 +881,6 @@ impl ConfigureMode {
.label("Stop on Entry")
.label_position(SwitchLabelPosition::Start)
.label_size(LabelSize::Default)
- .color(ui::SwitchColor::Accent)
.on_click({
let this = cx.weak_entity();
move |state, _, cx| {
@@ -1023,7 +1022,7 @@ impl DebugDelegate {
Some(TaskSourceKind::Lsp { language_name, .. }) => {
Some(format!("LSP: {language_name}"))
}
- Some(TaskSourceKind::Language { name }) => Some(format!("Lang: {name}")),
+ Some(TaskSourceKind::Language { name }) => Some(format!("Language: {name}")),
_ => context.clone().and_then(|ctx| {
ctx.task_context
.task_variables
diff --git a/crates/debugger_ui/src/session/running.rs b/crates/debugger_ui/src/session/running.rs
index b82f839edee82f884c1419d44a2344c39c8abd0d..bc99d6ac8e42b0a706df4a09177ae2103d5939e2 100644
--- a/crates/debugger_ui/src/session/running.rs
+++ b/crates/debugger_ui/src/session/running.rs
@@ -1743,7 +1743,7 @@ impl RunningState {
let is_building = self.session.update(cx, |session, cx| {
session.shutdown(cx).detach();
- matches!(session.mode, session::SessionState::Booting(_))
+ matches!(session.state, session::SessionState::Booting(_))
});
if is_building {
diff --git a/crates/debugger_ui/src/session/running/loaded_source_list.rs b/crates/debugger_ui/src/session/running/loaded_source_list.rs
index 921ebd8b5f5bdfe8a3c8a8f7bb1625bd1ffad7fb..e55fad336b5ee6dfbee1cb0c90ea3d19f561a2ba 100644
--- a/crates/debugger_ui/src/session/running/loaded_source_list.rs
+++ b/crates/debugger_ui/src/session/running/loaded_source_list.rs
@@ -17,7 +17,9 @@ impl LoadedSourceList {
let list = ListState::new(0, gpui::ListAlignment::Top, px(1000.));
let _subscription = cx.subscribe(&session, |this, _, event, cx| match event {
- SessionEvent::Stopped(_) | SessionEvent::LoadedSources => {
+ SessionEvent::Stopped(_)
+ | SessionEvent::HistoricSnapshotSelected
+ | SessionEvent::LoadedSources => {
this.invalidate = true;
cx.notify();
}
diff --git a/crates/debugger_ui/src/session/running/module_list.rs b/crates/debugger_ui/src/session/running/module_list.rs
index 19f407eb23f8acf0aa665f5119ecfd2156eb685f..7d0228fc6851185d10a3a237257d6244d5a90c76 100644
--- a/crates/debugger_ui/src/session/running/module_list.rs
+++ b/crates/debugger_ui/src/session/running/module_list.rs
@@ -32,7 +32,9 @@ impl ModuleList {
let focus_handle = cx.focus_handle();
let _subscription = cx.subscribe(&session, |this, _, event, cx| match event {
- SessionEvent::Stopped(_) | SessionEvent::Modules => {
+ SessionEvent::Stopped(_)
+ | SessionEvent::HistoricSnapshotSelected
+ | SessionEvent::Modules => {
if this._rebuild_task.is_some() {
this.schedule_rebuild(cx);
}
diff --git a/crates/debugger_ui/src/session/running/stack_frame_list.rs b/crates/debugger_ui/src/session/running/stack_frame_list.rs
index 96a910af4dd0ac901c6802c139ddd5b8b3d728bc..4dffb57a792cb5a5ed6bcc8003a8fa6f3b9af9de 100644
--- a/crates/debugger_ui/src/session/running/stack_frame_list.rs
+++ b/crates/debugger_ui/src/session/running/stack_frame_list.rs
@@ -4,6 +4,7 @@ use std::time::Duration;
use anyhow::{Context as _, Result, anyhow};
use dap::StackFrameId;
+use dap::adapters::DebugAdapterName;
use db::kvp::KEY_VALUE_STORE;
use gpui::{
Action, AnyElement, Entity, EventEmitter, FocusHandle, Focusable, FontWeight, ListState,
@@ -20,7 +21,7 @@ use project::debugger::breakpoint_store::ActiveStackFrame;
use project::debugger::session::{Session, SessionEvent, StackFrame, ThreadStatus};
use project::{ProjectItem, ProjectPath};
use ui::{Tooltip, WithScrollbar, prelude::*};
-use workspace::{ItemHandle, Workspace};
+use workspace::{ItemHandle, Workspace, WorkspaceId};
use super::RunningState;
@@ -58,6 +59,14 @@ impl From for String {
}
}
+pub(crate) fn stack_frame_filter_key(
+ adapter_name: &DebugAdapterName,
+ workspace_id: WorkspaceId,
+) -> String {
+ let database_id: i64 = workspace_id.into();
+ format!("stack-frame-list-filter-{}-{}", adapter_name.0, database_id)
+}
+
pub struct StackFrameList {
focus_handle: FocusHandle,
_subscription: Subscription,
@@ -97,7 +106,9 @@ impl StackFrameList {
SessionEvent::Threads => {
this.schedule_refresh(false, window, cx);
}
- SessionEvent::Stopped(..) | SessionEvent::StackTrace => {
+ SessionEvent::Stopped(..)
+ | SessionEvent::StackTrace
+ | SessionEvent::HistoricSnapshotSelected => {
this.schedule_refresh(true, window, cx);
}
_ => {}
@@ -105,14 +116,18 @@ impl StackFrameList {
let list_state = ListState::new(0, gpui::ListAlignment::Top, px(1000.));
- let list_filter = KEY_VALUE_STORE
- .read_kvp(&format!(
- "stack-frame-list-filter-{}",
- session.read(cx).adapter().0
- ))
+ let list_filter = workspace
+ .read_with(cx, |workspace, _| workspace.database_id())
.ok()
.flatten()
- .map(StackFrameFilter::from_str_or_default)
+ .and_then(|database_id| {
+ let key = stack_frame_filter_key(&session.read(cx).adapter(), database_id);
+ KEY_VALUE_STORE
+ .read_kvp(&key)
+ .ok()
+ .flatten()
+ .map(StackFrameFilter::from_str_or_default)
+ })
.unwrap_or(StackFrameFilter::All);
let mut this = Self {
@@ -225,7 +240,6 @@ impl StackFrameList {
}
this.update_in(cx, |this, window, cx| {
this.build_entries(select_first, window, cx);
- cx.notify();
})
.ok();
})
@@ -806,15 +820,8 @@ impl StackFrameList {
.ok()
.flatten()
{
- let database_id: i64 = database_id.into();
- let save_task = KEY_VALUE_STORE.write_kvp(
- format!(
- "stack-frame-list-filter-{}-{}",
- self.session.read(cx).adapter().0,
- database_id,
- ),
- self.list_filter.into(),
- );
+ let key = stack_frame_filter_key(&self.session.read(cx).adapter(), database_id);
+ let save_task = KEY_VALUE_STORE.write_kvp(key, self.list_filter.into());
cx.background_spawn(save_task).detach();
}
diff --git a/crates/debugger_ui/src/session/running/variable_list.rs b/crates/debugger_ui/src/session/running/variable_list.rs
index 1b455b59d7d12712a3d4adc713a6ed15e8166c6e..7b23cd685d93e6353d68dc57cd3998099ea56ad7 100644
--- a/crates/debugger_ui/src/session/running/variable_list.rs
+++ b/crates/debugger_ui/src/session/running/variable_list.rs
@@ -217,6 +217,12 @@ impl VariableList {
let _subscriptions = vec![
cx.subscribe(&stack_frame_list, Self::handle_stack_frame_list_events),
cx.subscribe(&session, |this, _, event, cx| match event {
+ SessionEvent::HistoricSnapshotSelected => {
+ this.selection.take();
+ this.edited_path.take();
+ this.selected_stack_frame_id.take();
+ this.build_entries(cx);
+ }
SessionEvent::Stopped(_) => {
this.selection.take();
this.edited_path.take();
@@ -225,7 +231,6 @@ impl VariableList {
SessionEvent::Variables | SessionEvent::Watchers => {
this.build_entries(cx);
}
-
_ => {}
}),
cx.on_focus_out(&focus_handle, window, |this, _, _, cx| {
diff --git a/crates/debugger_ui/src/tests/inline_values.rs b/crates/debugger_ui/src/tests/inline_values.rs
index 801e6d43623b50d69ea3ce297c274c2d7e5a8b14..379bc4c98f5341b089b5936ed8571da5a6280723 100644
--- a/crates/debugger_ui/src/tests/inline_values.rs
+++ b/crates/debugger_ui/src/tests/inline_values.rs
@@ -4,7 +4,7 @@ use dap::{Scope, StackFrame, Variable, requests::Variables};
use editor::{Editor, EditorMode, MultiBuffer};
use gpui::{BackgroundExecutor, TestAppContext, VisualTestContext};
use language::{
- Language, LanguageConfig, LanguageMatcher, tree_sitter_python, tree_sitter_rust,
+ Language, LanguageConfig, LanguageMatcher, rust_lang, tree_sitter_python,
tree_sitter_typescript,
};
use project::{FakeFs, Project};
@@ -224,7 +224,7 @@ fn main() {
.unwrap();
buffer.update(cx, |buffer, cx| {
- buffer.set_language(Some(Arc::new(rust_lang())), cx);
+ buffer.set_language(Some(rust_lang()), cx);
});
let (editor, cx) = cx.add_window_view(|window, cx| {
@@ -1521,23 +1521,6 @@ fn main() {
});
}
-fn rust_lang() -> Language {
- let debug_variables_query = include_str!("../../../languages/src/rust/debugger.scm");
- Language::new(
- LanguageConfig {
- name: "Rust".into(),
- matcher: LanguageMatcher {
- path_suffixes: vec!["rs".to_string()],
- ..Default::default()
- },
- ..Default::default()
- },
- Some(tree_sitter_rust::LANGUAGE.into()),
- )
- .with_debug_variables_query(debug_variables_query)
- .unwrap()
-}
-
#[gpui::test]
async fn test_python_inline_values(executor: BackgroundExecutor, cx: &mut TestAppContext) {
init_test(cx);
@@ -1859,21 +1842,23 @@ fn python_lang() -> Language {
.unwrap()
}
-fn go_lang() -> Language {
+fn go_lang() -> Arc {
let debug_variables_query = include_str!("../../../languages/src/go/debugger.scm");
- Language::new(
- LanguageConfig {
- name: "Go".into(),
- matcher: LanguageMatcher {
- path_suffixes: vec!["go".to_string()],
+ Arc::new(
+ Language::new(
+ LanguageConfig {
+ name: "Go".into(),
+ matcher: LanguageMatcher {
+ path_suffixes: vec!["go".to_string()],
+ ..Default::default()
+ },
..Default::default()
},
- ..Default::default()
- },
- Some(tree_sitter_go::LANGUAGE.into()),
+ Some(tree_sitter_go::LANGUAGE.into()),
+ )
+ .with_debug_variables_query(debug_variables_query)
+ .unwrap(),
)
- .with_debug_variables_query(debug_variables_query)
- .unwrap()
}
/// Test utility function for inline values testing
@@ -1891,7 +1876,7 @@ async fn test_inline_values_util(
before: &str,
after: &str,
active_debug_line: Option,
- language: Language,
+ language: Arc,
executor: BackgroundExecutor,
cx: &mut TestAppContext,
) {
@@ -2091,7 +2076,7 @@ async fn test_inline_values_util(
.unwrap();
buffer.update(cx, |buffer, cx| {
- buffer.set_language(Some(Arc::new(language)), cx);
+ buffer.set_language(Some(language), cx);
});
let (editor, cx) = cx.add_window_view(|window, cx| {
@@ -2276,55 +2261,61 @@ fn main() {
.await;
}
-fn javascript_lang() -> Language {
+fn javascript_lang() -> Arc {
let debug_variables_query = include_str!("../../../languages/src/javascript/debugger.scm");
- Language::new(
- LanguageConfig {
- name: "JavaScript".into(),
- matcher: LanguageMatcher {
- path_suffixes: vec!["js".to_string()],
+ Arc::new(
+ Language::new(
+ LanguageConfig {
+ name: "JavaScript".into(),
+ matcher: LanguageMatcher {
+ path_suffixes: vec!["js".to_string()],
+ ..Default::default()
+ },
..Default::default()
},
- ..Default::default()
- },
- Some(tree_sitter_typescript::LANGUAGE_TYPESCRIPT.into()),
+ Some(tree_sitter_typescript::LANGUAGE_TYPESCRIPT.into()),
+ )
+ .with_debug_variables_query(debug_variables_query)
+ .unwrap(),
)
- .with_debug_variables_query(debug_variables_query)
- .unwrap()
}
-fn typescript_lang() -> Language {
+fn typescript_lang() -> Arc {
let debug_variables_query = include_str!("../../../languages/src/typescript/debugger.scm");
- Language::new(
- LanguageConfig {
- name: "TypeScript".into(),
- matcher: LanguageMatcher {
- path_suffixes: vec!["ts".to_string()],
+ Arc::new(
+ Language::new(
+ LanguageConfig {
+ name: "TypeScript".into(),
+ matcher: LanguageMatcher {
+ path_suffixes: vec!["ts".to_string()],
+ ..Default::default()
+ },
..Default::default()
},
- ..Default::default()
- },
- Some(tree_sitter_typescript::LANGUAGE_TYPESCRIPT.into()),
+ Some(tree_sitter_typescript::LANGUAGE_TYPESCRIPT.into()),
+ )
+ .with_debug_variables_query(debug_variables_query)
+ .unwrap(),
)
- .with_debug_variables_query(debug_variables_query)
- .unwrap()
}
-fn tsx_lang() -> Language {
+fn tsx_lang() -> Arc {
let debug_variables_query = include_str!("../../../languages/src/tsx/debugger.scm");
- Language::new(
- LanguageConfig {
- name: "TSX".into(),
- matcher: LanguageMatcher {
- path_suffixes: vec!["tsx".to_string()],
+ Arc::new(
+ Language::new(
+ LanguageConfig {
+ name: "TSX".into(),
+ matcher: LanguageMatcher {
+ path_suffixes: vec!["tsx".to_string()],
+ ..Default::default()
+ },
..Default::default()
},
- ..Default::default()
- },
- Some(tree_sitter_typescript::LANGUAGE_TSX.into()),
+ Some(tree_sitter_typescript::LANGUAGE_TSX.into()),
+ )
+ .with_debug_variables_query(debug_variables_query)
+ .unwrap(),
)
- .with_debug_variables_query(debug_variables_query)
- .unwrap()
}
#[gpui::test]
diff --git a/crates/debugger_ui/src/tests/stack_frame_list.rs b/crates/debugger_ui/src/tests/stack_frame_list.rs
index 05e638e2321bb6fcb4504a8bc8c81123f1b09a33..445d5a01d9f062501c889a9d5aa920de6f037914 100644
--- a/crates/debugger_ui/src/tests/stack_frame_list.rs
+++ b/crates/debugger_ui/src/tests/stack_frame_list.rs
@@ -1,12 +1,15 @@
use crate::{
debugger_panel::DebugPanel,
- session::running::stack_frame_list::{StackFrameEntry, StackFrameFilter},
+ session::running::stack_frame_list::{
+ StackFrameEntry, StackFrameFilter, stack_frame_filter_key,
+ },
tests::{active_debug_session_panel, init_test, init_test_workspace, start_debug_session},
};
use dap::{
StackFrame,
requests::{Scopes, StackTrace, Threads},
};
+use db::kvp::KEY_VALUE_STORE;
use editor::{Editor, ToPoint as _};
use gpui::{BackgroundExecutor, TestAppContext, VisualTestContext};
use project::{FakeFs, Project};
@@ -1085,3 +1088,180 @@ async fn test_stack_frame_filter(executor: BackgroundExecutor, cx: &mut TestAppC
);
});
}
+
+#[gpui::test]
+async fn test_stack_frame_filter_persistence(
+ executor: BackgroundExecutor,
+ cx: &mut TestAppContext,
+) {
+ init_test(cx);
+
+ let fs = FakeFs::new(executor.clone());
+
+ fs.insert_tree(
+ path!("/project"),
+ json!({
+ "src": {
+ "test.js": "function main() { console.log('hello'); }",
+ }
+ }),
+ )
+ .await;
+
+ let project = Project::test(fs.clone(), [path!("/project").as_ref()], cx).await;
+ let workspace = init_test_workspace(&project, cx).await;
+ let cx = &mut VisualTestContext::from_window(*workspace, cx);
+ workspace
+ .update(cx, |workspace, _, _| {
+ workspace.set_random_database_id();
+ })
+ .unwrap();
+
+ let threads_response = dap::ThreadsResponse {
+ threads: vec![dap::Thread {
+ id: 1,
+ name: "Thread 1".into(),
+ }],
+ };
+
+ let stack_trace_response = dap::StackTraceResponse {
+ stack_frames: vec![StackFrame {
+ id: 1,
+ name: "main".into(),
+ source: Some(dap::Source {
+ name: Some("test.js".into()),
+ path: Some(path!("/project/src/test.js").into()),
+ source_reference: None,
+ presentation_hint: None,
+ origin: None,
+ sources: None,
+ adapter_data: None,
+ checksums: None,
+ }),
+ line: 1,
+ column: 1,
+ end_line: None,
+ end_column: None,
+ can_restart: None,
+ instruction_pointer_reference: None,
+ module_id: None,
+ presentation_hint: None,
+ }],
+ total_frames: None,
+ };
+
+ let stopped_event = dap::StoppedEvent {
+ reason: dap::StoppedEventReason::Pause,
+ description: None,
+ thread_id: Some(1),
+ preserve_focus_hint: None,
+ text: None,
+ all_threads_stopped: None,
+ hit_breakpoint_ids: None,
+ };
+
+ let session = start_debug_session(&workspace, cx, |_| {}).unwrap();
+ let client = session.update(cx, |session, _| session.adapter_client().unwrap());
+ let adapter_name = session.update(cx, |session, _| session.adapter());
+
+ client.on_request::({
+ let threads_response = threads_response.clone();
+ move |_, _| Ok(threads_response.clone())
+ });
+
+ client.on_request::(move |_, _| Ok(dap::ScopesResponse { scopes: vec![] }));
+
+ client.on_request::({
+ let stack_trace_response = stack_trace_response.clone();
+ move |_, _| Ok(stack_trace_response.clone())
+ });
+
+ client
+ .fake_event(dap::messages::Events::Stopped(stopped_event.clone()))
+ .await;
+
+ cx.run_until_parked();
+
+ let stack_frame_list =
+ active_debug_session_panel(workspace, cx).update(cx, |debug_panel_item, cx| {
+ debug_panel_item
+ .running_state()
+ .update(cx, |state, _| state.stack_frame_list().clone())
+ });
+
+ stack_frame_list.update(cx, |stack_frame_list, _cx| {
+ assert_eq!(
+ stack_frame_list.list_filter(),
+ StackFrameFilter::All,
+ "Initial filter should be All"
+ );
+ });
+
+ stack_frame_list.update(cx, |stack_frame_list, cx| {
+ stack_frame_list
+ .toggle_frame_filter(Some(project::debugger::session::ThreadStatus::Stopped), cx);
+ assert_eq!(
+ stack_frame_list.list_filter(),
+ StackFrameFilter::OnlyUserFrames,
+ "Filter should be OnlyUserFrames after toggle"
+ );
+ });
+
+ cx.run_until_parked();
+
+ let workspace_id = workspace
+ .update(cx, |workspace, _window, _cx| workspace.database_id())
+ .ok()
+ .flatten()
+ .expect("workspace id has to be some for this test to work properly");
+
+ let key = stack_frame_filter_key(&adapter_name, workspace_id);
+ let stored_value = KEY_VALUE_STORE.read_kvp(&key).unwrap();
+ assert_eq!(
+ stored_value,
+ Some(StackFrameFilter::OnlyUserFrames.into()),
+ "Filter should be persisted in KVP store with key: {}",
+ key
+ );
+
+ client
+ .fake_event(dap::messages::Events::Terminated(None))
+ .await;
+ cx.run_until_parked();
+
+ let session2 = start_debug_session(&workspace, cx, |_| {}).unwrap();
+ let client2 = session2.update(cx, |session, _| session.adapter_client().unwrap());
+
+ client2.on_request::({
+ let threads_response = threads_response.clone();
+ move |_, _| Ok(threads_response.clone())
+ });
+
+ client2.on_request::(move |_, _| Ok(dap::ScopesResponse { scopes: vec![] }));
+
+ client2.on_request::({
+ let stack_trace_response = stack_trace_response.clone();
+ move |_, _| Ok(stack_trace_response.clone())
+ });
+
+ client2
+ .fake_event(dap::messages::Events::Stopped(stopped_event.clone()))
+ .await;
+
+ cx.run_until_parked();
+
+ let stack_frame_list2 =
+ active_debug_session_panel(workspace, cx).update(cx, |debug_panel_item, cx| {
+ debug_panel_item
+ .running_state()
+ .update(cx, |state, _| state.stack_frame_list().clone())
+ });
+
+ stack_frame_list2.update(cx, |stack_frame_list, _cx| {
+ assert_eq!(
+ stack_frame_list.list_filter(),
+ StackFrameFilter::OnlyUserFrames,
+ "Filter should be restored from KVP store in new session"
+ );
+ });
+}
diff --git a/crates/edit_prediction/Cargo.toml b/crates/edit_prediction/Cargo.toml
index 2c6888d14be49c857e7805fb63f9f9335ac32c8e..6e62cfa6f038671d595c5671de147cdc2125064d 100644
--- a/crates/edit_prediction/Cargo.toml
+++ b/crates/edit_prediction/Cargo.toml
@@ -11,7 +11,69 @@ workspace = true
[lib]
path = "src/edit_prediction.rs"
+[features]
+eval-support = []
+
[dependencies]
+ai_onboarding.workspace = true
+anyhow.workspace = true
+arrayvec.workspace = true
+brotli.workspace = true
client.workspace = true
+cloud_llm_client.workspace = true
+cloud_zeta2_prompt.workspace = true
+collections.workspace = true
+copilot.workspace = true
+credentials_provider.workspace = true
+db.workspace = true
+edit_prediction_types.workspace = true
+edit_prediction_context.workspace = true
+feature_flags.workspace = true
+fs.workspace = true
+futures.workspace = true
gpui.workspace = true
+indoc.workspace = true
+itertools.workspace = true
language.workspace = true
+language_model.workspace = true
+log.workspace = true
+lsp.workspace = true
+menu.workspace = true
+open_ai.workspace = true
+postage.workspace = true
+pretty_assertions.workspace = true
+project.workspace = true
+rand.workspace = true
+regex.workspace = true
+release_channel.workspace = true
+semver.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+settings.workspace = true
+smol.workspace = true
+strsim.workspace = true
+strum.workspace = true
+telemetry.workspace = true
+telemetry_events.workspace = true
+thiserror.workspace = true
+ui.workspace = true
+util.workspace = true
+uuid.workspace = true
+workspace.workspace = true
+worktree.workspace = true
+zed_actions.workspace = true
+
+[dev-dependencies]
+clock = { workspace = true, features = ["test-support"] }
+cloud_api_types.workspace = true
+cloud_llm_client = { workspace = true, features = ["test-support"] }
+ctor.workspace = true
+gpui = { workspace = true, features = ["test-support"] }
+indoc.workspace = true
+language = { workspace = true, features = ["test-support"] }
+language_model = { workspace = true, features = ["test-support"] }
+lsp.workspace = true
+parking_lot.workspace = true
+project = { workspace = true, features = ["test-support"] }
+settings = { workspace = true, features = ["test-support"] }
+zlog.workspace = true
diff --git a/crates/zeta/license_examples/0bsd.txt b/crates/edit_prediction/license_examples/0bsd.txt
similarity index 100%
rename from crates/zeta/license_examples/0bsd.txt
rename to crates/edit_prediction/license_examples/0bsd.txt
diff --git a/crates/zeta/license_examples/apache-2.0-ex0.txt b/crates/edit_prediction/license_examples/apache-2.0-ex0.txt
similarity index 100%
rename from crates/zeta/license_examples/apache-2.0-ex0.txt
rename to crates/edit_prediction/license_examples/apache-2.0-ex0.txt
diff --git a/crates/zeta/license_examples/apache-2.0-ex1.txt b/crates/edit_prediction/license_examples/apache-2.0-ex1.txt
similarity index 100%
rename from crates/zeta/license_examples/apache-2.0-ex1.txt
rename to crates/edit_prediction/license_examples/apache-2.0-ex1.txt
diff --git a/crates/zeta/license_examples/apache-2.0-ex2.txt b/crates/edit_prediction/license_examples/apache-2.0-ex2.txt
similarity index 100%
rename from crates/zeta/license_examples/apache-2.0-ex2.txt
rename to crates/edit_prediction/license_examples/apache-2.0-ex2.txt
diff --git a/crates/zeta/license_examples/apache-2.0-ex3.txt b/crates/edit_prediction/license_examples/apache-2.0-ex3.txt
similarity index 100%
rename from crates/zeta/license_examples/apache-2.0-ex3.txt
rename to crates/edit_prediction/license_examples/apache-2.0-ex3.txt
diff --git a/crates/zeta/license_examples/apache-2.0-ex4.txt b/crates/edit_prediction/license_examples/apache-2.0-ex4.txt
similarity index 100%
rename from crates/zeta/license_examples/apache-2.0-ex4.txt
rename to crates/edit_prediction/license_examples/apache-2.0-ex4.txt
diff --git a/crates/zeta/license_examples/bsd-1-clause.txt b/crates/edit_prediction/license_examples/bsd-1-clause.txt
similarity index 100%
rename from crates/zeta/license_examples/bsd-1-clause.txt
rename to crates/edit_prediction/license_examples/bsd-1-clause.txt
diff --git a/crates/zeta/license_examples/bsd-2-clause-ex0.txt b/crates/edit_prediction/license_examples/bsd-2-clause-ex0.txt
similarity index 100%
rename from crates/zeta/license_examples/bsd-2-clause-ex0.txt
rename to crates/edit_prediction/license_examples/bsd-2-clause-ex0.txt
diff --git a/crates/zeta/license_examples/bsd-3-clause-ex0.txt b/crates/edit_prediction/license_examples/bsd-3-clause-ex0.txt
similarity index 100%
rename from crates/zeta/license_examples/bsd-3-clause-ex0.txt
rename to crates/edit_prediction/license_examples/bsd-3-clause-ex0.txt
diff --git a/crates/zeta/license_examples/bsd-3-clause-ex1.txt b/crates/edit_prediction/license_examples/bsd-3-clause-ex1.txt
similarity index 100%
rename from crates/zeta/license_examples/bsd-3-clause-ex1.txt
rename to crates/edit_prediction/license_examples/bsd-3-clause-ex1.txt
diff --git a/crates/zeta/license_examples/bsd-3-clause-ex2.txt b/crates/edit_prediction/license_examples/bsd-3-clause-ex2.txt
similarity index 100%
rename from crates/zeta/license_examples/bsd-3-clause-ex2.txt
rename to crates/edit_prediction/license_examples/bsd-3-clause-ex2.txt
diff --git a/crates/zeta/license_examples/bsd-3-clause-ex3.txt b/crates/edit_prediction/license_examples/bsd-3-clause-ex3.txt
similarity index 100%
rename from crates/zeta/license_examples/bsd-3-clause-ex3.txt
rename to crates/edit_prediction/license_examples/bsd-3-clause-ex3.txt
diff --git a/crates/zeta/license_examples/bsd-3-clause-ex4.txt b/crates/edit_prediction/license_examples/bsd-3-clause-ex4.txt
similarity index 100%
rename from crates/zeta/license_examples/bsd-3-clause-ex4.txt
rename to crates/edit_prediction/license_examples/bsd-3-clause-ex4.txt
diff --git a/crates/zeta/license_examples/isc.txt b/crates/edit_prediction/license_examples/isc.txt
similarity index 100%
rename from crates/zeta/license_examples/isc.txt
rename to crates/edit_prediction/license_examples/isc.txt
diff --git a/crates/zeta/license_examples/mit-ex0.txt b/crates/edit_prediction/license_examples/mit-ex0.txt
similarity index 100%
rename from crates/zeta/license_examples/mit-ex0.txt
rename to crates/edit_prediction/license_examples/mit-ex0.txt
diff --git a/crates/zeta/license_examples/mit-ex1.txt b/crates/edit_prediction/license_examples/mit-ex1.txt
similarity index 100%
rename from crates/zeta/license_examples/mit-ex1.txt
rename to crates/edit_prediction/license_examples/mit-ex1.txt
diff --git a/crates/zeta/license_examples/mit-ex2.txt b/crates/edit_prediction/license_examples/mit-ex2.txt
similarity index 100%
rename from crates/zeta/license_examples/mit-ex2.txt
rename to crates/edit_prediction/license_examples/mit-ex2.txt
diff --git a/crates/zeta/license_examples/mit-ex3.txt b/crates/edit_prediction/license_examples/mit-ex3.txt
similarity index 100%
rename from crates/zeta/license_examples/mit-ex3.txt
rename to crates/edit_prediction/license_examples/mit-ex3.txt
diff --git a/crates/zeta/license_examples/upl-1.0.txt b/crates/edit_prediction/license_examples/upl-1.0.txt
similarity index 100%
rename from crates/zeta/license_examples/upl-1.0.txt
rename to crates/edit_prediction/license_examples/upl-1.0.txt
diff --git a/crates/zeta/license_examples/zlib-ex0.txt b/crates/edit_prediction/license_examples/zlib-ex0.txt
similarity index 100%
rename from crates/zeta/license_examples/zlib-ex0.txt
rename to crates/edit_prediction/license_examples/zlib-ex0.txt
diff --git a/crates/zeta/license_patterns/0bsd-pattern b/crates/edit_prediction/license_patterns/0bsd-pattern
similarity index 100%
rename from crates/zeta/license_patterns/0bsd-pattern
rename to crates/edit_prediction/license_patterns/0bsd-pattern
diff --git a/crates/zeta/license_patterns/apache-2.0-pattern b/crates/edit_prediction/license_patterns/apache-2.0-pattern
similarity index 100%
rename from crates/zeta/license_patterns/apache-2.0-pattern
rename to crates/edit_prediction/license_patterns/apache-2.0-pattern
diff --git a/crates/zeta/license_patterns/apache-2.0-reference-pattern b/crates/edit_prediction/license_patterns/apache-2.0-reference-pattern
similarity index 100%
rename from crates/zeta/license_patterns/apache-2.0-reference-pattern
rename to crates/edit_prediction/license_patterns/apache-2.0-reference-pattern
diff --git a/crates/zeta/license_patterns/bsd-pattern b/crates/edit_prediction/license_patterns/bsd-pattern
similarity index 100%
rename from crates/zeta/license_patterns/bsd-pattern
rename to crates/edit_prediction/license_patterns/bsd-pattern
diff --git a/crates/zeta/license_patterns/isc-pattern b/crates/edit_prediction/license_patterns/isc-pattern
similarity index 100%
rename from crates/zeta/license_patterns/isc-pattern
rename to crates/edit_prediction/license_patterns/isc-pattern
diff --git a/crates/zeta/license_patterns/mit-pattern b/crates/edit_prediction/license_patterns/mit-pattern
similarity index 100%
rename from crates/zeta/license_patterns/mit-pattern
rename to crates/edit_prediction/license_patterns/mit-pattern
diff --git a/crates/zeta/license_patterns/upl-1.0-pattern b/crates/edit_prediction/license_patterns/upl-1.0-pattern
similarity index 100%
rename from crates/zeta/license_patterns/upl-1.0-pattern
rename to crates/edit_prediction/license_patterns/upl-1.0-pattern
diff --git a/crates/zeta/license_patterns/zlib-pattern b/crates/edit_prediction/license_patterns/zlib-pattern
similarity index 100%
rename from crates/zeta/license_patterns/zlib-pattern
rename to crates/edit_prediction/license_patterns/zlib-pattern
diff --git a/crates/edit_prediction/src/cursor_excerpt.rs b/crates/edit_prediction/src/cursor_excerpt.rs
new file mode 100644
index 0000000000000000000000000000000000000000..1f2f1d32ebcb2eaa151433bd49d275e0e2a3b817
--- /dev/null
+++ b/crates/edit_prediction/src/cursor_excerpt.rs
@@ -0,0 +1,78 @@
+use language::{BufferSnapshot, Point};
+use std::ops::Range;
+
+pub fn editable_and_context_ranges_for_cursor_position(
+ position: Point,
+ snapshot: &BufferSnapshot,
+ editable_region_token_limit: usize,
+ context_token_limit: usize,
+) -> (Range, Range) {
+ let mut scope_range = position..position;
+ let mut remaining_edit_tokens = editable_region_token_limit;
+
+ while let Some(parent) = snapshot.syntax_ancestor(scope_range.clone()) {
+ let parent_tokens = guess_token_count(parent.byte_range().len());
+ let parent_point_range = Point::new(
+ parent.start_position().row as u32,
+ parent.start_position().column as u32,
+ )
+ ..Point::new(
+ parent.end_position().row as u32,
+ parent.end_position().column as u32,
+ );
+ if parent_point_range == scope_range {
+ break;
+ } else if parent_tokens <= editable_region_token_limit {
+ scope_range = parent_point_range;
+ remaining_edit_tokens = editable_region_token_limit - parent_tokens;
+ } else {
+ break;
+ }
+ }
+
+ let editable_range = expand_range(snapshot, scope_range, remaining_edit_tokens);
+ let context_range = expand_range(snapshot, editable_range.clone(), context_token_limit);
+ (editable_range, context_range)
+}
+
+fn expand_range(
+ snapshot: &BufferSnapshot,
+ range: Range,
+ mut remaining_tokens: usize,
+) -> Range {
+ let mut expanded_range = range;
+ expanded_range.start.column = 0;
+ expanded_range.end.column = snapshot.line_len(expanded_range.end.row);
+ loop {
+ let mut expanded = false;
+
+ if remaining_tokens > 0 && expanded_range.start.row > 0 {
+ expanded_range.start.row -= 1;
+ let line_tokens =
+ guess_token_count(snapshot.line_len(expanded_range.start.row) as usize);
+ remaining_tokens = remaining_tokens.saturating_sub(line_tokens);
+ expanded = true;
+ }
+
+ if remaining_tokens > 0 && expanded_range.end.row < snapshot.max_point().row {
+ expanded_range.end.row += 1;
+ expanded_range.end.column = snapshot.line_len(expanded_range.end.row);
+ let line_tokens = guess_token_count(expanded_range.end.column as usize);
+ remaining_tokens = remaining_tokens.saturating_sub(line_tokens);
+ expanded = true;
+ }
+
+ if !expanded {
+ break;
+ }
+ }
+ expanded_range
+}
+
+/// Typical number of string bytes per token for the purposes of limiting model input. This is
+/// intentionally low to err on the side of underestimating limits.
+pub(crate) const BYTES_PER_TOKEN_GUESS: usize = 3;
+
+pub fn guess_token_count(bytes: usize) -> usize {
+ bytes / BYTES_PER_TOKEN_GUESS
+}
diff --git a/crates/edit_prediction/src/edit_prediction.rs b/crates/edit_prediction/src/edit_prediction.rs
index 1984383a9691ae9373973a3eb9f00db4e7e795f2..141fff3063b83d7e0003fddd6b4eba2d213d5fd5 100644
--- a/crates/edit_prediction/src/edit_prediction.rs
+++ b/crates/edit_prediction/src/edit_prediction.rs
@@ -1,298 +1,1944 @@
-use std::{ops::Range, sync::Arc};
+use anyhow::Result;
+use arrayvec::ArrayVec;
+use client::{Client, EditPredictionUsage, UserStore};
+use cloud_llm_client::predict_edits_v3::{self, Event, PromptFormat};
+use cloud_llm_client::{
+ AcceptEditPredictionBody, EXPIRED_LLM_TOKEN_HEADER_NAME, EditPredictionRejectReason,
+ EditPredictionRejection, MAX_EDIT_PREDICTION_REJECTIONS_PER_REQUEST,
+ MINIMUM_REQUIRED_VERSION_HEADER_NAME, PredictEditsRequestTrigger, RejectEditPredictionsBodyRef,
+ ZED_VERSION_HEADER_NAME,
+};
+use cloud_zeta2_prompt::DEFAULT_MAX_PROMPT_BYTES;
+use collections::{HashMap, HashSet};
+use db::kvp::{Dismissable, KEY_VALUE_STORE};
+use edit_prediction_context::EditPredictionExcerptOptions;
+use edit_prediction_context::{RelatedExcerptStore, RelatedExcerptStoreEvent, RelatedFile};
+use feature_flags::{FeatureFlag, FeatureFlagAppExt as _};
+use futures::{
+ AsyncReadExt as _, FutureExt as _, StreamExt as _,
+ channel::{
+ mpsc::{self, UnboundedReceiver},
+ oneshot,
+ },
+ select_biased,
+};
+use gpui::BackgroundExecutor;
+use gpui::{
+ App, AsyncApp, Entity, EntityId, Global, SharedString, Subscription, Task, WeakEntity, actions,
+ http_client::{self, AsyncBody, Method},
+ prelude::*,
+};
+use language::language_settings::all_language_settings;
+use language::{Anchor, Buffer, File, Point, ToPoint};
+use language::{BufferSnapshot, OffsetRangeExt};
+use language_model::{LlmApiToken, RefreshLlmTokenListener};
+use project::{Project, ProjectPath, WorktreeId};
+use release_channel::AppVersion;
+use semver::Version;
+use serde::de::DeserializeOwned;
+use settings::{EditPredictionProvider, SettingsStore, update_settings_file};
+use std::collections::{VecDeque, hash_map};
+use workspace::Workspace;
+
+use std::ops::Range;
+use std::path::Path;
+use std::rc::Rc;
+use std::str::FromStr as _;
+use std::sync::{Arc, LazyLock};
+use std::time::{Duration, Instant};
+use std::{env, mem};
+use thiserror::Error;
+use util::{RangeExt as _, ResultExt as _};
+use workspace::notifications::{ErrorMessagePrompt, NotificationId, show_app_notification};
+
+mod cursor_excerpt;
+mod license_detection;
+pub mod mercury;
+mod onboarding_modal;
+pub mod open_ai_response;
+mod prediction;
+pub mod sweep_ai;
+pub mod udiff;
+mod xml_edits;
+mod zed_edit_prediction_delegate;
+pub mod zeta1;
+pub mod zeta2;
+
+#[cfg(test)]
+mod edit_prediction_tests;
+
+use crate::license_detection::LicenseDetectionWatcher;
+use crate::mercury::Mercury;
+use crate::onboarding_modal::ZedPredictModal;
+pub use crate::prediction::EditPrediction;
+pub use crate::prediction::EditPredictionId;
+pub use crate::prediction::EditPredictionInputs;
+use crate::prediction::EditPredictionResult;
+pub use crate::sweep_ai::SweepAi;
+pub use telemetry_events::EditPredictionRating;
+pub use zed_edit_prediction_delegate::ZedEditPredictionDelegate;
+
+actions!(
+ edit_prediction,
+ [
+ /// Resets the edit prediction onboarding state.
+ ResetOnboarding,
+ /// Clears the edit prediction history.
+ ClearHistory,
+ ]
+);
+
+/// Maximum number of events to track.
+const EVENT_COUNT_MAX: usize = 6;
+const CHANGE_GROUPING_LINE_SPAN: u32 = 8;
+const ZED_PREDICT_DATA_COLLECTION_CHOICE: &str = "zed_predict_data_collection_choice";
+const REJECT_REQUEST_DEBOUNCE: Duration = Duration::from_secs(15);
-use client::EditPredictionUsage;
-use gpui::{App, Context, Entity, SharedString};
-use language::{Anchor, Buffer, BufferSnapshot, OffsetRangeExt};
+pub struct SweepFeatureFlag;
-// TODO: Find a better home for `Direction`.
-//
-// This should live in an ancestor crate of `editor` and `edit_prediction`,
-// but at time of writing there isn't an obvious spot.
-#[derive(Copy, Clone, PartialEq, Eq)]
-pub enum Direction {
- Prev,
- Next,
+impl FeatureFlag for SweepFeatureFlag {
+ const NAME: &str = "sweep-ai";
}
-#[derive(Clone)]
-pub enum EditPrediction {
- /// Edits within the buffer that requested the prediction
- Local {
- id: Option,
- edits: Vec<(Range, Arc)>,
- edit_preview: Option,
- },
- /// Jump to a different file from the one that requested the prediction
- Jump {
- id: Option,
- snapshot: language::BufferSnapshot,
- target: language::Anchor,
+pub struct MercuryFeatureFlag;
+
+impl FeatureFlag for MercuryFeatureFlag {
+ const NAME: &str = "mercury";
+}
+
+pub const DEFAULT_OPTIONS: ZetaOptions = ZetaOptions {
+ context: EditPredictionExcerptOptions {
+ max_bytes: 512,
+ min_bytes: 128,
+ target_before_cursor_over_total_bytes: 0.5,
},
+ max_prompt_bytes: DEFAULT_MAX_PROMPT_BYTES,
+ prompt_format: PromptFormat::DEFAULT,
+};
+
+static USE_OLLAMA: LazyLock =
+ LazyLock::new(|| env::var("ZED_ZETA2_OLLAMA").is_ok_and(|var| !var.is_empty()));
+
+static EDIT_PREDICTIONS_MODEL_ID: LazyLock = LazyLock::new(|| {
+ match env::var("ZED_ZETA2_MODEL").as_deref() {
+ Ok("zeta2-exp") => "4w5n28vw", // Fine-tuned model @ Baseten
+ Ok(model) => model,
+ Err(_) if *USE_OLLAMA => "qwen3-coder:30b",
+ Err(_) => "yqvev8r3", // Vanilla qwen3-coder @ Baseten
+ }
+ .to_string()
+});
+static PREDICT_EDITS_URL: LazyLock> = LazyLock::new(|| {
+ env::var("ZED_PREDICT_EDITS_URL").ok().or_else(|| {
+ if *USE_OLLAMA {
+ Some("http://localhost:11434/v1/chat/completions".into())
+ } else {
+ None
+ }
+ })
+});
+
+pub struct Zeta2FeatureFlag;
+
+impl FeatureFlag for Zeta2FeatureFlag {
+ const NAME: &'static str = "zeta2";
+
+ fn enabled_for_staff() -> bool {
+ true
+ }
+}
+
+#[derive(Clone)]
+struct EditPredictionStoreGlobal(Entity);
+
+impl Global for EditPredictionStoreGlobal {}
+
+pub struct EditPredictionStore {
+ client: Arc,
+ user_store: Entity,
+ llm_token: LlmApiToken,
+ _llm_token_subscription: Subscription,
+ projects: HashMap