Skip to content

armgit / Wake

Public Imported from GitHub
0

All your AI agent sessions in one place — browse, search, resume. Rust + GPUI.

Rust

ui: refine session browsing and detail experience

Corey Chiuc0fad7d57703
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 339a298..93b2ce5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,18 @@
## Unreleased
- Fix: in a Codex branch or subagent thread, the parent conversation's transcript is injected as a `user` message — its assistant replies were being shown as if you had typed them, and were indexed for search. They are now treated as injected context, like the other `<environment_context>`-style blocks
+- Update: sessions sorted by newest creation or update time are grouped into Pinned, Today, Yesterday, Earlier this week, and month sections
+- Fix: the session list now loads additional pages near the bottom instead of stopping after the first batch, and search hits beyond that batch are loaded and selected correctly
+- Fix: long mixed-language titles now end with a Unicode-width-aware ellipsis in the session list while wrapping in full in the detail header
+- Update: the project badge in session detail opens its folder, while empty, `HEAD`, and detached branch labels stay hidden
+- Fix: session detail now shows the concrete missing-adapter or transcript parsing error instead of a blank reader, with an action to reveal the source file
+- Update: conversation Markdown now has clearer h1–h4 hierarchy and framed code blocks with language labels, copy actions, and immediate light/dark syntax colors
+- Update: conversation text has roomier line spacing and window-level selection, including Shift extension across messages and edge auto-scroll while dragging a selection
+- Update: the destructive session action in the detail overflow menu now uses the danger color for both its trash icon and label
+- Fix: Codex code-review results now render as a readable review with findings, locations, and confidence instead of exposing the structured JSON payload
+- Update: Thinking attached to assistant replies is now a collapsible panel with a one-line summary and full expanded content, independently of tool-call expansion
+- Update: tool calls now use expandable cards with Unicode-width-aware summaries, complete available inputs, successful and failed outputs, and full-content copy actions beyond the 600-character preview
+- Update: Insights uses 28px overview values, 24px leaderboard rows, 32px section spacing, and one shared 2px radius for chart and heatmap cells
## [0.3.1] — 2026-08-30
diff --git a/Cargo.lock b/Cargo.lock
index bed9f10..dfa5cce 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,6 +2,115 @@
# It is not intended for manual editing.
version = 4
+[[package]]
+name = "accesskit"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3b7f7f85a7e5f68090000ed7622545829afd484d210358702ae4cb97dd0c320"
+dependencies = [
+ "enumn",
+ "uuid",
+]
+
+[[package]]
+name = "accesskit_atspi_common"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e8c61bee90b42a772d39d06a740207dc71a4e780004ace1db8d99fb1baaa954"
+dependencies = [
+ "accesskit",
+ "accesskit_consumer 0.36.0",
+ "atspi-common",
+ "phf 0.13.1",
+ "serde",
+ "zvariant",
+]
+
+[[package]]
+name = "accesskit_consumer"
+version = "0.36.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25e0d7e25d06f4dc21d1774d67146e9e80d6789216cbd4d1e88185b0095dba60"
+dependencies = [
+ "accesskit",
+ "hashbrown 0.16.1",
+]
+
+[[package]]
+name = "accesskit_consumer"
+version = "0.37.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f950720ce064757a1b629caad3a408e8d2c63bb01f29b8a3ff8daa331053ffeb"
+dependencies = [
+ "accesskit",
+ "hashbrown 0.16.1",
+]
+
+[[package]]
+name = "accesskit_consumer"
+version = "0.38.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d10a236f96f87d70732e44520046785431ef01d5bcd6b041317bfadd2f88245"
+dependencies = [
+ "accesskit",
+ "hashbrown 0.16.1",
+]
+
+[[package]]
+name = "accesskit_macos"
+version = "0.26.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce02dc63b43f0c9296af9ac946312a2dc8814427d7a64d2d600971dac55b6076"
+dependencies = [
+ "accesskit",
+ "accesskit_consumer 0.38.0",
+ "hashbrown 0.16.1",
+ "objc2 0.5.2",
+ "objc2-app-kit 0.2.2",
+ "objc2-foundation 0.2.2",
+]
+
+[[package]]
+name = "accesskit_unix"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b016ca8db0ea0ea2ceff29a9d6240391492d960716aa471967c00e8cc8cb197c"
+dependencies = [
+ "accesskit",
+ "accesskit_atspi_common",
+ "async-channel",
+ "async-executor",
+ "async-task",
+ "atspi",
+ "futures-lite",
+ "futures-util",
+ "serde",
+ "zbus",
+]
+
+[[package]]
+name = "accesskit_windows"
+version = "0.33.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "36e93ac7bf50b964f1cbb75f741629a4e950571baa1ef1274457ab5a80d9bcc2"
+dependencies = [
+ "accesskit",
+ "accesskit_consumer 0.37.0",
+ "hashbrown 0.16.1",
+ "static_assertions",
+ "windows 0.62.2",
+ "windows-core 0.62.2",
+]
+
+[[package]]
+name = "addr2line"
+version = "0.25.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b5d307320b3181d6d7954e663bd7c774a838b8220fe0593c86d9fb09f498b4b"
+dependencies = [
+ "gimli",
+]
+
[[package]]
name = "adler2"
version = "2.0.1"
@@ -28,6 +137,7 @@ checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
dependencies = [
"cfg-if",
"const-random",
+ "getrandom 0.3.4",
"once_cell",
"version_check",
"zerocopy",
@@ -60,6 +170,12 @@ dependencies = [
"equator",
]
+[[package]]
+name = "allocator-api2"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
+
[[package]]
name = "android_system_properties"
version = "0.1.6"
@@ -70,19 +186,27 @@ dependencies = [
]
[[package]]
-name = "anyhow"
-version = "1.0.104"
+name = "annotate-snippets"
+version = "0.12.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "330a5ed07fa54e4702c9d6c4174f74427fc0ef6e214bbd677ae50a5099946470"
+checksum = "f211a51805bc641f3ad5b7664c77d2547af685cc33b4cd8d31964027a46f13f1"
+dependencies = [
+ "anstyle",
+ "memchr",
+ "unicode-width",
+]
[[package]]
-name = "ar_archive_writer"
-version = "0.5.3"
+name = "anstyle"
+version = "1.0.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73cd58deff2140a0a8eae87e417bd01db68a33e148aa93d1e8cd837e55e312b6"
-dependencies = [
- "object",
-]
+checksum = "940b3a0ca603d1eade50a4846a2afffd5ef57a9feac2c0e2ec2e14f9ead76000"
+
+[[package]]
+name = "anyhow"
+version = "1.0.104"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "330a5ed07fa54e4702c9d6c4174f74427fc0ef6e214bbd677ae50a5099946470"
[[package]]
name = "arbitrary"
@@ -110,6 +234,12 @@ dependencies = [
"syn 2.0.119",
]
+[[package]]
+name = "arraydeque"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d902e3d592a523def97af8f317b08ce16b7ab854c1985a0c671e6f15cebc236"
+
[[package]]
name = "arrayref"
version = "0.3.9"
@@ -146,53 +276,21 @@ dependencies = [
"libloading",
]
-[[package]]
-name = "ash-window"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52bca67b61cb81e5553babde81b8211f713cb6db79766f80168f3e5f40ea6c82"
-dependencies = [
- "ash",
- "raw-window-handle",
- "raw-window-metal",
-]
-
[[package]]
name = "ashpd"
-version = "0.11.1"
+version = "0.13.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2f3f79755c74fd155000314eb349864caa787c6592eace6c6882dad873d9c39"
+checksum = "fb8421aaa9644a5faf26735f258b669b15f063313ef8f8e2bdb28912a1a6f111"
dependencies = [
- "async-fs",
- "async-net",
"enumflags2",
"futures-channel",
"futures-util",
- "rand 0.9.5",
+ "getrandom 0.4.3",
"serde",
"serde_repr",
- "url",
"wayland-backend",
"wayland-client",
- "wayland-protocols 0.32.13",
- "zbus",
-]
-
-[[package]]
-name = "ashpd"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33a3c86f3fd70c0ffa500ed189abfa90b5a52398a45d5dc372fcc38ebeb7a645"
-dependencies = [
- "async-fs",
- "async-net",
- "enumflags2",
- "futures-channel",
- "futures-util",
- "rand 0.9.5",
- "serde",
- "serde_repr",
- "url",
+ "wayland-protocols",
"zbus",
]
@@ -202,23 +300,12 @@ version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "435a87a52755b8f27fcf321ac4f04b2802e337c8c4872923137471ec39c37532"
dependencies = [
- "event-listener 5.4.2",
+ "event-listener",
"event-listener-strategy",
"futures-core",
"pin-project-lite",
]
-[[package]]
-name = "async-channel"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35"
-dependencies = [
- "concurrent-queue",
- "event-listener 2.5.3",
- "futures-core",
-]
-
[[package]]
name = "async-channel"
version = "2.5.0"
@@ -251,8 +338,8 @@ checksum = "c96bf972d85afc50bf5ab8fe2d54d1586b4e0b46c97c50a0c9e71e2f7bcd812a"
dependencies = [
"async-task",
"concurrent-queue",
- "fastrand 2.5.0",
- "futures-lite 2.6.1",
+ "fastrand",
+ "futures-lite",
"pin-project-lite",
"slab",
]
@@ -265,22 +352,7 @@ checksum = "8034a681df4aed8b8edbd7fbe472401ecf009251c8b40556b304567052e294c5"
dependencies = [
"async-lock",
"blocking",
- "futures-lite 2.6.1",
-]
-
-[[package]]
-name = "async-global-executor"
-version = "2.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c"
-dependencies = [
- "async-channel 2.5.0",
- "async-executor",
- "async-io",
- "async-lock",
- "blocking",
- "futures-lite 2.6.1",
- "once_cell",
+ "futures-lite",
]
[[package]]
@@ -293,10 +365,10 @@ dependencies = [
"cfg-if",
"concurrent-queue",
"futures-io",
- "futures-lite 2.6.1",
+ "futures-lite",
"parking",
"polling",
- "rustix 1.1.4",
+ "rustix",
"slab",
"windows-sys 0.61.2",
]
@@ -307,7 +379,7 @@ version = "3.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "290f7f2596bd5b78a9fec8088ccd89180d7f9f55b94b0576823bbbdc72ee8311"
dependencies = [
- "event-listener 5.4.2",
+ "event-listener",
"event-listener-strategy",
"pin-project-lite",
]
@@ -320,7 +392,7 @@ checksum = "b948000fad4873c1c9339d60f2623323a0cfd3816e5181033c6a5cb68b2accf7"
dependencies = [
"async-io",
"blocking",
- "futures-lite 2.6.1",
+ "futures-lite",
]
[[package]]
@@ -329,16 +401,16 @@ version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fc50921ec0055cdd8a16de48773bfeec5c972598674347252c0399676be7da75"
dependencies = [
- "async-channel 2.5.0",
+ "async-channel",
"async-io",
"async-lock",
"async-signal",
"async-task",
"blocking",
"cfg-if",
- "event-listener 5.4.2",
- "futures-lite 2.6.1",
- "rustix 1.1.4",
+ "event-listener",
+ "futures-lite",
+ "rustix",
]
[[package]]
@@ -364,39 +436,12 @@ dependencies = [
"cfg-if",
"futures-core",
"futures-io",
- "rustix 1.1.4",
+ "rustix",
"signal-hook-registry",
"slab",
"windows-sys 0.61.2",
]
-[[package]]
-name = "async-std"
-version = "1.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c8e079a4ab67ae52b7403632e4618815d6db36d2a010cfe41b02c1b1578f93b"
-dependencies = [
- "async-channel 1.9.0",
- "async-global-executor",
- "async-io",
- "async-lock",
- "async-process",
- "crossbeam-utils",
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-lite 2.6.1",
- "gloo-timers",
- "kv-log-macro",
- "log",
- "memchr",
- "once_cell",
- "pin-project-lite",
- "pin-utils",
- "slab",
- "wasm-bindgen-futures",
-]
-
[[package]]
name = "async-task"
version = "4.7.1"
@@ -414,19 +459,6 @@ dependencies = [
"syn 3.0.3",
]
-[[package]]
-name = "async_zip"
-version = "0.0.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b9f7252833d5ed4b00aa9604b563529dd5e11de9c23615de2dcdf91eb87b52"
-dependencies = [
- "async-compression",
- "crc32fast",
- "futures-lite 2.6.1",
- "pin-project",
- "thiserror 1.0.69",
-]
-
[[package]]
name = "atomic"
version = "0.5.3"
@@ -439,6 +471,43 @@ version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
+[[package]]
+name = "atspi"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c77886257be21c9cd89a4ae7e64860c6f0eefca799bb79127913052bd0eefb3d"
+dependencies = [
+ "atspi-common",
+ "atspi-proxies",
+]
+
+[[package]]
+name = "atspi-common"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20c5617155740c98003016429ad13fe43ce7a77b007479350a9f8bf95a29f63d"
+dependencies = [
+ "enumflags2",
+ "serde",
+ "static_assertions",
+ "zbus",
+ "zbus-lockstep",
+ "zbus-lockstep-macros",
+ "zbus_names",
+ "zvariant",
+]
+
+[[package]]
+name = "atspi-proxies"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2230e48787ed3eb4088996eab66a32ca20c0b67bbd4fd6cdfe79f04f1f04c9fc"
+dependencies = [
+ "atspi-common",
+ "serde",
+ "zbus",
+]
+
[[package]]
name = "autocfg"
version = "1.5.1"
@@ -488,6 +557,21 @@ dependencies = [
"arrayvec",
]
+[[package]]
+name = "backtrace"
+version = "0.3.76"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb531853791a215d7c62a30daf0dde835f381ab5de4589cfe7c649d2cbe92bd6"
+dependencies = [
+ "addr2line",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+ "windows-link 0.2.1",
+]
+
[[package]]
name = "base62"
version = "2.2.4"
@@ -509,7 +593,7 @@ dependencies = [
"bitflags 2.13.1",
"cexpr",
"clang-sys",
- "itertools 0.13.0",
+ "itertools 0.11.0",
"log",
"prettyplease",
"proc-macro2",
@@ -526,7 +610,16 @@ version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3"
dependencies = [
- "bit-vec",
+ "bit-vec 0.8.0",
+]
+
+[[package]]
+name = "bit-set"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34ddef2995421ab6a5c779542c81ee77c115206f4ad9d5a8e05f4ff49716a3dd"
+dependencies = [
+ "bit-vec 0.9.1",
]
[[package]]
@@ -535,6 +628,12 @@ version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7"
+[[package]]
+name = "bit-vec"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b71798fca2c1fe1086445a7258a4bc81e6e49dcd24c8d0dd9a1e57395b603f51"
+
[[package]]
name = "bit_field"
version = "0.10.3"
@@ -562,64 +661,6 @@ dependencies = [
"no_std_io2",
]
-[[package]]
-name = "blade-graphics"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e71cfb73b98eb9f58ee84048aa1bdf4e7497fd20c141b57523499fa066b48fed"
-dependencies = [
- "ash",
- "ash-window",
- "bitflags 2.13.1",
- "bytemuck",
- "codespan-reporting",
- "glow",
- "gpu-alloc",
- "gpu-alloc-ash",
- "hidden-trait",
- "js-sys",
- "khronos-egl",
- "libloading",
- "log",
- "mint",
- "naga",
- "objc2",
- "objc2-app-kit",
- "objc2-core-foundation",
- "objc2-foundation",
- "objc2-metal",
- "objc2-quartz-core",
- "objc2-ui-kit",
- "once_cell",
- "raw-window-handle",
- "slab",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "blade-macros"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27142319e2f4c264581067eaccb9f80acccdde60d8b4bf57cc50cd3152f109ca"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.119",
-]
-
-[[package]]
-name = "blade-util"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a6be3a82c001ba7a17b6f8e413ede5d1004e6047213f8efaf0ffc15b5c4904c"
-dependencies = [
- "blade-graphics",
- "bytemuck",
- "log",
- "profiling",
-]
-
[[package]]
name = "block"
version = "0.1.6"
@@ -655,26 +696,45 @@ dependencies = [
[[package]]
name = "block2"
-version = "0.6.2"
+version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdeb9d870516001442e364c5220d3574d2da8dc765554b4a617230d33fa58ef5"
+checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f"
dependencies = [
- "objc2",
+ "objc2 0.5.2",
]
[[package]]
-name = "blocking"
+name = "block2"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdeb9d870516001442e364c5220d3574d2da8dc765554b4a617230d33fa58ef5"
+dependencies = [
+ "objc2 0.6.4",
+]
+
+[[package]]
+name = "blocking"
version = "1.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e83f8d02be6967315521be875afa792a316e28d57b5a2d401897e2a7921b7f21"
dependencies = [
- "async-channel 2.5.0",
+ "async-channel",
"async-task",
"futures-io",
- "futures-lite 2.6.1",
+ "futures-lite",
"piper",
]
+[[package]]
+name = "borsh"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "553c5d846a6ba5150c65e3b1b8ec073bcf1abc20f9b7220de384a4443ea4e20a"
+dependencies = [
+ "bytes",
+ "cfg_aliases",
+]
+
[[package]]
name = "bstr"
version = "1.13.1"
@@ -735,28 +795,36 @@ version = "1.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fc652a48c352aef3ea3aed32080501cf3ef6ed5da78602a020c991775b0aff04"
+[[package]]
+name = "bzip2"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3a53fac24f34a81bc9954b5d6cfce0c21e18ec6959f44f56e8e90e4bb7c346c"
+dependencies = [
+ "libbz2-rs-sys",
+]
+
[[package]]
name = "calloop"
-version = "0.13.0"
+version = "0.14.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec"
+checksum = "4dbf9978365bac10f54d1d4b04f7ce4427e51f71d61f2fe15e3fed5166474df7"
dependencies = [
"bitflags 2.13.1",
- "log",
"polling",
- "rustix 0.38.44",
+ "rustix",
"slab",
- "thiserror 1.0.69",
+ "tracing",
]
[[package]]
name = "calloop-wayland-source"
-version = "0.3.0"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20"
+checksum = "138efcf0940a02ebf0cc8d1eff41a1682a46b431630f4c52450d6265876021fa"
dependencies = [
"calloop",
- "rustix 0.38.44",
+ "rustix",
"wayland-backend",
"wayland-client",
]
@@ -901,7 +969,7 @@ checksum = "f79398230a6e2c08f5c9760610eb6924b52aa9e7950a619602baba59dcbbdbb2"
dependencies = [
"bitflags 2.13.1",
"block",
- "cocoa-foundation 0.2.0",
+ "cocoa-foundation 0.2.1",
"core-foundation 0.10.0",
"core-graphics 0.24.0",
"foreign-types",
@@ -925,53 +993,52 @@ dependencies = [
[[package]]
name = "cocoa-foundation"
-version = "0.2.0"
+version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e14045fb83be07b5acf1c0884b2180461635b433455fa35d1cd6f17f1450679d"
+checksum = "81411967c50ee9a1fc11365f8c585f863a22a9697c89239c452292c40ba79b0d"
dependencies = [
"bitflags 2.13.1",
"block",
"core-foundation 0.10.0",
"core-graphics-types 0.2.0",
- "libc",
"objc",
]
[[package]]
name = "codespan-reporting"
-version = "0.12.0"
+version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe6d2e5af09e8c8ad56c969f2157a3d4238cebc7c55f0a517728c38f7b200f81"
+checksum = "af491d569909a7e4dee0ad7db7f5341fef5c614d5b8ec8cf765732aba3cff681"
dependencies = [
"serde",
"termcolor",
"unicode-width",
]
+[[package]]
+name = "collections"
+version = "0.1.0"
+source = "git+https://github.com/zed-industries/zed#ce48461eaadd16c65c31f835511ab96bd3b6e746"
+dependencies = [
+ "gpui_util",
+ "indexmap",
+ "rustc-hash 2.1.3",
+]
+
[[package]]
name = "color_quant"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
-[[package]]
-name = "command-fds"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b60b5124979fccd9addd89d8b97a1d6eebb4950694520c75ddd722535ea443f"
-dependencies = [
- "nix 0.31.3",
- "thiserror 2.0.20",
-]
-
[[package]]
name = "compression-codecs"
version = "0.4.38"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ce2548391e9c1929c21bf6aa2680af86fe4c1b33e6cea9ac1cfeec0bd11218cf"
dependencies = [
+ "bzip2",
"compression-core",
- "deflate64",
"flate2",
"memchr",
]
@@ -991,6 +1058,16 @@ dependencies = [
"crossbeam-utils",
]
+[[package]]
+name = "console_error_panic_hook"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc"
+dependencies = [
+ "cfg-if",
+ "wasm-bindgen",
+]
+
[[package]]
name = "const-oid"
version = "0.10.2"
@@ -1019,9 +1096,21 @@ dependencies = [
[[package]]
name = "convert_case"
-version = "0.4.0"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "633458d4ef8c78b72454de2d54fd6ab2e60f9e02be22f3c6104cdc8a4e0fceb9"
+dependencies = [
+ "unicode-segmentation",
+]
+
+[[package]]
+name = "convert_case"
+version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
+checksum = "affbf0190ed2caf063e3def54ff444b449371d55c58e513a95ab98eca50adb49"
+dependencies = [
+ "unicode-segmentation",
+]
[[package]]
name = "core-foundation"
@@ -1112,9 +1201,9 @@ dependencies = [
[[package]]
name = "core-graphics2"
-version = "0.4.1"
+version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e4583956b9806b69f73fcb23aee05eb3620efc282972f08f6a6db7504f8334d"
+checksum = "4416167a69126e617f8d0a214af0e3c1dbdeffcb100ddf72dcd1a1ac9893c146"
dependencies = [
"bitflags 2.13.1",
"block",
@@ -1137,9 +1226,9 @@ dependencies = [
[[package]]
name = "core-video"
-version = "0.4.3"
+version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d45e71d5be22206bed53c3c3cb99315fc4c3d31b8963808c6bc4538168c4f8ef"
+checksum = "139679cc63eb9504bdbe37e37874b0247136177655f0008588781e90863afa62"
dependencies = [
"block",
"core-foundation 0.10.0",
@@ -1160,21 +1249,22 @@ dependencies = [
[[package]]
name = "cosmic-text"
-version = "0.14.2"
+version = "0.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da46a9d5a8905cc538a4a5bceb6a4510de7a51049c5588c0114efce102bcbbe8"
+checksum = "be17b688510d934ce13f48a2beba700e11583e281e0fda99c22bb256a14eda73"
dependencies = [
"bitflags 2.13.1",
- "fontdb 0.16.2",
+ "fontdb",
+ "harfrust",
+ "linebender_resource_handle",
"log",
"rangemap",
- "rustc-hash 1.1.0",
- "rustybuzz 0.14.1",
+ "rustc-hash 2.1.3",
"self_cell",
+ "skrifa 0.40.0",
"smol_str",
"swash",
"sys-locale",
- "ttf-parser 0.21.1",
"unicode-bidi",
"unicode-linebreak",
"unicode-script",
@@ -1255,7 +1345,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a"
dependencies = [
"generic-array",
- "rand_core 0.6.4",
"typenum",
]
@@ -1270,20 +1359,14 @@ dependencies = [
[[package]]
name = "ctor"
-version = "0.4.3"
+version = "1.0.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec09e802f5081de6157da9a75701d6c713d8dc3ba52571fd4bd25f412644e8a6"
+checksum = "914a755b7c2d4af2bdcff7ce1739e2db9a1b81a9b07123d8015786ae03c0980d"
dependencies = [
- "ctor-proc-macro",
- "dtor",
+ "link-section",
+ "linktime-proc-macro",
]
-[[package]]
-name = "ctor-proc-macro"
-version = "0.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2931af7e13dc045d8e9d26afccc6fa115d64e115c9c84b1166288b46f6782c2"
-
[[package]]
name = "data-url"
version = "0.3.2"
@@ -1291,22 +1374,42 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "be1e0bca6c3637f992fc1cc7cbc52a78c1ef6db076dbf1059c4323d6a2048376"
[[package]]
-name = "deflate64"
-version = "0.1.12"
+name = "deranged"
+version = "0.5.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac6b926516df9c60bfa16e107b21086399f8285a44ca9711344b9e553c5146e2"
+checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c"
[[package]]
name = "derive_more"
-version = "0.99.20"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d751e9e49156b02b44f9c1815bcb94b984cdcc4396ecc32521c739452808b134"
+dependencies = [
+ "derive_more-impl",
+]
+
+[[package]]
+name = "derive_more-impl"
+version = "2.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6edb4b64a43d977b8e99788fe3a04d483834fba1215a7e02caa415b626497f7f"
+checksum = "799a97264921d8623a957f6c3b9011f3b5492f557bbb7a5a19b7fa6d06ba8dcb"
dependencies = [
- "convert_case",
+ "convert_case 0.10.0",
"proc-macro2",
"quote",
"rustc_version",
"syn 2.0.119",
+ "unicode-xid",
+]
+
+[[package]]
+name = "derive_refineable"
+version = "0.1.0"
+source = "git+https://github.com/zed-industries/zed#ce48461eaadd16c65c31f835511ab96bd3b6e746"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
]
[[package]]
@@ -1349,6 +1452,15 @@ dependencies = [
"dirs-sys 0.4.1",
]
+[[package]]
+name = "dirs"
+version = "6.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e"
+dependencies = [
+ "dirs-sys 0.5.0",
+]
+
[[package]]
name = "dirs-sys"
version = "0.3.7"
@@ -1356,7 +1468,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
dependencies = [
"libc",
- "redox_users",
+ "redox_users 0.4.6",
"winapi",
]
@@ -1368,10 +1480,22 @@ checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
dependencies = [
"libc",
"option-ext",
- "redox_users",
+ "redox_users 0.4.6",
"windows-sys 0.48.0",
]
+[[package]]
+name = "dirs-sys"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab"
+dependencies = [
+ "libc",
+ "option-ext",
+ "redox_users 0.5.2",
+ "windows-sys 0.61.2",
+]
+
[[package]]
name = "dispatch"
version = "0.2.0"
@@ -1385,7 +1509,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e0e367e4e7da84520dedcac1901e4da967309406d1e51017ae1abfb97adbd38"
dependencies = [
"bitflags 2.13.1",
- "objc2",
+ "block2 0.6.2",
+ "libc",
+ "objc2 0.6.4",
]
[[package]]
@@ -1409,25 +1535,19 @@ dependencies = [
]
[[package]]
-name = "downcast-rs"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2"
-
-[[package]]
-name = "dtor"
-version = "0.0.6"
+name = "document-features"
+version = "0.2.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97cbdf2ad6846025e8e25df05171abfb30e3ababa12ee0a0e44b9bbe570633a8"
+checksum = "d4b8a88685455ed29a21542a33abd9cb6510b6b129abadabdcef0f4c55bc8f61"
dependencies = [
- "dtor-proc-macro",
+ "litrs",
]
[[package]]
-name = "dtor-proc-macro"
-version = "0.0.5"
+name = "downcast-rs"
+version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7454e41ff9012c00d53cf7f475c5e3afa3b91b7c90568495495e8d9bf47a1055"
+checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2"
[[package]]
name = "dunce"
@@ -1482,6 +1602,15 @@ dependencies = [
"cfg-if",
]
+[[package]]
+name = "encoding_rs_io"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fba3fe847045ecff794b9c138293a80db914678c453ad63fbf0c6a9eb6e00b22"
+dependencies = [
+ "encoding_rs",
+]
+
[[package]]
name = "endi"
version = "1.1.1"
@@ -1529,6 +1658,17 @@ dependencies = [
"syn 2.0.119",
]
+[[package]]
+name = "enumn"
+version = "0.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f9ed6b3789237c8a0c1c505af1c7eb2c560df6186f01b098c3a1064ea532f38"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
[[package]]
name = "equator"
version = "0.4.2"
@@ -1573,7 +1713,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
dependencies = [
"libc",
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
]
[[package]]
@@ -1595,12 +1735,6 @@ dependencies = [
"num-traits",
]
-[[package]]
-name = "event-listener"
-version = "2.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
-
[[package]]
name = "event-listener"
version = "5.4.2"
@@ -1617,7 +1751,7 @@ version = "0.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93"
dependencies = [
- "event-listener 5.4.2",
+ "event-listener",
"pin-project-lite",
]
@@ -1650,20 +1784,14 @@ version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a"
-[[package]]
-name = "fastrand"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
-dependencies = [
- "instant",
-]
-
[[package]]
name = "fastrand"
version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da7c62ceae207dd37ea5b845da6a0696c799f85e97da1ab5b7910be3c1c80223"
+dependencies = [
+ "getrandom 0.4.3",
+]
[[package]]
name = "fax"
@@ -1707,6 +1835,12 @@ version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "26b73573e6edcd2af0cdf47bd6cb58f0b3839491263c314eaad1ccf24430e1de"
+[[package]]
+name = "fixedbitset"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99"
+
[[package]]
name = "flate2"
version = "1.1.9"
@@ -1746,14 +1880,14 @@ dependencies = [
[[package]]
name = "flume"
-version = "0.11.1"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da0e4dd2a88388a1f4ccc7c9ce104604dab68d9f408dc34cd45823d5a9069095"
+checksum = "5e139bc46ca777eb5efaf62df0ab8cc5fd400866427e56c68b22e414e53bd3be"
dependencies = [
+ "fastrand",
"futures-core",
"futures-sink",
- "nanorand",
- "spin",
+ "spin 0.9.9",
]
[[package]]
@@ -1768,36 +1902,37 @@ version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
+[[package]]
+name = "foldhash"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb"
+
[[package]]
name = "font-types"
-version = "0.12.3"
+version = "0.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75382bc7392ef10aad10935f92fc3db36d2d4dad0e5d96d8d65e04f89a07ec39"
+checksum = "5b38ad915f6dadd993ced50848a8291a543bd41ca62bc10740d5e64e2ab4cfd7"
dependencies = [
"bytemuck",
]
[[package]]
-name = "fontconfig-parser"
-version = "0.5.8"
+name = "font-types"
+version = "0.12.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbc773e24e02d4ddd8395fd30dc147524273a83e54e0f312d986ea30de5f5646"
+checksum = "e64eb721ca85a34323425f4041adc5d82704d3782d5f8f03793bc012419dce23"
dependencies = [
- "roxmltree",
+ "bytemuck",
]
[[package]]
-name = "fontdb"
-version = "0.16.2"
+name = "fontconfig-parser"
+version = "0.5.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0299020c3ef3f60f526a4f64ab4a3d4ce116b1acbf24cdd22da0068e5d81dc3"
+checksum = "bbc773e24e02d4ddd8395fd30dc147524273a83e54e0f312d986ea30de5f5646"
dependencies = [
- "fontconfig-parser",
- "log",
- "memmap2",
- "slotmap",
- "tinyvec",
- "ttf-parser 0.20.0",
+ "roxmltree 0.20.0",
]
[[package]]
@@ -1811,7 +1946,7 @@ dependencies = [
"memmap2",
"slotmap",
"tinyvec",
- "ttf-parser 0.25.1",
+ "ttf-parser",
]
[[package]]
@@ -1905,6 +2040,19 @@ dependencies = [
"futures-sink",
]
+[[package]]
+name = "futures-concurrency"
+version = "7.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "175cd8cca9e1d45b87f18ffa75088f2099e3c4fe5e2f83e42de112560bea8ea6"
+dependencies = [
+ "fixedbitset",
+ "futures-core",
+ "futures-lite",
+ "pin-project",
+ "smallvec",
+]
+
[[package]]
name = "futures-core"
version = "0.3.34"
@@ -1928,28 +2076,13 @@ version = "0.3.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "53c0fa8157de1303bfffdaa1cc2a673bfffb60102f76b0ef4441659124373fed"
-[[package]]
-name = "futures-lite"
-version = "1.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce"
-dependencies = [
- "fastrand 1.9.0",
- "futures-core",
- "futures-io",
- "memchr",
- "parking",
- "pin-project-lite",
- "waker-fn",
-]
-
[[package]]
name = "futures-lite"
version = "2.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f78e10609fe0e0b3f4157ffab1876319b5b0db102a2c60dc4626306dc46b44ad"
dependencies = [
- "fastrand 2.5.0",
+ "fastrand",
"futures-core",
"futures-io",
"parking",
@@ -2012,7 +2145,7 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1bd49230192a3797a9a4d6abe9b3eed6f7fa4c8a8a4947977c6f80025f92cbd8"
dependencies = [
- "rustix 1.1.4",
+ "rustix",
"windows-link 0.2.1",
]
@@ -2036,9 +2169,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
dependencies = [
"cfg-if",
+ "js-sys",
"libc",
"r-efi 5.3.0",
"wasip2",
+ "wasm-bindgen",
]
[[package]]
@@ -2055,6 +2190,16 @@ dependencies = [
"wasm-bindgen",
]
+[[package]]
+name = "gif"
+version = "0.13.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ae047235e33e2829703574b54fdec96bfbad892062d97fed2f76022287de61b"
+dependencies = [
+ "color_quant",
+ "weezl",
+]
+
[[package]]
name = "gif"
version = "0.14.2"
@@ -2065,6 +2210,23 @@ dependencies = [
"weezl",
]
+[[package]]
+name = "gimli"
+version = "0.32.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e629b9b98ef3dd8afe6ca2bd0f89306cec16d43d907889945bc5d6687f2f13c7"
+
+[[package]]
+name = "gl_generator"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d"
+dependencies = [
+ "khronos_api",
+ "log",
+ "xml-rs",
+]
+
[[package]]
name = "glob"
version = "0.3.4"
@@ -2096,55 +2258,56 @@ dependencies = [
]
[[package]]
-name = "gloo-timers"
-version = "0.3.0"
+name = "glow"
+version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994"
+checksum = "29038e1c483364cc6bb3cf78feee1816002e127c331a1eec55a4d202b9e1adb5"
dependencies = [
- "futures-channel",
- "futures-core",
"js-sys",
+ "slotmap",
"wasm-bindgen",
+ "web-sys",
]
[[package]]
-name = "glow"
-version = "0.16.0"
+name = "glutin_wgl_sys"
+version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5e5ea60d70410161c8bf5da3fdfeaa1c72ed2c15f8bbb9d19fe3a4fad085f08"
+checksum = "2c4ee00b289aba7a9e5306d57c2d05499b2e5dc427f84ac708bd2c090212cf3e"
dependencies = [
- "js-sys",
- "slotmap",
- "wasm-bindgen",
- "web-sys",
+ "gl_generator",
]
[[package]]
-name = "gpu-alloc"
-version = "0.6.2"
+name = "gpu-allocator"
+version = "0.28.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45cf04b2726f02df5508c6de726acdc90cdf97ac771a9a0ffd8ba10a6e696bf9"
+checksum = "51255ea7cfaadb6c5f1528d43e92a82acb2b96c43365989a28b2d44ee38f8795"
dependencies = [
- "bitflags 2.13.1",
- "gpu-alloc-types",
+ "ash",
+ "hashbrown 0.16.1",
+ "log",
+ "presser",
+ "thiserror 2.0.20",
+ "windows 0.56.0",
]
[[package]]
-name = "gpu-alloc-ash"
-version = "0.7.1"
+name = "gpu-descriptor"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "643756f08ef6def813c776199e4766596395a4c6530373c9a4374a64de2f53a1"
+checksum = "b89c83349105e3732062a895becfc71a8f921bb71ecbbdd8ff99263e3b53a0ca"
dependencies = [
- "ash",
- "gpu-alloc-types",
- "tinyvec",
+ "bitflags 2.13.1",
+ "gpu-descriptor-types",
+ "hashbrown 0.15.5",
]
[[package]]
-name = "gpu-alloc-types"
-version = "0.3.1"
+name = "gpu-descriptor-types"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2bbed164dd10ed526c2e4fe3e721ca4a71c61730e5aafac6844b417b3227058"
+checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91"
dependencies = [
"bitflags 2.13.1",
]
@@ -2152,123 +2315,135 @@ dependencies = [
[[package]]
name = "gpui"
version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "979b45cfa6ec723b6f42330915a1b3769b930d02b2d505f9697f8ca602bee707"
+source = "git+https://github.com/zed-industries/zed#ce48461eaadd16c65c31f835511ab96bd3b6e746"
dependencies = [
+ "accesskit",
"anyhow",
- "as-raw-xcb-connection",
- "ashpd 0.11.1",
+ "async-channel",
"async-task",
+ "backtrace",
"bindgen",
- "blade-graphics",
- "blade-macros",
- "blade-util",
- "block",
- "bytemuck",
- "calloop",
- "calloop-wayland-source",
- "cbindgen",
- "cocoa 0.26.0",
- "cocoa-foundation 0.2.0",
- "core-foundation 0.10.0",
- "core-foundation-sys",
- "core-graphics 0.24.0",
- "core-text",
+ "bitflags 2.13.1",
+ "chrono",
+ "collections",
"core-video",
- "cosmic-text",
"ctor",
"derive_more",
"embed-resource",
"etagere",
- "filedescriptor",
- "flume",
- "foreign-types",
"futures",
- "gpui-macros",
- "gpui_collections",
- "gpui_http_client",
- "gpui_media",
- "gpui_refineable",
- "gpui_semantic_version",
- "gpui_sum_tree",
+ "futures-concurrency",
+ "getrandom 0.3.4",
+ "gpui_macros",
+ "gpui_shared_string",
"gpui_util",
- "gpui_util_macros",
+ "heapless",
+ "http_client",
"image",
"inventory",
"itertools 0.14.0",
- "libc",
"log",
"lyon",
- "metal",
- "naga",
"num_cpus",
- "objc",
- "oo7",
- "open",
"parking",
"parking_lot",
- "pathfinder_geometry",
"pin-project",
+ "pollster 0.4.0",
"postage",
"profiling",
+ "proptest",
"rand 0.9.5",
"raw-window-handle",
- "resvg",
+ "refineable",
+ "regex",
+ "resvg 0.46.0",
+ "scheduler",
"schemars",
"seahash",
"serde",
"serde_json",
"slotmap",
"smallvec",
- "smol",
- "stacksafe",
- "strum 0.27.2",
+ "spin 0.10.1",
+ "strum",
+ "sum_tree",
"taffy",
"thiserror 2.0.20",
- "usvg",
+ "tracing",
+ "ttf-parser",
+ "url",
+ "usvg 0.46.0",
+ "util_macros",
"uuid",
"waker-fn",
- "wayland-backend",
- "wayland-client",
- "wayland-cursor",
- "wayland-protocols 0.31.2",
- "wayland-protocols-plasma",
+ "web-time",
"windows 0.61.3",
- "windows-core 0.61.2",
- "windows-numerics",
- "windows-registry 0.5.3",
- "x11-clipboard",
- "x11rb",
- "xkbcommon",
"zed-font-kit",
"zed-scap",
- "zed-xim",
+ "ztracing",
]
[[package]]
-name = "gpui-component"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d021d46b4088d3d93a57ccdf443da85695a77272108caca2f6fe5369f584966a"
+name = "gpui-base"
+version = "0.5.2"
+source = "git+https://github.com/longbridge/gpui-component?rev=fd3bc2bbb8a2c4dfe268c1475682476ada54cd0c#fd3bc2bbb8a2c4dfe268c1475682476ada54cd0c"
dependencies = [
"aho-corasick",
+ "anyhow",
+ "async-channel",
+ "chrono",
+ "gpui",
+ "gpui_macros",
+ "instant",
+ "lsp-types",
+ "objc2 0.6.4",
+ "objc2-app-kit 0.3.2",
+ "objc2-foundation 0.3.2",
+ "raw-window-handle",
+ "regex",
+ "ropey",
+ "schemars",
+ "serde",
+ "serde_json",
+ "smallvec",
+ "smol",
+ "tracing",
+ "unicode-segmentation",
+ "web-time",
+ "zed-sum-tree",
+]
+
+[[package]]
+name = "gpui-component"
+version = "0.5.2"
+source = "git+https://github.com/longbridge/gpui-component?rev=fd3bc2bbb8a2c4dfe268c1475682476ada54cd0c#fd3bc2bbb8a2c4dfe268c1475682476ada54cd0c"
+dependencies = [
"anyhow",
"chrono",
"core-text",
"enum-iterator",
+ "futures",
"gpui",
+ "gpui-base",
+ "gpui-component-assets",
"gpui-component-macros",
- "gpui-macros",
+ "gpui_macros",
"html5ever",
+ "instant",
"itertools 0.13.0",
+ "log",
"lsp-types",
"markdown",
"markup5ever_rcdom",
"notify",
"num-traits",
+ "objc2 0.6.4",
+ "objc2-app-kit 0.3.2",
+ "objc2-foundation 0.3.2",
"once_cell",
"paste",
- "regex",
+ "raw-window-handle",
+ "resvg 0.45.1",
"ropey",
"rust-i18n",
"schemars",
@@ -2279,6 +2454,7 @@ dependencies = [
"smol",
"tracing",
"tree-sitter",
+ "tree-sitter-astro-next",
"tree-sitter-bash",
"tree-sitter-c",
"tree-sitter-c-sharp",
@@ -2295,203 +2471,298 @@ dependencies = [
"tree-sitter-javascript",
"tree-sitter-jsdoc",
"tree-sitter-json",
+ "tree-sitter-kotlin-sg",
+ "tree-sitter-lua",
"tree-sitter-make",
"tree-sitter-md",
+ "tree-sitter-php",
"tree-sitter-proto",
"tree-sitter-python",
"tree-sitter-ruby",
"tree-sitter-rust",
"tree-sitter-scala",
"tree-sitter-sequel",
+ "tree-sitter-svelte-next",
"tree-sitter-swift",
"tree-sitter-toml-ng",
"tree-sitter-typescript",
"tree-sitter-yaml",
"tree-sitter-zig",
- "unicode-segmentation",
"uuid",
+ "windows 0.58.0",
"zed-sum-tree",
]
[[package]]
-name = "gpui-component-macros"
+name = "gpui-component-assets"
version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86fbc2d84bf91717b171320e6adc600d91ccb3ed259448f3b006787633c1c615"
+source = "git+https://github.com/longbridge/gpui-component?rev=fd3bc2bbb8a2c4dfe268c1475682476ada54cd0c#fd3bc2bbb8a2c4dfe268c1475682476ada54cd0c"
dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.119",
+ "anyhow",
+ "gpui",
+ "log",
+ "rust-embed",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "zed-reqwest 0.12.15-zed (git+https://github.com/zed-industries/reqwest.git?rev=c15662463bda39148ba154100dd44d3fba5873a4)",
]
[[package]]
-name = "gpui-macros"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcb02dd63a2859714ac7b6b476937617c3c744157af1b49f7c904023a79039be"
+name = "gpui-component-macros"
+version = "0.5.1"
+source = "git+https://github.com/longbridge/gpui-component?rev=fd3bc2bbb8a2c4dfe268c1475682476ada54cd0c#fd3bc2bbb8a2c4dfe268c1475682476ada54cd0c"
dependencies = [
- "heck 0.5.0",
"proc-macro2",
"quote",
"syn 2.0.119",
]
[[package]]
-name = "gpui_collections"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae39dc6d3d201be97e4bc08d96dbef2bc5b5c3d5734e05786e8cc3043342351c"
-dependencies = [
- "indexmap",
- "rustc-hash 2.1.3",
-]
-
-[[package]]
-name = "gpui_derive_refineable"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "644de174341a87b3478bd65b66bca38af868bcf2b2e865700523734f83cfc664"
+name = "gpui_apple"
+version = "0.1.0"
+source = "git+https://github.com/zed-industries/zed#ce48461eaadd16c65c31f835511ab96bd3b6e746"
dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.119",
+ "anyhow",
+ "block",
+ "cbindgen",
+ "cocoa 0.26.0",
+ "collections",
+ "core-foundation 0.10.0",
+ "core-video",
+ "derive_more",
+ "etagere",
+ "foreign-types",
+ "gpui",
+ "image",
+ "log",
+ "metal",
+ "objc",
+ "parking_lot",
]
[[package]]
-name = "gpui_http_client"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23822b0a6d2c5e6a42507980a0ab3848610ea908942c8ef98187f646f690335e"
+name = "gpui_linux"
+version = "0.1.0"
+source = "git+https://github.com/zed-industries/zed#ce48461eaadd16c65c31f835511ab96bd3b6e746"
dependencies = [
+ "accesskit",
+ "accesskit_unix",
"anyhow",
- "async-compression",
- "async-fs",
- "bytes",
- "derive_more",
+ "as-raw-xcb-connection",
+ "ashpd",
+ "bitflags 2.13.1",
+ "bytemuck",
+ "calloop",
+ "calloop-wayland-source",
+ "collections",
+ "filedescriptor",
"futures",
+ "gpui",
"gpui_util",
- "http",
- "http-body",
+ "gpui_wgpu",
+ "http_client",
+ "libc",
"log",
+ "notify-rust",
+ "oo7",
+ "open",
"parking_lot",
- "serde",
- "serde_json",
- "sha2 0.10.9",
- "tempfile",
+ "raw-window-handle",
+ "smallvec",
+ "smol",
+ "strum",
"url",
- "zed-async-tar",
- "zed-reqwest",
+ "uuid",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-cursor",
+ "wayland-protocols",
+ "wayland-protocols-plasma",
+ "wayland-protocols-wlr",
+ "x11-clipboard",
+ "x11rb",
+ "xkbcommon",
+ "zed-scap",
+ "zed-xim",
]
[[package]]
-name = "gpui_media"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05cb8912ae17371725132d2b7eec6797a255accc95d58ee5c1134b529810f14b"
+name = "gpui_macos"
+version = "0.1.0"
+source = "git+https://github.com/zed-industries/zed#ce48461eaadd16c65c31f835511ab96bd3b6e746"
dependencies = [
+ "accesskit",
+ "accesskit_macos",
"anyhow",
- "bindgen",
+ "async-task",
+ "block",
+ "block2 0.6.2",
+ "cocoa 0.26.0",
+ "collections",
"core-foundation 0.10.0",
- "core-video",
+ "core-foundation-sys",
+ "core-graphics 0.24.0",
+ "core-text",
"ctor",
+ "dispatch2",
"foreign-types",
+ "futures",
+ "gpui",
+ "gpui_apple",
+ "gpui_util",
+ "image",
+ "itertools 0.14.0",
+ "libc",
+ "log",
+ "mach2",
+ "media",
"metal",
"objc",
+ "objc2 0.6.4",
+ "objc2-app-kit 0.3.2",
+ "objc2-foundation 0.3.2",
+ "objc2-user-notifications",
+ "parking_lot",
+ "pathfinder_geometry",
+ "raw-window-handle",
+ "semver",
+ "smallvec",
+ "strum",
+ "uuid",
+ "zed-font-kit",
]
[[package]]
-name = "gpui_perf"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f40a0961dcf598955130e867f4b731150a20546427b41b1a63767c1037a86d77"
+name = "gpui_macros"
+version = "0.1.0"
+source = "git+https://github.com/zed-industries/zed#ce48461eaadd16c65c31f835511ab96bd3b6e746"
dependencies = [
- "gpui_collections",
- "serde",
- "serde_json",
+ "heck 0.5.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
]
[[package]]
-name = "gpui_refineable"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "258cb099254e9468181aee5614410fba61db4ae115fc1d51b4a0b985f60d6641"
+name = "gpui_platform"
+version = "0.1.0"
+source = "git+https://github.com/zed-industries/zed#ce48461eaadd16c65c31f835511ab96bd3b6e746"
dependencies = [
- "gpui_derive_refineable",
+ "console_error_panic_hook",
+ "gpui",
+ "gpui_linux",
+ "gpui_macos",
+ "gpui_web",
+ "gpui_windows",
]
[[package]]
-name = "gpui_semantic_version"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "201e45eff7b695528fb3af6560a534943fbc2db5323d755b9d198bd743948e35"
+name = "gpui_shared_string"
+version = "0.1.0"
+source = "git+https://github.com/zed-industries/zed#ce48461eaadd16c65c31f835511ab96bd3b6e746"
dependencies = [
- "anyhow",
+ "schemars",
"serde",
+ "smol_str",
]
[[package]]
-name = "gpui_sum_tree"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4f3bedd573fafafa13d1200b356c588cf094fb2786e3684bb3f5ea59b549fa9"
+name = "gpui_util"
+version = "0.1.0"
+source = "git+https://github.com/zed-industries/zed#ce48461eaadd16c65c31f835511ab96bd3b6e746"
dependencies = [
- "arrayvec",
+ "anyhow",
"log",
- "rayon",
+ "which",
]
[[package]]
-name = "gpui_util"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68faea25903ae524de9af83990b9aa51bcbc8dd085929ac0aea7fd41905e05c3"
+name = "gpui_web"
+version = "0.1.0"
+source = "git+https://github.com/zed-industries/zed#ce48461eaadd16c65c31f835511ab96bd3b6e746"
dependencies = [
"anyhow",
- "async-fs",
- "async_zip",
- "command-fds",
- "dirs 4.0.0",
- "dunce",
+ "console_error_panic_hook",
"futures",
- "futures-lite 1.13.0",
- "globset",
- "gpui_collections",
+ "gpui",
+ "gpui_wgpu",
+ "http_client",
+ "js-sys",
+ "log",
+ "parking_lot",
+ "raw-window-handle",
+ "scheduler",
+ "uuid",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "wasm_thread",
+ "web-sys",
+ "web-time",
+]
+
+[[package]]
+name = "gpui_wgpu"
+version = "0.1.0"
+source = "git+https://github.com/zed-industries/zed#ce48461eaadd16c65c31f835511ab96bd3b6e746"
+dependencies = [
+ "anyhow",
+ "bytemuck",
+ "collections",
+ "cosmic-text",
+ "etagere",
+ "gpui",
+ "gpui_util",
"itertools 0.14.0",
- "libc",
"log",
- "nix 0.29.0",
- "regex",
- "rust-embed",
- "schemars",
- "serde",
- "serde_json",
- "serde_json_lenient",
- "shlex 1.3.0",
- "smol",
- "take-until",
- "tempfile",
- "tendril",
- "unicase",
- "walkdir",
- "which",
+ "parking_lot",
+ "profiling",
+ "raw-window-handle",
+ "smallvec",
+ "swash",
+ "unicode-bidi",
+ "unicode-segmentation",
+ "web-sys",
+ "wgpu",
+ "zed-font-kit",
]
[[package]]
-name = "gpui_util_macros"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c28f65ef47fb97e21e82fd4dd75ccc2506eda010c846dc8054015ea234f1a22"
+name = "gpui_windows"
+version = "0.1.0"
+source = "git+https://github.com/zed-industries/zed#ce48461eaadd16c65c31f835511ab96bd3b6e746"
dependencies = [
- "gpui_perf",
- "quote",
- "syn 2.0.119",
+ "accesskit",
+ "accesskit_windows",
+ "anyhow",
+ "collections",
+ "dunce",
+ "etagere",
+ "futures",
+ "gpui",
+ "gpui_util",
+ "image",
+ "itertools 0.14.0",
+ "log",
+ "parking_lot",
+ "rand 0.9.5",
+ "raw-window-handle",
+ "smallvec",
+ "uuid",
+ "windows 0.61.3",
+ "windows-core 0.61.2",
+ "windows-numerics 0.2.0",
+ "windows-registry 0.5.3",
]
[[package]]
-name = "grid"
-version = "0.18.0"
+name = "granit-parser"
+version = "0.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12101ecc8225ea6d675bc70263074eab6169079621c2186fe0c66590b2df9681"
+checksum = "d03f81ad4732830d85cfd417a9f62cde6dadda4354d37d078a6084a19560aa2d"
+dependencies = [
+ "arraydeque",
+ "smallvec",
+]
[[package]]
name = "h2"
@@ -2524,6 +2795,28 @@ dependencies = [
"zerocopy",
]
+[[package]]
+name = "harfrust"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9da2e5ae821f6e96664977bf974d6d6a2d6682f9ccee23e62ec1d134246845f9"
+dependencies = [
+ "bitflags 2.13.1",
+ "bytemuck",
+ "core_maths",
+ "read-fonts 0.37.0",
+ "smallvec",
+]
+
+[[package]]
+name = "hash32"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "47d60b12902ba28e2730cd37e95b8c9223af2808df9e902d4df49588d1470606"
+dependencies = [
+ "byteorder",
+]
+
[[package]]
name = "hashbrown"
version = "0.14.5"
@@ -2539,7 +2832,18 @@ version = "0.15.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
dependencies = [
- "foldhash",
+ "foldhash 0.1.5",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.16.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
+dependencies = [
+ "allocator-api2",
+ "equivalent",
+ "foldhash 0.2.0",
]
[[package]]
@@ -2557,6 +2861,16 @@ dependencies = [
"hashbrown 0.14.5",
]
+[[package]]
+name = "heapless"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25ba4bd83f9415b58b4ed8dc5714c76e626a105be4646c02630ad730ad3b5aa4"
+dependencies = [
+ "hash32",
+ "stable_deref_trait",
+]
+
[[package]]
name = "heck"
version = "0.4.1"
@@ -2587,17 +2901,6 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df"
-[[package]]
-name = "hidden-trait"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68ed9e850438ac849bec07e7d09fbe9309cbd396a5988c30b010580ce08860df"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
[[package]]
name = "hkdf"
version = "0.12.4"
@@ -2616,15 +2919,6 @@ dependencies = [
"digest 0.10.7",
]
-[[package]]
-name = "home"
-version = "0.5.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc627f471c528ff0c4a49e1d5e60450c8f6461dd6d10ba9dcd3a61d3dff7728d"
-dependencies = [
- "windows-sys 0.61.2",
-]
-
[[package]]
name = "html5ever"
version = "0.27.0"
@@ -2672,6 +2966,26 @@ dependencies = [
"pin-project-lite",
]
+[[package]]
+name = "http_client"
+version = "0.1.0"
+source = "git+https://github.com/zed-industries/zed#ce48461eaadd16c65c31f835511ab96bd3b6e746"
+dependencies = [
+ "anyhow",
+ "async-compression",
+ "bytes",
+ "derive_more",
+ "futures",
+ "http",
+ "http-body",
+ "log",
+ "parking_lot",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "url",
+]
+
[[package]]
name = "httparse"
version = "1.10.1"
@@ -2756,7 +3070,7 @@ dependencies = [
"js-sys",
"log",
"wasm-bindgen",
- "windows-core 0.62.2",
+ "windows-core 0.56.0",
]
[[package]]
@@ -2898,7 +3212,7 @@ dependencies = [
"byteorder-lite",
"color_quant",
"exr",
- "gif",
+ "gif 0.14.2",
"image-webp",
"moxcms",
"num-traits",
@@ -2906,10 +3220,9 @@ dependencies = [
"qoi",
"ravif",
"rayon",
- "rgb",
"tiff",
- "zune-core",
- "zune-jpeg",
+ "zune-core 0.5.3",
+ "zune-jpeg 0.5.15",
]
[[package]]
@@ -2919,7 +3232,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "525e9ff3e1a4be2fbea1fdf0e98686a6d98b4d8f937e1bf7402245af1909e8c3"
dependencies = [
"byteorder-lite",
- "quick-error",
+ "quick-error 2.0.1",
]
[[package]]
@@ -2928,6 +3241,12 @@ version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "edcd27d72f2f071c64249075f42e205ff93c9a4c5f6c6da53e79ed9f9832c285"
+[[package]]
+name = "imagesize"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09e54e57b4c48b40f7aec75635392b12b3421fa26fe8b4332e63138ed278459c"
+
[[package]]
name = "imgref"
version = "1.12.2"
@@ -2983,6 +3302,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
dependencies = [
"cfg-if",
+ "js-sys",
+ "wasm-bindgen",
+ "web-sys",
]
[[package]]
@@ -3075,6 +3397,34 @@ version = "1.0.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
+[[package]]
+name = "jni-sys"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41a652e1f9b6e0275df1f15b32661cf0d4b78d4d87ddec5e0c3c20f097433258"
+dependencies = [
+ "jni-sys 0.4.1",
+]
+
+[[package]]
+name = "jni-sys"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6377a88cb3910bee9b0fa88d4f42e1d2da8e79915598f65fb0c7ee14c878af2"
+dependencies = [
+ "jni-sys-macros",
+]
+
+[[package]]
+name = "jni-sys-macros"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38c0b942f458fe50cdac086d2f946512305e5631e720728f2a61aabcd47a6264"
+dependencies = [
+ "quote",
+ "syn 2.0.119",
+]
+
[[package]]
name = "jobserver"
version = "0.1.35"
@@ -3104,8 +3454,15 @@ checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76"
dependencies = [
"libc",
"libloading",
+ "pkg-config",
]
+[[package]]
+name = "khronos_api"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"
+
[[package]]
name = "kqueue"
version = "1.2.1"
@@ -3138,12 +3495,15 @@ dependencies = [
]
[[package]]
-name = "kv-log-macro"
-version = "1.0.7"
+name = "kurbo"
+version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f"
+checksum = "4b60dfc32f652b926df6192e55525b16d186c69d47876c3ead4da5cc9f8450e2"
dependencies = [
- "log",
+ "arrayvec",
+ "euclid",
+ "polycool",
+ "smallvec",
]
[[package]]
@@ -3151,9 +3511,6 @@ name = "lazy_static"
version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
-dependencies = [
- "spin",
-]
[[package]]
name = "leak"
@@ -3176,6 +3533,12 @@ version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a79a3332a6609480d7d0c9eab957bca6b455b91bb84e66d19f5ff66294b85b8"
+[[package]]
+name = "libbz2-rs-sys"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34b357333733e8260735ba5894eb928c02ecc69c78715f01a8019e7fa7f2db4c"
+
[[package]]
name = "libc"
version = "0.2.189"
@@ -3229,10 +3592,22 @@ dependencies = [
]
[[package]]
-name = "linux-raw-sys"
-version = "0.4.15"
+name = "linebender_resource_handle"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4a5ff6bcca6c4867b1c4fd4ef63e4db7436ef363e0ad7531d1558856bae64f4"
+
+[[package]]
+name = "link-section"
+version = "0.19.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39c29a617ce3df32c08497bdc1ab6e2376e0b17948ac166a2fbe5977c5954cd9"
+
+[[package]]
+name = "linktime-proc-macro"
+version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
+checksum = "7e57c38c1e860fd37c604281cdfb1dd2216977fd76a50f85ba2f388ef3219616"
[[package]]
name = "linux-raw-sys"
@@ -3246,6 +3621,12 @@ version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "47d9d19d1d6efa0109d2f65ff4c85cddd50bd572e5a00127ab10987290bcefae"
+[[package]]
+name = "litrs"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11d3d7f243d5c5a8b9bb5d6dd2b1602c0cb0b9db1621bafc7ed66e35ff9fe092"
+
[[package]]
name = "lock_api"
version = "0.4.14"
@@ -3351,6 +3732,29 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4"
+[[package]]
+name = "mac-notification-sys"
+version = "0.6.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd604973958ddcc11b561193c0fb96ba146506ef2f231ef2e7c35fd2cbc9beca"
+dependencies = [
+ "cc",
+ "log",
+ "objc2 0.6.4",
+ "objc2-foundation 0.3.2",
+ "time",
+ "uuid",
+]
+
+[[package]]
+name = "mach2"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a1b95cd5421ec55b445b5ae102f5ea0e768de1f82bd3001e11f426c269c3aea"
+dependencies = [
+ "libc",
+]
+
[[package]]
name = "malloc_buf"
version = "0.0.6"
@@ -3366,6 +3770,7 @@ version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a5cab8f2cadc416a82d2e783a1946388b31654d391d1c7d92cc1f03e295b1deb"
dependencies = [
+ "serde",
"unicode-id",
]
@@ -3376,7 +3781,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "16ce3abbeba692c8b8441d036ef91aea6df8da2c6b6e21c7e14d3c18e526be45"
dependencies = [
"log",
- "phf",
+ "phf 0.11.3",
"phf_codegen",
"string_cache",
"string_cache_codegen",
@@ -3415,6 +3820,20 @@ dependencies = [
"digest 0.10.7",
]
+[[package]]
+name = "media"
+version = "0.1.0"
+source = "git+https://github.com/zed-industries/zed#ce48461eaadd16c65c31f835511ab96bd3b6e746"
+dependencies = [
+ "anyhow",
+ "bindgen",
+ "core-foundation 0.10.0",
+ "core-video",
+ "foreign-types",
+ "metal",
+ "objc",
+]
+
[[package]]
name = "memchr"
version = "2.8.3"
@@ -3441,13 +3860,13 @@ dependencies = [
[[package]]
name = "metal"
-version = "0.29.0"
+version = "0.33.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ecfd3296f8c56b7c1f6fbac3c71cefa9d78ce009850c45000015f206dc7fa21"
+checksum = "c7047791b5bc903b8cd963014b355f71dc9864a9a0b727057676c1dcae5cbc15"
dependencies = [
"bitflags 2.13.1",
"block",
- "core-graphics-types 0.1.3",
+ "core-graphics-types 0.2.0",
"foreign-types",
"log",
"objc",
@@ -3486,12 +3905,6 @@ dependencies = [
"simd-adler32",
]
-[[package]]
-name = "mint"
-version = "0.5.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff"
-
[[package]]
name = "mio"
version = "1.2.2"
@@ -3516,36 +3929,37 @@ dependencies = [
[[package]]
name = "naga"
-version = "25.0.1"
+version = "29.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b977c445f26e49757f9aca3631c3b8b836942cb278d69a92e7b80d3b24da632"
+checksum = "b2bf919621e7975acb27d881bae2fb993e0d45c8e0446e85e6272971e00dc8df"
dependencies = [
"arrayvec",
- "bit-set",
+ "bit-set 0.9.1",
"bitflags 2.13.1",
+ "cfg-if",
"cfg_aliases",
"codespan-reporting",
"half",
- "hashbrown 0.15.5",
+ "hashbrown 0.16.1",
"hexf-parse",
"indexmap",
+ "libm",
"log",
"num-traits",
"once_cell",
"rustc-hash 1.1.0",
"spirv",
- "strum 0.26.3",
"thiserror 2.0.20",
"unicode-ident",
]
[[package]]
-name = "nanorand"
-version = "0.7.0"
+name = "ndk-sys"
+version = "0.6.0+11769913"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3"
+checksum = "ee6cda3051665f1fb8d9e08fc35c96d5a244fb1be711a03b71118828afc9a873"
dependencies = [
- "getrandom 0.2.17",
+ "jni-sys 0.3.1",
]
[[package]]
@@ -3554,30 +3968,6 @@ version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
-[[package]]
-name = "nix"
-version = "0.29.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
-dependencies = [
- "bitflags 2.13.1",
- "cfg-if",
- "cfg_aliases",
- "libc",
-]
-
-[[package]]
-name = "nix"
-version = "0.31.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf20d2fde8ff38632c426f1165ed7436270b44f199fc55284c38276f9db47c3d"
-dependencies = [
- "bitflags 2.13.1",
- "cfg-if",
- "cfg_aliases",
- "libc",
-]
-
[[package]]
name = "no_std_io2"
version = "0.9.4"
@@ -3587,6 +3977,12 @@ dependencies = [
"memchr",
]
+[[package]]
+name = "nohash-hasher"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451"
+
[[package]]
name = "nom"
version = "7.1.3"
@@ -3640,6 +4036,20 @@ dependencies = [
"windows-sys 0.52.0",
]
+[[package]]
+name = "notify-rust"
+version = "4.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c5b4c1b4f2aa9f25f63a7a49d3dd0ed567b3670da15330a66b29434be899b891"
+dependencies = [
+ "futures-lite",
+ "log",
+ "mac-notification-sys",
+ "serde",
+ "tauri-winrt-notification",
+ "zbus",
+]
+
[[package]]
name = "notify-types"
version = "1.0.1"
@@ -3658,6 +4068,15 @@ dependencies = [
"winapi",
]
+[[package]]
+name = "nu-ansi-term"
+version = "0.50.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
+dependencies = [
+ "windows-sys 0.61.2",
+]
+
[[package]]
name = "num"
version = "0.4.3"
@@ -3684,16 +4103,16 @@ dependencies = [
[[package]]
name = "num-bigint-dig"
-version = "0.8.6"
+version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e661dda6640fad38e827a6d4a310ff4763082116fe217f279885c97f511bb0b7"
+checksum = "a7f9a86e097b0d187ad0e65667c2f58b9254671e86e7dbb78036b16692eae099"
dependencies = [
- "lazy_static",
"libm",
"num-integer",
"num-iter",
"num-traits",
- "rand 0.8.7",
+ "once_cell",
+ "rand 0.9.5",
"serde",
"smallvec",
"zeroize",
@@ -3709,6 +4128,12 @@ dependencies = [
"num-traits",
]
+[[package]]
+name = "num-conv"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "521739c6d2bac4aa25192232afe6841231376b2b26d4d9fae5ecf8ca5772e441"
+
[[package]]
name = "num-derive"
version = "0.4.2"
@@ -3721,107 +4146,251 @@ dependencies = [
]
[[package]]
-name = "num-integer"
-version = "0.1.47"
+name = "num-integer"
+version = "0.1.47"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ce2d95d4b3734dc35aa2f45e1aa22cd416814592a4f9d9205e11affd5b8e10b"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "num-iter"
+version = "0.1.46"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c92800bd69a1eac91786bcfe9da64a897eb72911b8dc3095decbd07429e8048b"
+dependencies = [
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-rational"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824"
+dependencies = [
+ "num-bigint",
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+ "libm",
+]
+
+[[package]]
+name = "num_cpus"
+version = "1.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91df4bbde75afed763b708b7eee1e8e7651e02d97f6d5dd763e89367e957b23b"
+dependencies = [
+ "hermit-abi",
+ "libc",
+]
+
+[[package]]
+name = "objc"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
+dependencies = [
+ "malloc_buf",
+ "objc_exception",
+]
+
+[[package]]
+name = "objc-foundation"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9"
+dependencies = [
+ "block",
+ "objc",
+ "objc_id",
+]
+
+[[package]]
+name = "objc-sys"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310"
+
+[[package]]
+name = "objc2"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804"
+dependencies = [
+ "objc-sys",
+ "objc2-encode",
+]
+
+[[package]]
+name = "objc2"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a12a8ed07aefc768292f076dc3ac8c48f3781c8f2d5851dd3d98950e8c5a89f"
+dependencies = [
+ "objc2-encode",
+]
+
+[[package]]
+name = "objc2-app-kit"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff"
+dependencies = [
+ "bitflags 2.13.1",
+ "block2 0.5.1",
+ "libc",
+ "objc2 0.5.2",
+ "objc2-core-data 0.2.2",
+ "objc2-core-image 0.2.2",
+ "objc2-foundation 0.2.2",
+ "objc2-quartz-core 0.2.2",
+]
+
+[[package]]
+name = "objc2-app-kit"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c"
+dependencies = [
+ "bitflags 2.13.1",
+ "block2 0.6.2",
+ "libc",
+ "objc2 0.6.4",
+ "objc2-cloud-kit",
+ "objc2-core-data 0.3.2",
+ "objc2-core-foundation",
+ "objc2-core-graphics",
+ "objc2-core-image 0.3.2",
+ "objc2-core-text",
+ "objc2-core-video",
+ "objc2-foundation 0.3.2",
+ "objc2-quartz-core 0.3.2",
+]
+
+[[package]]
+name = "objc2-cloud-kit"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ce2d95d4b3734dc35aa2f45e1aa22cd416814592a4f9d9205e11affd5b8e10b"
+checksum = "73ad74d880bb43877038da939b7427bba67e9dd42004a18b809ba7d87cee241c"
dependencies = [
- "num-traits",
+ "bitflags 2.13.1",
+ "objc2 0.6.4",
+ "objc2-foundation 0.3.2",
]
[[package]]
-name = "num-iter"
-version = "0.1.46"
+name = "objc2-core-data"
+version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c92800bd69a1eac91786bcfe9da64a897eb72911b8dc3095decbd07429e8048b"
+checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef"
dependencies = [
- "num-integer",
- "num-traits",
+ "bitflags 2.13.1",
+ "block2 0.5.1",
+ "objc2 0.5.2",
+ "objc2-foundation 0.2.2",
]
[[package]]
-name = "num-rational"
-version = "0.4.2"
+name = "objc2-core-data"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824"
+checksum = "0b402a653efbb5e82ce4df10683b6b28027616a2715e90009947d50b8dd298fa"
dependencies = [
- "num-bigint",
- "num-integer",
- "num-traits",
+ "bitflags 2.13.1",
+ "objc2 0.6.4",
+ "objc2-foundation 0.3.2",
]
[[package]]
-name = "num-traits"
-version = "0.2.19"
+name = "objc2-core-foundation"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536"
dependencies = [
- "autocfg",
- "libm",
+ "bitflags 2.13.1",
+ "dispatch2",
+ "objc2 0.6.4",
]
[[package]]
-name = "num_cpus"
-version = "1.17.0"
+name = "objc2-core-graphics"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91df4bbde75afed763b708b7eee1e8e7651e02d97f6d5dd763e89367e957b23b"
+checksum = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807"
dependencies = [
- "hermit-abi",
- "libc",
+ "bitflags 2.13.1",
+ "dispatch2",
+ "objc2 0.6.4",
+ "objc2-core-foundation",
+ "objc2-io-surface",
]
[[package]]
-name = "objc"
-version = "0.2.7"
+name = "objc2-core-image"
+version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
+checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80"
dependencies = [
- "malloc_buf",
- "objc_exception",
+ "block2 0.5.1",
+ "objc2 0.5.2",
+ "objc2-foundation 0.2.2",
+ "objc2-metal 0.2.2",
]
[[package]]
-name = "objc-foundation"
-version = "0.1.1"
+name = "objc2-core-image"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9"
+checksum = "e5d563b38d2b97209f8e861173de434bd0214cf020e3423a52624cd1d989f006"
dependencies = [
- "block",
- "objc",
- "objc_id",
+ "objc2 0.6.4",
+ "objc2-foundation 0.3.2",
]
[[package]]
-name = "objc2"
-version = "0.6.4"
+name = "objc2-core-location"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a12a8ed07aefc768292f076dc3ac8c48f3781c8f2d5851dd3d98950e8c5a89f"
+checksum = "ca347214e24bc973fc025fd0d36ebb179ff30536ed1f80252706db19ee452009"
dependencies = [
- "objc2-encode",
+ "objc2 0.6.4",
+ "objc2-foundation 0.3.2",
]
[[package]]
-name = "objc2-app-kit"
+name = "objc2-core-text"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c"
+checksum = "0cde0dfb48d25d2b4862161a4d5fcc0e3c24367869ad306b0c9ec0073bfed92d"
dependencies = [
"bitflags 2.13.1",
- "objc2",
+ "objc2 0.6.4",
"objc2-core-foundation",
- "objc2-foundation",
- "objc2-quartz-core",
+ "objc2-core-graphics",
]
[[package]]
-name = "objc2-core-foundation"
+name = "objc2-core-video"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536"
+checksum = "d425caf1df73233f29fd8a5c3e5edbc30d2d4307870f802d18f00d83dc5141a6"
dependencies = [
"bitflags 2.13.1",
- "dispatch2",
- "objc2",
+ "objc2 0.6.4",
+ "objc2-core-foundation",
+ "objc2-core-graphics",
+ "objc2-io-surface",
]
[[package]]
@@ -3830,6 +4399,18 @@ version = "4.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ef25abbcd74fb2609453eb695bd2f860d389e457f67dc17cafc8b8cbc89d0c33"
+[[package]]
+name = "objc2-foundation"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8"
+dependencies = [
+ "bitflags 2.13.1",
+ "block2 0.5.1",
+ "libc",
+ "objc2 0.5.2",
+]
+
[[package]]
name = "objc2-foundation"
version = "0.3.2"
@@ -3837,10 +4418,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272"
dependencies = [
"bitflags 2.13.1",
- "objc2",
+ "block2 0.6.2",
+ "libc",
+ "objc2 0.6.4",
+ "objc2-core-foundation",
+]
+
+[[package]]
+name = "objc2-io-surface"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "180788110936d59bab6bd83b6060ffdfffb3b922ba1396b312ae795e1de9d81d"
+dependencies = [
+ "bitflags 2.13.1",
+ "objc2 0.6.4",
"objc2-core-foundation",
]
+[[package]]
+name = "objc2-metal"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6"
+dependencies = [
+ "bitflags 2.13.1",
+ "block2 0.5.1",
+ "objc2 0.5.2",
+ "objc2-foundation 0.2.2",
+]
+
[[package]]
name = "objc2-metal"
version = "0.3.2"
@@ -3848,9 +4454,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a0125f776a10d00af4152d74616409f0d4a2053a6f57fa5b7d6aa2854ac04794"
dependencies = [
"bitflags 2.13.1",
- "block2",
- "objc2",
- "objc2-foundation",
+ "block2 0.6.2",
+ "objc2 0.6.4",
+ "objc2-foundation 0.3.2",
+]
+
+[[package]]
+name = "objc2-quartz-core"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a"
+dependencies = [
+ "bitflags 2.13.1",
+ "block2 0.5.1",
+ "objc2 0.5.2",
+ "objc2-foundation 0.2.2",
+ "objc2-metal 0.2.2",
]
[[package]]
@@ -3860,23 +4479,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "96c1358452b371bf9f104e21ec536d37a650eb10f7ee379fff67d2e08d537f1f"
dependencies = [
"bitflags 2.13.1",
- "objc2",
+ "objc2 0.6.4",
"objc2-core-foundation",
- "objc2-foundation",
- "objc2-metal",
+ "objc2-foundation 0.3.2",
+ "objc2-metal 0.3.2",
]
[[package]]
-name = "objc2-ui-kit"
+name = "objc2-user-notifications"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d87d638e33c06f577498cbcc50491496a3ed4246998a7fbba7ccb98b1e7eab22"
+checksum = "9df9128cbbfef73cda168416ccf7f837b62737d748333bfe9ab71c245d76613e"
dependencies = [
"bitflags 2.13.1",
- "objc2",
- "objc2-core-foundation",
- "objc2-foundation",
- "objc2-quartz-core",
+ "block2 0.6.2",
+ "objc2 0.6.4",
+ "objc2-core-location",
+ "objc2-foundation 0.3.2",
]
[[package]]
@@ -3899,9 +4518,9 @@ dependencies = [
[[package]]
name = "object"
-version = "0.39.1"
+version = "0.37.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e5a6c098c7a3b6547378093f5cc30bc54fd361ce711e05293a5cc589562739b"
+checksum = "ff76201f031d8863c38aa7f905eca4f53abbfa15f609db4277d44cd8938f33fe"
dependencies = [
"memchr",
]
@@ -3914,12 +4533,12 @@ checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
[[package]]
name = "oo7"
-version = "0.5.0"
+version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3299dd401feaf1d45afd8fd1c0586f10fcfb22f244bb9afa942cec73503b89d"
+checksum = "78f2bfed90f1618b4b48dcad9307f25e14ae894e2949642c87c351601d62cebd"
dependencies = [
"aes",
- "ashpd 0.12.3",
+ "ashpd",
"async-fs",
"async-io",
"async-lock",
@@ -3928,17 +4547,17 @@ dependencies = [
"cipher",
"digest 0.10.7",
"endi",
- "futures-lite 2.6.1",
+ "futures-lite",
"futures-util",
- "getrandom 0.3.4",
+ "getrandom 0.4.3",
"hkdf",
"hmac",
"md-5",
"num",
"num-bigint-dig",
"pbkdf2",
- "rand 0.9.5",
"serde",
+ "serde_bytes",
"sha2 0.10.9",
"subtle",
"zbus",
@@ -3949,9 +4568,9 @@ dependencies = [
[[package]]
name = "open"
-version = "5.4.1"
+version = "5.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9cfef937e9c486488c7e3d949ae31c0f1d06bdacd75b99c086cb35356e30408"
+checksum = "ade3be4664bc1ef537ce133015f04c176b737815c2ba9fd60edf212d6e90dd55"
dependencies = [
"is-wsl",
"libc",
@@ -3969,6 +4588,15 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
+[[package]]
+name = "ordered-float"
+version = "5.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c7c9e0d9b23589f26070720bac724174bfec1083e82f7854cdd0267518343c0"
+dependencies = [
+ "num-traits",
+]
+
[[package]]
name = "ordered-stream"
version = "0.2.0"
@@ -4003,7 +4631,7 @@ checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1"
dependencies = [
"cfg-if",
"libc",
- "redox_syscall 0.5.18",
+ "redox_syscall",
"smallvec",
"windows-link 0.2.1",
]
@@ -4055,13 +4683,34 @@ version = "2.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
+[[package]]
+name = "perf"
+version = "0.1.0"
+source = "git+https://github.com/zed-industries/zed#ce48461eaadd16c65c31f835511ab96bd3b6e746"
+dependencies = [
+ "collections",
+ "serde",
+ "serde_json",
+]
+
[[package]]
name = "phf"
version = "0.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078"
dependencies = [
- "phf_shared",
+ "phf_shared 0.11.3",
+]
+
+[[package]]
+name = "phf"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1562dc717473dbaa4c1f85a36410e03c047b2e7df7f45ee938fbef64ae7fadf"
+dependencies = [
+ "phf_macros",
+ "phf_shared 0.13.1",
+ "serde",
]
[[package]]
@@ -4070,8 +4719,8 @@ version = "0.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aef8048c789fa5e851558d709946d6d79a8ff88c0440c587967f8e94bfb1216a"
dependencies = [
- "phf_generator",
- "phf_shared",
+ "phf_generator 0.11.3",
+ "phf_shared 0.11.3",
]
[[package]]
@@ -4080,10 +4729,33 @@ version = "0.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d"
dependencies = [
- "phf_shared",
+ "phf_shared 0.11.3",
"rand 0.8.7",
]
+[[package]]
+name = "phf_generator"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "135ace3a761e564ec88c03a77317a7c6b80bb7f7135ef2544dbe054243b89737"
+dependencies = [
+ "fastrand",
+ "phf_shared 0.13.1",
+]
+
+[[package]]
+name = "phf_macros"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "812f032b54b1e759ccd5f8b6677695d5268c588701effba24601f6932f8269ef"
+dependencies = [
+ "phf_generator 0.13.1",
+ "phf_shared 0.13.1",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
[[package]]
name = "phf_shared"
version = "0.11.3"
@@ -4093,6 +4765,15 @@ dependencies = [
"siphasher",
]
+[[package]]
+name = "phf_shared"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e57fef6bc5981e38c2ce2d63bfa546861309f875b8a75f092d1d54ae2d64f266"
+dependencies = [
+ "siphasher",
+]
+
[[package]]
name = "pico-args"
version = "0.5.0"
@@ -4125,12 +4806,6 @@ version = "0.2.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd"
-[[package]]
-name = "pin-utils"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
-
[[package]]
name = "piper"
version = "0.2.5"
@@ -4138,7 +4813,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c835479a4443ded371d6c535cbfd8d31ad92c5d23ae9770a61bc155e4992a3c1"
dependencies = [
"atomic-waker",
- "fastrand 2.5.0",
+ "fastrand",
"futures-io",
]
@@ -4184,7 +4859,7 @@ dependencies = [
"concurrent-queue",
"hermit-abi",
"pin-project-lite",
- "rustix 1.1.4",
+ "rustix",
"windows-sys 0.61.2",
]
@@ -4194,6 +4869,36 @@ version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5da3b0203fd7ee5720aa0b5e790b591aa5d3f41c3ed2c34a3a393382198af2f7"
+[[package]]
+name = "pollster"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f3a9f18d041e6d0e102a0a46750538147e5e8992d3b4873aaafee2520b00ce3"
+
+[[package]]
+name = "polycool"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50596ddc09eb5ad5f75cacd40209568e66df71baf86e1499a0e99c4cff12a5a6"
+dependencies = [
+ "arrayvec",
+]
+
+[[package]]
+name = "portable-atomic"
+version = "1.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05c8b63e8d9609db387f0324918f81d68fe27748f084ef092fb35954d0539a85"
+
+[[package]]
+name = "portable-atomic-util"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2a106d1259c23fac8e543272398ae0e3c0b8d33c88ed73d0cc71b0f1d902618"
+dependencies = [
+ "portable-atomic",
+]
+
[[package]]
name = "postage"
version = "0.5.0"
@@ -4206,7 +4911,7 @@ dependencies = [
"log",
"parking_lot",
"pin-project",
- "pollster",
+ "pollster 0.2.5",
"static_assertions",
"thiserror 1.0.69",
]
@@ -4220,6 +4925,12 @@ dependencies = [
"zerovec",
]
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+
[[package]]
name = "ppv-lite86"
version = "0.2.21"
@@ -4235,6 +4946,12 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
+[[package]]
+name = "presser"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa"
+
[[package]]
name = "prettyplease"
version = "0.2.37"
@@ -4254,28 +4971,6 @@ dependencies = [
"toml_edit 0.25.13+spec-1.1.0",
]
-[[package]]
-name = "proc-macro-error-attr2"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5"
-dependencies = [
- "proc-macro2",
- "quote",
-]
-
-[[package]]
-name = "proc-macro-error2"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802"
-dependencies = [
- "proc-macro-error-attr2",
- "proc-macro2",
- "quote",
- "syn 2.0.119",
-]
-
[[package]]
name = "proc-macro2"
version = "1.0.107"
@@ -4305,13 +5000,33 @@ dependencies = [
]
[[package]]
-name = "psm"
-version = "0.1.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dcd034599e63b970727f70d79e02d62390a4a84f7c6b827c27c46d5ac3fa622"
+name = "proptest"
+version = "1.10.0"
+source = "git+https://github.com/proptest-rs/proptest?rev=3dca198a8fef1b32e3a66f1e1897c955b4dc5b5b#3dca198a8fef1b32e3a66f1e1897c955b4dc5b5b"
dependencies = [
- "ar_archive_writer",
- "cc",
+ "bit-set 0.8.0",
+ "bit-vec 0.8.0",
+ "bitflags 2.13.1",
+ "num-traits",
+ "proptest-macro",
+ "rand 0.9.5",
+ "rand_chacha 0.9.0",
+ "rand_xorshift",
+ "regex-syntax",
+ "rusty-fork",
+ "tempfile",
+ "unarray",
+]
+
+[[package]]
+name = "proptest-macro"
+version = "0.5.0"
+source = "git+https://github.com/proptest-rs/proptest?rev=3dca198a8fef1b32e3a66f1e1897c955b4dc5b5b#3dca198a8fef1b32e3a66f1e1897c955b4dc5b5b"
+dependencies = [
+ "convert_case 0.11.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
]
[[package]]
@@ -4352,6 +5067,12 @@ dependencies = [
"bytemuck",
]
+[[package]]
+name = "quick-error"
+version = "1.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
+
[[package]]
name = "quick-error"
version = "2.0.1"
@@ -4420,7 +5141,7 @@ dependencies = [
"once_cell",
"socket2",
"tracing",
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
]
[[package]]
@@ -4529,6 +5250,21 @@ dependencies = [
"rand_core 0.10.1",
]
+[[package]]
+name = "rand_xorshift"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "513962919efc330f829edb2535844d1b912b0fbe2ca165d613e4e8788bb05a5a"
+dependencies = [
+ "rand_core 0.9.5",
+]
+
+[[package]]
+name = "range-alloc"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca45419789ae5a7899559e9512e58ca889e41f04f1f2445e9f4b290ceccd1d08"
+
[[package]]
name = "rangemap"
version = "1.8.0"
@@ -4579,7 +5315,7 @@ dependencies = [
"avif-serialize",
"imgref",
"loop9",
- "quick-error",
+ "quick-error 2.0.1",
"rav1e",
"rayon",
"rgb",
@@ -4602,14 +5338,14 @@ checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539"
[[package]]
name = "raw-window-metal"
-version = "0.4.0"
+version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76e8caa82e31bb98fee12fa8f051c94a6aa36b07cddb03f0d4fc558988360ff1"
+checksum = "40d213455a5f1dc59214213c7330e074ddf8114c9a42411eb890c767357ce135"
dependencies = [
- "cocoa 0.25.0",
- "core-graphics 0.23.2",
- "objc",
- "raw-window-handle",
+ "objc2 0.6.4",
+ "objc2-core-foundation",
+ "objc2-foundation 0.3.2",
+ "objc2-quartz-core 0.3.2",
]
[[package]]
@@ -4634,30 +5370,32 @@ dependencies = [
[[package]]
name = "read-fonts"
-version = "0.41.0"
+version = "0.37.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "046a7d674daf459825b32f5062056d6882db0d2f5a479fbd76ccfc870ac18709"
+checksum = "7b634fabf032fab15307ffd272149b622260f55974d9fad689292a5d33df02e5"
dependencies = [
"bytemuck",
- "font-types",
- "once_cell",
+ "core_maths",
+ "font-types 0.11.3",
]
[[package]]
-name = "reborrow"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03251193000f4bd3b042892be858ee50e8b3719f2b08e5833ac4353724632430"
-
-[[package]]
-name = "redox_syscall"
-version = "0.2.16"
+name = "read-fonts"
+version = "0.41.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
+checksum = "046a7d674daf459825b32f5062056d6882db0d2f5a479fbd76ccfc870ac18709"
dependencies = [
- "bitflags 1.3.2",
+ "bytemuck",
+ "font-types 0.12.4",
+ "once_cell",
]
+[[package]]
+name = "reborrow"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03251193000f4bd3b042892be858ee50e8b3719f2b08e5833ac4353724632430"
+
[[package]]
name = "redox_syscall"
version = "0.5.18"
@@ -4678,6 +5416,17 @@ dependencies = [
"thiserror 1.0.69",
]
+[[package]]
+name = "redox_users"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac"
+dependencies = [
+ "getrandom 0.2.17",
+ "libredox",
+ "thiserror 2.0.20",
+]
+
[[package]]
name = "ref-cast"
version = "1.0.26"
@@ -4698,6 +5447,14 @@ dependencies = [
"syn 3.0.3",
]
+[[package]]
+name = "refineable"
+version = "0.1.0"
+source = "git+https://github.com/zed-industries/zed#ce48461eaadd16c65c31f835511ab96bd3b6e746"
+dependencies = [
+ "derive_refineable",
+]
+
[[package]]
name = "regex"
version = "1.13.1"
@@ -4727,18 +5484,44 @@ version = "0.8.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4"
+[[package]]
+name = "renderdoc-sys"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832"
+
[[package]]
name = "resvg"
version = "0.45.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a8928798c0a55e03c9ca6c4c6846f76377427d2c1e1f7e6de3c06ae57942df43"
dependencies = [
+ "gif 0.13.3",
+ "image-webp",
+ "log",
+ "pico-args",
+ "rgb",
+ "svgtypes 0.15.3",
+ "tiny-skia",
+ "usvg 0.45.1",
+ "zune-jpeg 0.4.21",
+]
+
+[[package]]
+name = "resvg"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b563218631706d614e23059436526d005b50ab5f2d506b55a17eb65c5eb83419"
+dependencies = [
+ "gif 0.14.2",
+ "image-webp",
"log",
"pico-args",
"rgb",
- "svgtypes",
+ "svgtypes 0.16.1",
"tiny-skia",
- "usvg",
+ "usvg 0.46.0",
+ "zune-jpeg 0.5.15",
]
[[package]]
@@ -4779,6 +5562,15 @@ version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97"
+[[package]]
+name = "roxmltree"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1964b10c76125c36f8afe190065a4bf9a87bf324842c05701330bba9f1cacbb"
+dependencies = [
+ "memchr",
+]
+
[[package]]
name = "rusqlite"
version = "0.32.1"
@@ -4814,6 +5606,7 @@ dependencies = [
"proc-macro2",
"quote",
"rust-embed-utils",
+ "shellexpand",
"syn 2.0.119",
"walkdir",
]
@@ -4831,12 +5624,11 @@ dependencies = [
[[package]]
name = "rust-i18n"
-version = "3.1.5"
+version = "4.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fda2551fdfaf6cc5ee283adc15e157047b92ae6535cf80f6d4962d05717dc332"
+checksum = "f10cee36dd3b1f7929ea12b759de9eea9eff83bfccbc71f387ef4d41a57c64a4"
dependencies = [
"globwalk",
- "once_cell",
"regex",
"rust-i18n-macro",
"rust-i18n-support",
@@ -4845,44 +5637,44 @@ dependencies = [
[[package]]
name = "rust-i18n-macro"
-version = "3.1.5"
+version = "4.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22baf7d7f56656d23ebe24f6bb57a5d40d2bce2a5f1c503e692b5b2fa450f965"
+checksum = "f0bb1ed4e04fe26c2a2652cad1c6595efaf7196f4445c0d6e13c67154347fb7e"
dependencies = [
"glob",
- "once_cell",
"proc-macro2",
"quote",
"rust-i18n-support",
"serde",
"serde_json",
- "serde_yaml",
"syn 2.0.119",
]
[[package]]
name = "rust-i18n-support"
-version = "3.1.5"
+version = "4.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "940ed4f52bba4c0152056d771e563b7133ad9607d4384af016a134b58d758f19"
+checksum = "ba1c083408a2733180ae0acf2897612f8ceec7b0c0dcd065a0a87103bfb3b1d9"
dependencies = [
"arc-swap",
"base62",
"globwalk",
"itertools 0.11.0",
- "lazy_static",
"normpath",
- "once_cell",
- "proc-macro2",
- "regex",
"serde",
+ "serde-saphyr",
"serde_json",
- "serde_yaml",
"siphasher",
"toml 0.8.23",
"triomphe",
]
+[[package]]
+name = "rustc-demangle"
+version = "0.1.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b74b56ffa8bb2830709a538c2cbcae9aa062db0d2a42563bfb09bdaae44020eb"
+
[[package]]
name = "rustc-hash"
version = "1.1.0"
@@ -4904,19 +5696,6 @@ dependencies = [
"semver",
]
-[[package]]
-name = "rustix"
-version = "0.38.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
-dependencies = [
- "bitflags 2.13.1",
- "errno",
- "libc",
- "linux-raw-sys 0.4.15",
- "windows-sys 0.59.0",
-]
-
[[package]]
name = "rustix"
version = "1.1.4"
@@ -4926,8 +5705,8 @@ dependencies = [
"bitflags 2.13.1",
"errno",
"libc",
- "linux-raw-sys 0.12.1",
- "windows-sys 0.61.2",
+ "linux-raw-sys",
+ "windows-sys 0.52.0",
]
[[package]]
@@ -4993,20 +5772,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf54715a573b99ac80df0bc206da022bcd442c974952c7b9720069370852e21f"
[[package]]
-name = "rustybuzz"
-version = "0.14.1"
+name = "rusty-fork"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfb9cf8877777222e4a3bc7eb247e398b56baba500c38c1c46842431adc8b55c"
+checksum = "cc6bf79ff24e648f6da1f8d1f011e9cac26491b619e6b9280f2b47f1774e6ee2"
dependencies = [
- "bitflags 2.13.1",
- "bytemuck",
- "libm",
- "smallvec",
- "ttf-parser 0.21.1",
- "unicode-bidi-mirroring 0.2.0",
- "unicode-ccc 0.2.0",
- "unicode-properties",
- "unicode-script",
+ "fnv",
+ "quick-error 1.2.3",
+ "tempfile",
+ "wait-timeout",
]
[[package]]
@@ -5020,9 +5794,9 @@ dependencies = [
"core_maths",
"log",
"smallvec",
- "ttf-parser 0.25.1",
- "unicode-bidi-mirroring 0.4.0",
- "unicode-ccc 0.4.0",
+ "ttf-parser",
+ "unicode-bidi-mirroring",
+ "unicode-ccc",
"unicode-properties",
"unicode-script",
]
@@ -5051,6 +5825,22 @@ dependencies = [
"windows-sys 0.61.2",
]
+[[package]]
+name = "scheduler"
+version = "0.1.0"
+source = "git+https://github.com/zed-industries/zed#ce48461eaadd16c65c31f835511ab96bd3b6e746"
+dependencies = [
+ "async-task",
+ "backtrace",
+ "chrono",
+ "flume",
+ "futures",
+ "parking_lot",
+ "rand 0.9.5",
+ "wasm_thread",
+ "web-time",
+]
+
[[package]]
name = "schemars"
version = "1.2.2"
@@ -5152,6 +5942,10 @@ name = "semver"
version = "1.0.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd"
+dependencies = [
+ "serde",
+ "serde_core",
+]
[[package]]
name = "serde"
@@ -5163,6 +5957,35 @@ dependencies = [
"serde_derive",
]
+[[package]]
+name = "serde-saphyr"
+version = "0.0.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7bd22781911de0ca6debda95f073c8f18bec65d1a94f1fa9573f3102e514cea4"
+dependencies = [
+ "ahash",
+ "annotate-snippets",
+ "base64",
+ "encoding_rs_io",
+ "getrandom 0.3.4",
+ "granit-parser",
+ "nohash-hasher",
+ "num-traits",
+ "serde_core",
+ "smallvec",
+ "zmij",
+]
+
+[[package]]
+name = "serde_bytes"
+version = "0.11.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5d440709e79d88e51ac01c4b72fc6cb7314017bb7da9eeff678aa94c10e3ea8"
+dependencies = [
+ "serde",
+ "serde_core",
+]
+
[[package]]
name = "serde_core"
version = "1.0.229"
@@ -5217,19 +6040,6 @@ dependencies = [
"zmij",
]
-[[package]]
-name = "serde_json_lenient"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e033097bf0d2b59a62b42c18ebbb797503839b26afdda2c4e1415cb6c813540"
-dependencies = [
- "indexmap",
- "itoa",
- "memchr",
- "ryu",
- "serde",
-]
-
[[package]]
name = "serde_repr"
version = "0.1.21"
@@ -5271,19 +6081,6 @@ dependencies = [
"serde",
]
-[[package]]
-name = "serde_yaml"
-version = "0.9.34+deprecated"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
-dependencies = [
- "indexmap",
- "itoa",
- "ryu",
- "serde",
- "unsafe-libyaml",
-]
-
[[package]]
name = "sha1_smol"
version = "1.0.1"
@@ -5312,6 +6109,24 @@ dependencies = [
"digest 0.11.3",
]
+[[package]]
+name = "sharded-slab"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
+dependencies = [
+ "lazy_static",
+]
+
+[[package]]
+name = "shellexpand"
+version = "3.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32824fab5e16e6c4d86dc1ba84489390419a39f97699852b66480bb87d297ed8"
+dependencies = [
+ "dirs 4.0.0",
+]
+
[[package]]
name = "shlex"
version = "1.3.0"
@@ -5364,6 +6179,16 @@ version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ee5873ec9cce0195efcb7a4e9507a04cd49aec9c83d0389df45b1ef7ba2e649"
+[[package]]
+name = "skrifa"
+version = "0.40.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fbdfe3d2475fbd7ddd1f3e5cf8288a30eb3e5f95832829570cd88115a7434ac"
+dependencies = [
+ "bytemuck",
+ "read-fonts 0.37.0",
+]
+
[[package]]
name = "skrifa"
version = "0.44.0"
@@ -5371,7 +6196,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "819ab7d62b1d3e72d9d9dea5650bac30424f9111364bb94928dbf5ecad1baa68"
dependencies = [
"bytemuck",
- "read-fonts",
+ "read-fonts 0.41.0",
]
[[package]]
@@ -5401,7 +6226,7 @@ version = "2.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a33bd3e260892199c3ccfc487c88b2da2265080acb316cd920da72fdfd7c599f"
dependencies = [
- "async-channel 2.5.0",
+ "async-channel",
"async-executor",
"async-fs",
"async-io",
@@ -5409,14 +6234,18 @@ dependencies = [
"async-net",
"async-process",
"blocking",
- "futures-lite 2.6.1",
+ "futures-lite",
]
[[package]]
name = "smol_str"
-version = "0.2.2"
+version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead"
+checksum = "4aaa7368fcf4852a4c2dd92df0cace6a71f2091ca0a23391ce7f3a31833f1523"
+dependencies = [
+ "borsh",
+ "serde_core",
+]
[[package]]
name = "socket2"
@@ -5438,53 +6267,28 @@ dependencies = [
]
[[package]]
-name = "spirv"
-version = "0.3.0+sdk-1.3.268.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844"
-dependencies = [
- "bitflags 2.13.1",
-]
-
-[[package]]
-name = "stable_deref_trait"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
-
-[[package]]
-name = "stacker"
-version = "0.1.25"
+name = "spin"
+version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "707f49d46706bacf8a2b00d51dace3f9de527c13eec3778f570c411f89e69967"
+checksum = "023a211cb3138dbc438680b32560ad89f699977624c9f8dbb95a47d5b4c07dd3"
dependencies = [
- "cc",
- "cfg-if",
- "libc",
- "psm",
- "windows-sys 0.61.2",
+ "lock_api",
]
[[package]]
-name = "stacksafe"
-version = "0.1.4"
+name = "spirv"
+version = "0.4.0+sdk-1.4.341.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d9c1172965d317e87ddb6d364a040d958b40a1db82b6ef97da26253a8b3d090"
+checksum = "d9571ea910ebd84c86af4b3ed27f9dbdc6ad06f17c5f96146b2b671e2976744f"
dependencies = [
- "stacker",
- "stacksafe-macro",
+ "bitflags 2.13.1",
]
[[package]]
-name = "stacksafe-macro"
-version = "0.1.4"
+name = "stable_deref_trait"
+version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "172175341049678163e979d9107ca3508046d4d2a7c6682bee46ac541b17db69"
-dependencies = [
- "proc-macro-error2",
- "quote",
- "syn 2.0.119",
-]
+checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
[[package]]
name = "static_assertions"
@@ -5521,7 +6325,7 @@ checksum = "bf776ba3fa74f83bf4b63c3dcbbf82173db2632ed8452cb2d891d33f459de70f"
dependencies = [
"new_debug_unreachable",
"parking_lot",
- "phf_shared",
+ "phf_shared 0.11.3",
"precomputed-hash",
"serde",
]
@@ -5532,48 +6336,26 @@ version = "0.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c711928715f1fe0fe509c53b43e993a9a557babc2d0a3567d0a3006f1ac931a0"
dependencies = [
- "phf_generator",
- "phf_shared",
+ "phf_generator 0.11.3",
+ "phf_shared 0.11.3",
"proc-macro2",
"quote",
]
[[package]]
name = "strum"
-version = "0.26.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06"
-dependencies = [
- "strum_macros 0.26.4",
-]
-
-[[package]]
-name = "strum"
-version = "0.27.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf"
-dependencies = [
- "strum_macros 0.27.2",
-]
-
-[[package]]
-name = "strum_macros"
-version = "0.26.4"
+version = "0.28.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
+checksum = "9628de9b8791db39ceda2b119bbe13134770b56c138ec1d3af810d045c04f9bd"
dependencies = [
- "heck 0.5.0",
- "proc-macro2",
- "quote",
- "rustversion",
- "syn 2.0.119",
+ "strum_macros",
]
[[package]]
name = "strum_macros"
-version = "0.27.2"
+version = "0.28.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7695ce3845ea4b33927c055a39dc438a45b059f7c1b3d91d38d10355fb8cbca7"
+checksum = "ab85eea0270ee17587ed4156089e10b9e6880ee688791d45a905f5b1ca36f664"
dependencies = [
"heck 0.5.0",
"proc-macro2",
@@ -5587,6 +6369,18 @@ version = "2.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
+[[package]]
+name = "sum_tree"
+version = "0.1.0"
+source = "git+https://github.com/zed-industries/zed#ce48461eaadd16c65c31f835511ab96bd3b6e746"
+dependencies = [
+ "heapless",
+ "log",
+ "rayon",
+ "tracing",
+ "ztracing",
+]
+
[[package]]
name = "sval"
version = "2.21.1"
@@ -5678,30 +6472,29 @@ version = "0.15.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "68c7541fff44b35860c1a7a47a7cadf3e4a304c457b58f9870d9706ece028afc"
dependencies = [
- "kurbo",
+ "kurbo 0.11.3",
"siphasher",
]
[[package]]
-name = "swash"
-version = "0.2.10"
+name = "svgtypes"
+version = "0.16.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c2499c2d826531388872b2268718aed907a39bd785ab0dcfe57fab26283f92e"
+checksum = "695b5790b3131dafa99b3bbfd25a216edb3d216dad9ca208d4657bfb8f2abc3d"
dependencies = [
- "skrifa",
- "yazi",
- "zeno",
+ "kurbo 0.13.1",
+ "siphasher",
]
[[package]]
-name = "syn"
-version = "1.0.109"
+name = "swash"
+version = "0.2.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+checksum = "6c2499c2d826531388872b2268718aed907a39bd785ab0dcfe57fab26283f92e"
dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
+ "skrifa 0.44.0",
+ "yazi",
+ "zeno",
]
[[package]]
@@ -5766,7 +6559,7 @@ dependencies = [
"memchr",
"ntapi",
"rayon",
- "windows 0.57.0",
+ "windows 0.56.0",
]
[[package]]
@@ -5792,22 +6585,16 @@ dependencies = [
[[package]]
name = "taffy"
-version = "0.9.0"
+version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a13e5d13f79d558b5d353a98072ca8ca0e99da429467804de959aa8c83c9a004"
+checksum = "c034e05f6ee85a12daa63863c2245797715075c70649947aa0da54f3f2ab1d0f"
dependencies = [
"arrayvec",
- "grid",
"serde",
"slotmap",
+ "smallvec",
]
-[[package]]
-name = "take-until"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bdb6fa0dfa67b38c1e66b7041ba9dcf23b99d8121907cd31c807a332f7a0bbb"
-
[[package]]
name = "tao-core-video-sys"
version = "0.2.0"
@@ -5820,17 +6607,28 @@ dependencies = [
"objc",
]
+[[package]]
+name = "tauri-winrt-notification"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed071c670382e85fc2f48ae706492d8c338f4f89bf72520d32f8abfe880aade"
+dependencies = [
+ "thiserror 2.0.20",
+ "windows 0.61.3",
+ "windows-version",
+]
+
[[package]]
name = "tempfile"
version = "3.27.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"
dependencies = [
- "fastrand 2.5.0",
+ "fastrand",
"getrandom 0.4.3",
"once_cell",
- "rustix 1.1.4",
- "windows-sys 0.61.2",
+ "rustix",
+ "windows-sys 0.52.0",
]
[[package]]
@@ -5893,6 +6691,15 @@ dependencies = [
"syn 3.0.3",
]
+[[package]]
+name = "thread_local"
+version = "1.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ad99c4c6d32803332c548b1af0540b357b3f5fc0be8f6c6bfe8b2e6ae784070"
+dependencies = [
+ "cfg-if",
+]
+
[[package]]
name = "tiff"
version = "0.11.3"
@@ -5902,11 +6709,30 @@ dependencies = [
"fax",
"flate2",
"half",
- "quick-error",
+ "quick-error 2.0.1",
"weezl",
- "zune-jpeg",
+ "zune-jpeg 0.5.15",
+]
+
+[[package]]
+name = "time"
+version = "0.3.55"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdb87b95ec50ddfa440816d227a17b2ccbdda963a316a727fda0fc4334f7d134"
+dependencies = [
+ "deranged",
+ "num-conv",
+ "powerfmt",
+ "serde_core",
+ "time-core",
]
+[[package]]
+name = "time-core"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e1c906769ad99c88eaa54e728060edef082f8e358ff32030cb7c7d315e81109"
+
[[package]]
name = "tiny-keccak"
version = "2.0.2"
@@ -6142,6 +6968,7 @@ version = "0.1.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100"
dependencies = [
+ "log",
"pin-project-lite",
"tracing-attributes",
"tracing-core",
@@ -6165,6 +6992,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a"
dependencies = [
"once_cell",
+ "valuable",
+]
+
+[[package]]
+name = "tracing-log"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
+dependencies = [
+ "log",
+ "once_cell",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-subscriber"
+version = "0.3.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb7f578e5945fb242538965c2d0b04418d38ec25c79d160cd279bf0731c8d319"
+dependencies = [
+ "nu-ansi-term",
+ "sharded-slab",
+ "smallvec",
+ "thread_local",
+ "tracing-core",
+ "tracing-log",
]
[[package]]
@@ -6176,8 +7029,8 @@ dependencies = [
"chrono",
"libc",
"log",
- "objc2",
- "objc2-foundation",
+ "objc2 0.6.4",
+ "objc2-foundation 0.3.2",
"once_cell",
"percent-encoding",
"scopeguard",
@@ -6187,9 +7040,9 @@ dependencies = [
[[package]]
name = "tree-sitter"
-version = "0.25.10"
+version = "0.26.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78f873475d258561b06f1c595d93308a7ed124d9977cb26b148c2084a4a3cc87"
+checksum = "17ebdd3a5a7e28a1890b876fdbd0c3c0fe0a6336cffaa104f11b9f720c9daa29"
dependencies = [
"cc",
"regex",
@@ -6199,6 +7052,16 @@ dependencies = [
"tree-sitter-language",
]
+[[package]]
+name = "tree-sitter-astro-next"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "794a4a59fc2d88e49b4bc41fef9522d77184a36f4e68bbaf545cd1eb2364c46e"
+dependencies = [
+ "cc",
+ "tree-sitter-language",
+]
+
[[package]]
name = "tree-sitter-bash"
version = "0.23.3"
@@ -6359,12 +7222,32 @@ dependencies = [
"tree-sitter-language",
]
+[[package]]
+name = "tree-sitter-kotlin-sg"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c06ec43ae3c12165d4ac08afe4e1f5fc6757ffe274fa7bd5af9007ef11ba4319"
+dependencies = [
+ "cc",
+ "tree-sitter-language",
+]
+
[[package]]
name = "tree-sitter-language"
version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "009994f150cc0cd50ff54917d5bc8bffe8cad10ca10d81c34da2ec421ae61782"
+[[package]]
+name = "tree-sitter-lua"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea992f4164d83f371ef1239ae178c4d4596c296c09055e9a48bb02a2760403af"
+dependencies = [
+ "cc",
+ "tree-sitter-language",
+]
+
[[package]]
name = "tree-sitter-make"
version = "1.1.1"
@@ -6385,6 +7268,16 @@ dependencies = [
"tree-sitter-language",
]
+[[package]]
+name = "tree-sitter-php"
+version = "0.24.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d8c17c3ab69052c5eeaa7ff5cd972dd1bc25d1b97ee779fec391ad3b5df5592"
+dependencies = [
+ "cc",
+ "tree-sitter-language",
+]
+
[[package]]
name = "tree-sitter-proto"
version = "0.2.0"
@@ -6445,6 +7338,16 @@ dependencies = [
"tree-sitter-language",
]
+[[package]]
+name = "tree-sitter-svelte-next"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56f88190d0743e897c3e148a7e241aba0a8844b8afe816943851426e3f7b9753"
+dependencies = [
+ "cc",
+ "tree-sitter-language",
+]
+
[[package]]
name = "tree-sitter-swift"
version = "0.7.3"
@@ -6512,18 +7415,6 @@ version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
-[[package]]
-name = "ttf-parser"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4"
-
-[[package]]
-name = "ttf-parser"
-version = "0.21.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c591d83f69777866b9126b24c6dd9a18351f177e49d625920d19f989fd31cf8"
-
[[package]]
name = "ttf-parser"
version = "0.25.1"
@@ -6556,6 +7447,12 @@ dependencies = [
"windows-sys 0.61.2",
]
+[[package]]
+name = "unarray"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94"
+
[[package]]
name = "unicase"
version = "2.9.0"
@@ -6568,24 +7465,12 @@ version = "0.3.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5"
-[[package]]
-name = "unicode-bidi-mirroring"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23cb788ffebc92c5948d0e997106233eeb1d8b9512f93f41651f52b6c5f5af86"
-
[[package]]
name = "unicode-bidi-mirroring"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5dfa6e8c60bb66d49db113e0125ee8711b7647b5579dc7f5f19c42357ed039fe"
-[[package]]
-name = "unicode-ccc"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1df77b101bcc4ea3d78dafc5ad7e4f58ceffe0b2b16bf446aeb50b6cb4157656"
-
[[package]]
name = "unicode-ccc"
version = "0.4.0"
@@ -6641,10 +7526,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254"
[[package]]
-name = "unsafe-libyaml"
-version = "0.2.11"
+name = "unicode-xid"
+version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
[[package]]
name = "untrusted"
@@ -6662,7 +7547,6 @@ dependencies = [
"idna",
"percent-encoding",
"serde",
- "serde_derive",
]
[[package]]
@@ -6680,17 +7564,44 @@ dependencies = [
"base64",
"data-url",
"flate2",
- "fontdb 0.23.0",
- "imagesize",
- "kurbo",
+ "fontdb",
+ "imagesize 0.13.0",
+ "kurbo 0.11.3",
"log",
"pico-args",
- "roxmltree",
- "rustybuzz 0.20.1",
+ "roxmltree 0.20.0",
+ "rustybuzz",
"simplecss",
"siphasher",
"strict-num",
- "svgtypes",
+ "svgtypes 0.15.3",
+ "tiny-skia-path",
+ "unicode-bidi",
+ "unicode-script",
+ "unicode-vo",
+ "xmlwriter",
+]
+
+[[package]]
+name = "usvg"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e419dff010bb12512b0ae9e3d2f318dfbdf0167fde7eb05465134d4e8756076f"
+dependencies = [
+ "base64",
+ "data-url",
+ "flate2",
+ "fontdb",
+ "imagesize 0.14.0",
+ "kurbo 0.13.1",
+ "log",
+ "pico-args",
+ "roxmltree 0.21.1",
+ "rustybuzz",
+ "simplecss",
+ "siphasher",
+ "strict-num",
+ "svgtypes 0.16.1",
"tiny-skia-path",
"unicode-bidi",
"unicode-script",
@@ -6710,6 +7621,16 @@ version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+[[package]]
+name = "util_macros"
+version = "0.1.0"
+source = "git+https://github.com/zed-industries/zed#ce48461eaadd16c65c31f835511ab96bd3b6e746"
+dependencies = [
+ "perf",
+ "quote",
+ "syn 2.0.119",
+]
+
[[package]]
name = "uuid"
version = "1.24.0"
@@ -6734,6 +7655,12 @@ dependencies = [
"wasm-bindgen",
]
+[[package]]
+name = "valuable"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65"
+
[[package]]
name = "value-bag"
version = "1.13.2"
@@ -6802,6 +7729,15 @@ dependencies = [
"libc",
]
+[[package]]
+name = "wait-timeout"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ac3b126d3914f9849036f826e054cbabdc8519970b8998ddaf3b5bd3c65f11"
+dependencies = [
+ "libc",
+]
+
[[package]]
name = "wake"
version = "0.3.1"
@@ -6812,12 +7748,15 @@ dependencies = [
"futures",
"gpui",
"gpui-component",
+ "gpui_platform",
"semver",
"serde",
"serde_json",
+ "unicode-segmentation",
+ "unicode-width",
"wake-core",
"winresource",
- "zed-reqwest",
+ "zed-reqwest 0.12.15-zed (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -6946,15 +7885,26 @@ dependencies = [
"web-sys",
]
+[[package]]
+name = "wasm_thread"
+version = "0.3.3"
+source = "git+https://github.com/zed-industries/wasm_thread?rev=0cf96c7708dfb97ccf3da50347e25edcf75d6937#0cf96c7708dfb97ccf3da50347e25edcf75d6937"
+dependencies = [
+ "futures",
+ "js-sys",
+ "wasm-bindgen",
+ "web-sys",
+]
+
[[package]]
name = "wayland-backend"
-version = "0.3.16"
+version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "016ccf01d1c58b6f8999612813e17c9b2390f7d70671428869913310f83f54b8"
+checksum = "38a91b4eaddff87b1cd1074985e3713da4af2c49742d1b356b2c01670a67a078"
dependencies = [
"cc",
"downcast-rs",
- "rustix 1.1.4",
+ "rustix",
"scoped-tls",
"smallvec",
"wayland-sys",
@@ -6967,7 +7917,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e3c36a0f861ad76d0901f2800b46321410d9f73f2ea88aac0650d86c32688073"
dependencies = [
"bitflags 2.13.1",
- "rustix 1.1.4",
+ "rustix",
"wayland-backend",
"wayland-scanner",
]
@@ -6978,16 +7928,16 @@ version = "0.31.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4a52d18780be9b1314328a3de5f930b73d2200112e3849ca6cb11822793fb34d"
dependencies = [
- "rustix 1.1.4",
+ "rustix",
"wayland-client",
"xcursor",
]
[[package]]
name = "wayland-protocols"
-version = "0.31.2"
+version = "0.32.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4"
+checksum = "23d0c813de3daa2ed6520af85a3bd49b0e722a3078506899aa9686fea58dc4b6"
dependencies = [
"bitflags 2.13.1",
"wayland-backend",
@@ -6996,89 +7946,265 @@ dependencies = [
]
[[package]]
-name = "wayland-protocols"
-version = "0.32.13"
+name = "wayland-protocols-plasma"
+version = "0.3.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23d0c813de3daa2ed6520af85a3bd49b0e722a3078506899aa9686fea58dc4b6"
+checksum = "2b6d8cf1eb2c1c31ed1f5643c88a6e53538129d4af80030c8cabd1f9fa884d91"
dependencies = [
"bitflags 2.13.1",
"wayland-backend",
"wayland-client",
+ "wayland-protocols",
"wayland-scanner",
]
[[package]]
-name = "wayland-protocols-plasma"
-version = "0.2.0"
+name = "wayland-protocols-wlr"
+version = "0.3.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb04e52f7836d7c7976c78ca0250d61e33873c34156a2a1fc9474828ec268234"
+dependencies = [
+ "bitflags 2.13.1",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-protocols",
+ "wayland-scanner",
+]
+
+[[package]]
+name = "wayland-scanner"
+version = "0.31.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "338e30461b3a2b67d70eb30a6d89f8e0c93a833e07d2ae89085cd070c4a00ac0"
+dependencies = [
+ "proc-macro2",
+ "quick-xml",
+ "quote",
+]
+
+[[package]]
+name = "wayland-sys"
+version = "0.31.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8eab23fefc9e41f8e841df4a9c707e8a8c4ed26e944ef69297184de2785e3be"
+dependencies = [
+ "dlib",
+ "log",
+ "once_cell",
+ "pkg-config",
+]
+
+[[package]]
+name = "web-sys"
+version = "0.3.104"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c435338968042f4f59a557f690a253676d47ce13ceb55d70100e7facf6620a30"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "web-time"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "weezl"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a28ac98ddc8b9274cb41bb4d9d4d5c425b6020c50c46f25559911905610b4a88"
+
+[[package]]
+name = "wgpu"
+version = "29.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76e8840e1ba2881d4cbb18d2147627a56af426ff064c0401eb0c8410c6325d07"
+dependencies = [
+ "arrayvec",
+ "bitflags 2.13.1",
+ "bytemuck",
+ "cfg-if",
+ "cfg_aliases",
+ "document-features",
+ "hashbrown 0.16.1",
+ "js-sys",
+ "log",
+ "naga",
+ "parking_lot",
+ "portable-atomic",
+ "profiling",
+ "raw-window-handle",
+ "smallvec",
+ "static_assertions",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+ "wgpu-core",
+ "wgpu-hal",
+ "wgpu-types",
+]
+
+[[package]]
+name = "wgpu-core"
+version = "29.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f519832254e56965a9940c4af57dcb75f702b6f6fa4a0b172f685395843a4d7"
+dependencies = [
+ "arrayvec",
+ "bit-set 0.9.1",
+ "bit-vec 0.9.1",
+ "bitflags 2.13.1",
+ "bytemuck",
+ "cfg_aliases",
+ "document-features",
+ "hashbrown 0.16.1",
+ "indexmap",
+ "log",
+ "naga",
+ "once_cell",
+ "parking_lot",
+ "portable-atomic",
+ "profiling",
+ "raw-window-handle",
+ "rustc-hash 1.1.0",
+ "smallvec",
+ "thiserror 2.0.20",
+ "wgpu-core-deps-apple",
+ "wgpu-core-deps-emscripten",
+ "wgpu-core-deps-wasm",
+ "wgpu-core-deps-windows-linux-android",
+ "wgpu-hal",
+ "wgpu-naga-bridge",
+ "wgpu-types",
+]
+
+[[package]]
+name = "wgpu-core-deps-apple"
+version = "29.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5e39e26c4c0e07589e67d18546cf79ff45383659fc72fca4dd293358a0347f3"
+dependencies = [
+ "wgpu-hal",
+]
+
+[[package]]
+name = "wgpu-core-deps-emscripten"
+version = "29.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479"
+checksum = "01e09be551dc939498bdd5f6b2c66e55ab275dad25825267a08605a80fc9f0af"
dependencies = [
- "bitflags 2.13.1",
- "wayland-backend",
- "wayland-client",
- "wayland-protocols 0.31.2",
- "wayland-scanner",
+ "wgpu-hal",
]
[[package]]
-name = "wayland-scanner"
-version = "0.31.11"
+name = "wgpu-core-deps-wasm"
+version = "29.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "338e30461b3a2b67d70eb30a6d89f8e0c93a833e07d2ae89085cd070c4a00ac0"
+checksum = "af1fb1798be2a912497d4c224f72d39bb0cb34af50e8bcc29865bc339c943059"
dependencies = [
- "proc-macro2",
- "quick-xml",
- "quote",
+ "wgpu-hal",
]
[[package]]
-name = "wayland-sys"
-version = "0.31.11"
+name = "wgpu-core-deps-windows-linux-android"
+version = "29.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8eab23fefc9e41f8e841df4a9c707e8a8c4ed26e944ef69297184de2785e3be"
+checksum = "4e592c1bbef6ad047647ae6e666ebd8cee7a32bb4544d9700ec96cbf73230257"
dependencies = [
- "dlib",
- "log",
- "once_cell",
- "pkg-config",
+ "wgpu-hal",
]
[[package]]
-name = "web-sys"
-version = "0.3.104"
+name = "wgpu-hal"
+version = "29.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c435338968042f4f59a557f690a253676d47ce13ceb55d70100e7facf6620a30"
+checksum = "97ace1c17727311c22a46e4e3faf56ea6de81af99dcc839bdfb54857b94d448d"
dependencies = [
+ "android_system_properties",
+ "arrayvec",
+ "ash",
+ "bit-set 0.9.1",
+ "bitflags 2.13.1",
+ "block2 0.6.2",
+ "bytemuck",
+ "cfg-if",
+ "cfg_aliases",
+ "glow",
+ "glutin_wgl_sys",
+ "gpu-allocator",
+ "gpu-descriptor",
+ "hashbrown 0.16.1",
"js-sys",
+ "khronos-egl",
+ "libc",
+ "libloading",
+ "log",
+ "naga",
+ "ndk-sys",
+ "objc2 0.6.4",
+ "objc2-core-foundation",
+ "objc2-foundation 0.3.2",
+ "objc2-metal 0.3.2",
+ "objc2-quartz-core 0.3.2",
+ "once_cell",
+ "ordered-float",
+ "parking_lot",
+ "portable-atomic",
+ "portable-atomic-util",
+ "profiling",
+ "range-alloc",
+ "raw-window-handle",
+ "raw-window-metal",
+ "renderdoc-sys",
+ "smallvec",
+ "thiserror 2.0.20",
"wasm-bindgen",
+ "wayland-sys",
+ "web-sys",
+ "wgpu-naga-bridge",
+ "wgpu-types",
+ "windows 0.62.2",
+ "windows-core 0.62.2",
+ "windows-result 0.4.1",
]
[[package]]
-name = "web-time"
-version = "1.1.0"
+name = "wgpu-naga-bridge"
+version = "29.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
+checksum = "95226013f547544b223281cd16a4fb549aa9dcb562adbda0faae4c73ffbbc161"
dependencies = [
- "js-sys",
- "wasm-bindgen",
+ "naga",
+ "wgpu-types",
]
[[package]]
-name = "weezl"
-version = "0.1.12"
+name = "wgpu-types"
+version = "29.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a28ac98ddc8b9274cb41bb4d9d4d5c425b6020c50c46f25559911905610b4a88"
+checksum = "84bf84cd9ca8ca45e2b223a3868f1adf9bfc0c66aeac212e76ee7e40fdadf8f5"
+dependencies = [
+ "bitflags 2.13.1",
+ "bytemuck",
+ "js-sys",
+ "log",
+ "raw-window-handle",
+ "web-sys",
+]
[[package]]
name = "which"
-version = "6.0.3"
+version = "8.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4ee928febd44d98f2f459a4a79bd4d928591333a494a10a868418ac1b39cf1f"
+checksum = "bae2f2b2b816647a1cab1acc91f5bd20812d53cb344382635ec2181940c8034f"
dependencies = [
- "either",
- "home",
- "rustix 0.38.44",
- "winsafe",
+ "libc",
]
[[package]]
@@ -7103,7 +8229,7 @@ version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
dependencies = [
- "windows-sys 0.61.2",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -7124,11 +8250,11 @@ dependencies = [
[[package]]
name = "windows"
-version = "0.57.0"
+version = "0.58.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143"
+checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6"
dependencies = [
- "windows-core 0.57.0",
+ "windows-core 0.58.0",
"windows-targets 0.52.6",
]
@@ -7138,11 +8264,23 @@ version = "0.61.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9babd3a767a4c1aef6900409f85f5d53ce2544ccdfaa86dad48c91782c6d6893"
dependencies = [
- "windows-collections",
+ "windows-collections 0.2.0",
"windows-core 0.61.2",
- "windows-future",
+ "windows-future 0.2.1",
"windows-link 0.1.3",
- "windows-numerics",
+ "windows-numerics 0.2.0",
+]
+
+[[package]]
+name = "windows"
+version = "0.62.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "527fadee13e0c05939a6a05d5bd6eec6cd2e3dbd648b9f8e447c6518133d8580"
+dependencies = [
+ "windows-collections 0.3.2",
+ "windows-core 0.62.2",
+ "windows-future 0.3.2",
+ "windows-numerics 0.3.1",
]
[[package]]
@@ -7155,7 +8293,7 @@ dependencies = [
"rayon",
"thiserror 2.0.20",
"windows 0.61.3",
- "windows-future",
+ "windows-future 0.2.1",
]
[[package]]
@@ -7167,6 +8305,15 @@ dependencies = [
"windows-core 0.61.2",
]
+[[package]]
+name = "windows-collections"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23b2d95af1a8a14a3c7367e1ed4fc9c20e0a26e79551b1454d72583c97cc6610"
+dependencies = [
+ "windows-core 0.62.2",
+]
+
[[package]]
name = "windows-core"
version = "0.56.0"
@@ -7181,13 +8328,14 @@ dependencies = [
[[package]]
name = "windows-core"
-version = "0.57.0"
+version = "0.58.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d"
+checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99"
dependencies = [
- "windows-implement 0.57.0",
- "windows-interface 0.57.0",
- "windows-result 0.1.2",
+ "windows-implement 0.58.0",
+ "windows-interface 0.58.0",
+ "windows-result 0.2.0",
+ "windows-strings 0.1.0",
"windows-targets 0.52.6",
]
@@ -7225,7 +8373,18 @@ checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e"
dependencies = [
"windows-core 0.61.2",
"windows-link 0.1.3",
- "windows-threading",
+ "windows-threading 0.1.0",
+]
+
+[[package]]
+name = "windows-future"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1d6f90251fe18a279739e78025bd6ddc52a7e22f921070ccdc67dde84c605cb"
+dependencies = [
+ "windows-core 0.62.2",
+ "windows-link 0.2.1",
+ "windows-threading 0.2.1",
]
[[package]]
@@ -7241,9 +8400,9 @@ dependencies = [
[[package]]
name = "windows-implement"
-version = "0.57.0"
+version = "0.58.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7"
+checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b"
dependencies = [
"proc-macro2",
"quote",
@@ -7274,9 +8433,9 @@ dependencies = [
[[package]]
name = "windows-interface"
-version = "0.57.0"
+version = "0.58.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7"
+checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515"
dependencies = [
"proc-macro2",
"quote",
@@ -7316,6 +8475,16 @@ dependencies = [
"windows-link 0.1.3",
]
+[[package]]
+name = "windows-numerics"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e2e40844ac143cdb44aead537bbf727de9b044e107a0f1220392177d15b0f26"
+dependencies = [
+ "windows-core 0.62.2",
+ "windows-link 0.2.1",
+]
+
[[package]]
name = "windows-registry"
version = "0.4.0"
@@ -7347,6 +8516,15 @@ dependencies = [
"windows-targets 0.52.6",
]
+[[package]]
+name = "windows-result"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
[[package]]
name = "windows-result"
version = "0.3.4"
@@ -7365,6 +8543,16 @@ dependencies = [
"windows-link 0.2.1",
]
+[[package]]
+name = "windows-strings"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
+dependencies = [
+ "windows-result 0.2.0",
+ "windows-targets 0.52.6",
+]
+
[[package]]
name = "windows-strings"
version = "0.3.1"
@@ -7485,6 +8673,24 @@ dependencies = [
"windows-link 0.1.3",
]
+[[package]]
+name = "windows-threading"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3949bd5b99cafdf1c7ca86b43ca564028dfe27d66958f2470940f73d86d75b37"
+dependencies = [
+ "windows-link 0.2.1",
+]
+
+[[package]]
+name = "windows-version"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4060a1da109b9d0326b7262c8e12c84df67cc0dbc9e33cf49e01ccc2eb63631"
+dependencies = [
+ "windows-link 0.2.1",
+]
+
[[package]]
name = "windows_aarch64_gnullvm"
version = "0.48.5"
@@ -7661,12 +8867,6 @@ dependencies = [
"version_check",
]
-[[package]]
-name = "winsafe"
-version = "0.0.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904"
-
[[package]]
name = "wio"
version = "0.2.2"
@@ -7723,7 +8923,7 @@ dependencies = [
"as-raw-xcb-connection",
"gethostname",
"libc",
- "rustix 1.1.4",
+ "rustix",
"x11rb-protocol",
"xcursor",
]
@@ -7734,15 +8934,6 @@ version = "0.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ea6fc2961e4ef194dcbfe56bb845534d0dc8098940c7e5c012a258bfec6701bd"
-[[package]]
-name = "xattr"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc"
-dependencies = [
- "libc",
-]
-
[[package]]
name = "xcb"
version = "1.7.1"
@@ -7764,17 +8955,15 @@ checksum = "163b33ed8786455e2fa5d72f554057ce3f3182425434f756cd39c99839d88e23"
[[package]]
name = "xim-ctext"
version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ac61a7062c40f3c37b6e82eeeef835d5cc7824b632a72784a89b3963c33284c"
+source = "git+https://github.com/zed-industries/xim-rs.git?rev=16f35a2c881b815a2b6cdfd6687988e84f8447d8#16f35a2c881b815a2b6cdfd6687988e84f8447d8"
dependencies = [
"encoding_rs",
]
[[package]]
name = "xim-parser"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dcee45f89572d5a65180af3a84e7ddb24f5ea690a6d3aa9de231281544dd7b7"
+version = "0.2.1"
+source = "git+https://github.com/zed-industries/xim-rs.git?rev=16f35a2c881b815a2b6cdfd6687988e84f8447d8#16f35a2c881b815a2b6cdfd6687988e84f8447d8"
dependencies = [
"bitflags 2.13.1",
]
@@ -7797,6 +8986,12 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56"
+[[package]]
+name = "xml-rs"
+version = "0.8.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e450f9b2ed1dff33c94c12589a87338689467b9c4f5d8a5710bd09a847d2c8a7"
+
[[package]]
name = "xml5ever"
version = "0.18.1"
@@ -7876,13 +9071,13 @@ dependencies = [
"async-trait",
"blocking",
"enumflags2",
- "event-listener 5.4.2",
+ "event-listener",
"futures-core",
- "futures-lite 2.6.1",
+ "futures-lite",
"hex",
"libc",
"ordered-stream",
- "rustix 1.1.4",
+ "rustix",
"serde",
"serde_repr",
"tracing",
@@ -7895,6 +9090,30 @@ dependencies = [
"zvariant",
]
+[[package]]
+name = "zbus-lockstep"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6998de05217a084b7578728a9443d04ea4cd80f2a0839b8d78770b76ccd45863"
+dependencies = [
+ "zbus_xml",
+ "zvariant",
+]
+
+[[package]]
+name = "zbus-lockstep-macros"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "10da05367f3a7b7553c8cdf8fa91aee6b64afebe32b51c95177957efc47ca3a0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+ "zbus-lockstep",
+ "zbus_xml",
+ "zvariant",
+]
+
[[package]]
name = "zbus_macros"
version = "5.19.0"
@@ -7922,40 +9141,37 @@ dependencies = [
]
[[package]]
-name = "zcheapstr"
-version = "1.1.0"
+name = "zbus_xml"
+version = "5.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1afec51604565183aeb5c54c20aeab286120d4e4460f7f76e3e8bb8c0d99473"
+checksum = "d1586c021a01ca0a9216dcd874e546382e156a5cbab5fab6cb5f10087e22682a"
dependencies = [
"serde",
+ "winnow 1.0.4",
+ "zbus_names",
+ "zvariant",
]
[[package]]
-name = "zed-async-tar"
-version = "0.5.0-zed"
+name = "zcheapstr"
+version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6cf4b5f655e29700e473cb1acd914ab112b37b62f96f7e642d5fc6a0c02eb881"
+checksum = "d1afec51604565183aeb5c54c20aeab286120d4e4460f7f76e3e8bb8c0d99473"
dependencies = [
- "async-std",
- "filetime",
- "libc",
- "pin-project",
- "redox_syscall 0.2.16",
- "xattr",
+ "serde",
]
[[package]]
name = "zed-font-kit"
version = "0.14.1-zed"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3898e450f36f852edda72e3f985c34426042c4951790b23b107f93394f9bff5"
+source = "git+https://github.com/zed-industries/font-kit?rev=94b0f28166665e8fd2f53ff6d268a14955c82269#94b0f28166665e8fd2f53ff6d268a14955c82269"
dependencies = [
"bitflags 2.13.1",
"byteorder",
"core-foundation 0.10.0",
"core-graphics 0.24.0",
"core-text",
- "dirs 5.0.1",
+ "dirs 6.0.0",
"dwrote",
"float-ord",
"freetype-sys",
@@ -7977,10 +9193,52 @@ checksum = "ac2d05756ff48539950c3282ad7acf3817ad3f08797c205ad1c34a2ce03b9970"
dependencies = [
"base64",
"bytes",
- "encoding_rs",
"futures-channel",
"futures-core",
"futures-util",
+ "http",
+ "http-body",
+ "http-body-util",
+ "hyper",
+ "hyper-rustls",
+ "hyper-util",
+ "ipnet",
+ "js-sys",
+ "log",
+ "mime",
+ "once_cell",
+ "percent-encoding",
+ "pin-project-lite",
+ "quinn",
+ "rustls",
+ "rustls-native-certs",
+ "rustls-pemfile",
+ "rustls-pki-types",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "sync_wrapper",
+ "tokio",
+ "tokio-rustls",
+ "tower",
+ "tower-service",
+ "url",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+ "windows-registry 0.4.0",
+]
+
+[[package]]
+name = "zed-reqwest"
+version = "0.12.15-zed"
+source = "git+https://github.com/zed-industries/reqwest.git?rev=c15662463bda39148ba154100dd44d3fba5873a4#c15662463bda39148ba154100dd44d3fba5873a4"
+dependencies = [
+ "base64",
+ "bytes",
+ "encoding_rs",
+ "futures-core",
+ "futures-util",
"h2",
"http",
"http-body",
@@ -8023,8 +9281,7 @@ dependencies = [
[[package]]
name = "zed-scap"
version = "0.0.8-zed"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6b338d705ae33a43ca00287c11129303a7a0aa57b101b72a1c08c863f698ac8"
+source = "git+https://github.com/zed-industries/scap?rev=4afea48c3b002197176fb19cd0f9b180dd36eaac#4afea48c3b002197176fb19cd0f9b180dd36eaac"
dependencies = [
"anyhow",
"cocoa 0.25.0",
@@ -8057,8 +9314,7 @@ dependencies = [
[[package]]
name = "zed-xim"
version = "0.4.0-zed"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c0b46ed118eba34d9ba53d94ddc0b665e0e06a2cf874cfa2dd5dec278148642"
+source = "git+https://github.com/zed-industries/xim-rs.git?rev=16f35a2c881b815a2b6cdfd6687988e84f8447d8#16f35a2c881b815a2b6cdfd6687988e84f8447d8"
dependencies = [
"ahash",
"hashbrown 0.14.5",
@@ -8168,6 +9424,17 @@ dependencies = [
"syn 3.0.3",
]
+[[package]]
+name = "zlog"
+version = "0.1.0"
+source = "git+https://github.com/zed-industries/zed#ce48461eaadd16c65c31f835511ab96bd3b6e746"
+dependencies = [
+ "anyhow",
+ "chrono",
+ "collections",
+ "log",
+]
+
[[package]]
name = "zmij"
version = "1.0.23"
@@ -8202,6 +9469,28 @@ dependencies = [
"pkg-config",
]
+[[package]]
+name = "ztracing"
+version = "0.1.0"
+source = "git+https://github.com/zed-industries/zed#ce48461eaadd16c65c31f835511ab96bd3b6e746"
+dependencies = [
+ "tracing",
+ "tracing-subscriber",
+ "zlog",
+ "ztracing_macro",
+]
+
+[[package]]
+name = "ztracing_macro"
+version = "0.1.0"
+source = "git+https://github.com/zed-industries/zed#ce48461eaadd16c65c31f835511ab96bd3b6e746"
+
+[[package]]
+name = "zune-core"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a"
+
[[package]]
name = "zune-core"
version = "0.5.3"
@@ -8217,25 +9506,34 @@ dependencies = [
"simd-adler32",
]
+[[package]]
+name = "zune-jpeg"
+version = "0.4.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29ce2c8a9384ad323cf564b67da86e21d3cfdff87908bc1223ed5c99bc792713"
+dependencies = [
+ "zune-core 0.4.12",
+]
+
[[package]]
name = "zune-jpeg"
version = "0.5.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "27bc9d5b815bc103f142aa054f561d9187d191692ec7c2d1e2b4737f8dbd7296"
dependencies = [
- "zune-core",
+ "zune-core 0.5.3",
]
[[package]]
name = "zvariant"
-version = "5.14.0"
+version = "5.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5e28c25bd8bb8da5a1f3e7065d0c156b9ee9a7973adf78b0e35eaefdf3b1b5c"
+checksum = "c1d34c27cc6cdd1f458427519dd6b8612f7b7e3f7b9a0b2355d041dda9869147"
dependencies = [
"endi",
"enumflags2",
"serde",
- "url",
+ "serde_bytes",
"winnow 1.0.4",
"zcheapstr",
"zvariant_derive",
@@ -8244,9 +9542,9 @@ dependencies = [
[[package]]
name = "zvariant_derive"
-version = "5.14.0"
+version = "5.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d496a145685283b67e232bd9e47377f6b60ad9d51e3601b23867f77c42477f96"
+checksum = "864155e69b4352db0c7f374917bf45d1e0c8d17659c8b3dbf9795f3673f8c497"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -8257,9 +9555,9 @@ dependencies = [
[[package]]
name = "zvariant_utils"
-version = "4.0.0"
+version = "4.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "629d80ece222cad20fe0e8741be493c4ab166acf3b85341bdc2cdbcfd8f3c2d6"
+checksum = "bad0294361a320b694a328460dc73add56c306150f5cb6bfafc44446120008a3"
dependencies = [
"proc-macro2",
"quote",
diff --git a/DESIGN.md b/DESIGN.md
index 5caf0e3..224331a 100644
--- a/DESIGN.md
+++ b/DESIGN.md
@@ -144,9 +144,13 @@ macOS 不设置横跨三栏的自定义 header。主窗口透明标题栏高 44p
- 顶部由 22px 上下文标题、会话总数角标和 icon-only 排序按钮组成;整个标题区固定为 88px,与左栏顶部身份区等高。标题和会话总数保持 2px 紧凑间距,并作为一个信息组在 88px 内整体垂直居中,禁止拆成两条 44px 行。排序按钮与信息组顶部对齐,沿用 16px 图标、透明 ghost 常态和 6px 圆角;当前排序字段和方向放在 tooltip 与菜单选中态中。
- 会话流固定 336px;顶部使用 22px 上下文标题、Label 11 会话数量和 icon-only 排序按钮。
- 会话行使用 Body 14 标题与 Label 11 元信息,共两行;行内 `SPACE_SM` 上下内边距 + `SPACE_XS` 两行间距。
-- 第二行固定为品牌图标 15px、项目名 badge、弹性空隙和右对齐的智能时间;一分钟内显示 Just now,一小时内显示分钟数,当天显示时间,昨天显示 Yesterday,本年显示月日,更早补年份。Hover 统一显示精确到秒的本地时间。
+- 标题严格保持单行;超长标题按 `unicode-width` 的中英文显示宽度提前截断并补 `…`,状态图标占用的尾部宽度必须预留,Hover 展示完整标题。
+- 第二行固定为品牌图标 15px、项目名 badge、弹性空隙和右对齐的当前排序时间(按创建时间排序时显示创建时间,其他排序显示更新时间);一分钟内显示 Just now,一小时内显示分钟数,当天显示时间,昨天显示 Yesterday,本年显示月日,更早补年份。Hover 统一显示精确到秒的本地时间。
+- 按创建或更新时间倒序时,置顶会话单列 `Pinned`,其余按 `Today` / `Yesterday` / `Earlier this week` / 月份分组;跨年月份补年份。分组标题采用“标签 + 右侧低对比度 hairline”,不使用贯穿整栏的底边,既标明分界又避免表格感。按消息数或任何升序排列时保持平铺,避免分组语义与实际顺序冲突。
+- 会话流每页读取 100 条,距当前已加载内容末尾 20 行时后台预取下一页;同值排序以 session key 稳定打破平局,跨页追加去重并重算分组。筛选或排序变化会让旧分页请求失效,失败的页停住等待用户刷新,禁止触底重试风暴。
+- 全文搜索命中不受当前已加载页限制:若目标不在首批数据中,后台继续按页读取到目标,再通过平铺下标与分组 `IndexPath` 的映射完成选中和滚动。
- 分支、token 和归档状态不在列表重复展示,移入详情元信息。
-- 收藏和置顶允许以 11px 系统蓝图标出现在标题尾部。
+- 收藏以 11px macOS 系统黄实心星、置顶以 11px 系统蓝实心图标出现在标题尾部。
- 当前行使用低饱和蓝材质,不额外描边。
- 会话流不重复提供全文搜索入口;列表内输入只筛选当前范围。
@@ -154,30 +158,35 @@ macOS 不设置横跨三栏的自定义 header。主窗口透明标题栏高 44p
层级从上到下为:
-1. Agent、项目、分支等来源上下文与右侧操作工具条,共享一个 44px 高的 Flex 行;28px 操作条上下各保留 8px,不使用绝对定位。
-2. 会话标题独占第二个 44px 行,与第一行合计 88px;标题行下沿与左栏身份区和会话列表标题区对齐。标题保持 22px,过长时单行截断。
+1. Agent、项目、分支等来源上下文与右侧操作工具条,共享一个 44px 高的 Flex 行;28px 操作条上下各保留 8px,不使用绝对定位。项目 badge 可点击并在文件管理器中打开项目目录;空值、`HEAD`、`detached` 和 `detached HEAD` 不作为有效分支显示。
+2. 会话标题独占第二行;单行标题时该行最小 44px,与第一行合计 88px 并保持三栏基线对齐。标题保持 22px,过长时详情头自然向下扩展并完整换行,不截断内容;Hover 同时展示完整标题 tooltip。
3. 模型、来源(Via)badge 与消息数/token 共处标题下方第一行;统计文本弹性占据剩余宽度,窄窗口下单行截断。
4. 项目路径独占第二行。
5. 第三行以 12px 日期图标开头,创建与更新信息复用会话列表的智能时间,两者以留白和低对比度中点明确分组;Hover 对应时间时统一展示精确到秒的完整本地时间。
-五层信息一项不减;标题下方的三行信息不压进 88px 标题区域。元信息区与标题、底部分隔线均保留 8px,层间保持 8px,让来源、标题、运行统计、位置和时间上下文能被分别扫读。
+五层信息一项不减;标题下方的三行信息不压进来源与标题区域。元信息区与标题、底部分隔线均保留 8px,层间保持 8px,让来源、标题、运行统计、位置和时间上下文能被分别扫读。
-“在终端继续”是唯一主按钮。收藏、置顶保留为独立图标按钮;导出、Finder 和删除进入“更多”菜单。按钮圆角固定 6px,危险操作在菜单中用分组隔开并继续走确认框。
+“在终端继续”是唯一主按钮。收藏、置顶保留为独立图标按钮;导出、Finder 和删除进入“更多”菜单。按钮圆角固定 6px,危险操作在菜单中用分组隔开,图标与文案统一使用 danger 红色,并继续走确认框。
详情正文使用 `popover` 阅读底色,与 `background` 详情头形成明确分区;阅读面横向铺满且不套大号圆角卡。内容限制在 720px 阅读宽度并居中。助手正文保持平铺,不在每条回复前重复 Agent 署名。只有 thinking、没有回复正文或工具调用的中间事件不进入阅读视图;带正文的 thinking 摘要保留,工具调用继续默认折叠。
+详情加载失败不得退化为空白阅读面:没有匹配 adapter 时明确说明 agent 与会话路径不匹配,转录解析失败时保留底层错误链;两者共用居中的错误态,并提供“在文件管理器中显示”动作定位原始会话文件。异步解析结果只允许写回仍然选中的同一会话,避免快速切换时旧任务覆盖新详情。
+
对话框标题一律 Heading 16 semibold:组件内建 `.title()` 不设字号(实渲窗口默认 14px),必须显式补 `text_size(FONT_HEADING)`。破坏性确认的主按钮点名动作并用 danger 形态("Move to Trash",Windows 上经 trash_copy! 平台文案为 "Move to Recycle Bin",不留裸 "OK");表单弹窗内控件同档取齐(输入框与下拉/浏览钮同高,次级动作行才允许 small)。
### 对话阅读面
-正文横向铺在 `popover` 材质阅读面中,与 `background` 详情头用 hairline 分开,不再套圆角大卡。助手正文 13px、用户正文 13.5px,可选择、可滚动,代码继续使用 tree-sitter 高亮。
+正文横向铺在 `popover` 材质阅读面中,与 `background` 详情头用 hairline 分开,不再套圆角大卡。助手正文 13px、用户正文 13.5px,行高分别为 1.9 / 1.85,可选择、可滚动。Markdown 继续由组件原生渲染表格、引用块和分隔线;h1–h4 相对正文依次使用 1.45 / 1.28 / 1.14 / 1.05 倍字号,不拆分 `TextView`,以保留跨块连续选择。阅读区使用窗口级文本选择:Shift 可跨消息扩选,拖到视口边缘时自动滚动,复制按文档顺序合并所选文字。
+
+代码块使用 `muted` 阅读底、`border` 描边、8px 圆角和 4px 网格内边距;右上角显示语言名和复制操作。tree-sitter 高亮必须显式选择 light/dark theme,且 `TextView` id 带当前模式,让主题切换走同步重建,禁止短暂残留上一模式的代码配色。
对话角色不使用常驻标题或 emoji:
- 用户使用靠右的低饱和引用块。
- 助手正文平铺,不在每条回复前重复 Agent 名称。
-- 仅有 thinking、没有正文或工具的中间事件不进入阅读视图;带正式回复的思考摘要显示 `Thinking · …`。
-- 工具调用合并为折叠簇,失败项才内联输出。
+- 仅有 thinking、没有正文或工具的中间事件不进入阅读视图;正式回复所带的 thinking 显示为折叠面板,收起是一行摘要,展开后显示完整原文。Thinking 与工具调用分别保存展开状态,禁止互相连带。
+- Codex review 的 `ExitedReviewMode.review_output` 转为可读 Markdown,展示结论、说明、finding、代码位置与置信度;注入式 `<user_action>` 只作缺少结构化事件时的文本兜底,不显示 XML 外壳,也不与结构化结果重复。
+- 工具调用合并为低强调折叠卡:单条收起时显示工具名与参数摘要,多条显示数量与名称序列,失败数常驻。摘要格数从当前阅读区像素宽反算,再用 `unicode-width` 截断。展开后显示可用的完整 Input,以及成功和失败 Output;失败结果使用 danger 色。Input/Output 面板最多展示前 600 个字符,但始终提供复制完整原文的操作,不引入嵌套滚动区。
emoji 不再承担界面或正文结构图标职责。
@@ -202,10 +211,10 @@ emoji 不再承担界面或正文结构图标职责。
- 页面用 `background` 材质整片承载;顶部 88px 标题区与中栏同节奏(Insights 22px semibold + Label 11 副行,副行只说 "Since {首会话月份}"),兼窗口拖拽区。内容限 720px 阅读宽居中,区块之间只用 32px 留白与 Body 14 semibold 组头分隔——**不做卡片墙、零投影**,延续"避免每个区域加边框"的层级原则。
- 统计口径与主 UI 一致(archived 不计):"Prompts" 一律指主线用户消息。数据在打开与每次 Refresh 后后台重算,不阻塞浏览。
-- 概览行:22px semibold 大数字 + Caption 标签,序为 Sessions / Tokens / Prompts / Agents / Projects / Active days(用户钉序,2026-08-27);Tokens 仅在有 agent 报过用量时出现。数字千分位。
-- 活跃热力图:53 周 × 7 天(周一起始,最右列为本周),10px 圆角格 + 3px 缝,总宽 715px。强度 = `muted` 空格 + `primary` 25/50/75/100% 四档(按窗口内峰值分位);未来日期留白。月份与 Mon/Wed/Fri 标签用 Label 11 muted;每格 tooltip 给 "N prompts · Aug 3, 2026"。底注左侧为 streak 与最忙一日(Label 11,` · ` 分隔),右侧 Less–More 固定满阶梯图例。
+- 概览行:28px semibold 大数字 + Caption 标签,序为 Sessions / Tokens / Prompts / Agents / Projects / Active days(用户钉序,2026-08-27);Tokens 仅在有 agent 报过用量时出现。数字千分位。
+- 活跃热力图:53 周 × 7 天(周一起始,最右列为本周),9px 方格 + 3px 缝,总宽 662px。热力格、分布柱和图例统一使用 `RADIUS_CELL` 2px 圆角;强度 = `muted` 空格 + `primary` 25/50/75/100% 四档(按窗口内峰值分位);未来日期留白。月份与 Mon/Wed/Fri 标签用 Label 11 muted;每格 tooltip 给 "N prompts · Aug 3, 2026"。底注左侧为 streak 与最忙一日(Label 11,` · ` 分隔),右侧 Less–More 固定满阶梯图例。
- 分布图:hour(24 柱)/ weekday(7 柱)/ month(12 柱)三个维度共用一张竖柱图,组头右侧 ‹ › ghost 按钮循环切换(纯视图状态,数据三份常驻不重查);峰值柱全饱和 `primary`、其余 55%,零值保留 2px `muted` 基线;柱数越少缝越大(4/8/6px)。hour 只标 6 小时锚点(靠左),weekday/month 每柱标签与柱居中;组头副行点出峰值("Most active around 2 PM" / "on Sundays" / "in August")。
-- Agents / Projects / Models 三个榜单同构:条形行 = 行首(品牌图 15px 原色 / folder 图标 / 无)+ 名称列定宽 truncate + 6px 圆头轨道条(`muted` 轨、`primary` 填充,按组内峰值归一)+ 右对齐 Label 计数。三个组头都挂 ‹ › 切换度量,循环序与概览行一致:Sessions / Tokens / Prompts;**当前档位名(首字母大写的裸名词)显示在两键中间**——64px 定宽居中,Caption muted,按钮位置不随文本跳动;榜单组头因此为单行(标题与按钮组居中对齐),分布图组头保留 caption 双行、按钮中间无标签(其标题本身就是档位名)。每个榜单各自记忆档位,行按当前度量降序重排后取 top-N(Agents 全量、Projects/Models 各 6;截断在排序之后,换度量不漏项);Tokens 档只列报过用量的组、值用 K/M 缩写,组内无人报 token 时该档不进循环。
+- Agents / Projects / Models 三个榜单同构:24px 条形行 = 行首(品牌图 15px 原色 / folder 图标 / 无)+ 名称列定宽 truncate + 6px 圆头轨道条(`muted` 轨、`primary` 填充,按组内峰值归一)+ 右对齐 Label 计数。三个组头都挂 ‹ › 切换度量,循环序与概览行一致:Sessions / Tokens / Prompts;**当前档位名(首字母大写的裸名词)显示在两键中间**——64px 定宽居中,Caption muted,按钮位置不随文本跳动;榜单组头因此为单行(标题与按钮组居中对齐),分布图组头保留 caption 双行、按钮中间无标签(其标题本身就是档位名)。每个榜单各自记忆档位,行按当前度量降序重排后取 top-N(Agents 全量、Projects/Models 各 6;截断在排序之后,换度量不漏项);Tokens 档只列报过用量的组、值用 K/M 缩写,组内无人报 token 时该档不进循环。
- 空态沿用详情空态形制("No activity yet" + "Refresh sessions to see your activity here.");加载用居中 Spinner,已有数据时静默换新不闪烁。
## 图标、形状与层次
@@ -213,7 +222,7 @@ emoji 不再承担界面或正文结构图标职责。
- UI chrome 只使用内嵌 Lucide 单线 SVG,不使用 Unicode 或 emoji 图标;Agent 身份用内嵌品牌 PNG,经 `img()` 渲染并**保持原色**(不得用 `text_color` 着色,选中态也不变色)。
- 品牌 PNG 登记在 `assets.rs` 的 `brands!` 宏,文件名 = `AgentId::as_str()`,路径含 `.png`。入库前须裁掉透明边并保持正方形;带白色/彩色底的 app-icon 风格图必须先抠底,否则在侧栏材质上会露出白方块。
- 品牌图标侧栏分组项 18px、内容区(列表/搜索/详情)15px;Lucide 行内图标 13–15px;主操作与工具栏图标 14–16px;空态图标 22–26px。
-- 面板圆角 12px,列表与侧栏选择 8px,按钮固定 6px,快捷键标签 5px,badge 胶囊 4px。代码里前两档走 `theme.radius_lg` / `theme.radius`,后三档见 `ui.rs` 的 `RADIUS_BUTTON` / `RADIUS_KBD` / `RADIUS_BADGE`——不要再写裸数字。
+- 面板圆角 12px,列表与侧栏选择 8px,按钮固定 6px,快捷键标签 5px,badge 胶囊 4px,数据格 2px。代码里前两档走 `theme.radius_lg` / `theme.radius`,其余引用 `ui.rs` 的 `RADIUS_BUTTON` / `RADIUS_KBD` / `RADIUS_BADGE` / `RADIUS_CELL`——不要再写裸数字。
- 常驻界面零投影、零渐变、无装饰性描边。菜单、命令面板、确认框和通知由组件库提供浮层阴影。
- 相邻的自定义材质只用一套 token 和圆角语言,避免每个按钮各自模拟玻璃。
diff --git a/crates/wake-core/src/adapters/codex.rs b/crates/wake-core/src/adapters/codex.rs
index 6ef09cc..e20f75f 100644
--- a/crates/wake-core/src/adapters/codex.rs
+++ b/crates/wake-core/src/adapters/codex.rs
@@ -6,6 +6,7 @@ use anyhow::Result;
use rusqlite::Connection;
use serde_json::Value;
use std::collections::HashMap;
+use std::fmt::Write as _;
use std::fs;
use std::io::{BufRead, BufReader};
use std::path::{Path, PathBuf};
@@ -152,6 +153,141 @@ fn friendly_source(originator: &str) -> Option<String> {
})
}
+/// Codex Desktop 把一次 review 同时写成注入式 `<user_action>` 与
+/// `ExitedReviewMode.review_output`。前者只作结构化事件的文本兜底,不应以
+/// “用户消息 + XML 外壳”的形态出现在详情里。
+fn review_results_from_user_action(text: &str) -> Option<String> {
+ let text = text.trim();
+ if !text.starts_with("<user_action") || extract_tag(text, "action")?.trim() != "review" {
+ return None;
+ }
+ let results = extract_tag(text, "results")?;
+ (!results.trim().is_empty()).then(|| results.trim().to_string())
+}
+
+fn review_confidence(value: Option<&Value>) -> Option<String> {
+ let value = value?.as_f64()?;
+ let percent = if (0.0..=1.0).contains(&value) {
+ value * 100.0
+ } else {
+ value
+ };
+ percent.is_finite().then(|| format!("{percent:.0}%"))
+}
+
+/// review 的机器 JSON 转成详情页 Markdown。严格要求 `findings` 数组,避免
+/// 把用户恰好贴出的普通 JSON 误判成 review。
+fn format_review_output(review: &Value) -> Option<String> {
+ let findings = review.get("findings")?.as_array()?;
+ let mut out = String::from("## Code review\n\n");
+
+ let verdict = review
+ .get("overall_correctness")
+ .and_then(Value::as_str)
+ .map(|value| match value {
+ "patch is correct" => "Passed",
+ "patch is incorrect" => "Changes requested",
+ other => other,
+ });
+ let confidence = review_confidence(review.get("overall_confidence_score"));
+ let mut facts = Vec::new();
+ if let Some(verdict) = verdict {
+ facts.push(format!("**Result:** {verdict}"));
+ }
+ if let Some(confidence) = confidence {
+ facts.push(format!("**Confidence:** {confidence}"));
+ }
+ if !facts.is_empty() {
+ out.push_str(&facts.join(" · "));
+ out.push_str("\n\n");
+ }
+
+ if let Some(explanation) = review
+ .get("overall_explanation")
+ .and_then(Value::as_str)
+ .map(str::trim)
+ .filter(|text| !text.is_empty())
+ {
+ out.push_str(explanation);
+ out.push_str("\n\n");
+ }
+
+ out.push_str("### Findings\n\n");
+ if findings.is_empty() {
+ out.push_str("No findings.");
+ return Some(out);
+ }
+
+ for (index, finding) in findings.iter().enumerate() {
+ let title = finding
+ .get("title")
+ .and_then(Value::as_str)
+ .map(str::trim)
+ .filter(|title| !title.is_empty())
+ .unwrap_or("Untitled finding")
+ .replace(['\r', '\n'], " ");
+ let priority = finding.get("priority").and_then(Value::as_i64);
+ let heading = if title.starts_with("[P") {
+ title
+ } else if let Some(priority) = priority {
+ format!("[P{priority}] {title}")
+ } else {
+ title
+ };
+ let _ = write!(out, "#### {}. {heading}\n\n", index + 1);
+
+ if let Some(body) = finding
+ .get("body")
+ .and_then(Value::as_str)
+ .map(str::trim)
+ .filter(|body| !body.is_empty())
+ {
+ out.push_str(body);
+ out.push_str("\n\n");
+ }
+
+ if let Some(location) = finding.get("code_location") {
+ if let Some(path) = location.get("absolute_file_path").and_then(Value::as_str) {
+ let range = location.get("line_range");
+ let start = range
+ .and_then(|range| range.get("start"))
+ .and_then(Value::as_i64);
+ let end = range
+ .and_then(|range| range.get("end"))
+ .and_then(Value::as_i64);
+ let suffix = match (start, end) {
+ (Some(start), Some(end)) if start != end => format!(":{start}–{end}"),
+ (Some(start), _) => format!(":{start}"),
+ _ => String::new(),
+ };
+ // 路径理论上不会含反引号;替换掉可避免异常输入打断 Markdown。
+ let path = path.replace('`', "'");
+ let _ = write!(out, "**Location:** `{path}{suffix}`\n\n");
+ }
+ }
+
+ if let Some(confidence) = review_confidence(finding.get("confidence_score")) {
+ let _ = write!(out, "**Confidence:** {confidence}\n\n");
+ }
+ }
+
+ Some(out.trim_end().to_string())
+}
+
+fn format_review_json(text: &str) -> Option<String> {
+ let text = text.trim();
+ let review: Value = match serde_json::from_str(text) {
+ Ok(review) => review,
+ Err(_) => {
+ // 某些 reviewer 把键名按 Markdown 写成 `confidence\_score`;这类
+ // 输出不是合法 JSON,只在初次解析失败后做窄化兼容。
+ let unescaped = text.replace("\\_", "_");
+ serde_json::from_str(&unescaped).ok()?
+ }
+ };
+ format_review_output(&review)
+}
+
fn parse_rollout(path: &Path) -> Result<CodexParse> {
let file = fs::File::open(path)?;
let reader = BufReader::with_capacity(1 << 20, file);
@@ -159,6 +295,7 @@ fn parse_rollout(path: &Path) -> Result<CodexParse> {
let mut messages: Vec<TranscriptMessage> = Vec::new();
let mut event_fallback: Vec<TranscriptMessage> = Vec::new();
let mut tool_index: HashMap<String, (usize, usize)> = HashMap::new();
+ let mut pending_review_message: Option<usize> = None;
let mut cwd = String::new();
let mut git_branch: Option<String> = None;
let mut model: Option<String> = None;
@@ -258,9 +395,20 @@ fn parse_rollout(path: &Path) -> Result<CodexParse> {
}
match role {
"user" => {
- messages.push(mk_msg(Role::User, user_kind(&text), &text, ts))
+ if let Some(results) = review_results_from_user_action(&text) {
+ messages.push(mk_msg(
+ Role::Assistant,
+ MessageKind::Text,
+ &results,
+ ts,
+ ));
+ pending_review_message = Some(messages.len() - 1);
+ } else {
+ messages.push(mk_msg(Role::User, user_kind(&text), &text, ts));
+ }
}
"assistant" => {
+ let text = format_review_json(&text).unwrap_or(text);
messages.push(mk_msg(Role::Assistant, MessageKind::Text, &text, ts))
}
_ => messages.push(mk_msg(Role::System, MessageKind::Meta, &text, ts)),
@@ -386,22 +534,63 @@ fn parse_rollout(path: &Path) -> Result<CodexParse> {
"user_message" => {
if let Some(m) = payload.get("message").and_then(|v| v.as_str()) {
if !m.trim().is_empty() {
- event_fallback.push(mk_msg(Role::User, user_kind(m), m.trim(), ts));
+ if let Some(results) = review_results_from_user_action(m) {
+ event_fallback.push(mk_msg(
+ Role::Assistant,
+ MessageKind::Text,
+ &results,
+ ts,
+ ));
+ } else {
+ event_fallback.push(mk_msg(
+ Role::User,
+ user_kind(m),
+ m.trim(),
+ ts,
+ ));
+ }
}
}
}
"agent_message" => {
if let Some(m) = payload.get("message").and_then(|v| v.as_str()) {
if !m.trim().is_empty() {
+ let text = format_review_json(m).unwrap_or_else(|| m.trim().into());
event_fallback.push(mk_msg(
Role::Assistant,
MessageKind::Text,
- m.trim(),
+ &text,
ts,
));
}
}
}
+ "item_completed" => {
+ let item = payload.get("item");
+ let is_review = item
+ .and_then(|item| item.get("type"))
+ .and_then(Value::as_str)
+ == Some("ExitedReviewMode");
+ if is_review {
+ if let Some(markdown) = item
+ .and_then(|item| item.get("review_output"))
+ .and_then(format_review_output)
+ {
+ let review_message =
+ mk_msg(Role::Assistant, MessageKind::Text, &markdown, ts);
+ if let Some(index) = pending_review_message
+ .take()
+ .filter(|index| *index + 1 == messages.len())
+ {
+ messages[index] = review_message;
+ } else if !messages.last().is_some_and(|message| {
+ message.role == Role::Assistant && message.text == markdown
+ }) {
+ messages.push(review_message);
+ }
+ }
+ }
+ }
_ => {}
}
}
@@ -681,3 +870,36 @@ impl AgentAdapter for CodexAdapter {
}))
}
}
+
+#[cfg(test)]
+mod tests {
+ use super::*;
+
+ #[test]
+ fn raw_review_json_is_formatted_instead_of_exposed() {
+ let raw = serde_json::json!({
+ "findings": [{
+ "title": "A finding",
+ "body": "Human-readable detail.",
+ "confidence_score": 0.91,
+ "priority": 1,
+ "code_location": {
+ "absolute_file_path": "/tmp/example.rs",
+ "line_range": { "start": 7, "end": 7 }
+ }
+ }],
+ "overall_correctness": "patch is incorrect",
+ "overall_explanation": "One issue remains.",
+ "overall_confidence_score": 0.95
+ })
+ .to_string();
+
+ let formatted = format_review_json(&raw).expect("review JSON");
+ assert!(formatted.contains("## Code review"));
+ assert!(formatted.contains("[P1] A finding"));
+ assert!(formatted.contains("`/tmp/example.rs:7`"));
+ assert!(!formatted.contains("\"findings\""));
+ assert!(format_review_json(&raw.replace('_', "\\_")).is_some());
+ assert!(format_review_json(r#"{"ordinary":"json"}"#).is_none());
+ }
+}
diff --git a/crates/wake-core/src/adapters/parse_utils.rs b/crates/wake-core/src/adapters/parse_utils.rs
index c8b35f3..b5d8799 100644
--- a/crates/wake-core/src/adapters/parse_utils.rs
+++ b/crates/wake-core/src/adapters/parse_utils.rs
@@ -332,6 +332,7 @@ pub fn is_injected_user_content(text: &str) -> bool {
const PREFIXES: &[&str] = &[
"<recommended_plugins",
"<environment_context",
+ "<user_action",
"<user_instructions",
"<permissions",
"<workspace",
diff --git a/crates/wake-core/src/db.rs b/crates/wake-core/src/db.rs
index 4e3768b..5c696ee 100644
--- a/crates/wake-core/src/db.rs
+++ b/crates/wake-core/src/db.rs
@@ -630,7 +630,7 @@ impl Store {
let sql = format!(
"SELECT {SESSION_COLS} FROM sessions s LEFT JOIN user_data u ON u.session_key = s.key
{where_sql}
- ORDER BY COALESCE(u.pinned,0) DESC, {order_col} {order_dir} LIMIT ? OFFSET ?"
+ ORDER BY COALESCE(u.pinned,0) DESC, {order_col} {order_dir}, s.key ASC LIMIT ? OFFSET ?"
);
let mut stmt = conn.prepare_cached(&sql)?;
let limit = if f.limit > 0 { f.limit } else { 500 };
diff --git a/crates/wake-core/tests/adapter_contracts.rs b/crates/wake-core/tests/adapter_contracts.rs
index 3a6ed4f..9c1ef33 100644
--- a/crates/wake-core/tests/adapter_contracts.rs
+++ b/crates/wake-core/tests/adapter_contracts.rs
@@ -365,6 +365,13 @@ fn codex_subagent_ref() -> SessionFileRef {
"33333333-aaaa-bbbb-cccc-000000000003",
)
}
+fn codex_review_ref() -> SessionFileRef {
+ fs_ref(
+ AgentId::Codex,
+ &fixture("codex/sessions/2026/08/09/rollout-2026-08-09T10-30-00-44444444-aaaa-bbbb-cccc-000000000004.jsonl"),
+ "44444444-aaaa-bbbb-cccc-000000000004",
+ )
+}
fn qoder_ref() -> SessionFileRef {
fs_ref(
AgentId::Qoder,
@@ -557,6 +564,36 @@ fn codex_parse_contract() {
);
}
+#[test]
+fn codex_review_output_is_readable_and_not_duplicated() {
+ setup();
+ let adapter = CodexAdapter::new();
+ let r = codex_review_ref();
+ let transcript = adapter
+ .parse_transcript(&r)
+ .expect("codex review transcript");
+
+ assert_eq!(transcript.mainline.len(), 1);
+ let review = &transcript.mainline[0];
+ assert_eq!(review.role, Role::Assistant);
+ assert_eq!(review.kind, MessageKind::Text);
+ assert!(review.text.contains("## Code review"));
+ assert!(review.text.contains("Changes requested"));
+ assert!(review.text.contains("[P2] Keep the selected row"));
+ assert!(review.text.contains("workbench.rs:42–44"));
+ assert!(review.text.contains("98%"));
+ assert!(!review.text.contains("Fallback review text"));
+ assert!(!review.text.contains("\"findings\""));
+ assert!(!review.text.contains("<user_action>"));
+ assert_eq!(transcript.unknown_line_count, 0);
+
+ let session = adapter.parse_session(&r).expect("codex review session");
+ assert_eq!(session.meta.message_count, 1);
+ assert_eq!(session.meta.title, UNTITLED);
+ assert_eq!(session.units.len(), 1);
+ assert!(session.units[0].text.contains("Keep the selected row"));
+}
+
#[test]
fn qoder_parse_contract() {
setup();
diff --git a/crates/wake-core/tests/db_roundtrip.rs b/crates/wake-core/tests/db_roundtrip.rs
index ec87ce1..26b296a 100644
--- a/crates/wake-core/tests/db_roundtrip.rs
+++ b/crates/wake-core/tests/db_roundtrip.rs
@@ -165,6 +165,42 @@ fn list_sessions_filters_and_counts() {
assert_eq!(sessions[0].key, "codex:s5");
}
+#[test]
+fn list_sessions_pages_have_stable_tie_order() {
+ let (_dir, store) = temp_store();
+ for suffix in ["d", "a", "e", "b", "c"] {
+ let session = meta(&format!("claude-code:{suffix}"), suffix);
+ store
+ .write_session(&session, session.updated_at, &[])
+ .unwrap();
+ }
+
+ let mut filter = SessionFilter {
+ sort: SortKey::Updated,
+ ascending: false,
+ limit: 2,
+ ..Default::default()
+ };
+ let mut keys = Vec::new();
+ for offset in [0, 2, 4] {
+ filter.offset = offset;
+ let (page, total) = store.list_sessions(&filter).unwrap();
+ assert_eq!(total, 5);
+ keys.extend(page.into_iter().map(|session| session.key));
+ }
+
+ assert_eq!(
+ keys,
+ [
+ "claude-code:a",
+ "claude-code:b",
+ "claude-code:c",
+ "claude-code:d",
+ "claude-code:e",
+ ]
+ );
+}
+
#[test]
fn path_counts_respect_agent_and_boundary() {
// Session locations 面板的计数按数据根归属。两条真实风险:
diff --git a/crates/wake-core/tests/fixtures/codex/sessions/2026/08/09/rollout-2026-08-09T10-30-00-44444444-aaaa-bbbb-cccc-000000000004.jsonl b/crates/wake-core/tests/fixtures/codex/sessions/2026/08/09/rollout-2026-08-09T10-30-00-44444444-aaaa-bbbb-cccc-000000000004.jsonl
new file mode 100644
index 0000000..c35da97
--- /dev/null
+++ b/crates/wake-core/tests/fixtures/codex/sessions/2026/08/09/rollout-2026-08-09T10-30-00-44444444-aaaa-bbbb-cccc-000000000004.jsonl
@@ -0,0 +1,3 @@
+{"timestamp":"2026-08-09T10:30:00.000Z","type":"session_meta","payload":{"id":"44444444-aaaa-bbbb-cccc-000000000004","timestamp":"2026-08-09T10:30:00.000Z","cwd":"/Users/tester/Github/wakefx","originator":"codex_work_desktop"}}
+{"timestamp":"2026-08-09T10:30:01.000Z","type":"response_item","payload":{"type":"message","role":"user","content":[{"type":"input_text","text":"<user_action>\n<context>User initiated a review task.</context>\n<action>review</action>\n<results>Fallback review text that should be replaced by the structured result.</results>\n</user_action>"}]}}
+{"timestamp":"2026-08-09T10:30:01.010Z","type":"event_msg","payload":{"type":"item_completed","thread_id":"44444444-aaaa-bbbb-cccc-000000000004","turn_id":"turn-review","started_at_ms":1,"completed_at_ms":2,"item":{"type":"ExitedReviewMode","id":"review-1","review_output":{"findings":[{"title":"[P2] Keep the selected row","body":"Refreshing a paged list must restore selection by session key.","confidence_score":0.98,"priority":2,"code_location":{"absolute_file_path":"/Users/tester/Github/wakefx/src/workbench.rs","line_range":{"start":42,"end":44}}}],"overall_correctness":"patch is incorrect","overall_explanation":"The list can lose its selection after refresh.","overall_confidence_score":0.97}}}}
diff --git a/crates/wake/Cargo.toml b/crates/wake/Cargo.toml
index 98090a6..15e8cee 100644
--- a/crates/wake/Cargo.toml
+++ b/crates/wake/Cargo.toml
@@ -14,13 +14,19 @@ wake-core = { path = "../wake-core" }
anyhow.workspace = true
serde.workspace = true
serde_json.workspace = true
-gpui = "0.2"
-gpui-component = { version = "0.5", features = ["tree-sitter-languages"] }
+gpui = { git = "https://github.com/zed-industries/zed" }
+gpui_platform = { git = "https://github.com/zed-industries/zed", features = ["font-kit", "x11", "wayland", "runtime_shaders"] }
+gpui-component = { git = "https://github.com/longbridge/gpui-component", rev = "fd3bc2bbb8a2c4dfe268c1475682476ada54cd0c", features = ["tree-sitter-languages"] }
futures = "0.3"
chrono.workspace = true
dirs.workspace = true
semver.workspace = true
reqwest.workspace = true
+unicode-width = "0.2"
+unicode-segmentation = "1.13"
+
+[dev-dependencies]
+gpui = { git = "https://github.com/zed-industries/zed", features = ["test-support"] }
# exe 图标 + 版本资源(build.rs 里按 CARGO_CFG_TARGET_OS 判目标生效)。
# 不做 target 门控:build-dependencies 的 [target.*] 匹配语义在 host/target
diff --git a/crates/wake/src/format.rs b/crates/wake/src/format.rs
index 964ac2e..5aa94c9 100644
--- a/crates/wake/src/format.rs
+++ b/crates/wake/src/format.rs
@@ -1,4 +1,36 @@
use chrono::{DateTime, Datelike, Duration, Local, TimeZone};
+use unicode_segmentation::UnicodeSegmentation as _;
+use unicode_width::UnicodeWidthStr as _;
+
+/// 按终端显示单元宽度截断文本,并在确有截断时补一个省略号。
+///
+/// CJK 宽字符按 2 个单元计算,并以 Unicode 字素簇为不可拆分单位;这比按
+/// code point 范围猜测宽度准确,也不会切断 ZWJ/肤色修饰 Emoji。
+pub fn clip_display(s: &str, max_width: usize) -> String {
+ if s.width() <= max_width {
+ return s.to_string();
+ }
+
+ let ellipsis = "…";
+ let ellipsis_width = ellipsis.width();
+ if max_width < ellipsis_width {
+ return String::new();
+ }
+
+ let content_width = max_width - ellipsis_width;
+ let mut clipped = String::new();
+ let mut used = 0;
+ for grapheme in s.graphemes(true) {
+ let width = grapheme.width();
+ if used + width > content_width {
+ break;
+ }
+ clipped.push_str(grapheme);
+ used += width;
+ }
+ clipped.push_str(ellipsis);
+ clipped
+}
/// 会话时间的渐进式展示:越近越强调新鲜度,越远越强调日期锚点。
pub fn smart_time(ts: i64) -> String {
@@ -183,4 +215,31 @@ mod tests {
"Aug 21, 2025"
);
}
+
+ #[test]
+ fn clip_display_counts_cjk_and_latin_widths() {
+ assert_eq!(clip_display("Wake 会话", 9), "Wake 会话");
+ assert_eq!(clip_display("Wake 会话标题", 9), "Wake 会…");
+ assert_eq!(clip_display("超长会话标题", 7), "超长会…");
+ }
+
+ #[test]
+ fn clip_display_respects_zero_width_marks_and_tiny_limits() {
+ let combined = "e\u{301}clair";
+ assert_eq!(clip_display(combined, 4), "e\u{301}cl…");
+ assert_eq!(clip_display("abc", 1), "…");
+ assert_eq!(clip_display("abc", 0), "");
+ }
+
+ #[test]
+ fn clip_display_never_splits_emoji_grapheme_clusters() {
+ let family = "👩‍👩‍👧‍👦";
+ assert_eq!(
+ clip_display(&format!("{family}xy"), 3),
+ format!("{family}…")
+ );
+
+ let toned = "👍🏽";
+ assert_eq!(clip_display(&format!("{toned}xy"), 3), format!("{toned}…"));
+ }
}
diff --git a/crates/wake/src/main.rs b/crates/wake/src/main.rs
index 22b7c33..dc741d4 100644
--- a/crates/wake/src/main.rs
+++ b/crates/wake/src/main.rs
@@ -25,7 +25,7 @@ use workbench::{
actions!(wake_app, [Quit, CloseWindow]);
fn main() {
- let app = Application::new().with_assets(Assets);
+ let app = gpui_platform::application().with_assets(Assets);
app.run(move |cx: &mut App| {
gpui_component::init(cx);
gpui_component::set_locale("en");
@@ -61,6 +61,7 @@ fn main() {
Menu {
name: "Wake".into(),
items: wake_menu_items,
+ disabled: false,
},
Menu {
name: "File".into(),
@@ -69,6 +70,7 @@ fn main() {
MenuItem::separator(),
MenuItem::action("Close Window", CloseWindow),
],
+ disabled: false,
},
]);
@@ -121,7 +123,7 @@ fn main() {
theme::sync_appearance(Some(window), cx);
let workbench = cx.new(|cx| Workbench::new(window, cx));
- window.focus(&workbench.read(cx).focus_handle(cx));
+ window.focus(&workbench.read(cx).focus_handle(cx), cx);
cx.new(|cx| Root::new(workbench, window, cx))
},
);
diff --git a/crates/wake/src/settings.rs b/crates/wake/src/settings.rs
index 877f119..eba2e99 100644
--- a/crates/wake/src/settings.rs
+++ b/crates/wake/src/settings.rs
@@ -59,10 +59,11 @@ fn settings_button(button: Button, cx: &App) -> Button {
ButtonCustomVariant::new(cx)
.color(theme.secondary)
.foreground(theme.secondary_foreground)
- .border(theme.border)
.hover(theme.secondary_hover)
.active(theme.secondary_active),
)
+ .border_1()
+ .border_color(theme.border)
.small()
.rounded(RADIUS_BUTTON)
}
@@ -76,11 +77,12 @@ fn settings_primary_button(button: Button, cx: &App) -> Button {
ButtonCustomVariant::new(cx)
.color(theme.primary)
.foreground(theme.primary_foreground)
- .border(theme.primary)
.hover(theme.primary_hover)
.active(theme.primary_active)
.shadow(true),
)
+ .border_1()
+ .border_color(theme.primary)
.rounded(RADIUS_BUTTON)
}
@@ -241,7 +243,6 @@ impl SettingsView {
} else {
theme.muted_foreground
})
- .border(theme.transparent)
.hover(theme.secondary_hover)
.active(theme.popover),
)
diff --git a/crates/wake/src/theme.rs b/crates/wake/src/theme.rs
index 595e5b5..3668ee4 100644
--- a/crates/wake/src/theme.rs
+++ b/crates/wake/src/theme.rs
@@ -110,7 +110,7 @@ pub fn apply_wake_theme(cx: &mut App) {
theme.sidebar_primary = c(0x4C8DFF);
theme.sidebar_primary_foreground = c(0xFFFFFF);
- theme.list = c(0x20201F);
+ theme.colors.list = c(0x20201F);
theme.list_hover = c(0x2A2A28);
theme.list_active = c(0x303B4C);
theme.list_active_border = c(0x303B4C);
@@ -172,7 +172,7 @@ pub fn apply_wake_theme(cx: &mut App) {
theme.sidebar_primary = c(0x0A84FF);
theme.sidebar_primary_foreground = c(0xFFFFFF);
- theme.list = c(0xF7F7F5);
+ theme.colors.list = c(0xF7F7F5);
theme.list_hover = c(0xEDEDEA);
theme.list_active = c(0xE3EBF6);
theme.list_active_border = c(0xE3EBF6);
diff --git a/crates/wake/src/ui.rs b/crates/wake/src/ui.rs
index a0ef506..44f1716 100644
--- a/crates/wake/src/ui.rs
+++ b/crates/wake/src/ui.rs
@@ -143,6 +143,8 @@ pub const RADIUS_BUTTON: Pixels = px(6.);
pub const RADIUS_KBD: Pixels = px(5.);
/// 小胶囊 badge(项目名 / model / source / 各处计数共用)
pub const RADIUS_BADGE: Pixels = px(4.);
+/// 数据可视化小色块(热力图、分布柱、图例),统一保持方格读数感。
+pub const RADIUS_CELL: Pixels = px(2.);
// ---------------- 组件度量派生 ----------------
diff --git a/crates/wake/src/workbench.rs b/crates/wake/src/workbench.rs
index ce890f3..bf7dd0c 100644
--- a/crates/wake/src/workbench.rs
+++ b/crates/wake/src/workbench.rs
@@ -16,19 +16,25 @@
// ============================================================================
use std::cell::Cell;
use std::collections::{HashMap, HashSet};
+use std::ops::Range;
use std::path::PathBuf;
use std::rc::Rc;
-use std::sync::Arc;
+use std::sync::{
+ atomic::{AtomicU64, Ordering},
+ Arc,
+};
+use chrono::{Datelike as _, Local, NaiveDate, TimeZone as _};
use futures::StreamExt;
use gpui::prelude::FluentBuilder as _;
use gpui::*;
use gpui_component::button::{Button, ButtonCustomVariant, ButtonVariants as _};
+use gpui_component::highlighter::HighlightTheme;
use gpui_component::input::{Input, InputEvent, InputState};
use gpui_component::list::{List, ListDelegate, ListEvent, ListItem, ListState};
use gpui_component::menu::{DropdownMenu as _, PopupMenuItem};
use gpui_component::notification::Notification;
-use gpui_component::scroll::ScrollableElement as _;
+use gpui_component::scroll::{AutoScroll, ScrollableElement as _};
use gpui_component::spinner::Spinner;
use gpui_component::text::{TextView, TextViewStyle};
use gpui_component::{
@@ -40,13 +46,15 @@ use wake_core::adapters::{
adapter_for, create_adapter_roster_for, path_owns, AdapterLocation, AgentAdapter,
};
use wake_core::db::Store;
+use wake_core::models::Role as MessageRole;
use wake_core::models::*;
use wake_core::scanner::{run_scan, ScanEvents, ScanProgress};
use wake_core::services::{exporter, terminal};
use wake_core::watcher::{start_watcher, SessionWatcher};
use crate::format::{
- abs_date, expand_tilde, fmt_tokens, month_year, one_line, smart_time, thousands, tilde_path,
+ abs_date, clip_display, expand_tilde, fmt_tokens, month_year, one_line, smart_time, thousands,
+ tilde_path,
};
use crate::settings::{SettingsPage, SettingsView};
use crate::ui::*;
@@ -78,6 +86,14 @@ const WINDOW_TITLEBAR_HEIGHT: Pixels = px(44.);
const LIBRARY_IDENTITY_HEIGHT: Pixels = px(88.);
/// 侧栏底部常态工具栏内容高;加上父容器 1px 顶部分隔线,总高 44px。
const SIDEBAR_FOOTER_ROW_HEIGHT: Pixels = px(43.);
+/// 三栏固定结构宽度;工具摘要需要从窗口宽度反算真实可用空间。
+const SIDEBAR_WIDTH: Pixels = px(224.);
+const SESSION_STREAM_WIDTH: Pixels = px(336.);
+const READER_MAX_WIDTH: Pixels = px(720.);
+/// FONT_MSG_THINKING 使用等宽字体时,一个 ASCII 显示格的实测近似宽度。
+const TOOL_MONO_CELL_WIDTH: f32 = 6.9;
+/// Insights 主区块间距,明确落在 4px 网格上。
+const INSIGHTS_SECTION_GAP: Pixels = px(32.);
type SharedAdapters = Arc<Vec<Box<dyn AgentAdapter>>>;
type SharedLocations = Arc<Vec<AdapterLocation>>;
@@ -119,15 +135,243 @@ impl ScanEvents for ChannelEvents {
// ---------------- 会话列表 delegate ----------------
+/// 336px 会话流在 14px 系统字体下约容纳 42 个西文显示单元;CJK 字符由
+/// unicode-width 按两个单元计算。尾部每个状态图标再预留三个单元。
+const SESSION_TITLE_MAX_WIDTH: usize = 42;
+/// 会话流首批与后续每页的条数。列表组件会在距末尾 20 行时预取下一页。
+const SESSION_PAGE_SIZE: i64 = 100;
+static SESSION_PAGINATION_GENERATION: AtomicU64 = AtomicU64::new(1);
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+struct SessionGroup {
+ label: SharedString,
+ range: Range<usize>,
+}
+
+struct SessionPagination {
+ store: Arc<Store>,
+ filter: SessionFilter,
+ total: i64,
+ next_offset: i64,
+ generation: u64,
+ loading: bool,
+ failed: bool,
+}
+
+fn session_group_timestamp(session: &SessionMeta, sort: SortKey) -> i64 {
+ match sort {
+ SortKey::Created => session.created_at,
+ SortKey::Updated | SortKey::Messages => session.updated_at,
+ }
+}
+
+fn session_group_label(ts: i64, today: NaiveDate) -> SharedString {
+ let Some(date) = Local
+ .timestamp_millis_opt(ts)
+ .single()
+ .map(|dt| dt.date_naive())
+ else {
+ return "Undated".into();
+ };
+
+ if date >= today {
+ return "Today".into();
+ }
+ if date == today.pred_opt().unwrap_or(today) {
+ return "Yesterday".into();
+ }
+
+ let week_start =
+ today - chrono::Duration::days(i64::from(today.weekday().num_days_from_monday()));
+ if date >= week_start {
+ return "Earlier this week".into();
+ }
+ if date.year() == today.year() {
+ return date.format("%B").to_string().into();
+ }
+ date.format("%B %Y").to_string().into()
+}
+
+fn build_session_groups_at(
+ sessions: &[SessionMeta],
+ sort: SortKey,
+ ascending: bool,
+ today: NaiveDate,
+) -> Vec<SessionGroup> {
+ let time_descending = !ascending && matches!(sort, SortKey::Updated | SortKey::Created);
+ if sessions.is_empty() || !time_descending {
+ return vec![SessionGroup {
+ label: "".into(),
+ range: 0..sessions.len(),
+ }];
+ }
+
+ let mut groups = Vec::new();
+ let pinned_count = sessions.iter().take_while(|session| session.pinned).count();
+ if pinned_count > 0 {
+ groups.push(SessionGroup {
+ label: "Pinned".into(),
+ range: 0..pinned_count,
+ });
+ }
+
+ let mut start = pinned_count;
+ while start < sessions.len() {
+ let label = session_group_label(session_group_timestamp(&sessions[start], sort), today);
+ let mut end = start + 1;
+ while end < sessions.len()
+ && session_group_label(session_group_timestamp(&sessions[end], sort), today) == label
+ {
+ end += 1;
+ }
+ groups.push(SessionGroup {
+ label,
+ range: start..end,
+ });
+ start = end;
+ }
+ groups
+}
+
+fn same_session_query(left: &SessionFilter, right: &SessionFilter) -> bool {
+ left.agents == right.agents
+ && left.project_path == right.project_path
+ && left.favorite_only == right.favorite_only
+ && left.include_archived == right.include_archived
+ && left.title_query == right.title_query
+ && left.sort == right.sort
+ && left.ascending == right.ascending
+}
+
+fn session_matches_filter(session: &SessionMeta, filter: &SessionFilter) -> bool {
+ (filter.agents.is_empty() || filter.agents.contains(&session.agent))
+ && filter
+ .project_path
+ .as_ref()
+ .is_none_or(|project| project == &session.project_path)
+ && (!filter.favorite_only || session.favorite)
+ && (filter.include_archived || !session.archived)
+ && filter
+ .title_query
+ .as_deref()
+ .map(str::trim)
+ .filter(|query| !query.is_empty())
+ .is_none_or(|query| {
+ let query = query.to_lowercase();
+ session.title.to_lowercase().contains(&query)
+ || session.project_name.to_lowercase().contains(&query)
+ })
+}
+
pub struct SessionsDelegate {
pub sessions: Vec<SessionMeta>,
+ groups: Vec<SessionGroup>,
+ grouped_on: NaiveDate,
+ sort: SortKey,
+ ascending: bool,
+ pagination: Option<SessionPagination>,
+}
+
+impl SessionsDelegate {
+ fn new(sessions: Vec<SessionMeta>, sort: SortKey, ascending: bool) -> Self {
+ Self::new_at(sessions, sort, ascending, Local::now().date_naive())
+ }
+
+ fn new_at(
+ sessions: Vec<SessionMeta>,
+ sort: SortKey,
+ ascending: bool,
+ grouped_on: NaiveDate,
+ ) -> Self {
+ let groups = build_session_groups_at(&sessions, sort, ascending, grouped_on);
+ Self {
+ sessions,
+ groups,
+ grouped_on,
+ sort,
+ ascending,
+ pagination: None,
+ }
+ }
+
+ fn paged(
+ sessions: Vec<SessionMeta>,
+ filter: SessionFilter,
+ total: i64,
+ store: Arc<Store>,
+ ) -> Self {
+ let mut delegate = Self::new(sessions, filter.sort, filter.ascending);
+ delegate.pagination = Some(SessionPagination {
+ store,
+ total: total.max(0),
+ next_offset: i64::try_from(delegate.sessions.len()).unwrap_or(i64::MAX),
+ filter,
+ generation: SESSION_PAGINATION_GENERATION.fetch_add(1, Ordering::Relaxed),
+ loading: false,
+ failed: false,
+ });
+ delegate
+ }
+
+ fn rebuild_groups(&mut self) {
+ let today = Local::now().date_naive();
+ self.groups = build_session_groups_at(&self.sessions, self.sort, self.ascending, today);
+ self.grouped_on = today;
+ }
+
+ fn rebuild_groups_at(&mut self, today: NaiveDate) -> bool {
+ if self.grouped_on == today {
+ return false;
+ }
+ let groups = build_session_groups_at(&self.sessions, self.sort, self.ascending, today);
+ let changed = groups != self.groups;
+ self.groups = groups;
+ self.grouped_on = today;
+ changed
+ }
+
+ fn append_sessions(&mut self, page: Vec<SessionMeta>) {
+ let mut keys: HashSet<String> = self
+ .sessions
+ .iter()
+ .map(|session| session.key.clone())
+ .collect();
+ self.sessions.extend(
+ page.into_iter()
+ .filter(|session| keys.insert(session.key.clone())),
+ );
+ self.rebuild_groups();
+ }
+
+ /// 把组件发出的分组坐标还原为 `sessions` 的平铺下标。
+ fn flat_index(&self, ix: IndexPath) -> Option<usize> {
+ let group = self.groups.get(ix.section)?;
+ let flat = group.range.start.checked_add(ix.row)?;
+ (flat < group.range.end).then_some(flat)
+ }
+
+ /// 搜索跳转仍以 `sessions` 平铺下标定位;进入列表前转成分组坐标。
+ fn index_path(&self, flat: usize) -> Option<IndexPath> {
+ self.groups
+ .iter()
+ .enumerate()
+ .find(|(_, group)| group.range.contains(&flat))
+ .map(|(section, group)| IndexPath::new(flat - group.range.start).section(section))
+ }
}
impl ListDelegate for SessionsDelegate {
type Item = ListItem;
- fn items_count(&self, _section: usize, _cx: &App) -> usize {
- self.sessions.len()
+ fn sections_count(&self, _cx: &App) -> usize {
+ self.groups.len()
+ }
+
+ fn items_count(&self, section: usize, _cx: &App) -> usize {
+ self.groups
+ .get(section)
+ .map(|group| group.range.len())
+ .unwrap_or_default()
}
fn render_item(
@@ -136,82 +380,178 @@ impl ListDelegate for SessionsDelegate {
_window: &mut Window,
cx: &mut Context<ListState<Self>>,
) -> Option<Self::Item> {
- let s = self.sessions.get(ix.row)?;
+ let flat_ix = self.flat_index(ix)?;
+ let s = self.sessions.get(flat_ix)?;
let theme = cx.theme();
- let updated_time: SharedString = smart_time(s.updated_at).into();
- let updated_tooltip: SharedString = abs_date(s.updated_at).into();
+ let shown_ts = session_group_timestamp(s, self.sort);
+ let shown_time: SharedString = smart_time(shown_ts).into();
+ let shown_tooltip: SharedString = abs_date(shown_ts).into();
+ let title_tooltip: SharedString = s.title.clone().into();
+ let icon_width = 3 * (usize::from(s.pinned) + usize::from(s.favorite));
+ let title: SharedString =
+ clip_display(&s.title, SESSION_TITLE_MAX_WIDTH.saturating_sub(icon_width)).into();
Some(
- ListItem::new(ix.row)
- .rounded(theme.radius)
- .mx(SPACE_SM)
- .child(
- v_flex()
- .w_full()
- .px(SPACE_XS)
- .py(SPACE_SM)
- .gap(SPACE_XS)
- .child(
- h_flex()
- .gap(px(6.))
- .child(
- div()
- .flex_1()
- .min_w_0()
- .text_size(FONT_BODY)
- .font_medium()
- .text_color(theme.foreground)
- .truncate()
- .child(s.title.clone()),
+ ListItem::new(ix).rounded(theme.radius).mx(SPACE_SM).child(
+ v_flex()
+ .w_full()
+ .px(SPACE_XS)
+ .py(SPACE_SM)
+ .gap(SPACE_XS)
+ .child(
+ h_flex()
+ .gap(px(6.))
+ .child(
+ div()
+ .id(("session-title", flat_ix))
+ .flex_1()
+ .min_w_0()
+ .overflow_hidden()
+ .whitespace_nowrap()
+ .text_size(FONT_BODY)
+ .font_medium()
+ .text_color(theme.foreground)
+ .child(title)
+ .tooltip(move |window, cx| {
+ gpui_component::tooltip::Tooltip::new(title_tooltip.clone())
+ .build(window, cx)
+ }),
+ )
+ .when(s.pinned, |this| {
+ this.child(
+ icon("icons/pin-filled.svg")
+ .with_size(px(11.))
+ .text_color(theme.primary),
)
- .when(s.pinned, |this| {
- this.child(
- icon("icons/pin-filled.svg")
- .with_size(px(11.))
- .text_color(theme.primary),
- )
- })
- .when(s.favorite, |this| {
- this.child(
- icon("icons/star-filled.svg")
- .with_size(px(11.))
- .text_color(rgb(crate::theme::STAR_YELLOW)),
- )
- }),
- )
- .child(
- h_flex()
- .gap(px(6.))
- .text_size(FONT_LABEL)
- .text_color(theme.muted_foreground)
- .child(
- img(s.agent.brand_icon(theme.mode.is_dark()))
- .size(px(15.))
- .flex_shrink_0(),
+ })
+ .when(s.favorite, |this| {
+ this.child(
+ icon("icons/star-filled.svg")
+ .with_size(px(11.))
+ .text_color(rgb(crate::theme::STAR_YELLOW)),
)
- .child(badge(
- s.project_name.clone(),
- theme.muted,
- theme.muted_foreground,
- ))
- .child(div().flex_1())
- .child(
- div()
- .id(("session-updated-time", ix.row))
- .flex_shrink_0()
- .child(updated_time)
- .tooltip(move |window, cx| {
- gpui_component::tooltip::Tooltip::new(
- updated_tooltip.clone(),
- )
+ }),
+ )
+ .child(
+ h_flex()
+ .gap(px(6.))
+ .text_size(FONT_LABEL)
+ .text_color(theme.muted_foreground)
+ .child(
+ img(s.agent.brand_icon(theme.mode.is_dark()))
+ .size(px(15.))
+ .flex_shrink_0(),
+ )
+ .child(badge(
+ s.project_name.clone(),
+ theme.muted,
+ theme.muted_foreground,
+ ))
+ .child(div().flex_1())
+ .child(
+ div()
+ .id(("session-time", flat_ix))
+ .flex_shrink_0()
+ .child(shown_time)
+ .tooltip(move |window, cx| {
+ gpui_component::tooltip::Tooltip::new(shown_tooltip.clone())
.build(window, cx)
- }),
- ),
- ),
- ),
+ }),
+ ),
+ ),
+ ),
)
}
+ fn render_section_header(
+ &mut self,
+ section: usize,
+ _window: &mut Window,
+ cx: &mut Context<ListState<Self>>,
+ ) -> Option<impl IntoElement> {
+ let label = self.groups.get(section)?.label.clone();
+ if label.is_empty() {
+ return None;
+ }
+ let theme = cx.theme();
+
+ Some(
+ h_flex()
+ .h(px(32.))
+ .w_full()
+ .items_center()
+ .gap(SPACE_SM)
+ .px(SPACE_MD)
+ .pt(SPACE_XS)
+ .text_size(FONT_LABEL)
+ .font_medium()
+ .text_color(theme.muted_foreground)
+ .child(div().flex_shrink_0().child(label))
+ .child(div().h(px(1.)).flex_1().bg(theme.border.opacity(0.72))),
+ )
+ }
+
+ // 还有下一页时返回 true。失败后停住,等待用户刷新重建 delegate,
+ // 避免触底重试风暴。
+ fn has_more(&self, _cx: &App) -> bool {
+ self.pagination
+ .as_ref()
+ .is_some_and(|page| !page.loading && !page.failed && page.next_offset < page.total)
+ }
+
+ fn load_more(&mut self, window: &mut Window, cx: &mut Context<ListState<Self>>) {
+ let Some(page) = self.pagination.as_mut() else {
+ return;
+ };
+ if page.loading || page.failed || page.next_offset >= page.total {
+ return;
+ }
+
+ page.loading = true;
+ let generation = page.generation;
+ let query_offset = page.next_offset;
+ let store = page.store.clone();
+ let mut filter = page.filter.clone();
+ filter.limit = SESSION_PAGE_SIZE;
+ filter.offset = query_offset;
+
+ let query = cx.background_spawn(async move { store.list_sessions(&filter) });
+ cx.spawn_in(window, async move |this, cx| {
+ let result = query.await;
+ this.update(cx, |state, cx| {
+ let delegate = state.delegate_mut();
+ let Some(current) = delegate.pagination.as_mut() else {
+ return;
+ };
+ if current.generation != generation {
+ return;
+ }
+ current.loading = false;
+
+ match result {
+ Ok((sessions, total)) => {
+ let received = i64::try_from(sessions.len()).unwrap_or(i64::MAX);
+ current.total = total.max(0);
+ let next_offset = if received == 0 {
+ current.total
+ } else {
+ query_offset.saturating_add(received).min(current.total)
+ };
+ // 搜索定位可能同时批量翻过更多页,较晚完成的单页请求
+ // 不能把它已经推进的 offset 倒退。
+ current.next_offset =
+ current.next_offset.max(next_offset).min(current.total);
+ delegate.append_sessions(sessions);
+ }
+ Err(_) => current.failed = true,
+ }
+ cx.notify();
+ })
+ .ok();
+ })
+ .detach();
+ }
+
// 点击/回车走 ListEvent::Confirm(ix),无需自存选中态
fn set_selected_index(
&mut self,
@@ -222,6 +562,319 @@ impl ListDelegate for SessionsDelegate {
}
}
+#[cfg(test)]
+mod session_group_tests {
+ use std::collections::HashSet;
+ use std::path::PathBuf;
+
+ use chrono::{Local, NaiveDate, TimeZone as _};
+ use gpui_component::IndexPath;
+ use wake_core::adapters::AgentAdapter;
+ use wake_core::models::{
+ AgentId, ParsedSession, ParsedTranscript, SessionFileRef, SessionFilter, SessionMeta,
+ SortKey, ToolCallView,
+ };
+
+ use super::{
+ build_session_groups_at, clip_tool_text, load_visible_transcript, non_blank_tool_text,
+ same_session_query, session_group_label, session_matches_filter, toggle_expanded_row,
+ tool_cluster_heading, visible_git_branch, SessionsDelegate, SESSION_PAGE_SIZE,
+ };
+
+ struct FailingAdapter;
+
+ impl AgentAdapter for FailingAdapter {
+ fn agent(&self) -> AgentId {
+ AgentId::Codex
+ }
+
+ fn list_session_files(&self) -> anyhow::Result<Vec<SessionFileRef>> {
+ Ok(Vec::new())
+ }
+
+ fn parse_session(&self, _r: &SessionFileRef) -> anyhow::Result<ParsedSession> {
+ Err(anyhow::anyhow!("unused session parser"))
+ }
+
+ fn parse_transcript(&self, _r: &SessionFileRef) -> anyhow::Result<ParsedTranscript> {
+ Err(anyhow::anyhow!("broken transcript fixture"))
+ }
+
+ fn data_roots(&self) -> Vec<PathBuf> {
+ vec![PathBuf::from("/tmp/wake-test")]
+ }
+
+ fn with_custom_root(&self, _dir: PathBuf) -> Box<dyn AgentAdapter> {
+ Box::new(FailingAdapter)
+ }
+ }
+
+ fn local_ms(year: i32, month: u32, day: u32) -> i64 {
+ Local
+ .with_ymd_and_hms(year, month, day, 12, 0, 0)
+ .single()
+ .expect("test date should be unambiguous in the local timezone")
+ .timestamp_millis()
+ }
+
+ fn session(key: &str, updated_at: i64, pinned: bool) -> SessionMeta {
+ SessionMeta {
+ key: key.to_string(),
+ id: key.to_string(),
+ agent: AgentId::Codex,
+ title: key.to_string(),
+ project_path: "/tmp/wake-test".to_string(),
+ project_name: "wake-test".to_string(),
+ file_path: "/tmp/wake-test/session.jsonl".to_string(),
+ created_at: updated_at,
+ updated_at,
+ message_count: 1,
+ size_bytes: 1,
+ git_branch: None,
+ model: None,
+ tokens_used: None,
+ archived: false,
+ source: None,
+ favorite: false,
+ pinned,
+ }
+ }
+
+ fn tool_call(name: &str, input_preview: &str) -> ToolCallView {
+ ToolCallView {
+ id: name.to_string(),
+ name: name.to_string(),
+ input_preview: input_preview.to_string(),
+ input: Some(input_preview.to_string()),
+ output: None,
+ is_error: false,
+ sidechain_ref: None,
+ }
+ }
+
+ #[test]
+ fn date_labels_respect_calendar_week_boundaries() {
+ let wednesday = NaiveDate::from_ymd_opt(2026, 9, 2).unwrap();
+ assert_eq!(
+ session_group_label(local_ms(2026, 9, 1), wednesday),
+ "Yesterday"
+ );
+ assert_eq!(
+ session_group_label(local_ms(2026, 8, 31), wednesday),
+ "Earlier this week"
+ );
+ assert_eq!(
+ session_group_label(local_ms(2026, 8, 30), wednesday),
+ "August"
+ );
+
+ let monday = NaiveDate::from_ymd_opt(2026, 9, 7).unwrap();
+ assert_eq!(
+ session_group_label(local_ms(2026, 9, 6), monday),
+ "Yesterday"
+ );
+ assert_eq!(
+ session_group_label(local_ms(2026, 9, 5), monday),
+ "September"
+ );
+ }
+
+ #[test]
+ fn time_descending_groups_pinned_and_calendar_ranges() {
+ let sessions = vec![
+ session("pinned", local_ms(2025, 1, 1), true),
+ session("today", local_ms(2026, 9, 2), false),
+ session("yesterday", local_ms(2026, 9, 1), false),
+ session("week", local_ms(2026, 8, 31), false),
+ session("month", local_ms(2026, 8, 30), false),
+ ];
+ let groups = build_session_groups_at(
+ &sessions,
+ SortKey::Updated,
+ false,
+ NaiveDate::from_ymd_opt(2026, 9, 2).unwrap(),
+ );
+
+ let labels: Vec<&str> = groups.iter().map(|group| group.label.as_ref()).collect();
+ assert_eq!(
+ labels,
+ [
+ "Pinned",
+ "Today",
+ "Yesterday",
+ "Earlier this week",
+ "August"
+ ]
+ );
+ assert_eq!(groups[0].range, 0..1);
+ assert_eq!(groups[3].range, 3..4);
+
+ let delegate = SessionsDelegate {
+ sessions,
+ groups,
+ grouped_on: NaiveDate::from_ymd_opt(2026, 9, 2).unwrap(),
+ sort: SortKey::Updated,
+ ascending: false,
+ pagination: None,
+ };
+ assert_eq!(delegate.flat_index(IndexPath::new(0).section(3)), Some(3));
+ assert_eq!(delegate.index_path(4), Some(IndexPath::new(0).section(4)));
+ }
+
+ #[test]
+ fn non_time_descending_sorts_stay_flat() {
+ let sessions = vec![
+ session("one", local_ms(2026, 9, 2), false),
+ session("two", local_ms(2026, 9, 1), false),
+ ];
+ for (sort, ascending) in [(SortKey::Messages, false), (SortKey::Updated, true)] {
+ let groups = build_session_groups_at(
+ &sessions,
+ sort,
+ ascending,
+ NaiveDate::from_ymd_opt(2026, 9, 2).unwrap(),
+ );
+ assert_eq!(groups.len(), 1);
+ assert!(groups[0].label.is_empty());
+ assert_eq!(groups[0].range, 0..2);
+ }
+ }
+
+ #[test]
+ fn appended_pages_deduplicate_and_rebuild_flat_indexes() {
+ let one = session("one", local_ms(2026, 9, 2), false);
+ let duplicate = one.clone();
+ let two = session("two", local_ms(2026, 9, 1), false);
+ let mut delegate = SessionsDelegate::new(vec![one], SortKey::Messages, false);
+
+ delegate.append_sessions(vec![duplicate, two]);
+
+ assert_eq!(delegate.sessions.len(), 2);
+ assert_eq!(delegate.sessions[0].key, "one");
+ assert_eq!(delegate.sessions[1].key, "two");
+ assert_eq!(delegate.groups[0].range, 0..2);
+ assert_eq!(delegate.index_path(1), Some(IndexPath::new(1)));
+ }
+
+ #[test]
+ fn date_change_rebuilds_groups_and_stable_indexes() {
+ let september_second = NaiveDate::from_ymd_opt(2026, 9, 2).unwrap();
+ let september_third = NaiveDate::from_ymd_opt(2026, 9, 3).unwrap();
+ let sessions = vec![
+ session("recent", local_ms(2026, 9, 2), false),
+ session("older", local_ms(2026, 9, 1), false),
+ ];
+ let mut delegate =
+ SessionsDelegate::new_at(sessions, SortKey::Updated, false, september_second);
+
+ assert_eq!(delegate.groups[0].label.as_ref(), "Today");
+ assert!(delegate.rebuild_groups_at(september_third));
+ assert_eq!(delegate.groups[0].label.as_ref(), "Yesterday");
+ assert_eq!(delegate.groups[1].label.as_ref(), "Earlier this week");
+ assert_eq!(delegate.index_path(1), Some(IndexPath::new(0).section(1)));
+ assert!(!delegate.rebuild_groups_at(september_third));
+ }
+
+ #[test]
+ fn refresh_query_comparison_ignores_only_page_extent() {
+ let mut current = SessionFilter {
+ limit: SESSION_PAGE_SIZE,
+ ..Default::default()
+ };
+ let mut reloaded = current.clone();
+ reloaded.limit = SESSION_PAGE_SIZE * 3;
+ reloaded.offset = SESSION_PAGE_SIZE * 2;
+ assert!(same_session_query(&current, &reloaded));
+
+ current.favorite_only = true;
+ assert!(!same_session_query(&current, &reloaded));
+ }
+
+ #[test]
+ fn archived_search_hits_are_not_visible_in_active_list() {
+ let mut archived = session("archived", local_ms(2026, 9, 2), false);
+ archived.archived = true;
+ let active_filter = SessionFilter::default();
+ assert!(!session_matches_filter(&archived, &active_filter));
+
+ let archived_filter = SessionFilter {
+ include_archived: true,
+ ..Default::default()
+ };
+ assert!(session_matches_filter(&archived, &archived_filter));
+ }
+
+ #[test]
+ fn meaningless_git_branches_are_hidden() {
+ assert_eq!(visible_git_branch(None), None);
+ assert_eq!(visible_git_branch(Some("")), None);
+ assert_eq!(visible_git_branch(Some(" HEAD ")), None);
+ assert_eq!(visible_git_branch(Some("detached")), None);
+ assert_eq!(visible_git_branch(Some("(detached HEAD)")), None);
+ assert_eq!(
+ visible_git_branch(Some("feature/session-detail")),
+ Some("feature/session-detail")
+ );
+ }
+
+ #[test]
+ fn detail_load_reports_missing_adapter_and_parse_reason() {
+ let meta = session("broken", local_ms(2026, 9, 2), false);
+
+ let missing = load_visible_transcript(&[], &meta).expect_err("adapter should be missing");
+ assert!(missing.contains("No Codex adapter"));
+
+ let adapters: Vec<Box<dyn AgentAdapter>> = vec![Box::new(FailingAdapter)];
+ let parse_error = load_visible_transcript(&adapters, &meta)
+ .expect_err("fixture transcript should fail to parse");
+ assert!(parse_error.contains("broken transcript fixture"));
+ }
+
+ #[test]
+ fn thinking_and_tools_keep_independent_expansion_state() {
+ let mut thinking = HashSet::new();
+ let mut tools = HashSet::new();
+
+ toggle_expanded_row(&mut thinking, 4);
+ assert!(thinking.contains(&4));
+ assert!(!tools.contains(&4));
+
+ toggle_expanded_row(&mut tools, 4);
+ assert!(thinking.contains(&4));
+ assert!(tools.contains(&4));
+
+ toggle_expanded_row(&mut thinking, 4);
+ assert!(!thinking.contains(&4));
+ assert!(tools.contains(&4));
+ }
+
+ #[test]
+ fn tool_summaries_use_unicode_width_and_long_sections_are_marked() {
+ let calls = vec![tool_call("Bash", "搜索中文项目路径")];
+ let (name, argument) = tool_cluster_heading(&calls, 8);
+ assert_eq!(name.as_ref(), "Bash");
+ assert_eq!(
+ argument.as_ref().map(|value| value.as_ref()),
+ Some("搜索中…")
+ );
+
+ let (shown, truncated) = clip_tool_text("abcdef", 3);
+ assert_eq!(shown, "abc…");
+ assert!(truncated);
+
+ let (shown, truncated) = clip_tool_text("abc", 3);
+ assert_eq!(shown, "abc");
+ assert!(!truncated);
+ }
+
+ #[test]
+ fn tool_copy_source_preserves_edge_whitespace() {
+ let original = "\n result \n";
+ assert_eq!(non_blank_tool_text(original), Some(original));
+ assert_eq!(non_blank_tool_text(" \n\t "), None);
+ }
+}
+
// ---------------- 搜索面板 delegate ----------------
pub struct SearchDelegate {
@@ -410,19 +1063,282 @@ impl ListDelegate for SearchDelegate {
// ---------------- 详情状态 ----------------
+fn visible_git_branch(branch: Option<&str>) -> Option<&str> {
+ let branch = branch?.trim();
+ let normalized = branch.trim_matches(['(', ')']).trim();
+ (!normalized.is_empty()
+ && !normalized.eq_ignore_ascii_case("head")
+ && !normalized.eq_ignore_ascii_case("detached")
+ && !normalized.eq_ignore_ascii_case("detached head"))
+ .then_some(branch)
+}
+
+fn load_visible_transcript(
+ adapters: &[Box<dyn AgentAdapter>],
+ meta: &SessionMeta,
+) -> Result<Vec<TranscriptMessage>, String> {
+ // adapter_for 按文件路径挑实例:自定义 location 的会话必须由拥有其根的
+ // 实例解析;完全找不到对应 agent 时保留可读错误,不再静默变成空详情。
+ let adapter = adapter_for(adapters, meta.agent, &meta.file_path).ok_or_else(|| {
+ format!(
+ "No {} adapter is available for this session path.",
+ meta.agent.display_name()
+ )
+ })?;
+ let session_ref = SessionFileRef::from_meta(meta);
+ let transcript = adapter.parse_transcript(&session_ref).map_err(|error| {
+ format!(
+ "Failed to parse {} session data: {error:#}",
+ meta.agent.display_name()
+ )
+ })?;
+
+ Ok(transcript
+ .mainline
+ .into_iter()
+ .filter(|message| {
+ message.kind != MessageKind::Meta
+ && (!message.text.trim().is_empty()
+ || !message.tool_calls.is_empty()
+ || message.thinking.is_some()
+ || message.kind == MessageKind::CompactSummary)
+ })
+ .collect())
+}
+
+fn toggle_expanded_row(rows: &mut HashSet<usize>, ix: usize) {
+ if !rows.insert(ix) {
+ rows.remove(&ix);
+ }
+}
+
struct DetailState {
meta: SessionMeta,
/// 过滤后的可见消息。Rc 让行渲染以引用计数克隆代替整条消息深拷贝
transcript: Rc<Vec<TranscriptMessage>>,
loading: bool,
+ /// 详情解析的具体失败原因;None 表示加载中或成功。
+ error: Option<SharedString>,
/// 逐消息不等高列表(gpui 原生 ListState,惰性测量)
msg_list: gpui::ListState,
- /// 展开的工具簇/thinking(按消息在 transcript 里的下标)
- expanded_rows: HashSet<usize>,
+ /// 展开的工具簇(按消息在 transcript 里的下标)
+ expanded_tools: HashSet<usize>,
+ /// 展开的 Thinking。与工具簇分开存,避免其中一个把另一个一起展开。
+ expanded_thinking: HashSet<usize>,
/// 搜索跳转目标(FTS seq,契约=消息 seq);解析完成后滚到该消息并保持高亮
jump_seq: Option<i64>,
}
+#[cfg(test)]
+mod detail_selection_tests {
+ use std::time::Duration;
+
+ use gpui::{
+ div, list, point, px, AppContext as _, Context, Element as _, InteractiveElement as _,
+ IntoElement, ListAlignment, ListState, Modifiers, MouseButton, MouseMoveEvent,
+ ParentElement as _, Render, Styled as _, TestAppContext, VisualTestContext, Window,
+ };
+ use gpui_component::{scroll::AutoScroll, text::TextView, Root, WindowExt as _};
+
+ struct VirtualMessageList {
+ list: ListState,
+ }
+
+ struct AutoScrollingVirtualMessageList {
+ list: ListState,
+ auto_scroll: AutoScroll,
+ }
+
+ impl Render for VirtualMessageList {
+ fn render(&mut self, _: &mut Window, _: &mut Context<Self>) -> impl IntoElement {
+ list(self.list.clone(), |ix, _, _| {
+ let text = if ix == 0 {
+ "First message"
+ } else {
+ "Second message"
+ };
+ div()
+ .h(px(60.))
+ .w_full()
+ .child(TextView::markdown(("selection-message", ix), text).selectable(true))
+ .into_any()
+ })
+ .size_full()
+ }
+ }
+
+ impl Render for AutoScrollingVirtualMessageList {
+ #[allow(deprecated)]
+ fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+ let list_state = self.list.clone();
+ div()
+ .size_full()
+ .on_mouse_move(cx.listener(|this, event: &MouseMoveEvent, window, cx| {
+ let bounds = this.list.viewport_bounds();
+ let delta = (event.dragging() && window.has_text_selection(cx))
+ .then(|| AutoScroll::compute_delta(event.position.y, bounds))
+ .flatten();
+ this.auto_scroll.set(delta, cx, |delta, this, cx| {
+ this.list.scroll_by(delta);
+ cx.notify();
+ });
+ }))
+ .on_mouse_up(
+ MouseButton::Left,
+ cx.listener(|this, _, _, _| this.auto_scroll.stop()),
+ )
+ .child(
+ list(list_state, |ix, _, _| {
+ div()
+ .h(px(60.))
+ .w_full()
+ .child(
+ TextView::markdown(
+ ("auto-scroll-selection-message", ix),
+ format!("Message {ix}"),
+ )
+ .selectable(true),
+ )
+ .into_any()
+ })
+ .size_full(),
+ )
+ }
+ }
+
+ #[gpui::test]
+ #[allow(deprecated)]
+ fn window_selection_spans_text_views_inside_gpui_list(cx: &mut TestAppContext) {
+ cx.update(gpui_component::init);
+ let (_, cx) = cx.add_window_view(|window, cx| {
+ let view = cx.new(|_| VirtualMessageList {
+ list: ListState::new(2, ListAlignment::Top, px(60.)),
+ });
+ Root::new(view, window, cx)
+ });
+ let cx: &mut VisualTestContext = cx;
+ cx.run_until_parked();
+ cx.update(|window, cx| {
+ let _ = window.draw(cx);
+ });
+
+ cx.simulate_mouse_down(
+ point(px(1.), px(15.)),
+ MouseButton::Left,
+ Modifiers::default(),
+ );
+ cx.simulate_mouse_move(
+ point(px(300.), px(75.)),
+ Some(MouseButton::Left),
+ Modifiers::default(),
+ );
+ cx.simulate_mouse_up(
+ point(px(300.), px(75.)),
+ MouseButton::Left,
+ Modifiers::default(),
+ );
+ cx.update(|window, cx| {
+ let _ = window.draw(cx);
+ });
+
+ let selected = cx.update(|window, cx| window.selected_text(cx));
+ assert!(selected.contains("First message"), "got {selected:?}");
+ assert!(selected.contains("Second message"), "got {selected:?}");
+ }
+
+ #[gpui::test]
+ #[allow(deprecated)]
+ fn shift_click_extends_across_messages_inside_gpui_list(cx: &mut TestAppContext) {
+ cx.update(gpui_component::init);
+ let (_, cx) = cx.add_window_view(|window, cx| {
+ let view = cx.new(|_| VirtualMessageList {
+ list: ListState::new(2, ListAlignment::Top, px(60.)),
+ });
+ Root::new(view, window, cx)
+ });
+ let cx: &mut VisualTestContext = cx;
+ cx.run_until_parked();
+ cx.update(|window, cx| {
+ let _ = window.draw(cx);
+ });
+
+ cx.simulate_mouse_down(
+ point(px(1.), px(15.)),
+ MouseButton::Left,
+ Modifiers::default(),
+ );
+ cx.simulate_mouse_up(
+ point(px(1.), px(15.)),
+ MouseButton::Left,
+ Modifiers::default(),
+ );
+ let shift = Modifiers {
+ shift: true,
+ ..Modifiers::default()
+ };
+ cx.simulate_mouse_down(point(px(300.), px(75.)), MouseButton::Left, shift);
+ cx.simulate_mouse_up(point(px(300.), px(75.)), MouseButton::Left, shift);
+ cx.update(|window, cx| {
+ let _ = window.draw(cx);
+ });
+
+ let selected = cx.update(|window, cx| window.selected_text(cx));
+ assert!(selected.contains("First message"), "got {selected:?}");
+ assert!(selected.contains("Second message"), "got {selected:?}");
+ }
+
+ #[gpui::test]
+ fn dragging_selection_at_viewport_edge_auto_scrolls_gpui_list(cx: &mut TestAppContext) {
+ cx.update(gpui_component::init);
+ let (root, cx) = cx.add_window_view(|window, cx| {
+ let view = cx.new(|_| AutoScrollingVirtualMessageList {
+ list: ListState::new(100, ListAlignment::Top, px(60.)),
+ auto_scroll: AutoScroll::default(),
+ });
+ Root::new(view, window, cx)
+ });
+ let view = root.read_with(cx, |root, _| {
+ root.view()
+ .clone()
+ .downcast::<AutoScrollingVirtualMessageList>()
+ .unwrap()
+ });
+ let cx: &mut VisualTestContext = cx;
+ cx.run_until_parked();
+ cx.update(|window, cx| {
+ let _ = window.draw(cx);
+ });
+ let bounds = view.read_with(cx, |view, _| view.list.viewport_bounds());
+ let x = bounds.left() + px(10.);
+ let anchor = point(x, bounds.top() + px(15.));
+
+ cx.simulate_mouse_down(anchor, MouseButton::Left, Modifiers::default());
+ cx.simulate_mouse_move(
+ point(x, bounds.bottom() - px(20.)),
+ Some(MouseButton::Left),
+ Modifiers::default(),
+ );
+ cx.simulate_mouse_move(
+ point(x, bounds.bottom() - px(1.)),
+ Some(MouseButton::Left),
+ Modifiers::default(),
+ );
+ assert!(view.read_with(cx, |view, _| view.auto_scroll.is_active()));
+
+ cx.executor().advance_clock(Duration::from_millis(32));
+ cx.run_until_parked();
+ let scroll_top = view.read_with(cx, |view, _| view.list.logical_scroll_top());
+ assert!(scroll_top.item_ix > 0 || scroll_top.offset_in_item > px(0.));
+
+ cx.simulate_mouse_up(
+ point(x, bounds.bottom() - px(1.)),
+ MouseButton::Left,
+ Modifiers::default(),
+ );
+ assert!(!view.read_with(cx, |view, _| view.auto_scroll.is_active()));
+ }
+}
+
// ---------------- Workbench ----------------
pub struct Workbench {
@@ -468,7 +1384,16 @@ pub struct Workbench {
palette_input: Entity<InputState>,
/// 进行中的搜索任务;新输入覆盖旧值即取消过期搜索
_palette_search_task: Option<Task<()>>,
-
+ /// 搜索命中不在首批会话时,按页补齐到命中项;新搜索覆盖旧任务。
+ _list_seek_task: Option<Task<()>>,
+ /// delegate 刷新或日期分组变化后,旧 IndexPath 已失效;下一帧按稳定 key
+ /// 恢复选择,必要时继续分页找到目标。
+ pending_list_selection: Option<String>,
+ /// 每分钟触发一次轻量重绘,让跨午夜的 Today/Yesterday 分组自动换日。
+ _calendar_task: Option<Task<()>>,
+
+ /// 文本拖选靠近详情视口边缘时,持续推动外层消息列表。
+ detail_selection_auto_scroll: AutoScroll,
detail: Option<DetailState>,
/// Insights 页(侧栏底部入口):打开时替换中栏+右栏。与其他导航目的地
@@ -674,9 +1599,7 @@ impl Workbench {
let list_state = cx.new(|cx| {
ListState::new(
- SessionsDelegate {
- sessions: Vec::new(),
- },
+ SessionsDelegate::new(Vec::new(), SortKey::Updated, false),
window,
cx,
)
@@ -764,6 +1687,10 @@ impl Workbench {
palette_list,
palette_input,
_palette_search_task: None,
+ _list_seek_task: None,
+ pending_list_selection: None,
+ _calendar_task: None,
+ detail_selection_auto_scroll: AutoScroll::default(),
detail: None,
insights_open: false,
insights: None,
@@ -778,6 +1705,14 @@ impl Workbench {
_subs: subs,
};
this.refresh(cx);
+ this._calendar_task = Some(cx.spawn(async move |this, cx| loop {
+ cx.background_executor()
+ .timer(std::time::Duration::from_secs(60))
+ .await;
+ if this.update(cx, |_, cx| cx.notify()).is_err() {
+ break;
+ }
+ }));
// 索引重建过就告诉用户一声——收藏/置顶没了,总得让人知道为什么。
// defer 到下一帧:此刻 Root 还没建好,notification 层挂不上
@@ -818,19 +1753,47 @@ impl Workbench {
title_query: None,
sort: self.sort_key,
ascending: self.sort_ascending,
- limit: 500,
+ limit: SESSION_PAGE_SIZE,
offset: 0,
}
}
+ fn selected_list_key(&self, cx: &App) -> Option<String> {
+ let list = self.list_state.read(cx);
+ let delegate = list.delegate();
+ list.selected_index()
+ .and_then(|path| delegate.flat_index(path))
+ .and_then(|flat| delegate.sessions.get(flat))
+ .map(|session| session.key.clone())
+ }
+
fn refresh(&mut self, cx: &mut Context<Self>) {
- let filter = self.current_filter();
+ let mut filter = self.current_filter();
+ let selected_key = self
+ .pending_list_selection
+ .clone()
+ .or_else(|| self.selected_list_key(cx));
+ let previously_loaded = {
+ let list = self.list_state.read(cx);
+ let delegate = list.delegate();
+ delegate
+ .pagination
+ .as_ref()
+ .filter(|page| same_session_query(&page.filter, &filter))
+ .map(|_| delegate.sessions.len())
+ .unwrap_or_default()
+ };
+ if previously_loaded > SESSION_PAGE_SIZE as usize {
+ filter.limit = i64::try_from(previously_loaded).unwrap_or(i64::MAX);
+ }
if let Ok((sessions, total)) = self.store.list_sessions(&filter) {
self.total_sessions = total;
+ let store = self.store.clone();
self.list_state.update(cx, |state, cx| {
- state.delegate_mut().sessions = sessions;
+ *state.delegate_mut() = SessionsDelegate::paged(sessions, filter, total, store);
cx.notify();
});
+ self.pending_list_selection = selected_key;
}
let mut counts: Vec<(AgentId, i64)> = self
.store
@@ -851,6 +1814,33 @@ impl Workbench {
cx.notify();
}
+ fn refresh_session_group_date(&mut self, cx: &mut Context<Self>) {
+ let today = Local::now().date_naive();
+ let selected_key = self
+ .pending_list_selection
+ .clone()
+ .or_else(|| self.selected_list_key(cx));
+ let changed = self.list_state.update(cx, |state, cx| {
+ let changed = state.delegate_mut().rebuild_groups_at(today);
+ if changed {
+ cx.notify();
+ }
+ changed
+ });
+ if changed {
+ self.pending_list_selection = selected_key;
+ }
+ }
+
+ fn restore_pending_list_selection(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+ let Some(key) = self.pending_list_selection.take() else {
+ return;
+ };
+ if !self.select_list_key(&key, false, window, cx) {
+ self.seek_list_key(&key, window, cx);
+ }
+ }
+
/// 侧栏底部入口。再点一次(或点任意导航行)退回会话列表
fn toggle_insights(&mut self, cx: &mut Context<Self>) {
if self.insights_open {
@@ -1106,7 +2096,7 @@ impl Workbench {
.detach();
crate::theme::sync_appearance(Some(window), cx);
let settings = cx.new(|cx| SettingsView::new(settings_workbench, window, cx));
- window.focus(&settings.read(cx).focus_handle(cx));
+ window.focus(&settings.read(cx).focus_handle(cx), cx);
cx.new(|cx| Root::new(settings, window, cx))
},
) {
@@ -1463,15 +2453,22 @@ impl Workbench {
})
});
if dirty {
- dialog.footer(move |ok, cancel, window, cx| {
- vec![h_flex()
+ dialog.footer(
+ gpui_component::dialog::DialogFooter::new()
.w_full()
- .justify_end()
- .gap(SPACE_SM)
.px(field_inset)
- .child(cancel(window, cx))
- .child(ok(window, cx))]
- })
+ .child(
+ gpui_component::dialog::DialogClose::new()
+ .child(Button::new("location-cancel").label("Cancel").outline()),
+ )
+ .child(
+ gpui_component::dialog::DialogAction::new().child(
+ Button::new("location-save")
+ .label(ok_label.clone())
+ .primary(),
+ ),
+ ),
+ )
} else {
dialog
}
@@ -1807,13 +2804,17 @@ impl Workbench {
ListEvent::Select(ix) | ListEvent::Confirm(ix) => *ix,
ListEvent::Cancel => return,
};
- let key = list
- .read(cx)
- .delegate()
- .sessions
- .get(ix.row)
- .map(|s| s.key.clone());
+ let key = {
+ let list = list.read(cx);
+ let delegate = list.delegate();
+ delegate
+ .flat_index(ix)
+ .and_then(|flat| delegate.sessions.get(flat))
+ .map(|session| session.key.clone())
+ };
if let Some(key) = key {
+ // 用户手动选择优先于尚未完成的搜索定位,避免旧任务稍后抢回高亮。
+ self._list_seek_task = None;
self.open_detail(&key, None, window, cx);
}
}
@@ -2078,9 +3079,11 @@ impl Workbench {
meta: meta.clone(),
transcript: Rc::new(Vec::new()),
loading: true,
+ error: None,
// Bottom 对齐 = 聊天语义:打开落在最新消息,向上翻历史
msg_list: gpui::ListState::new(0, gpui::ListAlignment::Bottom, px(512.)),
- expanded_rows: HashSet::new(),
+ expanded_tools: HashSet::new(),
+ expanded_thinking: HashSet::new(),
jump_seq,
});
// 搜索路径:中栏列表同步选中并滚到该会话。
@@ -2092,53 +3095,46 @@ impl Workbench {
let adapters = self.adapters.clone();
let task = cx.background_spawn(async move {
- // adapter_for 按文件路径挑实例:自定义 location 的会话必须由
- // 拥有其根的实例解析(gemini/kimi 的 cwd 反查是实例相对侧档)
- let adapter = adapter_for(&adapters, meta.agent, &meta.file_path)?;
- let r = SessionFileRef::from_meta(&meta);
- let t = adapter.parse_transcript(&r).ok()?;
- let visible: Vec<TranscriptMessage> = t
- .mainline
- .into_iter()
- .filter(|m| {
- m.kind != MessageKind::Meta
- && (!m.text.trim().is_empty()
- || !m.tool_calls.is_empty()
- || m.thinking.is_some()
- || m.kind == MessageKind::CompactSummary)
- })
- .collect();
- Some((meta.key.clone(), visible))
+ let result = load_visible_transcript(&adapters, &meta);
+ (meta.key.clone(), result)
});
cx.spawn_in(window, async move |this, cx| {
- let result = task.await;
+ let (key, result) = task.await;
this.update_in(cx, |this, _window, cx| {
if let Some(detail) = &mut this.detail {
- match result {
- Some((key, messages)) if key == detail.meta.key => {
- detail.msg_list = gpui::ListState::new(
- messages.len(),
- gpui::ListAlignment::Bottom,
- px(512.),
- );
- // 搜索跳转:seq → 可见消息下标,滚到视口顶。
- // FTS 命中的行可能被详情过滤(如空文本),用 >= 落到
- // 其后最近一条;找不到(尾部被滤)则保持默认落底。
- // jump_seq 归一为落点消息的实际 seq——高亮按精确相等
- // 渲染,不归一则命中被滤时滚动与高亮指向不同行
- if let Some(seq) = detail.jump_seq {
- if let Some(ix) = messages.iter().position(|m| m.seq >= seq) {
- detail.jump_seq = Some(messages[ix].seq);
- detail.msg_list.scroll_to(gpui::ListOffset {
- item_ix: ix,
- offset_in_item: px(0.),
- });
+ if key == detail.meta.key {
+ detail.loading = false;
+ match result {
+ Ok(messages) => {
+ detail.msg_list = gpui::ListState::new(
+ messages.len(),
+ gpui::ListAlignment::Bottom,
+ px(512.),
+ );
+ // 搜索跳转:seq → 可见消息下标,滚到视口顶。
+ // FTS 命中的行可能被详情过滤(如空文本),用 >= 落到
+ // 其后最近一条;找不到(尾部被滤)则保持默认落底。
+ // jump_seq 归一为落点消息的实际 seq——高亮按精确相等
+ // 渲染,不归一则命中被滤时滚动与高亮指向不同行
+ if let Some(seq) = detail.jump_seq {
+ if let Some(ix) = messages.iter().position(|m| m.seq >= seq) {
+ detail.jump_seq = Some(messages[ix].seq);
+ detail.msg_list.scroll_to(gpui::ListOffset {
+ item_ix: ix,
+ offset_in_item: px(0.),
+ });
+ }
}
+ detail.transcript = Rc::new(messages);
+ detail.error = None;
+ }
+ Err(error) => {
+ detail.transcript = Rc::new(Vec::new());
+ detail.msg_list =
+ gpui::ListState::new(0, gpui::ListAlignment::Bottom, px(512.));
+ detail.error = Some(error.into());
}
- detail.transcript = Rc::new(messages);
- detail.loading = false;
}
- _ => detail.loading = false,
}
}
cx.notify();
@@ -2173,17 +3169,130 @@ impl Workbench {
/// 搜索命中打开:侧栏切回 All Sessions(搜索是全库范围,过滤视图下
/// 命中可能不在列表里),中栏定位选中该会话并滚到可见
fn sync_list_selection(&mut self, key: &str, window: &mut Window, cx: &mut Context<Self>) {
+ self._list_seek_task = None;
+ // 全文搜索包含归档会话,而 All Sessions 明确排除归档。归档命中仍可在
+ // 右栏打开,但不能为了一个永远不可见的 key 把所有活动页全部读进内存。
+ if !self
+ .store
+ .get_session(key)
+ .ok()
+ .flatten()
+ .is_some_and(|session| !session.archived)
+ {
+ return;
+ }
self.show_all_sessions(window, cx);
- let row = self
- .list_state
- .read(cx)
- .delegate()
- .sessions
- .iter()
- .position(|s| s.key == key);
- if let Some(row) = row {
- self.list_state.update(cx, |state, cx| {
- state.set_selected_index(Some(IndexPath::new(row)), window, cx);
+ // show_all_sessions 的通用刷新会暂存刷新前的旧选择;搜索有更明确的新
+ // 目标,不能让下一帧的恢复逻辑把刚选中的搜索命中覆盖回去。
+ self.pending_list_selection = None;
+ if !self.select_list_key(key, true, window, cx) {
+ self.seek_list_key(key, window, cx);
+ }
+ }
+
+ /// 搜索命中可能落在尚未加载的页。后台逐页补齐到命中项,再用分组后的
+ /// IndexPath 选中;generation 防止筛选/排序变化后旧任务污染新列表。
+ fn seek_list_key(&mut self, key: &str, window: &mut Window, cx: &mut Context<Self>) {
+ let request = {
+ let list = self.list_state.read(cx);
+ let Some(page) = list.delegate().pagination.as_ref() else {
+ return;
+ };
+ if page.next_offset >= page.total {
+ return;
+ }
+ (
+ page.generation,
+ page.filter.clone(),
+ page.next_offset,
+ page.total,
+ )
+ };
+ let (generation, mut filter, mut offset, mut total) = request;
+ if !self
+ .store
+ .get_session(key)
+ .ok()
+ .flatten()
+ .is_some_and(|session| session_matches_filter(&session, &filter))
+ {
+ return;
+ }
+ let store = self.store.clone();
+ let key = key.to_string();
+ let wanted_key = key.clone();
+ let query = cx.background_spawn(async move {
+ let mut loaded = Vec::new();
+ let mut found = false;
+ while offset < total {
+ filter.limit = SESSION_PAGE_SIZE;
+ filter.offset = offset;
+ let (page, current_total) = store.list_sessions(&filter).ok()?;
+ total = current_total.max(0);
+ let received = i64::try_from(page.len()).unwrap_or(i64::MAX);
+ if received == 0 {
+ offset = total;
+ break;
+ }
+ found |= page.iter().any(|session| session.key == wanted_key);
+ offset = offset.saturating_add(received).min(total);
+ loaded.extend(page);
+ if found {
+ break;
+ }
+ }
+ Some((generation, loaded, total, offset, found))
+ });
+
+ self._list_seek_task = Some(cx.spawn_in(window, async move |this, cx| {
+ let Some((generation, sessions, total, next_offset, found)) = query.await else {
+ return;
+ };
+ this.update_in(cx, |this, window, cx| {
+ let applied = this.list_state.update(cx, |state, cx| {
+ let delegate = state.delegate_mut();
+ let Some(page) = delegate.pagination.as_mut() else {
+ return false;
+ };
+ if page.generation != generation {
+ return false;
+ }
+ page.total = total;
+ page.next_offset = page.next_offset.max(next_offset).min(total);
+ page.failed = false;
+ delegate.append_sessions(sessions);
+ cx.notify();
+ true
+ });
+ if applied && found {
+ this.select_list_key(&key, true, window, cx);
+ }
+ })
+ .ok();
+ }));
+ }
+
+ /// 按稳定 session key 恢复列表选择;排序、置顶和分组都可能改变 IndexPath。
+ fn select_list_key(
+ &mut self,
+ key: &str,
+ scroll: bool,
+ window: &mut Window,
+ cx: &mut Context<Self>,
+ ) -> bool {
+ let path = {
+ let list = self.list_state.read(cx);
+ let delegate = list.delegate();
+ delegate
+ .sessions
+ .iter()
+ .position(|session| session.key == key)
+ .and_then(|flat| delegate.index_path(flat))
+ };
+ self.list_state.update(cx, |state, cx| {
+ state.set_selected_index(path, window, cx);
+ if scroll {
+ let Some(path) = path else { return };
// 组件无 strict-Top:非 Center 策略都是"最小滚动恰好可见",
// 目标从下方进入会贴底。先把 offset 拉到超底,deferred 消费时
// 目标位于视口上方,最小滚动分支即把它对齐到视口顶。
@@ -2191,9 +3300,10 @@ impl Workbench {
// scroll_strict 字段目前写死 false 未被读——它被接通之日,
// 换成 strict-Top 调用并删掉这行 set_offset
state.scroll_handle().set_offset(point(px(0.), px(-1e9)));
- state.scroll_to_item(IndexPath::new(row), ScrollStrategy::Top, window, cx);
- });
- }
+ state.scroll_to_item(path, ScrollStrategy::Top, window, cx);
+ }
+ });
+ path.is_some()
}
// ---------- 操作 ----------
@@ -2241,21 +3351,25 @@ impl Workbench {
});
}
- fn toggle_favorite(&mut self, _window: &mut Window, cx: &mut Context<Self>) {
+ fn toggle_favorite(&mut self, window: &mut Window, cx: &mut Context<Self>) {
if let Some(detail) = &mut self.detail {
+ let key = detail.meta.key.clone();
let v = !detail.meta.favorite;
let _ = self.store.set_user_data(&detail.meta.key, Some(v), None);
detail.meta.favorite = v;
self.refresh(cx);
+ self.select_list_key(&key, false, window, cx);
}
}
- fn toggle_pinned(&mut self, _window: &mut Window, cx: &mut Context<Self>) {
+ fn toggle_pinned(&mut self, window: &mut Window, cx: &mut Context<Self>) {
if let Some(detail) = &mut self.detail {
+ let key = detail.meta.key.clone();
let v = !detail.meta.pinned;
let _ = self.store.set_user_data(&detail.meta.key, None, Some(v));
detail.meta.pinned = v;
self.refresh(cx);
+ self.select_list_key(&key, true, window, cx);
}
}
@@ -2332,7 +3446,7 @@ impl Workbench {
.map(|a| a.session_paths(&meta))
.unwrap_or_else(|| vec![meta.file_path.clone()]);
let entity = cx.entity();
- window.open_dialog(cx, move |dialog, _window, cx| {
+ window.open_alert_dialog(cx, move |dialog, _window, cx| {
let meta = meta.clone();
let targets = targets.clone();
let entity = entity.clone();
@@ -2344,7 +3458,7 @@ impl Workbench {
.font_semibold()
.child("Delete this session?"),
)
- .w(px(440.))
+ .width(px(440.))
// 破坏性确认:主按钮点名动作并用 danger 形态,不留裸 "OK"。
// .confirm() 必须显式调用——Dialog 只在设了 footer 时才渲染
// 按钮行,只挂 on_ok 的弹窗实际无按钮(仅回车可确认)
@@ -2474,7 +3588,7 @@ impl Workbench {
let show_titlebar = cfg!(target_os = "macos")
|| matches!(window.window_decorations(), Decorations::Client { .. });
v_flex()
- .w(px(224.))
+ .w(SIDEBAR_WIDTH)
.h_full()
.flex_shrink_0()
.bg(theme.sidebar)
@@ -2766,10 +3880,15 @@ impl Workbench {
let mk_key = |label: &'static str, key: SortKey| {
let entity = sort_entity.clone();
PopupMenuItem::new(label).checked(sort_key == key).on_click(
- move |_, _window, cx| {
+ move |_, window, cx| {
entity.update(cx, |this, cx| {
+ let selected =
+ this.detail.as_ref().map(|detail| detail.meta.key.clone());
this.sort_key = key;
this.refresh(cx);
+ if let Some(selected) = selected {
+ this.select_list_key(&selected, true, window, cx);
+ }
});
},
)
@@ -2778,10 +3897,15 @@ impl Workbench {
let entity = sort_entity.clone();
PopupMenuItem::new(label)
.checked(sort_ascending == ascending)
- .on_click(move |_, _window, cx| {
+ .on_click(move |_, window, cx| {
entity.update(cx, |this, cx| {
+ let selected =
+ this.detail.as_ref().map(|detail| detail.meta.key.clone());
this.sort_ascending = ascending;
this.refresh(cx);
+ if let Some(selected) = selected {
+ this.select_list_key(&selected, true, window, cx);
+ }
});
})
};
@@ -2793,12 +3917,12 @@ impl Workbench {
.item(mk_dir("Descending", false))
.item(mk_dir("Ascending", true))
})
- .anchor(Corner::TopRight);
+ .anchor(Anchor::TopRight);
v_flex()
- .w(px(336.))
+ .w(SESSION_STREAM_WIDTH)
.h_full()
.flex_shrink_0()
- .bg(theme.list)
+ .bg(theme.colors.list)
.child(
v_flex()
.id("list-header")
@@ -2918,9 +4042,16 @@ impl Workbench {
window: &mut Window,
cx: &mut Context<Self>,
) -> AnyElement {
+ // 详情宽度随窗口变化;工具头要用当前可用像素反算显示格数,再交给
+ // unicode-width 截断,避免窄窗口溢出、宽窗口仍停在固定长度。
+ let reader_width =
+ (window.viewport_size().width - SIDEBAR_WIDTH - SESSION_STREAM_WIDTH - SPACE_XXL * 2.)
+ .clamp(px(220.), READER_MAX_WIDTH);
+ let tool_summary_width = (reader_width - px(156.)).max(px(80.));
+ let tool_arg_cells =
+ ((f32::from(tool_summary_width) / TOOL_MONO_CELL_WIDTH) as usize).max(8);
let theme = cx.theme();
let dark = theme.mode.is_dark();
- let muted_fg = theme.muted_foreground;
// 尾部要用的 Copy 值提前取出,theme 借用不跨越 inner 构建期的 &mut cx
let jump_bg = theme.primary.opacity(0.09);
let jump_radius = theme.radius;
@@ -2928,7 +4059,8 @@ impl Workbench {
return div().into_any_element();
};
let total = detail.transcript.len();
- let expanded = detail.expanded_rows.contains(&ix);
+ let tools_open = detail.expanded_tools.contains(&ix);
+ let thinking_open = detail.expanded_thinking.contains(&ix);
let jump_seq = detail.jump_seq;
// Rc 克隆只加引用计数;逐行借用,避免每帧深拷贝整条消息(text 可达 32KB)
let transcript = detail.transcript.clone();
@@ -2937,7 +4069,7 @@ impl Workbench {
};
// 只有 thinking、没有回复正文或工具调用的中间事件属于运行日志,
// 连续铺在阅读视图里会把真正的对话切碎;完整原始记录仍保留在源文件中。
- if matches!(m.role, Role::Assistant)
+ if matches!(m.role, MessageRole::Assistant)
&& m.text.is_empty()
&& m.tool_calls.is_empty()
&& m.thinking.is_some()
@@ -2951,7 +4083,7 @@ impl Workbench {
centered_pill("Context compacted", cx).into_any_element()
} else {
match m.role {
- Role::User => h_flex()
+ MessageRole::User => h_flex()
.w_full()
.justify_end()
.child(
@@ -2963,68 +4095,60 @@ impl Workbench {
.px(px(14.))
.py(SPACE_SM)
.text_size(FONT_MSG_USER)
- .child(
- TextView::markdown(
- SharedString::from(format!("dmsg-{}", m.seq)),
- m.text.clone(),
- window,
- cx,
- )
- .style(TextViewStyle {
- heading_base_font_size: FONT_MSG_USER,
- paragraph_gap: gpui::rems(0.5),
- is_dark: dark,
- ..Default::default()
- })
- .line_height(relative(1.45))
- .selectable(true),
- ),
+ .line_height(relative(1.85))
+ .child(markdown_body(
+ format!("dmsg-{}", m.seq).into(),
+ m.text.clone(),
+ FONT_MSG_USER,
+ gpui::rems(0.5),
+ dark,
+ window,
+ cx,
+ )),
)
.into_any_element(),
- Role::Assistant => {
+ MessageRole::Assistant => {
let mut col = v_flex().w_full().min_w_0().gap(SPACE_SM);
- if !m.text.is_empty() {
- if let Some(th) = &m.thinking {
- col = col.child(
- div()
- .text_size(FONT_MSG_THINKING)
- .italic()
- .text_color(muted_fg)
- .truncate()
- .child(format!("Thinking · {}", one_line(th, 200))),
- );
- }
+ if let Some(thinking) = &m.thinking {
+ col = col.child(thinking_panel(
+ ix,
+ thinking,
+ thinking_open,
+ cx.listener(move |this, _, _window, cx| {
+ if let Some(detail) = &mut this.detail {
+ toggle_expanded_row(&mut detail.expanded_thinking, ix);
+ detail.msg_list.splice(ix..ix + 1, 1);
+ }
+ cx.notify();
+ }),
+ cx,
+ ));
}
if !m.text.is_empty() {
col = col.child(
- div().text_size(FONT_MSG_BODY).child(
- TextView::markdown(
- SharedString::from(format!("dmsg-{}", m.seq)),
+ div()
+ .text_size(FONT_MSG_BODY)
+ .line_height(relative(1.9))
+ .child(markdown_body(
+ format!("dmsg-{}", m.seq).into(),
m.text.clone(),
+ FONT_MSG_BODY,
+ gpui::rems(0.6),
+ dark,
window,
cx,
- )
- .style(TextViewStyle {
- heading_base_font_size: FONT_MSG_BODY,
- paragraph_gap: gpui::rems(0.6),
- is_dark: dark,
- ..Default::default()
- })
- .line_height(relative(1.5))
- .selectable(true),
- ),
+ )),
);
}
if !m.tool_calls.is_empty() {
col = col.child(tool_cluster(
ix,
&m.tool_calls,
- expanded,
+ tool_arg_cells,
+ tools_open,
cx.listener(move |this, _, _window, cx| {
if let Some(detail) = &mut this.detail {
- if !detail.expanded_rows.insert(ix) {
- detail.expanded_rows.remove(&ix);
- }
+ toggle_expanded_row(&mut detail.expanded_tools, ix);
// 行高随展开变化,让 list 重测该行
detail.msg_list.splice(ix..ix + 1, 1);
}
@@ -3035,7 +4159,7 @@ impl Workbench {
}
col.into_any_element()
}
- Role::System => centered_pill(one_line(&m.text, 120), cx).into_any_element(),
+ MessageRole::System => centered_pill(one_line(&m.text, 120), cx).into_any_element(),
}
};
@@ -3051,7 +4175,7 @@ impl Workbench {
.child(
div()
.w_full()
- .max_w(px(720.))
+ .max_w(READER_MAX_WIDTH)
.min_w_0()
// 淡 primary 底:标记搜索命中落点(尾部命中不滚动,全靠它识别)。
// 负 margin + 等量 padding:背景向外扩出呼吸边,内容原位不推挤,
@@ -3210,10 +4334,10 @@ impl Workbench {
div().w_full().flex().justify_center().px(SPACE_XXL).child(
v_flex()
.w_full()
- .max_w(px(720.))
+ .max_w(READER_MAX_WIDTH)
.pt(SPACE_SM)
.pb(px(40.))
- .gap(px(32.))
+ .gap(INSIGHTS_SECTION_GAP)
.child(overview)
.child(
v_flex()
@@ -3367,6 +4491,38 @@ impl Workbench {
.into_any_element()
}
+ #[allow(deprecated)]
+ fn update_detail_selection_auto_scroll(
+ &mut self,
+ event: &MouseMoveEvent,
+ window: &mut Window,
+ cx: &mut Context<Self>,
+ ) {
+ let has_selection = event.dragging() && window.has_text_selection(cx);
+ let delta = self.detail.as_ref().and_then(|detail| {
+ let bounds = detail.msg_list.viewport_bounds();
+ (has_selection
+ && !detail.msg_list.is_scrollbar_dragging()
+ && event.position.x >= bounds.left()
+ && event.position.x <= bounds.right())
+ .then(|| AutoScroll::compute_delta(event.position.y, bounds))
+ .flatten()
+ });
+
+ self.detail_selection_auto_scroll
+ .set(delta, cx, |delta, this, cx| {
+ let Some(detail) = &this.detail else {
+ return;
+ };
+ detail.msg_list.scroll_by(delta);
+ cx.notify();
+ });
+ }
+
+ fn stop_detail_selection_auto_scroll(&mut self) {
+ self.detail_selection_auto_scroll.stop();
+ }
+
fn render_detail(&self, _window: &mut Window, cx: &mut Context<Self>) -> AnyElement {
let theme = cx.theme();
let Some(detail) = &self.detail else {
@@ -3390,6 +4546,7 @@ impl Workbench {
.into_any_element();
};
let meta = &detail.meta;
+ let detail_title_tooltip: SharedString = meta.title.clone().into();
let session_id = meta.id.clone();
let export_entity = cx.entity();
let reveal_entity = export_entity.clone();
@@ -3398,7 +4555,7 @@ impl Workbench {
.ghost()
.rounded(RADIUS_BUTTON)
.icon(icon("icons/more-horizontal.svg").with_size(px(16.)))
- .dropdown_menu(move |menu, _, _| {
+ .dropdown_menu(move |menu, _, cx| {
let export_entity = export_entity.clone();
let reveal_entity = reveal_entity.clone();
let delete_entity = delete_entity.clone();
@@ -3435,16 +4592,22 @@ impl Workbench {
)
.separator()
.item(
- PopupMenuItem::new(format!(" {MOVE_TO_TRASH}"))
- .icon(icon("icons/trash-2.svg").with_size(px(15.)))
- .on_click(move |_, window, cx| {
- delete_entity.update(cx, |this, cx| {
- this.confirm_delete(window, cx);
- });
- }),
+ PopupMenuItem::element(|_, cx| {
+ div().text_color(cx.theme().danger).child(MOVE_TO_TRASH)
+ })
+ .icon(
+ icon("icons/trash-2.svg")
+ .with_size(px(15.))
+ .text_color(cx.theme().danger),
+ )
+ .on_click(move |_, window, cx| {
+ delete_entity.update(cx, |this, cx| {
+ this.confirm_delete(window, cx);
+ });
+ }),
)
})
- .anchor(Corner::TopRight);
+ .anchor(Anchor::TopRight);
let detail_path: SharedString = if meta.project_path.is_empty() {
"Unknown project".to_string()
@@ -3473,6 +4636,29 @@ impl Workbench {
format!("Updated {}", abs_date(meta.updated_at)).into(),
)
});
+ let branch: Option<SharedString> =
+ visible_git_branch(meta.git_branch.as_deref()).map(|branch| branch.to_string().into());
+ let project_badge: AnyElement = {
+ let badge = badge(
+ meta.project_name.clone(),
+ theme.muted,
+ theme.muted_foreground,
+ );
+ if meta.project_path.is_empty() {
+ div().child(badge).into_any_element()
+ } else {
+ let project_path = meta.project_path.clone();
+ div()
+ .id("detail-project")
+ .cursor_pointer()
+ .tooltip(|window, cx| {
+ gpui_component::tooltip::Tooltip::new(SHOW_IN_FM).build(window, cx)
+ })
+ .on_click(move |_, _, _| terminal::open_in_file_manager(&project_path))
+ .child(badge)
+ .into_any_element()
+ }
+ };
v_flex()
.flex_1()
@@ -3505,8 +4691,8 @@ impl Workbench {
.text_color(theme.muted_foreground)
.child(img(meta.agent.brand_icon(theme.mode.is_dark())).size(px(15.)).flex_shrink_0())
.child(div().flex_shrink_0().child(meta.agent.display_name()))
- .child(badge(meta.project_name.clone(), theme.muted, theme.muted_foreground))
- .when_some(meta.git_branch.clone(), |this, branch| {
+ .child(project_badge)
+ .when_some(branch, |this, branch| {
this.child(
h_flex()
.min_w_0()
@@ -3647,7 +4833,7 @@ impl Workbench {
}
menu
})
- .anchor(Corner::TopRight),
+ .anchor(Anchor::TopRight),
)
})
.child(tool_btn(
@@ -3684,19 +4870,29 @@ impl Workbench {
),
)
.child(
- h_flex()
+ div()
.w_full()
- .h(WINDOW_TITLEBAR_HEIGHT)
+ .min_h(WINDOW_TITLEBAR_HEIGHT)
.min_w_0()
+ .py(SPACE_SM)
+ .flex()
.items_center()
.child(
div()
+ .id("detail-title")
+ .w_full()
.min_w_0()
- .truncate()
+ .whitespace_normal()
.text_size(FONT_TITLE)
.line_height(relative(1.15))
.font_semibold()
- .child(meta.title.clone()),
+ .child(meta.title.clone())
+ .tooltip(move |window, cx| {
+ gpui_component::tooltip::Tooltip::new(
+ detail_title_tooltip.clone(),
+ )
+ .build(window, cx)
+ }),
),
)
.child(
@@ -3830,6 +5026,54 @@ impl Workbench {
.child(Spinner::new().small())
.child(div().text_size(FONT_BODY).child("Loading session…"))
.into_any_element()
+ } else if let Some(error) = detail.error.clone() {
+ let reveal_path = meta.file_path.clone();
+ v_flex()
+ .flex_1()
+ .bg(theme.popover)
+ .items_center()
+ .justify_center()
+ .px(SPACE_XXL)
+ .child(
+ v_flex()
+ .w_full()
+ .max_w(px(520.))
+ .items_center()
+ .gap(SPACE_MD)
+ .child(
+ icon("icons/circle-x.svg")
+ .with_size(px(24.))
+ .text_color(theme.danger),
+ )
+ .child(
+ div()
+ .text_size(FONT_HEADING)
+ .font_semibold()
+ .text_color(theme.foreground)
+ .child("Couldn't load this session"),
+ )
+ .child(
+ div()
+ .w_full()
+ .whitespace_normal()
+ .text_center()
+ .text_size(FONT_CAPTION)
+ .text_color(theme.muted_foreground)
+ .child(error),
+ )
+ .child(
+ Button::new("reveal-failed-session")
+ .outline()
+ .small()
+ .rounded(RADIUS_BUTTON)
+ .icon(icon("icons/folder.svg").with_size(px(13.)))
+ .label(REVEAL_IN_FM)
+ .on_click(move |_, _, _| {
+ terminal::reveal_in_file_manager(&reveal_path)
+ }),
+ ),
+ )
+ .into_any_element()
} else {
let entity = cx.entity().downgrade();
div()
@@ -4010,7 +5254,7 @@ fn usage_bar_row(
let theme = cx.theme();
let frac = (count as f32 / max.max(1) as f32).clamp(0., 1.);
h_flex()
- .h(px(22.))
+ .h(SPACE_XXL)
.gap(SPACE_SM)
.items_center()
.when_some(lead, |row, lead| {
@@ -4172,7 +5416,7 @@ fn render_distribution(range: InsightsRange, values: &[i64], peak: usize, cx: &A
.id(("dist", i))
.flex_1()
.h(height)
- .rounded(px(2.))
+ .rounded(RADIUS_CELL)
.bg(bg)
.tooltip(move |window, cx| {
gpui_component::tooltip::Tooltip::new(label.clone()).build(window, cx)
@@ -4296,7 +5540,7 @@ fn render_heatmap(d: &InsightsData, cx: &App) -> AnyElement {
div()
.id(("hm", ix))
.size(px(CELL))
- .rounded(px(2.))
+ .rounded(RADIUS_CELL)
.bg(heat_color(n))
// 只捕获 Copy 的 (start, ix, n),hover 到的那格才格式化
.tooltip(move |window, cx| {
@@ -4338,7 +5582,7 @@ fn render_heatmap(d: &InsightsData, cx: &App) -> AnyElement {
.flex_shrink_0()
.child("Less")
.children(std::iter::once(0.).chain(HEAT).map(|a: f32| {
- div().size(px(CELL)).rounded(px(2.)).bg(if a == 0. {
+ div().size(px(CELL)).rounded(RADIUS_CELL).bg(if a == 0. {
theme.muted
} else {
theme.primary.opacity(a)
@@ -4433,115 +5677,353 @@ fn centered_pill(text: impl Into<SharedString>, cx: &App) -> Div {
)
}
-/// 工具调用折叠簇:头行(chevron + 名字序列 + 失败计数)默认收起,
-/// 展开为左竖线缩进列表;仅失败项内联输出(错误才是回顾重点)。
+/// 对话正文共用的 Markdown 视图。表格、引用块与分隔线由组件原生解析;
+/// Wake 只覆写标题层级、代码块表面、语法配色和代码操作区。
+fn markdown_body(
+ id: SharedString,
+ text: String,
+ base: Pixels,
+ paragraph_gap: gpui::Rems,
+ dark: bool,
+ _window: &mut Window,
+ cx: &mut App,
+) -> TextView {
+ let theme = cx.theme();
+ let code_bg = theme.muted;
+ let code_border = theme.border;
+ let code_radius = theme.radius;
+ // TextView 的语法颜色在解析阶段固化;把主题写进 id,让模式切换走同步
+ // 首次解析路径,避免代码块短暂保留上一种模式的颜色。
+ let themed_id: SharedString = format!("{id}-{}", if dark { "dark" } else { "light" }).into();
+
+ TextView::markdown(themed_id, text)
+ .style(
+ TextViewStyle {
+ heading_base_font_size: base,
+ paragraph_gap,
+ is_dark: dark,
+ highlight_theme: if dark {
+ HighlightTheme::default_dark()
+ } else {
+ HighlightTheme::default_light()
+ },
+ ..Default::default()
+ }
+ .heading_font_size(|level, base| match level {
+ 1 => base * 1.45,
+ 2 => base * 1.28,
+ 3 => base * 1.14,
+ 4 => base * 1.05,
+ _ => base,
+ })
+ .code_block(
+ StyleRefinement::default()
+ .bg(code_bg)
+ .border_1()
+ .border_color(code_border)
+ .rounded(code_radius)
+ .px(SPACE_LG)
+ .py(SPACE_MD),
+ ),
+ )
+ .code_block_actions(|block, _window, cx| {
+ let theme = cx.theme();
+ let code = block.code();
+ h_flex()
+ .items_center()
+ .gap(SPACE_SM)
+ .px(px(6.))
+ .text_size(FONT_LABEL)
+ .text_color(theme.muted_foreground)
+ .when_some(block.lang(), |actions, lang| actions.child(lang))
+ .child(
+ div()
+ .id("code-copy")
+ .size(px(20.))
+ .flex()
+ .items_center()
+ .justify_center()
+ .rounded(RADIUS_BADGE)
+ .cursor_pointer()
+ .hover(|style| style.bg(theme.secondary_hover))
+ .tooltip(|window, cx| {
+ gpui_component::tooltip::Tooltip::new("Copy code").build(window, cx)
+ })
+ .on_click(move |_, _, cx| {
+ cx.write_to_clipboard(ClipboardItem::new_string(code.to_string()));
+ })
+ .child(icon("icons/copy.svg").with_size(px(12.))),
+ )
+ })
+ .selectable(true)
+}
+
+/// Thinking 折叠面板:收起是一行摘要,展开后显示完整原文。
+fn thinking_panel(
+ ix: usize,
+ text: &str,
+ expanded: bool,
+ on_toggle: impl Fn(&ClickEvent, &mut Window, &mut App) + 'static,
+ cx: &App,
+) -> Div {
+ let theme = cx.theme();
+ let summary = clip_display(&one_line(text, 400), 88);
+ let mut panel = v_flex()
+ .w_full()
+ .min_w_0()
+ .rounded(theme.radius)
+ .border_1()
+ .border_color(theme.border)
+ .bg(theme.muted.opacity(0.45))
+ .child(
+ h_flex()
+ .id(("thinking", ix))
+ .w_full()
+ .min_w_0()
+ .items_center()
+ .gap(px(7.))
+ .px(SPACE_MD)
+ .py(SPACE_SM)
+ .cursor_pointer()
+ .text_size(FONT_MSG_THINKING)
+ .text_color(theme.muted_foreground)
+ .hover(|style| style.text_colored(theme.foreground, FONT_MSG_THINKING))
+ .child(
+ icon("icons/chevron-right.svg")
+ .with_size(px(11.))
+ .flex_shrink_0()
+ .when(expanded, |icon| {
+ icon.rotate(gpui::Radians(std::f32::consts::FRAC_PI_2))
+ }),
+ )
+ .child(div().flex_shrink_0().font_medium().child("Thinking"))
+ .when(!expanded, |header| {
+ header.child(
+ div()
+ .min_w_0()
+ .overflow_hidden()
+ .whitespace_nowrap()
+ .italic()
+ .child(summary),
+ )
+ })
+ .on_click(on_toggle),
+ );
+
+ if expanded {
+ panel = panel.child(
+ div()
+ .w_full()
+ .min_w_0()
+ .pl(px(30.))
+ .pr(SPACE_MD)
+ .pb(SPACE_MD)
+ .whitespace_normal()
+ .text_size(FONT_MSG_THINKING)
+ .line_height(relative(1.7))
+ .text_color(theme.muted_foreground)
+ .child(text.to_string()),
+ );
+ }
+
+ panel
+}
+
+const TOOL_TEXT_PREVIEW_LIMIT: usize = 600;
+
+fn tool_cluster_heading(
+ calls: &[ToolCallView],
+ arg_cells: usize,
+) -> (SharedString, Option<SharedString>) {
+ match calls {
+ [] => ("No tool calls".into(), None),
+ [only] => {
+ let arg = (!only.input_preview.trim().is_empty())
+ .then(|| clip_display(&only.input_preview, arg_cells).into());
+ (only.name.clone().into(), arg)
+ }
+ many => {
+ let names = many
+ .iter()
+ .map(|call| call.name.as_str())
+ .collect::<Vec<_>>()
+ .join(" · ");
+ (
+ format!("{} tool calls", many.len()).into(),
+ Some(clip_display(&names, arg_cells).into()),
+ )
+ }
+ }
+}
+
+fn clip_tool_text(text: &str, limit: usize) -> (String, bool) {
+ let mut chars = text.chars();
+ let mut shown: String = chars.by_ref().take(limit).collect();
+ let truncated = chars.next().is_some();
+ if truncated {
+ shown.push('…');
+ }
+ (shown, truncated)
+}
+
+/// 工具调用折叠卡:收起显示名称/数量、Unicode 宽度感知的参数摘要和失败数;
+/// 展开显示可用的完整 Input 与成功/失败 Output。正文只展示前 600 字符,
+/// 但复制按钮始终复制完整内容,不使用会抢主阅读区滚轮的嵌套滚动容器。
fn tool_cluster(
ix: usize,
calls: &[ToolCallView],
+ arg_cells: usize,
expanded: bool,
on_toggle: impl Fn(&ClickEvent, &mut Window, &mut App) + 'static,
cx: &App,
) -> Div {
let theme = cx.theme();
let failed = calls.iter().filter(|c| c.is_error).count();
- let names = calls
- .iter()
- .map(|c| c.name.as_str())
- .collect::<Vec<_>>()
- .join(" · ");
- let head_label = if calls.len() == 1 {
- names.clone()
- } else {
- format!("{} tools · {}", calls.len(), names)
- };
+ let (head_name, head_arg) = tool_cluster_heading(calls, arg_cells);
let mono = theme.mono_font_family.clone();
+ let panel_border = theme.border;
- let mut cluster = v_flex().w_full().min_w_0().gap(px(4.)).child(
- h_flex()
- .id(("tool-cluster", ix))
- .w_full()
- .min_w_0()
- .gap(px(6.))
- .cursor_pointer()
- .text_size(FONT_CAPTION)
- .text_color(theme.muted_foreground)
- .hover(|s| s.text_colored(theme.foreground, FONT_CAPTION))
- .child(
- icon("icons/chevron-right.svg")
- .with_size(px(11.))
- .flex_shrink_0()
- .when(expanded, |ic| {
- ic.rotate(gpui::Radians(std::f32::consts::FRAC_PI_2))
- }),
- )
- .child(div().min_w_0().truncate().font_medium().child(head_label))
- .when(failed > 0, |this| {
- this.child(
+ let mut cluster = v_flex()
+ .w_full()
+ .min_w_0()
+ .rounded(theme.radius)
+ .border_1()
+ .border_color(panel_border)
+ .bg(theme.muted.opacity(0.35))
+ .child(
+ h_flex()
+ .id(("tool-cluster", ix))
+ .w_full()
+ .min_w_0()
+ .items_center()
+ .gap(px(7.))
+ .px(SPACE_MD)
+ .py(SPACE_SM)
+ .cursor_pointer()
+ .text_size(FONT_MSG_THINKING)
+ .text_color(theme.muted_foreground)
+ .hover(|style| style.text_colored(theme.foreground, FONT_MSG_THINKING))
+ .child(
+ icon("icons/chevron-right.svg")
+ .with_size(px(11.))
+ .flex_shrink_0()
+ .when(expanded, |icon| {
+ icon.rotate(gpui::Radians(std::f32::consts::FRAC_PI_2))
+ }),
+ )
+ .child(
div()
.flex_shrink_0()
- .text_color(theme.danger)
- .child(format!("{failed} failed")),
+ .font_medium()
+ .text_color(theme.foreground)
+ .child(head_name),
)
- })
- .on_click(on_toggle),
- );
+ .when_some(head_arg, |header, arg| {
+ header.child(
+ div()
+ .min_w_0()
+ .overflow_hidden()
+ .whitespace_nowrap()
+ .font_family(mono.clone())
+ .child(arg),
+ )
+ })
+ .child(div().flex_1())
+ .when(failed > 0, |header| {
+ header.child(
+ div()
+ .flex_shrink_0()
+ .px(px(7.))
+ .rounded(RADIUS_BADGE)
+ .text_size(FONT_LABEL)
+ .text_color(theme.danger)
+ .bg(theme.danger.opacity(0.12))
+ .child(format!("{failed} failed")),
+ )
+ })
+ .on_click(on_toggle),
+ );
+
if expanded {
let mut items = v_flex()
.w_full()
.min_w_0()
- .ml(px(5.))
- .pl(px(12.))
- .border_l_1()
- .border_color(theme.border)
- .gap(px(6.));
- for tc in calls {
- let mut item = v_flex().w_full().min_w_0().gap(px(2.)).child(
- h_flex()
- .w_full()
- .min_w_0()
- .gap(px(6.))
- .child(
- div()
- .flex_shrink_0()
- .text_size(FONT_CAPTION)
- .font_medium()
- .text_color(if tc.is_error {
- theme.danger
- } else {
- theme.foreground
- })
- .child(tc.name.clone()),
- )
- .child(
- div()
- .min_w_0()
- .truncate()
- .text_size(FONT_MSG_THINKING)
- .font_family(mono.clone())
- .text_color(theme.muted_foreground)
- .child(tc.input_preview.clone()),
- ),
- );
- if tc.is_error {
- if let Some(out) = &tc.output {
- let shown: String = out.trim().chars().take(400).collect();
- if !shown.is_empty() {
- item = item.child(
+ .border_t_1()
+ .border_color(panel_border);
+ for (call_ix, call) in calls.iter().enumerate() {
+ let mut item = v_flex()
+ .w_full()
+ .min_w_0()
+ .px(SPACE_MD)
+ .py(px(10.))
+ .gap(px(6.))
+ .when(call_ix > 0, |item| {
+ item.border_t_1().border_color(panel_border)
+ });
+
+ if calls.len() > 1 {
+ item = item.child(
+ h_flex()
+ .w_full()
+ .min_w_0()
+ .gap(px(7.))
+ .child(
+ div()
+ .flex_shrink_0()
+ .text_size(FONT_MSG_THINKING)
+ .font_medium()
+ .text_color(if call.is_error {
+ theme.danger
+ } else {
+ theme.foreground
+ })
+ .child(call.name.clone()),
+ )
+ .child(
div()
- .w_full()
.min_w_0()
- .px(px(8.))
- .py(px(5.))
- .rounded(RADIUS_KBD)
- .bg(theme.muted)
- .text_size(FONT_LABEL)
+ .overflow_hidden()
+ .whitespace_nowrap()
+ .text_size(FONT_MSG_THINKING)
.font_family(mono.clone())
.text_color(theme.muted_foreground)
- .child(shown),
- );
- }
- }
+ .child(clip_display(&call.input_preview, arg_cells)),
+ ),
+ );
+ }
+
+ let input = call.input.as_deref().and_then(non_blank_tool_text);
+ if let Some(input) = input {
+ item = item.child(tool_section(
+ format!("tool-copy-{ix}-{call_ix}-input").into(),
+ "Input",
+ input,
+ false,
+ mono.clone(),
+ cx,
+ ));
+ } else if let Some(input_preview) = non_blank_tool_text(&call.input_preview) {
+ item = item.child(tool_section(
+ format!("tool-copy-{ix}-{call_ix}-input-preview").into(),
+ "Input preview",
+ input_preview,
+ false,
+ mono.clone(),
+ cx,
+ ));
+ }
+
+ if let Some(output) = call.output.as_deref().and_then(non_blank_tool_text) {
+ item = item.child(tool_section(
+ format!("tool-copy-{ix}-{call_ix}-output").into(),
+ "Output",
+ output,
+ call.is_error,
+ mono.clone(),
+ cx,
+ ));
}
+
items = items.child(item);
}
cluster = cluster.child(items);
@@ -4549,6 +6031,94 @@ fn tool_cluster(
cluster
}
+/// 空白只参与“是否有内容”的判断;展示与复制必须保留工具原始输出的边界空白。
+fn non_blank_tool_text(text: &str) -> Option<&str> {
+ (!text.trim().is_empty()).then_some(text)
+}
+
+fn tool_section(
+ copy_id: SharedString,
+ label: &'static str,
+ body: &str,
+ is_error: bool,
+ mono: SharedString,
+ cx: &App,
+) -> Div {
+ let theme = cx.theme();
+ let (shown, truncated) = clip_tool_text(body, TOOL_TEXT_PREVIEW_LIMIT);
+ let full = body.to_string();
+ let copy_tooltip: SharedString = format!("Copy full {}", label.to_lowercase()).into();
+
+ v_flex()
+ .w_full()
+ .min_w_0()
+ .gap(SPACE_XS)
+ .child(
+ h_flex()
+ .w_full()
+ .items_center()
+ .gap(SPACE_SM)
+ .text_size(FONT_LABEL)
+ .text_color(if is_error {
+ theme.danger
+ } else {
+ theme.muted_foreground
+ })
+ .child(label)
+ .when(truncated, |header| {
+ header.child(
+ div()
+ .text_color(theme.muted_foreground)
+ .child(format!("First {TOOL_TEXT_PREVIEW_LIMIT} characters")),
+ )
+ })
+ .child(div().flex_1())
+ .child(
+ div()
+ .id(copy_id)
+ .size(px(20.))
+ .flex()
+ .items_center()
+ .justify_center()
+ .rounded(RADIUS_BADGE)
+ .cursor_pointer()
+ .text_color(theme.muted_foreground)
+ .hover(|style| style.bg(theme.secondary_hover).text_color(theme.foreground))
+ .tooltip(move |window, cx| {
+ gpui_component::tooltip::Tooltip::new(copy_tooltip.clone())
+ .build(window, cx)
+ })
+ .on_click(move |_, _, cx| {
+ cx.write_to_clipboard(ClipboardItem::new_string(full.clone()));
+ })
+ .child(icon("icons/copy.svg").with_size(px(12.))),
+ ),
+ )
+ .child(
+ div()
+ .w_full()
+ .min_w_0()
+ .px(px(10.))
+ .py(px(7.))
+ .rounded(RADIUS_KBD)
+ .bg(if is_error {
+ theme.danger.opacity(0.08)
+ } else {
+ theme.muted
+ })
+ .whitespace_normal()
+ .text_size(FONT_MSG_THINKING)
+ .line_height(relative(1.6))
+ .font_family(mono)
+ .text_color(if is_error {
+ theme.danger
+ } else {
+ theme.muted_foreground
+ })
+ .child(shown),
+ )
+}
+
/// 小胶囊 badge(项目名/model/source 共用):4px 圆角,内部截断。
/// 项目名用 muted 灰;model/source 用主题色 tint(淡底+同色文字)。
/// 该数据根是否派生自某条自定义 location(with_custom_root 契约保证派生根
@@ -4753,6 +6323,8 @@ impl Focusable for Workbench {
impl Render for Workbench {
fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+ self.refresh_session_group_date(cx);
+ self.restore_pending_list_selection(window, cx);
let theme = cx.theme();
div()
.id("workbench")
@@ -4765,6 +6337,13 @@ impl Render for Workbench {
.on_action(cx.listener(|this, _: &OpenSettings, _window, cx| this.open_settings(cx)))
.on_action(cx.listener(|this, _: &OpenUpdates, _window, cx| this.open_updates(cx)))
.on_action(cx.listener(|this, _: &OpenAbout, _window, cx| this.open_about(cx)))
+ .on_mouse_move(cx.listener(|this, event: &MouseMoveEvent, window, cx| {
+ this.update_detail_selection_auto_scroll(event, window, cx)
+ }))
+ .on_mouse_up(
+ MouseButton::Left,
+ cx.listener(|this, _, _, _| this.stop_detail_selection_auto_scroll()),
+ )
.size_full()
.bg(theme.background)
.text_color(theme.foreground)