Repository navigation
ci: upstream merges must keep every signalbox hook line - #693
Merged
Merged
Conversation
The Upstream Merge job fails a PR that merges upstream T3 Code and drops a signalbox: hook line, unless upstream deleted the hook's file. A new Upstream Sync check passes only on such a PR, as evidence a folder's Merge gate can trust (#692, for #5). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This was referenced Oct 16, 2026
Owner
Author
|
Merged by the coordinator. CI was green on the head, with no bot findings. The builder's live proof is in this PR. A scratch merge of current main with #665, #706, #688, #693 and #651 passed: contracts 676 tests, automations 24, the api parity check 21, cloud GitHub and automations 38, mobile 17, plus server layer, compiler and upstream-sync hook tests. Typecheck was clean for contracts, cloud, server, web and mobile. |
This was referenced Oct 16, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Problem
"Hooks intact" on an upstream sync PR is checked by eye. #5 moves the sync into a Signalbox automation that merges through the signalbox folder's Merge gate with every client closed, so the gate needs machine evidence that a PR is a real upstream merge that kept every
signalbox:hook line. A branch name or title isn't evidence.Fix
scripts/upstream-sync/check-hooks.tsruns in the Upstream Merge job on PRs. When the head brings in upstream commits the base lacks, it diffsbase...headand fails when a removed hook line isn't added back anywhere. Matching is by hook text, so a hook that moved with upstream's refactor counts as kept, and hooksmaingained after the branch left don't count. A hook in a file upstream deleted (not renamed) is a notice, not a failure: it went with the code it hooked.Upstream Syncjob runs only when the head merges upstream, and needs Upstream Merge to pass. It's skipped on every other PR, so it stays out ofCheck'sneeds(which fails on skipped jobs).The diff approach matters in CI's
blob:nonecheckout. Grepping both full trees fetched blobs one by one (75–90s) and hit a promisor fetch error. The diff prefetches in one batch: 2–3s.Verification
vp test run upstream-sync/inscripts: 13 passed. They cover every hook form, a moved hook, a dropped one, a base that moved on, a non-sync PR, and upstream-deleted vs renamed files.blob:noneclone (chore: sync upstream T3 Code #173, chore: sync upstream T3 Code #203, chore: merge upstream T3 Code (339179f50a) #407, chore: merge upstream T3 Code (a9c9c7cdb1) #572, chore: sync upstream T3 Code #621): all pass. chore: merge upstream T3 Code (a9c9c7cdb1) #572 reports the three hooks inNightlyMobileBeta.tsx, which upstream deleted in fix(mobile): make test builds optional and preserve APK releases pingdotgg/t3code#20092.actionlintand lint are clean on the changed files.Closes #692. Part of #5, map #384.
🤖 Generated with Claude Code