Integrate upstream block/buzz main (35 commits: onboarding refresh, ACP session scope, thread-context dedup) - #64
Merged
Conversation
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Integrates upstream block/buzz
main(a9dd4d3) into ourproduct/main. We were 243 ahead / 35 behind; 363 files touched on both sides; 15 files conflicted for real.Resolution strategy
buzz-pi-acpforkVerification (local, evidence)
pnpm run check(desktop): ✅ RC=0 — biome + check:px-text + check:pubkey-truncation + check:pubkey-normalization + check:agent-identitycargo test(crates/buzz-acp): ✅ 987+9+9 passed, 0 failedcargo test(desktop/src-tauri): ✅ 3247+7+3 passed, 0 failed_ci-desktop-macos.ymltouch) — artifacts onlyKey upstream changes absorbed
fetch-failedre-onboard logic survived)session_policyon AgentDefinition)Closes the sync gap noted in the fleet survey. Follow-up tracked: watch upstream monthly; next sync target ~30 commits/month cadence.