[clubanderson]

Fixes #14471

Problem

settleAdoption (which polls the superseding hive PR and closes the original once it merges) only ran while the original sat at stage 074 adopted-by-hive. Both live cases moved off 074 before the superseder merged:

• 🐛 fix: backfill spoke startup probes during self-upgrade #14395 got needs-human three minutes after adoption and parked at 085; 🐛 fix: backfill spoke startup probes during self-upgrade #14459 merged, 🐛 fix: backfill spoke startup probes during self-upgrade #14395 stayed open.
• 🐛 fix(agent): report CI polls without inferring PR ownership #14403's contributor pushed a new head, so AdoptionLive(head) was false, the PR returned to 072, and 🐛 fix(agent): report CI polls without inferring PR ownership #14461 (which carried the new head anyway) merged with 🐛 fix(agent): report CI polls without inferring PR ownership #14403 still open.

Both had to be closed by a human.

Fix

• settleSuperseder polls the superseder from any non-terminal stage while a record still has AdoptedBy set, on the existing adoptCheckInterval cadence.
• Superseder merged: if the superseder carries the original's current head (or the original has no head on record), post the hive:adopted-merged note and close the original. If the heads diverged, post one hive:adopted-merged-diverged note per head and leave it open for the contributor.
• Close refused (403/404, e.g. a fork PR the App cannot close): leave the note, mark the record superseded_by/superseded_open so the stage tracker drops the row; no retry loop.
• Superseder closed unmerged: clear adoption so the original flows normally.
• Stage store: MarkSuperseded (idempotent), MarkSupersederMergedNoted, Superseded, SupersederPollDue; ClearAdoption resets them.
• Stage tracker: superseded records are not rows.
• adoptClosesPattern now also carries Refs #N lines to the adopted PR.

Tests

• automerge: superseder merged while original parked at 085; merged with a later head that the superseder carries; diverged head notes once and does not close; close refused marks superseded-open; Refs carried.
• stagelabels: MarkSuperseded idempotence, poll gate, ClearAdoption reset.
• dashboard: superseded PR dropped from the stage tracker.

go test -coverprofile: stagelabels 93.0%, github/automerge 90.0%.

[kubestellar-prow]

[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 nicholasjackson 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:

• OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[github-actions]

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.

No conflicting open PRs or same-file overlaps were found.

[hivecommons-hive]

@clubanderson is auto-promoted for contributor-lane merging on this PR: the last 5 merged PRs by this author in this repository have no revert or sentinel-alert evidence. CI, reviewer verdict, diff fences, soak, holds and branch protection still apply.

[github-actions]

Thank you for your contribution! Your PR has been merged.

We'd love to hear how your experience was: share feedback

[hivecommons-hive]

Evidence bundle `#144744de6552` sha256:ee6cbe9045768136c3c035b2c617d1199b43cea7c9f9e6cf5c02056e42b22f0a — download from the dashboard or `hivectl review evidence #14474`.

[hivecommons-hive]

merged by Hive trusted-author auto-merge: author @clubanderson holds role owner and GitHub permission admin on repo; CI green at 4de6552.