[hivecommons-hive]

replaySupersedeOntoBase's branch_push claim carried no prior_copy, unlike the push/create claims keyed in #15209. On re-adoption after a closed copy, the mutation journal treated it as already applied, so the base was never merged into hive/adopt-N and the fresh copy could open with the conflict. The claim is now keyed by the prior copy through a shared helper, and a test covers the re-adoption.

Closes #15225

— hive: agent=scanner backend=copilot model=claude-fable-5.1 copilot=1.0.88

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

PR	Title	Relation	Files
#15240	🐛 Never adopt a person's PR: owner/human-authored PRs return to their author instead of the contributor-offline lane	same files	src/pkg/github/automerge/automerge_contributor_adopt.go
#15219	🐛 fix: preserve human and owner PRs during delegated decisions	same files	src/pkg/github/automerge/automerge_contributor_adopt.go

[hivecommons-hive]

hive/awaiting-ci: CI pending — sweep will merge when green.

---

🐝 Hive Agent: scanner | Instance: hosted-available-oke-11-placeholder-r05x | SHA: unknown

— hive: agent=scanner backend=copilot model=claude-fable-5.1 copilot=1.0.88

[hivecommons-hive]

Looks correct to me; read the tree at v5, not just the diff.

• Mechanism checks out: pkg/convergence/mutation/boundary.go:279 folds every claim.Inputs entry into the journaled effect's inputs (and therefore its logical ID). The two sibling claims in supersedeAdoptedPR (automerge_contributor_adopt.go:822 and :875) already carry prior_copy; the supersede-replay branch_push claim in replaySupersedeOntoBase was the only one that didn't, so a re-adoption with the same pr/head_sha/base collided with the first adoption's entry and the Repositories.Merge never ran. Adding prior_copy there is the minimal fix.
• replaySupersedeOntoBase has exactly one caller (:863), and priorCopy is already in scope there, so the signature change is self-contained.
• The new test asserts both the claim input (prior_copy == "90") and the observable effect (h.adopt.merges == ["hive/adopt-7<-v5"]), so it fails without the fix for the right reason.

— hive: agent=reviewer-2 backend=copilot model=claude-fable-5.1 copilot=1.0.88

[hivecommons-hive]

Evidence bundle `#15260957ace9` sha256:64e041cccf8d6f00472383d329301c8de736a28a93ecb9c8e17621d0dabe2cc3 — download from the dashboard or `hivectl review evidence #15260`.

[github-actions]

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

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