Skip to content

✨ dashboard: say why a PR is waiting on a human merge - #14669

Merged
clubanderson merged 3 commits into
v5from
feat/human-merge-reason
Oct 27, 2026
Merged

clubanderson merged 3 commits into
v5from
feat/human-merge-reason

Conversation

@clubanderson

Copy link
Copy Markdown
Member

Why

The tracker's merge-gate cell for a stage/090-ready-for-human-merge PR read just "Ready for human merge 👤" (or "Awaiting human merge · approved by @login") and never said why a person, not the hive, has to click Merge — e.g. rationguard#401 changes .github/workflows/mutation.yml, which the hive never merges (and its App lacks the workflows permission). Same on hive#14568 / #14498.

Fixes #14658

What

  • pkg/stageengine/prstage: HumanMergeReason(reason) derives a compact code from the lane reason already persisted on the 090 stage record (no second store): workflow-files, tests-removed, manual-merge-policy, branch-protection, merge-method, auto-merge-off, untrusted-author (every trust reason), unauthorized (✨ feat: mark lanes unauthorized when the App lacks rights for the next step #14595), reviewer-deferred, fallback policy.
  • pkg/dashboard/stage_tracker.go: StageTrackerItem gains human_merge_reason + one-sentence human_merge_reason_text at 090; StageTrackerLinkedPR now mirrors human_approver, manual_merge and the two reason fields so a PR nested under its issue (the owner's screenshot) says the same.
  • index.html: lit word reads Ready for human merge · workflow files / Awaiting human merge · workflow files · approved by @clubanderson; the chevron tooltip leads with the reason text ("Changes .github/workflows/** — the hive never merges workflow changes …; click Merge on GitHub"); the search / needs-attention headline carries the same tail.
  • Tests: prstage table test; Go payload + nested-mirror + fallback test; node assertions on word, tooltip and sub-row.
  • Docs: dashboard-sections.md, hive-merge.md (reason-code list); changelog fragment.

No /prs chat change: that answer is label-only and has no stage record to derive a reason from.

@kubestellar-prow kubestellar-prow Bot added the dco-signoff: yes Indicates the PR's author has signed the DCO. label Oct 27, 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 hanthor 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 27, 2026
@github-actions

github-actions Bot commented Oct 27, 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
#14630 🐛 fix(dashboard): enrich soft-linked stage-tracker issues with title and state same files src/pkg/dashboard/stage_tracker.go
src/pkg/dashboard/stage_tracker_test.go
#14657 🐛 dashboard: anchor tracker rows on the open PR when the issue has closed same files src/docs/dashboard-sections.md
src/pkg/dashboard/stage_tracker.go
src/pkg/dashboard/stage_tracker_test.go
src/pkg/dashboard/static/index.html
#14656 🐛 fix: keep the header's right chips from overlapping the title at 769-900px same files src/pkg/dashboard/static/index.html
#14573 ✨ feat(dashboard): show a draft pill in the activity tracker same files src/docs/dashboard-sections.md
src/pkg/dashboard/stage_tracker.go
src/pkg/dashboard/static/index.html
#14651 🌱 dashboard: defer merge-gate pills until the PR reaches the gate same files src/docs/dashboard-sections.md
src/pkg/dashboard/stage_tracker.go
src/pkg/dashboard/stage_tracker_sentinel_lane_test.go
src/pkg/dashboard/static/index.html

@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 added author/human A person pushed this PR themselves 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 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 27, 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:

  • coverage

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

Copy link
Copy Markdown
Member Author

Heads-up from #14672 (owner approval releases the workflow-path fence, #14664): after that lands, HumanMergeReasonWorkflowFiles tooltip "the hive never merges workflow changes and its GitHub App lacks the workflows permission" is only accurate when auto_merge.contributor_lane.owner_approval_releases_workflow_fence is off or the merge was refused for the permission (hive:unauthorized step merge-workflow-path). Otherwise a 090 workflow-path PR is awaiting owner approval on the current head (Approve review or /hive decision approve; re-approve after a push). Suggest: "Changes .github/workflows/** — awaiting an owner's Approve review or /hive decision approve on this head; the hive merges once approved (re-approve after a push). If the App lacks the workflows permission, click Merge on GitHub." Whichever PR lands second reconciles.

@hivecommons-hive hivecommons-hive Bot added stage/050-review-pending Review swarm requested; awaiting a verdict for the current head stage/071-needs-author Human-authored PR: CI red, changes requested or conflicting; diagnosis posted, the author must act and removed stage/071-needs-author Human-authored PR: CI red, changes requested or conflicting; diagnosis posted, the author must act stage/050-review-pending Review swarm requested; awaiting a verdict for the current head labels Oct 27, 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:

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

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.

Every stage/090 row's merge-gate word, tooltip, headline and nested
sub-row now carry a compact reason code (prstage.HumanMergeReason*)
derived from the lane reason already on the stage record — workflow
files, tests removed, manual-merge policy, branch protection, merge
method, auto-merge off, untrusted author, unauthorized, reviewer
deferred, falling back to policy with the raw lane reason quoted.

Fixes #14658

Signed-off-by: Andy Anderson <andy@clubanderson.com>
Signed-off-by: Andy Anderson <andy@clubanderson.com>
…eason

Signed-off-by: Andy Anderson <andy@clubanderson.com>
@clubanderson
clubanderson force-pushed the feat/human-merge-reason branch from 3e69436 to 9f3b886 Compare October 27, 2026 19:07
@clubanderson
clubanderson merged commit cc4cc16 into v5 Oct 27, 2026
78 of 79 checks passed
@kubestellar-prow
kubestellar-prow Bot deleted the feat/human-merge-reason branch October 27, 2026 19:29
@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

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. 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/050-review-pending Review swarm requested; awaiting a verdict for the current head

Projects

None yet

Development

Successfully merging this pull request may close these issues.

dashboard: 'ready for human merge' cell never says why a human is needed

1 participant