mirror of
https://github.com/block/buzz.git
synced 2026-11-04 08:21:48 +00:00
eeca9e78ca
Fold current origin/main into the cross-workspace agent library branch. Base was re-taken from934f3325cafter main rewound past the prior staged base (203735f15): the TTS-playback merge was reverted and #6271 (buzz-dev-mcp ~ expansion) and #6261 (buzz-acp workspace-scan) landed. The 12 Rust conflict files were byte-identical between the two bases, so every resolution replayed 1:1. Non-conflict main additions (#6271/#6261, identity-persistence coordinator, owner-identity egress) merge cleanly. Re-thread #6003 workspace-apply staleness guard, a one-sided main addition the prior resolution dropped: app_state fields + init, the next_apply_generation/assert_current_apply_generation/begin_workspace_apply helpers, WORKSPACE_APPLY_SUPERSEDED, and main's tests, with the apply lock transferred into HEAD's restructured fire-and-forget restore spawns so the guard survives the reshaped restore path rather than pasting main's now-incompatible spawn. Co-authored-by: Will Pfleger <pfleger.will@gmail.com> Signed-off-by: Will Pfleger <pfleger.will@gmail.com>