Skip to content

πŸ› Activity monitor: one merge-gate vocabulary and a labelled leading glyph on every gated row - #15084

Merged
hivecommons-hive[bot] merged 3 commits into
v5from
fix/merge-gate-indicator
Oct 28, 2026
Merged

hivecommons-hive[bot] merged 3 commits into
v5from
fix/merge-gate-indicator

Conversation

@clubanderson

Copy link
Copy Markdown
Member

Fixes #15073

What the operator saw

At 15:11 ET on hive's hive, two Merge gate rows both read Ready for auto merge ⬑ β€” #15042 (base v6) with a leading spinning glyph, #15054 (base v5) without.

Why they differed

The glyph was not merge progress. It is the working cue from #15014 (.cue-working β†’ .ham-active-ico): drawn when some agent's lastAction this round names the PR. At 15:10:37 the review swarm was re-reviewing #15042 (050β†’070β†’050β†’060 bounce); nobody was on #15054. It had no title or aria-label, so it read as a status indicator. Worse, both rows were at 060 reviewed with CI still pending β€” STAGE_TRACKER_ACTIVE_WORD mapped 060, 080 and 100 all to "Ready for auto merge", so the word was wrong too. Nothing to do with v5 vs v6, GitHub auto-merge, or the merge queue.

Fix

Payload β€” /api/stage-tracker PR items (and the nested linked_prs copies) carry

"merge_gate": {"state": "gate-pending|ready|soaking|merging", "reason": "...", "sweep_running": false,
               "last_sweep_at": "...", "next_sweep_at": "...", "soak_until": "...", "soak_remaining_seconds": 452}

backed by a new automerge.SweepClock that records the running pass (cause + targeted PRs) and the next floor pass; both the event-driven loop and the legacy ticker arm it.

SPA β€” one vocabulary in pipeline order, each with its live detail after a Β·:

stage word detail
060 Awaiting merge gate what holds it β€” CI still running (build-and-test), CI is red (lint), branch has conflicts
080 Ready for auto merge next sweep in 42s (ticks in place)
095 Soaking 7m left (ticks in place)
100 Merging β€”
110 Merged βœ“ cap

Every gated row gets a leading glyph with the same plain-words sentence as title and aria-label β€” spinning while hive's sweep is on the PR ("hive's merge sweep is running on this PR now."), a clock while it waits ("Approved and green; waiting for hive's merge sweep β€” next sweep in 42s. A GitHub event on the PR … triggers a pass sooner. Last checked 10s ago."). The agent-working spinner now carries "Working now: …" as title + aria-label, so it can never again be mistaken for merge state. Countdowns ride the existing cue tick (no new interval); esc() on every attribute; no inline styles.

Actor icon unchanged (existing ⬑ / πŸ€– / πŸ‘€ per STAGE_TRACKER_ACTOR); the stage_actor work in the other PR is not duplicated.

