@codedrifters/configulator 0.0.394 → 0.0.396

package/lib/index.js

@@ -4633,7 +4633,17 @@ function buildBaseBundle(paths = DEFAULT_AGENT_PATHS) {
           "  `status:ready`.",
           "- **Automated flag** \u2192 add `status:needs-attention` (do not remove existing",
           "  status). Never auto-reset a `status:needs-attention` issue back to ready;",
-          "  a human must decide.",
+          "  a human must decide. The flag is **additive**: apply it with `--add-label`",
+          "  alone \u2014 never pair it with a `--remove-label` that strips the base",
+          "  `status:*` label. A flag that swaps out the base status (e.g. scope-gate",
+          "  or worker-failure paths removing `status:ready` / `status:in-progress`)",
+          "  leaves the issue with no base status \u2014 invisible to every status-driven",
+          "  query and to the queue, and unrecoverable once the flag is cleared.",
+          "- **Automated-flag clear** \u2192 when `status:needs-attention` is cleared, if the",
+          "  issue carries no base `status:*` label (a legacy issue flagged before the",
+          "  additive-flag rule, whose base status was stripped at flag time), restore",
+          "  `status:ready` \u2014 or `status:blocked` if the body still declares an open",
+          "  `Depends on:` dependency \u2014 in the same edit so it re-enters the workflow.",
           "- **PR CI failure** \u2192 add `status:needs-attention` to the associated PR (and",
           "  its linked issue) when CI fails in a **permanent** state \u2014 i.e. the failure",
           "  persists after a rerun, or the failure is clearly not a flake (compile",
@@ -14427,8 +14437,19 @@ function renderScopeGateSection(gate, excludeBundles = []) {
     "",
     "When the classifier returns `large`:",
     "",
-    "1. Apply the `status:needs-attention` label and remove",
-    "   `status:ready` from the issue.",
+    "1. **Add** the `status:needs-attention` label to the issue with",
+    "   `--add-label` alone. Leave the existing base `status:*` label",
+    "   (`status:ready`) in place \u2014 `status:needs-attention` is",
+    "   **additive**, so a flagged issue reads `status:ready` +",
+    "   `status:needs-attention`. Do **not** remove the base status:",
+    "   stripping it leaves the issue with no base `status:*` label,",
+    "   invisible to every status-driven query and to the queue itself,",
+    "   and a later flag-clear can never restore dispatchability. The",
+    "   `status:needs-attention` label already keeps the issue out of",
+    "   the dispatch queue, so the base label safely stays:",
+    "   ```bash",
+    '   gh issue edit <number> --add-label "status:needs-attention"',
+    "   ```",
     "2. Post the decomposition-proposal comment (see template below),",
     "   with `<AC_COUNT>` / `<SOURCES_COUNT>` substituted from the",
     "   classification and `<AC_LIMIT>` / `<SOURCES_LIMIT>` set to",
@@ -14449,7 +14470,12 @@ function renderScopeGateSection(gate, excludeBundles = []) {
       "4. **Auto-file is OFF.** Stop after posting the comment. A human",
       "   reviews the proposal, files the phased sub-issues manually,",
       "   and clears `status:needs-attention` when the decomposition",
-      "   is in place."
+      "   is in place. When clearing the flag, if the issue carries **no**",
+      "   base `status:*` label \u2014 a legacy issue flagged before the",
+      "   additive-flag fix, whose base status was stripped at flag time \u2014",
+      "   also add `status:ready` (or `status:blocked` when the body still",
+      "   declares an open `Depends on:` dependency) in the same edit so",
+      "   the issue re-enters the queue instead of going invisible."
     );
   }
   const overrideEntries = Object.entries(gate.bundleOverrides).filter(
@@ -16814,7 +16840,7 @@ var orchestratorSubAgent = {
     "### Step 3 \u2014 failure semantics",
     "",
     "A single PR's worker failure (missing or malformed `WORKER_*` final",
-    "line, sub-agent error, unresolvable rebase conflict) **never stops",
+    "line, sub-agent error, unresolvable merge conflict) **never stops",
     "the drain**. Log the failure as",
     "`WORKER_FAILED pr:#<n> reason:<observed>` and continue to the next",
     "`PR_DRAIN` line. The next orchestrator invocation re-runs",
@@ -17004,9 +17030,16 @@ var orchestratorSubAgent = {
     "",
     "If the scope is `large`, **do not dispatch**. Instead:",
     "",
-    "1. Apply `status:needs-attention` and remove `status:ready`:",
+    "1. **Add** `status:needs-attention` with `--add-label` alone \u2014",
+    "   leave the base `status:*` label (`status:ready`) in place.",
+    "   `status:needs-attention` is **additive**; pairing it with a",
+    '   `--remove-label "status:ready"` strips the base status and',
+    "   leaves the issue with no `status:*` label at all, invisible to",
+    "   the queue and unrecoverable when the flag is later cleared. The",
+    "   `status:needs-attention` label already keeps the issue out of",
+    "   dispatch, so the base label stays:",
     "   ```bash",
-    '   gh issue edit <number> --remove-label "status:ready" --add-label "status:needs-attention"',
+    '   gh issue edit <number> --add-label "status:needs-attention"',
     "   ```",
     "2. Post the decomposition-proposal comment (see the **Scope gate**",
     "   section in `CLAUDE.md` for the template). Substitute the",
@@ -17104,7 +17137,9 @@ var orchestratorSubAgent = {
     "5. **Priority order:** critical > high > medium > low > trivial, then **funnel tier asc** (lower tier wins ties), then FIFO by issue number.",
     "6. **Never dispatch a `large` issue.** Always run the scope check",
     "   on the top `PICK` line before reporting `NEXT_WORK_ITEM`. A",
-    "   `large` issue must be flagged with `status:needs-attention` and",
+    "   `large` issue must be flagged by **adding** `status:needs-attention`",
+    "   (additive \u2014 leave the base `status:*` label in place; never pair",
+    "   the flag with a `--remove-label` that strips the base status) and",
     "   handed a decomposition proposal \u2014 never claimed, never branched,",
     "   never delegated to the `issue-worker`.",
     "7. **Sweep dependents whenever you apply `status:done`.** Every",
@@ -17422,43 +17457,55 @@ var issueWorkerSubAgent = {
     "   reviewer's signal that the PR's head branch is BEHIND the default",
     "   branch with merge conflicts that `gh pr update-branch` could not",
     "   resolve. For either item the work is **not** an editorial change",
-    "   \u2014 it is a rebase plus conflict resolution. The two ids select",
-    "   different recipes:",
+    "   \u2014 it is a merge of the default branch into the PR branch plus",
+    "   conflict resolution. The two ids select different recipes:",
     "",
     "   - `synthetic:rebase-behind-main` \u2014 generic conflict. Resolve",
     "     each conflicting file by hand (read both sides, reconcile,",
-    "     stage), then `git rebase --continue` until the rebase",
-    "     completes.",
+    "     stage), then `git commit --no-edit` to complete the merge",
+    "     commit.",
     "   - `synthetic:rebase-shared-index` \u2014 every conflicting file is a",
     "     row-insert race on a shared-index file (registry / index /",
     "     feature-matrix under a Starlight content root). Apply the",
     "     explicit re-insert recipe carried in the item's `instruction`",
     "     field \u2014 do **not** hand-merge.",
     "",
+    "   **Marker name vs. operation.** The `comment_id` values keep their",
+    "   historical `rebase` spelling as a **stable identifier** the",
+    "   reviewer and worker agree on across sessions \u2014 the operation they",
+    "   select is a **merge** of the default branch into the PR branch,",
+    "   **not** a rebase. The PR branch is already pushed and diverged,",
+    "   so a rebase would rewrite its published history and require a",
+    "   `--force-with-lease` push that rule 8 forbids. A merge commit is",
+    "   fast-forward-pushable with a plain `git push`.",
+    "",
     "   **For `synthetic:rebase-behind-main`.** Run the following",
     "   sequence:",
     "",
     "   ```bash",
     "   git fetch origin",
-    "   git pull --rebase origin {{repository.defaultBranch}}",
+    "   git merge --no-edit origin/{{repository.defaultBranch}}",
     "   ```",
     "",
-    "   When the rebase produces conflicts, resolve each conflicting file",
-    "   in turn (read both sides, reconcile, stage), then run",
-    "   `git rebase --continue` until the rebase completes. Never run",
-    "   `git rebase --abort` on a synthetic-rebase item \u2014 aborting drops",
-    "   the work the reviewer delegated. If you cannot resolve a conflict",
-    "   (the change is editorial enough that it requires human judgement,",
-    "   or the conflict touches a generated file you should not hand-edit),",
-    "   record the item as `failed` with a clear reason, run",
-    "   `git rebase --abort`, and proceed to the report step. Do not",
-    "   force-push.",
-    "",
-    "   When the rebase completes cleanly, treat the rebased commits",
-    "   themselves as the deliverable. Skip the conventional commit step",
-    "   in Phase 6 for this item \u2014 the rebase already produced the commit",
-    "   history. Push with a regular non-force `git push origin <branch>`",
-    "   and report the rebased head SHA as the worker's commit.",
+    "   When the merge produces conflicts, resolve each conflicting file",
+    "   in turn (read both sides \u2014 `<<<<<<< HEAD` is this PR's change,",
+    "   `>>>>>>> origin/{{repository.defaultBranch}}` is the default",
+    "   branch's \u2014 reconcile, stage), then run `git commit --no-edit` to",
+    "   complete the merge commit. Do not run `git merge --abort` to give",
+    "   up casually \u2014 aborting drops the work the reviewer delegated.",
+    "   Abort **only** as the failure path: if you genuinely cannot",
+    "   resolve a conflict (the change is editorial enough that it",
+    "   requires human judgement, or the conflict touches a generated",
+    "   file you should not hand-edit), record the item as `failed` with",
+    "   a clear reason, run `git merge --abort`, and proceed to the",
+    "   report step. Do not force-push.",
+    "",
+    "   When the merge completes cleanly, treat the merge commit itself",
+    "   as the deliverable. Skip the conventional commit step in Phase 6",
+    "   for this item \u2014 the merge already produced the commit. Push with",
+    "   a regular non-force `git push origin <branch>` (the merge commit",
+    "   is fast-forward-pushable, so no force-push is needed) and report",
+    "   the merged head SHA as the worker's commit.",
     "",
     "   **For `synthetic:rebase-shared-index`.** Apply the typed",
     "   re-insert recipe step-by-step. Read the recipe verbatim from the",
@@ -17466,11 +17513,11 @@ var issueWorkerSubAgent = {
     "   contract the reviewer encodes and the precondition guards you",
     "   must enforce:",
     "",
-    "   1. **Pull and rebase** onto the default branch:",
+    "   1. **Fetch and merge** the default branch into the PR branch:",
     "",
     "      ```bash",
     "      git fetch origin",
-    "      git pull --rebase origin {{repository.defaultBranch}}",
+    "      git merge --no-edit origin/{{repository.defaultBranch}}",
     "      ```",
     "",
     "   2. **For each conflicting file**, inspect the conflict markers",
@@ -17487,18 +17534,20 @@ var issueWorkerSubAgent = {
     "      the frontmatter (lines between the opening / closing `---`",
     "      fences), the page H1, surrounding prose paragraphs, the",
     "      table header row, or the separator row, **stop**, run",
-    "      `git rebase --abort`, and record the item as `failed` with",
+    "      `git merge --abort`, and record the item as `failed` with",
     "      the structured marker `BLOCKED <reason>` (e.g.",
     "      `BLOCKED conflict touches table header in <path>`). Do not",
     "      hand-merge \u2014 the typed recipe applies only to pure",
     "      row-insert races.",
     "",
-    "      When the guards pass, read the rebased version of the file",
-    "      (it now contains the other PR's row), extract this PR's row",
-    "      from the `<<<<<<<` side of the conflict markers, re-insert",
-    "      that row in declared sort order using the file's documented",
-    "      sort key (alphabetical on the first column by default), and",
-    "      stage the file:",
+    "      When the guards pass, resolve the conflict in place: the",
+    "      `<<<<<<< HEAD` side carries this PR's row and the",
+    "      `>>>>>>> origin/{{repository.defaultBranch}}` side carries",
+    "      the other PR's row. Extract this PR's row and re-insert",
+    "      that row in declared sort order alongside the other PR's row",
+    "      using the file's documented sort key (alphabetical on the",
+    "      first column by default) so both rows survive, remove the",
+    "      conflict markers, and stage the file:",
     "",
     "      ```bash",
     "      git add <path>",
@@ -17514,16 +17563,17 @@ var issueWorkerSubAgent = {
     '      [ "$count" = "1" ] || { echo "BLOCKED verification failed for <path>"; exit 1; }',
     "      ```",
     "",
-    "   4. **Continue the rebase and push** with a non-force push once",
-    "      every file is staged and verified:",
+    "   4. **Complete the merge and push** with a plain non-force push",
+    "      once every file is staged and verified (the merge commit is",
+    "      fast-forward-pushable, so no force-push is needed):",
     "",
     "      ```bash",
-    "      git rebase --continue",
+    "      git commit --no-edit",
     "      git push origin <branch>",
     "      ```",
     "",
     "   On any `BLOCKED` precondition failure, exit non-zero with the",
-    "   `BLOCKED <reason>` line, run `git rebase --abort`, record the",
+    "   `BLOCKED <reason>` line, run `git merge --abort`, record the",
     "   item as `failed`, and proceed to the report step. The reviewer",
     "   will see the `failed` outcome on the next pass and fall through",
     "   to the human-required hand-off via `review:awaiting-human`. Do",
@@ -17590,20 +17640,21 @@ var issueWorkerSubAgent = {
     "git push origin <branch-name>",
     "```",
     "",
-    "**Synthetic-rebase items skip the `fix(review)` commit.** When the",
+    "**Synthetic rebase items skip the `fix(review)` commit.** When the",
     "fix-list contained a `comment_id` of `synthetic:rebase-behind-main`",
-    "or `synthetic:rebase-shared-index` and you completed the rebase in",
-    "Phase 4, the rebased commit history is itself the deliverable \u2014",
-    "there is no per-item editorial change to wrap in a `fix(review)`",
-    "commit. Skip `git add` / `git commit` / `git pull --rebase` for",
-    "that item and push the rebased branch directly:",
+    "or `synthetic:rebase-shared-index` and you completed the merge in",
+    "Phase 4, the merge commit is itself the deliverable \u2014 there is no",
+    "per-item editorial change to wrap in a `fix(review)` commit. The",
+    "merge commit already exists from Phase 4, so skip the `git add` /",
+    '`git commit -m "fix(review)..."` / `git pull --rebase` editorial',
+    "steps for that item and push the merged branch directly:",
     "",
     "```bash",
     "git push origin <branch-name>",
     "```",
     "",
-    "If the fix-list mixed a synthetic-rebase item with editorial items,",
-    "perform the editorial commit first (the rebase already preceded it",
+    "If the fix-list mixed a synthetic rebase item with editorial items,",
+    "perform the editorial commit first (the merge already preceded it",
     "in Phase 4), then push once at the end.",
     "",
     "**Normal mode:** Use conventional commit messages and push with `-u`",
@@ -17632,8 +17683,8 @@ var issueWorkerSubAgent = {
     "",
     "**This is the FIRST action after a successful push** \u2014 before any",
     "summary, log line, or secondary step. Call the deterministic procedure",
-    "with the PR number, the commit SHA you pushed (or the rebased head SHA",
-    "for a synthetic-rebase item), and the per-item outcomes JSON array:",
+    "with the PR number, the commit SHA you pushed (or the merged head SHA",
+    "for a synthetic rebase item), and the per-item outcomes JSON array:",
     "",
     "```bash",
     ".claude/procedures/complete-feedback-handoff.sh <pr-number> <commit-sha> '<items-json>'",
@@ -17772,9 +17823,17 @@ var issueWorkerSubAgent = {
     "   downstream agents (notably the `pr-reviewer`) can identify",
     "   bot-authored PRs. Pass `--label 'origin:issue-worker'` on every",
     "   `gh pr create` call.",
-    "7. **On failure:** If you cannot complete the issue, update labels and leave a comment:",
+    "7. **On failure:** If you cannot complete the issue (including a",
+    "   wrong-agent / routing mismatch), flag it for human triage and",
+    "   leave a comment. **Add** `status:needs-attention` with",
+    "   `--add-label` alone \u2014 do **not** remove the base",
+    "   `status:in-progress` label. `status:needs-attention` is",
+    "   additive, so the flagged issue reads `status:in-progress` +",
+    "   `status:needs-attention` and keeps a base status a human can act",
+    "   on; stripping it leaves the issue with no base `status:*` label,",
+    "   invisible to every status-driven query:",
     "   ```bash",
-    '   gh issue edit <number> --remove-label "status:in-progress" --add-label "status:needs-attention"',
+    '   gh issue edit <number> --add-label "status:needs-attention"',
     '   gh issue comment <number> --body "Worker could not complete: <reason>"',
     "   ```",
     "8. **Never force-push in feedback mode.** If a `git pull --rebase`",
@@ -19376,22 +19435,22 @@ var prReviewerSubAgent = {
     "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:",
+    "files, and either delegates a conflict resolution 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",
+    "  the shared procedure's entry-point step (a local merge 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",
-    "  durably queued for `issue-worker` (the PR now carries",
+    "- **On the procedure returning `delegated`:** a conflict resolution",
+    "  has been durably queued for `issue-worker` (the PR now carries",
     "  `review:needs-worker` and the `review:fixing` lease); stop this",
     "  pass. A top-level `issue-worker` session pulls the marker and",
-    "  pushes the rebased branch, then a follow-up reviewer pass confirms",
+    "  pushes the merged branch, then a follow-up reviewer pass confirms",
     "  the result and releases the lease \u2014 no human re-invocation is",
     "  required for the loop to complete.",
     "- **On the procedure returning `skipped` (a guard denied delegation",
@@ -20350,13 +20409,13 @@ var prReviewerSubAgent = {
     "  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",
+    "  the PR's merge state instead: attempt a local merge of the default",
+    "  branch into the head 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",
+    "  resolution \u2014 the actual merge-and-resolve is delegated to",
     "  `issue-worker` exactly as in the other entry point.",
     "",
     "### Guards",
@@ -20371,8 +20430,10 @@ var prReviewerSubAgent = {
     "   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.)",
+    "   the board: a worker's conflict-resolution merge reconciles both",
+    "   sides of each conflict into the branch, a stronger change to the",
+    "   reviewed diff than the clean merge-commit `gh pr update-branch`",
+    "   performs on a no-conflict branch.)",
     "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",
@@ -20402,7 +20463,7 @@ var prReviewerSubAgent = {
     "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.",
+    "file, or the generic conflict-resolution recipe in every other case.",
     "",
     "**Classification step.** For each conflicting path, decide whether",
     "the file is `shared-index` or `generic` against these criteria (the",
@@ -20436,12 +20497,23 @@ var prReviewerSubAgent = {
     '  fix-list item with `comment_id: "synthetic:rebase-shared-index"`',
     "  carrying the explicit re-insert recipe (see step 3 below). The",
     "  worker mechanically re-inserts each row in declared sort order",
-    "  against the rebased file.",
+    "  against the merged file.",
     "- **Any conflicting file is `generic`** \u2014 emit the existing generic",
     '  fix-list item with `comment_id: "synthetic:rebase-behind-main"`',
     "  (see step 3 below). The worker performs a hand-merge of the",
     "  conflict markers.",
     "",
+    "**Marker name vs. operation.** The two `comment_id` values retain",
+    "their historical `rebase` spelling as a **stable cross-session",
+    "identifier** \u2014 a fix-list posted by an older reviewer and consumed",
+    "by a newer worker still matches. The operation they now select is a",
+    "**merge** of the default branch into the PR branch, **not** a",
+    "rebase: the PR branch is already pushed and diverged, so a rebase",
+    "would rewrite its published history and force the worker into a",
+    "`--force-with-lease` push that the never-force-push rule forbids. A",
+    "merge commit is fast-forward-pushable with a plain `git push`, so",
+    "the recipe stays publishable.",
+    "",
     "### Hand off to `issue-worker`",
     "",
     "Hand off to `issue-worker` with the chosen single synthetic",
@@ -20464,14 +20536,15 @@ var prReviewerSubAgent = {
     "   ```",
     "",
     "3. **Post a fix-list comment** containing exactly one synthetic item",
-    "   describing the rebase. The `comment_id` field selects the typed",
-    "   recipe:",
+    "   describing the conflict resolution. The `comment_id` field selects",
+    "   the typed recipe (both perform a **merge** of the default branch",
+    "   into the PR branch \u2014 see the marker-name note above):",
     "",
     "   - `synthetic:rebase-behind-main` \u2014 generic conflict; the worker",
     "     resolves conflicting hunks by hand.",
     "   - `synthetic:rebase-shared-index` \u2014 every conflict is a pure",
     "     row-insert race on a shared-index file; the worker re-inserts",
-    "     each row in declared sort order against the rebased file.",
+    "     each row in declared sort order against the merged file.",
     "",
     "   The next reviewer pass identifies the item by its `comment_id`.",
     "",
@@ -20480,7 +20553,7 @@ var prReviewerSubAgent = {
     "   ```markdown",
     "   ## Reviewer: fix list for @issue-worker",
     "",
-    "   - [ ] @reviewer \u2014 rebase onto origin/<default-branch> and resolve conflicts in: <space-separated list of conflicting files>",
+    "   - [ ] @reviewer \u2014 merge origin/<default-branch> into the PR branch and resolve conflicts in: <space-separated list of conflicting files>",
     "",
     "   ```json fix-list",
     "   {",
@@ -20488,7 +20561,7 @@ var prReviewerSubAgent = {
     '     "branch": "<head-ref-name>",',
     '     "generated_at": "<ISO-8601 timestamp>",',
     '     "items": [',
-    '       {"comment_id": "synthetic:rebase-behind-main", "author": "reviewer", "file": "<first-conflicting-file>", "instruction": "Branch is BEHIND default-branch with merge conflicts. Pull and rebase onto origin/<default-branch>, resolve conflicts in <conflicting-files>, push the resolved branch (no force-push), and report success."}',
+    '       {"comment_id": "synthetic:rebase-behind-main", "author": "reviewer", "file": "<first-conflicting-file>", "instruction": "Branch is BEHIND default-branch with merge conflicts. Fetch and merge the default branch into the PR branch: `git fetch origin && git merge --no-edit origin/<default-branch>`. Resolve the conflicts in <conflicting-files> by reconciling both sides (`<<<<<<< HEAD` is this PR\'s change), `git add` each resolved file, then `git commit --no-edit` to complete the merge commit. Push the merged branch with a plain non-force `git push origin <branch>` \u2014 the merge commit is fast-forward-pushable, so no force-push is needed \u2014 and report success."}',
     "     ]",
     "   }",
     "   ```",
@@ -20501,7 +20574,7 @@ var prReviewerSubAgent = {
     "   ```markdown",
     "   ## Reviewer: fix list for @issue-worker",
     "",
-    "   - [ ] @reviewer \u2014 rebase onto origin/<default-branch> and re-insert shared-index rows in: <space-separated list of conflicting files>",
+    "   - [ ] @reviewer \u2014 merge origin/<default-branch> into the PR branch and re-insert shared-index rows in: <space-separated list of conflicting files>",
     "",
     "   ```json fix-list",
     "   {",
@@ -20509,7 +20582,7 @@ var prReviewerSubAgent = {
     '     "branch": "<head-ref-name>",',
     '     "generated_at": "<ISO-8601 timestamp>",',
     '     "items": [',
-    '       {"comment_id": "synthetic:rebase-shared-index", "author": "reviewer", "file": "<first-conflicting-file>", "instruction": "Branch is BEHIND default-branch with shared-index row-insert conflicts only. Apply this recipe: (1) Fetch and rebase: `git fetch origin && git pull --rebase origin <default-branch>`. (2) For each conflicting shared-index file: read the rebased version (it now contains the other PR\'s row), extract this PR\'s row from the `<<<<<<<` side of the conflict markers, re-insert that row in declared sort order using the file\'s documented sort key (alphabetical on the first column by default), stage the file with `git add <path>`. (3) Run the commit-path verification for each row: `count=$(git show :<path> | grep -Fc <row-unique-marker>) && [ \\"$count\\" = \\"1\\" ] || exit 1`. (4) `git rebase --continue` and push with non-force `git push origin <branch>`. (5) If any conflict marker touches the frontmatter, table header row, `|---|---|` separator, or surrounding prose, abort the recipe and emit `BLOCKED <reason>` \u2014 the precondition guards from the reviewer\'s classification step were violated."}',
+    '       {"comment_id": "synthetic:rebase-shared-index", "author": "reviewer", "file": "<first-conflicting-file>", "instruction": "Branch is BEHIND default-branch with shared-index row-insert conflicts only. Apply this recipe: (1) Fetch and merge the default branch into the PR branch: `git fetch origin && git merge --no-edit origin/<default-branch>`. (2) For each conflicting shared-index file: the conflict has this PR\'s row on the `<<<<<<< HEAD` side and the other PR\'s row on the `>>>>>>> origin/<default-branch>` side \u2014 extract this PR\'s row and re-insert that row in declared sort order alongside the other PR\'s row using the file\'s documented sort key (alphabetical on the first column by default) so both rows survive, remove the conflict markers, stage the file with `git add <path>`. (3) Run the commit-path verification for each row: `count=$(git show :<path> | grep -Fc <row-unique-marker>) && [ \\"$count\\" = \\"1\\" ] || exit 1`. (4) Complete the merge with `git commit --no-edit` and push with a plain non-force `git push origin <branch>` \u2014 the merge commit is fast-forward-pushable, so no force-push is needed. (5) If any conflict marker touches the frontmatter, table header row, `|---|---|` separator, or surrounding prose, abort with `git merge --abort` and emit `BLOCKED <reason>` \u2014 the precondition guards from the reviewer\'s classification step were violated."}',
     "     ]",
     "   }",
     "   ```",
@@ -20537,7 +20610,7 @@ var prReviewerSubAgent = {
     "   The worker runs in its own top-level session; a **subsequent**",
     "   reviewer pass detects the worker finished (PR carries",
     "   `review:fixing` but **not** `review:needs-worker`), reacts on the",
-    "   source comment, re-evaluates AC/CI against the rebased branch,",
+    "   source comment, re-evaluates AC/CI against the merged branch,",
     "   re-enables auto-merge, and releases the `review:fixing` lease. See",
     "   the **Confirm pass** section below.",
     "",
@@ -20556,7 +20629,7 @@ var prReviewerSubAgent = {
     "and return `skipped` to the caller.",
     "",
     "```bash",
-    "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.'",
+    "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 the branch is updated) will need to resolve.'",
     "```",
     "",
     "## Shared Procedure: Confirm a Completed Delegation",
@@ -20566,7 +20639,8 @@ var prReviewerSubAgent = {
     "the fix-list, acquires the `review:fixing` lease, applies the durable",
     "`review:needs-worker` marker, and exits returning `delegated`. A",
     "**separate** top-level `issue-worker` session then discovers the",
-    "marker, applies the fix-list (an editorial fix or a rebase), pushes,",
+    "marker, applies the fix-list (an editorial fix or a conflict-resolution",
+    "merge), pushes,",
     "writes a structured worker-report comment, and **clears**",
     "`review:needs-worker` \u2014 leaving `review:fixing` in place for the",
     "reviewer to release. The confirm pass below is how a later reviewer",
@@ -20605,12 +20679,12 @@ var prReviewerSubAgent = {
     "   used to perform.",
     "2. **React on the source comments.** For each item:",
     "   - **`handled`** \u2014 react `rocket` on the original source comment",
-    "     (the fix-list comment for a synthetic rebase item) to signal the",
-    "     accepted change has landed.",
+    "     (the fix-list comment for a synthetic conflict-resolution item)",
+    "     to signal the accepted change has landed.",
     "   - **`failed`** \u2014 react `thinking_face` (`content=confused`) on the",
     "     source comment and post a reply citing the worker's failure",
     "     reason.",
-    "3. **Re-evaluate AC/CI against the rebased branch.** Re-run the Phase",
+    "3. **Re-evaluate AC/CI against the merged branch.** Re-run the Phase",
     "   3 acceptance-criteria comparison and the **CI Verification** check",
     "   against the **updated** head SHA the worker pushed \u2014 do not reuse",
     "   any pre-delegation result.",
@@ -20737,8 +20811,9 @@ var prReviewerSubAgent = {
     "been applied in this pass. `delegated` is never a terminal",
     "completion: the loop closes only when a top-level worker consumes the",
     "marker and a later reviewer confirm pass releases the lease. Likewise",
-    "`Branch updated: delegated (PR #<n>)` records that a rebase was",
-    "queued for the worker, not that the branch is already current.",
+    "`Branch updated: delegated (PR #<n>)` records that a conflict",
+    "resolution was queued for the worker, not that the branch is already",
+    "current.",
     "",
     "---",
     "",
@@ -20821,11 +20896,13 @@ var prReviewerSubAgent = {
     "    issue type) continue to block `update-branch`: pushing main into",
     "    those PRs expands the diff under review without the human",
     "    reviewer's consent. The same restriction applies to delegating",
-    "    conflict resolution to `issue-worker`: never delegate a rebase",
-    "    on a `human-required` PR regardless of `matched_rule` \u2014 the",
-    "    typed-recipe delegation flow stays auto-merge-only because a",
-    "    worker push to a human-required branch is a stronger mutation",
-    "    than the merge-commit `gh pr update-branch` performs.",
+    "    conflict resolution to `issue-worker`: never delegate a",
+    "    conflict resolution on a `human-required` PR regardless of",
+    "    `matched_rule` \u2014 the typed-recipe delegation flow stays",
+    "    auto-merge-only because a worker's merge injects reconciled",
+    "    content into a human-required branch, expanding the reviewed",
+    "    diff more than the clean merge-commit `gh pr update-branch`",
+    "    performs.",
     "16. **Never delegate conflict resolution involving generated or",
     "    projen-managed files.** When `gh pr update-branch` fails on a",
     "    BEHIND PR with conflicts and any conflicting path is a lockfile,",