diff --git a/changelog.d/fixed-085-human-merge-path-fence.md b/changelog.d/fixed-085-human-merge-path-fence.md new file mode 100644 index 0000000000..225e64a29f --- /dev/null +++ b/changelog.d/fixed-085-human-merge-path-fence.md @@ -0,0 +1 @@ +- Stage 085 / 090: with `auto_merge.contributor_lane.owner_approval_releases_workflow_fence` on, a contributor PR whose workflow edit is also listed in `auto_merge.human_merge_paths` was told that an owner's Approve review "releases the fence and the hive merges it". The approval only brought the lane to the human-merge-path rule, which holds the PR and never merges it, and the PR then sat at needs-decision with no step left. Under `workflow_fence_scope: human_merge_paths` that was every fenced PR. The stage now treats a head that touches a human-merge path as a person's merge from the start: no approval ask, the human-merge-path cause, and `stage/090-ready-for-human-merge` with the human-merge-path reason once the head is reviewed, green and soaked (an unanswered `requires_human` verdict still asks for its decision at 085). The hive's own human-merge-path `hold` routes the same way; a hold a person set keeps its route. The match reuses the file list the contributor lane already reads for its diff fence, so no extra GitHub call is made per sweep. A PR the pin-only exception might admit, and a workflow edit outside `human_merge_paths`, keep today's route. diff --git a/src/docs/hive-merge.md b/src/docs/hive-merge.md index e3cdc1581f..d260dfa4d3 100644 --- a/src/docs/hive-merge.md +++ b/src/docs/hive-merge.md @@ -1159,7 +1159,13 @@ A PR merges through this tier only when all of the following hold: (`merge-workflow-path`) and stays fenced for a person's merge, as an owner-released head does. - A listed file still gets the human-merge hold as well. List every + A listed file still gets the human-merge hold as well, and a head that + touches any `human_merge_paths` file is a person's merge whatever is + approved: the stage never asks for the owner approval on it, names the + human-merge path instead, and parks it at `090-ready-for-human-merge` + under that reason once it is reviewed, green and soaked (an unanswered + `requires_human` verdict still asks for its decision at 085). A PR the + pin-only exception might admit keeps the approval ask. List every reusable workflow and local action your release workflows call, not only the top-level files: an edit to an unlisted one merges after review. Three things ignore the scope: diff --git a/src/docs/labels-and-control-signals/stage-labels.md b/src/docs/labels-and-control-signals/stage-labels.md index 088d1c3673..3af0b7b28e 100644 --- a/src/docs/labels-and-control-signals/stage-labels.md +++ b/src/docs/labels-and-control-signals/stage-labels.md @@ -410,7 +410,7 @@ used to admit the PR: | CI red (required or optional) on a **fork** PR while **every** failing check's annotation says the check refuses forks (case-insensitive `fork pull request(s) cannot`, `maintainer must push this branch`, or `cannot publish` together with `fork` — a fork-publication / fork-secrets guard) | `085-needs-decision`, reason `fork-guard:,`: never 070/071/072, never nudged, never adopted (074) — neither the author nor the hive can turn the check green by pushing to the fork. The entry comment names the check and says a maintainer must push the branch to the repository (or run or approve it for head `` as the repository requires). A new head on the same fork PR (a merge of the base, or the author's push) keeps the guard while the lane's red check is one of the recorded `fork-guard:` checks, so the PR does not drop to 072 and nobody is nudged before the annotation for that head is read. A fork PR head that nothing has classified yet (its first red head, or a PR that came to 072 for another reason first) is classified from its own check annotations with the same rule, once per head, before it can be nudged: a head red only on fork-guarded checks goes straight to 085 and the guard is recorded for later heads (projectbluefin/utah-packages#972, where the author was nudged and sent relay rework for a fork-gated Canary five minutes before the annotation was read). The hive also does not update the branch of a fork head that waits on a fork-guarded check: the run a maintainer dispatches proves one exact head, and a merge of the base would discard it. Once the check is green the guard drops and updates resume before merge. While the PR stays parked across new heads, the entry comment is rewritten in place for each one, so it always names the current head, and it says that a run which passed on an earlier head does not cover this one even when the patch is the same, because a rebase or a merge of the base changes the code the check runs (projectbluefin/utah-packages#917). A same-repo PR with the same message, or a fork PR with any other red check, is handed back as usual ([#14273](https://github.com/hivecommons/hive/issues/14273), projectbluefin/utah-packages#862 and #869) | | any **non-required** check on the current head is red, whatever the lane's reason (the lane gates on required checks only, so it still soaks and merges; a reader of the rollup sees ✗). Parking modifiers (`hold`, `needs-human`, admission reasons) still win | `070-fixing` / `071-needs-author` / `072-returned-to-contributor` (by author kind), reason `optional-check-failing:` (the nudge lists every red check); never 080 or 100. A red *required* check is the lane's own `required-check-failing:*` → 070/071/072 ([#12538](https://github.com/hivecommons/hive/issues/12538), seen on [#12457](https://github.com/hivecommons/hive/pull/12457)) | | `label:hold`, `held`, `sentinel`, `contributor-lane:sentinel-blocked` | **gate**, not a stage ([#17327](https://github.com/hivecommons/hive/issues/17327)): routed by the head's evidence (below) exactly as a trust cause — CI / 070 while checks run or fail, 071 on a reviewer question, `090-ready-for-human-merge` when the head is otherwise clean — with the gate reason kept on the route so the popover and the entry comment say "Held: …". The lanes refuse the merge on the label, never on the stage | -| `label:needs-human`, `exempt-label`, `excluded-label:*`, `human-merge-path*`, `intent-*`, `contributor-lane:workflow-path` / `tests-removed` / `no-reviewer` / `review-off` (a verdict is required but the review swarm is off, so none will be requested) / `reporter-trust-hold`, `workflow-permission` (GitHub refused update-branch or the merge-forward with a 403 because the base changed `.github/workflows/` and the token the hive used lacks the workflows permission; no token the hive holds can push that update, so it is not sent to 070), `fork-workflow-update` (the same update-branch refusal on a fork head: the App is not installed on the fork, so no grant lets it push there), `linked-issue:hold:#N: