Skip to content

🌱 Activity Monitor: one chevron word, Queued for merge, for every PR waiting only on the merge - #16657

Merged
hivecommons-hive[bot] merged 1 commit into
v5from
queued-for-merge-wording
Nov 4, 2026
Merged

hivecommons-hive[bot] merged 1 commit into
v5from
queued-for-merge-wording

Conversation

@clubanderson

Copy link
Copy Markdown
Member

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… and Approved · 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).

state before after
080, waiting for the lane's pass Ready for auto merge · next pass in 42s Queued for merge · next pass in 42s
080, pass on it now Ready for auto merge · checking now Queued for merge · checking now
080, trust soak on the head Ready for auto merge · soak 12m left Queued for merge · soak 12m left
merge-train member Merge queued · 2nd of 3 · ~4m Queued for merge · 2nd of 3 · ~4m
Approve / Let hive decide → approve (pending) Approved · merge queue takes it Queued for merge · next pass
Approve and let hive merge (pending) Approved · hive will merge on the next tick once CI is green Queued for merge · after CI
merge call refused: required checks not reported Waiting for CI · 4 checks Queued for merge · after CI (count in the hover)
merge call refused: head moved Merge failed · needs rebase Queued for merge · needs rebase
merge call refused: branch protection Merge failed · branch protection Queued for merge · branch protection pending
080 flagged provisional by the server Ready for auto merge · queued 1st of 2 once ready Review passed · queued 1st of 2 once ready

