@codedrifters/configulator 0.0.352 → 0.0.354

package/lib/index.mjs

@@ -17787,7 +17787,11 @@ var prReviewerSubAgent = {
     "",
     "The PR is **eligible** only when **all** of the following hold:",
     "",
-    '1. `mergeable == "MERGEABLE"` (no merge conflicts).',
+    '1. `mergeable == "MERGEABLE"` (no merge conflicts). A',
+    '   `mergeable == "CONFLICTING"` PR is **not** an automatic',
+    "   disqualification \u2014 see the **already-`CONFLICTING` handling**",
+    "   below, which may auto-correct it via delegation before falling",
+    "   back to a hard reject.",
     "2. No **failing** required checks in `statusCheckRollup` \u2014 CI must be",
     "   green or still pending. Any `FAILURE`, `TIMED_OUT`, `CANCELLED`, or",
     "   `ERROR` conclusion on a required check disqualifies the PR. If the",
@@ -17799,8 +17803,9 @@ var prReviewerSubAgent = {
     "3. The PR body contains a linked issue via one of the closing keywords:",
     "   `Closes #N`, `Fixes #N`, or `Resolves #N` (case-insensitive).",
     "",
-    "If **any** check fails, post a short comment explaining the reason and",
-    "stop. Do not proceed to full review.",
+    "If the **CI** check (2) or the **linked-issue** check (3) fails, post",
+    "a short comment explaining the reason and stop. Do not proceed to",
+    "full review.",
     "",
     "```bash",
     "gh pr comment <pr-number> --body '<reason>'",
@@ -17808,10 +17813,50 @@ var prReviewerSubAgent = {
     "",
     "Typical reasons:",
     "",
-    "- `Not reviewable: merge conflicts \u2014 please rebase onto the default branch.`",
     "- `Not reviewable: required CI check <name> is failing.`",
     "- `Not reviewable: PR body is missing a linked issue (Closes #N / Fixes #N / Resolves #N).`",
     "",
+    "### Already-`CONFLICTING` handling (auto-correct, then reject)",
+    "",
+    'When the merge check (1) reports `mergeable == "CONFLICTING"`, do',
+    "**not** unconditionally reject. A bot-authored PR that is already",
+    "conflicting when the orchestrator finds it is exactly the case the",
+    "conflict-resolution delegation flow exists to auto-correct \u2014 there",
+    "is no reason to make a human rebase it by hand when `issue-worker`",
+    "can. Before rejecting, evaluate checks (2) and (3) above first: a",
+    "`CONFLICTING` PR that **also** has failing CI or no linked issue is",
+    "rejected for that reason via the comment-and-stop path above, since",
+    "the delegation cannot succeed without a linked issue and green-able",
+    "CI anyway.",
+    "",
+    "Otherwise, hand off to the **Shared Procedure: Conflict-Resolution",
+    "Delegation** section. It evaluates the guards (auto-merge mode, the",
+    "delegation invocation guard, a free `review:fixing` lease, no",
+    "generated / projen / lockfile conflicts), classifies the conflicting",
+    "files, and either delegates a rebase to `issue-worker` or falls",
+    "through to its own fallback. Invoke it with this entry point's",
+    "parameters:",
+    "",
+    "- **Entry point:** `already-conflicting`. There is no failed",
+    "  `gh pr update-branch` to read conflicting paths from \u2014 identify",
+    "  the conflicting files from the PR's merge state as documented in",
+    "  the shared procedure's entry-point step (a local rebase attempt",
+    "  whose `<<<<<<<` / `=======` / `>>>>>>>` markers name the",
+    "  conflicting files). The guards and classification are identical to",
+    "  the Phase 4 entry point.",
+    "- **On the procedure returning `delegated`:** a rebase has been",
+    "  delegated to `issue-worker`; stop this pass. A human re-invokes",
+    "  the reviewer once the worker pushes the rebased branch.",
+    "- **On the procedure returning `skipped` (a guard denied delegation",
+    "  or the guards failed):** fall back to the original hard reject \u2014",
+    "  post the merge-conflict rejection comment and stop. Use this",
+    "  comment **only** in the skipped case, never before the shared",
+    "  procedure has had its chance to auto-correct:",
+    "",
+    "```bash",
+    "gh pr comment <pr-number> --body 'Not reviewable: merge conflicts \u2014 please rebase onto the default branch.'",
+    "```",
+    "",
     "## Phase 2: Gather Context",
     "",
     "```bash",
@@ -17945,7 +17990,12 @@ var prReviewerSubAgent = {
     "   `review:human-required` label, set `mode = human-required`.",
     "3. **Labels that force human** \u2014 if the PR carries any label listed",
     "   under `human-required.labels-that-force-human` (e.g.",
-    "   `priority:critical`), set `mode = human-required`.",
+    "   `review:human-required`), set `mode = human-required`. Evaluate",
+    "   the PR's **own** labels only \u2014 rules 1\u20133 never traverse the",
+    "   `Closes #N` link to read the linked issue's labels. `priority:*`",
+    "   and `status:*` are issue-triage labels for the orchestrator's",
+    "   scheduling queue, not merge-risk signals, and are never listed",
+    "   here.",
     "4. **Path globs** \u2014 if any file in the PR diff matches any glob in",
     "   `human-required.paths`, set `mode = human-required`. Record the",
     "   first matching path + glob pair as the reason.",
@@ -18463,7 +18513,7 @@ var prReviewerSubAgent = {
     "when the mode is `human-required` and any of the following fired:",
     "",
     "- rule 2 (`review:human-required` label),",
-    "- rule 3 (any `labels-that-force-human` label such as `priority:critical`),",
+    "- rule 3 (any `labels-that-force-human` label),",
     "- rule 4 (`human-required.paths` glob match), or",
     "- rule 5 (`human-required.issue-types` match).",
     "",
@@ -18513,37 +18563,215 @@ var prReviewerSubAgent = {
     "##### Conflict-resolution delegation (BEHIND + conflicts)",
     "",
     "When `gh pr update-branch <pr-number>` fails because the merge would",
-    "produce conflicts, the reviewer **may** delegate conflict resolution to",
-    "`issue-worker` via the existing feedback-mode delegation contract (the",
-    "same path Phase 4's in-scope-fix delegation uses). The reviewer never",
-    "hand-resolves conflicts itself \u2014 branch mutations always belong to",
-    "`issue-worker`.",
+    "produce conflicts, hand off to the **Shared Procedure:",
+    "Conflict-Resolution Delegation** section below. That procedure owns",
+    "the guards, the `shared-index` vs `generic` classification, the two",
+    "typed recipes, and the fallback \u2014 defined once and shared with the",
+    "Phase 1.5 already-`CONFLICTING` entry point. Invoke it with this",
+    "entry point's parameters:",
+    "",
+    "- **Entry point:** `update-branch-conflict`. The set of conflicting",
+    "  files is the list reported by the failed `gh pr update-branch`",
+    "  (cross-referenced with `gh pr view <pr-number> --json files`).",
+    "- **On the procedure returning `delegated`:** record",
+    "  `Branch updated: delegated (PR #<n>)` for the per-PR report.",
+    "- **On the procedure returning `skipped` (a guard denied delegation",
+    "  or the guards failed):** the procedure has already posted the",
+    "  fallback comment and recorded",
+    "  `Branch updated: failed (conflicts; <short reason>)`. Stop.",
+    "",
+    "#### Mode `human-required`",
+    "",
+    "Do **not** run `gh pr merge --auto`. Instead, hand the PR off to a",
+    "human reviewer:",
+    "",
+    "1. Apply the `review:awaiting-human` label so the PR is discoverable",
+    "   in the human-review queue:",
+    "",
+    "   ```bash",
+    "   gh pr edit <pr-number> --add-label 'review:awaiting-human'",
+    "   ```",
+    "",
+    "2. **If `matched_rule == 6`** (size threshold was the sole trigger),",
+    "   run the `Update the branch when `mergeStateStatus` is `BEHIND``",
+    "   step from the `Mode auto-merge` branch above before exiting. The",
+    "   eligibility gate documented in that sub-section explicitly permits",
+    "   `gh pr update-branch` on size-only human-required PRs so the bot",
+    "   keeps the branch fresh against the default branch while the human",
+    "   reviews. Skip this sub-step for `matched_rule` in 2\u20135 \u2014 the gate",
+    "   denies `update-branch` there and the human owns branch-lifecycle.",
+    "",
+    "3. Exit cleanly after the acceptance-criteria check completes and any",
+    "   summary comment the reviewer posts. Proceed to Phase 5 only if a",
+    "   merge occurred \u2014 in `human-required` mode the reviewer stops at",
+    "   the hand-off and does not poll for merge.",
+    "",
+    "The reason captured in Phase 2.75 should be included in any summary",
+    "comment so maintainers know why human review was required (path hit,",
+    "issue type, size threshold, label, or default).",
+    "",
+    "### If any criterion is missing, partial, or CI is failing",
+    "",
+    "Post a plain comment (not a formal review block) with grouped findings:",
+    "",
+    "```bash",
+    "gh pr comment <pr-number> --body '<grouped findings>'",
+    "```",
+    "",
+    "Group findings by severity (**Blocking** / **Suggested** / **Nitpick**).",
+    "For each blocking finding, cite the unmet acceptance criterion and the",
+    "file or function the gap lives in. Do **not** merge, and do **not** push",
+    "any commits to the PR's branch.",
+    "",
+    "Rationale for using a plain comment rather than `gh pr review",
+    "--request-changes`: it is lighter-weight, doesn't require the author to",
+    "dismiss a formal review, and composes cleanly with the multi-PR loop.",
+    "",
+    "## Phase 4.5: Update Sticky Summary",
+    "",
+    "On **every pass**, create or update a single **`## Reviewer notes`**",
+    "comment on the PR. This sticky comment is the human-facing single",
+    "source of truth for the PR's state \u2014 one comment per PR, edited in",
+    "place across passes, never duplicated. Do not post a fresh",
+    '"pass N summary" on each iteration.',
+    "",
+    "### Step 1: Find the existing sticky comment (if any)",
+    "",
+    "List PR-level comments and look for one authored by the reviewer",
+    "whose body starts with `## Reviewer notes`:",
+    "",
+    "```bash",
+    "gh api repos/{{repository.owner}}/{{repository.name}}/issues/<pr-number>/comments",
+    "```",
+    "",
+    "If multiple candidates exist (an older run double-posted before this",
+    "phase existed), keep the earliest and plan to delete the duplicates",
+    "on a later pass. Never delete another author's comment.",
+    "",
+    "### Step 2: Compose the sticky body",
+    "",
+    "The body uses the following shape:",
+    "",
+    "```",
+    "## Reviewer notes",
+    "",
+    "**Mode:** auto-merge | human-required \u2014 <reason from Phase 2.75>",
+    "**AC status:** <met / partial / missing> (evidence links)",
+    "**CI status:** green | pending | red",
+    "**Outstanding:** <list of comments still open with their classification and author>",
+    "**Pushbacks:** <list of disputes with reasons>",
+    "**Last pass:** <ISO timestamp>",
+    "```",
+    "",
+    "Populate each field from the phases above:",
+    "",
+    "- **Mode / reason** \u2014 the mode and reason recorded in Phase 2.75.",
+    "- **AC status** \u2014 the checklist produced in Phase 3 (met, partial,",
+    "  or missing), with links to the files or tests that provide the",
+    "  evidence.",
+    "- **CI status** \u2014 the verdict from the **CI Verification** section",
+    "  (primary check-runs read, or the Actions-runs fallback when",
+    "  check-runs returns a fine-grained-PAT 403).",
+    "- **Outstanding** \u2014 the comments still carrying a non-terminal",
+    "  reviewer reaction from Phase 3.5 (typically `eyes` for queued",
+    "  in-scope items and `nit` / `question` items that remain open).",
+    "  List each as `<classification>: <author> \u2014 <short summary> (<url>)`.",
+    "- **Pushbacks** \u2014 every comment the reviewer reacted",
+    "  `thinking_face` to on this or any prior pass, with the reason",
+    "  captured in the pushback reply. Empty list when there are none.",
+    "- **Last pass** \u2014 the ISO 8601 timestamp of this run.",
+    "",
+    "### Step 3: Create or edit in place",
+    "",
+    "If no existing sticky comment was found in Step 1, create one:",
+    "",
+    "```bash",
+    "gh pr comment <pr-number> --body '<sticky body>'",
+    "```",
+    "",
+    "If an existing sticky comment was found, edit it in place using the",
+    "comment id. Do not delete and re-create \u2014 editing preserves the",
+    "comment's URL and any reactions humans have added to the summary:",
+    "",
+    "```bash",
+    "gh api repos/{{repository.owner}}/{{repository.name}}/issues/comments/<sticky-comment-id> \\",
+    "  -X PATCH -f body='<sticky body>'",
+    "```",
+    "",
+    "The sticky summary must be updated on every pass through Phase 4.5,",
+    "including passes that ended in a pushback-gated skip, a",
+    "`NEEDS_CHANGES` findings comment, or the `human-required` hand-off.",
+    "Humans rely on the sticky comment to see the current state of the",
+    "PR at a glance \u2014 it must never go stale while the reviewer is",
+    "actively processing the PR.",
+    "",
+    "## Shared Procedure: Conflict-Resolution Delegation",
+    "",
+    "This procedure resolves a PR that cannot land because its head",
+    "branch conflicts with the default branch. It is invoked from **two**",
+    "entry points, both of which reuse the identical guards,",
+    "classification, typed recipes, and fallback defined here \u2014 the flow",
+    "is defined **once** and shared:",
+    "",
+    "- **Phase 4 `update-branch-conflict`** \u2014 a PR that was MERGEABLE at",
+    "  Phase 1.5 went BEHIND, and `gh pr update-branch` then failed",
+    "  because the merge would conflict.",
+    "- **Phase 1.5 `already-conflicting`** \u2014 the orchestrator handed the",
+    "  reviewer a PR that is **already** `CONFLICTING` (its",
+    '  `mergeable == "CONFLICTING"`) before any review work began.',
+    "",
+    "The reviewer **may** delegate conflict resolution to `issue-worker`",
+    "via the feedback-mode delegation contract (the same path Phase 4's",
+    "in-scope-fix delegation uses). The reviewer never hand-resolves",
+    "conflicts itself \u2014 branch mutations always belong to `issue-worker`.",
+    "",
+    "### Entry-point parameters",
+    "",
+    "The caller supplies which entry point it is and how the conflicting",
+    "files are identified. Everything after this step is identical across",
+    "both entry points.",
+    "",
+    "- **`update-branch-conflict`** \u2014 the conflicting-file set is the",
+    "  list reported by the failed `gh pr update-branch` (cross-referenced",
+    "  with `gh pr view <pr-number> --json files`).",
+    "- **`already-conflicting`** \u2014 there is no failed `update-branch` to",
+    "  read conflicting paths from. Identify the conflicting files from",
+    "  the PR's merge state instead: attempt a local rebase of the head",
+    "  branch onto the default branch in a scratch checkout (or read the",
+    "  conflicting paths git reports) and collect the files that carry",
+    "  `<<<<<<<` / `=======` / `>>>>>>>` conflict markers. Use that set",
+    "  as the conflicting-file list. The reviewer inspects these markers",
+    "  read-only to classify; it does **not** stage, commit, or push any",
+    "  resolution \u2014 the actual rebase-and-resolve is delegated to",
+    "  `issue-worker` exactly as in the other entry point.",
+    "",
+    "### Guards",
     "",
     "Delegate **only when all** of the following hold. If any guard fails,",
-    "fall through to the fallback at the end of this sub-section instead.",
+    "fall through to the **Fallback** at the end of this procedure and",
+    "return `skipped`.",
     "",
     "1. **Review mode is `auto-merge`.** Never delegate conflict",
     "   resolution on `human-required` PRs \u2014 pushing worker-resolved",
     "   merge content into them expands the diff under review without",
-    "   the human reviewer's consent. (Unlike the `update-branch` step",
-    "   above, which permits a size-only `human-required` carve-out, the",
+    "   the human reviewer's consent. (Unlike the `update-branch` step,",
+    "   which permits a size-only `human-required` carve-out, the",
     "   conflict-resolution delegation flow is auto-merge-only across",
     "   the board: a worker rebase push is a stronger branch mutation",
     "   than the merge-commit `gh pr update-branch` performs.)",
     "2. **Delegation invocation guard permits the hand-off** \u2014 the PR",
     "   carries the `origin:issue-worker` label, **or** the reviewer was",
     "   invoked with `--allow-human-author`. The same guard used for the",
-    "   in-scope-fix delegation flow above applies here unchanged.",
+    "   in-scope-fix delegation flow applies here unchanged.",
     "3. **The `review:fixing` lease is currently free.** If",
     "   `review:fixing` is already on the PR, another delegation is",
     "   in-flight; skip conflict-resolution delegation, log the contention",
     "   to the sticky summary, and fall through to the fallback.",
-    "4. **No conflicting file is generated or projen-managed.** Run",
-    "   `gh pr view <pr-number> --json files --jq '.files[].path'` and",
-    "   inspect the conflicting paths reported by the failed",
-    "   `update-branch`. If **any** conflicting path matches one of the",
-    "   following globs, the conflict is unsafe to resolve mechanically",
-    "   and the reviewer must skip delegation:",
+    "4. **No conflicting file is generated or projen-managed.** Inspect",
+    "   the conflicting paths from the entry-point step above. If **any**",
+    "   conflicting path matches one of the following globs, the conflict",
+    "   is unsafe to resolve mechanically and the reviewer must skip",
+    "   delegation:",
     "    - `**/*.lock` and `pnpm-lock.yaml` / `yarn.lock` / `package-lock.json`",
     "    - `**/.projen/**`",
     "    - any file whose first 5 lines contain the marker",
@@ -18554,17 +18782,18 @@ var prReviewerSubAgent = {
     "   and conflicts there should be resolved by re-running synth, not by",
     "   merging the conflict markers.",
     "",
+    "### Classify each conflicting file",
+    "",
     "When every guard above passes, **classify each conflicting file**",
     "before composing the fix-list. The classification picks one of two",
     "typed recipes \u2014 a precise `shared-index` resolver when every",
     "conflict is a row-insert race on a registry / index / feature-matrix",
     "file, or the generic rebase recipe in every other case.",
     "",
-    "**Classification step.** For each conflicting path reported by the",
-    "failed `update-branch`, decide whether the file is `shared-index` or",
-    "`generic` against these criteria (the shared-index glob set comes",
-    "from the `shared-editing-safety` rule \u2014 see the bundle's",
-    "`shared-editing.ts` for the canonical constant):",
+    "**Classification step.** For each conflicting path, decide whether",
+    "the file is `shared-index` or `generic` against these criteria (the",
+    "shared-index glob set comes from the `shared-editing-safety` rule \u2014",
+    "see the bundle's `shared-editing.ts` for the canonical constant):",
     "",
     "- `shared-index` \u2014 the path matches one of the shared-editing glob",
     "  patterns:",
@@ -18599,6 +18828,8 @@ var prReviewerSubAgent = {
     "  (see step 3 below). The worker performs a hand-merge of the",
     "  conflict markers.",
     "",
+    "### Hand off to `issue-worker`",
+    "",
     "Hand off to `issue-worker` with the chosen single synthetic",
     "fix-list item:",
     "",
@@ -18686,147 +18917,25 @@ var prReviewerSubAgent = {
     "",
     "7. **Do not re-enable auto-merge in the same pass.** After delegation,",
     "   exit and let a human re-invoke the reviewer. The next pass will",
-    "   re-evaluate `mergeStateStatus` against the rebased branch and",
-    "   re-enable auto-merge through the normal flow above.",
+    "   re-evaluate `mergeStateStatus` (or `mergeable`) against the",
+    "   rebased branch and re-enable auto-merge through the normal flow.",
+    "",
+    "Return `delegated` to the caller when delegation completes",
+    "(regardless of the worker's outcome \u2014 the delegation itself is the",
+    "action taken).",
     "",
-    "Record `Branch updated: delegated (PR #<n>)` for the per-PR report",
-    "when delegation completes (regardless of the worker's outcome \u2014 the",
-    "delegation itself is the action taken).",
+    "### Fallback",
     "",
     "**Fallback when delegation is not permitted or guards fail.** Post a",
     "short comment explaining why the branch could not be updated",
     "automatically and stop. Do not push commits, do not force, do not",
-    "retry. Record `Branch updated: failed (conflicts; <short reason>)`.",
+    "retry. Record `Branch updated: failed (conflicts; <short reason>)`",
+    "and return `skipped` to the caller.",
     "",
     "```bash",
-    "gh pr comment <pr-number> --body 'Auto-merge queued; branch is BEHIND <default-branch> with conflicts. <short reason delegation was skipped \u2014 e.g. human-required mode, generated-file conflicts, or in-flight review:fixing lease>. A human (or the next reviewer pass after rebase) will need to resolve.'",
+    "gh pr comment <pr-number> --body 'Branch is BEHIND <default-branch> with conflicts. <short reason delegation was skipped \u2014 e.g. human-required mode, generated-file conflicts, or in-flight review:fixing lease>. A human (or the next reviewer pass after rebase) will need to resolve.'",
     "```",
     "",
-    "#### Mode `human-required`",
-    "",
-    "Do **not** run `gh pr merge --auto`. Instead, hand the PR off to a",
-    "human reviewer:",
-    "",
-    "1. Apply the `review:awaiting-human` label so the PR is discoverable",
-    "   in the human-review queue:",
-    "",
-    "   ```bash",
-    "   gh pr edit <pr-number> --add-label 'review:awaiting-human'",
-    "   ```",
-    "",
-    "2. **If `matched_rule == 6`** (size threshold was the sole trigger),",
-    "   run the `Update the branch when `mergeStateStatus` is `BEHIND``",
-    "   step from the `Mode auto-merge` branch above before exiting. The",
-    "   eligibility gate documented in that sub-section explicitly permits",
-    "   `gh pr update-branch` on size-only human-required PRs so the bot",
-    "   keeps the branch fresh against the default branch while the human",
-    "   reviews. Skip this sub-step for `matched_rule` in 2\u20135 \u2014 the gate",
-    "   denies `update-branch` there and the human owns branch-lifecycle.",
-    "",
-    "3. Exit cleanly after the acceptance-criteria check completes and any",
-    "   summary comment the reviewer posts. Proceed to Phase 5 only if a",
-    "   merge occurred \u2014 in `human-required` mode the reviewer stops at",
-    "   the hand-off and does not poll for merge.",
-    "",
-    "The reason captured in Phase 2.75 should be included in any summary",
-    "comment so maintainers know why human review was required (path hit,",
-    "issue type, size threshold, label, or default).",
-    "",
-    "### If any criterion is missing, partial, or CI is failing",
-    "",
-    "Post a plain comment (not a formal review block) with grouped findings:",
-    "",
-    "```bash",
-    "gh pr comment <pr-number> --body '<grouped findings>'",
-    "```",
-    "",
-    "Group findings by severity (**Blocking** / **Suggested** / **Nitpick**).",
-    "For each blocking finding, cite the unmet acceptance criterion and the",
-    "file or function the gap lives in. Do **not** merge, and do **not** push",
-    "any commits to the PR's branch.",
-    "",
-    "Rationale for using a plain comment rather than `gh pr review",
-    "--request-changes`: it is lighter-weight, doesn't require the author to",
-    "dismiss a formal review, and composes cleanly with the multi-PR loop.",
-    "",
-    "## Phase 4.5: Update Sticky Summary",
-    "",
-    "On **every pass**, create or update a single **`## Reviewer notes`**",
-    "comment on the PR. This sticky comment is the human-facing single",
-    "source of truth for the PR's state \u2014 one comment per PR, edited in",
-    "place across passes, never duplicated. Do not post a fresh",
-    '"pass N summary" on each iteration.',
-    "",
-    "### Step 1: Find the existing sticky comment (if any)",
-    "",
-    "List PR-level comments and look for one authored by the reviewer",
-    "whose body starts with `## Reviewer notes`:",
-    "",
-    "```bash",
-    "gh api repos/{{repository.owner}}/{{repository.name}}/issues/<pr-number>/comments",
-    "```",
-    "",
-    "If multiple candidates exist (an older run double-posted before this",
-    "phase existed), keep the earliest and plan to delete the duplicates",
-    "on a later pass. Never delete another author's comment.",
-    "",
-    "### Step 2: Compose the sticky body",
-    "",
-    "The body uses the following shape:",
-    "",
-    "```",
-    "## Reviewer notes",
-    "",
-    "**Mode:** auto-merge | human-required \u2014 <reason from Phase 2.75>",
-    "**AC status:** <met / partial / missing> (evidence links)",
-    "**CI status:** green | pending | red",
-    "**Outstanding:** <list of comments still open with their classification and author>",
-    "**Pushbacks:** <list of disputes with reasons>",
-    "**Last pass:** <ISO timestamp>",
-    "```",
-    "",
-    "Populate each field from the phases above:",
-    "",
-    "- **Mode / reason** \u2014 the mode and reason recorded in Phase 2.75.",
-    "- **AC status** \u2014 the checklist produced in Phase 3 (met, partial,",
-    "  or missing), with links to the files or tests that provide the",
-    "  evidence.",
-    "- **CI status** \u2014 the verdict from the **CI Verification** section",
-    "  (primary check-runs read, or the Actions-runs fallback when",
-    "  check-runs returns a fine-grained-PAT 403).",
-    "- **Outstanding** \u2014 the comments still carrying a non-terminal",
-    "  reviewer reaction from Phase 3.5 (typically `eyes` for queued",
-    "  in-scope items and `nit` / `question` items that remain open).",
-    "  List each as `<classification>: <author> \u2014 <short summary> (<url>)`.",
-    "- **Pushbacks** \u2014 every comment the reviewer reacted",
-    "  `thinking_face` to on this or any prior pass, with the reason",
-    "  captured in the pushback reply. Empty list when there are none.",
-    "- **Last pass** \u2014 the ISO 8601 timestamp of this run.",
-    "",
-    "### Step 3: Create or edit in place",
-    "",
-    "If no existing sticky comment was found in Step 1, create one:",
-    "",
-    "```bash",
-    "gh pr comment <pr-number> --body '<sticky body>'",
-    "```",
-    "",
-    "If an existing sticky comment was found, edit it in place using the",
-    "comment id. Do not delete and re-create \u2014 editing preserves the",
-    "comment's URL and any reactions humans have added to the summary:",
-    "",
-    "```bash",
-    "gh api repos/{{repository.owner}}/{{repository.name}}/issues/comments/<sticky-comment-id> \\",
-    "  -X PATCH -f body='<sticky body>'",
-    "```",
-    "",
-    "The sticky summary must be updated on every pass through Phase 4.5,",
-    "including passes that ended in a pushback-gated skip, a",
-    "`NEEDS_CHANGES` findings comment, or the `human-required` hand-off.",
-    "Humans rely on the sticky comment to see the current state of the",
-    "PR at a glance \u2014 it must never go stale while the reviewer is",
-    "actively processing the PR.",
-    "",
     "## Phase 5: Branch Cleanup and Issue Closure Verification",
     "",
     "Skip this phase entirely when the review mode from Phase 2.75 is",
@@ -19217,7 +19326,6 @@ function buildPrReviewBundle(policy = resolvePrReviewPolicy()) {
           "    insertions: 500",
           "  labels-that-force-human:",
           '    - "review:human-required"',
-          '    - "priority:critical"',
           "",
           "auto-merge:",
           "  labels-that-force-auto:",
@@ -19248,8 +19356,9 @@ function buildPrReviewBundle(policy = resolvePrReviewPolicy()) {
           "2. **`review:human-required` label** \u2014 reserved force-human label;",
           "   if present (and no force-auto label beat it in step 1), the mode",
           "   is `human-required`.",
-          "3. **`human-required.labels-that-force-human`** \u2014 any listed label on",
-          "   the PR (e.g. `priority:critical`) forces `human-required`.",
+          "3. **`human-required.labels-that-force-human`** \u2014 if the PR",
+          "   carries any label listed here (e.g. `review:human-required`),",
+          "   the mode is `human-required`.",
           "4. **`human-required.paths`** \u2014 if any file in the PR diff matches",
           "   any glob here, the mode is `human-required`. Matching uses",
           "   standard glob semantics (`**` for recursive directories,",
@@ -19270,6 +19379,24 @@ function buildPrReviewBundle(policy = resolvePrReviewPolicy()) {
           "7. **`default`** \u2014 applied only when no rule above matched",
           "   (normally `auto-merge`).",
           "",
+          "**Label-check scope.** All label checks in rules 1\u20133 evaluate",
+          "the PR's **own** labels only. Never traverse the `Closes #N`",
+          "link to read the linked issue's labels for a label rule. Rule 5",
+          "is the only rule that reads the linked issue, and it reads the",
+          "issue **type**, not its labels.",
+          "",
+          "**`priority:*` / `status:*` are not merge-risk signals.**",
+          "`priority:*` and `status:*` are issue-triage labels consumed by",
+          "the orchestrator for scheduling \u2014 `priority:*` sequences the",
+          "work queue and `status:*` tracks workflow position. They say",
+          "nothing about a PR's merge risk and must never appear in any",
+          "`labels-that-force-*` list. Gating merge on `priority:critical`",
+          "in particular inverts the intended behaviour: the most urgent",
+          "work would wait the longest for a human merge. Merge risk is",
+          "already covered by the path globs (rule 4), the",
+          "`release` / `hotfix` issue-types (rule 5), and the size",
+          "thresholds (rule 6).",
+          "",
           "The `auto-merge.paths-exempt-from-size` carve-out exists so",
           "**doc-only PRs** that routinely exceed the 500-insertion size",
           "threshold (large migrations, bulk additions, refresh passes)",
@@ -19301,8 +19428,8 @@ function buildPrReviewBundle(policy = resolvePrReviewPolicy()) {
           "The exception is keyed on the matched-rule index recorded in",
           "Phase 2.75. All other `human-required` triggers \u2014 rule 2",
           "(`review:human-required` label), rule 3 (any",
-          "`labels-that-force-human` label such as `priority:critical`),",
-          "rule 4 (`human-required.paths` glob match), and rule 5",
+          "`labels-that-force-human` label), rule 4",
+          "(`human-required.paths` glob match), and rule 5",
           "(`human-required.issue-types` match) \u2014 continue to block",
           "`update-branch` because each one signals a human reviewer who",
           "has explicit ownership of the branch's lifecycle.",