You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
Repository navigation
🐛 [reviewer] operator decision is lost when the hive refreshes the PR's base; PR re-parks at 085 #15751
On hive-authored #15649 (adopted from #15433, fixes #15432) the operator recorded an approve decision via POST /api/repos/{o}/{r}/items/15649/decision at ~04:00 ET on head A (status approval-commented, released [approval-recorded, admitted]).
Later the hive itself merged v5 into the branch — the require_current_base refresh, a merge commit authored by the App with no change to the PR's diff vs base. New head B = 72246f98. The reviewer swarm re-reviewed B, returned requires_human (finding: "the reviewer marked this change high-risk" — security-sensitive path, proxy private-address bypass) and the stage engine logged:
The PR went back to stage/085-needs-decision and the operator had to approve the same diff a second time.
Why
review-human-change-requests.json is head-scoped by design: a new head supersedes every decision on the old one (#14679). That is right for any push a person or agent makes. It is wrong for the one head change the hive makes itself without touching the PR's content: the base refresh.
#15722 makes the hold guard reject carried GitHub review approvals across heads (adoption carry). That stays as is — a GitHub review names one commit. This issue is the narrow exception for the operator's recorded decision when, and only when, the new head is a merge commit authored by the App whose parents are the decided head and a base-branch commit, and whose base...head diff is identical (file set, blobs, patches) to the decided head's. Any other head change still invalidates the decision.
Fix
pkg/github: BaseRefreshChecker.HeadIsBaseRefreshOf (memoised per PR/head; one commit read + two compares) and DecisionCarrier that re-records the decision on the new head with carried_from_head, logging one INFO decision carried over base refresh.
Applied in the reviewer-verdict stage route (decision_answered stays true), the automerge review gate / operator admission, and the hold guard's operator-admission path.
Tests: carried on a pure base refresh; not carried when a content commit was pushed (even with a base merge), when the merge was not by the App, when the diff changed, or for GitHub review approvals; logged once.
Activity
🐛 reviewer: carry operator decision over the hive's own base refresh (h…