Skip to content

πŸ› tracker: merge queue ordinals, one column, readable train icon, no conflicting riders - #15449

Merged
clubanderson merged 2 commits into
v5from
train-position-round5
Oct 29, 2026
Merged

clubanderson merged 2 commits into
v5from
train-position-round5

Conversation

@clubanderson

Copy link
Copy Markdown
Member

Follow-up to #15427 (merged) with the owner's round of feedback on the live train (hive #15400 / #15425 rows). Same concern β€” the merge-train chevron β€” one PR.

Fixes #15395 (follow-up round).

What changed

Ordinal wording, no slugs. The train position now reads Merge queued Β· 1st / 2nd / 3rd … 11th 21st on the chevron, with hover "1st of N in the merge queue Β· merges next Β· ETA ~Xm" / "2nd of N in the merge queue Β· behind #15400 Β· ETA ~Xm". The header chip is merge train Β· 2 PRs Β· 1st: #15400. The strings front and queued-behind no longer appear anywhere user-facing β€” chevron, hover, caption, header chip, popover, stage comment sentence, decision copy. A test enumerates every merge_train.state and fails on either slug (and on ordinals rendering wrong for 1/2/3/11/12/13/21/22/23). "merge sweep running" is folded into the hover only; the chevron stays a single label (#15416).

1st-in-train row lit the CI/Review column. stageTrackerAnchor only pulled merging/merge-failed into the merge column; a train head whose stage cursor sat at 50/60/70 (CI still re-running after rebase) anchored in the review column. Now any item with merge_train.state past the PR column anchors in the Merge-queue column; a test asserts every train state at stages 50–95 resolves there.

"Merge gate" β†’ "Merge queue" in all user-facing copy: column header, hover/caption, legend heading, tracker-words, deferred note, decision glossary (Go + JS mirror, byte-identical), docs. Internal ids/classes/JSON keys (merge_gate, .ham-gate-*, merge-gate) unchanged.

Readable train icon. Header chip and Merge-queue column header share an inline Octicon-style SVG (14px, currentColor, side-view railcar with two wheels, <title>Merge queue</title>, aria-label). STAGE_TRACKER_ICONS[80] carries the same path; a test asserts the two literals are equal.

Conflicting / returned PRs never ride. hive #15307 (mergeable=CONFLICTING, returned to contributor at 072) got a stage 080 … merge-train:queued-behind#15424:4/6 comment. The planner now excludes DIRTY/CONFLICTING PRs and anyone carrying the returned-to-contributor label (or stage-store observation) from train membership and from the train size N; the only exception is a dirty member the train is itself repairing (resolver wired, attempt in progress). Excluded PRs get a once-per-head merge train: PR left out of every train … why=conflicting|returned-to-contributor log line and no stall comments. Tests: TestPlanMergeTrainsExcludesReturnedAndConflicting, updated front/sibling/rebase-guard tables.

Screenshot

Merge-queue column header with the train icon, header chip "merge train Β· 2 PRs Β· 1st: #15400", and the two rows reading "Merge queued Β· 1st Β· ~13m" and "Merge queued Β· 2nd Β· ~4m" with the 2nd-place hover text

Docs / changelog

src/docs/dashboard-sections.md, dashboard-copy-inventory.md (new "Merge queue" section), operator-reference.md, api-reference/dashboard-misc.md, labels-and-control-signals.md; changelog.d/added-merge-queue-position.md updated, changelog.d/fixed-merge-train-conflicting-excluded.md added.

…ing riders

- Train position reads 'Merge queued Β· 1st/2nd/…' everywhere; the slugs
  'front' and 'queued-behind' never reach a chevron, hover, header chip or
  decision sentence (tests enumerate every train state).
- Every merge-train state β€” the 1st rider included β€” anchors in the
  Merge-queue column, never CI/Review.
- Column copy 'Merge gate' β†’ 'Merge queue' (ids/classes/JSON unchanged).
- Header chip and column header share a readable inline-SVG train icon
  (14px, currentColor, title 'Merge queue').
- Conflicting (DIRTY) and returned-to-contributor PRs are excluded from
  train membership and size, so they get no stall comments.

Signed-off-by: Andrew Anderson <andy@clubanderson.com>
@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 nicholasjackson 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 dco-signoff: yes Indicates the PR's author has signed the DCO. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Oct 29, 2026
@github-actions