Unchanged (genuinely different states): Soaking, Merging, Rebasing · attempt 1/2, Needs human decision, and Merge 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: decidedVerbs for approve / queue-merge; stageTrackerQueuedForMergeWord.
  • Toast / action words (tracker-actions.js, tracker-row-acted.js), docs legend (activity-monitor.md, dashboard.md, glossary, api-reference, copy inventory), tests, regenerated static/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-check
  • node --test src/pkg/dashboard/*.test.js — 316 pass
  • go test ./pkg/dashboard/ — ok

…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>
@kubestellar-prow kubestellar-prow Bot added the dco-signoff: yes Indicates the PR's author has signed the DCO. label Nov 4, 2026
@kubestellar-prow

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign kellyaa for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@kubestellar-prow kubestellar-prow Bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Nov 4, 2026
@github-actions

github-actions Bot commented Nov 4, 2026 •

Copy link
Copy Markdown
Contributor

Open PR overlap check

Base branch: v5

Conflicts are checked with every PR merged onto the current tip of v5, so a PR that only needs a rebase is not reported as conflicting with its siblings.

PR Title Relation Files
#16662 🐛 Review and CI chevrons state what the head waits on, never "activity unknown" same files src/docs/dashboard-sections/activity-monitor.md
src/pkg/dashboard/stage_tracker_ui_rows_test.go
src/pkg/dashboard/static/index.html
#16660 🐛 fix: label narrow dashboard navigation same files src/pkg/dashboard/static/index.html
#16659 🐛 Activity Monitor: celebrate externally merged PRs with bee + toast naming the merger same files src/pkg/dashboard/static/index.html
#16637 🐛 Stage tracker: say CI running (not activity unknown) when checks are still pending same files src/pkg/dashboard/stage_tracker_ui_rows_test.go
src/pkg/dashboard/static/index.html
#16634 🐛 fix(dashboard): preserve settled review verdicts and explain findings same files src/pkg/dashboard/static/index.html

@hivecommons-hive hivecommons-hive Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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):

  1. src/pkg/dashboard/stage_tracker_decided.go:120 — the comment says "The SPA's STAGE_TRACKER_QUEUED_FOR_MERGE_WORD mirrors it", but no such constant exists at this head (tracker-words-core.js spells 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.
    
  2. src/pkg/dashboard/static-src/js/tracker-words-gate.js:263 and :267 still say the chip "stays ≤ 5 words", while this PR relaxes the pin to ≤ 6 (stage_tracker_merge_failed_column_test.go:118) because Queued for merge · branch protection pending is six. Change both to ≤ 6 words.
  3. src/docs/operator-reference/README.md:573 still documents the queue-merge toast as approved — hive will merge on the next tick once CI is green; tracker-actions.js:2108 and tracker-row-acted.js:52 now 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

@hivecommons-hive

hivecommons-hive Bot commented Nov 4, 2026 •

Copy link
Copy Markdown
Contributor

Hive status — updated in place; edits do not notify. Full history is in the Activity Monitor.

Review findings from ci-maintainer (folded here because this head already carries its hive review):

Style review (head 833cfdc) — the rename is complete and consistent across Go/JS/docs; no stale Ready for auto merge / Waiting for CI left in shipped strings. Three comments the diff introduces now contradict the code they sit on:

  1. src/pkg/dashboard/stage_tracker_decided.go:120 says "The SPA's STAGE_TRACKER_QUEUED_FOR_MERGE_WORD mirrors it", but no such JS symbol exists — tracker-words-core.js:184 instead says the word is "spelled out in each table", and tracker-words-gate.js:283,296 repeat the bare literal 'Queued for merge'. Either introduce the JS constant (and use it at gate.js:283/296, where there is no test-lifting reason for a literal) or point the Go comment at what actually exists:
// short qualifier after the dot saying why it has not merged yet. The
// SPA spells the same string in STAGE_TRACKER_MERGE_GATE_WORD.ready,
// STAGE_TRACKER_ACTIVE_WORD[80] and STAGE_TRACKER_TRAIN_STATE_WORD.
  1. src/pkg/dashboard/static-src/js/tracker-words-gate.js:263 and :267 still say the chip "stays ≤ 5 words" / "fixed short phrase (≤ 5 words)", while the test cap was raised to 6 in this PR and Queued for merge · branch protection pending (gate.js:295) is six words. Update both to ≤ 6 words.

  2. src/pkg/dashboard/static-src/js/tracker-words-core.js:326 keeps "Keys below STAGE_TRACKER_MERGE_READY only." immediately above a table that now has key 80 (== STAGE_TRACKER_MERGE_READY, core.js:321). Suggest "Keys at or below STAGE_TRACKER_MERGE_READY" or drop the sentence, since the next comment already explains the 080 entry.

Review findings from adjudicator (folded here because this head already carries its hive review):

Correctness review @ 833cfdc — no blocker; two small wording drifts the rename introduces.

  1. Timed-out approval now reads "Queued for merge" — stage_tracker_decided.go:208 builds the timed-out text from d.Word, which decidedVerbs (lines 136/142) now sets to Queued for merge for approve / queue-merge. Result: Queued for merge · no effect after 30m — options in the row menu, and the history badge's short (static/index.html:18961, dec.word + ' — ' + dec.verdict) reads Queued for merge — approve — stuck for exactly the row that is not going to merge. The chevron itself is unaffected (stageTrackerDecidedOf only uses decided.text while effect === 'pending', index.html:16487), so this is low severity, but the label contradicts Activity Monitor: three different Merge chevron captions for PRs that are all just queued for merge #16653's intent ("nothing left but the merge"). Suggested fix in the timed-out branch:

    	case !a.At.IsZero() && now.Sub(a.At) >= timeout:
    		d.Effect = decidedEffectTimedOut
    		if d.Word == stageTrackerQueuedForMergeWord {
    			d.Word = "Approved"
    		}
    		d.Text = d.Word + " · no effect after " + formatETA(timeout) + " — options in the row menu"
    
  2. Stale word cap in the comment — tracker-words-gate.js:263-268 still says "the chip stays ≤ 5 words" / "fixed short phrase (≤ 5 words)", but Queued for merge · branch protection pending (line 294) is six and stage_tracker_merge_failed_column_test.go:118 now asserts ≤ 6. Update the comment to ≤ 6 so the next reader doesn't "fix" the test.

Note: the chips deviate from the issue's table (· after CI · 4 checks → count moved to the hover; · waiting for branch protection → · branch protection pending); the PR body documents both, and they fit the stated cap, so I treat them as intentional.

Review findings from reviewer (folded here because this head already carries its hive review):

Read the diff against the v5 tree (JS word tables, the refusal classifier, and the Go decidedVerbs side). The rename is consistent and complete; looks correct to me.

What I verified

  • Every row in the PR's before/after table has a code path: STAGE_TRACKER_MERGE_GATE_WORD.ready / STAGE_TRACKER_ACTIVE_WORD[80] (tracker-words-core.js:185,191), both train queue states (:257), both decidedVerbs entries (stage_tracker_decided.go:136,142), and the three refusal kinds in stageTrackerMergeFailedWord (tracker-words-gate.js:283,294-297). The kinds head-moved and protection are real outputs of the classifier (tracker-words-gate.js:255,257), so the new queuedDetail branch is reachable, and review / method / merge-queue / forbidden still fall through to Merge failed · <reason> — matching the activity-monitor.md line that a refusal a person must fix keeps its own word.
  • The new 80: 'Review passed' provisional entry is reachable: stageTrackerTrainProvisionalHeadline (:343-348) is keyed by stage with no < MERGE_READY guard, and stageTrackerTrainIsProvisional returns true for merge_train.provisional === true regardless of stage (:337).
  • No stale copies left behind: grep for Ready for auto merge, Merge queued, Waiting for CI across non-test .go/.js under pkg/dashboard returns nothing on this head; the docs (dashboard-copy-inventory.md:105-107, activity-monitor.md:571) were updated in step.

One low note: the new comment at stage_tracker_decided.go:119-120 says "The SPA's STAGE_TRACKER_QUEUED_FOR_MERGE_WORD mirrors it", but no such JS constant exists — the string is spelled out per table (as the tracker-words-core.js:183-184 comment says it is, deliberately, so tests can lift lines one at a time). Worth pointing the Go comment at STAGE_TRACKER_MERGE_GATE_WORD.ready instead so the next reader does not go looking for a constant that is not there.

go test is not runnable in this agent's pod; the merge-gate equality pin (stage_tracker_merge_gate_test.go) runs in CI.

Evidence bundle `#16657833cfdc` sha256:6e112aac7ef21ab79cb00cf001ab374f45839c1245a27384462d463637ccb023 — download from the dashboard or `hivectl review evidence #16657`.

@hivecommons-hive
hivecommons-hive Bot merged commit 718eb7e into v5 Nov 4, 2026
87 of 91 checks passed
@kubestellar-prow
kubestellar-prow Bot deleted the queued-for-merge-wording branch November 4, 2026 20:40
@github-actions

github-actions Bot commented Nov 4, 2026

Copy link
Copy Markdown
Contributor

Thank you for your contribution! Your PR has been merged.

We'd love to hear how your experience was: share feedback

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

dco-signoff: yes Indicates the PR's author has signed the DCO. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Activity Monitor: three different Merge chevron captions for PRs that are all just queued for merge

1 participant