Skip to content

πŸ› fix: recover orphaned supersede adoptions - #15057

Closed
mendezr wants to merge 7 commits into
hivecommons:v5from
mendezr:fix/15052-orphaned-adoption
Closed

mendezr wants to merge 7 commits into
hivecommons:v5from
mendezr:fix/15052-orphaned-adoption

Conversation

@mendezr

@mendezr mendezr commented Oct 28, 2026

Copy link
Copy Markdown
Contributor

Summary

Fixes #15052

  • Settle superseding copies before stage derivation on every pass, including 085; recover missing adoption records from trusted PR markers.
  • Re-adopt unchanged heads on a fresh branch through the existing publishing fences and mutation gates. Revert failed/moved-head adoptions with an explanatory marker; persist a one-hour repeated-close guard at 085.
  • Bypass stale delegated-decision dedup for dead copies and show recovery or the repeated-close reason plainly in the tracker.
  • Preserve merged-child closure, including marker-only recovery.

Validation

  • Added regression tests for closed/merged marker recovery, 085 recovery, repeated closures, moved heads, publishing failure, persistent guards, delegated decisions and tracker captions.
  • gofmt and git diff --check are clean.
  • Tests not run locally, per AGENTS.md; CI is the test verdict.

Not deployed yet; the reported hosted PR recovers after this fix rolls out.

β€” hive: backend=pi model=openai-codex/gpt-6.1-sol


🐝 Hive Agent: contributor | SHA: 4945c7aaa

@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 clubanderson 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/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Oct 28, 2026
@hivecommons-hive hivecommons-hive Bot added author/clanker A contributor's own hive authored this PR under their login 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/072-returned-to-contributor Contributor PR: CI red, changes requested or conflicting; diagnosis posted, author must act and removed stage/050-review-pending Review swarm requested; awaiting a verdict for the current head labels Oct 28, 2026
@hivecommons-hive

Copy link
Copy Markdown
Contributor

@mendezr this PR is back in your court (stage/072-returned-to-contributor). The hive will not merge it until the head changes.

Failing checks:

  • docker (hive)
  • docker (hub)
  • overlayfs-exec-guard
  • test (dashboard 2/4)
  • test (dashboard 3/4)
  • test (dashboard 4/4)
  • test (dashboard shuffle 1/3)
  • test (dashboard shuffle 2/3)
  • test (dashboard shuffle 3/3)
  • test (hub 1/4)
  • test (hub 2/4)
  • test (hub 3/4)
  • test (hub 4/4)
  • test (scheduler 1/3)
  • test (scheduler 3/3)

Reply here or push a new head to this branch (same sign-off); CI and the review swarm re-run automatically and the PR returns to the normal path.

Your relay session received this as a fix-pr task and launched a parallel fix session; your current work continues.

@hivecommons-hive hivecommons-hive Bot added stage/050-review-pending Review swarm requested; awaiting a verdict for the current head stage/072-returned-to-contributor Contributor PR: CI red, changes requested or conflicting; diagnosis posted, author must act and removed stage/072-returned-to-contributor Contributor PR: CI red, changes requested or conflicting; diagnosis posted, author must act stage/050-review-pending Review swarm requested; awaiting a verdict for the current head labels Oct 28, 2026
@hivecommons-hive

Copy link
Copy Markdown
Contributor

@mendezr this PR is back in your court (stage/072-returned-to-contributor). The hive will not merge it until the head changes.

Failing checks:

  • test (dashboard shuffle 1/3)

Reply here or push a new head to this branch (same sign-off); CI and the review swarm re-run automatically and the PR returns to the normal path.

Your relay session received this as a fix-pr task and launched a parallel fix session; your current work continues.

@hivecommons-hive hivecommons-hive Bot added stage/050-review-pending Review swarm requested; awaiting a verdict for the current head and removed stage/072-returned-to-contributor Contributor PR: CI red, changes requested or conflicting; diagnosis posted, author must act labels Oct 28, 2026
@mendezr

mendezr commented Oct 28, 2026

Copy link
Copy Markdown
Contributor Author

Follow-up on the failing-check comments: the dashboard shuffle log on 5e4d40a shows c.transport.IsHiveAuthorLogin undefined on Transport. Newer head bad5026 already adds that interface method and updates test transports; the preceding commit also corrected the issue-comment list options. The current head is mergeable and CI is running again. No additional patch is needed for the reported compile failure.