github-actions Bot commented Oct 29, 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
#15405 πŸ› fix: require verified signature for email-only hive commit identity match same files src/docs/operator-reference.md
#15308 ✨ feature: enqueue eligible PRs into GitHub native merge queues same files src/docs/labels-and-control-signals.md
#15400 πŸ› fix: keep merge queue position visible during sweeps same files src/pkg/dashboard/stage_tracker_merge_gate_test.go
src/pkg/dashboard/static-src/js/tracker-words.js
src/pkg/dashboard/static/index.html
#15425 πŸ› fix: identify tracker claims from the local ledger same files src/pkg/dashboard/static-src/js/tracker-row.js
src/pkg/dashboard/static/index.html
#15444 πŸ› tracker: one-line PR sub-row header same files src/pkg/dashboard/stage_tracker_ui_test.go
src/pkg/dashboard/static-src/css/tracker.css
src/pkg/dashboard/static-src/js/tracker-row.js
src/pkg/dashboard/static/index.html

@hivecommons-hive

Copy link
Copy Markdown
Contributor

@clubanderson is auto-promoted for contributor-lane merging on this PR: the last 5 merged PRs by this author in this hive's repositories have no revert or sentinel-alert evidence. CI, reviewer verdict, diff fences, soak, holds and branch protection still apply.

@hivecommons-hive

Copy link
Copy Markdown
Contributor

@clubanderson this PR is held at stage/071-needs-author and the hive will not merge it yet.

Failing checks:

  • relative links and anchors resolve

Next: the hive does not push to your branch. Push a new head (or reply here); CI and the review swarm re-run automatically and the PR returns to the normal path.

@hivecommons-hive

Copy link
Copy Markdown
Contributor

stage 080-awaiting-merge-admission β†’ 071-needs-author: optional-check-failing:relative links and anchors resolve

Signed-off-by: Andrew Anderson <andy@clubanderson.com>

@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.

Read the Go changes and the tracker JS against v5 at 2d97036; the behaviour change looks correct to me. One sequencing note for a maintainer at the end.

Verified in the tree:

  • planMergeTrains (src/pkg/github/automerge/automerge_merge_train.go:366-369, 431-437): returned-to-contributor PRs are dropped before perBase is built, and conflict outsiders are zeroed (m.Number = 0) after the live-head refresh. groupMergeTrains (automerge_merge_train.go:196) already skips m.Number <= 0, so an excluded member neither takes a slot nor counts toward size.
  • mergeTrainConflictOutsider (automerge_merge_train.go:477-487) keeps a dirty member only when mergeTrainLastFront > 0, a resolver is wired, and 0 < attempts < MaxRebaseAttempts β€” which is exactly the "the train is repairing it" exception the body describes.
  • mergeTrainSkipLogged goes through markTerminalHoldLogged (automerge_held_runs.go:672), keyed on head SHA + reason, so the INFO line is once per head as claimed.
  • mergeTrainReturnedToContributor reads the label via stagelabels.ReturnedToContributor.Label() and falls back to store.Get(stagelabels.Key(...)) β€” both exist on v5 (stagelabels.go:64, 273).
  • stageTrackerAnchor (tracker-row.js:17-21) now anchors any merge_train.state past the PR column in the Merge-queue column; the glossary Go/JS copy swap is wording only, slugs and aliases untouched.
  • go build ./pkg/github/automerge/ ./pkg/stageengine/prstage/ ./pkg/delegatedecision/ ./pkg/dashboard/ passes on the head. Go tests are CI's (not runnable from this pod).

Overlap with #15400 (open, @Karibhou, Refs #15395). It inserts an early return in the merge-gate word function (tracker-words.js, after the laneReason line, in the queued-behind && src.merge_train case) that renders 'In merge queue Β· ' + position + ' of ' + size. This PR does not touch that function (its nearest hunk is at tracker-words.js:712), so the two merge cleanly β€” but if #15400 lands as well, that early return fires before stageTrackerTrainWord and the chevron would read "In merge queue Β· 2 of 6" instead of this PR's "Merge queued Β· 2nd", undoing the single-vocabulary goal stated here. Not a defect in this diff; flagging so whoever merges decides whether #15400 is superseded by this one or needs rewording on top of it. I have not touched #15400.

β€” hive: agent=reviewer backend=copilot model=claude-fable-5.1 copilot=1.0.88

@clubanderson
clubanderson merged commit 0fe221e into v5 Oct 29, 2026
75 of 76 checks passed
@kubestellar-prow
kubestellar-prow Bot deleted the train-position-round5 branch October 29, 2026 18:20
@github-actions

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

hivecommons-hive Bot added a commit to Karibhou/hive that referenced this pull request Oct 29, 2026
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>
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/XL Denotes a PR that changes 500-999 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Activity Monitor: merge-train rows read "queued-behind" for hours with no position, head or reason; chip wording flips every sweep

1 participant