Repository navigation
π fix(stage): retry a failed 085 escalation note, once per head and reason - #15043
Merged
hivecommons-hive[bot] merged 1 commit intoOct 28, 2026
Merged
Conversation
β¦eason The adoption escalation marked the head noted before posting its note, so when GitHub answered the adoption-stalled note with a 500 the PR sat at stage/085-needs-decision with no comment on that head ever (projectbluefin/utah-packages#650 and hivecommons#652, 2026-10-26). The same mark-before-post pattern was in the three workflow-path refusal paths and in escalateUnadoptableFork. - stagelabels: MarkAdoptionEscalated records the escalation only; the new MarkAdoptionEscalationNoted records (head, reason) after the post succeeds. AdoptionEscalationNoted(head, reason) checks both, so a new blocker on the same head gets its own note (mirrors EntryCommentExplains, hivecommons#13139). A record from before reasons were kept (noted head, no reasons) reads as noted for every reason on that head, so the upgrade reposts nothing. - automerge: all five call sites post through postAdoptionEscalationNote. The held-escalation branch of escapeStalledAdoption retries an unposted workflow-path refusal note, and hands an unposted or changed stall reason to the stall path instead of holding silently. - Hold an active escalation against a weak opinion: an errored lane on an approved head reads 080 at role rank, which the adoption pin does not claim, so the pass dropped the escalation for a sweep and projectbluefin/utah#919 flipped 085 -> 080 -> 085 on one head (10-26, 10-28). stageengine.HoldsEscalation is shared by the live pass and passDecision so enforce mode derives the same stage. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01BQYnPGFJx81c8JXR3o1sg1 Signed-off-by: Danathar <Danathar@users.noreply.github.com>
Contributor
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
Contributor
Open PR overlap checkBase branch: Conflicts are checked with every PR merged onto the current tip of
|
This was referenced Oct 28, 2026
Contributor
Contributor
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.
Summary
PRs moved to
stage/085-needs-decisionwith no explaining comment, ever.#650 and #652. projectbluefin/utah-packages on 2026-10-26: in one sweep #646, #654 and #658 each got their
<!-- hive:adoption-stalled β¦ hive-signoff-attribution -->note, and #650 and #652 got nothing. The hive's own log shows why:The note was never retried.
escapeStalledAdoptioncalledMarkAdoptionEscalated(which also setAdoptEscalationNotedHead) beforeCreateComment, so a failed post left the head marked as explained. The same mark-before-post order was in the three workflow-path refusal paths and inescalateUnadoptableFork(#15018).Two related defects:
AdoptionEscalationNoted(head)), so a changed escalation reason on the same head (check-failure β hive-signoff-attribution β fork-rehome-refused) went to 085 with the old explanation. 085 entry comment goes stale when the decision cause changes on the same head; @maintainer placeholder pings nobodyΒ #13137 / π 085 entry comment follows the decision cause; flag @maintainer placeholder questionsΒ #13139 fixed the same thing for the lane's own 085 entry comment (EntryCommentExplains) only.The 080 flip on projectbluefin/utah#919. It went 085 β 080 β 085 within two minutes on an unchanged head: 10-26 14:13 to 14:15 (check-failure) and 10-28 09:25 to 09:27 (fork-rehome-refused). An errored lane observation whose approved head looks done on the author's side reads 080 at role rank. 080 does not yield to adoption, so the escalation hold was skipped for that pass and the active 085 was dropped.
Change
pkg/stagelabels/store.go):MarkAdoptionEscalatedrecords the escalation (head and reason) only.MarkAdoptionEscalationNotedis called afterCreateCommentsucceeds.AdoptionEscalationNoted(head, reason)checks the newAdoptEscalationNotedReasons(JSONadopt_escalation_noted_reasons, omitempty).automerge_contributor_adopt.go) go throughpostAdoptionEscalationNote, which marks the note only after it posts. In the hold branch:stageengine.HoldsEscalationis used in bothApplyStageLabelsand the engine'spassDecision, so enforce mode derives the same stage. A non-terminal opinion below owned rank that is not 085 and does not yield to adoption keeps an active escalation on the current head at 085 with its recorded reason. The next owned opinion re-evaluates it.EntryCommentExplainsuses. An upgrade therefore causes no repost, at the cost that a PR whose post already failed before this ships (fix: CONNECT proxy ECONNRESET β write 200 on hijacked connΒ #650, fix: revert VTScreen, fix CLI chrome detection for agent summariesΒ #652) gets its note only when its head moves.labels-and-control-signals.mdandhive-merge.mdnow say "once per (head, reason), retried until it posts".changelog.d/fixed-085-escalation-note-retry.md.Testing
From
src/,TZ=UTC,-count=1:go test ./pkg/github/automerge/ ./pkg/stagelabels/ ./pkg/stageengine/...passes.go build ./...,go vetandgofmtare clean.New tests:
The fake API gained
failComments/failCommentsOn. Four existing fixtures now seed the note explicitly, because "escalated" no longer implies "noted".Mutation checks: 13 mutants, each restored from a backup copy, and every one fails a test. They cover:
Not verified, or still open
no-reviewer) never reaches the escape branch, so that note is not retried. The lane's 085 entry comment still explains the PR.Contributor checklist
changelog.d/fixed-085-escalation-note-retry.md.v6.src/docs/labels-and-control-signals.md,src/docs/hive-merge.md).π€ Generated with Claude Code
https://claude.ai/code/session_01BQYnPGFJx81c8JXR3o1sg1