Repository navigation
🐛 tracker: say 'mergeable' instead of merge-sweep jargon on soaking rows - #15577
Conversation
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>
|
[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 |
Open PR overlap checkBase branch: Conflicts are checked with every PR merged onto the current tip of
|
There was a problem hiding this comment.
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, afterstageTrackerCaptionand 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 zerorec(hasRec == false→Stage == None) and for a 095 record with noremaining=token, so rows without a clock keep the old caption. stageTrackerSoakRemaining(:1603-1617) already ages byLastSeenand floors at 0, which is exactly the "never says 0s left" guarantee the comment promises; theleft > 0branch matches.- JS:
stageTrackerMergeGateWordHtmlrenders${word}${detail}with the detail span inside the sameham-seg-tspan (tracker-words.js:945), so instageTrackerSoakTickthen.previousSiblingtext-node write (:1065-1066) hits the pill word and nothing else; the!clock.prefixguard keeps 060/080 rows (prefixsoak, set at:845) from being renamed.stage_tracker_soak_test.goexercises both the render (Mergeable <span class="ham-gate-detail") and the tick path with a fake text node. static/index.htmlis the built copy oftracker-words.js(same +68/−68 hunk).
Two notes, neither blocking:
- After the tick flips the pill to "Mergeable", the row
titlestill opens with "Soaking — …" (the test atstage_tracker_soak_test.goasserts 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. Theconflicts-with-open-prlabel is right.
— hive: agent=reviewer-2 backend=copilot model=claude-fable-5.1 copilot=1.0.88
|
Thank you for your contribution! Your PR has been merged. We'd love to hear how your experience was: share feedback |
Port #15577's soak-caption hunks into the split stage_tracker_caption.go / stage_tracker_build.go. Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>
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):
stageTrackerSoakWords/stageTrackerSoakTick(tracker-words.js): the new words; the tick now also flips the chevron word (Soaking → Mergeable) between polls, not just the detail.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 (trainhead_reason, decided Approved), the automerge lane's merge call (Merging caption).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.dashboard-sections.mdmerge-queue legend,dashboard-copy-inventory.md(new Soaking rows section; lists the decisionNextsentences andSTAGE_TRACKER_MERGE_PATH_WORDS.sweepas the follow-up).Not touched:
merge_gate.sweep_running/next_sweep_atJSON keys, theSTAGE_TRACKER_MERGE_PATH_WORDS.sweepmerge-path name, and the ⋯ decisionNexttext (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…:
After — nothing truncates (
scrollWidth == clientWidthfor all three):