Skip to content

πŸ› tracker: chevron and caption agree β€” queue slot is a suffix until the PR is ready - #15581

Merged
hivecommons-hive[bot] merged 2 commits into
v5from
fix/queued-vs-ci-headline
Oct 30, 2026
Merged

hivecommons-hive[bot] merged 2 commits into
v5from
fix/queued-vs-ci-headline

Conversation

@clubanderson

Copy link
Copy Markdown
Member

Fixes #15580

Which one was correct for #15577

The caption. Tracker item: stage: 50, reason: required-check-pending:build-and-test; gh pr view 15577: build-and-test IN_PROGRESS, no reviews, BLOCKED. The PR was merely ordered first in a 2-PR train (overlap: tracker-words.js), not mergeable.

Root cause

stageTrackerMergeTrainPostPass marks a train's front at any stage < 110 (merge_gate.state=front, "merges next"), and the SPA (stageTrackerMergeGateInfoFor / stageTrackerTrainWord) painted the train word over the stage word whenever merge_train was present. The chevron therefore showed a future queue slot while the caption showed the current blocker.

Change

Layer Before After
Go StageTrackerMergeTrain no readiness signal provisional: true for members at stage in (0, 80)
Go gate reason (provisional front) "1st in the merge queue; merges next" "1st in the merge queue; merges first once it is ready"
SPA chevron headline πŸ•“ Merge queued Β· 1st πŸ•“ CI / Review Β· queued 1st once ready (stage-first; slot is a muted suffix)
SPA chevron tip queue tip only <stage word> β€” <blocker>. <queue tip>
Planner ordering kept kept

Stages β‰₯ 080 (merge-ready, soak, merging) are unchanged.

Tests

  • TestStageTrackerMergeTrainProvisionalFront β€” Go: front at 050 is provisional with the new reason; rider at 080 is not.
  • TestStageTrackerQueueSlotHeadlineAgreesWithStage β€” node ratchet: every (stage Γ— front/queued-behind Γ— provisional true/false/undefined) combination yields a headline whose blocker class matches the stage; exact πŸ› tracker: say 'mergeable' instead of merge-sweep jargon on soaking rowsΒ #15577 case asserted.
  • Existing headAt50 assertion updated.

Screenshots

Before (#15577 repro):

chevron reads Merge queued Β· 1st while caption says CI still running

After:

chevron reads CI / Review Β· queued 1st once ready

…he PR is ready

The merge-train post-pass marks a train's front at any stage, and the SPA
painted the train word ("Merge queued Β· 1st") over the stage word, so the
chevron advertised a future queue slot while the caption described the
current blocker (CI running / verdict pending).

- Go: StageTrackerMergeTrain.Provisional (stage in (0,80)); provisional
  front gate reason says "merges first once it is ready".
- SPA: stage-first headline; train slot is a trailing suffix until
  merge-ready; chevron tip carries the blocker.
- Tests: Go provisional-front test and node ratchet asserting headline
  and stage agree for every (stage, merge_train.state, provisional) combo.

Fixes #15580

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 Oct 30, 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 hanthor 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 Oct 30, 2026
@github-actions

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
#15530 πŸ› fix(dashboard): issue-row linked PR passes null when the lineage chip is empty same files src/pkg/dashboard/static/index.html
#15565 🌱 refactor: split tracker words source same files src/pkg/dashboard/static-src/js/tracker-words.js

@hivecommons-hive
hivecommons-hive Bot merged commit b689da1 into v5 Oct 30, 2026
77 of 78 checks passed
@kubestellar-prow
kubestellar-prow Bot deleted the fix/queued-vs-ci-headline branch October 30, 2026 00:35
@hivecommons-hive

Copy link
Copy Markdown
Contributor
Evidence bundle `#155817f97fdb` sha256:81718e176c61dd046e05162614b3b235f834ea03baef346dfca190f36bfdd7de β€” download from the dashboard or `hivectl review evidence #15581`.

@hivecommons-hive

Copy link
Copy Markdown
Contributor

merged by Hive trusted-author auto-merge: author @clubanderson holds role owner and GitHub permission admin on repo; CI green at 7f97fdb.

@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 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 stageTrackerMergeTrainPostPass, the stage table, and both JS copies on this head. Looks correct to me.

  • src/pkg/dashboard/stage_tracker_merge_train.go:98-100: stageTrackerMergeTrainProvisional uses stagelabels.AwaitingMergeAdmission.Number(), which is 80 (src/pkg/stagelabels/stagelabels.go:275); the JS STAGE_TRACKER_MERGE_READY = 80 agrees, and stage 85 (needs-decision) correctly falls outside the provisional range on both sides.
  • STAGE_TRACKER_PROVISIONAL_STAGE_WORD matches stageTrackerShort word-for-word for every key (src/pkg/dashboard/stage_tracker.go:807-831), so the chevron headline and the stage column name the same blocker.
  • The tracker-words.js and static/index.html additions are byte-identical, and stageTrackerTrainProvisionalJS is lifted into the existing JS test harness so a drift between them would fail the Go tests.
  • Provisional is omitempty; the JS falls back to the stage check when the field is absent, so an older server still renders sensibly.
  • The tooltip .replace(/ Β· merges next/, …) at tracker-words.js:869 has a real target in stageTrackerTrainQueueTip (:326), and detail is consumed by the chip renderer (:992), so the suffix actually shows.

Nothing to flag.

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

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.

tracker: chevron says "Merge queued Β· 1st" while caption says CI still running / verdict pending

1 participant