Skip to content

🐛 Activity Monitor: server-derived stage actor icons, one row per PR, Merged-today counter above the gate - #15074

Merged
hivecommons-hive[bot] merged 4 commits into
v5from
fix/tracker-actor-icon-dedupe-counter
Oct 28, 2026
Merged

hivecommons-hive[bot] merged 4 commits into
v5from
fix/tracker-actor-icon-dedupe-counter

Conversation

@clubanderson

Copy link
Copy Markdown
Member

Fixes #15071

Three Hive Activity Monitor fixes observed on hive's hive.

1. Actor icon from a server-derived stage_actor

Every item and nested PR now carries stage_actor: {kind: hive|clanker|human|bot|none, login, since, why} (stage_tracker_actor.go), derived from the stage, the author kind, the claimant, the human approver and the live agents[].lastAction workers. The SPA draws the pill icon from kind only (⬡ hive, robot clanker, person human — same glyph as Needs human decision — new cog for bot, none → no icon with tooltip no one is working on this right now — ); the old author_kind heuristic remains only for payloads from an older server.

A 070 PR nobody can fix no longer reads as an active Fixing: hivecommons/docs#500 (github-actions[bot], CONFLICTING, superseded by merged #497) now reads Conflicting · bot PR with the bot icon; caption Conflicting with the base branch; bot-authored PR (@github-actions[bot]) — the hive does not fix bot PRs; it waits for the bot's next run to replace it (superseded by #497). An unowned red PR reads Red · nobody on it.

2. hive#14921 drawn twice — root cause and fix

The PR body says Closes #14906 (closed), Closes #14910, Closes #14911. Both #14910 and #14911 are open and listed; each lists the PR once in linked_prs (the per-issue dedupe was fine), and each issue row rendered it as its single covering PR — two identical "↳ #14921 … Fixing ⬡" rows. Fix: stageTrackerResolveLinkedPRs stamps each linked entry with drawn_under (the PR's nested_under); the SPA draws the PR only under that issue and the other issue shows a compact ↳ #14921 · under #14910 chip. Go fixture TestStageTrackerLinkedPRDrawnUnder reproduces it.

3. Merged-today counter above the Merge gate

