Skip to content

πŸ› fix: preserve human and owner PRs during delegated decisions - #15219

Closed
thatguywob wants to merge 2 commits into
hivecommons:v5from
thatguywob:fix/human-pr-adoption-15202
Closed

thatguywob wants to merge 2 commits into
hivecommons:v5from
thatguywob:fix/human-pr-adoption-15202

Conversation

@thatguywob

Copy link
Copy Markdown
Contributor

Fixes #15202

Human-authored and configured hive owner/merger PRs could be treated as offline contributor hives after Let hive decide, allowing hive to supersede the author's PR. They now retain their own PR: reviewer questions and changes return to stage 071 with an author notification, a reviewed/green/mergeable head can be admitted, and holds remain enforced.

Protect both delegated decision paths (including stage 090 and orphaned-adoption recovery), LLM action validation, and adoption/re-home execution. Explicit adoption requests cannot override the protection; terminal refusals consume the request and appear in tracker hovers even without a contributor nudge. Relay PR adoption remains available.

Validation: added table/regression coverage for routing, policy, safety rails, adoption execution, dashboard decisions, and tracker hovers; updated affected stage golden expectations and explicit relay fixtures. gofmt -l and git diff --check pass. Go tests/build/lint were not run locally, per AGENTS.md; CI is the test verdict.

No GitHub state was changed on #15157 or #15192.

β€” hive: backend=codex


🐝 Hive Agent: contributor | SHA: d37688b43

Return human reviewer questions to stage 071 and prohibit adoption of human or hive owner/merger PRs, including explicit requests and re-home paths. Record blocked adoption reasons in tracker hovers and preserve relay adoption behavior.

Co-authored-by: clubanderson <407614+clubanderson@users.noreply.github.com>

Hive-Run: hivecommons#15202
Hive-Plan: protect-human-pr-ownership
Hive-Spec: issue-15202#human-author-adoption
Signed-off-by: thatguywob <thatguywob@users.noreply.github.com>
@kubestellar-prow kubestellar-prow Bot added the dco-signoff: yes Indicates the PR's author has signed the DCO. label Oct 29, 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/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Oct 29, 2026
@hivecommons-hive

Copy link
Copy Markdown
Contributor

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

@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 29, 2026
@hivecommons-hive

Copy link
Copy Markdown
Contributor

