Repository navigation
π fix: reject auto-merge queues from untrusted merger identities - #14977
Closed
hivecommons-hive[bot] wants to merge 2 commits into
Closed
hivecommons-hive[bot] wants to merge 2 commits into
hivecommons-hive[bot] wants to merge 2 commits into
Conversation
Check the recorded queue actor against dashboard.authorized_users before posting an approval. Explain merge-time refusals once per PR head, including authorization revocation at the serialized lane's final re-check. Hive-Run: #14938 Hive-Plan: queue-merge-authorization-parity Hive-Spec: issue-14938#acceptance-criteria Co-authored-by: Danathar <6772335+Danathar@users.noreply.github.com> Signed-off-by: thatguywob <thatguywob@users.noreply.github.com>
The hive and contributor image jobs failed downloading pinned base image layers from mirror.gcr.io with HTTP 429. Retry CI on a fresh head; the source and test checks passed. Signed-off-by: thatguywob <thatguywob@users.noreply.github.com>
5 tasks done
Contributor
|
[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 |
Contributor
Open PR overlap checkBase branch: Conflicts are checked with every PR merged onto the current tip of
|
Contributor
Author
This was referenced Oct 28, 2026
hivecommons-hive Bot
pushed a commit
that referenced
this pull request
Oct 28, 2026
β¦als out of the merge gate (#15011) * Close superseded hive PRs automatically and re-stage adopted originals out of the merge gate A hive-authored PR whose closing targets are all closed, one of them by a different merged PR, and whose head conflicts with the base (or whose files that PR already covers) is now closed by the hive itself as hive/superseded with a notice naming the superseding PR: in the self-authored auto-merge lane before any review is dispatched, in the supersession sweep when the rebase is refused for a conflict, and in close-on-merge of the superseding PR. New knob governor.auto_close_superseded (default on); human-authored PRs are never auto-closed. A contributor PR adopted in supersede mode leaves stage/085-needs-decision in the adopting pass when the park was only the review swarm's requires_human verdict, renders in the CI/Review column with an 'Adopted -> #N' pill, and the duplicate-fix sweep no longer closes the superseding App PR as a duplicate of the PR it supersedes. Evidence: #14965 (closed by #14957 for #14952), #14975 -> #14980, Signed-off-by: Andrew Anderson <andy@clubanderson.com> #14947 -> #14977. * Move changelog fragment to repo-root changelog.d Signed-off-by: Andrew Anderson <andy@clubanderson.com> --------- Signed-off-by: Andrew Anderson <andy@clubanderson.com>
This was referenced Oct 28, 2026
clubanderson
added a commit
that referenced
this pull request
Oct 29, 2026
β¦dopted or could-not-adopt, routes workflow-path PRs to the workflows capability blocker, and re-adoption survives the mutation journal
Let hive decide β adopt-supersede settled the operator-action ledger as
applied ("done") as soon as the adoption/supersede request label landed,
and the β hover kept saying so while nothing happened.
- #14822 edits .github/workflows: the adoption engine's
fence refused the supersession (adoption-stalled:contributor-lane:
workflow-path) and the row fell back to a bare Needs human decision.
The policy now decides such PRs as capability-gap (recommend-only),
the ledger records blocked, and the badge names the
capability:workflows-permission blocker with what a person can do.
- #14947 was adopted (copy #14977), the copy was closed by
the duplicate sweep, and the re-adoption's branch_push /
pull_request_create claims had the same inputs as the first attempt, so
the mutation journal replayed them as idempotent success without running
the effect: created == nil β "error=None" β adoption reverted. The
claims now carry prior_copy, and a replayed provenance URL is resolved
and reused while the copy is still open.
- settledDelegatedOutcome: adopt-supersede β executing, dedup β no-effect,
capability-gap β blocked. The tracker derives the β state from the
stage record (adopted as #N / could not adopt / still executing / stuck)
and exposes progress, blocker and human to the SPA hover.
Fixes #15188
Signed-off-by: Andrew Anderson <andy@clubanderson.com>
clubanderson
added a commit
that referenced
this pull request
Oct 29, 2026
β¦dopted or could-not-adopt, routes workflow-path PRs to the workflows capability blocker
Let hive decide β adopt-supersede settled the operator-action ledger as
applied ("done") as soon as the adoption/supersede request label landed,
and the β hover kept saying so while nothing happened.
- #14822 edits .github/workflows: the adoption engine's
fence refused the supersession (adoption-stalled:contributor-lane:
workflow-path) and the row fell back to a bare Needs human decision.
The policy now decides such PRs as capability-gap (recommend-only),
the ledger records blocked, and the badge names the
capability:workflows-permission blocker with what a person can do.
- #14947: the re-adoption after the copy #14977 was
closed was replayed by the mutation journal; that fix landed in
#15209 (prior_copy claim input, replayed provenance
resolved). This PR layers the ledger / hover states over it.
- settledDelegatedOutcome: adopt-supersede β executing, dedup β no-effect,
capability-gap β blocked. The tracker derives the β state from the
stage record (adopted as #N / could not adopt / still executing / stuck)
and exposes progress, blocker and human to the SPA hover.
Fixes #15188
Signed-off-by: Andrew Anderson <andy@clubanderson.com>
clubanderson
added a commit
that referenced
this pull request
Oct 29, 2026
β¦dopted or could-not-adopt, routes workflow-path PRs to the workflows capability blocker
Let hive decide β adopt-supersede settled the operator-action ledger as
applied ("done") as soon as the adoption/supersede request label landed,
and the β hover kept saying so while nothing happened.
- #14822 edits .github/workflows: the adoption engine's
fence refused the supersession (adoption-stalled:contributor-lane:
workflow-path) and the row fell back to a bare Needs human decision.
The policy now decides such PRs as capability-gap (recommend-only),
the ledger records blocked, and the badge names the
capability:workflows-permission blocker with what a person can do.
- #14947: the re-adoption after the copy #14977 was
closed was replayed by the mutation journal; that fix landed in
#15209 (prior_copy claim input, replayed provenance
resolved). This PR layers the ledger / hover states over it.
- settledDelegatedOutcome: adopt-supersede β executing, dedup β no-effect,
capability-gap β blocked. The tracker derives the β state from the
stage record (adopted as #N / could not adopt / still executing / stuck)
and exposes progress, blocker and human to the SPA hover.
Fixes #15188
Signed-off-by: Andrew Anderson <andy@clubanderson.com>
clubanderson
added a commit
that referenced
this pull request
Oct 29, 2026
β¦dopted or could-not-adopt, routes workflow-path PRs to the workflows capability blocker (#15206) Let hive decide β adopt-supersede settled the operator-action ledger as applied ("done") as soon as the adoption/supersede request label landed, and the β hover kept saying so while nothing happened. - #14822 edits .github/workflows: the adoption engine's fence refused the supersession (adoption-stalled:contributor-lane: workflow-path) and the row fell back to a bare Needs human decision. The policy now decides such PRs as capability-gap (recommend-only), the ledger records blocked, and the badge names the capability:workflows-permission blocker with what a person can do. - #14947: the re-adoption after the copy #14977 was closed was replayed by the mutation journal; that fix landed in #15209 (prior_copy claim input, replayed provenance resolved). This PR layers the ledger / hover states over it. - settledDelegatedOutcome: adopt-supersede β executing, dedup β no-effect, capability-gap β blocked. The tracker derives the β state from the stage record (adopted as #N / could not adopt / still executing / stuck) and exposes progress, blocker and human to the SPA hover. Fixes #15188 Signed-off-by: Andrew Anderson <andy@clubanderson.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Supersedes #14947 (adopted after CI went red and the contributor was unavailable; original commits by @thatguywob preserved).
Fixes #14938
This branch is #14947's head
bc3a6ea3ac36as pushed by @thatguywob (forkthatguywob/hive), unchanged. Last lane reason on the original:contributor-lane:decision-requested.Hive fix agent: rebase this branch on
v6, fix the failing checks / review asks, and push to THIS branch. Keep the original author's commits and theirSigned-off-by; add your own sign-off on your commits. Do not open another PR.