Skip to content

🐛 fix: clarify Activity Monitor actors and shared PR rows - #15076

Closed
thatguywob wants to merge 2 commits into
hivecommons:v5from
thatguywob:fix/15071-activity-monitor
Closed

thatguywob wants to merge 2 commits into
hivecommons:v5from
thatguywob:fix/15071-activity-monitor

Conversation

@thatguywob

Copy link
Copy Markdown
Contributor

Fixes #15071

The Activity Monitor now receives an explicit server-derived stage_actor with 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_under issue, 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 -l on changed Go files and git diff --check passed. 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

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>
@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 danathar 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 28, 2026 •

Copy link
Copy Markdown
Contributor

Open PR overlap check

Base branch: v5

This PR conflicts with v5 itself. Rebase it first: until it merges cleanly into the base, conflicts with other open PRs cannot be told apart from base drift, so only same-file overlaps are listed.

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
#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_actor.go
src/pkg/dashboard/stage_tracker_actor_test.go
src/pkg/dashboard/stage_tracker_motion_bucket.test.js
src/pkg/dashboard/stage_tracker_repo_grouping_test.go
src/pkg/dashboard/stage_tracker_ui_test.go
src/pkg/dashboard/static/index.html
#15057 🐛 fix: recover orphaned supersede adoptions same files src/pkg/dashboard/stage_tracker.go
src/pkg/dashboard/static/index.html
#15070 ✨ Activity Monitor: presence indicator (clanker online / offline / none) on the waiting-on pill same files src/docs/dashboard-sections.md
src/pkg/dashboard/stage_tracker.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_ui_test.go
src/pkg/dashboard/static/index.html
#15067 🐛 fix: enable bulk delegation for multi-PR parent selections same files src/pkg/dashboard/static/index.html
#15072 🐛 Adoption: re-adopt when the hive's superseding copy is closed unmerged same files src/docs/dashboard-sections.md
src/pkg/dashboard/stage_tracker.go
src/pkg/dashboard/static/index.html
#14807 ✨ dashboard: stream Job pod logs in the terminal pane for sandbox.runtime: job agents same files src/pkg/dashboard/static/index.html
#15054 ✨ feature: show clanker presence on waiting-on pills same files src/docs/dashboard-sections.md
src/pkg/dashboard/stage_tracker.go
src/pkg/dashboard/static/index.html

@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 author/clanker A contributor's own hive authored this PR under their login 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/050-review-pending Review swarm requested; awaiting a verdict for the current head labels Oct 28, 2026
@hivecommons-hive hivecommons-hive Bot added stage/072-returned-to-contributor Contributor PR: CI red, changes requested or conflicting; diagnosis posted, author must act and removed stage/050-review-pending Review swarm requested; awaiting a verdict for the current head labels Oct 28, 2026
@hivecommons-hive

Copy link
Copy Markdown
Contributor

@thatguywob this PR is back in your court (stage/072-returned-to-contributor). The hive will not merge it until the head changes.

Failing checks:

  • test (dashboard 1/4)
  • test (dashboard 4/4)
  • test (dashboard shuffle 1/3)
  • test (dashboard shuffle 3/3)

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 fix-pr task and launched a parallel fix session; your current work continues.

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>
@hivecommons-hive hivecommons-hive Bot added stage/050-review-pending Review swarm requested; awaiting a verdict for the current head and removed stage/072-returned-to-contributor Contributor PR: CI red, changes requested or conflicting; diagnosis posted, author must act 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 #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} as stage_actor on items and nested PRs (src/pkg/dashboard/stage_tracker_actor.go, new in both);
  • stamp linked PRs with drawn_under from the PR's nested_under so hive#14921 is drawn once (stage_tracker.go: this PR lp.DrawnUnder = pr.DrawnUnder after items[i].DrawnUnder = items[i].NestedUnder; #15074 it.LinkedPRs[j].DrawnUnder = pr.NestedUnder — same value);
  • move #activity-monitor-merged into a header slot above the Merge gate column in static/index.html;
  • document it in src/docs/dashboard-sections.md and add a changelog fragment.

Differences I verified, which is why I'd keep #15074:

  • author_kind semantics. This PR changes stageTrackerAuthorKind (stage_tracker.go:716) to return "bot" for [bot] logins, so the existing public author_kind JSON field gains a new value. The SPA author filter at base only knows human|clanker|hive (index.html:15772), so nothing breaks, but it is a change to an existing field; #15074 leaves author_kind as-is and classifies bots only inside the new stage_actor (stageTrackerBotAuthor).
  • Stage coverage. stageTrackerSetActor here handles stages 15/17/45/85/90, 20, 30/40/70/71/72 and leaves everything else as none — waiting for the next pipeline evaluation; #15074's stageTrackerStageActor gives every stage, plus hold / blocked / superseded / mirrored-issue modifiers, a specific kind and reason.
  • Minor: Login and Since here lack omitempty, 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

@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 #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 as stage_actor on StageTrackerItem and StageTrackerLinkedPR, and both add drawn_under to dedupe a PR listed under two issues (src/pkg/dashboard/stage_tracker.go, new src/pkg/dashboard/stage_tracker_actor.go in both PRs — same new filename).
  • Both move the Merged today chip above the Merge gate / ✓ header in static/index.html and update src/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"/inferred for any [bot] login, widening author_kind for every consumer; #15074 keeps author_kind as-is and adds stageTrackerBotAuthor() only for the actor derivation.
  • stage_actor here is a non-omitempty struct with since: null; #15074 uses *StageTrackerActor with omitempty on login/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 a why for every stagelabels stage 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

@hivecommons-hive hivecommons-hive Bot added stage/085-needs-decision A human decision is owed: sentinel alert, hold/needs-decision label, human-only rule or parked issue and removed stage/050-review-pending Review swarm requested; awaiting a verdict for the current head labels Oct 28, 2026
@hivecommons-hive

Copy link
Copy Markdown
Contributor

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:

  • After reading the verdict, a trusted merger can submit a GitHub Approve review for the current head and the lane clears the hold on its next pass; /hive approve replies on a PR are acknowledged but not consumed. An ordinary contributor cannot release their own PR.

Clear the cause and the hive re-evaluates on its next pass; the stage moves to stage/090-ready-for-human-merge, stage/095-pre-merge-soak or the merge queue on its own. Approval does not bypass CI, hold labels or other merge gates.

@github-actions github-actions Bot removed the conflicts-with-open-pr Open PR has a merge conflict with another open PR label Oct 28, 2026
@hivecommons-hive

Copy link
Copy Markdown
Contributor

Superseded by #15074 (earlier fix for #15071). Closing as duplicate.

@hivecommons-hive hivecommons-hive Bot added the hive/superseded Closed by Hive: a different merged PR already landed this change label Oct 28, 2026
@hivecommons-hive hivecommons-hive Bot closed this Oct 28, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

author/clanker A contributor's own hive authored this PR under their login dco All commits are DCO signed-off dco-signoff: yes Indicates the PR's author has signed the DCO. hive/superseded Closed by Hive: a different merged PR already landed this change role/trusted Author is trusted for unattended merge (trusted-author role or registry/claim tier in require_tiers) size/L Denotes a PR that changes 100-499 lines, ignoring generated files. stage/085-needs-decision A human decision is owed: sentinel alert, hold/needs-decision label, human-only rule or parked issue

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Activity Monitor: Fixing pill without actor icon on bot PRs, PR drawn twice under two issues, Merged-today counter far from the gate

1 participant