Repository navigation
✨ feature: show clanker presence on waiting-on pills - #15054
thatguywob wants to merge 4 commits into
Conversation
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
Open PR overlap checkBase branch:
Conflicts are checked with every PR merged onto the current tip of
|
|
@thatguywob this PR is back in your court ( Review asks:
Reply here or push a new head to this branch (same sign-off); CI and the review swarm re-run automatically and the PR returns to the normal path. Queued in your relay fix queue (1 waiting): fixes are handed out before new work as soon as you have capacity. |
Share adoption deadlines with the Activity Monitor and expose relay presence before the first nudge, including linked PR rows and named-author decision popovers. Hive-Run: hivecommons#15051 Hive-Plan: activity-monitor-waiting-presence Hive-Spec: hivecommons#15051#proposal Co-authored-by: clubanderson <407614+clubanderson@users.noreply.github.com> Signed-off-by: thatguywob <thatguywob@users.noreply.github.com>
36b881d to
6fc42ac
Compare
|
@thatguywob this PR is back in your court ( Failing checks:
Reply here or push a new head to this branch (same sign-off); CI and the review swarm re-run automatically and the PR returns to the normal path. Your relay session received this as a |
Signed-off-by: thatguywob <thatguywob@users.noreply.github.com>
|
@thatguywob this PR is back in your court ( Failing checks:
Reply here or push a new head to this branch (same sign-off); CI and the review swarm re-run automatically and the PR returns to the normal path. Queued in your relay fix queue (0 waiting): fixes are handed out before new work as soon as you have capacity. |
Signed-off-by: thatguywob <thatguywob@users.noreply.github.com>
There was a problem hiding this comment.
Decision needed: @clubanderson should decide whether #15054 or your own #15070 lands for #15051 — both implement the same waiting-on presence indicator and conflict on the same files.
This PR and #15070 both implement #15051 and cannot both merge. Both add Presence to StageTrackerItem / StageTrackerLinkedPR in src/pkg/dashboard/stage_tracker.go, add a presence object to the tracker payload (same login/state/kind/since/last_seen/next/adopt_at shape), add the .ham-presence-{online,offline,unknown} CSS and stageTrackerPresenceTip(item, nowMs) helper in index.html, and edit the same two docs paragraphs. Same intent (both bodies: show whether the hive will wait or adopt), different designs:
| #15054 (this) | #15070 (@clubanderson, owner) | |
|---|---|---|
| adopt-at clock | refactors adoptionDue into exported automerge.AdoptionDeadline (automerge_contributor_adopt.go:152) and calls it — one clock, cannot drift |
re-derives the clock in stage_tracker_presence.go:150-180; omits the engine's !hasPresence → adoptionGrace() branch (automerge_contributor_adopt.go:160), so with the hub unavailable after an online nudge it shows 15m where the engine waits 2h |
| stages | 071, 072 | 071, 072, 017 (PossiblyExisting) |
| presence snapshot | cached once per response (cachedStageTrackerPresence) |
per-call |
available flag |
yes (unavailable hub ≠ unregistered) | no (ok dropped at :110) |
| tests | Go + embedded node script | Go + separate .test.js fixture |
| CI | green (tide pending) | needs-rebase, dirty |
Correctness read on this PR: the adoptionDue → AdoptionDeadline refactor is behaviour-preserving (!now.Before(start+grace) ≡ now.Sub(start) >= grace for each of the four branches), and stageTrackerPersonPresence gates adopt_at on the same conditions the engine does (nudged head, AdoptionBlocked, adoption enabled, not held). Nothing I'd call a defect.
This is an ownership call between a maintainer's own PR and a contributor PR, not a code call, so I am not picking. If #15054 survives, #15070's 017 coverage is a small follow-up; if #15070 survives, the shared-AdoptionDeadline approach from here is worth carrying over. I have not closed anything.
— hive: agent=reviewer backend=copilot model=claude-fable-5.1 copilot=1.0.88
There was a problem hiding this comment.
Decision needed: @clubanderson should decide which of the two #15051 implementations lands — this PR (#15054, green, shares the adoption engine's clock) or your own #15070 (needs rebase, re-derives the clock, also covers 017) — since both add presence to StageTrackerItem and edit the same index.html pill, so they conflict and cannot both merge.
Looks correct to me, but it conflicts with #15070, which closes the same issue (#15051). Flagging for a maintainer to pick one; I have not closed anything.
What I verified against v5 (770b66d2a):
src/pkg/github/automerge/automerge_contributor_adopt.go:152-190—adoptionDueis now a thin wrapper over the new exportedAdoptionDeadline; the four branches (no presence → grace, online → grace, offline →after_offlinefrom max(nudge, last_seen), unregistered →after_unregistered) return the same instantsadoptionDuepreviously compared againstnow, so engine behaviour is unchanged and the tracker'sadopt_atis by construction the engine's own deadline. That is the "never contradicts the adoption text" requirement from #15051, satisfied structurally rather than by copy.src/pkg/dashboard/stage_tracker_person_presence.go:27-82—presenceis emitted only for PR rows at 071/072 (trackerNumberNeedsAuthor/trackerNumberReturned,stage_tracker.go:504-505); human-authored rows and rows withrec.AdoptionBlocked(head)or ahold/do-not-mergelabel (same label set as the engine'sadoptionBlocked,automerge_contributor_adopt.go:216-224) never getnext: adopt.stage_tracker.go:1548— the lookup is wrapped incachedStageTrackerPresence, so a relay connecting mid-response cannot make the dot and the adoption caption disagree on one row.stage_tracker.go:2508—Presenceis mirrored onto linked-PR sub-rows next toAdoption.- SPA:
role="img"+ escapedaria-label, distinct shapes per state,prefers-reduced-motiondisables the breathe — asserted inTestStageTrackerPersonPresenceJS(stage_tracker_person_presence_test.go:112-161), which also covers the<unsafe>login escape. The "Node rendering fixtures" in the body are these node scripts driven from Go, not a.test.jsfile.
Conflict with #15070 (same files: stage_tracker.go, static/index.html, both docs pages, both changelog fragments). The two are not a no-op pair — different Go types (StageTrackerPersonPresence vs StageTrackerPresence), different mechanics (this PR reuses the engine clock; #15070 re-implements it in stage_tracker_presence.go:106-186 and also emits presence at 017 Possibly-existing, which #15051 did not ask for). #15070 is currently needs-rebase; this one is green and mergeable. Whichever lands first makes the other a rewrite, so this is an ownership/scope call for the issue author rather than a code defect.
One non-blocking note: stage_tracker_person_presence.go:55-58 sets since to last_seen whenever it is later than the nudge start, including for an online clanker, so since on an online row means "last heartbeat" rather than "waiting since". The tooltip only reads since in the offline branch today, so nothing visible is wrong.
— hive: agent=reviewer-2 backend=copilot model=claude-fable-5.1 copilot=1.0.88
|
Needs a decision, not a merge:
Head: verdict requires_human @aee3eae, 57/57 checks green, DCO yes, soak 0s of 30m0s. How to release it:
Clear the cause and the hive re-evaluates on its next pass; the stage moves to |
|
@thatguywob this PR is back in your court ( Review asks:
Reply here or push a new head to this branch (same sign-off); CI and the review swarm re-run automatically and the PR returns to the normal path. Queued in your relay fix queue (2 waiting): fixes are handed out before new work as soon as you have capacity. |
|
PR needs rebase. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. |
…glyph on every gated row (#15084) * 🐛 Activity monitor: one merge-gate vocabulary and a labelled leading 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> * 🌱 automerge: SweepClock unit test Signed-off-by: Andrew Anderson <andy@clubanderson.com> * 📖 docs: resync api-reference citations after server.go line shift Signed-off-by: Andrew Anderson <andy@clubanderson.com> --------- Signed-off-by: Andrew Anderson <andy@clubanderson.com>
|
Closed as superseded by #15070 by @clubanderson from the Hive dashboard. |
PRs waiting on an author at 071 or 072 now show clanker presence before the first nudge, so operators can see whether to wait or expect adoption. The same presence appears in linked PR sub-rows and named-author Needs-human popovers.
Validation:
gofmt -lon all changed Go files andgit diff --checkpassed. Tests were not run locally, as required by AGENTS.md; CI runs the regression suites.Closes #15051
— hive: backend=codex
🐝 Hive Agent:
contributor| SHA:36b881ddb