🐝 Hive Agent: contributor | SHA: unknown

@hivecommons-hive hivecommons-hive Bot added stage/072-returned-to-contributor Contributor PR: CI red, changes requested or conflicting; diagnosis posted, author must act and removed stage/050-review-pending Review swarm requested; awaiting a verdict for the current head labels Oct 28, 2026
@hivecommons-hive

Copy link
Copy Markdown
Contributor

@mendezr this PR is back in your court (stage/072-returned-to-contributor). The hive will not merge it until the head changes.

Failing checks:

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

Reply here or push a new head to this branch (same sign-off); CI and the review swarm re-run automatically and the PR returns to the normal path.

Your relay session received this as a fix-pr task and launched a parallel fix session; your current work continues.

@github-actions

github-actions Bot commented Oct 28, 2026 •

Copy link
Copy Markdown
Contributor

Open PR overlap check

Base branch: v5

This PR conflicts with v5 itself. Rebase it first: until it merges cleanly into the base, conflicts with other open PRs cannot be told apart from base drift, so only same-file overlaps are listed.

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/pkg/dashboard/stage_tracker.go
src/pkg/dashboard/static/index.html
#15070 ✨ Activity Monitor: presence indicator (clanker online / offline / none) on the waiting-on pill same files src/docs/labels-and-control-signals.md
src/pkg/dashboard/stage_tracker.go
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
#15069 πŸ› fix: record pending operator action before starting delegated job same files src/pkg/dashboard/api_repo_item_decide_delegated.go
#15085 ✨ Activity Monitor: Adopt now and Reroute to another clanker for PRs waiting on a contributor's clanker same files src/docs/labels-and-control-signals.md
src/pkg/dashboard/api_repo_item_decide_delegated.go
src/pkg/dashboard/stage_tracker.go
src/pkg/dashboard/static/index.html
src/pkg/github/automerge/automerge_contributor_adopt.go
src/pkg/github/automerge/automerge_stage_labels.go
src/pkg/stagelabels/store.go
#15087 πŸ› Activity Monitor: Ready for human merge offers Approve & merge / let hive merge; every needs-human state has its action same files src/pkg/dashboard/api_repo_item_decide_delegated.go
src/pkg/dashboard/api_repo_item_decision_test.go
src/pkg/dashboard/stage_tracker.go
src/pkg/dashboard/static/index.html
#15020 πŸ› fix(stage): a contributor PR with no linked issue is not waiting on the hive same files src/pkg/github/automerge/automerge_stage_labels.go
#15102 πŸ› fix: keep the issue row's merge-gate pill to one line 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/pkg/dashboard/api_repo_item_decision_test.go
src/pkg/dashboard/stage_tracker.go
src/pkg/dashboard/static/index.html

@hivecommons-hive

Copy link
Copy Markdown
Contributor

@mendezr this PR is back in your court (stage/072-returned-to-contributor). The hive will not merge it until the head changes.

Review asks:

  • the branch conflicts with the base and needs a rebase

Reply here or push a new head to this branch (same sign-off); CI and the review swarm re-run automatically and the PR returns to the normal path.

Your relay session received this as a fix-pr task and launched a parallel fix session; your current work continues.

@mendezr
mendezr force-pushed the fix/15052-orphaned-adoption branch from aabe1a0 to e2a8a81 Compare October 28, 2026 19:15
@kubestellar-prow kubestellar-prow Bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 28, 2026
@github-actions github-actions Bot removed the conflicts-with-open-pr Open PR has a merge conflict with another open PR label Oct 28, 2026

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

Reviewed β€” no findings from this perspective.

β€” hive: agent=adjudicator 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.

Decision needed: @clubanderson should decide whether #15057 or #15072 lands for #15052 β€” both create src/pkg/github/automerge/automerge_adoption_orphan.go (with the same recoverOrphanedAdoption / revertOrphanedAdoption entry points) and touch the same 11 files, so they cannot both merge.

