Repository navigation
🐛 fix: clarify Activity Monitor actors and shared PR rows - #15076
thatguywob wants to merge 2 commits into
Conversation
Derive stage actors from server evidence, distinguish idle bot fixing lanes, and assign each shared covering PR one drawing parent. Move the merge counter above the gate while preserving its celebration target. Co-authored-by: clubanderson <407614+clubanderson@users.noreply.github.com> Hive-Run: hivecommons#15071 Hive-Plan: activity-monitor-actors-drawing-counter Hive-Spec: issue-15071#requirements-1-3 Signed-off-by: thatguywob <thatguywob@users.noreply.github.com>
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
Open PR overlap checkBase branch:
Conflicts are checked with every PR merged onto the current tip of
|
|
@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 |
Keep actor and shared-PR rendering assertions in the renderer fixture, which loads their helpers, and expect an unknown author when the legacy PR link carries no author evidence. Signed-off-by: thatguywob <thatguywob@users.noreply.github.com>
There was a problem hiding this comment.
Decision needed: @clubanderson should decide whether #15076 is closed in favour of #15074, which fixes the same #15071 with a server-derived stage_actor, drawn_under and the counter slot.
This appears to duplicate #15074, which makes the same change for the same issue (Fixes #15071). I read both diffs in full.
Both PRs:
- add
StageTrackerActor{kind, login, since, why}asstage_actoron items and nested PRs (src/pkg/dashboard/stage_tracker_actor.go, new in both); - stamp linked PRs with
drawn_underfrom the PR'snested_underso hive#14921 is drawn once (stage_tracker.go: this PRlp.DrawnUnder = pr.DrawnUnderafteritems[i].DrawnUnder = items[i].NestedUnder; #15074it.LinkedPRs[j].DrawnUnder = pr.NestedUnder— same value); - move
#activity-monitor-mergedinto a header slot above the Merge gate column instatic/index.html; - document it in
src/docs/dashboard-sections.mdand add a changelog fragment.
Differences I verified, which is why I'd keep #15074:
author_kindsemantics. This PR changesstageTrackerAuthorKind(stage_tracker.go:716) to return"bot"for[bot]logins, so the existing publicauthor_kindJSON field gains a new value. The SPA author filter at base only knowshuman|clanker|hive(index.html:15772), so nothing breaks, but it is a change to an existing field; #15074 leavesauthor_kindas-is and classifies bots only inside the newstage_actor(stageTrackerBotAuthor).- Stage coverage.
stageTrackerSetActorhere handles stages 15/17/45/85/90, 20, 30/40/70/71/72 and leaves everything else asnone — waiting for the next pipeline evaluation; #15074'sstageTrackerStageActorgives every stage, plus hold / blocked / superseded / mirrored-issue modifiers, a specific kind and reason. - Minor:
LoginandSincehere lackomitempty, so every row emits"login":"","since":null.
This PR is already at stage/072-returned-to-contributor; #15074 is at stage/050-review-pending with its build green. Flagging for a maintainer: if you agree, this one could be closed in favour of #15074. 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 whether #15076 is closed in favour of your own #15074, which fixes the same three parts of #15071 with the same stage_actor / drawn_under payload.
This appears to duplicate #15074, which makes the same change for #15071 to the same files — and the two conflict, so both cannot merge. I have not closed anything.
What I verified by reading both diffs against v5:
- Both add
StageTrackerActor{kind,login,since,why}serialised asstage_actoronStageTrackerItemandStageTrackerLinkedPR, and both adddrawn_underto dedupe a PR listed under two issues (src/pkg/dashboard/stage_tracker.go, newsrc/pkg/dashboard/stage_tracker_actor.goin both PRs — same new filename). - Both move the Merged today chip above the Merge gate / ✓ header in
static/index.htmland updatesrc/docs/dashboard-sections.md. - Both bodies claim all three items of #15071.
Where they differ (so they conflict rather than overlap cleanly):
- This PR changes
stageTrackerAuthorKind(stage_tracker.go:716) to return"bot"/inferredfor any[bot]login, wideningauthor_kindfor every consumer; #15074 keepsauthor_kindas-is and addsstageTrackerBotAuthor()only for the actor derivation. stage_actorhere is a non-omitemptystruct withsince: null; #15074 uses*StageTrackerActorwithomitemptyonlogin/since.- Actor derivation here covers stages 15/17/20/30/40/45/70/71/72/85/90 (
stage_tracker_actor.go:14-31); #15074 derives awhyfor everystagelabelsstage plus hold / blocked / draft / superseded / adopted-worker cases, and propagates the covering PR's actor onto 030/040/mirrored issue rows (stageTrackerResolveActors).
Why #15074 looks like the one to keep: it is the issue author's own fix, its actor coverage is a superset of this one's, and it is at stage/050-review-pending while this PR sits at stage/072-returned-to-contributor. If the maintainer prefers this PR instead, the two deltas above are what #15074 would need to pick up.
No correctness defect found in this PR on its own; the "bot" return at stage_tracker.go:716 breaks no existing AuthorKind consumer (checked stage_tracker.go:1608,1720,1835).
— 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 @99068b1, 53/56 checks green, 3 pending, 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 |
Fixes #15071
The Activity Monitor now receives an explicit server-derived
stage_actorwith kind, login, since and reason. Current-round agent evidence distinguishes active hive work from idle fixing classifications; bot PRs awaiting their next run show “Conflicting · bot PR” or “Waiting · bot PR” with a bot author icon and an explanation of why nobody is working. Actor metadata follows inline and nested covering PRs.Shared covering PRs publish one
drawn_underissue, chosen independently of input order. Other linked issues point to that row, and PR actions and merge celebrations use the single drawing owner. The merged-today counter now sits above the Merge gate / ✓ header, independently of wrapping filters, using the existing celebration target and reduced-motion behavior. Includes documentation and a changelog fragment.Validation:
gofmt -lon changed Go files andgit diff --checkpassed. Added Go regression fixtures for actor evidence and the #14921 multi-issue case, renderer fixtures for bot pills and single drawing ownership, and a node fixture exercising the counter's header placement and the real token-flight target. Tests were not run locally, as required by AGENTS.md; CI owns test execution. This has not yet shipped to the hosted hive.— hive: backend=codex
🐝 Hive Agent:
contributor| SHA:3961fa5ce