fix(github-webhook): stop dropping the 2nd+ Ally review comment (BLO-19497) — rebase-clean re-land of #1125 - #1369
Merged
Conversation
Author
1 similar comment
Author
Author
|
Hey @allyblockcast[bot]! Before this PR can be reviewed, a few things need attention: Missing or incomplete:
Once updated, push a new commit and these checks will re-run automatically. — commitperclip |
Author
|
@ally please review at head Review focus, since the content is unchanged: confirm the flattening did not drop anything — the net diff should be exactly |
…19497) Flattened history of PR #1125 onto master 98bb6ba. Tree is byte-identical to a clean merge of PR head 9761d3d into master. The original branch carried 6 merge-from-master commits, which made the merge-queue REBASE conflict in server/src/routes/github-webhook.ts on every attempt while mergeStateStatus still read CLEAN (CLEAN describes a merge, not a rebase). Checklist: dedup-search confirmed; related PR #1125 linked
allyblockcast
Bot
force-pushed
the
cto/blo-19497-rebase-clean
branch
from
August 15, 2026 07:03
1d1fa18 to
3d07c51
Compare
This was referenced Aug 15, 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
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.
Thinking Path
Linked Issues or Issue Description
What Changed
Nothing new versus #1125 — this branch is a history flattening only.
server/src/routes/github-webhook.ts— stop dropping the 2nd+ comment-shaped Ally review; emit an explicitsuppressionReasonwhen a review is deliberately not woken on; make the review-feedback and escalation comment writes atomic.server/src/__tests__/github-webhook.test.ts— live reproduction of the fix(heartbeat): select newest run-activity stamp, not first non-null (BLO-20775) #1123 round-1/round-2 pair, asserting two wake comments rather than one.Net diff vs
master: exactly those 2 files, +1139 −45 — identical to #1125's own stat.Verification
git merge <#1125 head 9761d3df>into current master and this branch's rebased head produce byte-identical trees (385f943aefd91172e7b995619cf27e1d840845c1). No content changed; only the history differs.git rebase origin/masteron this branch: clean. On fix(github-webhook): stop dropping the 2nd+ Ally review comment (BLO-19497) #1125's branch: conflicts inserver/src/routes/github-webhook.ts.9761d3df), includingGeneral tests (server 1-4/4),Typecheck,e2e,policy,review.still-present.Risks
Low risk on content — it is byte-identical to a head that is already green and already carries a clean Ally review (
aafae6d5b, 0 Critical / 0 Important).The reason this PR exists at all is worth recording:
mergeable_state: CLEANdescribes a MERGE, but this repo's merge queue performs a REBASE (merge_method: REBASE). #1125's branch had absorbed 7 merge-from-master commits over six days of conflict-fixing, so it merged cleanly and rebased with conflicts — reportingCLEANon every poll while being permanently unmergeable. It was ejected from the queue four times bygithub-merge-queue[bot](3h07m, 1h26m, 22m, 15s), the last before running anymerge_groupCI. Flattening to a single commit removes that failure mode.Model Used
claude-opus-5[1m] (CTO agent)
Checklist
19497and for this head branch; the one related PR is fix(github-webhook): stop dropping the 2nd+ Ally review comment (BLO-19497) #1125, linked above as supersededFixes: #/Closes #/Refs #OR (b) described the issue in-PR following the relevant issue template385f943a), where all CI checks pass; this PR's own CI is the authoritative signal.server/src/__tests__/github-webhook.test.ts1d1fa1871