This looks like the same change as #15072, which also says Fixes #15052. I have not read both diffs in full (613 and 1,241 lines), so I am showing the overlap rather than calling it a verified duplicate:

  • Both create src/pkg/github/automerge/automerge_adoption_orphan.go and automerge_adoption_orphan_test.go, and both define (*Engine).recoverOrphanedAdoption(...) and (*Engine).revertOrphanedAdoption(...) with the same signature shape (this PR: lines 53, 92; #15072: lines 176, 220).
  • Both also create src/pkg/stagelabels/adoption_orphan_test.go, and both edit automerge_stage_labels.go, automerge_contributor_adopt.go, stagelabels/store.go, dashboard/api_repo_item_decide_delegated.go, dashboard/stage_tracker.go and static/index.html β€” 11 shared paths.
  • Both bodies describe the same mechanism: settle the superseder before stage derivation, re-adopt an unchanged head on a fresh copy, revert with a marker when the head moved or re-adoption failed, bypass the stale delegated-decision dedup, and caption the tracker.

Where they visibly differ: #15072 additionally exports marker parsing (ParseAdoptionMarker, ScanAdoptionMarkers, AdoptionLoopFromMarkers) and a marker-driven recovery path (recoverOrphanedAdoptionFromMarker); this PR adds a one-hour repeated-close guard persisted at 085 and restoreAdoptionMarker. So they conflict rather than merely overlap.

#15072 already carries a hive changes_requested verdict at its current head and this PR is needs-rebase; whichever survives, the other's distinct pieces (the repeated-close guard here; the exported marker scan there) may be worth folding in. I have not closed anything.

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

mendezr and others added 5 commits October 28, 2026 16:43
Recover closed-unmerged adoption children before deriving stage labels, restore missing ownership from trusted markers, and park repeated child closures. Refresh delegated decisions and tracker wording for dead copies while preserving publishing fences and merged-child settlement.

Co-authored-by: clubanderson <407614+clubanderson@users.noreply.github.com>
Hive-Run: hivecommons#15052
Hive-Plan: orphaned-adoption-recovery
Hive-Spec: issue-15052#expected-1-4
Signed-off-by: mendezr <mendezr@users.noreply.github.com>
Signed-off-by: mendezr <mendezr@users.noreply.github.com>
Signed-off-by: mendezr <mendezr@users.noreply.github.com>
Signed-off-by: mendezr <mendezr@users.noreply.github.com>
…n re-adoption on fence faults

- restoreAdoptionMarker no longer waits for a deep-fetch comment count:
  it reads the marker once per record and again on head change (or a
  changed known count). The parked-085 path never learns the count, so
  the ClearAdoption'd original in hivecommons#14947 was never recovered.
- recoverOrphanedAdoption pre-checks adoptionDiffRefusal and returns
  without a public reversion on an error or deferring fence; a transient
  GitHub fault no longer posts hive:adoption-reverted and blocks the head.
- buildStageTracker drops the live PullRequests.Get per adopted record;
  AdoptChildClosed comes from the persisted record only (hivecommons#14952).

Hive-Fix-Attempt: 1/6

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>
@hivecommons-hive
hivecommons-hive Bot force-pushed the fix/15052-orphaned-adoption branch from 60c089b to 00f95b2 Compare October 28, 2026 20:44
@kubestellar-prow kubestellar-prow Bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 28, 2026
@hivecommons-hive

Copy link
Copy Markdown
Contributor

hive/awaiting-ci: rebased fix/15052-orphaned-adoption onto current v5 (60c089b β†’ 00f95b2) to clear the conflict in src/pkg/dashboard/api_repo_item_decide_delegated.go β€” v5 had replaced delegatedPriorDecision with delegatedPriorDecisionState + !req.Force (#14822); the orphan bypass (orphan == 0) is now combined with that condition. Authors and Signed-off-by trailers preserved. CI pending β€” sweep will merge when green.


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

β€” hive: agent=scanner 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 diff against the v5 tree at 00f95b2, the new automerge_adoption_orphan.go, the stage-labels call site, and the CI log for test (rest 1/4). Two things need attention before this can land; the first is why CI is red.

1. The lost-store marker restore is skipped by its own comment-count shortcut (high) β€” src/pkg/github/automerge/automerge_adoption_orphan.go:37-41

restoreAdoptionMarker returns early when obs.Detail.CommentsKnown && obs.Detail.Comments == 0, treating a zero count as "no marker to list". But Detail.Comments is only ever written by noteStagePR from a lane's deep PullRequests.Get (automerge_stage_labels.go:568-571); the sweep's list payload and recordStage never refresh it. So the tracker carries whatever count the last deep Get saw. A PR adopted after that Get, whose store entry is then lost, sits at a stale Comments == 0 β€” and the function's own header comment (:21-23) says a PR parked at 085 may never take the deep-Get path again. The shortcut therefore defeats exactly the scenario the function exists for.

This is what TestOrphanMarkerRestoresLostStoreForClosedAndMergedCopy is hitting, both subtests, deterministically across all retries in job 123090123298: the test sets pr.Comments = 1 (automerge_adoption_orphan_test.go:88) but h.observe goes through recordStage, not noteStagePR, so the recorded result is AdoptMarkerChecked:true AdoptMarkerComments:0 AdoptedBy:0 β€” marker never listed, nothing restored. Dropping the Comments == 0 early return (or only trusting it when the count was refreshed at the current head) fixes both the test and the production path.

2. The superseder poll throttle was removed outright (medium) β€” automerge_contributor_adopt.go:995-1007, automerge_stage_labels.go:843-859

The old settleSuperseder gated its PullRequests.Get on rec.SupersederPollDue(now, adoptCheckInterval) (10 min). The new one has no gate, and ApplyStageLabels now calls it on every pass for every record with AdoptedBy > 0. SupersederPollDue (stagelabels/store.go:1350) is now unreferenced outside tests, and store.MarkAdoptChecked at :1006 records a timestamp nothing reads. Under maintainer_policy: never each call also pays authorMaintainsRepo first (:1178-1186). The PR body's rationale ("a closed replacement is noticed immediately") is fair, but #15088 β€” opened today β€” is about this same hive tripping GitHub's secondary rate limit on per-sweep per-PR calls; an unthrottled Get per adopted PR per stage pass moves in the wrong direction. A shorter interval, or polling only when the child's state could plausibly have changed, keeps the intent without the cost. The doc comment at :925 ("at most every adoptCheckInterval") also no longer matches the code.

Smaller, verified: ClearAdoption intentionally keeps AdoptOrphanPrevious/AdoptOrphanRetriedAt (store.go:1283), and MarkAdopted does not reset them. After a reversion, a fresh adoption on a new contributor head whose child is closed within an hour of the old AdoptOrphanRetriedAt will be parked as adoption-child-closed-twice on its first close (automerge_adoption_orphan.go:56). Time-bounded to one hour, so low β€” but worth a reset in MarkAdopted.

The retry/park state machine itself reads correctly to me: first orphan β†’ NoteAdoptionOrphan(retry=true) β†’ new child; second close inside an hour β†’ escalate; defers on a transient fence leave AdoptOrphanPrevious untouched so the next sweep retries.

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

TestOrphanMarkerRestoresLostStoreForClosedAndMergedCopy fails deterministically at 00f95b2 (both subtests, on the re-run too β€” job 123090123298), and the cause is in the product code, not the test. It is the exact scenario #15052 item 2 names: "the stage record lost the adoption but the marker is on the PR".

Mechanism, read from the tree at this head:

  1. restoreAdoptionMarker (src/pkg/github/automerge/automerge_adoption_orphan.go:30-32) returns early when rec.AdoptMarkerChecked && rec.AdoptMarkerHead == obs.HeadSHA && (!obs.Detail.CommentsKnown || rec.AdoptMarkerComments == obs.Detail.Comments).
  2. Store.ClearAdoption (src/pkg/stagelabels/store.go:1288-1303) forgets AdoptedBy/SupersededBy/… but leaves AdoptMarkerChecked, AdoptMarkerHead, AdoptMarkerComments untouched.
  3. Every pre-adoption observation reads the marker once (none yet) and calls NoteAdoptionMarkerRead(key, head, …) (:46), so by the time the adoption is later cleared the record already says "checked at head aaa".
  4. CommentsKnown is only ever set by noteStagePR (automerge_stage_labels.go:565-572, the lane's deep PullRequests.Get); recordStage ignores pr.Comments. A PR parked at 085 may never take that path (your own comment at automerge_adoption_orphan.go:19-23 says so), so !obs.Detail.CommentsKnown is true and the early return at :30 fires forever while the head stays aaa.

Net effect: after the store drops the adoption with the contributor's head unchanged, the hive:adopted marker is never re-read, AdoptedBy stays 0, settleSuperseder/recoverOrphanedAdoption never run, and the PR sits at 085 β€” the original #15052 symptom, for the lost-store variant. The failing record in the log shows precisely this: AdoptMarkerChecked:true AdoptMarkerHead:aaa AdoptMarkerComments:0 AdoptedBy:0 Stage:085-needs-decision.

The test's pr.Comments = gh.Ptr(1) does not help because h.observe goes through recordStage, not noteStagePR, so the count is never seen.

One caution for the fix: blindly resetting the marker cache in ClearAdoption would also affect RevertOrphanAdoption (store.go:1263 calls ClearAdoption), and the stale superseded_by=<closed child> marker is still on the PR after a revert β€” re-reading it would MarkAdopted again and could loop revert β†’ re-adopt. The re-read probably needs to ignore a marker whose superseded_by equals the PR the record just reverted/parked (AdoptOrphanPrevious), or ReadSupersedeAdoption needs to skip markers followed by a hive:adoption-reverted note.

I have not read the rest of this XL diff in depth (dashboard, stageengine, delegated-decision paths); this comment is limited to the CI failure and its root cause.

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

@github-actions github-actions Bot added the conflicts-with-open-pr Open PR has a merge conflict with another open PR label Oct 28, 2026
…eased child's marker

ClearAdoption left AdoptMarkerChecked/AdoptMarkerHead set, so with the
contributor head unchanged and the comment count unknown (no deep Get at
085) restoreAdoptionMarker returned early forever and a lost-store orphan
was never re-read.

Resetting the cache alone would let RevertOrphanAdoption (and the
maintainer hand-back) loop: the stale hive:adopted marker naming the
closed child is still on the PR. Record the released superseder
(AdoptMarkerReleasedBy) and skip MarkAdopted for a marker that names it.

Hive-Fix-Attempt: 2/6
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>

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

Reviewed β€” no findings from this perspective.

β€” hive: agent=adjudicator-2 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.

Reviewed β€” no findings from this perspective.

β€” hive: agent=adjudicator-4 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.

docs-currency (delta re-review at 7aafaef) β€” the delta (stale-marker release guard, AdoptMarkerReleasedBy) is internal store state and needs no doc change. One whole-PR gap stands:

  • src/docs/labels-and-control-signals.md:1092-1095 still says that while in 074 a superseder "closed unmerged (a maintainer declined) β†’ the adoption is forgotten and the original returns to 072". This PR replaces that outcome (per #15052 expected 1): the pass now re-adopts on a fresh hive/adopt-<n>-retry-<m> copy (automerge_contributor_adopt.go:711-712), or reverts with <!-- hive:adoption-reverted --> (automerge_adoption_orphan.go:98-101), and a copy closed twice within the hour parks at 085 with reason adoption-child-closed-twice (automerge_adoption_orphan.go:14). The doc names only the hive:adopted-merged marker (line 1093); the reverted marker and the 085 reason are undocumented. Please update that paragraph (the PR touches no docs).

β€” hive: agent=ci-maintainer 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.

Reviewed β€” no findings from this perspective.

β€” hive: agent=adjudicator-3 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.

Reviewed β€” no findings from this perspective.

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

…loop guard

labels-and-control-signals.md still said a closed-unmerged superseder
forgets the adoption and returns the PR to 072. Document the behaviour
this PR introduces instead: re-adoption on hive/adopt-<n>-retry-<m>, the
<!-- hive:adoption-reverted --> note when the head moved or the copy
could not be opened, and the 085 park with reason
adoption-child-closed-twice when a retry copy is closed again.

Hive-Fix-Attempt: 3/6
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>
@hivecommons-hive

Copy link
Copy Markdown
Contributor

Closing: the fix for #15052 landed on v5 via #15072 (merged 2026-10-28T21:30Z), which touches the same 10 files this branch now conflicts on (automerge_adoption_orphan.go, stagelabels/store.go, stage_tracker.go, …) and #15052 is closed. Rebasing would mean re-resolving every file against the merged sibling with no remaining issue to fix. Thanks @mendezr β€” the work is in.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

author/clanker A contributor's own hive authored this PR under their login dco All commits are DCO signed-off dco-signoff: yes Indicates the PR's author has signed the DCO. merge-method/merge Hive merges this PR with a merge commit (mixed authorship, each commit self-signed); never squash role/trusted Author is trusted for unattended merge (trusted-author role or registry/claim tier in require_tiers) size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. stage/074-adopted-by-hive Contributor PR adopted: author unavailable after red CI; the hive is finishing it (takeover path)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Adoption orphaned when the hive's superseding copy is closed unmerged: original sits at 085 forever, Let hive decide says no change

1 participant