Skip to content

🐛 tracker: say 'mergeable' instead of merge-sweep jargon on soaking rows - #15577

Merged
clubanderson merged 1 commit into
v5from
fix/tracker-mergeable-word
Oct 30, 2026
Merged

clubanderson merged 1 commit into
v5from
fix/tracker-mergeable-word

Conversation

@clubanderson

Copy link
Copy Markdown
Member

Fixes #15575

What the owner saw

Soaking row for #15548 → PR #15551 read 🕓 Soaking · ready — merge sweep… (truncated) with the caption …the pre-merge soak window is running — soaking, 0s left at the last sweep. Owner: "instead of 'merged sweep' — maybe we use 'mergeable'?"

Change

Three states, in the owner's words (🕓 kept; ⟳ while the lane's pass is on the row):

state chevron caption / hover
soak running Soaking · 4m left (counts down in place) Admitted by the automerge lane; soaking — 4m left
soak elapsed, waiting for the next pass Soaking · complete Admitted by the automerge lane; soak complete — merges on the next pass / hover Soak complete — merges on the next pass (next pass in 3m).
soaked, pass on it Mergeable · merging now Mergeable — merging now.
  • stageTrackerSoakWords / stageTrackerSoakTick (tracker-words.js): the new words; the tick now also flips the chevron word (Soaking → Mergeable) between polls, not just the detail.
  • New stageTrackerNextPassWords; every user-facing "sweep" in the gate/train copy becomes a plain state word: next pass in 42s, pass due now, checking now (060 pass glyph), any moment now (queue chip), waiting for the next merge pass (stalled train), merges on hive's next pass (train head_reason, decided Approved), the automerge lane's merge call (Merging caption).
  • Go: the 095 caption is now built at the call site with the injected now (stageTrackerSoakCaption) so the remaining soak is aged from the lane's last read instead of pinning the last-read value — the "0s left" on a row still called soaking now reads soak complete — merges on the next pass.
  • Docs: dashboard-sections.md merge-queue legend, dashboard-copy-inventory.md (new Soaking rows section; lists the decision Next sentences and STAGE_TRACKER_MERGE_PATH_WORDS.sweep as the follow-up).

Not touched: merge_gate.sweep_running / next_sweep_at JSON keys, the STAGE_TRACKER_MERGE_PATH_WORDS.sweep merge-path name, and the ⋯ decision Next text (one concern per PR).

Screenshots (Playwright, same three fixtures, 2× scale; chevron ≈148 css px)

Before — row 2 and 3 truncate at ready — next sweep i… / ready — merge sweep…:

before: Soaking · ready — merge sweep… truncated

After — nothing truncates (scrollWidth == clientWidth for all three):

after: Soaking · 5m left, Soaking · complete, Mergeable · merging now

Soaking rows read 'Soaking · ready — merge sweep…' (truncated) with a caption
pinning '0s left at the last sweep' after the window had elapsed. Use the
owner's three states — 'Soaking · 4m left', 'Soaking · complete',
'Mergeable · merging now' — drop 'sweep' from user-facing gate/train copy
('next pass in 42s', 'pass due now', 'checking now', 'any moment now'), and
age the 095 caption's soak clock from the lane's last read.

Fixes #15575

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 29, 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 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
#15565 🌱 refactor: split tracker words source CONFLICT src/pkg/dashboard/static-src/js/tracker-words.js
#15537 🐛 fix: scope tracker link memo to the excluded PR same files src/pkg/dashboard/stage_tracker.go
#15574 🌱 dashboard: split stage_tracker.go into 4 files CONFLICT src/pkg/dashboard/stage_tracker.go
#15530 🐛 fix(dashboard): issue-row linked PR passes null when the lineage chip is empty same files src/pkg/dashboard/static/index.html
#15526 🌱 dashboard: split stage_tracker.go into 4 files same files src/docs/dashboard-sections.md
src/pkg/dashboard/stage_tracker.go

@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 diff against the tree at v5 (stage_tracker.go, stage_tracker_merge_train.go, tracker-words.js) and built ./pkg/dashboard on e77dde7. Looks correct to me.

What I verified:

  • The new stageTrackerSoakCaption (stage_tracker.go:1586-1598) is applied at :2127-2129, after stageTrackerCaption and before the in-flight merge override at :2130, adoption (:2140), and takeover (:2148) — so "Merging now" still wins when an attempt is live, and the soak sentence is never clobbered by the generic 095 text at :1807. It returns "" for a zero rec (hasRec == false → Stage == None) and for a 095 record with no remaining= token, so rows without a clock keep the old caption.
  • stageTrackerSoakRemaining (:1603-1617) already ages by LastSeen and floors at 0, which is exactly the "never says 0s left" guarantee the comment promises; the left > 0 branch matches.
  • JS: stageTrackerMergeGateWordHtml renders ${word}${detail} with the detail span inside the same ham-seg-t span (tracker-words.js:945), so in stageTrackerSoakTick the n.previousSibling text-node write (:1065-1066) hits the pill word and nothing else; the !clock.prefix guard keeps 060/080 rows (prefix soak , set at :845) from being renamed. stage_tracker_soak_test.go exercises both the render (Mergeable <span class="ham-gate-detail") and the tick path with a fake text node.
  • static/index.html is the built copy of tracker-words.js (same +68/−68 hunk).

Two notes, neither blocking:

  • After the tick flips the pill to "Mergeable", the row title still opens with "Soaking — …" (the test at stage_tracker_soak_test.go asserts exactly that prefix). Intentional-looking since the chevron word is render-time, but the hover and the pill disagree for one refresh.
  • This edits stage_tracker.go, which #15574 (adopting #15526) splits into four files; whichever lands second needs a rebase. The conflicts-with-open-pr label is right.

— hive: agent=reviewer-2 backend=copilot model=claude-fable-5.1 copilot=1.0.88

@clubanderson
clubanderson merged commit 6593b83 into v5 Oct 30, 2026
81 of 84 checks passed
@kubestellar-prow
kubestellar-prow Bot deleted the fix/tracker-mergeable-word branch October 30, 2026 00:06
@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

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

Labels

conflicts-with-open-pr Open PR has a merge conflict with another open PR 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: soaking rows say "merge sweep" (internal jargon) and pin "0s left at the last sweep" after the soak has elapsed

1 participant