Skip to content

πŸ› fix: keep the issue row's merge-gate pill to one line - #15102

Merged
hivecommons-hive[bot] merged 1 commit into
v5from
fix/merge-gate-pill-overflow
Oct 28, 2026
Merged

hivecommons-hive[bot] merged 1 commit into
v5from
fix/merge-gate-pill-overflow

Conversation

@clubanderson

Copy link
Copy Markdown
Member

Fixes #15101

What

In the Activity Monitor, an issue row whose covering PR sits in the merge gate rendered a two-line, clipped pill after #15084 rolled:

Awaiting merge gate
open PR #15090 covers it (PR at 060-reviewe…

(#15088β†’#15090, #15023β†’#15029, #15083β†’#15086, hotshot#316β†’#317.)

Root cause

stageTrackerMergeGateInfo built the gate-pending detail from mg.reason || item.reason. A PR row has merge_gate.reason (a gate token). An issue row has no merge_gate of its own and its reason is the issue lane's open PR #N covers it (PR at <stage>), which fell through stageTrackerGateReasonText unchanged and was concatenated into the pill label.

Fix

  • stageTrackerCoverReasonText recognises the issue lane's cover reason; it is never used as a gate reason, so the pill is one line: the stage word plus a gate fact only.
  • stageTrackerCoveringPR picks the nested linked_prs[] entry the reason names (else the one at the mirrored stage); the issue row reads merge_gate from it, so the issue row and the PR sub-row always agree on word / detail / cue.
  • The cover reason leads the glyph tooltip and the chevron title (which the decision popover reuses) as Open PR #15090 covers it Β· at 060-reviewed β€” … β€” no label name in parentheses (Activity Monitor: operator-readability findings from a live walkthrough (12:11–16:59 ET, 0470256 β†’ aa9b530)Β #15096 iteration-6 note).
  • TestStageTrackerMergeGateIssueRowPillNode (node, stdin fixture) asserts the pill has no covers it / (PR at text and the tooltip does, that both rows agree, and the older-payload / no-linked-PR / two-linked-PR cases.
  • Legend in docs/dashboard-sections.md and a changelog.d/fixed-* fragment.

090 vs 060 on the same rows

The label timeline shows #15086 / #15029 really wore stage/090-ready-for-human-merge before the roll and were relabelled stage/060-reviewed at 21:17Z; both displays were faithful to the label at the time. The 090 label was the wrong one (N7 in #15096: hive-authored PRs flagged untrusted) β€” a stage-derivation issue, not display; this PR is display-only.

The merge-gate pill (#15084) read an issue row's lane reason β€” 'open PR
#15090 covers it (PR at 060-reviewed)' β€” as a gate reason and drew it as
the pill's detail, a two-line clipped label on every issue whose PR sat
at the gate. The pill is now the stage word plus a gate fact only; the
issue row reads the gate from the nested PR it mirrors so it agrees with
the PR sub-row, and the cover reason leads the glyph tooltip instead.

Fixes #15101

Signed-off-by: Andrew Anderson <andy@clubanderson.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

@kubestellar-prow kubestellar-prow Bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. 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.

@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
#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/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/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
#15085 ✨ Activity Monitor: Adopt now and Reroute to another clanker for PRs waiting on a contributor's clanker same files src/docs/dashboard-sections.md
src/pkg/dashboard/static/index.html
#15087 πŸ› Activity Monitor: Ready for human merge offers Approve & merge / let hive merge; every needs-human state has its action same files src/docs/dashboard-sections.md
src/pkg/dashboard/static/index.html
#15057 πŸ› fix: recover orphaned supersede adoptions same files src/pkg/dashboard/static/index.html
#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/static/index.html

@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 tree, not just the diff. Looks correct to me.

Why the gate read is safe. The only producer of open PR #N covers it (PR at <stage>) is src/pkg/stageengine/derive_issue.go:160, and it returns mirrored=true on the same path β€” so whenever STAGE_TRACKER_COVER_REASON_RE matches, the issue row's stage is the covering PR's stage, and stageTrackerCoveringPR (static/index.html:14236) resolves to the same PR the sub-row draws. The server already fills linked_prs[].merge_gate / soak_remaining_seconds from the PR item (stage_tracker.go:2558, pre-existing on v5), so no API change was needed.

Partial cover. The addresses part of it (…; PR at <stage>) reason (derive_issue.go:158) doesn't match the regex, but the prs.find(p => p.stage === item.stage) fallback still picks the mirrored PR and laneReason is '' for every kind:'issue' row, so that shape no longer leaks into the pill either β€” it just loses the tooltip prefix. Fine.

PR rows unchanged. laneReason falls back to item.reason exactly as before for kind:'pr' (a PR row's reason never matches the cover regex), so stageTrackerMergeGateInfoFor is behaviour-preserving there.

Couldn't run the node-backed TestStageTrackerMergeGate* here (go test is disabled on agent hosts); CI is the verdict for those.

β€” 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.

Read the tree at ce9dcaf, not just the diff. Looks correct to me.

  • The regex STAGE_TRACKER_COVER_REASON_RE (src/pkg/dashboard/static/index.html:14227) matches the producer byte-for-byte: stageengine/derive_issue.go:160 emits "open PR #" + N + " covers it (PR at " + stage + ")". The older bare token open PR covers it (derive_issue.go:25) does not match and so is neither a cover text nor β€” since laneReason is '' for kind === 'issue' at index.html:14267 β€” a gate reason; the test covers that case.
  • stageTrackerCoveringPR reads linked_prs[].stage / .merge_gate, which the server does populate (stage_tracker.go:2558 mirrors pr.MergeGate onto the nested entry; StageTrackerLinkedPR.Stage at :476). Fallback to the issue's own stage when the nested PR has no merge_gate keeps older payloads at the right word.
  • All three callers (index.html:14297, 14306, 14607) go through stageTrackerMergeGateInfo, so the pill, the glyph tooltip and the row strip all take the new path; PR rows are untouched because stageTrackerCoveringPR returns null for kind === 'pr'.

I could not run the node test here (go test is blocked on agent hosts), but test (dashboard 1-4/4) is green on this head.

β€” hive: agent=reviewer-2 backend=copilot model=claude-fable-5.1 copilot=1.0.88

@hivecommons-hive
hivecommons-hive Bot merged commit 29bbea4 into v5 Oct 28, 2026
84 of 87 checks passed
@kubestellar-prow
kubestellar-prow Bot deleted the fix/merge-gate-pill-overflow branch October 28, 2026 21:51
@hivecommons-hive

Copy link
Copy Markdown
Contributor
Evidence bundle `#15102ce9dcaf` sha256:ebc2ee49ea31a5e0714addbdc13aa8ed8344fc0504a1a3164f3b5d005afcd1e7 β€” download from the dashboard or `hivectl review evidence #15102`.

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

@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/050-review-pending Review swarm requested; awaiting a verdict for the current head labels Oct 28, 2026
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 dco All commits are DCO signed-off dco-signoff: yes Indicates the PR's author has signed the DCO. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

πŸ› Activity Monitor: issue-row merge gate pill concatenates the 'open PR #N covers it (PR at …)' reason into a two-line clipped label

1 participant