@thatguywob 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 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 (rest 1/4)
  • test (rest 2/4)
  • test (rest 3/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.

Identify relay PRs in adoption fixtures, mirror the new decision glossary, and refresh stage expectations from CI. Keep human author notifications separate from relay dispatch assertions and address authors correctly in comments and dashboard results.

Allow the shared authorkind classifier in dashboard so delegated adoption uses the same ownership rules as the stage engine.

Signed-off-by: thatguywob <thatguywob@users.noreply.github.com>
@github-actions

github-actions Bot commented Oct 29, 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
#15186 πŸ› Activity Monitor: one coherent post-decision state for Let hive decide rows; 060 reviewed in CI / Review same files src/pkg/dashboard/api_repo_item_decide_delegated.go
src/pkg/dashboard/api_repo_item_decide_delegated_test.go
src/pkg/dashboard/api_repo_item_decision_test.go
src/pkg/dashboard/row_action_result.go
src/pkg/dashboard/stage_tracker.go
src/pkg/dashboard/stage_tracker_adoption.go
src/pkg/dashboard/static/index.html
src/pkg/delegatedecision/decision_glossary.go
#15104 πŸ› Activity Monitor: Rebase, then merge as maintainer; fixer owns parked conflicting PRs; dismiss self-inflicted changes_requested same files src/cmd/hive/merge_eligibility.go
src/internal/testutil/dashboard_import_allowlist.txt
src/pkg/dashboard/api_repo_item_decision_test.go
src/pkg/dashboard/stage_tracker.go
src/pkg/dashboard/static/index.html
#15253 πŸ› decision toast: issue decisions no longer read as 'approved for merge' same files src/pkg/dashboard/api_repo_item_decide_delegated.go
src/pkg/dashboard/api_repo_item_decide_delegated_test.go
src/pkg/dashboard/static/index.html
src/pkg/delegatedecision/decision_comment.go
src/pkg/delegatedecision/decision_glossary.go
#15282 πŸ“– docs: make Hive guides easier to follow same files src/docs/adr/0025-central-stage-engine.md
#15281 ✨ tracker: rework pickup signal on the waiting-on chip same files src/pkg/dashboard/stage_tracker.go
src/pkg/dashboard/static/index.html
#15236 πŸ› Prefer covering PR progress in Activity Monitor messages same files src/pkg/dashboard/stage_tracker.go
#15279 πŸ› dashboard: merged toast shows the PR number same files src/pkg/dashboard/static/index.html
#15278 πŸ› Close hive PRs superseded by a merged PR instead of parking them on a person; decide post-decision re-parks anew same files src/pkg/dashboard/api_repo_item_decide_delegated.go
src/pkg/dashboard/api_repo_item_decide_delegated_test.go
src/pkg/dashboard/api_repo_item_decision_test.go
src/pkg/github/automerge/automerge_stage_human_test.go
src/pkg/github/automerge/automerge_stage_labels.go
src/pkg/stagelabels/human.go
#15134 πŸ› Delegated decision on a capability gap: model the blocker, stop the un-park/re-park loop, name the missing App permission same files src/internal/testutil/dashboard_import_allowlist.txt
src/pkg/dashboard/api_repo_item_decide_delegated.go
src/pkg/dashboard/stage_tracker.go
src/pkg/dashboard/static/index.html
src/pkg/delegatedecision/decision_glossary.go

@github-actions github-actions Bot added the conflicts-with-open-pr Open PR has a merge conflict with another open PR label Oct 29, 2026
@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 29, 2026
@kubestellar-prow

Copy link
Copy Markdown
Contributor

PR needs rebase.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@hivecommons-hive

Copy link
Copy Markdown
Contributor

Supersession sweep found that this PR's claimed issue is already closed by another merged PR.

  • Claimed issue: hive#15202
  • Closing PR: #15240

Decision needed (@hivecommons): #15240 already merged and closed the claimed issue, but this PR touches files the merged PR did not. Recommended: keep open until the extra changes are reviewed, or close as superseded if they are not wanted. Another option: merge anyway.

Files the merged PR did not touch: changelog.d/fixed-15202-human-pr-adoption.md, src/docs/adr/0025-central-stage-engine.md, src/internal/testutil/dashboard_import_allowlist.txt, src/pkg/dashboard/api_repo_item_decide_delegated_test.go, src/pkg/dashboard/api_repo_item_decide_orphan.go and 9 more.

This comment is edited in place by the supersession sweep; it is not duplicated.

@hivecommons-hive hivecommons-hive Bot added hive/supersession-pending needs-human stage/085-needs-decision A human decision is owed: sentinel alert, hold/needs-decision label, human-only rule or parked issue and removed stage/072-returned-to-contributor Contributor PR: CI red, changes requested or conflicting; diagnosis posted, author must act labels Oct 29, 2026
@hivecommons-hive

Copy link
Copy Markdown
Contributor

/hive decision supersede now: adopt #15219 in supersede mode, preserving the author's commits and sign-off; do not wait for the grace deadline

Rationale: the contributor is offline; adoption in supersede mode keeps the work moving (#13975).

Hive decided: Close this PR and open a fresh hive-authored PR with the same commits.
Why: The author's hive hasn't been connected since the nudge.
What happens next: The hive closes this PR and opens a fresh hive-authored PR with the same commits and sign-off, then finishes that one β€” expected within 30 min.
If it doesn't happen: A maintainer can merge this PR by hand, re-run the decision, close it as superseded, or send it back for a new commit.

Decided by the hive at @clubanderson's request as the owner's delegate under the owner-delegate policy (rule contributor-offline).

@hivecommons-hive hivecommons-hive Bot added the adoption/supersede Owner-delegate request: adopt now in supersede mode label Oct 29, 2026
@clubanderson

Copy link
Copy Markdown
Member

Closing as superseded: #15202 was fixed and merged in #15240 (v5 25de3ba24) before this PR could be rebased; the diff here conflicts with that merge. Thanks @thatguywob β€” nothing further needed on this branch.

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

Labels

adoption/supersede Owner-delegate request: adopt now in supersede mode 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. hive/supersession-pending needs-human needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. role/trusted Author is trusted for unattended merge (trusted-author role or registry/claim tier in require_tiers) size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. stage/085-needs-decision A human decision is owed: sentinel alert, hold/needs-decision label, human-only rule or parked issue

Projects

None yet

Development

Successfully merging this pull request may close these issues.

πŸ› Owner/human-authored PR was adopt-superseded by hive after Let hive decide (contributor-offline rule)

2 participants