The counter (#activity-monitor-merged) is one node for the life of the page: the column header gains a top row whose last cell spans the Merge gate + ✓ columns and holds a slot; stageTrackerMergedCountMount moves the chip into it after each reconcile and back to its toolbar home (#activity-monitor-merged-home, hidden when empty) while the board is empty. celebrateRow, the count draw and Test celebration resolve the chip through stageTrackerMergedChip(), so the token flies straight up the gate column. ⚙ → Merges → Celebrate merges and reduced-motion handling are unchanged; CSS uses tokens only.

Tests

  • Go: TestStageTrackerStageActorKinds, TestStageTrackerStageActorUnits (hive/clanker/human/bot/none, fix: persist repo sparkline history across page refreshes #500 caption), TestStageTrackerLinkedPRDrawnUnder.
  • Node fixtures: TestStageTrackerActorIconKindsJS (icon per kind, no-actor tooltip, Fixing word, issue/sub-row propagation), TestStageTrackerLinkedDrawnUnderJS (dedupe + chip, legacy payload), TestStageTrackerMergedCounterPlacement (slot above the gate, chip mounted into the header, id resolves, survives a header re-render, parks home).
  • TestStageTrackerRows' lift list is extracted into stageTrackerRowsPreludeJS / stageTrackerRowsFixtureJS for reuse.

Docs: src/docs/dashboard-sections.md (Who is on it (actor icons), One row per PR, Merged today placement). Changelog fragment included.

@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 kellyaa 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/XXL Denotes a PR that changes 1000+ 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
#15104 🐛 Activity Monitor: Rebase, then merge as maintainer; fixer owns parked conflicting PRs; dismiss self-inflicted changes_requested same files src/docs/dashboard-sections.md
src/pkg/dashboard/stage_tracker.go
src/pkg/dashboard/stage_tracker_cues_test.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 CONFLICT src/pkg/dashboard/stage_tracker.go
src/pkg/dashboard/static/index.html
#15118 🐛 fix: open the needs-human popover on issue rows with a parked PR same files src/pkg/dashboard/static/index.html
#15122 🐛 Write-back containment: per-kind gate for every unsolicited GitHub write, with backfill guard same files 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
#14807 ✨ dashboard: stream Job pod logs in the terminal pane for sandbox.runtime: job agents same files 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

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 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.

Read the diff against v5 cac064e plus the callers in stage_tracker.go. Looks correct to me.

What I verified:

  • drawn_under is stamped in a second pass of stageTrackerResolveLinkedPRs after the first loop has finished lowering pr.NestedUnder (base stage_tracker.go:2519), so it names the final lowest-numbered open issue rather than whichever issue happened to be visited first. TestStageTrackerLinkedPRDrawnUnder asserts exactly that for #14921 → #14910.
  • The SPA's stageTrackerLinkedDrawnHere treats drawn_under == 0 as "draw here", so payloads from an older server keep today's draw-under-every-issue behaviour (covered by TestStageTrackerLinkedDrawnUnderJS's legacy case).
  • stageTrackerResolveActors runs after stageTrackerResolveLinkedPRs, so the covering PR's stage_actor it copies onto 030/040/mirrored issues is the finished one; it picks the PR whose DrawnUnder is this issue (or 0), consistent with what the row draws.
  • author_kind is untouched; bots are classified only inside the new stage_actor via stageTrackerBotAuthor (authorKind == "" && [bot] suffix), so the existing Author filter (index.html:15772, human|clanker|hive) and outcomes_by_author_kind metrics are unaffected.

One open question, not a defect: when the drawn_under parent (#14910) is hidden by an Activity Monitor filter that #14911 still matches (label, needs-human, attention), #14911 shows only the ↳ #14921 · under #14910 chip and the PR's full strip is drawn nowhere in the filtered view. Probably acceptable — the chip links to the PR — but worth knowing.

Note: #15076 implements the same three fixes for #15071 with a narrower stage map and a changed author_kind; I've commented there recommending this PR as the survivor.

— hive: agent=reviewer backend=copilot model=claude-fable-5.1 copilot=1.0.88

@hivecommons-hive hivecommons-hive Bot added stage/071-needs-author Human-authored PR: CI red, changes requested or conflicting; diagnosis posted, the 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

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

Failing checks:

  • build-and-test

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.

@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 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

Copy link
Copy Markdown
Contributor

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

Why:

  • the branch conflicts with the base and needs a rebase

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/071-needs-author Human-authored PR: CI red, changes requested or conflicting; diagnosis posted, the 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 hivecommons-hive Bot added stage/071-needs-author Human-authored PR: CI red, changes requested or conflicting; diagnosis posted, the 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

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

Why:

  • the review swarm requested changes

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 merged commit 1098e1f into v5 Oct 28, 2026
83 of 86 checks passed
@kubestellar-prow
kubestellar-prow Bot deleted the fix/tracker-actor-icon-dedupe-counter branch October 28, 2026 21:53
@hivecommons-hive

Copy link
Copy Markdown
Contributor
Evidence bundle `#1507429949f4` sha256:d0f034d79be57211886b4944f68be107df79f80ca19797506cbc31e6b3bcc0f7 — download from the dashboard or `hivectl review evidence #15074`.

@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 29949f4.

@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/071-needs-author Human-authored PR: CI red, changes requested or conflicting; diagnosis posted, the author must act labels Oct 28, 2026
clubanderson added a commit that referenced this pull request Oct 28, 2026
…se-resolve with loop guard; approve on a dirty PR queues the rebase; dismiss self-inflicted changes_requested

Squashed and rebased onto v5 after #15087 and #15074 landed.

Fixes #15103

Signed-off-by: Andrew Anderson <andy@clubanderson.com>
clubanderson added a commit that referenced this pull request Oct 28, 2026
…se-resolve with loop guard; approve on a dirty PR queues the rebase; dismiss self-inflicted changes_requested

Squashed and rebased onto v5 after #15087 and #15074 landed.

Fixes #15103

Signed-off-by: Andrew Anderson <andy@clubanderson.com>
clubanderson added a commit that referenced this pull request Oct 28, 2026
…se-resolve with loop guard; approve on a dirty PR queues the rebase; dismiss self-inflicted changes_requested

Squashed and rebased onto v5 after #15087 and #15074 landed.

Fixes #15103

Signed-off-by: Andrew Anderson <andy@clubanderson.com>
clubanderson added a commit that referenced this pull request Oct 29, 2026
…se-resolve with loop guard; approve on a dirty PR queues the rebase; dismiss self-inflicted changes_requested

Squashed and rebased onto v5 after #15087 and #15074 landed.

Fixes #15103

Signed-off-by: Andrew Anderson <andy@clubanderson.com>
clubanderson added a commit that referenced this pull request Oct 29, 2026
…se-resolve with loop guard; approve on a dirty PR queues the rebase; dismiss self-inflicted changes_requested

Squashed and rebased onto v5 after #15087 and #15074 landed.

Fixes #15103

Signed-off-by: Andrew Anderson <andy@clubanderson.com>
clubanderson added a commit that referenced this pull request Oct 29, 2026
…se-resolve with loop guard; approve on a dirty PR queues the rebase; dismiss self-inflicted changes_requested

Squashed and rebased onto v5 after #15087 and #15074 landed.

Fixes #15103

Signed-off-by: Andrew Anderson <andy@clubanderson.com>
clubanderson added a commit that referenced this pull request Oct 29, 2026
…se-resolve with loop guard; approve on a dirty PR queues the rebase; dismiss self-inflicted changes_requested

Squashed and rebased onto v5 after #15087 and #15074 landed.

Fixes #15103

Signed-off-by: Andrew Anderson <andy@clubanderson.com>
clubanderson added a commit that referenced this pull request Oct 29, 2026
…se-resolve with loop guard; approve on a dirty PR queues the rebase; dismiss self-inflicted changes_requested

Squashed and rebased onto v5 after #15087 and #15074 landed.

Fixes #15103

Signed-off-by: Andrew Anderson <andy@clubanderson.com>
clubanderson added a commit that referenced this pull request Oct 29, 2026
…se-resolve with loop guard; approve on a dirty PR queues the rebase; dismiss self-inflicted changes_requested

Squashed and rebased onto v5 after #15087 and #15074 landed.

Fixes #15103

Signed-off-by: Andrew Anderson <andy@clubanderson.com>
clubanderson added a commit that referenced this pull request Oct 29, 2026
…se-resolve with loop guard; approve on a dirty PR queues the rebase; dismiss self-inflicted changes_requested

Squashed and rebased onto v5 after #15087 and #15074 landed.

Fixes #15103

Signed-off-by: Andrew Anderson <andy@clubanderson.com>
clubanderson added a commit that referenced this pull request Oct 29, 2026
…se-resolve with loop guard; approve on a dirty PR queues the rebase; dismiss self-inflicted changes_requested

Squashed and rebased onto v5 after #15087 and #15074 landed.

Fixes #15103

Signed-off-by: Andrew Anderson <andy@clubanderson.com>
clubanderson added a commit that referenced this pull request Oct 29, 2026
…se-resolve with loop guard; approve on a dirty PR queues the rebase; dismiss self-inflicted changes_requested

Squashed and rebased onto v5 after #15087 and #15074 landed.

Fixes #15103

Signed-off-by: Andrew Anderson <andy@clubanderson.com>
clubanderson added a commit that referenced this pull request Oct 29, 2026
…se-resolve with loop guard; approve on a dirty PR queues the rebase; dismiss self-inflicted changes_requested

Squashed and rebased onto v5 after #15087 and #15074 landed.

Fixes #15103

Signed-off-by: Andrew Anderson <andy@clubanderson.com>
hivecommons-hive Bot pushed a commit that referenced this pull request Oct 29, 2026
…ed conflicting PRs; dismiss self-inflicted changes_requested (#15104)

* 🐛 Activity Monitor: Rebase, then merge as maintainer; autonomous rebase-resolve with loop guard; approve on a dirty PR queues the rebase; dismiss self-inflicted changes_requested

Squashed and rebased onto v5 after #15087 and #15074 landed.

Fixes #15103

Signed-off-by: Andrew Anderson <andy@clubanderson.com>

* test: fix fixtures after the v5 rebase (mock fields, failingEntry rebase fields, import ratchet, window shim)

Signed-off-by: Andrew Anderson <andy@clubanderson.com>

* test: lift pkg/rebasemerge coverage above its floor; drop an ineffectual assignment

Signed-off-by: Andrew Anderson <andy@clubanderson.com>

* test: compare the shared singletons through named values (staticcheck SA4000)

Signed-off-by: Andrew Anderson <andy@clubanderson.com>

* security: rebase-then-merge fails closed on a head the hive did not produce; document the new API shapes

The approval is bound to the head the operator read. A contributor PR whose
head moves after the click now counts as rebased only when GitHub reports
the hive (App bot or pane identity) as the commit's author or committer;
any other head settles the follow-through as failed (foreign-head) with
nothing merged, a note on the PR, and 'Approve the new head & merge' as the
way out. api-reference.md gains the 202 rebase-queued answer, the rebase
response field, and the rebase_merge / rebase row fields.

Signed-off-by: Andrew Anderson <andy@clubanderson.com>

* merge train: hand a dirty member to the fixer's rebase-resolve episode; the exhausted row's rebase-then-merge option goes live

v5 landed the conflict-aware merge train (#15157) with a RebaseResolver hook
reserved for this PR and a duplicate rebaseMergeFollowThroughLabel. The hook
now opens the shared rebase episode (requested_by: merge-train); the
mergeNowWired flag and its disabled reason go, since the option it guarded
is wired here.

Signed-off-by: Andrew Anderson <andy@clubanderson.com>

* test: approve toast wording follows #15213

Signed-off-by: Andrew Anderson <andy@clubanderson.com>

* rebase onto v5: drop duplicate nonEmptyString, lift STAGE_TRACKER_ICONS for the history badge in the rebase-then-merge row test

Signed-off-by: Andrew Anderson <andy@clubanderson.com>

* writeback ratchet: baseline the two operator-solicited comments of the rebase-then-merge follow-through

Signed-off-by: Andrew Anderson <andy@clubanderson.com>

* automerge: superseded question precedes the label block (#15278) while a needs-rebase label on a merely-behind head stays stale

Signed-off-by: Andrew Anderson <andy@clubanderson.com>

---------

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/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.

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