Skip to content

✨ Soak countdown on every soak pill, with the live timer on hover - #15223

Merged
clubanderson merged 1 commit into
v5from
feat/soak-countdown-everywhere
Oct 29, 2026
Merged

clubanderson merged 1 commit into
v5from
feat/soak-countdown-everywhere

Conversation

@clubanderson

Copy link
Copy Markdown
Member

Fixes #15218

What

  • Store: Record.SoakHead / SoakStartedAt / SoakWindowSeconds with Store.NoteSoak / ClearSoak and Record.Soak().
  • Pass (automerge_stage_soak.go): every pass writes the soak it holds the head for — from the lane's soaking(remaining=…) reason after admission (095), or from RouteHuman's soak evidence on a green trust-blocked head (060/080, including a head first seen green this pass and one past the window) — and clears it otherwise.
  • Tracker payload: PR rows at 060/080/095 carry soak: {started_at, until, window_s, head_sha}; the issue's nested linked PR mirrors it. Legacy 095 records without NoteSoak fall back to the reason's remaining, aged from the sweep, with the configured window.
  • SPA: stageTrackerSoakClock / SoakWords / SoakTick — one clock on every soak pill: "Soaking · 12m left" counting down in place; "ready — next sweep in 3m" past the window (060/080 keep their word with "soak 25m left" / "soaked — next sweep in 42s"); "Soak restarted · new head" when the row's head is not the soaked one. "merge sweep running" no longer hides the clock. The tick rewrites the live hover sentence ("Head abc1234 must sit 30 minutes without new commits before the hive merges it · 12m 30s left · soak ends 8:42 PM") into the chevron's and glyph's title/aria-label without a re-render. Static glyph — no spinner (🐛 fix: stop the status symbols rotating on tracker chevrons #15189 stays).

Tests

  • TestStoreNoteSoak (stagelabels), TestSoakWindowFor / TestNoteSoakWritesAndClears (automerge).
  • TestStageTrackerSoakPayload / TestStageTrackerSoakInPayload / TestStageTrackerSoakNode (dashboard; node fixture covers countdown, ready, restarted, 060 variant, issue mirror, tick + hover refresh, no spin).
  • TestStageTrackerMergeGateNode updated for the clock attributes.

@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 nicholasjackson for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@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
#15240 🐛 Never adopt a person's PR: owner/human-authored PRs return to their author instead of the contributor-offline lane same files src/pkg/dashboard/stage_tracker.go
src/pkg/dashboard/static/index.html
src/pkg/github/automerge/automerge_stage_labels.go
src/pkg/stagelabels/store.go
#15186 🐛 Activity Monitor: one coherent post-decision state for Let hive decide rows; 060 reviewed in CI / Review same files src/pkg/dashboard/stage_tracker.go
src/pkg/dashboard/stage_tracker_merge_gate_test.go
src/pkg/dashboard/static/index.html
#15134 🐛 Delegated decision on a capability gap: model the blocker, stop the un-park/re-park loop, name the missing App permission same files src/pkg/dashboard/stage_tracker.go
src/pkg/dashboard/static/index.html
#15208 🐛 fix: decidePR answers capability-gap, not adopt-supersede, for heads the App cannot adopt same files src/pkg/dashboard/static/index.html
#15253 🐛 decision toast: issue decisions no longer read as 'approved for merge' same files src/pkg/dashboard/static/index.html
#15241 🐛 tracker: keep a closed linked issue as the row head instead of promoting the PR same files src/pkg/dashboard/stage_tracker.go
src/pkg/dashboard/static/index.html
#15256 🐛 clanker PRs with a human changes-requested review show Returned to contributor, not Sentinel alert same files src/pkg/dashboard/stage_tracker.go
src/pkg/dashboard/static/index.html
#15236 🐛 Prefer covering PR progress in Activity Monitor messages same files src/pkg/dashboard/stage_tracker.go
#15251 🐛 tracker: show Merging in the merge gate for at least the toast lifetime before ✓ same files src/pkg/dashboard/stage_tracker.go
src/pkg/dashboard/stage_tracker_merge_gate_test.go
src/pkg/dashboard/static/index.html
#15104 🐛 Activity Monitor: Rebase, then merge as maintainer; fixer owns parked conflicting PRs; dismiss self-inflicted changes_requested same files src/pkg/dashboard/stage_tracker.go
src/pkg/dashboard/stage_tracker_merge_gate_test.go
src/pkg/dashboard/static/index.html
#15219 🐛 fix: preserve human and owner PRs during delegated decisions same files src/pkg/dashboard/stage_tracker.go
src/pkg/dashboard/static/index.html
src/pkg/github/automerge/automerge_stage_labels.go
src/pkg/stagelabels/store.go
#15122 🐛 Write-back containment: per-kind gate for every unsolicited GitHub write, with backfill guard same files src/pkg/dashboard/static/index.html
#15249 ✨ dashboard: merged ledger rolls like an odometer and the rising glyph eases slower same files src/pkg/dashboard/static/index.html

