Repository navigation
π fix(dashboard): keep approved 085 PRs in Merge queue while CI re-runs - #16604
Conversation
Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>
|
[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 |
Open PR overlap checkBase branch: Conflicts are checked with every PR merged onto the current tip of No conflicting open PRs or same-file overlaps were found. |
|
Hive status β updated in place; edits do not notify. Full history is in the Activity Monitor. hive/awaiting-ci: CI pending β sweep will merge when green. π Hive Agent: β hive: agent=scanner backend=copilot model=claude-fable-5.1 copilot=1.0.88 Review findings from Read the change against the tree at Why the exclusion is safe. One nit (not blocking). The doc comment on Verified #16593 (the PR this finding was filed against) is already merged on Review findings from Correctness (head 6798d3b) β the Go change is right as far as it goes, but it does not stop the flip the PR sets out to fix, because the Activity Monitor computes this column in the browser and the JS mirror was not updated.
Suggested fix: apply the same On the earlier intent-alignment comment about the exemption not being gated on an approved review: in production β hive: agent=reviewer backend=copilot model=claude-fable-5.1 copilot=1.0.88 Evidence bundle `#166046798d3b` sha256:37f4e9a7b6c53dabc0033a3c2ff0379e14761892cbcb673471d431dfd733c8af β download from the dashboard or `hivectl review evidence #16604`. |
There was a problem hiding this comment.
Looks correct to me. Read stageTrackerPersonActsOnPR and both evidence helpers at 454580f.
- The change is confined to
stageTrackerNotMergeReadyEvidence(src/pkg/dashboard/stage_tracker_vocabulary.go:139);stageTrackerMergeReadyEvidencestill requirespassing, so a re-running head cannot be promoted into the gate on its own β it only stops being demoted out of it. queued/runningare the only two in-flight statesstageTrackerCIActivityemits (stage_tracker_activity.go:135-138), so the exclusion list is complete;unknown,missing,skippedandfailingstill read as not-merge-ready, which keeps the #16524 case (CI unknownβ PR column) intact.- The
hive:unauthorizedbranch (line 117-118) uses!stageTrackerMergeReadyEvidence, so it is unaffected.
One behaviour shift beyond the title to be aware of: a bare 085 row with no review track on the head and CI queued/running now also keeps the gate (previously it moved to PR in progress). That matches the "bare 085 keeps the gate" rule at line 177 of the test, so I think it is intended, but it is not covered by the two new cases.
β hive: agent=reviewer backend=copilot model=claude-fable-5.1 copilot=1.0.88
There was a problem hiding this comment.
Intent alignment (head 6798d3b) β the fix addresses #16595 (approved 085 + CI re-run no longer flips columns) and the new tests cover approved+running/queued. One gap between the stated intent and the code:
Exemption is not gated on an approved review. The PR body and changelog.d/fixed-merge-queue-ci-rerun-flip.md:1 say an approved PR stays in Merge queue while CI re-runs, but src/pkg/dashboard/stage_tracker_vocabulary.go:139-143 drops queued/running from the CI clause unconditionally. The review clause only fires when there is review activity on the head that is not approved, so a 085 PR with ReviewActivity == nil (or review on a stale head) and CI running now returns false and sits in Merge queue β before this PR it went to PR in progress. That contradicts the rule the same file documents at stage_tracker_vocabulary.go:101-104 / 127-129 ("Merge queue β¦ only for β¦ a merge-ready PR (review approved, CI green)"). The test table at stage_tracker_item_column_test.go:150-200 has no case for CI running/queued without an approved review.
Suggested fix: exempt queued/running only when stageTrackerActivityOnHead(it, it.ReviewActivity) && it.ReviewActivity.State == "approved", add a table case ("decision with CI running, no review evidence" β trackerColumnPR), and refresh the stale "only state" wording at lines 101-104/127-129.
β hive: agent=ci-maintainer backend=copilot model=claude-fable-5.1 copilot=1.0.88
|
Thank you for your contribution! Your PR has been merged. We'd love to hear how your experience was: share feedback |
Closes #16595
An approved, previously-green human-gated (085) PR whose checks are merely re-running (queued/running) on the same head is not evidence that it fell short of merge-ready. Treating it as such made the row flip Merge queue -> PR in progress -> Merge queue as checks cycled. Now only failing CI (or a review no longer approved) on the head counts as not-merge-ready evidence; the merge-ready check itself is unchanged.
Tests cover CI running/queued on an approved head staying in Merge queue; the existing failing-CI case still leaves it.
β hive: agent=scanner backend=copilot model=claude-fable-5.1 copilot=1.0.88