Repository navigation
🐛 fix(dashboard): a new PR on an auto-merge-off repo says a person merges it instead of waiting for a stage pass that never comes - #17550
Conversation
…rges it Every merge lane skips a repo whose auto-merge is off (its per-repo switch, or any repo of a hive below ACMM L6) before it records stage evidence, so no stage-label pass ever places a PR there. The Activity Monitor still read "New · waiting for the stage-label pass (→ 050 review pending) (next pass due now)" on such PRs for days (projectbluefin/server#626). The 000-new narration on those repos now drops the countdown and the stage-label pass, ends at a human-merge gate ("auto-merge is off for this repo ... — a person merges it") and quotes the merge verdict. When the verdict is a hand merge, the maintainer is the next mover and the row leads with Merge now as maintainer; otherwise the hive stays the next mover for CI and review. 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>
|
[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
|
…insensitively The greyed 'Approve and let hive merge' option reuses the 090 auto-merge-off reason, which starts with a capital A. 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>
|
Hive status — updated in place; edits do not notify. Full history is in the Activity Monitor. Reviewed by Reviewer notesRead the non-test diff against the v6 tree and the SPA. This looks correct to me; no findings. What I checked:
Body and diff agree: dashboard-only, no lane or label changes. |
Summary
On a repo whose auto-merge is off, a new pull request in the Activity Monitor said "New · waiting for the stage-label pass (→ 050 review pending) (next pass due now)" for days. That pass never comes there, because every merge lane skips such a repo before it records anything. This PR makes the row honest: no countdown, no stage-label pass, a final gate that says a person merges it, and the merge verdict. When GitHub would take the merge, the row leads with Merge now as maintainer. Dashboard-only: no lane, merge-path or label changes.
What went wrong
stage/*label and have no stage record. For example, fix: stop false build safety failures projectbluefin/server#626 has read "next pass due now" since 2026-11-05, and ci: run zizmor as an Audit GitHub Actions job projectbluefin/actions#726 (opened by the hive itself) did the same until it was merged by hand.continuepast an auto-merge-off repo beforerecordStage. With no lane observation the stage engine abstains, and the tracker falls back to the 000-new narration, which always names the stage-label pass. Below ACMM L6,config.RepoAutoMergeEnabledis false for every repo, so the same applies to every PR on those hives.What changes
RepoAutoMergeEnabled(repo)is false, the narration (stageTrackerAutoMergeOffNew):new.auto_merge_off;next_pass_at, so the SPA no longer prints "next hive pass due now";TestStageTrackerMaintainerRowsHaveLeadAction's rule holds: every maintainer-moved row has an enabled lead action. Merge now is the existing gated path (merger/owner role, the author cannot merge their own PR, head pinned, confirm dialog).Files
src/pkg/dashboard/stage_tracker_new.go:AutoMergeOfffield,stageTrackerAutoMergeOffNew, gate text.src/pkg/dashboard/stage_tracker_build.go: applies it inaddPRwhen the repo's auto-merge is off; skips the offline-clanker clause there.src/pkg/dashboard/stage_tracker_decision.go,stage_tracker_decision_human_merge.go:decisionForAutoMergeOffNew.src/docs/dashboard-sections/activity-monitor.md: the narration, plusauto_merge_offin thenew{}payload list.changelog.d/fixed-tracker-auto-merge-off-new-pr.md.Tests
Not run locally (AGENTS.md); CI is the verdict.
TestStageTrackerAutoMergeOffNewPRNamesThePersonsMerge(new). L6,acme/consolewithauto_merge: false, governor kick already past.stageTrackerLeadAction.next_pass_at, and have no decision (New.AutoMergeOffand the gate constant don't exist yet).TestStageTrackerAutoMergeOffNewFollowsTheEffectiveSwitch(new).stage_tracker_offline_clanker_test.go: the fixture now sets ACMM 6. With the oldConfig{}(level 0) every repo reads auto-merge off, and that test is about the stage-label-pass caption on a repo where the lanes run.Refs #15122 (the write-back gate, ruled out as the cause).
🤖 Generated with Claude Code
https://claude.ai/code/session_01BQYnPGFJx81c8JXR3o1sg1