[clubanderson]

Fixes #12736

Problem

Clanker PRs the hive has adopted — the tracker shows "Adopted by hive" for #12428, #12421 and #12415, and the hive's own hive-hosted-hosted-available-oke-11-placeholder-r05x spoke is pushing fixes to them — carried stage/050-review-pending, not stage/074-adopted-by-hive. Only the still-red #12471 showed 074.

Root cause

ApplyStageLabels rewrote the lane verdict to AdoptedByHive only when that verdict was ReturnedToContributor (red). 074 was effectively a sub-state of "red clanker PR": as soon as the hive's push made the head pending/green, the 050/060 pipeline took over and the adoption fact was lost from the labels even though the stage store still recorded it. settleInPlaceAdoption (hive push keeps / contributor push yields) was gated the same way, so a contributor pushing over a green in-place adoption never triggered the yield.

Fix

Adoption is an ownership state, not a CI state.

• stagelabels.Record.AdoptionLive(head) — in place and not yielded, or superseded at this head.
• stagelabels.Stage.YieldsToAdoption() — every stage below the merge gate (010–074) gives way to 074; 080/085/090/100 do not.
• Reconciler: settle in-place adoption on every head change; apply the 074 override whenever the adoption is live and the verdict yields to it. A drifted 050 is healed back to 074 (050 removed).
• Tests: adopted + CI pending → 074; adopted + green no-verdict → 074; adopted + approved + CI pending → 074 (not 060); adopted + red → 074 (not 072, no nudge); label drifted to 050 → reconciler adds 074 / removes 050; approved + soaking → 100 (074 removed, adoption record kept); contributor push on a green head → yield, 050; supersede mode bound to the adopted head. YieldsToAdoption / AdoptionLive tables.
• Docs: labels-and-control-signals.md 074 row, state diagram and takeover narrative; dashboard-sections.md tracker note. The tracker already renders 074 in the CI / Review column with the hive icon — unchanged.

Validation

go build ./... && go vet ./pkg/... && go test ./pkg/github/automerge/ ./pkg/stagelabels/ -count=1 -shuffle=on && go test ./pkg/dashboard/ -run 'Stage|Tracker' — green. The new tests fail on v5 without the reconciler change (ci pending: stage 050-review-pending, want 074-adopted-by-hive).

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

• 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]

Reviewed — no findings from this perspective.

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

[hivecommons-hive]

Hive filed review findings that do not block this PR as backlog items:

• Review backlog (security): In-place adoption pusher attribution is forgeable (pre-existing; now persists through green) #12744 — Review backlog (security): In-place adoption pusher attribution is forgeable (pre-existing; now persists through green) (Review backlog (security): In-place adoption pusher attribution is forgeable (pre-existing; now persists through green) #12744)

Cap: 10 backlog item(s) per PR per day.

[hivecommons-hive]

Correctness review (head 52d6b2f)

Adopted-green PRs now read as "nobody is working it" instead of "waiting on the hive" — src/pkg/github/automerge/automerge_stage_labels.go:1077-1083 rewrites verdict.Stage to 074 before store.NoteActivity(key, stageActivity(obs, verdict.Stage)) at :1096. stageActivity (automerge_stage_labels.go:527-528) sets WaitingOnHive only for CI pending, shared-CI reasons, or stage == ReviewPending && no verdict. So an adopted PR whose hive fix is green and awaiting the reviewer lane — exactly the #12736 case, previously 050 with WaitingOnHive=true — now records WaitingOnHive=false. Consequences: StalledWith (src/pkg/stagelabels/store.go:871) marks it stage/stalled after the 074 dwell (3h, stagelabels.go:222; docs labels-and-control-signals.md:132 define stalled as "nobody is working the item"), and HiveHeld (store.go:891) can never fire, so the "reviewer lane needs attention" warning at automerge_stage_labels.go:1107-1110 is lost for every adopted PR. Suggest stageActivity treat stage == AdoptedByHive as waiting on the hive when CI is not red / no verdict yet (or compute activity from the pre-override stage), plus a test asserting WaitingOnHive for the adopted + green no-verdict case — none of the new tests in automerge_contributor_adopt_test.go check Stalled/WaitingOnHive.

Not verified: go test is disabled on this host; go build ./pkg/stagelabels/ ./pkg/github/automerge/ passes. The 074→080/100 hand-off and the supersede/in-place yield logic read correct (Stage.YieldsToAdoption uses table numbers, so 085/090/100 are all ≥ 80).

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

[hivecommons-hive]

Reviewed — no findings from this perspective.

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

[hivecommons-hive]

Evidence bundle `#1273752d6b2f` sha256:7c95c2cd8e1441a37384777d85b1451dadb6a60f0e61275307af8767f0f18e70 — download from the dashboard or `hivectl review evidence #12737`.

[hivecommons-hive]

Evidence bundle `#1273752d6b2f` sha256:7c95c2cd8e1441a37384777d85b1451dadb6a60f0e61275307af8767f0f18e70 — download from the dashboard or `hivectl review evidence #12737`.

[hivecommons-hive]

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

[hivecommons-hive]

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

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

Reviewed (docs-currency) — read head 52d6b2f; code and the two edited docs agree on the new 074 semantics. Two small places the text still describes the old "074 is a sub-state of red" model:

1. src/docs/labels-and-control-signals.md:684-686 (takeover narrative, same hunk this PR edits): after a contributor push over an in-place adoption "the PR is back on the ordinary 072 flow (a fresh nudge for the new head …)". The 074 table row (:219) and the diagram edge (:265) this PR rewrites say "072 if red, else the normal path / 050 if that head is green" — the narrative should say the same, since a yield on a green head produces 050 and no nudge.

2. src/docs/labels-and-control-signals.md:262-265: the state diagram gains s074 --> s080 and s074 --> s100 but not s074 --> s085 / s074 --> s090, although the row text says 074 "leaves … only at the merge gate (080/085/090/100)" and Stage.YieldsToAdoption() (src/pkg/stagelabels/stagelabels.go:344-346) lets 085/090 verdicts through directly — a role/*-blocked adopted PR goes 074 → 090 without passing 060/080.

Adjacent, not blocking: src/docs/contributor-relay.md:1007 still lists 074 as a "repair stage" feeding pending_rework ("the signal to look at"), and src/pkg/dashboard/contribute_fleet_rework.go:112,248 count every 074 record. Now that a green, review-pending adopted PR stays 074, it is counted as pending rework for the contributor until the merge gate — probably worth a follow-up to either exclude live-but-green adoptions or reword the doc.

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