diff --git a/changelog.d/changed-tracker-mergeable-word.md b/changelog.d/changed-tracker-mergeable-word.md
new file mode 100644
index 0000000000..59765111d8
--- /dev/null
+++ b/changelog.d/changed-tracker-mergeable-word.md
@@ -0,0 +1 @@
+- Stage Tracker: soaking rows now say what the reader cares about — **Soaking · 4m left**, **Soaking · complete** once the window has run out, **Mergeable · merging now** when the lane's pass is on the soaked head — instead of the lane's internal "merge sweep" name, and the 095 caption ages the soak clock from the lane's last read instead of pinning "0s left at the last sweep" on a row still called soaking. (hivecommons/hive#15575)
diff --git a/src/docs/dashboard-copy-inventory.md b/src/docs/dashboard-copy-inventory.md
index 8d036c1673..b302e7782f 100644
--- a/src/docs/dashboard-copy-inventory.md
+++ b/src/docs/dashboard-copy-inventory.md
@@ -80,10 +80,10 @@ The new hover, verbatim (title line omitted):
## Left as-is (follow-up)
-- Merge-gate (080/095/100) chip tips in `stageTrackerMergeGateInfo` still say
- *sweep* and *soak* ("next sweep in 42s", "soak 12m left"); they are live
- clocks, short already, and a rename touches the gate's own tests. Tracked
- under the same issue.
+- Merge-gate (080/095/100) chip details in `stageTrackerMergeGateInfo` are
+ live clocks ("next pass in 42s", "soak 12m left"), short already. The
+ word *sweep* left them in hivecommons/hive#15575 (see *Soaking rows*
+ below); *soak* stays — it is the state, not the mechanism.
- The stage descriptions in `stagelabels.Table` are shared with the labels
and the docs and were not shortened; the 090 chevron tip simply stopped
appending them.
@@ -111,3 +111,34 @@ old name).
| `stageTrackerHeaderHtml` | column header | *Merge gate* | 🚆 *Merge queue* (same icon as the chip and the 080 chevron) | `TestStageTrackerHeader…` |
| Go: `prstage.MergeTrain.Sentence`, `stageTrackerMergeTrainFrontCaption`, `eta_basis` | gate reason, caption, hover | *front of the merge train (1st of 3)*, *Front of a merge train of N PRs* | *1st in the merge queue; merges next (1st of 3)*, *1st in a merge queue of N PRs* | `TestParseMergeTrainRejectsMalformed` |
| "merge gate" in decision copy (`delegatedecision` glossary, ladder, dashboard decided/new/vocabulary) | glossary, ⋯ hints, PR comments | *the merge gate merges it once every check passes* | *the merge queue merges it …* | `TestStageTrackerDecisionGlossaryMirrorsGo` |
+
+## Soaking rows (hivecommons/hive#15575)
+
+The owner read a soaking row as **🕓 Soaking · ready — merge sweep…**
+(truncated) with the caption *…the pre-merge soak window is running —
+soaking, 0s left at the last sweep*. "Merge sweep" is the lane's internal
+name for its pass, not a state the reader cares about, and "0s left" on a
+row still called *soaking* was the lane's last read, not the time now. The
+three states, in the owner's words:
+
+| State | Chevron | Hover / caption |
+|---|---|---|
+| soak running | **Soaking · 4m left** (counts down in place) | *Head abc1234 must sit 30 minutes without new commits before the hive merges it · 4m 10s left · soak ends 8:42 PM* / caption *Admitted by the automerge lane; soaking — 4m left* |
+| soak elapsed, waiting for the lane's next pass | **Soaking · complete** | *… soaked since 8:42 PM. Soak complete — merges on the next pass (next pass in 3m).* / caption *Admitted by the automerge lane; soak complete — merges on the next pass* |
+| soak elapsed and the lane's pass is on it | **Mergeable · merging now** (⟳ spins) | *… Mergeable — merging now.* |
+
+| Builder | Reaches | Before | After | Held by |
+|---|---|---|---|---|
+| `stageTrackerSoakWords` (`tracker-words.js`) | 095 chevron label + hover, 060/080 detail | *Soaking · ready — next sweep in 3m* / *ready — merge sweep running* / *ready — sweep due now*; 060/080 *soaked — next sweep in 42s* | *Soaking · complete* / **Mergeable · merging now**; 060/080 *soak complete* / *soaked — merging now* | `TestStageTrackerSoakNode` |
+| `stageTrackerSoakTick` | the same label between polls | detail only | detail and, at 095, the word (*Soaking* → *Mergeable* when the pass was already on it) | same |
+| `stageTrackerNextPassWords` (new) + `stageTrackerGateCountdownSync` | 080 detail, soaking-without-clock detail, hovers | *next sweep in 42s* / *sweep due now* / *soak window complete* | *next pass in 42s* / *pass due now* / *complete* | `TestStageTrackerMergeGatePillNode` |
+| `stageTrackerMergeGateInfoFor` (pass on a pre-admission row) | 060 detail + hover | *merge sweep running* / *hive's merge sweep is running on this PR now.* | *checking now* / *hive is checking this PR now.* | same |
+| `stageTrackerTrainEtaDetail`, `STAGE_TRACKER_TRAIN_HEAD_STALL_WORD.ready` | queue chip, stalled train | *any sweep now*, *waiting for a merge sweep* | *any moment now*, *waiting for the next merge pass* | `TestStageTrackerMergeTrainQueueChip` |
+| Go `stageTrackerSoakCaption` (new), `humanizeStageReason` | 095 caption | *…soak window is running — soaking, 0s left at the last sweep* (the lane's last read, never aged) | *…soaking — 7m left* aged from the last read, *…soak complete — merges on the next pass* once it runs out | `TestStageTrackerSnapshot…` (pr102) |
+| Go `mergeTrainHead…` reasons, `eta_basis`, `stageTrackerMergingCaption`, decided *Approved* text | gate reason, hover, caption | *merges on hive's next sweep*, *next sweep in 40s*, *the automerge sweep's merge call* | *merges on hive's next pass*, *next pass in 40s*, *the automerge lane's merge call* | `TestStageTrackerMergeTrainQueue…` |
+
+Left for a follow-up under the same issue: the ⋯ decision consequences and
+`Next` sentences (*Hive's merge sweep merges it on its next pass…* in
+`api_repo_item_decision.go`, `row_action_result.go`,
+`delegated_decision_human_merge.go`) and `STAGE_TRACKER_MERGE_PATH_WORDS.sweep`
+(*automerge sweep* as a merge **path** name on merged rows).
diff --git a/src/docs/dashboard-sections.md b/src/docs/dashboard-sections.md
index 156fc26c7b..3f40fb4883 100644
--- a/src/docs/dashboard-sections.md
+++ b/src/docs/dashboard-sections.md
@@ -912,7 +912,7 @@ It counts under **Needs attention**. Before the merge gate only the held-workflo
#### Merge train
-When several approved PRs to the same base touch the same files, the automerge lanes merge them one at a time ([#15117](https://github.com/hivecommons/hive/issues/15117)). The tracker renders every train contiguously, in merge order, with a thin left rail linking the rows and a header chip `🚆 merge train · 4 PRs · 1st: #15074` — the glyph is an inline-SVG railcar (14px, currentColor, hover *Merge queue*), the same icon the **Merge queue** column header and its chevrons wear; overlapping files are listed beside it. Pill wording per state is the PR's place in the queue (the owner's words — `front` and `queued-behind` appear nowhere a person reads): the head reads "Merge queued · 1st · ~13m" (its own soak left plus the next sweep); the others "Merge queued · 2nd · ~4m", "Merge queued · 3rd", … (`1st 2nd 3rd 4th … 11th 12th 13th 21st`, countdown to its turn); once the front merged and the hive is rebasing a conflicting sibling, "Rebasing · attempt 1/2"; when the loop guard (`auto_merge.merge_train.max_rebase_attempts`) is spent, "Needs human decision · rebase failed twice" at stage/085 with the decision option "Rebase, then merge as maintainer".
+When several approved PRs to the same base touch the same files, the automerge lanes merge them one at a time ([#15117](https://github.com/hivecommons/hive/issues/15117)). The tracker renders every train contiguously, in merge order, with a thin left rail linking the rows and a header chip `🚆 merge train · 4 PRs · 1st: #15074` — the glyph is an inline-SVG railcar (14px, currentColor, hover *Merge queue*), the same icon the **Merge queue** column header and its chevrons wear; overlapping files are listed beside it. Pill wording per state is the PR's place in the queue (the owner's words — `front` and `queued-behind` appear nowhere a person reads): the head reads "Merge queued · 1st · ~13m" (its own soak left plus the next pass); the others "Merge queued · 2nd · ~4m", "Merge queued · 3rd", … (`1st 2nd 3rd 4th … 11th 12th 13th 21st`, countdown to its turn); once the front merged and the hive is rebasing a conflicting sibling, "Rebasing · attempt 1/2"; when the loop guard (`auto_merge.merge_train.max_rebase_attempts`) is spent, "Needs human decision · rebase failed twice" at stage/085 with the decision option "Rebase, then merge as maintainer".
The tooltip lists the PRs ahead and the overlapping files. Waiting siblings are never red, never `needs human`; a `needs-rebase` label on one is reported under `stale_labels`, the train repairs it. Each item carries `merge_gate.state` (`queued-behind` / `rebasing` / `rebase-exhausted` / `front`, with an honest `reason` such as `behind #15074 in merge train (3rd of 4, overlapping files: stage_tracker.go, index.html)`) and `merge_train{id, state, front, position, size, attempt, max_attempts, overlap_files, ahead, members}`; the id is `#` and `members` is the whole roster in merge order.
@@ -920,11 +920,11 @@ The tooltip lists the PRs ahead and the overlapping files. Waiting siblings are
**Who rides.** A PR the lane leaves to a person is not a train member and never its head: an author below the lane's trust (`untrusted-author-role`, `contributor-lane:no-linked-issue`, …), the title/label human-merge rule, a human-merge path, a merge GitHub refused for review, and every other `human_merge_reason` code except the catch-all `policy`. The lane's verdict is remembered per lane and head (`noteMergeTrainOutcome`); a new head starts clean. A head the lane last saw unable to merge on its own (red required check, terminal hold, permanent refusal) stays a member but never fronts.
-**Queue position, countdown, stall** ([#15395](https://github.com/hivecommons/hive/issues/15395)). The queued chip is its place in the queue and nothing else — **Merge queued · 2nd · ~4m** — so it reads the same whether or not a merge sweep is evaluating it: the sweep is the spinning ⬡ glyph and a *Checking now…* line in the hover, never a change of words (one label per chevron), and no state slug (`queued-behind`, `front`) ever reaches the page. The hover is the place sentence — *2nd of 6 in the merge queue · behind #15253 (soaking, 12m left) · ETA ~25m (2 ahead · head soaking 12m · next sweep in 40s). Hive merges one at a time, in order.*; the head's reads *1st of 6 in the merge queue · merges next · ETA ~13m.* — or, when the head is on a person or on CI, the blocker instead of a clock: *… behind #15253 (waiting for a maintainer (untrusted author)) · no estimate until #15253 moves.* Every train state — the 1st included — lights the **Merge queue** column, whatever numeric stage the lane holds the head at (the train's facts are mirrored onto a head still at 050/070; hive's own #15400 once lit CI / Review beside its 2nd-place sibling). The server adds to each member's `merge_train`: `length`, `head_number`, `head_state` (`needs-human` / `ci` / `soaking` / `ready` / `merging` / `fixing` / `unknown`), `head_reason` (plain words), `head_since`, `eta_s`, `eta_at`, `eta_basis`, `late`, `stalled`, `stalled_s`.
+**Queue position, countdown, stall** ([#15395](https://github.com/hivecommons/hive/issues/15395)). The queued chip is its place in the queue and nothing else — **Merge queued · 2nd · ~4m** — so it reads the same whether or not a merge sweep is evaluating it: the sweep is the spinning ⬡ glyph and a *Checking now…* line in the hover, never a change of words (one label per chevron), and no state slug (`queued-behind`, `front`) ever reaches the page. The hover is the place sentence — *2nd of 6 in the merge queue · behind #15253 (soaking, 12m left) · ETA ~25m (2 ahead · head soaking 12m · next pass in 40s). Hive merges one at a time, in order.*; the head's reads *1st of 6 in the merge queue · merges next · ETA ~13m.* — or, when the head is on a person or on CI, the blocker instead of a clock: *… behind #15253 (waiting for a maintainer (untrusted author)) · no estimate until #15253 moves.* Every train state — the 1st included — lights the **Merge queue** column, whatever numeric stage the lane holds the head at (the train's facts are mirrored onto a head still at 050/070; hive's own #15400 once lit CI / Review beside its 2nd-place sibling). The server adds to each member's `merge_train`: `length`, `head_number`, `head_state` (`needs-human` / `ci` / `soaking` / `ready` / `merging` / `fixing` / `unknown`), `head_reason` (plain words), `head_since`, `eta_s`, `eta_at`, `eta_basis`, `late`, `stalled`, `stalled_s`.
**One PR per issue** ([#15395](https://github.com/hivecommons/hive/issues/15395)). Two open PRs declaring the same `Fixes #N` never both ride the queue (hive's own #15402 and #15407, both for #15396, once sat side by side as "waiting its turn"). Before the trains are grouped the sweep keeps one PR per closing issue — a green head (not conflicting, not blocked on a red required check) beats a red one; among equals the earlier-opened wins — and holds the other out of every train with the stage reason `merge-train:duplicate-of#:/0:0/0:`. The held row's gate reads `duplicate-of:` (`merge_gate.duplicate_of`, `merge_gate.duplicate_issue`), its chip **Duplicate of #15402 · needs a pick** with no clock, it carries no `merge_train`, and it wears `needs-decision` so both PRs sit under their issue with the hold visible. *Let hive decide* on either row takes the existing supersede path (rule `one-pr-per-issue`): on the held PR it closes it as superseded by the kept one with a credit comment, through the same write gate as every delegate close; on the kept PR it releases it and names the duplicate the queue holds (or, if the kept PR has since gone red, only recommends the fix — the queue re-picks on its next pass, so an earlier red PR yields to a later green one).
-- **Countdown to auto-merge.** `eta_s` is the member's own remaining soak, plus — for each PR ahead — its remaining soak or, with no clock of its own, one sweep (the lanes' floor cadence), plus the wait for the next sweep tick; `eta_basis` is the short reading ("2 ahead · head soaking 12m · next sweep in 40s"). The chip's `· ~4m` counts down in place from `eta_at` on the same tick as the soak clock, and `eta_at` is anchored server-side to the member's first estimate at its position (re-anchored only when a fresh estimate runs more than a sweep longer), so a poll re-render never resets it. Past the estimate it reads *any sweep now*; past twice the first estimate `late` is set and the chip reads *running late* with the estimate kept in the hover. Always a `~`: an estimate, not a promise. A head on a person, on CI or being fixed — or a member that is itself a person's — carries no estimate and the blocker instead.
+- **Countdown to auto-merge.** `eta_s` is the member's own remaining soak, plus — for each PR ahead — its remaining soak or, with no clock of its own, one sweep (the lanes' floor cadence), plus the wait for the next sweep tick; `eta_basis` is the short reading ("2 ahead · head soaking 12m · next pass in 40s"). The chip's `· ~4m` counts down in place from `eta_at` on the same tick as the soak clock, and `eta_at` is anchored server-side to the member's first estimate at its position (re-anchored only when a fresh estimate runs more than a sweep longer), so a poll re-render never resets it. Past the estimate it reads *any moment now*; past twice the first estimate `late` is set and the chip reads *running late* with the estimate kept in the hover. Always a `~`: an estimate, not a promise. A head on a person, on CI or being fixed — or a member that is itself a person's — carries no estimate and the blocker instead.
- **Merge queue popover.** The sticky bar's **🚆 Merge queue N** chip (hidden with no train) opens a popover listing every train in merge order — ordinal, #, title, state in words, ETA — with the head's blocker on the front row; same pattern as the **Merged** popover (click outside / Escape closes).
- **Who rides.** A PR GitHub reports conflicting (`mergeable: CONFLICTING` / `DIRTY`) on its own, or one at **072 Returned to contributor** (by label or by the hive's stage record), is neither a member nor counted in the queue's length and draws no train idle comment — hive's own #15307 once read `queued-behind#15424:4/6` while conflicting at 072. A conflicting PR rides only while the train itself is repairing it (its rebase was requested behind a merged head and the loop guard still has attempts).
- **Stall warning.** Once the head has sat in one stage longer than `governor.merge_train_stall_warn_s` (default 3600) and is not merging — a soaking head counts only once its own clock has overrun — every member's chip turns to **Merge queue · stalled — waiting on #15253 (waiting for CI) · 3h** (the head's own row: **Merge queue · stalled — waiting for CI · 3h**; an untrusted-author head reads *needs maintainer merge*), the popover marks the train, and the activity log records one `merge train stalled` line per train per hour.
@@ -1195,11 +1195,12 @@ Every PR at the gate now carries `merge_gate: {state, reason, sweep_running, las
| stage | pill word | detail after `·` | glyph before the word (tooltip + `aria-label`) |
| --- | --- | --- | --- |
-| 060 reviewed — drawn in the **CI / Review** column, not the merge gate | **Review passed** | the lane's own recorded reason, in the operator's words — *CI in progress* (`N check(s) still running`, `check-pending`), *checks unreadable* (`checks could not be read`), *soak 30m remaining* (pre-admission soak); *waiting for merge admission* when the payload carries no reason | 🕓 clock — *Review passed, not yet admitted to auto merge — CI still running (build-and-test). hive re-checks the gate on its next sweep in 3m. A GitHub event on the PR (check run, review, push) triggers a pass sooner. Last checked 2m ago.* |
-| 080 awaiting merge admission | **Ready for auto merge** | *next sweep in 42s* (counts down in place; *sweep due now* once past) | 🕓 clock — *Approved and green; waiting for hive's merge sweep — next sweep in 42s. …* |
-| 095 pre-merge soak | **Soaking** | *7m left* (counts down; *soak window complete* once past) | 🕓 clock — *Admitted by the automerge lane; waiting for the soak window: 7m left. hive merges on its first sweep after that.* |
-| any of the above while a pass is evaluating this PR | the stage's word | *merge sweep running* | ⟳ (static) — *hive's merge sweep is running on this PR now.* |
-| 080 in a merge train (`merge_gate.state: queued-behind` / `front`) | **Merge queued · 2nd · ~4m** / **Merge queued · 1st** (ordinal place and countdown; **Merge queue · stalled — waiting on #15253 (waiting for CI) · 3h** once stalled) | *~4m* (counts down to its estimated turn from `merge_train.eta_at`; *any sweep now* once past; *running late* past twice the first estimate; nothing while the head is on a person or CI) — the words never change with the sweep | 🕓 clock, or ⟳ spinning while a sweep evaluates it — *Behind #15253 (soaking, 12m left) and 1 more. Hive merges one at a time, in order. Estimated turn: ~25m (2 ahead · head soaking 12m · next sweep in 40s). Checking now… Last checked 12s ago.* |
+| 060 reviewed — drawn in the **CI / Review** column, not the merge gate | **Review passed** | the lane's own recorded reason, in the operator's words — *CI in progress* (`N check(s) still running`, `check-pending`), *checks unreadable* (`checks could not be read`), *soak 30m remaining* (pre-admission soak); *waiting for merge admission* when the payload carries no reason | 🕓 clock — *Review passed, not yet admitted to auto merge — CI still running (build-and-test). hive re-checks the gate on its next pass in 3m. A GitHub event on the PR (check run, review, push) triggers a pass sooner. Last checked 2m ago.* |
+| 080 awaiting merge admission | **Ready for auto merge** | *next pass in 42s* (counts down in place; *pass due now* once past) | 🕓 clock — *Approved and green; waiting for hive's next merge pass — next pass in 42s. …* |
+| 095 pre-merge soak | **Soaking** | *7m left* (counts down in place; *complete* once past — the row never says "0s left") | 🕓 clock — *Head abc1234 must sit 30 minutes without new commits before the hive merges it · 7m 10s left · soak ends 8:42 PM*; past the window *… soaked since 8:42 PM. Soak complete — merges on the next pass (next pass in 3m).* Caption *Admitted by the automerge lane; soaking — 7m left* / *… soak complete — merges on the next pass* ([#15575](https://github.com/hivecommons/hive/issues/15575)) |
+| 095 soaked and the lane's pass is on it | **Mergeable** | *merging now* | ⟳ spinning — *… Mergeable — merging now.* |
+| 060/080 while a pass is evaluating this PR | the stage's word | *checking now* | ⟳ (static) — *hive is checking this PR now.* Never the word *sweep* — the lane's internal name, not a state ([#15575](https://github.com/hivecommons/hive/issues/15575)) |
+| 080 in a merge train (`merge_gate.state: queued-behind` / `front`) | **Merge queued · 2nd · ~4m** / **Merge queued · 1st** (ordinal place and countdown; **Merge queue · stalled — waiting on #15253 (waiting for CI) · 3h** once stalled) | *~4m* (counts down to its estimated turn from `merge_train.eta_at`; *any moment now* once past; *running late* past twice the first estimate; nothing while the head is on a person or CI) — the words never change with the sweep | 🕓 clock, or ⟳ spinning while a sweep evaluates it — *Behind #15253 (soaking, 12m left) and 1 more. Hive merges one at a time, in order. Estimated turn: ~25m (2 ahead · head soaking 12m · next pass in 40s). Checking now… Last checked 12s ago.* |
| 100 merge queue | **Merging** | — | ⟳ (static) — *Admitted and soaked; hive is merging it now (GitHub merge queue / merge window).* |
| any stage while hive's merge call is in flight (`merge_gate.merging_since`, `merge_path`) | **Merging** | *merge call in flight*, then *merge landed* while the SPA holds the row | ⟳ (static) — *hive is merging it now (automerge sweep) — the merge call has been in flight since 3s ago.* |
| any stage after GitHub refused hive's merge call (`merge_gate.state: merge-failed`, `merge_failed`, `merge_failed_kind`, `merge_failed_text`, `merge_failed_at`) | **Merge failed** | the refusal translated to a short phrase — *branch protection*, *needs rebase*, *not allowed*, *review required*, or *retrying* while the sweep is on it; never GitHub's raw text | 🕓 clock — *hive tried to merge this (maintainer merge from the dashboard) 9s ago and GitHub refused — branch protection blocks it. The lane re-evaluates it on its next pass. Details: 405 Pull Request is not mergeable* |
diff --git a/src/pkg/dashboard/stage_tracker.go b/src/pkg/dashboard/stage_tracker.go
index bb91d7f91d..01ea6ee788 100644
--- a/src/pkg/dashboard/stage_tracker.go
+++ b/src/pkg/dashboard/stage_tracker.go
@@ -1396,7 +1396,7 @@ func humanizeStageReason(reason string) string {
}
if strings.HasPrefix(lower, "contributor-lane:soaking") {
if left, ok := soakRemainingFromReason(r); ok {
- return "soaking, " + left.Round(time.Minute).String() + " left at the last sweep"
+ return "soaking, " + left.Round(time.Minute).String() + " left"
}
return "soaking"
}
@@ -1579,6 +1579,25 @@ func soakRemainingFromReason(reason string) (time.Duration, bool) {
return d, true
}
+// stageTrackerSoakCaption is the 095 sentence for a record carrying the
+// lane's soak clock: "soaking — 12m left" while the window runs, aged from
+// the lane's last read so a soak that has run out never says "0s left";
+// past it, "soak complete — merges on the next pass". "" when the record
+// is not at 095 or carries no clock (the generic caption stands).
+func stageTrackerSoakCaption(rec stagelabels.Record, now time.Time) string {
+ const admitted = "Admitted by the automerge lane; "
+ if rec.Stage != stagelabels.PreMergeSoak {
+ return ""
+ }
+ if _, ok := soakRemainingFromReason(rec.Reason); !ok {
+ return ""
+ }
+ if left := stageTrackerSoakRemaining(rec, now); left > 0 {
+ return admitted + "soaking — " + shortDuration(left) + " left"
+ }
+ return admitted + "soak complete — merges on the next pass"
+}
+
// stageTrackerSoakRemaining is the soak time left now for a record at 095:
// the lane's recorded remaining, aged by the time since the sweep wrote it.
func stageTrackerSoakRemaining(rec stagelabels.Record, now time.Time) time.Duration {
@@ -2105,6 +2124,9 @@ func (s *Server) buildStageTracker(status *StatusPayload, store *stagelabels.Sto
}
stageTrackerApplyMergeTrain(it)
it.Caption, it.Actor = stageTrackerCaption(stage, it.Reason, it.Author, it.Kind, it.Mirrored, rec, hasRec, it.LinkedPR, it.Head)
+ if c := stageTrackerSoakCaption(rec, now); c != "" {
+ it.Caption = c
+ }
if hasAttempt && (attempt.InFlight() || attempt.Merged) {
it.Caption, it.Actor = stageTrackerMergingCaption(attempt), StageActorHive
}
diff --git a/src/pkg/dashboard/stage_tracker_decided.go b/src/pkg/dashboard/stage_tracker_decided.go
index 11a86e7a45..fcb7ce50d9 100644
--- a/src/pkg/dashboard/stage_tracker_decided.go
+++ b/src/pkg/dashboard/stage_tracker_decided.go
@@ -119,7 +119,7 @@ var decidedVerbs = map[string]decidedVerb{
string(delegatedecision.VerdictCloseDuplicate): {Word: "Closing", Text: "Closing · duplicate, leaves the tracker next refresh", Acting: "Closing…", Plain: "closed as duplicate", Stage: stagelabels.None},
string(delegatedecision.VerdictCloseSuperseded): {Word: "Closing", Text: "Closing · superseded, leaves the tracker next refresh", Acting: "Closing…", Plain: "closed as superseded", Stage: stagelabels.None},
string(delegatedecision.VerdictNotNow): {Word: "Closing", Text: "Closing · declined for now, leaves the tracker next refresh", Acting: "Closing…", Plain: "declined for now", Stage: stagelabels.None},
- operatorActionQueueMerge: {Word: "Approved", Text: "Approved · hive merges on its next sweep", Acting: "Queuing for merge…", Plain: "approved — hive merges", Stage: stagelabels.AwaitingMergeAdmission},
+ operatorActionQueueMerge: {Word: "Approved", Text: "Approved · hive merges on its next pass", Acting: "Queuing for merge…", Plain: "approved — hive merges", Stage: stagelabels.AwaitingMergeAdmission},
operatorActionMergeNow: {Word: "Merging", Text: "Merging · as maintainer", Acting: "Merging…", Plain: "merged as maintainer", Stage: stagelabels.MergeQueue},
}
diff --git a/src/pkg/dashboard/stage_tracker_merge_failed_column_test.go b/src/pkg/dashboard/stage_tracker_merge_failed_column_test.go
index 9f39f7e320..6a9af331b7 100644
--- a/src/pkg/dashboard/stage_tracker_merge_failed_column_test.go
+++ b/src/pkg/dashboard/stage_tracker_merge_failed_column_test.go
@@ -7,9 +7,9 @@ import (
// TestStageTrackerMergeFailedColumnNode: the operator's row
// (hivecommons/docs#496 → docs#512, 2026-10-29 11:04 ET). The lane fell
-// back to 060 after the automerge sweep's merge call drew GitHub's 405 "4
+// back to 060 after the automerge lane's merge call drew GitHub's 405 "4
// of 4 required status checks are expected", and the tracker drew the amber
-// "⟳ Merge failed · merge sweep running ⬡" chip in CI / Review with the raw
+// "⟳ Merge failed · retrying ⬡" chip in CI / Review with the raw
// "PUT https://api.github.com/…" error spilling out of it. A merge outcome
// always lights the Merge gate column; the chip is a fixed short phrase
// (no URL, no verb, ≤ 5 words) with GitHub's words in the tooltip's
@@ -113,7 +113,7 @@ for (const [mg, want] of cases) {
}
// A retry says what GitHub said in the tooltip.
info = stageTrackerMergeGateInfo(row(gate({ merge_failed: '405 Pull Request is not mergeable' })), now);
-assert.ok(info.tip.includes('GitHub refused — branch protection blocks it') && info.tip.includes("merge sweep is retrying it now"), info.tip);
+assert.ok(info.tip.includes('GitHub refused — branch protection blocks it') && info.tip.includes("hive is retrying it now"), info.tip);
assert.strictEqual(info.cue, 'running');
// 4. Pending CI is not red.
diff --git a/src/pkg/dashboard/stage_tracker_merge_gate.go b/src/pkg/dashboard/stage_tracker_merge_gate.go
index 9ed6bbe770..2408ecc328 100644
--- a/src/pkg/dashboard/stage_tracker_merge_gate.go
+++ b/src/pkg/dashboard/stage_tracker_merge_gate.go
@@ -225,5 +225,5 @@ func stageTrackerMergingCaption(a github.MergeAttempt) string {
case github.PRAuditPathForge:
return "Merging now — the forge adapter's merge call is in flight"
}
- return "Merging now — the automerge sweep's merge call is in flight"
+ return "Merging now — the automerge lane's merge call is in flight"
}
diff --git a/src/pkg/dashboard/stage_tracker_merge_gate_test.go b/src/pkg/dashboard/stage_tracker_merge_gate_test.go
index 4f729da7ba..37dd2d3f54 100644
--- a/src/pkg/dashboard/stage_tracker_merge_gate_test.go
+++ b/src/pkg/dashboard/stage_tracker_merge_gate_test.go
@@ -162,7 +162,7 @@ func TestStageTrackerMergeGateNode(t *testing.T) {
if err != nil {
t.Fatal(err)
}
- for _, want := range []string{"**Merge queue pills — legend**", "Awaiting merge gate", "Ready for auto merge", "**Soaking**", "**Merging**", "next sweep in"} {
+ for _, want := range []string{"**Merge queue pills — legend**", "Awaiting merge gate", "Ready for auto merge", "**Soaking**", "**Merging**", "next pass in"} {
if !strings.Contains(string(docs), want) {
t.Errorf("docs/dashboard-sections.md missing merge-gate legend %q", want)
}
@@ -207,10 +207,10 @@ const merging = { repo: 'hivecommons/hive', number: 15061, kind: 'pr', stage: 10
let a = stageTrackerMergeGateInfo(pr15042, now), b = stageTrackerMergeGateInfo(pr15054, now);
assert.strictEqual(a.word, 'Review passed'); assert.strictEqual(b.word, 'Review passed');
assert.strictEqual(a.cue, 'running'); assert.strictEqual(a.detail, 'CI in progress');
-assert.strictEqual(a.tip, "Review passed, not yet admitted to auto merge — CI in progress; hive's merge sweep is running on this PR now.");
+assert.strictEqual(a.tip, "Review passed, not yet admitted to auto merge — CI in progress; hive is checking this PR now.");
// The pill uses the operator's wording; the tooltip keeps the lane's full reason.
assert.strictEqual(b.cue, 'waiting'); assert.strictEqual(b.detail, 'CI in progress');
-assert.ok(b.tip.startsWith('Review passed, not yet admitted to auto merge — CI running (build-and-test). hive re-checks the gate on its next sweep in 42s.'), b.tip);
+assert.ok(b.tip.startsWith('Review passed, not yet admitted to auto merge — CI running (build-and-test). hive re-checks the gate on its next pass in 42s.'), b.tip);
assert.ok(b.tip.includes('A GitHub event on the PR (check run, review, push) triggers a pass sooner.') && b.tip.endsWith('Last checked 2m ago.'), b.tip);
// Every row on the gate gets the glyph; the sentence is its title AND aria-label.
@@ -224,7 +224,7 @@ assert.strictEqual(stageTrackerGateCueHtml({ repo: 'r', number: 1, kind: 'pr', s
assert.strictEqual(stageTrackerGateCueHtml({ repo: 'r', number: 1, kind: 'pr', stage: STAGE_TRACKER_TERMINAL }, now), '', 'merged: no glyph');
// The pill word with the live detail; the waiting row says what it waits for.
-assert.strictEqual(stageTrackerMergeGateWordHtml(ready, now), 'Ready for auto merge · next sweep in 42s');
+assert.strictEqual(stageTrackerMergeGateWordHtml(ready, now), 'Ready for auto merge · next pass in 42s');
// The soak detail carries its clock (data-ham-soak…) so the tick redoes the words and the hover.
const soakHtml = stageTrackerMergeGateWordHtml(pr15044, now);
assert.ok(soakHtml.startsWith('Soaking ({ attrs: { 'data-ham-until': String(until), 'data-h
const n1 = mk(now + 42000, 'ready'), n2 = mk(now + 452000, 'soaking');
const el = { querySelectorAll: () => [n1, n2] };
stageTrackerGateCountdownSync(el, now + 30000);
-assert.deepStrictEqual([n1.textContent, n2.textContent], ['· next sweep in 12s', '· 8m left']);
+assert.deepStrictEqual([n1.textContent, n2.textContent], ['· next pass in 12s', '· 8m left']);
stageTrackerGateCountdownSync(el, now + 500000);
-assert.deepStrictEqual([n1.textContent, n2.textContent], ['· sweep due now', '· soak window complete']);
+assert.deepStrictEqual([n1.textContent, n2.textContent], ['· pass due now', '· complete']);
// hivecommons/hive#15103: the fixer's rebase loop guard is the pill while
// the hive rebases a conflicting PR, spinning on attempt n/2 and asking
@@ -341,6 +341,7 @@ func stageTrackerSoakClockJS(t *testing.T, html string) string {
return jsFunc(t, html, "stageTrackerSoakClock") + "\n" +
jsFunc(t, html, "stageTrackerSoakLeftText") + "\n" +
jsFunc(t, html, "stageTrackerClockText") + "\n" +
+ jsFunc(t, html, "stageTrackerNextPassWords") + "\n" +
jsFunc(t, html, "stageTrackerSoakWords") + "\n" +
jsFunc(t, html, "stageTrackerSoakTick")
}
diff --git a/src/pkg/dashboard/stage_tracker_merge_train.go b/src/pkg/dashboard/stage_tracker_merge_train.go
index 18e9243a4b..f15c188dcb 100644
--- a/src/pkg/dashboard/stage_tracker_merge_train.go
+++ b/src/pkg/dashboard/stage_tracker_merge_train.go
@@ -383,7 +383,7 @@ func stageTrackerSoakLeftOf(it *StageTrackerItem, now time.Time) time.Duration {
}
// mergeTrainEtaBasis is the short plain-English reading of the estimate:
-// "2 ahead · head soaking 12m · next sweep in 40s".
+// "2 ahead · head soaking 12m · next pass in 40s".
func mergeTrainEtaBasis(aheadN int, headState string, headLeft, own, tick time.Duration, sweeping bool) string {
var parts []string
switch aheadN {
@@ -403,9 +403,9 @@ func mergeTrainEtaBasis(aheadN int, headState string, headLeft, own, tick time.D
parts = append(parts, "own soak "+shortDuration(own))
}
if sweeping {
- parts = append(parts, "sweep running")
+ parts = append(parts, "pass running")
} else if tick > 0 {
- parts = append(parts, "next sweep in "+shortDuration(tick))
+ parts = append(parts, "next pass in "+shortDuration(tick))
}
return strings.Join(parts, " · ")
}
@@ -422,7 +422,7 @@ func mergeTrainHeadState(head *StageTrackerItem, now time.Time) (state, reason s
return mergeTrainHeadMerging, "merging now", 0, true
}
if mg != nil && mg.State == MergeGateStateMergeFailed {
- return mergeTrainHeadReady, "GitHub refused the last merge; hive retries on its next sweep", 0, false
+ return mergeTrainHeadReady, "GitHub refused the last merge; hive retries on its next pass", 0, false
}
switch head.Stage {
case trackerNumberReadyForHuman:
@@ -446,7 +446,7 @@ func mergeTrainHeadState(head *StageTrackerItem, now time.Time) (state, reason s
if left > 0 {
return mergeTrainHeadSoaking, "soaking, " + shortDuration(left) + " left", left, true
}
- return mergeTrainHeadSoaking, "soaked; hive merges it on its next sweep", 0, true
+ return mergeTrainHeadSoaking, "soaked; hive merges it on its next pass", 0, true
case trackerNumberReviewed, trackerNumberReviewPending:
return mergeTrainHeadCI, "waiting for CI", 0, false
case trackerNumberFixing, trackerNumberReturned, trackerNumberNeedsAuthor:
@@ -463,7 +463,7 @@ func mergeTrainHeadState(head *StageTrackerItem, now time.Time) (state, reason s
if mg != nil && mg.NextSweepAt != nil && mg.NextSweepAt.After(now) {
next = mg.NextSweepAt.Sub(now)
}
- return mergeTrainHeadReady, "approved and green; merges on hive's next sweep", next, true
+ return mergeTrainHeadReady, "approved and green; merges on hive's next pass", next, true
}
// shortDuration is "12m" / "1h 05m" / "45s" for the chip's words.
diff --git a/src/pkg/dashboard/stage_tracker_merge_train_queue_test.go b/src/pkg/dashboard/stage_tracker_merge_train_queue_test.go
index a5abbe699a..bcafe47f1e 100644
--- a/src/pkg/dashboard/stage_tracker_merge_train_queue_test.go
+++ b/src/pkg/dashboard/stage_tracker_merge_train_queue_test.go
@@ -55,23 +55,23 @@ func TestStageTrackerMergeTrainQueueFacts(t *testing.T) {
stalledS int64
}{
{name: "2nd behind a soaking head: head soak + next tick", self: member(15319, 2, nil), ahead: []*StageTrackerItem{headSoaking}, head: headSoaking, opts: opts,
- headState: mergeTrainHeadSoaking, reason: "soaking, 12m left", etaS: 12*60 + 40, basis: "1 ahead · head soaking 12m · next sweep in 40s"},
+ headState: mergeTrainHeadSoaking, reason: "soaking, 12m left", etaS: 12*60 + 40, basis: "1 ahead · head soaking 12m · next pass in 40s"},
{name: "3rd: head soak + one sweep for the 2nd + tick", self: member(15374, 3, nil), ahead: []*StageTrackerItem{headSoaking, member(15319, 2, nil)}, head: headSoaking, opts: opts,
- headState: mergeTrainHeadSoaking, reason: "soaking, 12m left", etaS: 12*60 + 5*60 + 40, basis: "2 ahead · head soaking 12m · next sweep in 40s"},
+ headState: mergeTrainHeadSoaking, reason: "soaking, 12m left", etaS: 12*60 + 5*60 + 40, basis: "2 ahead · head soaking 12m · next pass in 40s"},
{name: "3rd with a soaking 2nd: its soak, not a sweep", self: member(15374, 3, nil), ahead: []*StageTrackerItem{headSoaking, member(15319, 2, soaking(7*time.Minute))}, head: headSoaking, opts: opts,
- headState: mergeTrainHeadSoaking, reason: "soaking, 12m left", etaS: 12*60 + 7*60 + 40, basis: "2 ahead · head soaking 12m · next sweep in 40s"},
+ headState: mergeTrainHeadSoaking, reason: "soaking, 12m left", etaS: 12*60 + 7*60 + 40, basis: "2 ahead · head soaking 12m · next pass in 40s"},
{name: "own soak counts too", self: member(15319, 2, soaking(3*time.Minute)), ahead: []*StageTrackerItem{headSoaking}, head: headSoaking, opts: opts,
- headState: mergeTrainHeadSoaking, reason: "soaking, 12m left", etaS: 12*60 + 3*60 + 40, basis: "1 ahead · head soaking 12m · own soak 3m · next sweep in 40s"},
+ headState: mergeTrainHeadSoaking, reason: "soaking, 12m left", etaS: 12*60 + 3*60 + 40, basis: "1 ahead · head soaking 12m · own soak 3m · next pass in 40s"},
{name: "a running sweep has no tick", self: member(15319, 2, func(it *StageTrackerItem) {
it.MergeGate = &StageTrackerMergeGate{State: MergeGateStateQueuedBehind, SweepRunning: true}
}), ahead: []*StageTrackerItem{headSoaking}, head: headSoaking, opts: opts,
- headState: mergeTrainHeadSoaking, reason: "soaking, 12m left", etaS: 12 * 60, basis: "1 ahead · head soaking 12m · sweep running"},
+ headState: mergeTrainHeadSoaking, reason: "soaking, 12m left", etaS: 12 * 60, basis: "1 ahead · head soaking 12m · pass running"},
{name: "ready head: one sweep each + tick", self: member(15374, 3, nil), ahead: []*StageTrackerItem{headReady, member(15319, 2, nil)}, head: headReady, opts: opts,
- headState: mergeTrainHeadReady, reason: "approved and green; merges on hive's next sweep", etaS: 2*5*60 + 40, basis: "2 ahead · next sweep in 40s"},
+ headState: mergeTrainHeadReady, reason: "approved and green; merges on hive's next pass", etaS: 2*5*60 + 40, basis: "2 ahead · next pass in 40s"},
{name: "no cadence armed yet: the default floor", self: member(15319, 2, nil), ahead: []*StageTrackerItem{headReady}, head: headReady, opts: mergeTrainQueueOptions{Now: now, StallWarn: time.Hour},
- headState: mergeTrainHeadReady, reason: "approved and green; merges on hive's next sweep", etaS: int64(mergeTrainDefaultSweepEvery / time.Second), basis: "1 ahead"},
+ headState: mergeTrainHeadReady, reason: "approved and green; merges on hive's next pass", etaS: int64(mergeTrainDefaultSweepEvery / time.Second), basis: "1 ahead"},
{name: "merging head: its turn is one sweep away", self: member(15319, 2, nil), ahead: []*StageTrackerItem{headMerging}, head: headMerging, opts: opts,
- headState: mergeTrainHeadMerging, reason: "merging now", etaS: 5*60 + 40, basis: "1 ahead · head merging · next sweep in 40s"},
+ headState: mergeTrainHeadMerging, reason: "merging now", etaS: 5*60 + 40, basis: "1 ahead · head merging · next pass in 40s"},
{name: "head on a human: blocker, no estimate, stalled past the window", self: member(15319, 2, nil), ahead: []*StageTrackerItem{headHuman}, head: headHuman, opts: opts,
headState: mergeTrainHeadNeedsHuman, reason: "waiting for a maintainer (untrusted author)", stalled: true, stalledS: 8 * 3600},
{name: "head on CI: blocker, no estimate", self: member(15319, 2, nil), ahead: []*StageTrackerItem{headCI}, head: headCI, opts: opts,
@@ -249,7 +249,7 @@ assert.strictEqual(a.word, 'Merge queued · 2nd');
assert.strictEqual(b.word, a.word, 'sweep_running must not change the chip label');
assert.strictEqual(a.detail, ''); assert.strictEqual(b.detail, '');
assert.strictEqual(stageTrackerMergeGateWordHtml(quiet, now), stageTrackerMergeGateWordHtml(busy, now), 'identical chip markup');
-assert.ok(!/queued-behind|front|merge sweep running/i.test(a.word + a.detail + b.word + b.detail), 'no slug, no "front", no sweep words in the label');
+assert.ok(!/queued-behind|front|checking now/i.test(a.word + a.detail + b.word + b.detail), 'no slug, no "front", no sweep words in the label');
// The sweep lives in the glyph and the tooltip.
assert.strictEqual(a.cue, 'waiting'); assert.strictEqual(b.cue, 'running');
assert.ok(b.tip.includes('Checking now…') && !a.tip.includes('Checking now…'), b.tip);
@@ -274,7 +274,7 @@ assert.ok(stageTrackerMergeGateInfo(head, now).tip.startsWith('1st of 3 in the m
// hive's own #15406 read the bare slug "front" while the front sat in its
// soak (the mirrored soak clock returned the raw state). A front in soak
// keeps its place word and its countdown (own soak left + next sweep).
-const frontSoak = mk(15406, 'in soak at the front', { state: 'front', position: 1, size: 4, length: 4, head_number: 15406, front: 15406, ahead: [], head_state: 'soaking', head_reason: 'soaking, 12m left', eta_s: 760, eta_at: new Date(now + 760 * 1000).toISOString(), eta_basis: 'own soak 12m · next sweep in 40s' },
+const frontSoak = mk(15406, 'in soak at the front', { state: 'front', position: 1, size: 4, length: 4, head_number: 15406, front: 15406, ahead: [], head_state: 'soaking', head_reason: 'soaking, 12m left', eta_s: 760, eta_at: new Date(now + 760 * 1000).toISOString(), eta_basis: 'own soak 12m · next pass in 40s' },
{ state: 'front', soak_until: new Date(now + 12 * 60 * 1000).toISOString(), soak_started_at: new Date(now - 18 * 60 * 1000).toISOString(), sweep_running: true });
const fs = stageTrackerMergeGateInfo(frontSoak, now);
assert.strictEqual(fs.word, 'Merge queued · 1st', fs.word); assert.strictEqual(fs.detail, '~13m');
@@ -284,10 +284,10 @@ assert.strictEqual(stageTrackerMergeGateWordHtml(frontSoak, now).replace(/<[^>]+
// the clock so the shared tick keeps counting and a re-render lands on the same
// instant (no reset on poll).
const etaAt = new Date(now + 4 * 60 * 1000).toISOString();
-const timed = mk(15319, 'fleetreport: slog feed', { state: 'queued-behind', position: 2, ahead: [15315], head_state: 'soaking', head_reason: 'soaking, 3m left', eta_s: 240, eta_at: etaAt, eta_basis: '1 ahead · head soaking 3m · next sweep in 40s' }, { sweep_running: false });
+const timed = mk(15319, 'fleetreport: slog feed', { state: 'queued-behind', position: 2, ahead: [15315], head_state: 'soaking', head_reason: 'soaking, 3m left', eta_s: 240, eta_at: etaAt, eta_basis: '1 ahead · head soaking 3m · next pass in 40s' }, { sweep_running: false });
const ti = stageTrackerMergeGateInfo(timed, now);
assert.strictEqual(ti.word, 'Merge queued · 2nd'); assert.strictEqual(ti.detail, '~4m'); assert.strictEqual(ti.until, now + 4 * 60 * 1000);
-assert.ok(ti.tip.includes('· ETA ~4m (1 ahead · head soaking 3m · next sweep in 40s).'), ti.tip);
+assert.ok(ti.tip.includes('· ETA ~4m (1 ahead · head soaking 3m · next pass in 40s).'), ti.tip);
const chipHtml = stageTrackerMergeGateWordHtml(timed, now);
assert.ok(chipHtml.includes('>Merge queued · 2nd · ~4m'), chipHtml);
assert.strictEqual(chipHtml.replace(/<[^>]+>/g, ''), 'Merge queued · 2nd · ~4m');
@@ -298,7 +298,7 @@ assert.strictEqual(stageTrackerMergeGateInfo(timed, now + 150 * 1000).detail, '~
const node = { attrs: { 'data-ham-until': String(now + 240000), 'data-ham-until-kind': 'queued-behind' }, textContent: '· ~4m', getAttribute(k) { return this.attrs[k] === undefined ? null : this.attrs[k]; } };
const el = { querySelectorAll() { return [node]; } };
stageTrackerGateCountdownSync(el, now + 150 * 1000); assert.strictEqual(node.textContent, '· ~2m');
-stageTrackerGateCountdownSync(el, now + 5 * 60 * 1000); assert.strictEqual(node.textContent, '· any sweep now');
+stageTrackerGateCountdownSync(el, now + 5 * 60 * 1000); assert.strictEqual(node.textContent, '· any moment now');
// Running late: no clock, the words instead; the estimate stays in the hover.
const late = mk(15319, 'fleetreport: slog feed', { state: 'queued-behind', position: 2, ahead: [15315], head_state: 'ready', head_reason: 'approved and green; merges on hive\'s next sweep', eta_s: 300, eta_at: etaAt, eta_basis: '1 ahead', late: true });
const li = stageTrackerMergeGateInfo(late, now);
diff --git a/src/pkg/dashboard/stage_tracker_merge_train_test.go b/src/pkg/dashboard/stage_tracker_merge_train_test.go
index b9a6983cb7..dc914e3be1 100644
--- a/src/pkg/dashboard/stage_tracker_merge_train_test.go
+++ b/src/pkg/dashboard/stage_tracker_merge_train_test.go
@@ -115,7 +115,7 @@ func TestStageTrackerMergeTrainPayload(t *testing.T) {
t.Fatal(err)
}
for _, want := range []string{`"merge_gate":{"state":"queued-behind","reason":"behind #15074 in merge train (2nd of 4, overlapping files: stage_tracker.go, index.html)"`,
- `"merge_train":{"id":"v5#15074","state":"queued-behind","front":15074,"position":2,"size":4,"overlap_files":["stage_tracker.go","index.html"],"ahead":[15074],"members":[15074,15085,15087,15097],"length":4,"head_number":15074,"head_state":"ready","head_reason":"approved and green; merges on hive's next sweep","head_since":"2026-10-27T14:00:00Z","eta_s":300,"eta_at":"2026-10-27T14:05:00Z","eta_basis":"1 ahead"}`} {
+ `"merge_train":{"id":"v5#15074","state":"queued-behind","front":15074,"position":2,"size":4,"overlap_files":["stage_tracker.go","index.html"],"ahead":[15074],"members":[15074,15085,15087,15097],"length":4,"head_number":15074,"head_state":"ready","head_reason":"approved and green; merges on hive's next pass","head_since":"2026-10-27T14:00:00Z","eta_s":300,"eta_at":"2026-10-27T14:05:00Z","eta_basis":"1 ahead"}`} {
if !strings.Contains(string(raw), want) {
t.Fatalf("payload lacks %s:\n%s", want, raw)
}
diff --git a/src/pkg/dashboard/stage_tracker_merging_hold_test.go b/src/pkg/dashboard/stage_tracker_merging_hold_test.go
index 1f6dd5cd69..485f784786 100644
--- a/src/pkg/dashboard/stage_tracker_merging_hold_test.go
+++ b/src/pkg/dashboard/stage_tracker_merging_hold_test.go
@@ -89,7 +89,7 @@ func TestStageTrackerMergeGateAttemptOverlay(t *testing.T) {
if mg = stageTrackerMergeGateAttempt(nil, failed, true); mg == nil || mg.State != MergeGateStateMergeFailed || mg.MergeFailed != "422 boom" || mg.MergeFailedAt == nil {
t.Errorf("failed attempt off the gate: %+v", mg)
}
- for _, c := range []struct{ path, want string }{{github.PRAuditPathDashboard, "dashboard"}, {github.PRAuditPathRelay, "relay"}, {github.PRAuditPathForge, "forge"}, {github.PRAuditPathSweep, "automerge sweep"}, {"", "automerge sweep"}} {
+ for _, c := range []struct{ path, want string }{{github.PRAuditPathDashboard, "dashboard"}, {github.PRAuditPathRelay, "relay"}, {github.PRAuditPathForge, "forge"}, {github.PRAuditPathSweep, "automerge lane"}, {"", "automerge lane"}} {
if got := stageTrackerMergingCaption(github.MergeAttempt{Path: c.path}); !strings.Contains(got, c.want) {
t.Errorf("caption for %q = %q, want %q", c.path, got, c.want)
}
diff --git a/src/pkg/dashboard/stage_tracker_soak_test.go b/src/pkg/dashboard/stage_tracker_soak_test.go
index 03e3806caf..add5d23a0b 100644
--- a/src/pkg/dashboard/stage_tracker_soak_test.go
+++ b/src/pkg/dashboard/stage_tracker_soak_test.go
@@ -133,12 +133,13 @@ func TestStageTrackerSoakInPayload(t *testing.T) {
}
// TestStageTrackerSoakNode: the SPA's soak clock — "Soaking · 12m left"
-// counting down in place, "ready — next sweep in Nm" past the window,
+// counting down in place, "Soaking · complete" past the window and
+// "Mergeable · merging now" once the lane's pass is on the soaked head,
// "Soak restarted · new head" when the row's head is not the soaked one,
// the 060 variant keeping its own word with "soak 12m left", the hover
// sentence with the rule, the live time left and the end time, and the
// tick swapping that sentence into the row's titles. The sweep being on
-// the PR never hides the clock, and the glyph never spins.
+// the PR never hides the clock; the glyph spins only for "Mergeable".
func TestStageTrackerSoakNode(t *testing.T) {
html := indexHTML(t)
for _, want := range []string{
@@ -150,9 +151,13 @@ func TestStageTrackerSoakNode(t *testing.T) {
t.Errorf("index.html missing soak-clock wiring %q", want)
}
}
- // No new spinner: the soak pill's cue is static.
+ // No new spinner markup: the soak words set a cue, the glyph owns the spin.
if strings.Contains(jsFunc(t, html, "stageTrackerSoakWords"), "cue-spin") || strings.Contains(jsFunc(t, html, "stageTrackerSoakTick"), "cue-spin") {
- t.Error("the soak clock must not add a spinning glyph")
+ t.Error("the soak clock must not add its own spinning glyph")
+ }
+ // The owner's words (hivecommons/hive#15575): never "sweep" on a soaking row.
+ if src := jsFunc(t, html, "stageTrackerSoakWords"); strings.Contains(src, "sweep ") || strings.Contains(src, "ready —") {
+ t.Error("stageTrackerSoakWords must not say \"merge sweep\" or \"ready —\"")
}
runStageTrackerRowActionsScript(t, "function esc(s) { return String(s).replace(/&/g, '&').replace(/· 13m left'), html);
-// Past the window and the sweep has not run: ready, with the next pass.
+// Past the window and the lane's pass has not come: "Soaking · complete"; the next pass is hover-only.
const soaked = Object.assign({}, soaking, { soak: Object.assign({}, soaking.soak, { until: iso(now - 60000) }), merge_gate: { state: 'soaking', last_sweep_at: iso(now - 20000), next_sweep_at: iso(now + 3 * 60000) } });
info = stageTrackerMergeGateInfo(soaked, now);
-assert.strictEqual(info.detail, 'ready — next sweep in 3m');
+assert.strictEqual(info.word, 'Soaking'); assert.strictEqual(info.detail, 'complete'); assert.strictEqual(info.cue, 'soaking');
assert.strictEqual(info.until, now - 60000, 'the clock stays on the node so the tick can keep the next-sweep words fresh');
-assert.ok(info.tip.startsWith('Head abc1234 sat 30 minutes without new commits — soaked since ' + stageTrackerClockText(now - 60000) + '; hive merges it on its next sweep (next sweep in 3m).'), info.tip);
-assert.strictEqual(stageTrackerMergeGateInfo(Object.assign({}, soaked, { merge_gate: { state: 'soaking', sweep_running: true } }), now).detail, 'ready — merge sweep running');
-assert.strictEqual(stageTrackerMergeGateInfo(Object.assign({}, soaked, { merge_gate: { state: 'soaking' } }), now).detail, 'ready — sweep due now');
+assert.ok(info.tip.startsWith('Head abc1234 sat 30 minutes without new commits — soaked since ' + stageTrackerClockText(now - 60000) + '. Soak complete — merges on the next pass (next pass in 3m).'), info.tip);
+// The lane's pass on a soaked head: Mergeable, spinning, "merging now".
+const mergeable = stageTrackerMergeGateInfo(Object.assign({}, soaked, { merge_gate: { state: 'soaking', sweep_running: true } }), now);
+assert.strictEqual(mergeable.word, 'Mergeable'); assert.strictEqual(mergeable.detail, 'merging now'); assert.strictEqual(mergeable.cue, 'running');
+assert.ok(mergeable.tip.endsWith('. Mergeable — merging now.'), mergeable.tip);
+assert.ok(stageTrackerGateCueHtml(Object.assign({}, soaked, { merge_gate: { state: 'soaking', sweep_running: true } }), now).includes('cue-spin'));
+assert.ok(stageTrackerMergeGateWordHtml(Object.assign({}, soaked, { merge_gate: { state: 'soaking', sweep_running: true } }), now).startsWith('Mergeable [n] }, now + 13 * 60000);
-assert.strictEqual(n.textContent, '· ready — merge sweep running');
-assert.ok(li.attrs.title.startsWith('Soaking — Head abc1234 sat 30 minutes without new commits — soaked since ' + ends), li.attrs.title);
+assert.strictEqual(n.textContent, '· merging now');
+assert.strictEqual(wordNode.textContent, 'Mergeable ');
+assert.ok(li.attrs.title.startsWith('Soaking — Head abc1234 sat 30 minutes without new commits — soaked since ' + ends + '. Mergeable — merging now.'), li.attrs.title);
// Short / long forms.
assert.deepStrictEqual([stageTrackerSoakLeftText(45000), stageTrackerSoakLeftText(750000), stageTrackerSoakLeftText(3900000), stageTrackerSoakLeftText(0)], ['45s', '12m 30s', '1h 05m', '']);
console.log('soak clock ok');
diff --git a/src/pkg/dashboard/stage_tracker_test.go b/src/pkg/dashboard/stage_tracker_test.go
index e5906eb55c..99cfb6bc6c 100644
--- a/src/pkg/dashboard/stage_tracker_test.go
+++ b/src/pkg/dashboard/stage_tracker_test.go
@@ -503,7 +503,7 @@ func TestStageTrackerEndpoint(t *testing.T) {
if pr102.Stage != 95 || pr102.Lane != laneHive || pr102.AuthorKind != authorKindHive || pr102.AuthorKindSource != authorKindSrcLabel || pr102.Tier != "trusted" {
t.Fatalf("pr102 = %+v", pr102)
}
- if pr102.Caption != "Admitted by the automerge lane; the pre-merge soak window is running — soaking, 12m0s left at the last sweep" || pr102.Actor != "automerge lane" || len(pr102.Modifiers) != 0 {
+ if pr102.Caption != "Admitted by the automerge lane; soaking — 7m left" || pr102.Actor != "automerge lane" || len(pr102.Modifiers) != 0 {
t.Fatalf("pr102 caption=%q actor=%q mods=%v", pr102.Caption, pr102.Actor, pr102.Modifiers)
}
// 12m left when the sweep wrote it 5m ago → 7m now; the 40m-old entry
diff --git a/src/pkg/dashboard/static-src/js/tracker-words.js b/src/pkg/dashboard/static-src/js/tracker-words.js
index 38967d5f6b..a9569e186a 100644
--- a/src/pkg/dashboard/static-src/js/tracker-words.js
+++ b/src/pkg/dashboard/static-src/js/tracker-words.js
@@ -82,7 +82,7 @@
// remaining"); drawn in CI / Review, since it
// can still regress to 070
// 080 Ready for auto merge — green and approved; waiting for hive's
- // merge sweep: "next sweep in 42s"
+ // merge pass: "next pass in 42s"
// 095 Soaking — admitted; the soak window runs: "7m left"
// 100 Merging — admitted and soaked; the merge is being
// attempted (GitHub merge queue / tide)
@@ -204,7 +204,7 @@
// (mergeTrainHead* in Go) — short enough for a chevron. A head on a
// person says what the person has to do (the owner's ask: "waiting on
// #15425 (needs maintainer merge)"), not "waiting for a maintainer".
- const STAGE_TRACKER_TRAIN_HEAD_STALL_WORD = { 'needs-human': 'needs maintainer merge', ci: 'waiting for CI', soaking: 'soak overran', ready: 'waiting for a merge sweep', merging: 'merge call in flight', fixing: 'being fixed by its author', unknown: 'head not in this view' };
+ const STAGE_TRACKER_TRAIN_HEAD_STALL_WORD = { 'needs-human': 'needs maintainer merge', ci: 'waiting for CI', soaking: 'soak overran', ready: 'waiting for the next merge pass', merging: 'merge call in flight', fixing: 'being fixed by its author', unknown: 'head not in this view' };
// Pure: the short reason a stalled head is stuck — the head_state
// table, a human-decision head told apart by its reason, else the
// head's own plain-word reason cut at its first clause.
@@ -258,7 +258,7 @@
const s = Number(mt.eta_s) || 0;
return s > 0 ? nowMs + s * 1000 : 0;
}
- // Pure: the ETA words — "ETA ~25m (2 ahead · next sweep in 40s)",
+ // Pure: the ETA words — "ETA ~25m (2 ahead · next pass in 40s)",
// "running late — estimated ~25m, still waiting", or '' with no
// estimate. Always a "~": an estimate, not a promise.
function stageTrackerTrainEtaWords(mt, nowMs) {
@@ -267,7 +267,7 @@
const left = stageTrackerShortLeft(at - nowMs);
const basis = String(mt.eta_basis || '').trim();
if (mt.late) return 'Running late — estimated ~' + stageTrackerShortLeft((Number(mt.eta_s) || 0) * 1000) + ', still waiting' + (basis ? ' (' + basis + ')' : '') + '.';
- return 'ETA ' + (left ? '~' + left : 'any sweep now') + (basis ? ' (' + basis + ')' : '') + '.';
+ return 'ETA ' + (left ? '~' + left : 'any moment now') + (basis ? ' (' + basis + ')' : '') + '.';
}
// Pure: the queued row's hover — "2nd of 6 in the merge queue · behind
// #15253 (soaking, 12m left) · ETA ~25m. Hive merges one at a time, in
@@ -759,7 +759,7 @@
}
// Pure: { word, detail, tip, cue } for an item on the gate, null off it.
// word — the pill word (STAGE_TRACKER_MERGE_GATE_WORD)
- // detail — the live part after " · " ("next sweep in 42s", "7m left");
+ // detail — the live part after " · " ("next pass in 42s", "7m left");
// always a gate fact, never the issue's lane reason
// tip — one plain sentence for the glyph's title + aria-label; on
// an issue row it leads with "open PR #N covers it · at "
@@ -815,7 +815,7 @@
}
// A merge-train member (hivecommons/hive#15395): the label is its
// place in the queue and nothing else, so the chip does not flip
- // between "… · merge sweep running" and the bare form each sweep,
+ // between "… · checking now" and the bare form each sweep,
// and a front in its soak keeps its place word (never the slug) —
// its countdown already includes the soak left.
// The sweep is the spinning ⬡ and a "Checking now…" tooltip line.
@@ -834,7 +834,7 @@
const detail = etaAt > 0 ? (mt.late ? 'running late' : stageTrackerTrainEtaDetail(etaAt, nowMs)) : '';
return { state, word: trainWord, detail, tip: queueTip + checking + lastSeen, cue: mg.sweep_running ? 'running' : 'waiting', until: etaAt > 0 && !mt.late ? etaAt : 0, train: mt, stalled: !!mt.stalled };
}
- // A soak clock (own or mirrored) outranks "merge sweep running": the
+ // A soak clock (own or mirrored) outranks "checking now": the
// sweep reads the clock, it does not replace it. Any gate stage the
// lane holds for the soak — 095 admitted, or 060/080 while trust
// still blocks the head — counts the same clock down.
@@ -844,7 +844,7 @@
// "soak 12m left"; at 095 the soak is the stage.
clock.prefix = state === 'soaking' ? '' : 'soak ';
const soak = stageTrackerSoakWords(clock, nowMs, nextAt, !!mg.sweep_running);
- return { state, word: clock.restarted || state === 'soaking' ? soak.word : word, detail: soak.detail, tip: soak.tip + lastSeen, cue: 'soaking', until: clock.restarted ? 0 : clock.until, soak: soak.tip, soakClock: clock };
+ return { state, word: clock.restarted || state === 'soaking' ? soak.word : word, detail: soak.detail, tip: soak.tip + lastSeen, cue: soak.cue || 'soaking', until: clock.restarted ? 0 : clock.until, soak: soak.tip, soakClock: clock };
}
// 060 Review passed: the pill carries the lane's own recorded reason
// ("CI in progress", "checks unreadable", "soak 30m remaining" —
@@ -853,15 +853,15 @@
const preWhy = state === 'gate-pending' ? (stageTrackerReviewPassedDetail(mg.reason || laneReason) || 'waiting for merge admission') : '';
if (state === 'merge-failed') return stageTrackerMergeFailedInfo(mg, nowMs, nextAt, lastSeen);
if (mg.sweep_running) {
- return { state, word, detail: preWhy || 'merge sweep running', tip: (preWhy ? 'Review passed, not yet admitted to auto merge — ' + preWhy + '; ' : '') + "hive's merge sweep is running on this PR now.", cue: 'running', until: 0 };
+ return { state, word, detail: preWhy || 'checking now', tip: (preWhy ? 'Review passed, not yet admitted to auto merge — ' + preWhy + '; ' : '') + 'hive is checking this PR now.', cue: 'running', until: 0 };
}
- const nextWords = nextAt > nowMs ? 'next sweep in ' + stageTrackerShortLeft(nextAt - nowMs) : (nextAt > 0 ? 'sweep due now' : '');
+ const nextWords = stageTrackerNextPassWords(nextAt, nowMs);
const sooner = ' A GitHub event on the PR (check run, review, push) triggers a pass sooner.';
if (state === 'soaking') {
- return { state, word, detail: 'soak window complete', tip: 'Admitted; the soak window is complete — hive merges on its next sweep' + (nextWords ? ' (' + nextWords + ')' : '') + '.' + lastSeen, cue: 'soaking', until: 0 };
+ return { state, word, detail: 'complete', tip: 'Soak complete — merges on the next pass' + (nextWords ? ' (' + nextWords + ')' : '') + '.' + lastSeen, cue: 'soaking', until: 0 };
}
if (state === 'ready') {
- return { state, word, detail: nextWords, tip: "Approved and green; waiting for hive's merge sweep" + (nextWords ? ' — ' + nextWords + '.' : '.') + sooner + lastSeen, cue: 'waiting', until: nextAt > nowMs ? nextAt : 0 };
+ return { state, word, detail: nextWords, tip: "Approved and green; waiting for hive's next merge pass" + (nextWords ? ' — ' + nextWords + '.' : '.') + sooner + lastSeen, cue: 'waiting', until: nextAt > nowMs ? nextAt : 0 };
}
if (state === 'merging') {
// A live merge call (merging_since, hivecommons/hive#15245) says
@@ -910,16 +910,16 @@
const at = mg.merge_failed_at ? Date.parse(mg.merge_failed_at) : 0;
const who = STAGE_TRACKER_MERGE_PATH_WORDS[mg.merge_path] || '';
const when = (who ? ' (' + who + ')' : '') + (at > 0 ? ' ' + stageTrackerAgoText(at, nowMs) : '');
- const nextWords = nextAt > nowMs ? 'next sweep in ' + stageTrackerShortLeft(nextAt - nowMs) : (nextAt > 0 ? 'sweep due now' : '');
+ const nextWords = stageTrackerNextPassWords(nextAt, nowMs);
const details = why ? ' Details: ' + why : '';
if (kind === 'checks-pending') {
- const tip = 'hive tried to merge this' + when + ' before its required checks had reported — ' + (text || "required checks haven't finished") + '. It merges once they pass' + (mg.sweep_running ? "; hive's merge sweep is on it now" : (nextWords ? ' (' + nextWords + ')' : '')) + '.' + lastSeen + details;
+ const tip = 'hive tried to merge this' + when + ' before its required checks had reported — ' + (text || "required checks haven't finished") + '. It merges once they pass' + (mg.sweep_running ? '; hive is on it now' : (nextWords ? ' (' + nextWords + ')' : '')) + '.' + lastSeen + details;
return { state, word: 'Waiting for CI', detail: checks > 0 ? checks + ' check' + (checks === 1 ? '' : 's') : '', tip, cue: mg.sweep_running ? 'running' : 'waiting', until: 0 };
}
const word = STAGE_TRACKER_MERGE_GATE_WORD[state];
const sentence = 'hive tried to merge this' + when + ' and GitHub refused' + (text ? ' — ' + text : '') + '.';
if (mg.sweep_running) {
- return { state, word, detail: 'retrying', tip: sentence + " hive's merge sweep is retrying it now." + lastSeen + details, cue: 'running', until: 0 };
+ return { state, word, detail: 'retrying', tip: sentence + ' hive is retrying it now.' + lastSeen + details, cue: 'running', until: 0 };
}
return { state, word, detail: STAGE_TRACKER_MERGE_REFUSAL_DETAIL[kind] || 'GitHub refused', tip: sentence + ' The lane re-evaluates it on its next pass' + (nextWords ? ' (' + nextWords + ')' : '') + '.' + lastSeen + details, cue: 'waiting', until: 0 };
}
@@ -931,7 +931,7 @@
return line.length > STAGE_TRACKER_MERGE_FAILED_SHORT_MAX ? line.slice(0, STAGE_TRACKER_MERGE_FAILED_SHORT_MAX - 1).trimEnd() + '…' : line;
}
// Pure: the pill word with its live detail — "Ready for auto merge ·
- // next sweep in 42s". The detail span carries data-ham-until so the
+ // next pass in 42s". The detail span carries data-ham-until so the
// countdown ticks in place.
function stageTrackerMergeGateWordHtml(item, nowMs) {
const info = stageTrackerMergeGateInfo(item, nowMs);
@@ -986,10 +986,20 @@
if (typeof formatDashboardTime === 'function') return formatDashboardTime(ms, opts);
try { return new Intl.DateTimeFormat(undefined, opts).format(new Date(ms)); } catch (e) { return new Date(ms).toISOString(); }
}
- // Pure: { word, detail, tip } for a soak clock at nowMs.
+ // Pure: "next pass in 42s" until the lane's next pass, "pass due now"
+ // once it has come, '' when the next pass is unknown. Never the word
+ // "sweep" — that is the lane's internal name, not a state.
+ function stageTrackerNextPassWords(nextAt, nowMs) {
+ if (nextAt > nowMs) return 'next pass in ' + stageTrackerShortLeft(nextAt - nowMs);
+ return nextAt > 0 ? 'pass due now' : '';
+ }
+ // Pure: { word, detail, tip, cue } for a soak clock at nowMs.
// soaking — "Soaking · 12m left"; the hover carries the rule, the
// live time left and the end time
- // ready — past until: "Soaking · ready — next sweep in 3m"
+ // complete — past until, waiting for the lane's next pass:
+ // "Soaking · complete"
+ // mergeable — past until and the lane's pass is on it now:
+ // "Mergeable · merging now"
// restarted — "Soak restarted · new head"
function stageTrackerSoakWords(clock, nowMs, nextAt, sweepRunning) {
const short = clock.head ? clock.head.slice(0, 7) : '';
@@ -997,15 +1007,19 @@
const mins = clock.windowS > 0 ? Math.round(clock.windowS / 60) : 0;
const window = mins > 0 ? mins + ' minute' + (mins === 1 ? '' : 's') : 'the soak window';
if (clock.restarted) {
- return { word: 'Soak restarted', detail: 'new head', tip: who + ' was replaced by a new push, so the soak starts over on the new head: it must sit ' + window + ' without new commits before the hive merges it. hive re-reads it on its next sweep.' };
+ return { word: 'Soak restarted', detail: 'new head', tip: who + ' was replaced by a new push, so the soak starts over on the new head: it must sit ' + window + ' without new commits before the hive merges it. hive re-reads it on its next pass.' };
}
const prefix = clock.prefix || '';
const leftMs = clock.until - nowMs;
if (leftMs > 0) {
return { word: 'Soaking', detail: prefix + stageTrackerShortLeft(leftMs) + ' left', tip: who + ' must sit ' + window + ' without new commits before the hive merges it · ' + stageTrackerSoakLeftText(leftMs) + ' left · soak ends ' + stageTrackerClockText(clock.until) };
}
- const next = sweepRunning ? 'merge sweep running' : (nextAt > nowMs ? 'next sweep in ' + stageTrackerShortLeft(nextAt - nowMs) : 'sweep due now');
- return { word: 'Soaking', detail: (prefix ? 'soaked — ' : 'ready — ') + next, tip: who + ' sat ' + window + ' without new commits — soaked since ' + stageTrackerClockText(clock.until) + '; hive merges it on its next sweep (' + next + ').' };
+ const soaked = who + ' sat ' + window + ' without new commits — soaked since ' + stageTrackerClockText(clock.until) + '. ';
+ if (sweepRunning) {
+ return { word: 'Mergeable', detail: prefix ? 'soaked — merging now' : 'merging now', tip: soaked + 'Mergeable — merging now.', cue: 'running' };
+ }
+ const next = stageTrackerNextPassWords(nextAt, nowMs);
+ return { word: 'Soaking', detail: prefix ? 'soak complete' : 'complete', tip: soaked + 'Soak complete — merges on the next pass' + (next ? ' (' + next + ')' : '') + '.', cue: 'soaking' };
}
// Pure: the leading glyph for a row on the gate — spinning while hive's
// sweep is on it, a clock while it waits — with the sentence as title
@@ -1017,12 +1031,12 @@
return `${stageTrackerIcon(spin ? 'sweep' : 'wait', 'ham-ico')}`;
}
// Pure: the queue chip's countdown words — "~4m" until the estimate,
- // "any sweep now" once it has passed.
+ // "any moment now" once it has passed.
function stageTrackerTrainEtaDetail(etaAt, nowMs) {
const left = stageTrackerShortLeft(etaAt - nowMs);
- return left ? '~' + left : 'any sweep now';
+ return left ? '~' + left : 'any moment now';
}
- // Pure: ticks every countdown in el from nowMs; "sweep due now" once a
+ // Pure: ticks every countdown in el from nowMs; "pass due now" once a
// ready row's next pass has come.
function stageTrackerGateCountdownSync(el, nowMs) {
if (!el || typeof el.querySelectorAll !== 'function') return;
@@ -1032,7 +1046,7 @@
const kind = n.getAttribute('data-ham-until-kind');
if (n.getAttribute('data-ham-soak') === '1') { stageTrackerSoakTick(n, nowMs); continue; }
const left = stageTrackerShortLeft(until - nowMs);
- let t = kind === 'soaking' ? (left ? '· ' + left + ' left' : '· soak window complete') : (left ? '· next sweep in ' + left : '· sweep due now');
+ let t = kind === 'soaking' ? (left ? '· ' + left + ' left' : '· complete') : (left ? '· next pass in ' + left : '· pass due now');
if (kind === 'decided') t = n.textContent.replace(/ · in [^·]*$|· in [^·]*$/, '') + (left ? ' · in ' + left : ' · due now');
if (kind === STAGE_TRACKER_TRAIN_STATE_QUEUED || kind === STAGE_TRACKER_TRAIN_STATE_FRONT) t = '· ' + stageTrackerTrainEtaDetail(until, nowMs);
if (n.textContent !== t) n.textContent = t;
@@ -1046,6 +1060,10 @@
const words = stageTrackerSoakWords(clock, nowMs, Number(n.getAttribute('data-ham-next')) || 0, n.getAttribute('data-ham-sweeping') === '1');
const t = '· ' + words.detail;
if (n.textContent !== t) n.textContent = t;
+ // At 095 the soak owns the pill word too: a soaked head under the
+ // lane's pass flips "Soaking" to "Mergeable" without a re-render.
+ const wordNode = n.previousSibling;
+ if (!clock.prefix && wordNode && wordNode.nodeType === 3 && wordNode.textContent.trim() !== words.word) wordNode.textContent = words.word + ' ';
const prev = n.getAttribute('data-ham-soak-tip') || '';
if (!prev || prev === words.tip || typeof n.closest !== 'function') return;
const li = n.closest('li');
diff --git a/src/pkg/dashboard/static/index.html b/src/pkg/dashboard/static/index.html
index 9a2830085e..b005828611 100644
--- a/src/pkg/dashboard/static/index.html
+++ b/src/pkg/dashboard/static/index.html
@@ -14332,7 +14332,7 @@ Where to get help
// remaining"); drawn in CI / Review, since it
// can still regress to 070
// 080 Ready for auto merge — green and approved; waiting for hive's
- // merge sweep: "next sweep in 42s"
+ // merge pass: "next pass in 42s"
// 095 Soaking — admitted; the soak window runs: "7m left"
// 100 Merging — admitted and soaked; the merge is being
// attempted (GitHub merge queue / tide)
@@ -14454,7 +14454,7 @@ Where to get help
// (mergeTrainHead* in Go) — short enough for a chevron. A head on a
// person says what the person has to do (the owner's ask: "waiting on
// #15425 (needs maintainer merge)"), not "waiting for a maintainer".
- const STAGE_TRACKER_TRAIN_HEAD_STALL_WORD = { 'needs-human': 'needs maintainer merge', ci: 'waiting for CI', soaking: 'soak overran', ready: 'waiting for a merge sweep', merging: 'merge call in flight', fixing: 'being fixed by its author', unknown: 'head not in this view' };
+ const STAGE_TRACKER_TRAIN_HEAD_STALL_WORD = { 'needs-human': 'needs maintainer merge', ci: 'waiting for CI', soaking: 'soak overran', ready: 'waiting for the next merge pass', merging: 'merge call in flight', fixing: 'being fixed by its author', unknown: 'head not in this view' };
// Pure: the short reason a stalled head is stuck — the head_state
// table, a human-decision head told apart by its reason, else the
// head's own plain-word reason cut at its first clause.
@@ -14508,7 +14508,7 @@ Where to get help
const s = Number(mt.eta_s) || 0;
return s > 0 ? nowMs + s * 1000 : 0;
}
- // Pure: the ETA words — "ETA ~25m (2 ahead · next sweep in 40s)",
+ // Pure: the ETA words — "ETA ~25m (2 ahead · next pass in 40s)",
// "running late — estimated ~25m, still waiting", or '' with no
// estimate. Always a "~": an estimate, not a promise.
function stageTrackerTrainEtaWords(mt, nowMs) {
@@ -14517,7 +14517,7 @@ Where to get help
const left = stageTrackerShortLeft(at - nowMs);
const basis = String(mt.eta_basis || '').trim();
if (mt.late) return 'Running late — estimated ~' + stageTrackerShortLeft((Number(mt.eta_s) || 0) * 1000) + ', still waiting' + (basis ? ' (' + basis + ')' : '') + '.';
- return 'ETA ' + (left ? '~' + left : 'any sweep now') + (basis ? ' (' + basis + ')' : '') + '.';
+ return 'ETA ' + (left ? '~' + left : 'any moment now') + (basis ? ' (' + basis + ')' : '') + '.';
}
// Pure: the queued row's hover — "2nd of 6 in the merge queue · behind
// #15253 (soaking, 12m left) · ETA ~25m. Hive merges one at a time, in
@@ -15009,7 +15009,7 @@ Where to get help
}
// Pure: { word, detail, tip, cue } for an item on the gate, null off it.
// word — the pill word (STAGE_TRACKER_MERGE_GATE_WORD)
- // detail — the live part after " · " ("next sweep in 42s", "7m left");
+ // detail — the live part after " · " ("next pass in 42s", "7m left");
// always a gate fact, never the issue's lane reason
// tip — one plain sentence for the glyph's title + aria-label; on
// an issue row it leads with "open PR #N covers it · at "
@@ -15065,7 +15065,7 @@ Where to get help
}
// A merge-train member (hivecommons/hive#15395): the label is its
// place in the queue and nothing else, so the chip does not flip
- // between "… · merge sweep running" and the bare form each sweep,
+ // between "… · checking now" and the bare form each sweep,
// and a front in its soak keeps its place word (never the slug) —
// its countdown already includes the soak left.
// The sweep is the spinning ⬡ and a "Checking now…" tooltip line.
@@ -15084,7 +15084,7 @@ Where to get help
const detail = etaAt > 0 ? (mt.late ? 'running late' : stageTrackerTrainEtaDetail(etaAt, nowMs)) : '';
return { state, word: trainWord, detail, tip: queueTip + checking + lastSeen, cue: mg.sweep_running ? 'running' : 'waiting', until: etaAt > 0 && !mt.late ? etaAt : 0, train: mt, stalled: !!mt.stalled };
}
- // A soak clock (own or mirrored) outranks "merge sweep running": the
+ // A soak clock (own or mirrored) outranks "checking now": the
// sweep reads the clock, it does not replace it. Any gate stage the
// lane holds for the soak — 095 admitted, or 060/080 while trust
// still blocks the head — counts the same clock down.
@@ -15094,7 +15094,7 @@ Where to get help
// "soak 12m left"; at 095 the soak is the stage.
clock.prefix = state === 'soaking' ? '' : 'soak ';
const soak = stageTrackerSoakWords(clock, nowMs, nextAt, !!mg.sweep_running);
- return { state, word: clock.restarted || state === 'soaking' ? soak.word : word, detail: soak.detail, tip: soak.tip + lastSeen, cue: 'soaking', until: clock.restarted ? 0 : clock.until, soak: soak.tip, soakClock: clock };
+ return { state, word: clock.restarted || state === 'soaking' ? soak.word : word, detail: soak.detail, tip: soak.tip + lastSeen, cue: soak.cue || 'soaking', until: clock.restarted ? 0 : clock.until, soak: soak.tip, soakClock: clock };
}
// 060 Review passed: the pill carries the lane's own recorded reason
// ("CI in progress", "checks unreadable", "soak 30m remaining" —
@@ -15103,15 +15103,15 @@ Where to get help
const preWhy = state === 'gate-pending' ? (stageTrackerReviewPassedDetail(mg.reason || laneReason) || 'waiting for merge admission') : '';
if (state === 'merge-failed') return stageTrackerMergeFailedInfo(mg, nowMs, nextAt, lastSeen);
if (mg.sweep_running) {
- return { state, word, detail: preWhy || 'merge sweep running', tip: (preWhy ? 'Review passed, not yet admitted to auto merge — ' + preWhy + '; ' : '') + "hive's merge sweep is running on this PR now.", cue: 'running', until: 0 };
+ return { state, word, detail: preWhy || 'checking now', tip: (preWhy ? 'Review passed, not yet admitted to auto merge — ' + preWhy + '; ' : '') + 'hive is checking this PR now.', cue: 'running', until: 0 };
}
- const nextWords = nextAt > nowMs ? 'next sweep in ' + stageTrackerShortLeft(nextAt - nowMs) : (nextAt > 0 ? 'sweep due now' : '');
+ const nextWords = stageTrackerNextPassWords(nextAt, nowMs);
const sooner = ' A GitHub event on the PR (check run, review, push) triggers a pass sooner.';
if (state === 'soaking') {
- return { state, word, detail: 'soak window complete', tip: 'Admitted; the soak window is complete — hive merges on its next sweep' + (nextWords ? ' (' + nextWords + ')' : '') + '.' + lastSeen, cue: 'soaking', until: 0 };
+ return { state, word, detail: 'complete', tip: 'Soak complete — merges on the next pass' + (nextWords ? ' (' + nextWords + ')' : '') + '.' + lastSeen, cue: 'soaking', until: 0 };
}
if (state === 'ready') {
- return { state, word, detail: nextWords, tip: "Approved and green; waiting for hive's merge sweep" + (nextWords ? ' — ' + nextWords + '.' : '.') + sooner + lastSeen, cue: 'waiting', until: nextAt > nowMs ? nextAt : 0 };
+ return { state, word, detail: nextWords, tip: "Approved and green; waiting for hive's next merge pass" + (nextWords ? ' — ' + nextWords + '.' : '.') + sooner + lastSeen, cue: 'waiting', until: nextAt > nowMs ? nextAt : 0 };
}
if (state === 'merging') {
// A live merge call (merging_since, hivecommons/hive#15245) says
@@ -15160,16 +15160,16 @@ Where to get help
const at = mg.merge_failed_at ? Date.parse(mg.merge_failed_at) : 0;
const who = STAGE_TRACKER_MERGE_PATH_WORDS[mg.merge_path] || '';
const when = (who ? ' (' + who + ')' : '') + (at > 0 ? ' ' + stageTrackerAgoText(at, nowMs) : '');
- const nextWords = nextAt > nowMs ? 'next sweep in ' + stageTrackerShortLeft(nextAt - nowMs) : (nextAt > 0 ? 'sweep due now' : '');
+ const nextWords = stageTrackerNextPassWords(nextAt, nowMs);
const details = why ? ' Details: ' + why : '';
if (kind === 'checks-pending') {
- const tip = 'hive tried to merge this' + when + ' before its required checks had reported — ' + (text || "required checks haven't finished") + '. It merges once they pass' + (mg.sweep_running ? "; hive's merge sweep is on it now" : (nextWords ? ' (' + nextWords + ')' : '')) + '.' + lastSeen + details;
+ const tip = 'hive tried to merge this' + when + ' before its required checks had reported — ' + (text || "required checks haven't finished") + '. It merges once they pass' + (mg.sweep_running ? '; hive is on it now' : (nextWords ? ' (' + nextWords + ')' : '')) + '.' + lastSeen + details;
return { state, word: 'Waiting for CI', detail: checks > 0 ? checks + ' check' + (checks === 1 ? '' : 's') : '', tip, cue: mg.sweep_running ? 'running' : 'waiting', until: 0 };
}
const word = STAGE_TRACKER_MERGE_GATE_WORD[state];
const sentence = 'hive tried to merge this' + when + ' and GitHub refused' + (text ? ' — ' + text : '') + '.';
if (mg.sweep_running) {
- return { state, word, detail: 'retrying', tip: sentence + " hive's merge sweep is retrying it now." + lastSeen + details, cue: 'running', until: 0 };
+ return { state, word, detail: 'retrying', tip: sentence + ' hive is retrying it now.' + lastSeen + details, cue: 'running', until: 0 };
}
return { state, word, detail: STAGE_TRACKER_MERGE_REFUSAL_DETAIL[kind] || 'GitHub refused', tip: sentence + ' The lane re-evaluates it on its next pass' + (nextWords ? ' (' + nextWords + ')' : '') + '.' + lastSeen + details, cue: 'waiting', until: 0 };
}
@@ -15181,7 +15181,7 @@ Where to get help
return line.length > STAGE_TRACKER_MERGE_FAILED_SHORT_MAX ? line.slice(0, STAGE_TRACKER_MERGE_FAILED_SHORT_MAX - 1).trimEnd() + '…' : line;
}
// Pure: the pill word with its live detail — "Ready for auto merge ·
- // next sweep in 42s". The detail span carries data-ham-until so the
+ // next pass in 42s". The detail span carries data-ham-until so the
// countdown ticks in place.
function stageTrackerMergeGateWordHtml(item, nowMs) {
const info = stageTrackerMergeGateInfo(item, nowMs);
@@ -15236,10 +15236,20 @@ Where to get help
if (typeof formatDashboardTime === 'function') return formatDashboardTime(ms, opts);
try { return new Intl.DateTimeFormat(undefined, opts).format(new Date(ms)); } catch (e) { return new Date(ms).toISOString(); }
}
- // Pure: { word, detail, tip } for a soak clock at nowMs.
+ // Pure: "next pass in 42s" until the lane's next pass, "pass due now"
+ // once it has come, '' when the next pass is unknown. Never the word
+ // "sweep" — that is the lane's internal name, not a state.
+ function stageTrackerNextPassWords(nextAt, nowMs) {
+ if (nextAt > nowMs) return 'next pass in ' + stageTrackerShortLeft(nextAt - nowMs);
+ return nextAt > 0 ? 'pass due now' : '';
+ }
+ // Pure: { word, detail, tip, cue } for a soak clock at nowMs.
// soaking — "Soaking · 12m left"; the hover carries the rule, the
// live time left and the end time
- // ready — past until: "Soaking · ready — next sweep in 3m"
+ // complete — past until, waiting for the lane's next pass:
+ // "Soaking · complete"
+ // mergeable — past until and the lane's pass is on it now:
+ // "Mergeable · merging now"
// restarted — "Soak restarted · new head"
function stageTrackerSoakWords(clock, nowMs, nextAt, sweepRunning) {
const short = clock.head ? clock.head.slice(0, 7) : '';
@@ -15247,15 +15257,19 @@ Where to get help
const mins = clock.windowS > 0 ? Math.round(clock.windowS / 60) : 0;
const window = mins > 0 ? mins + ' minute' + (mins === 1 ? '' : 's') : 'the soak window';
if (clock.restarted) {
- return { word: 'Soak restarted', detail: 'new head', tip: who + ' was replaced by a new push, so the soak starts over on the new head: it must sit ' + window + ' without new commits before the hive merges it. hive re-reads it on its next sweep.' };
+ return { word: 'Soak restarted', detail: 'new head', tip: who + ' was replaced by a new push, so the soak starts over on the new head: it must sit ' + window + ' without new commits before the hive merges it. hive re-reads it on its next pass.' };
}
const prefix = clock.prefix || '';
const leftMs = clock.until - nowMs;
if (leftMs > 0) {
return { word: 'Soaking', detail: prefix + stageTrackerShortLeft(leftMs) + ' left', tip: who + ' must sit ' + window + ' without new commits before the hive merges it · ' + stageTrackerSoakLeftText(leftMs) + ' left · soak ends ' + stageTrackerClockText(clock.until) };
}
- const next = sweepRunning ? 'merge sweep running' : (nextAt > nowMs ? 'next sweep in ' + stageTrackerShortLeft(nextAt - nowMs) : 'sweep due now');
- return { word: 'Soaking', detail: (prefix ? 'soaked — ' : 'ready — ') + next, tip: who + ' sat ' + window + ' without new commits — soaked since ' + stageTrackerClockText(clock.until) + '; hive merges it on its next sweep (' + next + ').' };
+ const soaked = who + ' sat ' + window + ' without new commits — soaked since ' + stageTrackerClockText(clock.until) + '. ';
+ if (sweepRunning) {
+ return { word: 'Mergeable', detail: prefix ? 'soaked — merging now' : 'merging now', tip: soaked + 'Mergeable — merging now.', cue: 'running' };
+ }
+ const next = stageTrackerNextPassWords(nextAt, nowMs);
+ return { word: 'Soaking', detail: prefix ? 'soak complete' : 'complete', tip: soaked + 'Soak complete — merges on the next pass' + (next ? ' (' + next + ')' : '') + '.', cue: 'soaking' };
}
// Pure: the leading glyph for a row on the gate — spinning while hive's
// sweep is on it, a clock while it waits — with the sentence as title
@@ -15267,12 +15281,12 @@ Where to get help
return `${stageTrackerIcon(spin ? 'sweep' : 'wait', 'ham-ico')}`;
}
// Pure: the queue chip's countdown words — "~4m" until the estimate,
- // "any sweep now" once it has passed.
+ // "any moment now" once it has passed.
function stageTrackerTrainEtaDetail(etaAt, nowMs) {
const left = stageTrackerShortLeft(etaAt - nowMs);
- return left ? '~' + left : 'any sweep now';
+ return left ? '~' + left : 'any moment now';
}
- // Pure: ticks every countdown in el from nowMs; "sweep due now" once a
+ // Pure: ticks every countdown in el from nowMs; "pass due now" once a
// ready row's next pass has come.
function stageTrackerGateCountdownSync(el, nowMs) {
if (!el || typeof el.querySelectorAll !== 'function') return;
@@ -15282,7 +15296,7 @@ Where to get help
const kind = n.getAttribute('data-ham-until-kind');
if (n.getAttribute('data-ham-soak') === '1') { stageTrackerSoakTick(n, nowMs); continue; }
const left = stageTrackerShortLeft(until - nowMs);
- let t = kind === 'soaking' ? (left ? '· ' + left + ' left' : '· soak window complete') : (left ? '· next sweep in ' + left : '· sweep due now');
+ let t = kind === 'soaking' ? (left ? '· ' + left + ' left' : '· complete') : (left ? '· next pass in ' + left : '· pass due now');
if (kind === 'decided') t = n.textContent.replace(/ · in [^·]*$|· in [^·]*$/, '') + (left ? ' · in ' + left : ' · due now');
if (kind === STAGE_TRACKER_TRAIN_STATE_QUEUED || kind === STAGE_TRACKER_TRAIN_STATE_FRONT) t = '· ' + stageTrackerTrainEtaDetail(until, nowMs);
if (n.textContent !== t) n.textContent = t;
@@ -15296,6 +15310,10 @@ Where to get help
const words = stageTrackerSoakWords(clock, nowMs, Number(n.getAttribute('data-ham-next')) || 0, n.getAttribute('data-ham-sweeping') === '1');
const t = '· ' + words.detail;
if (n.textContent !== t) n.textContent = t;
+ // At 095 the soak owns the pill word too: a soaked head under the
+ // lane's pass flips "Soaking" to "Mergeable" without a re-render.
+ const wordNode = n.previousSibling;
+ if (!clock.prefix && wordNode && wordNode.nodeType === 3 && wordNode.textContent.trim() !== words.word) wordNode.textContent = words.word + ' ';
const prev = n.getAttribute('data-ham-soak-tip') || '';
if (!prev || prev === words.tip || typeof n.closest !== 'function') return;
const li = n.closest('li');