[upstream-sync] Upstream sync — block/buzz@54c8ef3...19d57b0 (10 commits) - #12
[upstream-sync] Upstream sync — block/buzz@54c8ef3...19d57b0 (10 commits)#12github-actions[bot] wants to merge 1 commit into
Conversation
|
Closing in favour of a hand-merged branch that preserves upstream ancestry. Two independent problems with this PR:
Replacement branch has real two-parent ancestry, correct file modes, and merges the remaining upstream commits cleanly. |
The 2026-08-01 agentic sync PR (#12) delivered upstream's two new desktop-release-authorization scripts at mode 100644 instead of 100755, so test-release-ref-contract.sh could not execute them. Detect Changed Paths exited 126 on 'Permission denied' and every downstream job skipped, which reads as a broken sync rather than a lost file mode. A mode-only change is a zero-line entry in git diff --stat, so it survives a diff skim. Record the symptom and the ls-tree check so the next run does not re-derive it from a red CI log. Signed-off-by: adrienlacombe <6303520+adrienlacombe@users.noreply.github.com>
Merges 10 commits from
block/buzzmain into this fork.Upstream range:
54c8ef30a...19d57b0d4What changed upstream
Relay
feat(relay): accept kind:30621 multi-repo projects at ingest(feat(relay): accept kind:30621 multi-repo projects at ingest block/buzz#3171) — newKIND_PROJECT = 30621NIP-MP event kind, ingest handler, scope mapping, envelope validation, FTS exclusion.Desktop
feat(desktop): Agent Trading Cards(feat(desktop): Agent Trading Cards — mintable agent-snapshot card PNGs with optional NIP-44 lock block/buzz#3278) — mintable agent-snapshot card PNGs with optional NIP-44 lock.fix(desktop): preserve first huddle speech(fix(desktop): preserve first huddle speech block/buzz#3962)fix(desktop): point Oh My Pi preset at omp.sh(fix(desktop): point Oh My Pi preset at omp.sh block/buzz#3516)ACP
fix(buzz-acp): thread cache-read tokens into NIP-AM kind:44200 events(fix(buzz-acp): thread cache-read tokens into NIP-AM kind:44200 events block/buzz#3999)Mesh/compute
fix(mesh): stop restarting a busy or loading shared-compute node(fix(mesh): stop restarting a busy or loading shared-compute node block/buzz#3909)Release / CI
chore(release): release Buzz Desktop version 0.5.3(chore(release): release Buzz Desktop version 0.5.3 block/buzz#3972) —tauri.conf.jsonversion bump to0.5.3.fix(release): require exact-head approval for desktop tags(fix(release): require exact-head approval for desktop tags block/buzz#3973)fix(release): preserve main in desktop PR body(fix(release): preserve main in desktop PR body block/buzz#3979)Docs
docs: add one-click Railway deploy for a hosted relay(docs: add one-click Railway deploy for a hosted relay block/buzz#2733)Conflicts
crates/buzz-core/src/kind.rsKIND_PROJECT = 30621and kept the fork-localKIND_STARKNET_WALLET_BINDING = 30900block in its reserved position after the NIP-34 git kinds. Both constants are present.crates/buzz-relay/src/handlers/ingest.rsKIND_PROJECTadded alongside the fork'sKIND_STARKNET_WALLET_BINDING.desktop/src-tauri/tauri.conf.jsonproductName: "BitcoinMarkets", took upstream'sversion: "0.5.3".Needs a human look
kind.rs/ingest.rs: The newKIND_PROJECT = 30621(NIP-MP multi-repo projects) has been integrated. Verify that the fork'sKIND_STARKNET_WALLET_BINDING = 30900ingest branch still handles attestation correctly alongside the new project kind, since both are now in the same import list.tauri.conf.json: Version bumped to0.5.3. The desktop release version inCHANGELOG.mdandInfo.plistshould match; no further conflicts seen there.release.yml: Upstream fix(release): require exact-head approval for desktop tags block/buzz#3973 and fix(release): preserve main in desktop PR body block/buzz#3979 touch release CI. This fork carries patches torelease.yml— verify the resolved file still has the fork'sRELEASE_REPOguard andgithub.repository-derived variables intact (those files merged cleanly, but worth a read).Note: This PR was resolved by the agentic sync stage. The merge commit's second parent is dropped when gh-aw applies it as a patch, so the merge base does not advance. Re-merge upstream by hand after merging (
git merge upstream/mainonmain) to keep the counter current.