@hivecommons-hive hivecommons-hive Bot added author/human A person pushed this PR themselves dco All commits are DCO signed-off stage/071-needs-author Human-authored PR: CI red, changes requested or conflicting; diagnosis posted, the author must act labels Oct 29, 2026
@clubanderson
clubanderson force-pushed the feat/soak-countdown-everywhere branch from 828bdf4 to eeef25c Compare October 29, 2026 02:01
@kubestellar-prow kubestellar-prow Bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 29, 2026
@github-actions github-actions Bot added conflicts-with-open-pr Open PR has a merge conflict with another open PR and removed conflicts-with-open-pr Open PR has a merge conflict with another open PR labels Oct 29, 2026
clubanderson added a commit that referenced this pull request Oct 29, 2026
Generated by changelog-fragment-guard from the PR title (#5675).
Edit the wording freely, or replace this file with the no-changelog
label if the change is not user-visible.

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Signed-off-by: clubanderson <407614+clubanderson@users.noreply.github.com>
@hivecommons-hive

Copy link
Copy Markdown
Contributor

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

@hivecommons-hive hivecommons-hive Bot added role/trusted Author is trusted for unattended merge (trusted-author role or registry/claim tier in require_tiers) stage/050-review-pending Review swarm requested; awaiting a verdict for the current head stage/071-needs-author Human-authored PR: CI red, changes requested or conflicting; diagnosis posted, the author must act and removed stage/071-needs-author Human-authored PR: CI red, changes requested or conflicting; diagnosis posted, the author must act stage/050-review-pending Review swarm requested; awaiting a verdict for the current head labels Oct 29, 2026
@hivecommons-hive

Copy link
Copy Markdown
Contributor

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

Failing checks:

  • changelog-fragment-guard

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

@hivecommons-hive hivecommons-hive Bot added stage/050-review-pending Review swarm requested; awaiting a verdict for the current head stage/071-needs-author Human-authored PR: CI red, changes requested or conflicting; diagnosis posted, the author must act and removed stage/071-needs-author Human-authored PR: CI red, changes requested or conflicting; diagnosis posted, the author must act stage/050-review-pending Review swarm requested; awaiting a verdict for the current head labels Oct 29, 2026
@hivecommons-hive hivecommons-hive Bot added stage/050-review-pending Review swarm requested; awaiting a verdict for the current head and removed stage/071-needs-author Human-authored PR: CI red, changes requested or conflicting; diagnosis posted, the author must act labels Oct 29, 2026
The pass records the soak it holds a head for on the stage record
(NoteSoak) whether the lane admitted it (095) or trust still blocks it
(060/080, RouteHuman's soak evidence), the tracker payload carries it as
soak {started_at, until, window_s, head_sha}, and the SPA counts one
clock down on every soak pill, flips to ready past the window, notices a
replaced head and writes the live time left into the chevron hover.

Signed-off-by: Andrew Anderson <andy@clubanderson.com>
@clubanderson
clubanderson force-pushed the feat/soak-countdown-everywhere branch from 4fa2c81 to c66f4dc Compare October 29, 2026 02:18
@github-actions github-actions Bot added the conflicts-with-open-pr Open PR has a merge conflict with another open PR label Oct 29, 2026
@github-actions github-actions Bot removed the conflicts-with-open-pr Open PR has a merge conflict with another open PR label Oct 29, 2026
@clubanderson
clubanderson merged commit 4db33fe into v5 Oct 29, 2026
77 of 78 checks passed
@kubestellar-prow
kubestellar-prow Bot deleted the feat/soak-countdown-everywhere branch October 29, 2026 02:44
@hivecommons-hive hivecommons-hive Bot removed role/trusted Author is trusted for unattended merge (trusted-author role or registry/claim tier in require_tiers) stage/050-review-pending Review swarm requested; awaiting a verdict for the current head labels Oct 29, 2026
@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

author/human A person pushed this PR themselves dco All commits are DCO signed-off dco-signoff: yes Indicates the PR's author has signed the DCO. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Activity Monitor: soak countdown missing on 'merge sweep running' and pre-admission soak rows; hover should show the live timer

1 participant