Repository navigation
🌱 Activity Monitor: one chevron word, Queued for merge, for every PR waiting only on the merge - #16657
Conversation
…waiting only on the merge Three adjacent approved rows on hive's own tracker read Ready for auto merge …, Approved · hive will… and Approved · merge queu…. Every state whose only remaining step is the merge itself now reads Queued for merge with a short qualifier after the dot (· next pass in 42s, · checking now, · soak 12m left, · 2nd of 3, · next pass, · after CI, · needs rebase, · branch protection pending); the tooltip keeps the explanation. Fixes #16653 Signed-off-by: Andrew Anderson <andy@clubanderson.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
|
There was a problem hiding this comment.
intent-alignment — read head 833cfdc (diff + tracker-words-core.js, tracker-words-gate.js, stage_tracker_decided.go, docs). The diff covers every row of #16653's table: 080 (STAGE_TRACKER_MERGE_GATE_WORD.ready, STAGE_TRACKER_ACTIVE_WORD[80]), train seats (STAGE_TRACKER_TRAIN_STATE_WORD), Approve / Queue merge (decidedVerbs), and the checks-pending / head-moved / protection refusals (stageTrackerMergeFailedInfo). The two departures from the issue's table — · after CI without the check count, and · branch protection pending instead of · waiting for branch protection — are stated in the PR body and are within the hive's own call. No scope creep. Three small pieces of drift the change itself leaves behind (advisory, non-blocking):
src/pkg/dashboard/stage_tracker_decided.go:120— the comment says "The SPA'sSTAGE_TRACKER_QUEUED_FOR_MERGE_WORDmirrors it", but no such constant exists at this head (tracker-words-core.jsspells the string into each table instead, per its own comment at L183–L185).// SPA spells the same string into STAGE_TRACKER_MERGE_GATE_WORD.ready, // STAGE_TRACKER_ACTIVE_WORD[80] and STAGE_TRACKER_TRAIN_STATE_WORD.src/pkg/dashboard/static-src/js/tracker-words-gate.js:263and:267still say the chip "stays ≤ 5 words", while this PR relaxes the pin to ≤ 6 (stage_tracker_merge_failed_column_test.go:118) becauseQueued for merge · branch protection pendingis six. Change both to≤ 6 words.src/docs/operator-reference/README.md:573still documents thequeue-mergetoast as approved — hive will merge on the next tick once CI is green;tracker-actions.js:2108andtracker-row-acted.js:52now say queued for merge — hive merges it on its next pass once CI is green.
— hive: agent=adjudicator-3 backend=copilot model=claude-fable-5.1 copilot=1.0.88
|
Hive status — updated in place; edits do not notify. Full history is in the Activity Monitor. Review findings from Style review (head 833cfdc) — the rename is complete and consistent across Go/JS/docs; no stale
Review findings from Correctness review @ 833cfdc — no blocker; two small wording drifts the rename introduces.
Note: the chips deviate from the issue's table ( Review findings from Read the diff against the v5 tree (JS word tables, the refusal classifier, and the Go What I verified
One low note: the new comment at
|
|
Thank you for your contribution! Your PR has been merged. We'd love to hear how your experience was: share feedback |
Fixes #16653
What
On hive's own Activity Monitor, three adjacent rows — all PRs approved, green and simply waiting for hive to merge — read
Ready for auto merge …,Approved · hive will…andApproved · merge queu…. The user: "can we use a common statement for things ready to merge? 'queued for merge' perhaps?"Every state whose only remaining step is the merge itself now reads one chevron word, Queued for merge, with a short, actionable qualifier after the dot and nothing else before it. The tooltip keeps the full explanation (who approved, when, which mechanism merges it, ETA when known).
Ready for auto merge · next pass in 42sQueued for merge · next pass in 42sReady for auto merge · checking nowQueued for merge · checking nowReady for auto merge · soak 12m leftQueued for merge · soak 12m leftMerge queued · 2nd of 3 · ~4mQueued for merge · 2nd of 3 · ~4mApproved · merge queue takes itQueued for merge · next passApproved · hive will merge on the next tick once CI is greenQueued for merge · after CIWaiting for CI · 4 checksQueued for merge · after CI(count in the hover)Merge failed · needs rebaseQueued for merge · needs rebaseMerge failed · branch protectionQueued for merge · branch protection pendingReady for auto merge · queued 1st of 2 once readyReview passed · queued 1st of 2 once readyUnchanged (genuinely different states):
Soaking,Merging,Rebasing · attempt 1/2,Needs human decision, andMerge failed · not allowed / review required / merge method off / GitHub refused / retrying— refusals a person must fix.Where
tracker-words-core.js:STAGE_TRACKER_MERGE_GATE_WORD.ready,STAGE_TRACKER_ACTIVE_WORD[80],STAGE_TRACKER_TRAIN_STATE_WORD.front/queued-behind;STAGE_TRACKER_PROVISIONAL_STAGE_WORD[80].tracker-words-gate.js:stageTrackerMergeFailedInfo— checks-pending / head-moved / protection keep the queue word; chip cap relaxed from 5 to 6 words (the queue word is three).stage_tracker_decided.go:decidedVerbsfor approve / queue-merge;stageTrackerQueuedForMergeWord.tracker-actions.js,tracker-row-acted.js), docs legend (activity-monitor.md,dashboard.md, glossary, api-reference, copy inventory), tests, regeneratedstatic/index.html.The 080 row caption / Go captions ("Green and approved; waiting for the automerge lane to admit it", merge-train sentences) are the tooltip text and are unchanged — they are the full explanation the chevron word points to. No TUI or hub rollup carries this word.
Verification
make dashboard-gen-checknode --test src/pkg/dashboard/*.test.js— 316 passgo test ./pkg/dashboard/— ok