Docs β€” legend table in src/docs/dashboard-sections.md (the (?) mark stays one sentence per #10915 and links there); labels-and-control-signals.md wording updated.

Tests β€” stage_tracker_merge_gate_test.go: Go tests of stageTrackerMergeGate (all states, targeted vs full pass, soak ageing, off-gate) and of buildStageTracker mirroring onto linked_prs; a node fixture test fed via stdin with the captured #15042 / #15054 / #15044 payloads asserting glyph presence on every gated row, identical title/aria-label, words, details, countdown ticking, and STAGE_TRACKER_ACTIVE_WORD ≑ STAGE_TRACKER_MERGE_GATE_WORD; sweep_clock_test.go in automerge. Existing row tests updated to the new words.

…glyph on every gated row

At 15:11 ET two Merge gate rows both read 'Ready for auto merge ⬑' while one
carried a spinning glyph and the other none. The glyph was the agent-working
cue (an agent's lastAction on that PR this round β€” the review swarm was
re-reviewing #15042; nobody was on #15054), unlabelled, so it read as merge
progress; and STAGE_TRACKER_ACTIVE_WORD mapped 060, 080 and 100 all to
'Ready for auto merge', so a 060 PR with CI still pending read as ready.

- /api/stage-tracker PR items (and nested linked_prs) carry
  merge_gate {state, reason, sweep_running, last_sweep_at, next_sweep_at,
  soak_until, soak_remaining_seconds}; automerge gains a SweepClock that
  records the running pass (cause, targets) and the next floor time.
- Pill words in pipeline order: Awaiting merge gate (what holds it) β†’
  Ready for auto merge (next sweep in Ns) β†’ Soaking (time left) β†’ Merging
  β†’ Merged. Every gated row gets a leading glyph with the same sentence as
  title + aria-label; it spins while a sweep is on the PR, shows a clock
  while it waits; countdowns tick from the existing cue timer.
- The agent-working spinner now carries 'Working now: <agent> …' as
  title + aria-label.
- Legend in docs/dashboard-sections.md; node fixture tests on the
  captured #15042 / #15054 / #15044 payloads; Go tests for merge_gate.

Fixes #15073

Signed-off-by: Andrew Anderson <andy@clubanderson.com>
Signed-off-by: Andrew Anderson <andy@clubanderson.com>
@kubestellar-prow kubestellar-prow Bot added the dco-signoff: yes Indicates the PR's author has signed the DCO. label Oct 28, 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 clubanderson for approval. For more information see the Code Review Process.

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

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

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

@kubestellar-prow kubestellar-prow Bot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Oct 28, 2026
@github-actions

github-actions Bot commented Oct 28, 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
#15067 πŸ› fix: enable bulk delegation for multi-PR parent selections same files src/pkg/dashboard/static/index.html
#15070 ✨ Activity Monitor: presence indicator (clanker online / offline / none) on the waiting-on pill CONFLICT src/pkg/dashboard/stage_tracker.go
#15072 πŸ› Adoption: re-adopt when the hive's superseding copy is closed unmerged same files src/docs/dashboard-sections.md
src/docs/labels-and-control-signals.md
src/pkg/dashboard/stage_tracker.go
src/pkg/dashboard/static/index.html
#15085 ✨ Activity Monitor: Adopt now and Reroute to another clanker for PRs waiting on a contributor's clanker same files src/docs/dashboard-sections.md
src/docs/labels-and-control-signals.md
src/pkg/dashboard/server.go
src/pkg/dashboard/stage_tracker.go
src/pkg/dashboard/static/index.html
#14524 ✨ feat(hub,agent): Hub-coordinated live CLI session pool for multi-tenant runner capacity same files src/docs/api-reference.md
#15057 πŸ› fix: recover orphaned supersede adoptions same files src/pkg/dashboard/stage_tracker.go
src/pkg/dashboard/static/index.html
src/pkg/github/automerge/automerge_sweep.go
#15054 ✨ feature: show clanker presence on waiting-on pills same files src/docs/dashboard-sections.md
src/docs/labels-and-control-signals.md
src/pkg/dashboard/stage_tracker.go
src/pkg/dashboard/static/index.html
#15074 πŸ› Activity Monitor: server-derived stage actor icons, one row per PR, Merged-today counter above the gate same files src/docs/dashboard-sections.md
src/pkg/dashboard/stage_tracker.go
src/pkg/dashboard/stage_tracker_ui_test.go
src/pkg/dashboard/static/index.html
#15081 πŸ› fix: explain Activity Monitor merge gates and sweep timing same files src/docs/dashboard-sections.md
src/pkg/dashboard/stage_tracker.go
src/pkg/dashboard/stage_tracker_merge_gate.go
src/pkg/dashboard/stage_tracker_merge_gate_test.go
src/pkg/dashboard/stage_tracker_ui_test.go
src/pkg/dashboard/static/index.html
src/pkg/github/automerge/automerge_forgestate.go
src/pkg/github/automerge/automerge_sweep.go
src/pkg/github/automerge/sweep_clock.go
src/pkg/github/automerge/sweep_clock_test.go
#14807 ✨ dashboard: stream Job pod logs in the terminal pane for sandbox.runtime: job agents same files src/docs/api-reference.md
src/pkg/dashboard/server.go
src/pkg/dashboard/static/index.html
#15049 ✨ feat(hub,agent): Hub-coordinated live CLI session pool for multi-tenant runner capacity same files src/docs/api-reference.md

@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 author/human A person pushed this PR themselves dco All commits are DCO signed-off role/trusted Author is trusted for unattended merge (trusted-author role or registry/claim tier in require_tiers) stage/071-needs-author Human-authored PR: CI red, changes requested or conflicting; diagnosis posted, the author must act labels Oct 28, 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:

  • relative links and anchors resolve

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.

Signed-off-by: Andrew Anderson <andy@clubanderson.com>
@github-actions github-actions Bot added the conflicts-with-open-pr Open PR has a merge conflict with another open PR label Oct 28, 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 28, 2026
@hivecommons-hive
hivecommons-hive Bot merged commit ad40710 into v5 Oct 28, 2026
78 of 80 checks passed
@kubestellar-prow
kubestellar-prow Bot deleted the fix/merge-gate-indicator branch October 28, 2026 20:22
@hivecommons-hive

Copy link
Copy Markdown
Contributor
Evidence bundle `#15084b7285dc` sha256:321db781092de039c5782e7bba70ad8ca8661717fa6a753cb37b14b3e9a6a933 β€” download from the dashboard or `hivectl review evidence #15084`.

@hivecommons-hive

Copy link
Copy Markdown
Contributor

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

@github-actions

Copy link
Copy Markdown
Contributor

Thank you for your contribution! Your PR has been merged.

We'd love to hear how your experience was: share feedback

@hivecommons-hive hivecommons-hive Bot 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 28, 2026

@hivecommons-hive hivecommons-hive Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Decision needed: @clubanderson should decide whether #15084 or #15081 is the fix for #15073 that lands β€” both add a merge_gate object with the same state vocabulary to the same tracker rows and both add an automerge sweep clock, with different wiring, and they cannot both merge.

This PR and #15081 are competing fixes for the same issue, not duplicates. Both say Fixes #15073, both add MergeGate *StageTrackerMergeGate with json:"merge_gate" to StageTrackerItem and StageTrackerLinkedPR (src/pkg/dashboard/stage_tracker.go), both create src/pkg/dashboard/stage_tracker_merge_gate.go and src/pkg/github/automerge/sweep_clock.go, both use the states gate-pending / ready / soaking / merging / merged, and both instrument automerge_sweep.go and automerge_forgestate.go. I read both diffs in full; the mechanisms differ enough that whichever merges second will conflict on every one of those files:

#15084 (this PR) #15081
clock owner automerge.SweepClock package-level defaultSweepClock, read by the dashboard via automerge.SweepSnapshot() (stageTrackerSweepState) github.MergeSweepClock hung off the GitHub client (client.go, merge_sweep_clock.go), reached by the engine through a transport type-assertion (sweepClock()) and by cmd/hive/main.go for the queued-automerge sweep
what "running" means the lane sweep's cause + targeted PR set (SweepState.OnPR; a floor sweep with nil targets marks every gated row) per-PR Working(repo, number) marks around the three merge sites, plus Begin("lanes") / Begin("queued")
state source stagelabels.Stage constants + stage record (rec.Reason, soak remaining) numeric stage (60/80/95/100/110) + item fields, applied in a post-pass applyMergeGates
SPA 163-line vocabulary rewrite incl. aria-label on the leading glyph 37-line change
extra api-reference.md citation refresh wires the cmd/hive queued sweep too

Neither one is wrong on its face; this is a pick between two designs (global clock vs client-owned clock; lane-sweep-scoped "working" vs per-PR marks). #15081 already carries a routed verdict at its head, so I am raising the question here rather than there. Both PRs are also labelled conflicts-with-open-pr, which is this.

I have not closed or approved anything.

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

hivecommons-hive Bot pushed a commit that referenced this pull request Oct 28, 2026
The merge-gate pill (#15084) read an issue row's lane reason β€” 'open PR
#15090 covers it (PR at 060-reviewed)' β€” as a gate reason and drew it as
the pill's detail, a two-line clipped label on every issue whose PR sat
at the gate. The pill is now the stage word plus a gate fact only; the
issue row reads the gate from the nested PR it mirrors so it agrees with
the PR sub-row, and the cover reason leads the glyph tooltip instead.

Fixes #15101

Signed-off-by: Andrew Anderson <andy@clubanderson.com>
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 conflicts-with-open-pr Open PR has a merge conflict with another open PR 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

1 participant