Repository navigation
🐛 Activity Monitor: server-derived stage actor icons, one row per PR, Merged-today counter above the gate - #15074
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
|
|
@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. |
There was a problem hiding this comment.
Read the diff against v5 cac064e plus the callers in stage_tracker.go. Looks correct to me.
What I verified:
drawn_underis stamped in a second pass ofstageTrackerResolveLinkedPRsafter the first loop has finished loweringpr.NestedUnder(basestage_tracker.go:2519), so it names the final lowest-numbered open issue rather than whichever issue happened to be visited first.TestStageTrackerLinkedPRDrawnUnderasserts exactly that for #14921 → #14910.- The SPA's
stageTrackerLinkedDrawnHeretreatsdrawn_under == 0as "draw here", so payloads from an older server keep today's draw-under-every-issue behaviour (covered byTestStageTrackerLinkedDrawnUnderJS's legacy case). stageTrackerResolveActorsruns afterstageTrackerResolveLinkedPRs, so the covering PR'sstage_actorit copies onto 030/040/mirrored issues is the finished one; it picks the PR whoseDrawnUnderis this issue (or 0), consistent with what the row draws.author_kindis untouched; bots are classified only inside the newstage_actorviastageTrackerBotAuthor(authorKind == "" && [bot] suffix), so the existing Author filter (index.html:15772,human|clanker|hive) andoutcomes_by_author_kindmetrics 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
|
@clubanderson this PR is held at Failing checks:
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. |
|
@clubanderson this PR is held at Why:
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. |
|
@clubanderson this PR is held at Why:
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. |
|
merged by Hive trusted-author auto-merge: author @clubanderson holds role owner and GitHub permission admin on repo; CI green at 29949f4. |
|
Thank you for your contribution! Your PR has been merged. We'd love to hear how your experience was: share feedback |
…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>
Fixes #15071
Three Hive Activity Monitor fixes observed on hive's hive.
1. Actor icon from a server-derived
stage_actorEvery 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 liveagents[].lastActionworkers. The SPA draws the pill icon fromkindonly (⬡ 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 oldauthor_kindheuristic remains only for payloads from an older server.A
070PR 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 inlinked_prs(the per-issue dedupe was fine), and each issue row rendered it as its single covering PR — two identical "↳ #14921 … Fixing ⬡" rows. Fix:stageTrackerResolveLinkedPRsstamps each linked entry withdrawn_under(the PR'snested_under); the SPA draws the PR only under that issue and the other issue shows a compact ↳ #14921 · under #14910 chip. Go fixtureTestStageTrackerLinkedPRDrawnUnderreproduces 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;stageTrackerMergedCountMountmoves 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 throughstageTrackerMergedChip(), so the token flies straight up the gate column. ⚙ → Merges → Celebrate merges and reduced-motion handling are unchanged; CSS uses tokens only.Tests
TestStageTrackerStageActorKinds,TestStageTrackerStageActorUnits(hive/clanker/human/bot/none, fix: persist repo sparkline history across page refreshes #500 caption),TestStageTrackerLinkedPRDrawnUnder.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 intostageTrackerRowsPreludeJS/stageTrackerRowsFixtureJSfor reuse.Docs:
src/docs/dashboard-sections.md(Who is on it (actor icons), One row per PR, Merged today placement). Changelog fragment included.