@codedrifters/configulator 0.0.287 → 0.0.289

package/lib/index.js

@@ -206,7 +206,6 @@ __export(index_exports, {
   DEFAULT_API_EXTRACTOR_REPORT_FOLDER: () => DEFAULT_API_EXTRACTOR_REPORT_FOLDER,
   DEFAULT_AUDIT_REPORT_DIR: () => DEFAULT_AUDIT_REPORT_DIR,
   DEFAULT_DECOMPOSITION_TEMPLATE: () => DEFAULT_DECOMPOSITION_TEMPLATE,
-  DEFAULT_DELEGATE_TO_PR_REVIEWER: () => DEFAULT_DELEGATE_TO_PR_REVIEWER,
   DEFAULT_DISPATCH_MODEL: () => DEFAULT_DISPATCH_MODEL,
   DEFAULT_DISPATCH_TO_HOUSEKEEPING_RATIO: () => DEFAULT_DISPATCH_TO_HOUSEKEEPING_RATIO,
   DEFAULT_HOUSEKEEPING_MODEL: () => DEFAULT_HOUSEKEEPING_MODEL,
@@ -216,7 +215,6 @@ __export(index_exports, {
   DEFAULT_ISSUE_TEMPLATES_ENABLED: () => DEFAULT_ISSUE_TEMPLATES_ENABLED,
   DEFAULT_ISSUE_TEMPLATES_PATH: () => DEFAULT_ISSUE_TEMPLATES_PATH,
   DEFAULT_ISSUE_TEMPLATES_REQUIRE_REFERENCE: () => DEFAULT_ISSUE_TEMPLATES_REQUIRE_REFERENCE,
-  DEFAULT_MERGE_METHOD: () => DEFAULT_MERGE_METHOD,
   DEFAULT_OFF_PEAK_CRON_EXAMPLE: () => DEFAULT_OFF_PEAK_CRON_EXAMPLE,
   DEFAULT_PARTIAL_UNBLOCK_COMMENT_TEMPLATE: () => DEFAULT_PARTIAL_UNBLOCK_COMMENT_TEMPLATE,
   DEFAULT_PRIORITY_LABELS: () => DEFAULT_PRIORITY_LABELS,
@@ -226,7 +224,6 @@ __export(index_exports, {
   DEFAULT_PROGRESS_FILES_FORMAT: () => DEFAULT_PROGRESS_FILES_FORMAT,
   DEFAULT_PROGRESS_FILES_STALE_AFTER_HOURS: () => DEFAULT_PROGRESS_FILES_STALE_AFTER_HOURS,
   DEFAULT_PROGRESS_FILES_STATE_DIR: () => DEFAULT_PROGRESS_FILES_STATE_DIR,
-  DEFAULT_REQUIRE_LINKED_ISSUE: () => DEFAULT_REQUIRE_LINKED_ISSUE,
   DEFAULT_REQUIRE_PRODUCT_CONTEXT: () => DEFAULT_REQUIRE_PRODUCT_CONTEXT,
   DEFAULT_SAMPLE_COMPILER_OPTIONS: () => DEFAULT_SAMPLE_COMPILER_OPTIONS,
   DEFAULT_SCHEDULED_TASKS_ROOT: () => DEFAULT_SCHEDULED_TASKS_ROOT,
@@ -258,7 +255,6 @@ __export(index_exports, {
   MINIMUM_RELEASE_AGE: () => MINIMUM_RELEASE_AGE,
   MONOREPO_LAYOUT: () => MONOREPO_LAYOUT,
   MonorepoProject: () => MonorepoProject,
-  PREFLIGHT_MERGE_METHOD_VALUES: () => PREFLIGHT_MERGE_METHOD_VALUES,
   PROD_DEPLOY_NAME: () => PROD_DEPLOY_NAME,
   PROGRESS_FILES_FORMAT_VALUES: () => PROGRESS_FILES_FORMAT_VALUES,
   PnpmWorkspace: () => PnpmWorkspace,
@@ -362,8 +358,6 @@ __export(index_exports, {
   renderIssueTemplatesRuleContent: () => renderIssueTemplatesRuleContent,
   renderIssueTemplatesStarterPage: () => renderIssueTemplatesStarterPage,
   renderMeetingTypesSection: () => renderMeetingTypesSection,
-  renderPreflightPrSection: () => renderPreflightPrSection,
-  renderPreflightPrShellHelpers: () => renderPreflightPrShellHelpers,
   renderPriorityRulesSection: () => renderPriorityRulesSection,
   renderProgressFileName: () => renderProgressFileName,
   renderProgressFilePath: () => renderProgressFilePath,
@@ -396,7 +390,6 @@ __export(index_exports, {
   resolveModelAlias: () => resolveModelAlias,
   resolveOrchestratorAssets: () => resolveOrchestratorAssets,
   resolveOutdirFromPackageName: () => resolveOutdirFromPackageName,
-  resolvePreflightPr: () => resolvePreflightPr,
   resolveProgressFiles: () => resolveProgressFiles,
   resolveRunRatio: () => resolveRunRatio,
   resolveScheduledTasks: () => resolveScheduledTasks,
@@ -417,7 +410,6 @@ __export(index_exports, {
   validateAgentTierConfig: () => validateAgentTierConfig,
   validateIssueTemplatesConfig: () => validateIssueTemplatesConfig,
   validateMonorepoLayout: () => validateMonorepoLayout,
-  validatePreflightPrConfig: () => validatePreflightPrConfig,
   validateProgressFilesConfig: () => validateProgressFilesConfig,
   validateRunRatioConfig: () => validateRunRatioConfig,
   validateScheduledTasksConfig: () => validateScheduledTasksConfig,
@@ -11169,291 +11161,6 @@ var meetingAnalysisBundle = {
   ]
 };
 
-// src/agent/bundles/preflight-pr.ts
-var DEFAULT_DELEGATE_TO_PR_REVIEWER = true;
-var DEFAULT_MERGE_METHOD = "squash";
-var DEFAULT_REQUIRE_LINKED_ISSUE = true;
-var PREFLIGHT_MERGE_METHOD_VALUES = [
-  "squash",
-  "merge",
-  "rebase"
-];
-function resolvePreflightPr(config) {
-  const mergeMethod = config?.mergeMethod ?? DEFAULT_MERGE_METHOD;
-  assertValidMergeMethod(mergeMethod);
-  const eligibleLabels = config?.eligibleLabels ?? [];
-  assertValidEligibleLabels(eligibleLabels);
-  return {
-    enabled: config?.enabled ?? true,
-    delegateToPrReviewer: config?.delegateToPrReviewer ?? DEFAULT_DELEGATE_TO_PR_REVIEWER,
-    mergeMethod,
-    requireLinkedIssue: config?.requireLinkedIssue ?? DEFAULT_REQUIRE_LINKED_ISSUE,
-    eligibleLabels
-  };
-}
-function validatePreflightPrConfig(config) {
-  return resolvePreflightPr(config);
-}
-function renderPreflightPrSection(pf) {
-  const lines = [
-    "## Pre-flight PR merge",
-    "",
-    "The orchestrator runs a **pre-flight PR merge sweep** before its",
-    "triage walk so already-approved, CI-green PRs land before the",
-    "unblock and queue-scan phases read dependency state. Without",
-    "pre-flight, an issue whose only remaining blocker is an approved",
-    "PR stuck behind a branch-protection delay shows up as blocked on",
-    "every dispatch cycle \u2014 the pipeline thrashes on stale dependency",
-    "state.",
-    ""
-  ];
-  if (!pf.enabled) {
-    lines.push(
-      "**Pre-flight is disabled for this project.** The orchestrator",
-      "skips the pre-flight sweep entirely; PR merges land via the",
-      "existing batch PR review step on housekeeping runs or via a",
-      "human operator. Enable pre-flight via",
-      "`AgentConfigOptions.preflightPr.enabled = true` once the repo",
-      "is comfortable with automated merges.",
-      ""
-    );
-    return lines.join("\n");
-  }
-  lines.push(
-    "### When pre-flight runs",
-    "",
-    "Pre-flight runs on **every orchestrator invocation** \u2014",
-    "both dispatch and housekeeping runs \u2014 immediately after Phase A",
-    "(Startup) and before any other phase reads issue or PR state. The",
-    "sweep is idempotent: `gh pr merge` on an already-merged PR is a",
-    "no-op, so re-running pre-flight on back-to-back invocations is",
-    "safe and cheap.",
-    "",
-    "### Eligibility",
-    "",
-    "A PR is eligible for a pre-flight merge when **all** of the",
-    "following hold:",
-    "",
-    "- PR is not draft and not closed.",
-    "- PR is `MERGEABLE` (no branch conflicts).",
-    "- Every required CI check has passed (`SUCCESS` or `SKIPPED`).",
-    "- PR carries at least one `APPROVED` review **or** auto-merge is",
-    "  already enabled on the PR.",
-    "- PR is not carrying `status:needs-attention`."
-  );
-  if (pf.requireLinkedIssue) {
-    lines.push(
-      "- PR body contains a `Closes #<n>` / `Fixes #<n>` / `Resolves`",
-      "  `#<n>` keyword referencing an open issue."
-    );
-  } else {
-    lines.push(
-      "- Linked-issue check is **disabled** for this project \u2014 PRs",
-      "  without a `Closes/Fixes/Resolves` keyword are eligible."
-    );
-  }
-  if (pf.eligibleLabels.length > 0) {
-    lines.push(
-      "- PR carries at least one of the following consumer-declared",
-      "  eligibility labels:",
-      "",
-      ...pf.eligibleLabels.map((label) => `  - \`${label}\``)
-    );
-  }
-  lines.push(
-    "",
-    "PRs that fail any criterion are skipped with a one-line",
-    "diagnostic and left for the `pr-reviewer` or a human operator to",
-    "handle on the normal review path.",
-    "",
-    "### Execution mode",
-    ""
-  );
-  if (pf.delegateToPrReviewer) {
-    lines.push(
-      "**Delegate mode (default).** The orchestrator invokes the",
-      "`pr-reviewer` sub-agent to run the pre-flight sweep. This",
-      "mirrors vortex's step 0b contract: the merge workflow runs on",
-      "its own (cheaper) model rather than consuming the orchestrator's",
-      "more expensive model budget for mechanical merges.",
-      "",
-      "The sub-agent returns a one-line structured summary as the last",
-      "line of its response:",
-      "",
-      "```",
-      "Merged <n> (#<list>), skipped <m> (#<pr> \u2014 <reason>), <k> eligible left.",
-      "```",
-      "",
-      "If the sub-agent's final line is missing, malformed, or",
-      "indicates an error, the orchestrator **does not retry** \u2014 it",
-      "proceeds to the next phase anyway. PR merges are idempotent at",
-      "GitHub, so the next orchestrator session re-runs pre-flight.",
-      "The only cost of a skipped sub-agent pass is that dependency",
-      "issues stay open one more cycle."
-    );
-  } else {
-    lines.push(
-      "**Inline mode.** The orchestrator performs the pre-flight merge",
-      "itself \u2014 it does **not** delegate to the `pr-reviewer`",
-      "sub-agent. Use this mode in repos that prefer a single-process",
-      "pipeline or that have not wired a `pr-reviewer` sub-agent.",
-      "",
-      `For each eligible PR, the orchestrator runs \`gh pr merge --${pf.mergeMethod}\``,
-      "with `--delete-branch` and re-confirms that the linked issue",
-      "closes (applying `status:done` if the auto-close did not fire)."
-    );
-  }
-  lines.push(
-    "",
-    "### Post-merge verification",
-    "",
-    "After each successful merge, the orchestrator re-reads the linked",
-    "issue state. When the merge commit did **not** auto-close the",
-    "issue (closing-keyword typos, linked-issue keyword dropped during",
-    "a rebase), the orchestrator closes the issue explicitly and",
-    "applies `status:done` so the downstream unblock loop sees the",
-    "dependency as resolved. This is the only way pre-flight prevents",
-    "the stale-dependency thrash \u2014 without the verification step a",
-    "merged-but-not-closed issue still reads as blocking to",
-    "`check-blocked.sh unblock`."
-  );
-  return lines.join("\n");
-}
-function renderPreflightPrShellHelpers(pf) {
-  const requireIssueFlag = pf.requireLinkedIssue ? "1" : "0";
-  const hasLabelFilter = pf.eligibleLabels.length > 0;
-  const lines = [
-    "# Scan open PRs and emit one eligibility line per PR in the",
-    "# canonical `PREFLIGHT_MERGE PR #<n> issue:#<m> branch:<b> \u2014",
-    '# "<title>"` / `PREFLIGHT_SKIP PR #<n> \u2014 <reason> \u2014 "<title>"` /',
-    "# `NO_PREFLIGHT_PRS` format. Orchestrator-side loops read this",
-    "# output and either merge the PR inline or delegate the sweep to",
-    "# the pr-reviewer sub-agent.",
-    "cmd_preflight() {",
-    '  if [[ "$PREFLIGHT_ENABLED" != "1" ]]; then',
-    '    echo "NO_PREFLIGHT_PRS"',
-    "    return 0",
-    "  fi",
-    "  local prs",
-    "  prs=$(gh pr list --state open --json number,title,isDraft,mergeable,headRefName,labels,body,reviewDecision,autoMergeRequest \\",
-    '    --limit 50 2>/dev/null || echo "[]")',
-    "",
-    "  local count",
-    `  count=$(echo "$prs" | jq 'length')`,
-    '  if [[ "$count" -eq 0 ]]; then',
-    '    echo "NO_PREFLIGHT_PRS"',
-    "    return 0",
-    "  fi",
-    "",
-    "  # Stage 1: filter in jq on purely structural fields (draft,",
-    "  # labels, linked-issue keyword). CI state lives outside the",
-    "  # list endpoint so it is checked per-PR below.",
-    "  local candidates",
-    `  candidates=$(echo "$prs" | jq -r --arg require_issue "$PREFLIGHT_REQUIRE_LINKED_ISSUE" '`,
-    "    .[] |",
-    "    select(.isDraft == false) |",
-    '    select(.labels | map(.name) | index("status:needs-attention") | not) |'
-  ];
-  if (hasLabelFilter) {
-    const jqArray = pf.eligibleLabels.map((label) => `"${label.replace(/"/g, '\\"')}"`).join(",");
-    lines.push(
-      `    select((.labels | map(.name)) as $names | [${jqArray}] | any(. as $l | $names | index($l))) |`
-    );
-  }
-  lines.push(
-    '    (.body | capture("(?:Closes|Fixes|Resolves) #(?<num>[0-9]+)"; "i") | .num) as $issue |',
-    '    select($require_issue == "0" or ($issue != null and $issue != "")) |',
-    '    "\\(.number)\\t\\(.title)\\t\\(.headRefName)\\t\\($issue // "")\\t\\(.mergeable // "UNKNOWN")\\t\\(.reviewDecision // "")\\t\\((.autoMergeRequest // null) != null)"',
-    "  ' 2>/dev/null)",
-    "",
-    '  if [[ -z "$candidates" ]]; then',
-    '    echo "NO_PREFLIGHT_PRS"',
-    "    return 0",
-    "  fi",
-    "",
-    "  local found_eligible=false",
-    "  while IFS=$'\\t' read -r pr_num title branch issue_num mergeable review_decision auto_merge; do",
-    '    [[ -z "$pr_num" ]] && continue',
-    "",
-    "    # Mergeable gate.",
-    '    if [[ "$mergeable" != "MERGEABLE" ]]; then',
-    '      echo "PREFLIGHT_SKIP PR #${pr_num} \u2014 not mergeable (${mergeable}) \u2014 \\"${title}\\""',
-    "      continue",
-    "    fi",
-    "",
-    "    # Approval gate: APPROVED review OR auto-merge already",
-    "    # enabled. Either signal means a human has signed off on the",
-    "    # change; pre-flight only needs to wait for CI + branch",
-    "    # protection to clear.",
-    '    if [[ "$review_decision" != "APPROVED" && "$auto_merge" != "true" ]]; then',
-    '      echo "PREFLIGHT_SKIP PR #${pr_num} \u2014 not approved and auto-merge not set \u2014 \\"${title}\\""',
-    "      continue",
-    "    fi",
-    "",
-    "    # CI gate. `gh pr checks` returns one row per check; anything",
-    "    # that is neither SUCCESS nor SKIPPED counts as failing or",
-    "    # pending.",
-    "    local failing_checks",
-    '    failing_checks=$(gh pr checks "$pr_num" --json name,state \\',
-    `      --jq '[.[] | select(.state != "SUCCESS" and .state != "SKIPPED")] | length' 2>/dev/null || echo "-1")`,
-    "",
-    '    if [[ "$failing_checks" == "-1" ]]; then',
-    '      echo "PREFLIGHT_SKIP PR #${pr_num} \u2014 could not read CI status \u2014 \\"${title}\\""',
-    "      continue",
-    "    fi",
-    "",
-    '    if [[ "$failing_checks" -gt 0 ]]; then',
-    '      echo "PREFLIGHT_SKIP PR #${pr_num} \u2014 ${failing_checks} CI check(s) not passing \u2014 \\"${title}\\""',
-    "      continue",
-    "    fi",
-    "",
-    "    # Linked-issue state gate. A PR whose linked issue is already",
-    "    # closed should not block pre-flight \u2014 skip it so the unblock",
-    "    # loop picks up the dependency. This path also fires when the",
-    "    # PR was merged but the closing keyword was dropped.",
-    '    if [[ -n "$issue_num" ]]; then',
-    "      local issue_state",
-    `      issue_state=$(gh issue view "$issue_num" --json state --jq '.state' 2>/dev/null || echo "UNKNOWN")`,
-    '      if [[ "$issue_state" == "CLOSED" ]]; then',
-    '        echo "PREFLIGHT_SKIP PR #${pr_num} \u2014 linked issue #${issue_num} already closed \u2014 \\"${title}\\""',
-    "        continue",
-    "      fi",
-    "    fi",
-    "",
-    "    found_eligible=true",
-    '    echo "PREFLIGHT_MERGE PR #${pr_num} issue:#${issue_num:-none} branch:${branch} \u2014 \\"${title}\\""',
-    '  done <<< "$candidates"',
-    "",
-    "  if ! $found_eligible; then",
-    '    echo "NO_PREFLIGHT_PRS"',
-    "  fi",
-    "}"
-  );
-  void requireIssueFlag;
-  return lines.join("\n");
-}
-function assertValidMergeMethod(value) {
-  if (!PREFLIGHT_MERGE_METHOD_VALUES.includes(value)) {
-    throw new Error(
-      `PreflightPrConfig.mergeMethod must be one of ${PREFLIGHT_MERGE_METHOD_VALUES.join(
-        " | "
-      )}; got ${JSON.stringify(value)}`
-    );
-  }
-}
-function assertValidEligibleLabels(labels) {
-  for (let i = 0; i < labels.length; i += 1) {
-    const label = labels[i];
-    if (typeof label !== "string" || label.trim().length === 0) {
-      throw new Error(
-        `PreflightPrConfig.eligibleLabels[${i}] must be a non-empty string; got ${JSON.stringify(
-          label
-        )}`
-      );
-    }
-  }
-}
-
 // src/agent/bundles/run-ratio.ts
 var DEFAULT_DISPATCH_TO_HOUSEKEEPING_RATIO = 4;
 var DEFAULT_STATE_FILE_PATH = ".state/orchestrator-runs.json";
@@ -11540,23 +11247,18 @@ function renderRunRatioSection(ratio) {
     "### Dispatch-run pipeline",
     "",
     "1. Phase A \u2014 startup (fetch + checkout default branch).",
-    "2. Phase B0 \u2014 pre-flight PR merge sweep (land approved,",
-    "   CI-green PRs before triage reads dependency state).",
-    "3. Phase C \u2014 triage unblock (resolve `Depends on:` chains).",
-    "4. Phase E \u2014 queue scan (pick the top `PICK` line, run the scope",
+    "2. Phase C \u2014 triage unblock (resolve `Depends on:` chains).",
+    "3. Phase E \u2014 queue scan (pick the top `PICK` line, run the scope",
     "   gate, emit `NEXT_WORK_ITEM`).",
-    "5. Phase F \u2014 cleanup.",
+    "4. Phase F \u2014 cleanup.",
     "",
     "### Housekeeping-run pipeline",
     "",
     "1. Phase A \u2014 startup.",
-    "2. Phase B0 \u2014 pre-flight PR merge sweep (same mechanics as the",
-    "   dispatch run; runs before the batch review so already-approved",
-    "   PRs land cleanly).",
-    "3. Phase B \u2014 batch PR review across every eligible open PR.",
-    "4. Phase D \u2014 maintenance scan (stale detection, orphaned branches,",
+    "2. Phase B \u2014 batch PR review across every eligible open PR.",
+    "3. Phase D \u2014 maintenance scan (stale detection, orphaned branches,",
     "   needs-attention summary).",
-    "5. Phase F \u2014 cleanup.",
+    "4. Phase F \u2014 cleanup.",
     "",
     "### Model recommendations",
     "",
@@ -11683,7 +11385,7 @@ var DEFAULT_SCHEDULED_TASK_ENTRIES = [
     recommendedModel: "sonnet",
     enabled: false,
     cron: null,
-    description: "End-to-end pipeline manager: pre-flight PR merge, triage, maintenance, queue scan, delegate the picked issue to the issue-worker, then cleanup."
+    description: "End-to-end pipeline manager: triage, maintenance, queue scan, delegate the picked issue to the issue-worker, then cleanup."
   },
   // Tier 1 — research.
   {
@@ -12111,10 +11813,33 @@ function renderPipelineSkillBody(task, lines) {
     "filter issues by `type:*` or phase label. Each invocation runs the",
     `target sub-agent's full end-to-end cycle exactly once.`,
     "",
-    `Run \`.claude/agents/${task.agent}.md\` and follow its workflow`,
-    "from start to finish. The sub-agent is responsible for picking the",
-    "next unit of work, delegating implementation to other workers as",
-    "needed, and exiting cleanly.",
+    "## Depth-0 execution contract",
+    "",
+    "**You \u2014 the scheduled-task session \u2014 are the pipeline manager.**",
+    "Do **not** spawn the target sub-agent via the `Agent` tool. The",
+    "Claude Code runtime forbids nested sub-agent spawning: a depth-1",
+    "sub-agent cannot invoke `Agent` to reach depth-2, so a pipeline",
+    "manager that delegates to other workers must run at depth-0 (this",
+    "scheduled-task session). See",
+    '<https://code.claude.com/docs/en/sub-agents> \u2014 *"Subagents cannot',
+    "spawn other subagents. If your workflow requires nested delegation,",
+    'use Skills or chain subagents from the main conversation."*',
+    "",
+    "Therefore:",
+    "",
+    `1. **Read \`.claude/agents/${task.agent}.md\` in this session** and`,
+    "   execute its phase pipeline directly. Treat the agent file as a",
+    "   workflow runbook the scheduled-task session follows step-by-step,",
+    "   not as a sub-agent to spawn.",
+    "2. **Use the `Agent` tool (with the `subagent_type` parameter set",
+    "   to the target worker name) to delegate one tier down.** From",
+    "   depth-0, you can spawn a depth-1 sub-agent (e.g. `issue-worker`,",
+    "   `pr-reviewer`) for the implementation, review, or merge step the",
+    "   pipeline calls out.",
+    "3. **Never spawn the pipeline manager itself as a sub-agent.** Do",
+    `   not call \`Agent(subagent_type: "${task.agent}", ...)\`. That`,
+    "   would put the pipeline manager at depth-1 and break every",
+    "   subsequent delegation step.",
     "",
     "## Recommended model",
     "",
@@ -12755,9 +12480,6 @@ function renderUnblockDependentsSection(ud) {
     "",
     "- The `pr-reviewer` sub-agent, Phase 5 (branch cleanup), after it",
     "  applies `status:done` to the linked issue on a successful merge.",
-    "- The `orchestrator` sub-agent, Phase B0 (pre-flight PR merge)",
-    "  post-merge verification, after it force-closes an issue whose",
-    "  merge commit dropped its closing keyword.",
     "",
     "Any other agent that manually applies `status:done` should call",
     "`unblock-dependents.sh <closed-issue>` as its last step. The",
@@ -13063,12 +12785,11 @@ function shellSingleQuote(value) {
 }
 
 // src/agent/bundles/orchestrator.ts
-function buildCheckBlockedScript(tiers, scopeGate, runRatio, preflight) {
+function buildCheckBlockedScript(tiers, scopeGate, runRatio) {
   const tierCase = renderAgentTierCaseStatement(tiers);
   const scopeHelper = renderScopeGateShellHelpers(scopeGate);
   const scopeHelperIndented = scopeHelper.split("\n").map((line) => line.length > 0 ? line : "").join("\n");
   const runRatioHelper = renderRunRatioShellHelpers(runRatio);
-  const preflightHelper = renderPreflightPrShellHelpers(preflight);
   return [
     "#!/usr/bin/env bash",
     "# check-blocked.sh \u2014 Token-efficient issue triage for agent loops.",
@@ -13083,7 +12804,6 @@ function buildCheckBlockedScript(tiers, scopeGate, runRatio, preflight) {
     "#   .claude/procedures/check-blocked.sh prs",
     "#   .claude/procedures/check-blocked.sh scope <issue-number>",
     "#   .claude/procedures/check-blocked.sh tick",
-    "#   .claude/procedures/check-blocked.sh preflight",
     "",
     "set -uo pipefail",
     "",
@@ -13098,10 +12818,6 @@ function buildCheckBlockedScript(tiers, scopeGate, runRatio, preflight) {
     `RUN_RATIO_ENABLED=${runRatio.enabled ? "1" : "0"}`,
     `RUN_RATIO_DISPATCH_PER_HOUSEKEEPING=${runRatio.ratio}`,
     `ORCHESTRATOR_STATE_FILE="${runRatio.stateFilePath}"`,
-    `PREFLIGHT_ENABLED=${preflight.enabled ? "1" : "0"}`,
-    `PREFLIGHT_REQUIRE_LINKED_ISSUE=${preflight.requireLinkedIssue ? "1" : "0"}`,
-    `PREFLIGHT_MERGE_METHOD="${preflight.mergeMethod}"`,
-    `PREFLIGHT_DELEGATE_TO_PR_REVIEWER=${preflight.delegateToPrReviewer ? "1" : "0"}`,
     "",
     "# \u2500\u2500 helpers \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500",
     "",
@@ -13134,8 +12850,6 @@ function buildCheckBlockedScript(tiers, scopeGate, runRatio, preflight) {
     "",
     runRatioHelper,
     "",
-    preflightHelper,
-    "",
     "# \u2500\u2500 subcommands \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500",
     "",
     "cmd_unblock() {",
@@ -13500,26 +13214,24 @@ function buildCheckBlockedScript(tiers, scopeGate, runRatio, preflight) {
     '  prs)       shift; cmd_prs "$@" ;;',
     '  scope)     shift; cmd_scope "$@" ;;',
     '  tick)      shift; cmd_tick "$@" ;;',
-    '  preflight) shift; cmd_preflight "$@" ;;',
     "  help|*)",
-    '    echo "Usage: check-blocked.sh <unblock|eligible|stale|orphaned|prs|scope|tick|preflight>"',
+    '    echo "Usage: check-blocked.sh <unblock|eligible|stale|orphaned|prs|scope|tick>"',
     "    exit 1",
     "    ;;",
     "esac"
   ].join("\n");
 }
-function buildCheckBlockedProcedure(tiers, scopeGate = resolveScopeGate(), runRatio = resolveRunRatio(), preflight = resolvePreflightPr()) {
+function buildCheckBlockedProcedure(tiers, scopeGate = resolveScopeGate(), runRatio = resolveRunRatio()) {
   return {
     name: "check-blocked.sh",
-    description: "Token-efficient issue triage script with subcommands: eligible, unblock, stale, orphaned, prs, scope, preflight, and (deprecated) tick. Sorts eligible issues by priority desc \u2192 funnel tier asc \u2192 issue number asc; the scope subcommand classifies a single issue against the scope-gate thresholds; the preflight subcommand emits one eligibility line per open PR that is mergeable, CI-green, approved (or auto-merge already enabled), and linked to an open issue. The tick subcommand is a deprecation no-op retained for one release (the orchestrator no longer maintains a dispatch/housekeeping run counter).",
-    content: buildCheckBlockedScript(tiers, scopeGate, runRatio, preflight)
+    description: "Token-efficient issue triage script with subcommands: eligible, unblock, stale, orphaned, prs, scope, and (deprecated) tick. Sorts eligible issues by priority desc \u2192 funnel tier asc \u2192 issue number asc; the scope subcommand classifies a single issue against the scope-gate thresholds. The tick subcommand is a deprecation no-op retained for one release (the orchestrator no longer maintains a dispatch/housekeeping run counter).",
+    content: buildCheckBlockedScript(tiers, scopeGate, runRatio)
   };
 }
 var checkBlockedProcedure = buildCheckBlockedProcedure(
   DEFAULT_AGENT_TIERS,
   resolveScopeGate(),
-  resolveRunRatio(),
-  resolvePreflightPr()
+  resolveRunRatio()
 );
 function buildUnblockDependentsProcedure(unblockDependents = resolveUnblockDependents()) {
   return {
@@ -13533,21 +13245,21 @@ var unblockDependentsProcedure = buildUnblockDependentsProcedure(
 );
 var orchestratorSubAgent = {
   name: "orchestrator",
-  description: "End-to-end pipeline manager that runs one full cycle every invocation: pre-flight PR merge \u2192 triage \u2192 maintenance \u2192 queue scan \u2192 delegate the picked issue to the issue-worker \u2192 cleanup",
+  description: "End-to-end pipeline manager that runs one full cycle every invocation: triage \u2192 maintenance \u2192 queue scan \u2192 delegate the picked issue to the issue-worker \u2192 cleanup",
   model: AGENT_MODEL.POWERFUL,
   maxTurns: 100,
-  canDelegateToAgents: ["issue-worker", "pr-reviewer"],
   platforms: { cursor: { exclude: true } },
   prompt: [
     "# Orchestrator Agent",
     "",
     "You are the pipeline orchestrator for the **{{repository.owner}}/{{repository.name}}** repository.",
-    "Each invocation runs **one full end-to-end cycle**. The cycle merges",
-    "approved PRs, triages blocked issues, runs maintenance scans, picks the",
-    "next ready issue, and **delegates implementation to the `issue-worker`**",
-    "sub-agent in scheduled mode. The orchestrator itself never implements",
-    "code, creates branches, or pushes commits \u2014 it routes work to other",
-    "agents.",
+    "Each invocation runs **one full end-to-end cycle**. The cycle triages",
+    "blocked issues, runs maintenance scans, picks the next ready issue, and",
+    "**delegates implementation to the `issue-worker`** sub-agent in scheduled",
+    "mode. The orchestrator itself never implements code, creates branches, or",
+    "pushes commits \u2014 it routes work to other agents. Approved-PR merging is",
+    "owned by the `pr-reviewer` sub-agent (invoked via `/review-pr` /",
+    "`/review-prs`); the orchestrator does not run a merge sweep.",
     "",
     "Run the phases below in order on every invocation. There is no",
     "dispatch/housekeeping fork \u2014 every phase runs every time.",
@@ -13555,20 +13267,23 @@ var orchestratorSubAgent = {
     "Phase ordering (each runs exactly once per invocation):",
     "",
     "1. **Phase A \u2014 Startup.** Pull the default branch.",
-    "2. **Phase B0 \u2014 Pre-flight PR Merge.** Land every eligible approved /",
-    "   CI-green PR before triage reads dependency state.",
-    "3. **Phase C \u2014 Triage / Unblock.** Flip dependents that have all",
+    "2. **Phase C \u2014 Triage / Unblock.** Flip dependents that have all",
     "   their dependencies closed back to `status:ready`.",
-    "4. **Phase D \u2014 Maintenance.** Stale-issue and orphaned-resource scan",
+    "3. **Phase D \u2014 Maintenance.** Stale-issue and orphaned-resource scan",
     "   plus a needs-attention summary.",
-    "5. **Phase E \u2014 Queue Scan.** Pick the highest-priority `PICK` line",
+    "4. **Phase E \u2014 Queue Scan.** Pick the highest-priority `PICK` line",
     "   and run the scope gate. If the result is `large`, flag and stop.",
-    "6. **Phase G \u2014 Delegate Implementation.** Hand the picked issue off",
+    "5. **Phase G \u2014 Delegate Implementation.** Hand the picked issue off",
     "   to the `issue-worker` sub-agent in scheduled mode. The worker",
     "   handles claim \u2192 branch \u2192 implement \u2192 commit \u2192 PR autonomously.",
-    "7. **Phase F \u2014 Cleanup.** Return to the default branch and log the",
+    "6. **Phase F \u2014 Cleanup.** Return to the default branch and log the",
     "   run summary.",
     "",
+    "Phase letters are stable identifiers \u2014 letters skipped in the list",
+    "above were used by earlier revisions of this pipeline and the gap",
+    "is left intentionally so existing references in commit history and",
+    "docs remain unambiguous.",
+    "",
     "---",
     "",
     ...PROJECT_CONTEXT_READER_SECTION,
@@ -13580,100 +13295,6 @@ var orchestratorSubAgent = {
     "git checkout main && git pull origin main",
     "```",
     "",
-    "## Phase B0: Pre-flight PR Merge",
-    "",
-    "Before any other phase reads dependency state, land every",
-    "eligible PR. The sweep is idempotent \u2014 `gh pr merge` on an",
-    "already-merged PR is a no-op \u2014 so re-running on back-to-back",
-    "invocations is safe.",
-    "",
-    "List eligibility:",
-    "",
-    "```bash",
-    ".claude/procedures/check-blocked.sh preflight",
-    "```",
-    "",
-    "Expect one line per open PR:",
-    "",
-    "```",
-    'PREFLIGHT_MERGE PR #<n> issue:#<m> branch:<b> \u2014 "<title>"',
-    'PREFLIGHT_SKIP PR #<n> \u2014 <reason> \u2014 "<title>"',
-    "NO_PREFLIGHT_PRS",
-    "```",
-    "",
-    "If the output is `NO_PREFLIGHT_PRS`, continue to Phase B / C.",
-    "",
-    "For each `PREFLIGHT_MERGE` line, either **delegate** to the",
-    "`pr-reviewer` sub-agent (default) or **merge inline** depending",
-    "on the rendered pre-flight config. See the **Pre-flight PR",
-    "merge** section in `CLAUDE.md` for the project's mode.",
-    "",
-    "**Delegate mode (default).** Invoke the `pr-reviewer` sub-agent",
-    "with a single-pass brief covering every `PREFLIGHT_MERGE` line:",
-    "",
-    "> Run your merge pipeline once across these PRs: <list of",
-    "> `#<n>` numbers>. Merge every eligible PR (linked issue still",
-    "> open, AC satisfied, CI green, approval present) and comment on",
-    "> any PR you skip. Return a one-line summary as the final line of",
-    "> your response, e.g. `Merged 2 (#123, #124), skipped 1 (#125 \u2014",
-    "> AC not met), 0 eligible left.` or `No eligible PRs.`",
-    "",
-    "If the sub-agent's final line is missing, malformed, or indicates",
-    "an error, **do not retry** \u2014 proceed to the next phase anyway.",
-    "The next orchestrator session will re-run pre-flight and pick up",
-    "anything left behind.",
-    "",
-    "**Inline mode.** For each `PREFLIGHT_MERGE PR #<n> issue:#<m>`",
-    "line, merge the PR with the configured method (default",
-    "`--squash`) and `--delete-branch`:",
-    "",
-    "```bash",
-    'gh pr merge <n> --squash --delete-branch --subject "<conventional-commit-title>" --body "<extended-description>"',
-    "```",
-    "",
-    "After every successful merge \u2014 whether delegated or inline \u2014 run",
-    "the post-merge verification step to close the stale-dependency",
-    "loop:",
-    "",
-    "```bash",
-    "gh issue view <m> --json state --jq '.state'",
-    "```",
-    "",
-    "If the linked issue's state is still `OPEN`, close it explicitly",
-    "and flip its status label to `status:done`:",
-    "",
-    "```bash",
-    "gh issue close <m>",
-    'gh issue edit <m> --remove-label "status:ready-for-review" --add-label "status:done"',
-    "```",
-    "",
-    "After applying `status:done` \u2014 whether the auto-close fired or",
-    "you force-closed above \u2014 run the targeted unblock sweep so any",
-    "dependents that were only waiting on issue `<m>` flip to",
-    "`status:ready` immediately:",
-    "",
-    "```bash",
-    ".claude/procedures/unblock-dependents.sh <m>",
-    "```",
-    "",
-    "The script emits one line per processed dependent",
-    "(`UNBLOCKED #<n>` / `STILL_BLOCKED #<n>` / `NO_DEPENDENTS #<m>`)",
-    "so the run summary records what transitioned. See the",
-    "**Agent-driven unblocking** section in `CLAUDE.md` for the full",
-    "contract.",
-    "",
-    "This step is the reason pre-flight exists: it prevents the",
-    "orchestrator from reading a merged-but-not-auto-closed issue as",
-    "still blocking on the next unblock sweep.",
-    "",
-    "Log the pre-flight outcome (number merged, PRs skipped with",
-    "reasons, and any issues force-closed) so the run summary records",
-    "what landed.",
-    "",
-    "Skip lines starting with `PREFLIGHT_SKIP` \u2014 those PRs failed one",
-    "or more eligibility checks. The `pr-reviewer` or a human",
-    "operator picks them up on the normal review path.",
-    "",
     "## Phase C: Triage \u2014 Unblock",
     "",
     "Check for blocked issues whose dependencies have resolved:",
@@ -13869,40 +13490,31 @@ var orchestratorSubAgent = {
     "git fetch --prune origin",
     "```",
     "",
-    "Log completion: phases executed, PRs merged in pre-flight, issues",
-    "unblocked, stale issues flagged, the next work item picked, and",
-    "the outcome of Phase G's delegation (worker success / failure /",
-    "skipped because the queue was empty).",
+    "Log completion: phases executed, issues unblocked, stale issues",
+    "flagged, the next work item picked, and the outcome of Phase G's",
+    "delegation (worker success / failure / skipped because the queue",
+    "was empty).",
     "",
     "---",
     "",
     "## Rules",
     "",
-    "1. **Never implement code.** You merge, triage, scan, and delegate \u2014 you do not code.",
+    "1. **Never implement code.** You triage, scan, and delegate \u2014 you do not code.",
     "2. **Never claim issues.** Do not add `status:in-progress` or create branches for issues. Phase G's `issue-worker` delegation is the only path that flips an issue's claim labels.",
-    "3. **Always use check-blocked.sh.** All triage queries go through the shell script for token efficiency.",
-    "4. **Follow CLAUDE.md conventions** for all git and gh operations.",
-    "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",
+    "3. **Never merge PRs.** Approved-PR merging is owned by the `pr-reviewer` sub-agent (invoked via `/review-pr` / `/review-prs`). The orchestrator does not run a merge sweep, does not call `gh pr merge`, and does not enable auto-merge.",
+    "4. **Always use check-blocked.sh.** All triage queries go through the shell script for token efficiency.",
+    "5. **Follow CLAUDE.md conventions** for all git and gh operations.",
+    "6. **Priority order:** critical > high > medium > low > trivial, then **funnel tier asc** (lower tier wins ties), then FIFO by issue number.",
+    "7. **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",
     "   handed a decomposition proposal \u2014 never claimed, never branched,",
     "   never delegated to the `issue-worker`.",
-    "7. **Always run pre-flight before reading dependency state.**",
-    "   Phase B0 (Pre-flight PR Merge) runs on every invocation,",
-    "   immediately after Phase A. Never skip Phase B0: without it, an",
-    "   issue whose only remaining blocker is an approved-but-not-yet-",
-    "   merged PR reads as blocked on every cycle and the pipeline",
-    "   thrashes. See the **Pre-flight PR merge** section in",
-    "   `CLAUDE.md` for eligibility rules and the delegate-vs-inline",
-    "   modes.",
     "8. **Sweep dependents whenever you apply `status:done`.** Every",
     "   `status:done` transition must be immediately followed by",
     "   `.claude/procedures/unblock-dependents.sh <n>` so downstream",
     "   `Depends on: #<n>` issues flip to `status:ready` without",
-    "   waiting for the next cycle. Phase B0's post-merge",
-    "   verification (and any inline-mode merge) already calls the",
-    "   sweep; don't skip it. See the **Agent-driven unblocking**",
+    "   waiting for the next cycle. See the **Agent-driven unblocking**",
     "   section in `CLAUDE.md` for the contract.",
     "9. **Always invoke `issue-worker` in scheduled mode.** Phase G's",
     "   delegation prompt must contain the literal phrase",
@@ -13916,8 +13528,7 @@ var issueWorkerSubAgent = {
   name: "issue-worker",
   description: "Selects the next ready issue from the queue, claims it, and implements the change end-to-end following repository conventions",
   model: AGENT_MODEL.POWERFUL,
-  maxTurns: 100,
-  canDelegateToAgents: [],
+  maxTurns: 150,
   platforms: { cursor: { exclude: true } },
   prompt: [
     "# Issue Worker",
@@ -14146,6 +13757,35 @@ var issueWorkerSubAgent = {
     "   `file` (and optional `line`). Track `comment_id` per item so you can",
     "   report which items were handled and which (if any) failed.",
     "",
+    "   **Synthetic rebase items.** A `comment_id` of",
+    "   `synthetic:rebase-behind-main` is the 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 this item only,",
+    "   the work is **not** an editorial change \u2014 it is a rebase plus",
+    "   conflict resolution. Run the following sequence:",
+    "",
+    "   ```bash",
+    "   git fetch origin",
+    "   git pull --rebase 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.",
+    "",
     "4. When complete, prepare a short structured report (PR number, commit",
     "   SHAs you will push, items handled by `comment_id`, items that failed",
     "   to apply) \u2014 you will return this after Phase 6.",
@@ -14207,6 +13847,22 @@ var issueWorkerSubAgent = {
     "git push origin <branch-name>",
     "```",
     "",
+    "**Synthetic-rebase items skip the `fix(review)` commit.** When the",
+    "fix-list contained a `comment_id` of `synthetic:rebase-behind-main`",
+    "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:",
+    "",
+    "```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",
+    "in Phase 4), then push once at the end.",
+    "",
     "**Normal mode:** Use conventional commit messages and push with `-u`",
     "to set up branch tracking:",
     "",
@@ -14340,15 +13996,21 @@ var ORCHESTRATOR_CONVENTIONS_PREAMBLE = [
   "",
   "When running the orchestrator agent (`.claude/agents/orchestrator.md`):",
   "",
-  "- The orchestrator runs **one full end-to-end cycle every invocation**: pre-flight PR merge \u2192 triage / unblock \u2192 maintenance \u2192 queue scan \u2192 delegate to `issue-worker` \u2192 cleanup",
-  "- The orchestrator **never** implements code, creates branches, or pushes commits \u2014 it merges PRs, triages issues, picks the next work item, and delegates implementation to other sub-agents",
+  "- The orchestrator runs **one full end-to-end cycle every invocation**: triage / unblock \u2192 maintenance \u2192 queue scan \u2192 delegate to `issue-worker` \u2192 cleanup",
+  "- The orchestrator **never** implements code, creates branches, pushes commits, **or merges PRs** \u2014 it triages issues, picks the next work item, and delegates implementation to other sub-agents. Approved-PR merging is owned by the `pr-reviewer` sub-agent (invoked via `/review-pr` / `/review-prs`).",
   "- All triage queries use `.claude/procedures/check-blocked.sh` for token efficiency",
   "- The queue scan reads only `priority:*` and `status:*` labels \u2014 type-routing (which typed agent handles a given `type:*` label) is the `issue-worker`'s concern, not the orchestrator's. The orchestrator's funnel-tier sort is a tie-breaker on `priority:*`, not a routing decision.",
   "- Priority order: critical > high > medium > low > trivial, then **funnel tier asc** (lower tier wins ties), then FIFO by issue number",
   "- Stale thresholds: 72h for in-progress, 168h for blocked",
-  "- Flagged issues get `status:needs-attention` \u2014 they are not auto-reset"
+  "- Flagged issues get `status:needs-attention` \u2014 they are not auto-reset",
+  "",
+  "## Depth-0 invocation requirement",
+  "",
+  'The orchestrator agent **must run as the top-level (depth-0) session** when its Phase G needs to delegate work to the `issue-worker` sub-agent. The Claude Code harness forbids nested sub-agent spawning \u2014 *"Subagents cannot spawn other subagents. If your workflow requires nested delegation, use Skills or chain subagents from the main conversation."* (see <https://code.claude.com/docs/en/sub-agents>). If the orchestrator itself were spawned as a depth-1 sub-agent (e.g. via `Agent(subagent_type: "orchestrator")` from another session), the `Agent` tool needed to reach the `issue-worker` at depth-2 would not be available and Phase G would silently abort.',
+  "",
+  'Practical implication for scheduled-task wiring: the `worker-orchestrator` scheduled task\'s `SKILL.md` instructs the **scheduled-task session itself** to read `.claude/agents/orchestrator.md` and execute its phase pipeline in-session, then use the `Agent` tool to delegate the picked work item to `issue-worker` (depth-1). The scheduled task does **not** call `Agent(subagent_type: "orchestrator")` \u2014 that would put the orchestrator at depth-1 and break the chain.'
 ].join("\n");
-function buildOrchestratorConventionsContent(tiers, scopeGate = resolveScopeGate(), runRatio = resolveRunRatio(), preflight = resolvePreflightPr(), scheduledTasks = resolveScheduledTasks(), unblockDependents = resolveUnblockDependents()) {
+function buildOrchestratorConventionsContent(tiers, scopeGate = resolveScopeGate(), runRatio = resolveRunRatio(), scheduledTasks = resolveScheduledTasks(), unblockDependents = resolveUnblockDependents()) {
   return [
     ORCHESTRATOR_CONVENTIONS_PREAMBLE,
     "",
@@ -14358,18 +14020,15 @@ function buildOrchestratorConventionsContent(tiers, scopeGate = resolveScopeGate
     "",
     renderRunRatioSection(runRatio),
     "",
-    renderPreflightPrSection(preflight),
-    "",
     renderScheduledTasksSection(scheduledTasks),
     "",
     renderUnblockDependentsSection(unblockDependents)
   ].join("\n");
 }
-function resolveOrchestratorAssets(tierConfig, scopeGateConfig, runRatioConfig, preflightPrConfig, scheduledTasksConfig, unblockDependentsConfig) {
+function resolveOrchestratorAssets(tierConfig, scopeGateConfig, runRatioConfig, scheduledTasksConfig, unblockDependentsConfig) {
   const tiers = resolveAgentTiers(tierConfig);
   const scopeGate = resolveScopeGate(scopeGateConfig);
   const runRatio = resolveRunRatio(runRatioConfig);
-  const preflight = resolvePreflightPr(preflightPrConfig);
   const scheduledTasks = resolveScheduledTasks(scheduledTasksConfig);
   const unblockDependentsResolved = resolveUnblockDependents(
     unblockDependentsConfig
@@ -14378,23 +14037,16 @@ function resolveOrchestratorAssets(tierConfig, scopeGateConfig, runRatioConfig,
     tiers,
     scopeGate,
     runRatio,
-    preflight,
     scheduledTasks,
     unblockDependents: unblockDependentsResolved,
     conventionsContent: buildOrchestratorConventionsContent(
       tiers,
       scopeGate,
       runRatio,
-      preflight,
       scheduledTasks,
       unblockDependentsResolved
     ),
-    procedure: buildCheckBlockedProcedure(
-      tiers,
-      scopeGate,
-      runRatio,
-      preflight
-    ),
+    procedure: buildCheckBlockedProcedure(tiers, scopeGate, runRatio),
     unblockDependentsProcedure: buildUnblockDependentsProcedure(
       unblockDependentsResolved
     )
@@ -14408,13 +14060,12 @@ var orchestratorBundle = {
   rules: [
     {
       name: "orchestrator-conventions",
-      description: "Guidelines for orchestrator agent behavior and pipeline management, including the funnel-tier dispatch sort, scope gate, pre-flight PR merge contract, and per-agent scheduled-task layout",
+      description: "Guidelines for orchestrator agent behavior and pipeline management, including the funnel-tier dispatch sort, scope gate, and per-agent scheduled-task layout",
       scope: AGENT_RULE_SCOPE.ALWAYS,
       content: buildOrchestratorConventionsContent(
         DEFAULT_AGENT_TIERS,
         resolveScopeGate(),
         resolveRunRatio(),
-        resolvePreflightPr(),
         resolveScheduledTasks(),
         resolveUnblockDependents()
       ),
@@ -16151,6 +15802,162 @@ var prReviewerSubAgent = {
     "`feat(scope): description`). The body should bullet the changes and end",
     "with `Closes #<issue-number>`.",
     "",
+    "##### Update the branch when `mergeStateStatus` is `BEHIND`",
+    "",
+    "After enabling auto-merge, re-read the PR's `mergeStateStatus` so a",
+    "branch that fell behind the default branch lands on the next CI tick",
+    "instead of sitting in the auto-merge queue indefinitely:",
+    "",
+    "```bash",
+    "gh pr view <pr-number> --json mergeStateStatus --jq '.mergeStateStatus'",
+    "```",
+    "",
+    "When the value is `BEHIND`, attempt to bring the head branch current with",
+    "the default branch via `gh pr update-branch` (default merge strategy \u2014",
+    "**never** `--rebase`, which would rewrite commits on a published branch):",
+    "",
+    "```bash",
+    "gh pr update-branch <pr-number>",
+    "```",
+    "",
+    "Branch on the outcome:",
+    "",
+    "- **Success** \u2014 record `Branch updated: yes` for the per-PR report and",
+    "  stop. Auto-merge will fire when required checks pass on the new head",
+    "  SHA. Do **not** poll for the merge here \u2014 Phase 5 owns polling.",
+    "- **Failure for reasons other than a merge conflict** (permission",
+    "  denied, branch protection refusing the merge commit, transient",
+    "  network error) \u2014 record `Branch updated: failed (<reason>)`, post a",
+    "  short comment explaining the failure, and stop. Do not retry.",
+    "- **Failure because the merge would conflict** \u2014 proceed to the",
+    "  conflict-resolution delegation flow below.",
+    "",
+    "When `mergeStateStatus` is **not** `BEHIND` (`CLEAN`, `BLOCKED`,",
+    "`UNSTABLE`, `HAS_HOOKS`, `UNKNOWN`), record `Branch updated: not needed`",
+    "and skip the rest of this sub-section. Only the `BEHIND` state triggers",
+    "an `update-branch` attempt \u2014 every other state either has nothing to do",
+    "or is already gated on a different signal that Phase 5 picks up.",
+    "",
+    "Never run `gh pr update-branch` on a PR whose review mode is",
+    "`human-required`. Pushing main into a human-required PR expands the",
+    "scope of the diff the human is reviewing without their consent. The",
+    "`update-branch` step lives **only** under the `Mode auto-merge` branch",
+    "of this phase \u2014 `human-required` skips straight to its hand-off block",
+    "below.",
+    "",
+    "##### 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`.",
+    "",
+    "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.",
+    "",
+    "1. **Review mode is `auto-merge`.** Never delegate conflict",
+    "   resolution on `human-required` PRs \u2014 pushing main resolutions into",
+    "   them expands the diff the human is reviewing. (This is the same",
+    "   reason the `update-branch` step itself is auto-merge-only.)",
+    "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.",
+    "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:",
+    "    - `**/*.lock` and `pnpm-lock.yaml` / `yarn.lock` / `package-lock.json`",
+    "    - `**/.projen/**`",
+    "    - any file whose first 5 lines contain the marker",
+    "      `~~ Generated by projen` or `// Generated by`.",
+    "   The lockfile guard exists because lockfile conflicts often need a",
+    "   regen (`pnpm i`) rather than a textual merge; the projen / generated",
+    "   guard exists because those files are derived from `.projenrc.ts`",
+    "   and conflicts there should be resolved by re-running synth, not by",
+    "   merging the conflict markers.",
+    "",
+    "When every guard above passes, hand off to `issue-worker` with a",
+    "**single synthetic fix-list item** that describes the rebase work:",
+    "",
+    "1. **Disable auto-merge** so a fast CI pass cannot land the PR",
+    "   mid-delegation (idempotent \u2014 safe no-op when auto-merge was never",
+    "   enabled). This mirrors step (b) of the in-scope-fix flow:",
+    "",
+    "   ```bash",
+    "   gh pr merge <pr-number> --disable-auto",
+    "   ```",
+    "",
+    "2. **Acquire the `review:fixing` lease** by adding the label",
+    "   (mirrors step (c) of the in-scope-fix flow). On contention, abort",
+    "   the delegation and fall through to the fallback:",
+    "",
+    "   ```bash",
+    "   gh pr edit <pr-number> --add-label 'review:fixing'",
+    "   ```",
+    "",
+    "3. **Post a fix-list comment** containing exactly one synthetic item",
+    "   describing the rebase. The `comment_id` is the literal string",
+    "   `synthetic:rebase-behind-main` so the worker recognises the",
+    "   special case and the next reviewer pass can identify the item:",
+    "",
+    "   ```markdown",
+    "   ## Reviewer: fix list for @issue-worker",
+    "",
+    "   - [ ] @reviewer \u2014 rebase onto origin/<default-branch> and resolve conflicts in: <space-separated list of conflicting files>",
+    "",
+    "   ```json fix-list",
+    "   {",
+    '     "pr": <pr-number>,',
+    '     "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."}',
+    "     ]",
+    "   }",
+    "   ```",
+    "   ```",
+    "",
+    "4. **Invoke `issue-worker` in feedback mode** with the same prompt",
+    "   shape used by the in-scope-fix flow: include the literal phrase",
+    "   `feedback mode: PR #<n>` plus the repository identifier",
+    "   (`{{repository.owner}}/{{repository.name}}`).",
+    "",
+    "5. **Process the worker's report** for the synthetic item using the",
+    "   same logic as step (f) of the in-scope-fix flow \u2014 `handled` reacts",
+    "   `rocket` on the fix-list comment; `failed` reacts `thinking_face`",
+    "   and posts a reply citing the worker's failure reason.",
+    "",
+    "6. **Release the `review:fixing` lease** with",
+    "   `gh pr edit <pr-number> --remove-label 'review:fixing'`. Always",
+    "   run this step.",
+    "",
+    "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.",
+    "",
+    "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 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>)`.",
+    "",
+    "```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.'",
+    "```",
+    "",
     "#### Mode `human-required`",
     "",
     "Do **not** run `gh pr merge --auto`. Instead, hand the PR off to a",
@@ -16341,6 +16148,7 @@ var prReviewerSubAgent = {
     "  - Nitpick: <items>",
     "",
     "Action taken: <enable-auto-merge | label-awaiting-human | commented-on-the-pr | none>",
+    "Branch updated: <yes | not needed | failed (<reason>) | delegated (PR #<n>) | n/a>",
     "Branch state: <merged | open | closed>",
     "Issue state: <closed | open>",
     "```",
@@ -16406,7 +16214,23 @@ var prReviewerSubAgent = {
     "    `review:awaiting-human` label is **not** present on the PR. Any",
     "    AC-drift pushback, any failed-fix pushback, and any human-required",
     "    hand-off all keep auto-merge disabled until the human resolves",
-    "    the underlying state."
+    "    the underlying state.",
+    "15. **Never run `gh pr update-branch` on a `human-required` PR.**",
+    "    Pushing main into a human-required PR expands the scope of the",
+    "    diff the human is reviewing without their consent. The",
+    "    `update-branch` step is gated to the `Mode auto-merge` branch of",
+    "    Phase 4 only. The same restriction applies to delegating",
+    "    conflict resolution to `issue-worker`: never delegate a rebase",
+    "    on a `human-required` PR.",
+    "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,",
+    "    a `**/.projen/**` file, or a file marked",
+    "    `~~ Generated by projen` / `// Generated by`, the reviewer must",
+    "    skip the `issue-worker` delegation and fall back to the comment",
+    "    pathway. Mechanical merge of generated content is unsafe \u2014 those",
+    "    files are derived from `.projenrc.ts` and must be regenerated,",
+    "    not merged."
   ].join("\n")
 };
 var reviewPrSkill = {
@@ -27518,12 +27342,6 @@ var ClaudeRenderer = class _ClaudeRenderer {
       if (agent.platforms?.claude?.memory) {
         lines.push(`memory: ${agent.platforms.claude.memory}`);
       }
-      if (agent.canDelegateToAgents && agent.canDelegateToAgents.length > 0) {
-        lines.push(`canDelegateToAgents:`);
-        for (const delegateName of agent.canDelegateToAgents) {
-          lines.push(`  - "${delegateName}"`);
-        }
-      }
       lines.push("---");
       lines.push("");
       lines.push(...agent.prompt.split("\n"));
@@ -27987,7 +27805,6 @@ var AgentConfig = class _AgentConfig extends import_projen8.Component {
     if (resolvedRunRatio.enabled) {
       this.project.gitignore.addPatterns(`/${resolvedRunRatio.stateFilePath}`);
     }
-    validatePreflightPrConfig(this.options.preflightPr);
     validateUnblockDependentsConfig(this.options.unblockDependents);
     const resolvedProgressFiles = validateProgressFilesConfig(
       this.options.progressFiles
@@ -28204,14 +28021,13 @@ ${section}`
         }
       }
     }
-    if (this.options.tiers || this.options.scopeGate || this.options.runRatio || this.options.preflightPr || this.options.scheduledTasks || this.options.unblockDependents) {
+    if (this.options.tiers || this.options.scopeGate || this.options.runRatio || this.options.scheduledTasks || this.options.unblockDependents) {
       const orchestratorRule = ruleMap.get("orchestrator-conventions");
       if (orchestratorRule) {
         const { conventionsContent } = resolveOrchestratorAssets(
           this.options.tiers,
           this.options.scopeGate,
           this.options.runRatio,
-          this.options.preflightPr,
           this.options.scheduledTasks,
           this.options.unblockDependents
         );
@@ -28526,14 +28342,13 @@ ${hook}`
         procMap.set(proc.name, proc);
       }
     }
-    if (this.options.tiers || this.options.scopeGate || this.options.runRatio || this.options.preflightPr) {
+    if (this.options.tiers || this.options.scopeGate || this.options.runRatio) {
       const existing = procMap.get("check-blocked.sh");
       if (existing) {
         const { procedure } = resolveOrchestratorAssets(
           this.options.tiers,
           this.options.scopeGate,
-          this.options.runRatio,
-          this.options.preflightPr
+          this.options.runRatio
         );
         if (procedure.content !== existing.content) {
           procMap.set("check-blocked.sh", procedure);
@@ -28548,7 +28363,6 @@ ${hook}`
           void 0,
           void 0,
           void 0,
-          void 0,
           this.options.unblockDependents
         );
         if (unblockDependentsProcedure2.content !== existing.content) {
@@ -30976,7 +30790,7 @@ var DEFAULT_AUTO_APPROVE_LABEL = "auto-approve";
 var DEFAULT_HEAD_BRANCH = "github-actions/upgrade";
 var DEFAULT_APPROVAL_APP_ID_SECRET = "APPROVAL_APP_ID";
 var DEFAULT_APPROVAL_APP_PRIVATE_KEY_SECRET = "APPROVAL_APP_PRIVATE_KEY";
-var DEFAULT_MERGE_METHOD2 = MERGE_METHODS.SQUASH;
+var DEFAULT_MERGE_METHOD = MERGE_METHODS.SQUASH;
 var PULL_REQUEST_TARGET_TYPES = [
   "labeled",
   "synchronize",
@@ -30990,7 +30804,7 @@ function addApproveMergeUpgradeWorkflow(project, options) {
   const allowedUsernames = options.allowedUsernames;
   const appIdSecret = options.approvalAppIdSecret ?? DEFAULT_APPROVAL_APP_ID_SECRET;
   const privateKeySecret = options.approvalAppPrivateKeySecret ?? DEFAULT_APPROVAL_APP_PRIVATE_KEY_SECRET;
-  const mergeMethod = options.mergeMethod ?? DEFAULT_MERGE_METHOD2;
+  const mergeMethod = options.mergeMethod ?? DEFAULT_MERGE_METHOD;
   const workflow = project.github?.addWorkflow(workflowName);
   if (!workflow) return;
   workflow.on({
@@ -32863,7 +32677,6 @@ var TypeScriptConfig = class extends import_projen23.Component {
   DEFAULT_API_EXTRACTOR_REPORT_FOLDER,
   DEFAULT_AUDIT_REPORT_DIR,
   DEFAULT_DECOMPOSITION_TEMPLATE,
-  DEFAULT_DELEGATE_TO_PR_REVIEWER,
   DEFAULT_DISPATCH_MODEL,
   DEFAULT_DISPATCH_TO_HOUSEKEEPING_RATIO,
   DEFAULT_HOUSEKEEPING_MODEL,
@@ -32873,7 +32686,6 @@ var TypeScriptConfig = class extends import_projen23.Component {
   DEFAULT_ISSUE_TEMPLATES_ENABLED,
   DEFAULT_ISSUE_TEMPLATES_PATH,
   DEFAULT_ISSUE_TEMPLATES_REQUIRE_REFERENCE,
-  DEFAULT_MERGE_METHOD,
   DEFAULT_OFF_PEAK_CRON_EXAMPLE,
   DEFAULT_PARTIAL_UNBLOCK_COMMENT_TEMPLATE,
   DEFAULT_PRIORITY_LABELS,
@@ -32883,7 +32695,6 @@ var TypeScriptConfig = class extends import_projen23.Component {
   DEFAULT_PROGRESS_FILES_FORMAT,
   DEFAULT_PROGRESS_FILES_STALE_AFTER_HOURS,
   DEFAULT_PROGRESS_FILES_STATE_DIR,
-  DEFAULT_REQUIRE_LINKED_ISSUE,
   DEFAULT_REQUIRE_PRODUCT_CONTEXT,
   DEFAULT_SAMPLE_COMPILER_OPTIONS,
   DEFAULT_SCHEDULED_TASKS_ROOT,
@@ -32915,7 +32726,6 @@ var TypeScriptConfig = class extends import_projen23.Component {
   MINIMUM_RELEASE_AGE,
   MONOREPO_LAYOUT,
   MonorepoProject,
-  PREFLIGHT_MERGE_METHOD_VALUES,
   PROD_DEPLOY_NAME,
   PROGRESS_FILES_FORMAT_VALUES,
   PnpmWorkspace,
@@ -33019,8 +32829,6 @@ var TypeScriptConfig = class extends import_projen23.Component {
   renderIssueTemplatesRuleContent,
   renderIssueTemplatesStarterPage,
   renderMeetingTypesSection,
-  renderPreflightPrSection,
-  renderPreflightPrShellHelpers,
   renderPriorityRulesSection,
   renderProgressFileName,
   renderProgressFilePath,
@@ -33053,7 +32861,6 @@ var TypeScriptConfig = class extends import_projen23.Component {
   resolveModelAlias,
   resolveOrchestratorAssets,
   resolveOutdirFromPackageName,
-  resolvePreflightPr,
   resolveProgressFiles,
   resolveRunRatio,
   resolveScheduledTasks,
@@ -33074,7 +32881,6 @@ var TypeScriptConfig = class extends import_projen23.Component {
   validateAgentTierConfig,
   validateIssueTemplatesConfig,
   validateMonorepoLayout,
-  validatePreflightPrConfig,
   validateProgressFilesConfig,
   validateRunRatioConfig,
   validateScheduledTasksConfig,