Repository navigation
✨ Adoption: maintainer_policy adopt|ask|never (default adopt); 072 row says why and offers Adopt - #15016
Conversation
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
Open PR overlap checkBase branch: Conflicts are checked with every PR merged onto the current tip of
|
dab43ca
ℹ️ Sentinel notice — informational; author is trusted (owner), merge is not blockedHive flagged this PR (author @clubanderson, head
Hive did not add the |
dab43ca to
68f8510
Compare
|
@clubanderson is auto-promoted for contributor-lane merging on this PR: the last 5 merged PRs by this author in this hive's repositories have no revert or sentinel-alert evidence. CI, reviewer verdict, diff fences, soak, holds and branch protection still apply. |
|
@clubanderson this PR is held at Why:
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. |
|
@clubanderson this PR is held at Failing checks:
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. |
68f8510
ℹ️ Sentinel notice — informational; author is trusted (owner), merge is not blockedHive flagged this PR (author @clubanderson, head
Hive did not add the |
…w says why and offers Adopt #14524 (hanthor, XXL, stage/072, nudged twice, 26h, hive offline) was never adopted: every sweep logged "author maintains the repository; not adopting" and nothing in the UI said so. Owner decision (2026-10-28): clanker PRs are adoptable on disconnect regardless of the owner's repo role. - config: governor.labels.stage.adoption.maintainer_policy adopt|ask|never, default adopt. adopt never reads the role; ask holds a maintainer's PR for an owner and records author-is-maintainer on the stage record; never is the previous rule (hold + release). Human-authored PRs stay unadopted under all three (the 072 machinery is clanker-only). - engine: maintainerHoldsAdoption / maintainerReleasesAdoption route the five authorMaintainsRepo call sites through the policy; the owner's adoption/supersede request lifts the ask hold. - tracker: every nudged 072 PR row carries adoption{author, due, blocked_by, since, nudges, author_online, author_registered, author_last_seen, author_maintainer, policy, action, text} from the stage record and the same hub presence the adoption uses; caption and an amber pill read "waiting on @hanthor (maintainer, offline 26h) — adopt?" instead of a bare "must act". - decision API: decision "adopt" (PR only, write, adoption enabled) posts an attributed note, sets adoption/supersede, audits repo_item_decision_adopt; SPA row action decide:adopt in the same decide:* vocabulary with an in-app confirm. - Settings → Labels three-way selector with one-line explanations. - tests (config, store, engine policy branches, tracker payload/text/ caption, decision API, governor API, SPA helpers), docs, changelog. Signed-off-by: Andrew Anderson <andy@clubanderson.com>
68f8510 to
6cff0fa
Compare
|
merged by Hive trusted-author auto-merge: author @clubanderson holds role owner and GitHub permission admin on repo; CI green at 6cff0fa. |
|
Thank you for your contribution! Your PR has been merged. We'd love to hear how your experience was: share feedback |
Fixes #15015
Evidence
#14524 (@hanthor, XXL, CONFLICTING, two failing ratchets, reviewer
changes_requested,stage/072-returned-to-contributor, nudged twice, 26h; hanthor's hive not connected). Every cycle:Row read "Returned to contributor — @hanthor must act (2 nudges sent)"; nothing explained the hold or offered a way out.
Owner decision (2026-10-28 12:28 ET)
→ clanker PRs are adoptable on disconnect regardless of the owner's repo role.
What changes
Config
governor.labels.stage.adoption.maintainer_policy: adopt | ask | never, default adopt.adopt— the author's role is never read; a maintainer'sauthor/clankerPR is adopted on the same clock and path as any contributor's (contributor-offline after the nudge window). Human-authored PRs (noauthor/clanker) keep the existing rule — the 072 nudge/adoption machinery stays clanker-only, so nothing is loosened there (testTestMaintainerPolicyAdoptKeepsHumanRule).ask— hold, recordauthor-is-maintaineron the stage record, let an owner decide. The owner's Adopt setsadoption/supersede(the owner-delegate's own request label) which the engine already treats as "requested" →contributor-offlineadoption — the same adopt/supersede path that produced 🐛 fix: reject auto-merge queues from untrusted merger identities #14977 / 📖 docs: explain webhook claim ledger and pending stage recovery #14980.never— the previous rule (🐛 bug: contributor adoption takes over a repository maintainer's own PR (admin author adopted as contributor-offline, then re-homed) #14301/🐛 fix(adoption): never adopt or re-home a repository maintainer's own PR #14305): hold, and release an existing adoption of a maintainer's head. Release-on-role now fires only undernever, so an owner-requested adoption underaskis not undone next sweep.Engine —
maintainerHoldsAdoption/maintainerReleasesAdoptionroute all fiveauthorMaintainsRepocall sites (adopt, supersede, settle, settle-in-place, stalled escape). Log line kept, now withpolicy=.Tracker payload — every nudged 072 PR row (and the nested PR of an issue row) carries
adoption: {author, due, blocked_by, since, nudges, author_online, author_registered, author_last_seen, author_maintainer, policy, action, text}— presence via the same hub lookup the contributor-offline adoption uses. Caption + amber pill/tooltip:waiting on @hanthor (maintainer, offline 26h) — adopt?(ask)waiting on @zoe (offline 40m, 2 nudges)(adopt, clock running)… — not adopted: maintainer_policy is neverDecision API —
POST …/items/N/decision {"decision":"adopt"}: PR only, write access, adoption enabled (409 otherwise); posts an attributed<!-- hive:adoption-requested by=<user> -->note, ensures+addsadoption/supersede, auditsrepo_item_decision_adopt, returnsstatus: adoption-queued.SPA (additive) — row action
decide:adopt("Adopt (hive takes over)") in the samedecide:<verb>id vocabulary the context menu / popover use, offered only whenadoption.action === 'decide:adopt', in-app confirm, selection-bar aware. New helpers aretypeof-guarded at their call sites so the other agents' name-extracted JS tests keep passing. Wired to the needs-human popover (#14995): ask-held rows carrydecision_needed(question "@hanthor maintains this repository and has been offline for 26h; adopt the PR?",blocker_reason: adoption:author-is-maintainer) withdecide:adoptleadingoptions, so the lit 072 chevron and theadopt?pill open the popover.Settings → Labels — three-way selector with one-line explanations + help-mark + search-index entry.
Docs —
labels-and-control-signals.md(adoption rules),operator-reference.md(config reference),dashboard-sections.md(adoption pill + action),GOVERNANCE.mdandcontributor-relay.md(one-sentence rationale). Changelogchangelog.d/added-adoption-maintainer-policy.md.Tests
NoteAdoptionBlocked/Clear/AdoptionBlockedincl. stale head, adopted, persistence.adoptadopts a maintainer without a permission read, keeps human rule, keeps live adoption;askholds + records + owner request lifts + adoption kept;neverholds even on request and records why. Existing maintainer tests pinned tonever(they test that rule).adopt(400 issue / 403 reader / 409 disabled / label+comment+audit), governor GET/PUT validation, SPA helpers under node (chip, tooltip, row action gating, label).Acceptance check
After this rolls to hive's hive, #14524 is adopted by hive's hive on the first cycle (
reason=contributor-offline, in place if maintainer edits are allowed, else ahive/adopt-14524superseder). Do not adopt it manually — the rollout is the test.