From 68a59bf20ad7965119a6e560d593d658e78d21cd Mon Sep 17 00:00:00 2001 From: meh Date: Sun, 16 Aug 2026 17:56:35 +0700 Subject: [PATCH 1/2] fix: repin blitz-bench too, so one rev per git source holds The engine repin moved apps/gui but not crates/blitz-bench, which still asked for tauri-runtime-blitz at 9edbec2 for blitz-control-protocol. Cargo.lock then carried both revs and check-one-rev-per-git-source.sh failed the build. Local cargo check -p az-gui passed because it never touched the bench crate, which is the gap the script exists to cover. 0.8.7. --- Cargo.lock | 26 ++++++++------------------ Cargo.toml | 2 +- crates/blitz-bench/Cargo.toml | 2 +- 3 files changed, 10 insertions(+), 20 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6cf97547..06607d4b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -72,7 +72,7 @@ dependencies = [ [[package]] name = "agency-tools" -version = "0.8.6" +version = "0.8.7" dependencies = [ "derive_more 2.1.1", "dirs", @@ -364,11 +364,11 @@ checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53" [[package]] name = "az-core" -version = "0.8.6" +version = "0.8.7" [[package]] name = "az-gui" -version = "0.8.6" +version = "0.8.7" dependencies = [ "agency-proxy-client", "agency-proxy-protocol", @@ -407,7 +407,7 @@ dependencies = [ [[package]] name = "az-mcp-proxy" -version = "0.8.6" +version = "0.8.7" dependencies = [ "az-core", ] @@ -498,9 +498,9 @@ dependencies = [ [[package]] name = "blitz-bench" -version = "0.8.6" +version = "0.8.7" dependencies = [ - "blitz-control-protocol 0.1.0 (git+https://github.com/pathscale/tauri-runtime-blitz.git?rev=9edbec23ce4ca9bcb052a364577fd9a736fd81a3)", + "blitz-control-protocol", "endpoint-libs", "eyre", "serde", @@ -518,16 +518,6 @@ dependencies = [ "serde_json", ] -[[package]] -name = "blitz-control-protocol" -version = "0.1.0" -source = "git+https://github.com/pathscale/tauri-runtime-blitz.git?rev=9edbec23ce4ca9bcb052a364577fd9a736fd81a3#9edbec23ce4ca9bcb052a364577fd9a736fd81a3" -dependencies = [ - "endpoint-libs", - "serde", - "serde_json", -] - [[package]] name = "blitz-html" version = "0.3.0-beta.3" @@ -6628,7 +6618,7 @@ name = "tauri-runtime-blitz" version = "0.1.0" source = "git+https://github.com/pathscale/tauri-runtime-blitz.git?rev=71d7bd897fc936b54fc4731e56600b9497e402ad#71d7bd897fc936b54fc4731e56600b9497e402ad" dependencies = [ - "blitz-control-protocol 0.1.0 (git+https://github.com/pathscale/tauri-runtime-blitz.git?rev=71d7bd897fc936b54fc4731e56600b9497e402ad)", + "blitz-control-protocol", "endpoint-libs", "http", "keyboard-types 0.7.0", @@ -8988,7 +8978,7 @@ dependencies = [ [[package]] name = "wt-migrate" -version = "0.8.6" +version = "0.8.7" dependencies = [ "chrono", "derive_more 2.1.1", diff --git a/Cargo.toml b/Cargo.toml index 494eb9ff..81171595 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,7 @@ members = [ ] [workspace.package] -version = "0.8.6" +version = "0.8.7" edition = "2024" publish = false diff --git a/crates/blitz-bench/Cargo.toml b/crates/blitz-bench/Cargo.toml index 24ac594b..314bd702 100644 --- a/crates/blitz-bench/Cargo.toml +++ b/crates/blitz-bench/Cargo.toml @@ -11,7 +11,7 @@ publish.workspace = true # `tauri-runtime-blitz` for the same types would build a browser engine to send # a wheel event. `cargo tree -p blitz-bench` is the check. [dependencies] -blitz-control-protocol = { git = "https://github.com/pathscale/tauri-runtime-blitz.git", rev = "9edbec23ce4ca9bcb052a364577fd9a736fd81a3" } +blitz-control-protocol = { git = "https://github.com/pathscale/tauri-runtime-blitz.git", rev = "71d7bd897fc936b54fc4731e56600b9497e402ad" } # The same framing the server uses, from the same crate, for the same reason as # the protocol types: a hand-rolled length-prefix reader is how the Python # client hung on its first malformed frame. From 68a774dc5bfbbf9232fa604087c47f58b5a20106 Mon Sep 17 00:00:00 2001 From: meh Date: Sun, 16 Aug 2026 17:59:09 +0700 Subject: [PATCH 2/2] build: track master instead of pinning revs Four of the five git revs in this workspace were pinned for no reason beyond inertia, and keeping them in step by hand is what broke the last two builds: apps/gui, crates/blitz-bench and apps/blitz-preview each named a different tauri-runtime-blitz rev, and cargo resolving one source at three revisions is exactly what check-one-rev-per-git-source.sh rejects. tauri-runtime-blitz (three manifests) and agent-experimental now track master, so there is nothing to keep in step. worktable stays pinned and says why in a comment: master has moved to an arctic-wt cargo cannot select alongside this workspace, so branch = master fails to resolve rather than building something newer. clippy -D warnings, 282 tests, and the one-rev guard all pass. --- Cargo.lock | 6 +++--- apps/blitz-preview/Cargo.toml | 2 +- apps/gui/Cargo.toml | 7 +++++-- crates/blitz-bench/Cargo.toml | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 06607d4b..58610ebb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -104,7 +104,7 @@ dependencies = [ [[package]] name = "agent-experimental" version = "0.1.3" -source = "git+https://gitlab.com/anonymous-28282828282/agent-experimental.git?rev=afe3a70e02ef844a092385859ab8f5f3ab8a039e#afe3a70e02ef844a092385859ab8f5f3ab8a039e" +source = "git+https://gitlab.com/anonymous-28282828282/agent-experimental.git?branch=master#afe3a70e02ef844a092385859ab8f5f3ab8a039e" dependencies = [ "anyhow", "reqwest", @@ -511,7 +511,7 @@ dependencies = [ [[package]] name = "blitz-control-protocol" version = "0.1.0" -source = "git+https://github.com/pathscale/tauri-runtime-blitz.git?rev=71d7bd897fc936b54fc4731e56600b9497e402ad#71d7bd897fc936b54fc4731e56600b9497e402ad" +source = "git+https://github.com/pathscale/tauri-runtime-blitz.git?branch=master#71d7bd897fc936b54fc4731e56600b9497e402ad" dependencies = [ "endpoint-libs", "serde", @@ -6616,7 +6616,7 @@ dependencies = [ [[package]] name = "tauri-runtime-blitz" version = "0.1.0" -source = "git+https://github.com/pathscale/tauri-runtime-blitz.git?rev=71d7bd897fc936b54fc4731e56600b9497e402ad#71d7bd897fc936b54fc4731e56600b9497e402ad" +source = "git+https://github.com/pathscale/tauri-runtime-blitz.git?branch=master#71d7bd897fc936b54fc4731e56600b9497e402ad" dependencies = [ "blitz-control-protocol", "endpoint-libs", diff --git a/apps/blitz-preview/Cargo.toml b/apps/blitz-preview/Cargo.toml index 9b68a129..8a72a2b8 100644 --- a/apps/blitz-preview/Cargo.toml +++ b/apps/blitz-preview/Cargo.toml @@ -16,7 +16,7 @@ blitz-traits = { path = "../../../blitz-rust/packages/blitz-traits" } brotli = { version = "=8.0.4", default-features = false, features = ["std"] } png = { version = "=0.18.1", optional = true } tauri = { version = "=2.11.5", default-features = false, features = ["compression"] } -tauri-runtime-blitz = { git = "https://github.com/pathscale/tauri-runtime-blitz.git", rev = "070ab3a2fd460d7c9b2f3f341e7d6c50af669682" } +tauri-runtime-blitz = { git = "https://github.com/pathscale/tauri-runtime-blitz.git", branch = "master" } url = "=2.5.8" [build-dependencies] diff --git a/apps/gui/Cargo.toml b/apps/gui/Cargo.toml index 30fb1abe..2a476c9d 100644 --- a/apps/gui/Cargo.toml +++ b/apps/gui/Cargo.toml @@ -51,10 +51,13 @@ wt-migrate = { path = "../../crates/wt-migrate" } agent-abstraction = "0.4.15" agency-proxy-client = "=0.1.6" agency-proxy-protocol = "=0.1.6" -agent-experimental = { git = "https://gitlab.com/anonymous-28282828282/agent-experimental.git", rev = "afe3a70e02ef844a092385859ab8f5f3ab8a039e", default-features = false, optional = true } +agent-experimental = { git = "https://gitlab.com/anonymous-28282828282/agent-experimental.git", branch = "master", default-features = false, optional = true } promptsyntax = "0.1.0" shlex = "1.3" az-core.workspace = true +# Pinned rather than tracking master, unlike the engine deps above. Master has +# moved on to an `arctic-wt` that cargo cannot select alongside this workspace, +# so `branch = "master"` fails to resolve rather than building something newer. worktable = { git = "https://github.com/pathscale/WorkTable.git", rev = "7ab68d17c31e7dd3e56a364ffbb559dd0819b317" } # The `worktable!` macro emits code that names these by bare path rather than # through a re-export, so a consumer of the macro has to declare them too. @@ -72,7 +75,7 @@ chrono = { version = "0.4", default-features = false, features = ["clock", "serd tokio = { version = "1", features = ["process", "rt-multi-thread", "time"] } # Default features are off; see `webview-runtime` for why. tauri = { version = "2", default-features = false, features = ["compression"] } -tauri-runtime-blitz = { git = "https://github.com/pathscale/tauri-runtime-blitz.git", rev = "71d7bd897fc936b54fc4731e56600b9497e402ad", optional = true } +tauri-runtime-blitz = { git = "https://github.com/pathscale/tauri-runtime-blitz.git", branch = "master", optional = true } blitz-dom = { package = "ps-blitz-dom", git = "https://github.com/pathscale/ps-blitz.git", branch = "master", features = ["system-fonts", "parallel-construct"], optional = true } blitz-script = { package = "ps-blitz-script", git = "https://github.com/pathscale/ps-blitz.git", branch = "master", features = ["system-fonts"], optional = true } brotli = { version = "8.0.4", default-features = false, features = ["std"], optional = true } diff --git a/crates/blitz-bench/Cargo.toml b/crates/blitz-bench/Cargo.toml index 314bd702..169e2dcb 100644 --- a/crates/blitz-bench/Cargo.toml +++ b/crates/blitz-bench/Cargo.toml @@ -11,7 +11,7 @@ publish.workspace = true # `tauri-runtime-blitz` for the same types would build a browser engine to send # a wheel event. `cargo tree -p blitz-bench` is the check. [dependencies] -blitz-control-protocol = { git = "https://github.com/pathscale/tauri-runtime-blitz.git", rev = "71d7bd897fc936b54fc4731e56600b9497e402ad" } +blitz-control-protocol = { git = "https://github.com/pathscale/tauri-runtime-blitz.git", branch = "master" } # The same framing the server uses, from the same crate, for the same reason as # the protocol types: a hand-rolled length-prefix reader is how the Python # client hung on its first malformed frame.