Repository navigation
Conversation
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. |
There was a problem hiding this comment.
Looks correct to me. Read the change against the tree at the merge-base, not just the diff:
- The slug leaked because Go sets
merge_gate.state = merge_train.statefor train members (src/pkg/dashboard/stage_tracker_merge_train.go:96) andSTAGE_TRACKER_MERGE_GATE_WORD(tracker-words.js:90) has noqueued-behindkey, sowordfell back to the raw state and thesweep_runningbranch toggled theΒ· merge sweep runningsuffix. The early return attracker-words.js:583-587short-circuits before both, so the label is now independent of the sweep clock β matches asks 1 and 2 of #15395. - Issue rows covered by a train member still work: the linked-PR copy carries
MergeTrain(stage_tracker.go:3014), sosrc.merge_trainis set whensrcis the cover. - The
rebasebranch at the top ofstageTrackerMergeGateInfoand thestageTrackerDecidedOfcheck still run first, so this does not override a rebasing or decided row. - Node harness additions (
stageTrackerTrain,stageTrackerOrdinal,stageTrackerTrainLines, the three state consts) are exactly the helpers the new branch calls.
One wording note, not a defect: the chevron for the same row reads In merge train Β· 2nd of 3 (stageTrackerTrainWord, tracker-words.js:157) while the new pill reads In merge queue Β· 2 of 3. The issue asked for the pill text, so this is fine as-is, but a follow-up could align the two.
Sign-off survives the squash shows CANCELLED rather than failed β looks like a run cancellation, not a DCO problem (dco-signoff: yes label, DCO and dco both green).
β hive: agent=reviewer backend=copilot model=claude-fable-5.1 copilot=1.0.88
There was a problem hiding this comment.
Read the diff against the v5 tree and its consumers. The fix is correct for what it targets, and the regression test is adequate.
Why the bug existed (verified): stageTrackerApplyMergeTrain (src/pkg/dashboard/stage_tracker_merge_train.go:94) copies the train state into merge_gate.state, but STAGE_TRACKER_MERGE_GATE_WORD (tracker-words.js:90) has no entry for queued-behind, so stageTrackerMergeGateInfoFor fell through to word = state β the raw slug β and mg.sweep_running toggled the Β· merge sweep running detail (tracker-words.js:602). tracker-row.js:303-304 then lets that gate word override the stageTrackerTrainWord short word, which is why the train wording already present at tracker-words.js:152 never reached the chip. The early return at tracker-words.js:583 (new) sits after the dec check and before the sweep branch, so decided rows and soak clocks keep their precedence. Looks correct to me; the wording matches ask 1 of #15395 verbatim, and Refs #15395 β partial lists what is left.
Two things for the author, neither blocking:
- Wording now diverges within one row (low). The chip says
In merge queue Β· 2 of 3; the chevron short word (stageTrackerTrainWord,tracker-words.js:158) and the tooltip line it builds (stageTrackerTrainLines,tracker-words.js:171) still sayIn merge train Β· 2nd of 3/Position: 2nd of 3. Since #15395 chose "merge queue", consider updating those two helpers (and their assertions instage_tracker_merge_train_test.go:255,263) in the same PR, or have the new branch callstageTrackerTrainWord(src)so there is one source of truth. - Open question, same mechanism: a train member in state
rebasingalso lands inmerge_gate.statewith noSTAGE_TRACKER_MERGE_GATE_WORDentry, so at 080 the chip would read the slugrebasingvia the same fallthrough (tracker-words.js:590post-change). That is outside this PR's stated partial scope; flagging so it is not lost when the rest of #15395 lands.
β hive: agent=reviewer-2 backend=copilot model=claude-fable-5.1 copilot=1.0.88
|
stage 080-awaiting-merge-admission β 060-reviewed: contributor-lane:no-linked-issue |
|
stage 080-awaiting-merge-admission β 050-review-pending: contributor-lane:no-linked-issue |
There was a problem hiding this comment.
Read tracker-words.js and stage_tracker_merge_train.go on v5. Looks correct to me, and the bug is real:
stage_tracker_merge_train.go:96setsit.MergeGate.State = mt.State, so a queued member reachesstageTrackerMergeGateInfoForwithstate === 'queued-behind'.tracker-words.js:90βSTAGE_TRACKER_MERGE_GATE_WORDhas noqueued-behindkey, sowordat:597fell back to the raw state string; then themg.sweep_runningbranch at:619-620returned that as the pill with detailmerge sweep running. The new early return before that line is placed correctly β ahead of the sweep/soak branches, after the decided-row override at:591, so a recorded decision still wins.cue: 'running'vs'waiting'keeps the sweep signal on the glyph while the word stays put, which is what the new node assertion pins (checking.word === waiting.word).
One info note: the pill now reads cardinal 2 of 3 while stageTrackerTrainLines (tracker-words.js:171, unchanged) still builds the tooltip as Position: 2nd of 3, so the same number appears in two forms on one row. Cosmetic; not blocking.
β hive: agent=reviewer-2 backend=copilot model=claude-fable-5.1 copilot=1.0.88
|
Ready for a human merge: verdict approved @695fded, 57/57 checks green, DCO yes, soak 30m0s elapsed. Blocked only by The hive never approves on your behalf: |
|
@Karibhou this PR is back in your court ( Review asks:
Reply here or push a new head to this branch (same sign-off); CI and the review swarm re-run automatically and the PR returns to the normal path. Your relay session received this as a |
|
Check report for Root cause: #15427 (merged to v5 at 17:06Z, Concrete fix (pick one):
As it stands the PR reverts behaviour already on v5, so it should not merge in its current form. π Hive Agent: β hive: agent=scanner backend=copilot model=claude-fable-5.1 copilot=1.0.88 |
|
@Karibhou the hive has adopted this PR ( |
Hive-Run: hivecommons#15395 Hive-Plan: merge-queue-label Hive-Spec: issue-15395#chip-wording Co-authored-by: clubanderson <407614+clubanderson@users.noreply.github.com> Signed-off-by: Karibhou <157208370+Karibhou@users.noreply.github.com>
v5 already ships the queue-position chip (hivecommons#15427, hivecommons#15449): 'Merge queued Β· 2nd', sweep-stable label, spinning cue and a tooltip naming the train and PRs ahead. The early return added here shadowed it with different wording and broke TestStageTrackerMergeQueueChipNode, so drop the superseded JS, its test and its changelog fragment. Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>
e9cb066 to
16015b3
Compare
|
[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 |
|
hive/awaiting-ci: pushed 16015b3 β rebased onto v5 and reverted the superseded chip wording (v5 already ships the queue-position chip via #15427/#15449; this PR's early return shadowed it and broke TestStageTrackerMergeQueueChipNode). Net diff vs v5 is now empty, so maintainers may prefer closing as superseded. CI pending β sweep will merge when green. π Hive Agent: β hive: agent=scanner backend=copilot model=claude-fable-5.1 copilot=1.0.88 |
|
stage 080-awaiting-merge-admission β 074-adopted-by-hive: hive-signoff-attribution |
|
Closing as superseded: v5 already ships the queue-position chip with stable wording and the sweep cue via #15427 and #15449 (merged), so this branch's net diff against v5 is now empty. The remaining #15395 items (head state/reason, ETA, queue popover, stall config, hourly log) stay tracked on the issue. Thanks @Karibhou. π Hive Agent: β hive: agent=scanner backend=copilot model=claude-fable-5.1 copilot=1.0.88 |
Summary
Show a queued merge-train member's position in the merge-gate chip and keep that label stable while a sweep runs. The cue spins and the tooltip says when checking is underway; the tooltip also lists the train and the PRs ahead.
Refs #15395 β partial: head state and reason, ETA, the queue popover, configurable stall detection and hourly activity log remain.
Validation
make dashboard-gensucceeded with a writable Go cache.git diff --checkandgofmt -lpassed.β hive: backend=codex