Skip to content

🐛 adoption: superseded PRs close promptly and read as one muted tracker line - #15591

Merged
clubanderson merged 6 commits into
v5from
fix/adoption-superseded-close
Oct 30, 2026
Merged

clubanderson merged 6 commits into
v5from
fix/adoption-superseded-close

Conversation

@clubanderson

Copy link
Copy Markdown
Member

Fixes #15586

#15511 listed hive's adoption #15574 (Merge queued · 2nd) and, under it, the still-open original #15526 whose greyed note "· Adopted → #15574 · superseded (hive re-authored with sign-off)" wrapped to two lines; the close-first close of #15526 had been refused by the write-back gate with needs-opt-in-label.

Close policy. New governor.labels.stage.adoption.close_superseded: on_adopt|on_merge (default on_adopt). A clanker- or hive-authored original (e.g. @odttlnt's clanker #15526, @Karibhou's clanker #15561) closes in the adopting pass by policy — the gate admits the close as superseded-agent-pr without the contributor_adopt opt-in label once the copy carries its commits and sign-off, with the standard supersede comment. A human-authored original still needs the opt-in label to close on adopt; otherwise it closes when the copy merges (documented).

Tracker (per owner's revised wording — the issue originally asked to hide the row). The muted, chevron-less sub-row under the issue stays. Its note is now the one-liner "superseded · hive adopted → #N" ("superseded · closed · hive adopted → #N" once closed); it never wraps — the PR title ellipsizes first — and "re-authored with the same commits and sign-off" moved to the hover. The tracker marks the original superseded_by: N (cleared when the copy dies, omitted for in-place adoptions) and the copy's adopted_from.state / lineage.from_state. A closed original is listed in this muted form only while its superseder is open and listed, and leaves the tracker when the superseder merges or closes.

Before:

before: two-line wrapped superseded note

After:

after: one-line muted note "superseded · hive adopted → #15574"

Go + Node tests (TestStageTrackerSuperseded*, decided-state Node suite, ratchet: the note CSS is nowrap, a closed original leaves with its copy), docs (hive-merge.md, dashboard-sections.md, operator-reference.md, labels-and-control-signals.md), changelog fragment.

The write-back gate refused the close-first of #15526 (odttlnt's clanker
PR, re-authored as #15574) with needs-opt-in-label: contributor_adopt
requires a repo opt-in label on items the hive did not author. An agent's
PR the hive has re-authored is one logical PR of the hive's own, so the
gate now allows the adoption kind on an agent-authored item whose copy is
on record (superseded-agent-pr). governor.labels.stage.adoption.
close_superseded: on_adopt (default) | on_merge chooses when; a person's
original keeps needing the label.

Signed-off-by: Andrew Anderson <andy@clubanderson.com>
A PR superseded by a hive adoption is no longer drawn as its own sub-row
while its superseder is listed: the server marks it superseded_by (cleared
when the copy dies, omitted for in-place adoptions) and the copy's
adopted_from.state / lineage.from_state; the SPA folds it into the copy's
'adopted from' chip whose hover says closed, or open and closing when the
copy merges. Docs, changelog, Go + Node tests and a fold ratchet.

Signed-off-by: Andrew Anderson <andy@clubanderson.com>
… on one muted line

Replaces the fold from the previous commit per owner feedback: the muted,
chevron-less sub-row under the issue stays; only the trailing note changes
to the short one-liner ("superseded · closed · hive adopted → #N" once the
original is closed), never wrapping — the title ellipsizes first — with
"re-authored with the same commits and sign-off" moved to the hover. A
closed original is listed in this muted form only while its superseder is
open and listed, and leaves when the superseder merges or closes.

Signed-off-by: Andrew Anderson <andy@clubanderson.com>
@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 dco-signoff: yes Indicates the PR's author has signed the DCO. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Oct 30, 2026
@github-actions

github-actions Bot commented Oct 30, 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
#15308 ✨ feature: enqueue eligible PRs into GitHub native merge queues same files src/docs/labels-and-control-signals.md
#15574 🌱 dashboard: split stage_tracker.go into 4 files same files src/docs/dashboard-sections.md
src/pkg/dashboard/stage_tracker.go
#15521 🌱 refactor: split tracker row source CONFLICT src/pkg/dashboard/static-src/js/tracker-row.js
#15565 🌱 refactor: split tracker words source CONFLICT src/pkg/dashboard/static-src/js/tracker-words.js
#15516 📖 docs: split the operator reference CONFLICT src/docs/operator-reference.md
#15605 📖 docs: link metrics token row to monitoring component and alert runbooks same files src/docs/operator-reference.md
#15566 🌱 refactor: split stage tracker UI tests CONFLICT src/pkg/dashboard/stage_tracker_ui_test.go
#15526 🌱 dashboard: split stage_tracker.go into 4 files same files src/docs/dashboard-sections.md
src/pkg/dashboard/stage_tracker.go
#15530 🐛 fix(dashboard): issue-row linked PR passes null when the lineage chip is empty same files src/pkg/dashboard/static-src/js/tracker-row.js
src/pkg/dashboard/static/index.html
#15405 🐛 fix: require verified signature for email-only hive commit identity match same files src/docs/operator-reference.md

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

@hivecommons-hive

Copy link
Copy Markdown
Contributor

stage 080-awaiting-merge-admission → 071-needs-author: required-check-failing:coverage

… golden

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

Copy link
Copy Markdown
Contributor

stage 080-awaiting-merge-admission → 050-review-pending: required-check-pending:build-and-test

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

Copy link
Copy Markdown
Contributor

stage 080-awaiting-merge-admission → 050-review-pending: check-pending

@clubanderson
clubanderson merged commit 22cf3b8 into v5 Oct 30, 2026
78 of 79 checks passed
@kubestellar-prow
kubestellar-prow Bot deleted the fix/adoption-superseded-close branch October 30, 2026 01:40
@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

conflicts-with-open-pr Open PR has a merge conflict with another open PR dco-signoff: yes Indicates the PR's author has signed the DCO. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

adoption: a superseded PR stays open and listed beside hive's copy (needs-opt-in-label refuses the close)

1 participant