@codedrifters/configulator 0.0.355 → 0.0.357

package/lib/index.mjs

@@ -14721,6 +14721,7 @@ function buildCheckBlockedScript(tiers, scopeGate, _runRatio) {
     "#   .claude/procedures/check-blocked.sh eligible",
     "#   .claude/procedures/check-blocked.sh stale",
     "#   .claude/procedures/check-blocked.sh orphaned",
+    "#   .claude/procedures/check-blocked.sh lease-reconcile",
     "#   .claude/procedures/check-blocked.sh maintenance",
     "#   .claude/procedures/check-blocked.sh prs",
     "#   .claude/procedures/check-blocked.sh scope <issue-number>",
@@ -15049,21 +15050,181 @@ function buildCheckBlockedScript(tiers, scopeGate, _runRatio) {
     "  fi",
     "}",
     "",
+    "cmd_lease_reconcile() {",
+    "  # PR-lease auto-reconcile for the feedback-drain loop. Two stuck",
+    "  # states wedge a `review:fixing` PR despite the Phase B1 drain and",
+    "  # the atomic worker hand-off; this sweep clears both WITHOUT a human:",
+    "  #",
+    "  #   1. Orphaned lease \u2014 PR carries `review:fixing` but NOT",
+    "  #      `review:needs-worker`, the reviewer's fix-list comment is older",
+    "  #      than the stale in-progress threshold, and NO worker-report",
+    "  #      comment newer than the fix-list exists. A delegation was kicked",
+    "  #      off but no worker result ever landed.",
+    "  #   2. Consumed-but-uncleared wedge \u2014 PR still carries BOTH",
+    "  #      `review:needs-worker` AND `review:fixing`, but the branch HEAD",
+    "  #      commit is NEWER than the fix-list comment and there is NO",
+    "  #      worker-report. The worker did the work and pushed, then skipped",
+    "  #      the hand-off, so the marker that the lease-without-marker",
+    "  #      confirm trigger keys on was never cleared.",
+    "  #",
+    "  # AUDIT TRAIL / SAFETY: neither state is silently force-released.",
+    "  #   - Orphaned lease \u2192 RE-APPLY `review:needs-worker` (not a",
+    "  #     `status:needs-attention` flag) so the Phase B1 consume loop",
+    "  #     retries the delegation autonomously, AND post a synthetic note",
+    "  #     comment recording the re-arm. Re-arming (rather than flagging",
+    "  #     for a human) is the autonomy-preserving choice the issue's",
+    "  #     never-silently-force-released AC calls for: the lease itself is",
+    "  #     left untouched (so the loop stays idempotent), only the durable",
+    "  #     work marker is restored, and the note comment is the audit",
+    "  #     trail proving the re-arm was deliberate.",
+    "  #   - Consumed-but-uncleared \u2192 REMOVE `review:needs-worker` (the",
+    "  #     hand-off the worker skipped) and post a synthetic reconcile note",
+    "  #     comment, flipping the PR into the lease-without-marker state the",
+    "  #     reviewer's confirm pass keys on so it can merge. The",
+    "  #     `review:fixing` lease is left for that confirm pass to release,",
+    "  #     mirroring complete-feedback-handoff.sh.",
+    "  #",
+    "  # Signals (all read via gh/jq):",
+    "  #   - fix-list comment: the reviewer's most recent PR comment whose",
+    "  #     body contains the stable heading `## Reviewer: fix list for",
+    "  #     @issue-worker`. Its createdAt is the lease's reference time.",
+    "  #   - worker-report comment: the most recent PR comment whose body",
+    "  #     contains the stable HTML marker",
+    "  #     `<!-- issue-worker feedback hand-off \u2014 review:needs-worker",
+    "  #     cleared -->` posted by complete-feedback-handoff.sh. Presence +",
+    "  #     createdAt newer than the fix-list means a result landed.",
+    "  #   - branch HEAD: the PR head commit committedDate, compared against",
+    "  #     the fix-list createdAt to detect a push that advanced past the",
+    "  #     delegation without a hand-off.",
+    "",
+    "  local orphaned_count=0",
+    "  local consumed_uncleared_count=0",
+    "",
+    "  # Enumerate every open PR carrying the `review:fixing` lease \u2014 both",
+    "  # stuck states require it. One API call; the per-PR comment/commit",
+    "  # reads happen only for this (typically tiny) candidate set.",
+    "  local fixing_prs",
+    '  fixing_prs=$(gh pr list --state open --label "review:fixing" \\',
+    '    --json number,labels,headRefOid --limit 50 2>/dev/null || echo "[]")',
+    "",
+    "  local fixing_count",
+    `  fixing_count=$(echo "$fixing_prs" | jq 'length' 2>/dev/null || echo 0)`,
+    '  if [[ "${fixing_count:-0}" -eq 0 ]]; then',
+    '    echo "LEASE_RECONCILE orphaned=0 consumed_uncleared=0"',
+    "    return 0",
+    "  fi",
+    "",
+    "  # Stale threshold timestamp (UTC), reusing the same",
+    "  # STALE_IN_PROGRESS_HOURS=72 constant the stale-issue scan applies.",
+    "  local lease_threshold",
+    "  lease_threshold=$(date -u -v-${STALE_IN_PROGRESS_HOURS}H +%Y-%m-%dT%H:%M:%S 2>/dev/null \\",
+    '    || date -u -d "${STALE_IN_PROGRESS_HOURS} hours ago" +%Y-%m-%dT%H:%M:%S 2>/dev/null)',
+    "",
+    "  local pr_rows",
+    `  pr_rows=$(echo "$fixing_prs" | jq -r '`,
+    "    .[] |",
+    '    (.labels | map(.name) | index("review:needs-worker") != null) as $has_marker |',
+    '    "\\(.number)\\t\\($has_marker)\\t\\(.headRefOid)"',
+    "  ' 2>/dev/null)",
+    "",
+    "  while IFS=$'\\t' read -r pr_num has_marker head_oid; do",
+    '    [[ -z "$pr_num" ]] && continue',
+    "",
+    "    # Pull the PR comments once; derive both the fix-list reference time",
+    "    # and the newest worker-report time from the same payload.",
+    "    local comments",
+    '    comments=$(gh pr view "$pr_num" --json comments \\',
+    `      --jq '.comments' 2>/dev/null || echo "[]")`,
+    "",
+    "    # Newest fix-list comment createdAt (empty if none found).",
+    "    local fixlist_at",
+    `    fixlist_at=$(echo "$comments" | jq -r '`,
+    '      [.[] | select(.body | contains("## Reviewer: fix list for @issue-worker"))]',
+    `      | sort_by(.createdAt) | last | .createdAt // ""' 2>/dev/null)`,
+    "",
+    "    # Newest worker-report createdAt (empty if none found). Keyed off the",
+    "    # stable HTML marker complete-feedback-handoff.sh embeds.",
+    "    local report_at",
+    `    report_at=$(echo "$comments" | jq -r '`,
+    '      [.[] | select(.body | contains("issue-worker feedback hand-off \u2014 review:needs-worker cleared"))]',
+    `      | sort_by(.createdAt) | last | .createdAt // ""' 2>/dev/null)`,
+    "",
+    "    # No fix-list comment at all \u2014 we cannot reason about this lease",
+    "    # (e.g. a human applied `review:fixing` by hand). Leave it alone.",
+    '    if [[ -z "$fixlist_at" ]]; then',
+    "      continue",
+    "    fi",
+    "",
+    "    # A worker-report newer than the fix-list means a result landed; the",
+    "    # confirm pass owns it. Skip for BOTH states.",
+    '    if [[ -n "$report_at" && "$report_at" > "$fixlist_at" ]]; then',
+    "      continue",
+    "    fi",
+    "",
+    '    if [[ "$has_marker" == "true" ]]; then',
+    "      # \u2500\u2500 Consumed-but-uncleared wedge \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",
+    "      # Marker still set + no worker-report. Reconcile only when the",
+    "      # branch advanced past the fix-list (the worker pushed but skipped",
+    "      # the hand-off); otherwise this is a normal in-flight delegation.",
+    "      local head_at",
+    '      head_at=$(gh api "repos/{owner}/{repo}/commits/${head_oid}" \\',
+    `        --jq '.commit.committer.date // ""' 2>/dev/null || echo "")`,
+    '      if [[ -n "$head_at" && "$head_at" > "$fixlist_at" ]]; then',
+    '        if gh pr edit "$pr_num" --remove-label "review:needs-worker" >/dev/null 2>&1; then',
+    '          gh pr comment "$pr_num" \\',
+    '            --body "Maintenance reconcile: branch HEAD advanced past the reviewer fix-list with no worker hand-off \u2014 clearing the orphaned \\`review:needs-worker\\` marker so the reviewer confirm pass can merge. The \\`review:fixing\\` lease is left for that pass to release." >/dev/null 2>&1 || true',
+    '          echo "LEASE_CONSUMED_UNCLEARED PR #${pr_num} \u2014 cleared review:needs-worker (branch advanced past fix-list, no worker report)"',
+    "          consumed_uncleared_count=$((consumed_uncleared_count + 1))",
+    "        else",
+    '          echo "LEASE_RECONCILE_FAILED PR #${pr_num} \u2014 could not remove review:needs-worker"',
+    "        fi",
+    "      fi",
+    "    else",
+    "      # \u2500\u2500 Orphaned lease \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",
+    "      # `review:fixing` without `review:needs-worker`, no worker-report",
+    "      # newer than the fix-list. Reclaim only when the fix-list comment",
+    "      # is older than the stale threshold \u2014 a recently delegated PR may",
+    "      # still be mid-consume.",
+    '      local fixlist_trimmed="${fixlist_at%%+*}"',
+    '      fixlist_trimmed="${fixlist_trimmed%%Z*}"',
+    '      if [[ "$fixlist_trimmed" < "$lease_threshold" ]]; then',
+    '        if gh pr edit "$pr_num" --add-label "review:needs-worker" >/dev/null 2>&1; then',
+    '          gh pr comment "$pr_num" \\',
+    '            --body "Maintenance reconcile: \\`review:fixing\\` lease orphaned (fix-list older than ${STALE_IN_PROGRESS_HOURS}h with no worker report) \u2014 re-applying the \\`review:needs-worker\\` marker so the feedback-drain loop retries the delegation. This is a deliberate re-arm, not a silent force-release; the \\`review:fixing\\` lease is left untouched." >/dev/null 2>&1 || true',
+    '          echo "LEASE_ORPHANED PR #${pr_num} \u2014 re-applied review:needs-worker (fix-list stale, no worker report)"',
+    "          orphaned_count=$((orphaned_count + 1))",
+    "        else",
+    '          echo "LEASE_RECONCILE_FAILED PR #${pr_num} \u2014 could not re-apply review:needs-worker"',
+    "        fi",
+    "      fi",
+    "    fi",
+    '  done <<< "$pr_rows"',
+    "",
+    "  # Single summary line consumed by the orchestrator, matching the",
+    "  # MAINTENANCE_DONE convention.",
+    '  echo "LEASE_RECONCILE orphaned=${orphaned_count} consumed_uncleared=${consumed_uncleared_count}"',
+    "}",
+    "",
     "cmd_maintenance() {",
     "  # Phase D maintenance sweep: flag stale issues with",
     "  # `status:needs-attention`, count orphan branches/PRs (no",
-    "  # auto-deletion), and emit a single MAINTENANCE_DONE summary",
-    "  # line so the orchestrator never iterates raw stale/orphan",
-    "  # output. Mirrors the discipline of cmd_unblock \u2014 per-issue",
-    "  # informational lines (FLAGGED #N, ORPHAN_BRANCH \u2026) survive",
-    "  # for log visibility but are not load-bearing for the",
-    "  # orchestrator.",
+    "  # auto-deletion), auto-reconcile stuck PR leases (re-arm orphaned",
+    "  # leases / clear consumed-but-uncleared markers, see",
+    "  # cmd_lease_reconcile), and emit a MAINTENANCE_DONE summary line",
+    "  # plus a LEASE_RECONCILE summary line so the orchestrator never",
+    "  # iterates raw stale/orphan/lease output. Mirrors the discipline of",
+    "  # cmd_unblock \u2014 per-issue / per-PR informational lines (FLAGGED #N,",
+    "  # ORPHAN_BRANCH \u2026, LEASE_ORPHANED PR #N \u2026) survive for log",
+    "  # visibility but are not load-bearing for the orchestrator.",
     "  #",
     "  # SAFETY: this subcommand NEVER auto-resets stale issues to",
     "  # `status:ready`. It only adds `status:needs-attention`; the",
     "  # existing `status:in-progress` or `status:blocked` label",
     "  # stays in place so partial implementation work on a branch",
-    "  # remains visible to humans.",
+    "  # remains visible to humans. The PR-lease reconcile likewise never",
+    "  # silently force-releases a `review:fixing` lease \u2014 it re-arms the",
+    "  # work marker (orphaned) or clears the consumed marker (wedge) and",
+    "  # always posts an audit-trail note comment.",
     "",
     "  local flagged_stale_count=0",
     "  local flagged_blocked_count=0",
@@ -15134,14 +15295,40 @@ function buildCheckBlockedScript(tiers, scopeGate, _runRatio) {
     "    esac",
     '  done <<< "$orphan_output"',
     "",
+    "  # \u2500\u2500 PR-lease auto-reconcile (MUTATING \u2014 see cmd_lease_reconcile) \u2500\u2500",
+    "  # Run the lease sweep and surface its informational lines for log",
+    "  # visibility. cmd_lease_reconcile applies the label edits itself",
+    "  # (re-arm or clear `review:needs-worker`) and posts the audit-trail",
+    "  # note comment \u2014 mirroring how this maintenance sweep already",
+    "  # mutates issue labels directly. Its terminal LEASE_RECONCILE line is",
+    "  # captured and re-emitted alongside MAINTENANCE_DONE so the",
+    "  # orchestrator reads both summaries from one maintenance invocation.",
+    "  local lease_output",
+    "  lease_output=$(cmd_lease_reconcile)",
+    '  local lease_summary="LEASE_RECONCILE orphaned=0 consumed_uncleared=0"',
+    "",
+    "  while IFS= read -r line; do",
+    '    [[ -z "$line" ]] && continue',
+    '    case "$line" in',
+    "      'LEASE_RECONCILE '*)",
+    '        lease_summary="$line"',
+    "        ;;",
+    "      *)",
+    '        echo "$line"',
+    "        ;;",
+    "    esac",
+    '  done <<< "$lease_output"',
+    "",
     "  # \u2500\u2500 needs-attention total \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",
     "  local needs_attention_total",
     '  needs_attention_total=$(gh issue list --label "status:needs-attention" --state open \\',
     "    --json number --limit 100 2>/dev/null | jq 'length' 2>/dev/null || echo 0)",
     "  needs_attention_total=${needs_attention_total:-0}",
     "",
-    "  # Single summary line consumed by the orchestrator.",
+    "  # Two summary lines consumed by the orchestrator: the issue/orphan",
+    "  # MAINTENANCE_DONE line and the PR-lease LEASE_RECONCILE line.",
     '  echo "MAINTENANCE_DONE flagged_stale=${flagged_stale_count} flagged_blocked=${flagged_blocked_count} orphan_branches=${orphan_branches_count} orphan_prs=${orphan_prs_count} needs_attention_total=${needs_attention_total}"',
+    '  echo "$lease_summary"',
     "}",
     "",
     "cmd_prs() {",
@@ -15289,11 +15476,12 @@ function buildCheckBlockedScript(tiers, scopeGate, _runRatio) {
     '  eligible)    shift; cmd_eligible "$@" ;;',
     '  stale)       shift; cmd_stale "$@" ;;',
     '  orphaned)    shift; cmd_orphaned "$@" ;;',
+    '  lease-reconcile) shift; cmd_lease_reconcile "$@" ;;',
     '  maintenance) shift; cmd_maintenance "$@" ;;',
     '  prs)         shift; cmd_prs "$@" ;;',
     '  scope)       shift; cmd_scope "$@" ;;',
     "  help|*)",
-    '    echo "Usage: check-blocked.sh <unblock|eligible|stale|orphaned|maintenance|prs|scope>"',
+    '    echo "Usage: check-blocked.sh <unblock|eligible|stale|orphaned|lease-reconcile|maintenance|prs|scope>"',
     "    exit 1",
     "    ;;",
     "esac"
@@ -15302,7 +15490,7 @@ function buildCheckBlockedScript(tiers, scopeGate, _runRatio) {
 function buildCheckBlockedProcedure(tiers, scopeGate = resolveScopeGate(), runRatio = resolveRunRatio()) {
   return {
     name: "check-blocked.sh",
-    description: "Token-efficient issue triage script with subcommands: eligible, unblock, stale, orphaned, maintenance, prs, scope. 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 unblock subcommand applies the `status:blocked` \u2192 `status:ready` label flip itself, posts the canned unblock comment, and emits a single `TRIAGE_DONE unblocked=N still_blocked=M` summary line; the maintenance subcommand flags stale issues with `status:needs-attention` (never auto-resets to `status:ready`), counts orphan branches/PRs, and emits a single `MAINTENANCE_DONE flagged_stale=N flagged_blocked=M orphan_branches=A orphan_prs=B needs_attention_total=T` summary line.",
+    description: "Token-efficient issue triage script with subcommands: eligible, unblock, stale, orphaned, lease-reconcile, maintenance, prs, scope. 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 unblock subcommand applies the `status:blocked` \u2192 `status:ready` label flip itself, posts the canned unblock comment, and emits a single `TRIAGE_DONE unblocked=N still_blocked=M` summary line; the lease-reconcile subcommand auto-reconciles stuck `review:fixing` PR leases \u2014 re-applying `review:needs-worker` on an orphaned lease (fix-list stale, no worker report) so the Phase B1 drain retries, and removing `review:needs-worker` on a consumed-but-uncleared wedge (branch HEAD advanced past the fix-list, marker still set, no worker report) so the reviewer confirm pass can merge, always posting an audit-trail note comment and emitting a single `LEASE_RECONCILE orphaned=N consumed_uncleared=M` summary line; the maintenance subcommand flags stale issues with `status:needs-attention` (never auto-resets to `status:ready`), counts orphan branches/PRs, folds in the lease-reconcile sweep, and emits a `MAINTENANCE_DONE flagged_stale=N flagged_blocked=M orphan_branches=A orphan_prs=B needs_attention_total=T` summary line followed by the `LEASE_RECONCILE` line.",
     content: buildCheckBlockedScript(tiers, scopeGate, runRatio)
   };
 }
@@ -15324,56 +15512,289 @@ var unblockDependentsProcedure = buildUnblockDependentsProcedure(
 function buildPrSweepScript() {
   return [
     "#!/usr/bin/env bash",
-    "# pr-sweep.sh \u2014 Token-efficient PR-eligibility filter for the",
-    "# orchestrator's Phase B PR review sweep. Emits one summary line",
-    "# per open PR; the orchestrator reads only the PR numbers and",
-    "# dispatches `pr-reviewer` per eligible PR.",
+    "# pr-sweep.sh \u2014 Token-efficient PR enumeration for the orchestrator's",
+    "# PR-handling phases. Two modes:",
+    "#",
+    "#   review       (default) \u2014 Phase B PR review sweep. Emits one",
+    "#                 PR_ELIGIBLE / PR_SKIP line per open PR; the",
+    "#                 orchestrator dispatches `pr-reviewer` per eligible PR.",
+    "#   needs-worker \u2014 Phase B1 feedback-drain. Emits one DRAIN line per",
+    "#                 open PR carrying the `review:needs-worker` marker that",
+    "#                 is NOT already in-flight (no `review:fixing` lease),",
+    "#                 ordered highest-priority-first so the orchestrator",
+    "#                 dispatches `issue-worker` per PR to consume the",
+    "#                 reviewer's fix-list.",
     "#",
-    "# Skip rules:",
+    "# Review-mode skip rules:",
     "#   - isDraft = true                          \u2192 reason=draft",
     "#   - review:human-required label             \u2192 reason=human-required",
     "#   - review:awaiting-human label             \u2192 reason=awaiting-human",
     "#",
+    "# Needs-worker-mode skip rules (PR carries review:needs-worker but is",
+    "# not eligible to drain this cycle):",
+    "#   - review:fixing label present             \u2192 reason=in-flight",
+    "#     (a delegation is already being consumed; the marker plus the",
+    "#      lease means another worker is mid-run \u2014 skip to stay idempotent)",
+    "#",
     "# Usage:",
-    "#   .claude/procedures/pr-sweep.sh",
+    "#   .claude/procedures/pr-sweep.sh [review|needs-worker]",
     "",
     "set -uo pipefail",
     "",
-    "prs=$(gh pr list --state open --json number,isDraft,labels \\",
-    '  --limit 50 2>/dev/null || echo "[]")',
+    "# \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",
     "",
-    `count=$(echo "$prs" | jq 'length')`,
-    'if [[ "$count" -eq 0 ]]; then',
-    '  echo "NO_OPEN_PRS"',
-    "  exit 0",
-    "fi",
+    "# Resolve the linked issue's priority for a PR so the needs-worker",
+    "# drain can order highest-priority-first. Echoes a single sort key",
+    "# 0-5 (0 = critical \u2026 4 = trivial, 5 = no/unknown priority) so an",
+    "# unprioritised PR always sorts last but is never dropped.",
+    "priority_key_for_pr() {",
+    '  local pr_num="$1"',
+    "  local issue_num",
+    '  issue_num=$(gh pr view "$pr_num" --json body \\',
+    `    --jq '(.body | capture("(?:Closes|Fixes|Resolves) #(?<num>[0-9]+)") | .num) // ""' \\`,
+    '    2>/dev/null || echo "")',
+    '  if [[ -z "$issue_num" ]]; then',
+    '    echo "5"',
+    "    return",
+    "  fi",
+    "  local labels",
+    '  labels=$(gh issue view "$issue_num" --json labels \\',
+    `    --jq '.labels[].name' 2>/dev/null || echo "")`,
+    '  case "$labels" in',
+    '    *priority:critical*) echo "0" ;;',
+    '    *priority:high*)     echo "1" ;;',
+    '    *priority:medium*)   echo "2" ;;',
+    '    *priority:low*)      echo "3" ;;',
+    '    *priority:trivial*)  echo "4" ;;',
+    '    *)                   echo "5" ;;',
+    "  esac",
+    "}",
     "",
-    "# Emit one PR_ELIGIBLE / PR_SKIP line per open PR, sorted by PR",
-    "# number ascending so the order is deterministic across runs.",
-    `echo "$prs" | jq -r '`,
-    "  sort_by(.number) |",
-    "  .[] |",
-    "  (.labels | map(.name)) as $labels |",
-    "  if .isDraft then",
-    '    "PR_SKIP #\\(.number) reason=draft"',
-    '  elif ($labels | index("review:human-required")) then',
-    '    "PR_SKIP #\\(.number) reason=human-required"',
-    '  elif ($labels | index("review:awaiting-human")) then',
-    '    "PR_SKIP #\\(.number) reason=awaiting-human"',
-    "  else",
-    '    "PR_ELIGIBLE #\\(.number)"',
-    "  end",
-    "'"
+    "# \u2500\u2500 modes \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\u2500\u2500",
+    "",
+    "cmd_review() {",
+    "  local prs",
+    "  prs=$(gh pr list --state open --json number,isDraft,labels \\",
+    '    --limit 50 2>/dev/null || echo "[]")',
+    "",
+    "  local count",
+    `  count=$(echo "$prs" | jq 'length')`,
+    '  if [[ "$count" -eq 0 ]]; then',
+    '    echo "NO_OPEN_PRS"',
+    "    return 0",
+    "  fi",
+    "",
+    "  # Emit one PR_ELIGIBLE / PR_SKIP line per open PR, sorted by PR",
+    "  # number ascending so the order is deterministic across runs.",
+    `  echo "$prs" | jq -r '`,
+    "    sort_by(.number) |",
+    "    .[] |",
+    "    (.labels | map(.name)) as $labels |",
+    "    if .isDraft then",
+    '      "PR_SKIP #\\(.number) reason=draft"',
+    '    elif ($labels | index("review:human-required")) then',
+    '      "PR_SKIP #\\(.number) reason=human-required"',
+    '    elif ($labels | index("review:awaiting-human")) then',
+    '      "PR_SKIP #\\(.number) reason=awaiting-human"',
+    "    else",
+    '      "PR_ELIGIBLE #\\(.number)"',
+    "    end",
+    "  '",
+    "}",
+    "",
+    "cmd_needs_worker() {",
+    "  # Phase B1 feedback-drain: enumerate open PRs carrying the durable",
+    "  # `review:needs-worker` marker that are NOT already in-flight (no",
+    "  # `review:fixing` lease), ordered highest-priority-first so the",
+    "  # orchestrator dispatches `issue-worker` per PR to consume the",
+    "  # reviewer's fix-list. A PR holding both labels is a delegation",
+    "  # mid-flight \u2014 it is skipped (reason=in-flight) so the drain stays",
+    "  # idempotent and respects the cross-session lease semantics.",
+    "  local prs",
+    "  prs=$(gh pr list --state open --label 'review:needs-worker' \\",
+    '    --json number,labels --limit 50 2>/dev/null || echo "[]")',
+    "",
+    "  local count",
+    `  count=$(echo "$prs" | jq 'length')`,
+    '  if [[ "$count" -eq 0 ]]; then',
+    '    echo "NO_NEEDS_WORKER_PRS"',
+    "    return 0",
+    "  fi",
+    "",
+    "  # First pass: split into skip (in-flight) and drain-candidate sets.",
+    "  # The skip lines are emitted immediately for log visibility; the",
+    "  # candidates are resolved to a priority key and sorted before",
+    "  # emission so the orchestrator drains highest-priority first.",
+    "  local candidates",
+    `  candidates=$(echo "$prs" | jq -r '`,
+    "    sort_by(.number) |",
+    "    .[] |",
+    "    (.labels | map(.name)) as $labels |",
+    '    if ($labels | index("review:fixing")) then',
+    '      "SKIP\\t\\(.number)"',
+    "    else",
+    '      "DRAIN\\t\\(.number)"',
+    "    end",
+    "  ')",
+    "",
+    '  local drain_rows=""',
+    '  local emitted_any=""',
+    "  while IFS=$'\\t' read -r kind pr_num; do",
+    '    [[ -z "$pr_num" ]] && continue',
+    '    if [[ "$kind" == "SKIP" ]]; then',
+    '      echo "PR_SKIP #${pr_num} reason=in-flight"',
+    '      emitted_any="1"',
+    "      continue",
+    "    fi",
+    "    # DRAIN candidate \u2014 resolve the linked issue's priority so the",
+    "    # drain order is highest-priority-first, tie-broken by PR number",
+    "    # ascending (FIFO, mirroring the queue scan's number-asc tie-break).",
+    "    local pkey",
+    '    pkey=$(priority_key_for_pr "$pr_num")',
+    '    drain_rows="${drain_rows}${pkey}\\t${pr_num}\\n"',
+    '  done <<< "$candidates"',
+    "",
+    '  if [[ -n "$drain_rows" ]]; then',
+    "    # Sort by priority key asc \u2192 PR number asc, then emit one",
+    "    # PR_DRAIN line per PR in that order.",
+    `    printf '%b' "$drain_rows" \\`,
+    "      | sort -t$'\\t' -k1,1n -k2,2n \\",
+    "      | while IFS=$'\\t' read -r _pkey pr_num; do",
+    '          [[ -z "$pr_num" ]] && continue',
+    '          echo "PR_DRAIN #${pr_num}"',
+    "        done",
+    '    emitted_any="1"',
+    "  fi",
+    "",
+    '  if [[ -z "$emitted_any" ]]; then',
+    '    echo "NO_NEEDS_WORKER_PRS"',
+    "  fi",
+    "}",
+    "",
+    "# \u2500\u2500 main \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\u2500\u2500\u2500",
+    "",
+    'case "${1:-review}" in',
+    '  review)       shift || true; cmd_review "$@" ;;',
+    '  needs-worker) shift || true; cmd_needs_worker "$@" ;;',
+    "  *)",
+    '    echo "Usage: pr-sweep.sh <review|needs-worker>" >&2',
+    "    exit 1",
+    "    ;;",
+    "esac"
   ].join("\n");
 }
 function buildPrSweepProcedure() {
   return {
     name: "pr-sweep.sh",
-    description: "Token-efficient PR-eligibility filter for the orchestrator's Phase B PR review sweep. Emits one `PR_ELIGIBLE #<n>` or `PR_SKIP #<n> reason=<draft|human-required|awaiting-human>` line per open PR; the orchestrator reads only the eligible numbers and dispatches `pr-reviewer` per eligible PR.",
+    description: "Token-efficient PR enumeration for the orchestrator. In `review` mode (default) it emits one `PR_ELIGIBLE #<n>` or `PR_SKIP #<n> reason=<draft|human-required|awaiting-human>` line per open PR so the orchestrator dispatches `pr-reviewer` per eligible PR. In `needs-worker` mode it lists open PRs carrying the `review:needs-worker` marker that are not already in-flight (skipping any holding the `review:fixing` lease as `reason=in-flight`), emitting `PR_DRAIN #<n>` lines ordered highest-priority-first so the orchestrator drains the feedback queue by dispatching `issue-worker` per PR; `NO_NEEDS_WORKER_PRS` when none.",
     content: buildPrSweepScript()
   };
 }
 var prSweepProcedure = buildPrSweepProcedure();
+function buildCompleteFeedbackHandoffScript() {
+  return [
+    "#!/usr/bin/env bash",
+    "# complete-feedback-handoff.sh \u2014 Atomic feedback-mode hand-off for the",
+    "# issue-worker (Phase 6.5). Posts the structured worker-report comment",
+    "# AND removes the `review:needs-worker` marker in ONE invocation,",
+    "# exiting non-zero on any failure so a successful push can never land",
+    "# without the hand-off completing.",
+    "#",
+    "# The marker is cleared even when some (or all) fix-list items failed \u2014",
+    "# a partial result is reported per-item but must not wedge the PR. The",
+    "# `review:fixing` lease is left in place for the reviewer's confirm pass.",
+    "#",
+    "# Usage:",
+    "#   complete-feedback-handoff.sh <pr-number> <commit-sha> <items-json>",
+    "#",
+    "#   <items-json> \u2014 JSON array of per-item outcomes keyed by the",
+    "#     fix-list `comment_id`:",
+    '#       [{"comment_id":"IC_abc","outcome":"applied","detail":""},',
+    '#        {"comment_id":"IC_def","outcome":"failed","detail":"reason"}]',
+    "#     `outcome` is `applied` or `failed`.",
+    "",
+    "set -uo pipefail",
+    "",
+    'pr_number="${1:-}"',
+    'commit_sha="${2:-}"',
+    'items_json="${3:-}"',
+    "",
+    'if [[ -z "$pr_number" || -z "$commit_sha" || -z "$items_json" ]]; then',
+    '  echo "Usage: complete-feedback-handoff.sh <pr-number> <commit-sha> <items-json>" >&2',
+    "  exit 2",
+    "fi",
+    "",
+    "# Validate the items JSON up front \u2014 a malformed payload must fail",
+    "# loudly before we mutate any PR state.",
+    `if ! echo "$items_json" | jq -e 'type == "array"' >/dev/null 2>&1; then`,
+    '  echo "complete-feedback-handoff: <items-json> is not a JSON array" >&2',
+    "  exit 2",
+    "fi",
+    "",
+    "# \u2500\u2500 Build the structured worker report \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",
+    "# One markdown checklist line per item (\u2713 applied / \u2717 failed), keyed by",
+    "# comment_id so the reviewer's confirm pass reacts on the right source",
+    "# comment. Includes the pushed commit SHA and an overall outcome",
+    "# (`complete` when every item applied, `partial` when any failed).",
+    `applied_count=$(echo "$items_json" | jq '[.[] | select(.outcome == "applied")] | length')`,
+    `failed_count=$(echo "$items_json" | jq '[.[] | select(.outcome == "failed")] | length')`,
+    "",
+    'overall="complete"',
+    'if [[ "$failed_count" -gt 0 ]]; then',
+    '  overall="partial"',
+    "fi",
+    "",
+    `item_lines=$(echo "$items_json" | jq -r '`,
+    "  .[] |",
+    '  if .outcome == "applied" then',
+    '    "- [x] `\\(.comment_id)` \u2014 applied"',
+    "  else",
+    '    "- [ ] `\\(.comment_id)` \u2014 **failed**" + (if (.detail // "") != "" then " (\\(.detail))" else "" end)',
+    "  end",
+    "')",
+    "",
+    "report=$(cat <<EOF",
+    "## Worker report",
+    "",
+    "Feedback-mode fix-list applied on commit \\`${commit_sha}\\`.",
+    "",
+    "**Outcome:** ${overall} (${applied_count} applied, ${failed_count} failed)",
+    "",
+    "${item_lines}",
+    "",
+    "<!-- issue-worker feedback hand-off \u2014 review:needs-worker cleared -->",
+    "EOF",
+    ")",
+    "",
+    "# \u2500\u2500 1. Post the worker-report comment \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",
+    "# The report is ALWAYS posted, even when every item failed \u2014 the",
+    "# reviewer's confirm pass needs the record to react and fall through to",
+    "# the human-required hand-off rather than silently wedging.",
+    'if ! echo "$report" | gh pr comment "$pr_number" --body-file -; then',
+    '  echo "complete-feedback-handoff: failed to post worker-report comment on PR #${pr_number}" >&2',
+    "  exit 1",
+    "fi",
+    "",
+    "# \u2500\u2500 2. Clear the durable review:needs-worker marker \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500",
+    "# Removing the marker (not the `review:fixing` lease) flips the PR into",
+    "# the lease-without-marker state the reviewer's confirm pass keys on.",
+    "# Cleared unconditionally on a partial result so the PR never wedges.",
+    `if ! gh pr edit "$pr_number" --remove-label 'review:needs-worker'; then`,
+    '  echo "complete-feedback-handoff: failed to remove review:needs-worker from PR #${pr_number}" >&2',
+    "  exit 1",
+    "fi",
+    "",
+    'echo "HANDOFF_DONE pr=#${pr_number} outcome=${overall} applied=${applied_count} failed=${failed_count}"'
+  ].join("\n");
+}
+function buildCompleteFeedbackHandoffProcedure() {
+  return {
+    name: "complete-feedback-handoff.sh",
+    description: "Atomic feedback-mode hand-off for the issue-worker (Phase 6.5). Given `<pr-number> <commit-sha> <items-json>`, it posts the structured `## Worker report` comment (per-item outcomes keyed by fix-list `comment_id`, `applied` / `failed`) AND removes the `review:needs-worker` marker in one invocation, exiting non-zero on any failure so a clean push can never land without the hand-off completing. The marker is cleared even when some or all items failed (overall outcome `partial`) so a partial result never wedges the PR; the `review:fixing` lease is left for the reviewer's confirm pass.",
+    content: buildCompleteFeedbackHandoffScript()
+  };
+}
+var completeFeedbackHandoffProcedure = buildCompleteFeedbackHandoffProcedure();
 var orchestratorSubAgent = {
   name: "orchestrator",
   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",
@@ -15386,9 +15807,11 @@ var orchestratorSubAgent = {
     "You are the pipeline orchestrator for the **{{repository.owner}}/{{repository.name}}** repository.",
     "Each invocation runs **one full end-to-end cycle**. The cycle pulls",
     "the default branch, sweeps eligible open PRs through the `pr-reviewer`",
-    "sub-agent, 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",
+    "sub-agent, **drains every open `review:needs-worker` PR through the",
+    "`issue-worker`** to consume the reviewer's fix-lists, 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, pushes commits, or merges PRs \u2014 it routes",
     "work to other agents. The merge decision is still owned by the",
     "`pr-reviewer` sub-agent; the orchestrator only chooses which PRs the",
@@ -15405,16 +15828,22 @@ var orchestratorSubAgent = {
     "   eligibility summary and dispatch the `pr-reviewer` sub-agent",
     "   in scheduled mode against each eligible open PR. Failures on",
     "   one PR never stop the sweep.",
-    "3. **Phase C \u2014 Triage / Unblock.** Flip dependents that have all",
+    "3. **Phase B1 \u2014 Feedback Drain.** Read the procedure-script's",
+    "   needs-worker enumeration and dispatch a top-level `issue-worker`",
+    "   per open `review:needs-worker` PR \u2014 highest-priority first \u2014 to",
+    "   consume the reviewer's fix-list. Drains **every** eligible",
+    "   marker PR in the cycle. Feedback PRs are preferred over fresh",
+    "   issues, so this phase runs before the queue scan.",
+    "4. **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",
+    "5. **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",
+    "6. **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",
+    "7. **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",
+    "8. **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",
@@ -15447,7 +15876,7 @@ var orchestratorSubAgent = {
     "metadata, mirroring the discipline of Phase E's bucketed queue scan.",
     "",
     "```bash",
-    ".claude/procedures/pr-sweep.sh",
+    ".claude/procedures/pr-sweep.sh review",
     "```",
     "",
     "Each line follows one of these shapes:",
@@ -15468,7 +15897,7 @@ var orchestratorSubAgent = {
     "  (the reviewer already handed off; a human is the next actor)",
     "",
     "If the script emits `NO_OPEN_PRS`, log the empty result and skip",
-    "directly to Phase C.",
+    "directly to Phase B1.",
     "",
     "### Step 2 \u2014 dispatch the reviewer per eligible PR",
     "",
@@ -15502,7 +15931,103 @@ var orchestratorSubAgent = {
     "eligible.",
     "",
     "After every eligible PR has been processed (or zero eligible PRs",
-    "were emitted), continue to Phase C regardless of outcomes.",
+    "were emitted), continue to Phase B1 regardless of outcomes.",
+    "",
+    "## Phase B1: Feedback Drain",
+    "",
+    "Phase B **produces** `review:needs-worker` markers (the reviewer's",
+    "pull-based hand-off applies one whenever it delegates an in-scope",
+    "fix-list); Phase B1 **consumes** them. The pr-reviewer cannot spawn",
+    "the worker in session \u2014 it frequently runs at depth-1 \u2014 so it leaves",
+    "a durable marker and exits. The orchestrator runs at depth-0, so it",
+    "**can** spawn `issue-worker`; this phase actively drains the marker",
+    "queue every cycle by dispatching one top-level worker per marked PR.",
+    "Without it, `review:needs-worker` PRs accumulate forever \u2014 the",
+    "marker-draining path is otherwise unreachable from the running loop,",
+    "because Phase G always hands the worker a fresh issue number, which",
+    "suppresses the worker's own autonomous feedback-pull discovery.",
+    "",
+    "**Feedback PRs are preferred over fresh issues**, so this phase runs",
+    "before the queue scan (Phase E) and the delegation (Phase G): a",
+    "queued fix-list is a half-finished unit of work and should land",
+    "before any new work starts.",
+    "",
+    "### Step 1 \u2014 read the needs-worker enumeration",
+    "",
+    "Run the bundled `pr-sweep.sh` procedure in `needs-worker` mode and",
+    "read **only** the summary lines it emits. Do **not** iterate raw",
+    "`gh pr list` JSON yourself \u2014 the procedure is the single source of",
+    "needs-worker metadata, mirroring Phase B's `review`-mode discipline.",
+    "",
+    "```bash",
+    ".claude/procedures/pr-sweep.sh needs-worker",
+    "```",
+    "",
+    "Each line follows one of these shapes:",
+    "",
+    "```",
+    "PR_DRAIN #<n>",
+    "PR_SKIP #<n> reason=in-flight",
+    "```",
+    "",
+    "The procedure enumerates every open PR carrying the",
+    "`review:needs-worker` marker, ordered **highest-priority-first**",
+    "(linked-issue `priority:*`, tie-broken by PR number ascending). It",
+    "skips \u2014 never drains \u2014 any PR that **also** carries the",
+    "`review:fixing` lease: that label pair means a delegation is already",
+    "in flight (a worker is mid-run or the reviewer's confirm pass is",
+    "pending), so re-dispatching would double-work the fix-list. This is",
+    "what makes the phase **idempotent** \u2014 a PR already being worked, or",
+    "one whose marker was already cleared by a finished worker, never",
+    "appears as a `PR_DRAIN` line.",
+    "",
+    "If the script emits `NO_NEEDS_WORKER_PRS`, log the empty result and",
+    "skip directly to Phase C.",
+    "",
+    "### Step 2 \u2014 dispatch a worker per drain PR",
+    "",
+    "For **each** `PR_DRAIN #<n>` line in the order the procedure emitted",
+    "them (highest-priority first), invoke the `issue-worker` sub-agent",
+    "**in scheduled mode** with the brief below. Loop until every",
+    "`PR_DRAIN` line has been dispatched \u2014 do **not** stop after the",
+    "first. Substitute `<n>` with the PR number from the line.",
+    "",
+    "> `scheduled mode`: `feedback mode: PR #<n>`. Pull the reviewer's",
+    "> most-recent fix-list comment on PR #<n>, check out the PR's head",
+    "> branch, apply each fix-list item, run the verification commands,",
+    "> commit with a `fix(review)` message, push to the existing branch",
+    "> (never force-push, never open a new PR), then \u2014 as the first action",
+    "> after the push \u2014 run `complete-feedback-handoff.sh` to atomically",
+    "> post the structured worker-report comment and clear the",
+    "> `review:needs-worker` marker (leave `review:fixing` for the",
+    "> reviewer's confirm pass). The unit of work is not complete until",
+    "> that procedure returns 0. Do not",
+    "> pause for approval. Return a one-line summary as the final line of",
+    "> your response in the form `WORKER_DONE pr:#<n>` on success or",
+    "> `WORKER_FAILED pr:#<n> reason:<short reason>` on failure.",
+    "",
+    "The `feedback mode: PR #<n>` push is the explicit-pull form documented",
+    "in the **Invocation Mode** section of `.claude/agents/issue-worker.md`",
+    "\u2014 it always wins, so the worker fixes exactly that PR and does not",
+    "scan the issue queue. The orchestrator is **read-only** with respect",
+    "to the PR and its branch: never check out the branch, apply the",
+    "fix-list, push commits, or edit review labels yourself. Consuming the",
+    "fix-list and clearing `review:needs-worker` is the worker's job.",
+    "",
+    "### 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",
+    "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",
+    "`pr-sweep.sh needs-worker` and re-dispatches a worker if the PR still",
+    "carries an unconsumed marker. Do **not** retry the same PR in this",
+    "session.",
+    "",
+    "After every `PR_DRAIN` PR has been processed (or",
+    "`NO_NEEDS_WORKER_PRS` was emitted), continue to Phase C regardless",
+    "of outcomes.",
     "",
     "## Phase C: Triage \u2014 Unblock",
     "",
@@ -15550,31 +16075,35 @@ var orchestratorSubAgent = {
     "## Phase D: Maintenance",
     "",
     "Run the bundled `check-blocked.sh maintenance` procedure and read",
-    "**only** the final `MAINTENANCE_DONE` summary line it emits. The",
-    "procedure folds the stale-detection, orphan-detection, and",
-    "needs-attention summary that earlier revisions split across D1,",
-    "D2, and D3 into a single sweep \u2014 applying the",
-    "`status:needs-attention` label and posting the canned flag comment",
-    "for each stale / stale-blocked issue itself, mirroring the",
-    "discipline of Phase B (`pr-sweep.sh`) and Phase C",
-    "(`check-blocked.sh unblock`).",
+    "**only** the two summary lines it emits \u2014 `MAINTENANCE_DONE` and",
+    "`LEASE_RECONCILE`. The procedure folds the stale-detection,",
+    "orphan-detection, needs-attention summary, and PR-lease",
+    "auto-reconcile that earlier revisions split across D1, D2, and D3",
+    "into a single sweep \u2014 applying the `status:needs-attention` label",
+    "and posting the canned flag comment for each stale / stale-blocked",
+    "issue itself, and reconciling stuck `review:fixing` PR leases",
+    "itself, mirroring the discipline of Phase B (`pr-sweep.sh`) and",
+    "Phase C (`check-blocked.sh unblock`).",
     "",
     "```bash",
     ".claude/procedures/check-blocked.sh maintenance",
     "```",
     "",
-    "The script emits one summary line in this shape:",
+    "The script emits two summary lines in this shape:",
     "",
     "```",
     "MAINTENANCE_DONE flagged_stale=<N> flagged_blocked=<M> orphan_branches=<A> orphan_prs=<B> needs_attention_total=<T>",
+    "LEASE_RECONCILE orphaned=<N> consumed_uncleared=<M>",
     "```",
     "",
-    "Per-issue / per-orphan informational lines (`FLAGGED_STALE #N`,",
-    "`FLAGGED_BLOCKED #N`, `STALE #N \u2014 \u2026`, `STALE_BLOCKED #N \u2014 \u2026`,",
-    "`ORPHAN_BRANCH \u2026`, `ORPHAN_PR #N \u2014 \u2026`, `FLAG_FAILED #N \u2014 \u2026`) are",
-    "emitted for log visibility but are **not** load-bearing for the",
-    "orchestrator \u2014 partial failures (one bad `gh` call) do not abort",
-    "the sweep, they are simply omitted from the `flagged_*` counters.",
+    "Per-issue / per-orphan / per-PR informational lines (`FLAGGED_STALE",
+    "#N`, `FLAGGED_BLOCKED #N`, `STALE #N \u2014 \u2026`, `STALE_BLOCKED #N \u2014 \u2026`,",
+    "`ORPHAN_BRANCH \u2026`, `ORPHAN_PR #N \u2014 \u2026`, `FLAG_FAILED #N \u2014 \u2026`,",
+    "`LEASE_ORPHANED PR #N \u2014 \u2026`, `LEASE_CONSUMED_UNCLEARED PR #N \u2014 \u2026`,",
+    "`LEASE_RECONCILE_FAILED PR #N \u2014 \u2026`) are emitted for log visibility",
+    "but are **not** load-bearing for the orchestrator \u2014 partial failures",
+    "(one bad `gh` call) do not abort the sweep, they are simply omitted",
+    "from the counters.",
     "",
     "**Important:** the script never auto-resets stale issues to",
     "`status:ready`. It only adds `status:needs-attention`; the",
@@ -15584,9 +16113,36 @@ var orchestratorSubAgent = {
     "but are never deleted by the orchestrator \u2014 a human reviews the",
     "log lines and prunes orphans manually.",
     "",
-    "Log the summary line and continue to Phase E regardless of",
-    "outcomes \u2014 a non-zero `flagged_*` or `orphan_*` count is",
-    "informational, not a failure.",
+    "**PR-lease auto-reconcile (`LEASE_RECONCILE`).** The sweep also",
+    "unwedges PRs stuck in the feedback-drain loop, so no human is",
+    "needed to free a stuck `review:fixing` lease. Two states are",
+    "reconciled directly by the script (it mutates the labels itself \u2014",
+    "the orchestrator only reads the summary line):",
+    "",
+    "- **Orphaned lease** \u2014 a PR carries `review:fixing` but **not**",
+    "  `review:needs-worker`, its reviewer fix-list comment is older",
+    "  than the 72h stale threshold, and no worker-report comment newer",
+    "  than the fix-list exists. The sweep **re-applies**",
+    "  `review:needs-worker` (a deliberate re-arm, not a silent",
+    "  force-release \u2014 the `review:fixing` lease is left untouched) and",
+    "  posts an audit-trail note comment, so the Phase B1 drain retries",
+    "  the delegation autonomously. Counted in `orphaned=<N>`.",
+    "- **Consumed-but-uncleared wedge** \u2014 a PR carries **both**",
+    "  `review:needs-worker` and `review:fixing`, but the branch HEAD",
+    "  commit is newer than the fix-list comment and no worker-report",
+    "  exists (the worker pushed then skipped the hand-off). The sweep",
+    "  **removes** `review:needs-worker` and posts an audit-trail",
+    "  reconcile note, flipping the PR into the lease-without-marker",
+    "  state the reviewer confirm pass keys on so it can merge. Counted",
+    "  in `consumed_uncleared=<M>`.",
+    "",
+    "Every lease reconcile leaves an audit-trail note comment \u2014 a lease",
+    "is never silently force-released. The `review:fixing` lease itself",
+    "is always left for the reviewer confirm pass to release.",
+    "",
+    "Log both summary lines and continue to Phase E regardless of",
+    "outcomes \u2014 a non-zero `flagged_*`, `orphan_*`, `orphaned`, or",
+    "`consumed_uncleared` count is informational, not a failure.",
     "",
     "## Phase E: Queue Scan",
     "",
@@ -15746,7 +16302,7 @@ var orchestratorSubAgent = {
     "",
     "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 procedure scripts.** Issue triage queries go through `.claude/procedures/check-blocked.sh`; PR-eligibility filtering goes through `.claude/procedures/pr-sweep.sh`. Never iterate raw `gh issue list` / `gh pr list` JSON in-context.",
+    "3. **Always use procedure scripts.** Issue triage queries go through `.claude/procedures/check-blocked.sh`; PR-eligibility filtering (Phase B) goes through `.claude/procedures/pr-sweep.sh review`; the feedback-drain enumeration (Phase B1) goes through `.claude/procedures/pr-sweep.sh needs-worker`. Never iterate raw `gh issue list` / `gh pr list` JSON in-context.",
     "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",
@@ -15768,8 +16324,17 @@ var orchestratorSubAgent = {
     "   human approval and the delegation stalls.",
     "9. **A failed reviewer never stops the sweep.** Phase B continues",
     "   to the next eligible PR after a `REVIEWER_FAILED` line and",
-    "   proceeds to Phase C regardless of how many PRs failed. Do not",
-    "   abort the cycle on a single PR's reviewer failure."
+    "   proceeds to Phase B1 regardless of how many PRs failed. Do not",
+    "   abort the cycle on a single PR's reviewer failure.",
+    "10. **Drain every `review:needs-worker` PR before fresh work.**",
+    "    Phase B1 dispatches a top-level `issue-worker` per open marker",
+    "    PR (highest-priority first) to consume the reviewer's fix-list,",
+    "    and loops until the queue is empty \u2014 feedback PRs are preferred",
+    "    over fresh issues, so Phase B1 runs before Phase E / Phase G.",
+    "    Skip any PR that also carries the `review:fixing` lease (a",
+    "    delegation already in flight) so the drain stays idempotent. A",
+    "    single worker's failure never stops the drain; the next cycle",
+    "    re-dispatches against any PR whose marker is still unconsumed."
   ].join("\n")
 };
 var issueWorkerSubAgent = {
@@ -15853,7 +16418,7 @@ var issueWorkerSubAgent = {
     "| 4. Implement | Read issue AC, implement | Read most-recent reviewer-authored fix-list comment on the PR, parse JSON, apply each item. |",
     "| 5. Verify | Unchanged | Unchanged. |",
     "| 6. Commit and Push | Conventional commit, interactive pause | Commit message `fix(review): <summary> (PR #<n>)`. Pause behaviour unchanged. `git push` (no `-u`). |",
-    "| 6.5. Complete the hand-off | n/a | Write the structured worker-report comment, then **clear `review:needs-worker`** (leave `review:fixing` for the reviewer's confirm pass). |",
+    "| 6.5. Complete the hand-off | n/a | **Mandatory, atomic.** As the first action after the push, run `complete-feedback-handoff.sh` to post the worker-report and **clear `review:needs-worker`** in one call (leave `review:fixing` for the reviewer's confirm pass). The unit of work is not complete until it returns 0. |",
     "| 7. Open a PR | Open a new PR | **Skip.** |",
     "| 8. Update Status | Set issue to `status:ready-for-review` | **Skip.** PR is still open; issue stays `status:in-progress`. |",
     "| 9. Branch Cleanup | Poll for merge, delete branch | **Skip.** Return control to the pr-reviewer without polling. |",
@@ -16250,46 +16815,73 @@ var issueWorkerSubAgent = {
     "git push -u origin <branch-name>",
     "```",
     "",
-    "## Phase 6.5: Complete the Feedback Hand-off",
+    "## Phase 6.5: Complete the Feedback Hand-off (MANDATORY, ATOMIC)",
     "",
     "**Normal mode:** Skip this phase entirely.",
     "",
-    "**Feedback mode:** After the fix commits are pushed (Phase 6), close",
-    "the pull-based hand-off so the pr-reviewer's confirm pass can pick it",
-    "up.",
+    "**Feedback mode \u2014 the invariant.** A successful Phase 6 push is **not**",
+    "the end of the unit of work. **If you pushed in feedback mode, the unit",
+    "of work is NOT complete until `complete-feedback-handoff.sh` returns",
+    "0.** The git push and the hand-off are a single atomic step: the marker",
+    "must be cleared and the worker-report posted in the **same session** as",
+    "the push. A clean push that leaves `review:needs-worker` set and posts",
+    "no report double-wedges the PR \u2014 the reviewer's confirm pass never",
+    "fires (the marker is still present) and stale-lease reclaim never fires",
+    "(it requires the marker absent). Never stop, hand back to the caller,",
+    "or move to any optional/secondary step until the procedure has exited 0.",
+    "",
+    "**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:",
+    "",
+    "```bash",
+    ".claude/procedures/complete-feedback-handoff.sh <pr-number> <commit-sha> '<items-json>'",
+    "```",
     "",
-    "1. **Write the structured worker-report comment** on the PR. It is",
-    "   the record the reviewer's confirm pass reads to react on source",
-    "   comments and re-evaluate AC/CI. Include: the PR number, the commit",
-    "   SHAs you pushed (or the rebased head SHA for a synthetic-rebase",
-    "   item), and a per-item outcome keyed by `comment_id` \u2014 `handled`",
-    "   or `failed` (with a short reason for each failure). This is the",
-    "   same structured report you would otherwise return to the caller in",
-    "   the pushed-feedback case; post it as a PR comment so a separate",
-    "   reviewer session can consume it.",
+    "The `<items-json>` argument is a JSON array of per-item outcomes keyed",
+    "by the fix-list `comment_id` \u2014 one entry per item you applied in Phase",
+    '4, each `{"comment_id": "<id>", "outcome": "applied"|"failed",',
+    '   "detail": "<short reason on failure>"}`:',
     "",
-    "   ```bash",
-    "   gh pr comment <pr-number> --body-file <worker-report-path>",
-    "   ```",
+    "```json",
+    "[",
+    '  {"comment_id": "IC_abc", "outcome": "applied", "detail": ""},',
+    '  {"comment_id": "IC_def", "outcome": "failed", "detail": "test still red"}',
+    "]",
+    "```",
     "",
-    "2. **Clear the `review:needs-worker` marker.** This signals the",
-    "   reviewer that the delegation has been consumed. Leave the",
-    "   `review:fixing` lease in place \u2014 the reviewer's confirm pass",
-    "   releases it after reacting and re-evaluating. Clearing the marker",
-    "   is what flips the PR into the lease-without-marker state the",
-    "   confirm pass keys on.",
+    "The procedure performs **both** halves of the hand-off in one call and",
+    "exits non-zero on any failure:",
+    "",
+    "1. **Posts the structured `## Worker report` comment** \u2014 the record the",
+    "   reviewer's confirm pass reads to react on source comments and",
+    "   re-evaluate AC/CI. It renders one checklist line per `comment_id`",
+    "   (`applied` / `failed`), the pushed commit SHA, and an overall",
+    "   outcome (`complete` when every item applied, `partial` when any",
+    "   failed).",
+    "2. **Removes the `review:needs-worker` marker** \u2014 leaving the",
+    "   `review:fixing` lease in place. Clearing the marker flips the PR",
+    "   into the lease-without-marker state the reviewer's confirm pass keys",
+    "   on.",
+    "",
+    "**Partial failure still clears the marker.** The worker-report is",
+    "ALWAYS posted and the marker ALWAYS cleared even when every item",
+    "`failed` (the procedure reports overall outcome `partial` and the",
+    "per-item failures by `comment_id`). The reviewer's confirm pass reacts",
+    "`thinking_face` on the failed items and falls through to the",
+    "human-required hand-off via `review:awaiting-human`. Leaving the marker",
+    "applied on a partial or total failure would wedge the PR, so the marker",
+    "is cleared unconditionally \u2014 never remove it yourself out-of-band and",
+    "never skip the procedure because items failed.",
     "",
-    "   ```bash",
-    "   gh pr edit <pr-number> --remove-label 'review:needs-worker'",
-    "   ```",
+    "If the procedure exits non-zero (e.g. the comment post or the label",
+    "removal failed), the hand-off did **not** complete \u2014 retry it. Do not",
+    "treat the pushed commit as a finished unit of work until the procedure",
+    "returns 0.",
     "",
     "Do **not** remove `review:fixing` yourself, and do **not** re-enable",
-    "auto-merge \u2014 both belong to the reviewer's confirm pass. If you could",
-    "not apply any item (every item `failed`), still write the report and",
-    "still clear `review:needs-worker`: the reviewer's confirm pass reacts",
-    "`thinking_face` on the failed items and falls through to the",
-    "human-required hand-off via `review:awaiting-human`. Leaving the",
-    "marker applied on a total failure would wedge the PR.",
+    "auto-merge \u2014 both belong to the reviewer's confirm pass.",
     "",
     "## Phase 7: Open a PR",
     "",
@@ -16418,13 +17010,19 @@ var issueWorkerSubAgent = {
     "    highest-priority unconsumed fix-list first. A half-finished PR",
     "    should land before a new unit of work starts. The explicit",
     "    `feedback mode: PR #<n>` push always overrides both scans.",
-    "16. **Clear `review:needs-worker`, never `review:fixing`.** On",
-    "    completing a feedback hand-off (Phase 6.5), write the structured",
-    "    worker-report comment and remove **only** the",
-    "    `review:needs-worker` marker. The `review:fixing` lease belongs",
-    "    to the reviewer's confirm pass \u2014 never remove it yourself, and",
-    "    never re-enable auto-merge. Clear the marker even when every item",
-    "    failed, so a crashed delegation does not wedge the PR.",
+    "16. **Complete the hand-off atomically; clear `review:needs-worker`,",
+    "    never `review:fixing`.** A successful feedback-mode push is not a",
+    "    finished unit of work until the hand-off completes. As the FIRST",
+    "    action after the push (Phase 6.5), run",
+    "    `.claude/procedures/complete-feedback-handoff.sh <pr> <commit-sha>",
+    "    '<items-json>'`, which posts the structured worker-report comment",
+    "    and removes **only** the `review:needs-worker` marker in one call,",
+    "    exiting non-zero on any failure. The unit of work is **not**",
+    "    complete until it returns 0. The `review:fixing` lease belongs to",
+    "    the reviewer's confirm pass \u2014 never remove it yourself, and never",
+    "    re-enable auto-merge. The procedure clears the marker even when",
+    "    every item failed (overall outcome `partial`), so a partial or",
+    "    crashed delegation does not wedge the PR.",
     "17. **Auto-pull only in scheduled mode.** The autonomous",
     "    `review:needs-worker` scan is scheduled-mode only. In an",
     "    interactive session, never auto-pull a feedback PR \u2014 a human who",
@@ -16436,19 +17034,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**: startup \u2192 PR review sweep \u2192 triage / unblock \u2192 maintenance \u2192 queue scan \u2192 delegate to `issue-worker` \u2192 cleanup",
+  "- The orchestrator runs **one full end-to-end cycle every invocation**: startup \u2192 PR review sweep \u2192 feedback drain \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 routes work to other sub-agents. The merge decision is still owned by the `pr-reviewer` sub-agent; Phase B only chooses which open PRs the reviewer should look at and dispatches one reviewer session per eligible PR (skipping drafts and any PR carrying `review:human-required` or `review:awaiting-human`).",
-  "- All triage queries use `.claude/procedures/check-blocked.sh` for token efficiency. PR-eligibility filtering for Phase B uses `.claude/procedures/pr-sweep.sh`, which emits `PR_ELIGIBLE` / `PR_SKIP` lines so the orchestrator never iterates raw `gh pr list` JSON.",
+  "- **Phase B produces `review:needs-worker` markers; Phase B1 consumes them.** Phase B's `pr-reviewer` dispatch leaves a durable `review:needs-worker` marker whenever it delegates a fix-list (it cannot spawn the worker in session \u2014 it may run at depth-1). Phase B1 (feedback drain) actively drains that queue every cycle: it dispatches a top-level `issue-worker` per open `review:needs-worker` PR \u2014 highest-priority first, looping until the queue is empty \u2014 to consume the reviewer's fix-list. **Feedback PRs are preferred over fresh issues**, so Phase B1 runs after the review sweep but before the queue scan (Phase E) and fresh delegation (Phase G). A PR that also carries the `review:fixing` lease is a delegation already in flight and is skipped, keeping the drain idempotent.",
+  "- All triage queries use `.claude/procedures/check-blocked.sh` for token efficiency. PR-eligibility filtering for Phase B uses `.claude/procedures/pr-sweep.sh review`, which emits `PR_ELIGIBLE` / `PR_SKIP` lines; the Phase B1 feedback-drain enumeration uses `.claude/procedures/pr-sweep.sh needs-worker`, which emits `PR_DRAIN` / `PR_SKIP reason=in-flight` lines. The orchestrator never iterates raw `gh pr list` JSON.",
   "- 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. Phase E's queue scan walks each priority bucket in turn (one `gh issue list` call per bucket, **capped at 50 issues per bucket**) and short-circuits on the first bucket whose survivors clear the `Depends on:` filter, so every higher-priority issue is visible even when the global ready backlog is much larger than 50.",
   "- Stale thresholds: 72h for in-progress, 168h for blocked",
   "- Flagged issues get `status:needs-attention` \u2014 they are not auto-reset",
+  "- **Phase D auto-reconciles stuck PR leases.** The maintenance sweep's `check-blocked.sh maintenance` invocation folds in a PR-lease reconcile that unwedges `review:fixing` PRs the Phase B1 drain and the worker hand-off left stuck, emitting a `LEASE_RECONCILE orphaned=<N> consumed_uncleared=<M>` line alongside `MAINTENANCE_DONE`. An **orphaned lease** (`review:fixing` without `review:needs-worker`, fix-list older than the 72h stale threshold, no worker-report newer than the fix-list) is **re-armed** \u2014 the sweep re-applies `review:needs-worker` so the Phase B1 drain retries the delegation, leaving the lease untouched. A **consumed-but-uncleared wedge** (both labels present, branch HEAD newer than the fix-list, no worker-report \u2014 the worker pushed but skipped the hand-off) is **auto-reconciled** \u2014 the sweep removes `review:needs-worker` so the reviewer confirm pass can merge. Both paths post an audit-trail note comment; a lease is never silently force-released, and the `review:fixing` lease itself is always left for the reviewer confirm pass to release.",
   "",
   "## Depth-0 invocation requirement",
   "",
-  'The orchestrator agent **must run as the top-level (depth-0) session** because both Phase B (PR review sweep) and Phase G (issue delegation) need to spawn child sub-agents. Phase B dispatches the `pr-reviewer` sub-agent once per eligible open PR; Phase G dispatches the `issue-worker` sub-agent against the picked issue. 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 `pr-reviewer` and `issue-worker` at depth-2 would not be available and both Phase B and Phase G would silently abort.',
+  'The orchestrator agent **must run as the top-level (depth-0) session** because Phase B (PR review sweep), Phase B1 (feedback drain), and Phase G (issue delegation) all need to spawn child sub-agents. Phase B dispatches the `pr-reviewer` sub-agent once per eligible open PR; Phase B1 dispatches the `issue-worker` sub-agent once per open `review:needs-worker` PR to consume the reviewer\'s fix-list; Phase G dispatches the `issue-worker` sub-agent against the picked issue. 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 `pr-reviewer` and `issue-worker` at depth-2 would not be available and Phase B, Phase B1, and Phase G would all silently abort. Phase B1 is precisely why the reviewer\'s pull-based hand-off works: the depth-1 reviewer leaves a durable `review:needs-worker` marker, and the depth-0 orchestrator \u2014 which *can* spawn the worker \u2014 drains it.',
   "",
-  '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 to `pr-reviewer` (Phase B) and `issue-worker` (Phase G) at depth-1. The scheduled task does **not** call `Agent(subagent_type: "orchestrator")` \u2014 that would put the orchestrator at depth-1 and break both delegation chains.'
+  '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 to `pr-reviewer` (Phase B) and `issue-worker` (Phase B1 and Phase G) at depth-1. The scheduled task does **not** call `Agent(subagent_type: "orchestrator")` \u2014 that would put the orchestrator at depth-1 and break all three delegation chains.'
 ].join("\n");
 function buildOrchestratorConventionsContent(tiers, scopeGate = resolveScopeGate(), _runRatio = resolveRunRatio(), scheduledTasks = resolveScheduledTasks(), unblockDependents = resolveUnblockDependents(), excludeBundles = []) {
   return [
@@ -16501,8 +17101,10 @@ var orchestrateCommand = {
     "# Orchestrate",
     "",
     "Invoke the `orchestrator` sub-agent and run **one full end-to-end",
-    "cycle**: triage / unblock \u2192 maintenance \u2192 queue scan \u2192 delegate the",
-    "picked issue to the `issue-worker` sub-agent \u2192 cleanup.",
+    "cycle**: PR review sweep \u2192 feedback drain (drain every open",
+    "`review:needs-worker` PR through the `issue-worker`) \u2192 triage /",
+    "unblock \u2192 maintenance \u2192 queue scan \u2192 delegate the picked issue to",
+    "the `issue-worker` sub-agent \u2192 cleanup.",
     "",
     "Follow the contract in `.claude/agents/orchestrator.md`. Do **not**",
     "implement code, create branches, push commits, or merge PRs \u2014 those",
@@ -16597,7 +17199,8 @@ var orchestratorBundle = {
   procedures: [
     checkBlockedProcedure,
     unblockDependentsProcedure,
-    prSweepProcedure
+    prSweepProcedure,
+    completeFeedbackHandoffProcedure
   ],
   commands: [orchestrateCommand, checkBlockedCommand, scanCommand],
   claudePermissions: {
@@ -18192,6 +18795,116 @@ var prReviewerSubAgent = {
     "unchanged regardless of mode. Only the terminal action in Phase 4",
     "branches on the decided mode.",
     "",
+    "## Phase 2.8: Label Reconciliation",
+    "",
+    "A PR can never carry **mutually-exclusive review-workflow labels**",
+    "after a reviewer pass \u2014 this is the PR equivalent of the",
+    '"exactly one `status:*`" discipline issues already follow.',
+    "Successive passes that layer labels with no reconciler can drive a",
+    "PR into an impossible state (a real PR once held",
+    "`review:awaiting-human` + `status:needs-attention` + `review:fixing`",
+    "+ `review:needs-worker` simultaneously). Humans cannot tell what",
+    "state such a PR is in, and downstream phases branch on contradictory",
+    "signals. This phase detects violations and resolves them to the",
+    "**single correct state** implied by the mode decided in Phase 2.75",
+    "and the current loop position, logging every correction in the",
+    "sticky `## Reviewer notes` comment.",
+    "",
+    "Run this phase **early** \u2014 after Phase 2.75 fixes the review mode and",
+    "after the **Confirm a Completed Delegation** detection step reads the",
+    "lease state, but **before** Phase 3.5 / Phase 4 branch on review",
+    "state to decide actions. It must operate on a clean label set so no",
+    "later phase inherits a contradiction. It runs on **every** pass.",
+    "",
+    "### The review-label invariants",
+    "",
+    "These are the workflow labels this phase governs (see the",
+    "`pr-review-feedback-protocol` label glossary for full meanings):",
+    "`review:awaiting-human`, `review:needs-worker`, `review:fixing`,",
+    "plus the additive `status:needs-attention`. (`review:human-required`",
+    "and `review:auto-ok` are **policy inputs** read in Phase 2.75, not",
+    "workflow-state labels \u2014 this phase never adds or removes them.)",
+    "",
+    "1. **`review:awaiting-human` is mutually exclusive with the",
+    "   fix-delegation labels.** A PR is **either** in the fix-delegation",
+    "   loop (`review:needs-worker` and/or `review:fixing`) **or** handed",
+    "   off to a human (`review:awaiting-human`) \u2014 **never both**. The",
+    "   combination `review:awaiting-human` + `review:needs-worker`,",
+    "   `review:awaiting-human` + `review:fixing`, or all three together",
+    "   is a **violation**.",
+    "2. **`review:fixing` WITHOUT `review:needs-worker` is NOT a",
+    "   violation** \u2014 it is the **confirm-pending** state (the worker",
+    "   finished and cleared its marker; a confirm pass owns the PR and",
+    "   will release the lease). Do **not** strip `review:fixing` here.",
+    "3. **`review:fixing` WITH `review:needs-worker` is NOT a violation**",
+    "   \u2014 it is a valid **in-flight delegation** (the work is durably",
+    "   queued and a top-level `issue-worker` pass will consume it). Do",
+    "   **not** treat this combination as a contradiction.",
+    "4. **`status:needs-attention` is additive but must not coexist with",
+    "   an in-flight delegation that is making progress.** When the PR",
+    "   carries an active in-flight delegation (`review:fixing` +",
+    "   `review:needs-worker`) with a fix-list newer than the flag and no",
+    "   failed-fix pushback, `status:needs-attention` contradicts the",
+    "   live progress signal and is a **violation**. (A",
+    "   `status:needs-attention` flag that coexists with a *stalled* or",
+    "   *failed* delegation, an unresolved `thinking_face` pushback, or a",
+    "   `human-required` hand-off is **legitimate** \u2014 leave it.)",
+    "",
+    "### Canonical resolution table",
+    "",
+    "For each detected violation, resolve to the single correct state",
+    "below. The winning label is chosen by the **mode the reviewer is",
+    "about to act in** (Phase 2.75) and the **current loop position**",
+    "(the lease/marker labels present), so the surviving set always",
+    "matches the action this pass will actually take:",
+    "",
+    "| Violation combo | Loop position / mode | Resolution (winner) | Why |",
+    "|-----------------|----------------------|---------------------|-----|",
+    "| `review:awaiting-human` + (`review:needs-worker` and/or `review:fixing`) | A fix-delegation is in-flight or confirm-pending (`review:needs-worker` and/or `review:fixing` present) **and** mode is `auto-merge` | **Remove `review:awaiting-human`** | The PR is in the fix-delegation loop; the loop must run to completion (worker \u2192 confirm) before any hand-off. `review:awaiting-human` was layered by a stale pass and contradicts the live delegation. |",
+    "| `review:awaiting-human` + (`review:needs-worker` and/or `review:fixing`) | This pass decided `human-required` (rules 2\u20135) **and** no delegation is actually in flight (no fresh fix-list / no worker activity) | **Remove `review:needs-worker` and `review:fixing`** | The reviewer is handing the PR to a human; the fix-delegation labels are stale leftovers. The hand-off wins, the delegation labels lose. Release the lease and clear the marker so the human owns a clean state. |",
+    "| `status:needs-attention` + active in-flight delegation making progress (`review:fixing` + `review:needs-worker`, fix-list newer than the flag, no failed-fix pushback) | mode `auto-merge`, delegation live | **Remove `status:needs-attention`** | The delegation is progressing autonomously; the triage flag is contradictory. Re-flag only if the delegation later stalls or fails. |",
+    "",
+    "Resolution is **conservative about human intent**: when the pass is",
+    "genuinely `human-required` the human-facing labels win and the",
+    "fix-delegation labels are cleared; when the pass is `auto-merge` and",
+    "a delegation is live, the delegation wins and the stray",
+    "`review:awaiting-human` is cleared. Never resolve a violation by",
+    "*adding* a label \u2014 only by removing the contradicting one(s) per the",
+    "table.",
+    "",
+    "### Detect and apply",
+    "",
+    "1. List the PR's current labels:",
+    "",
+    "   ```bash",
+    "   gh pr view <pr-number> --json labels --jq '.labels[].name'",
+    "   ```",
+    "",
+    "2. Evaluate the invariants above against the label set, the mode from",
+    "   Phase 2.75, and the lease/marker position. If no violation exists,",
+    "   record `Label reconciliation: consistent` and proceed \u2014 this is",
+    "   the common case and the phase is a cheap no-op.",
+    "",
+    "3. For each violation, remove the losing label(s) named in the",
+    "   resolution table:",
+    "",
+    "   ```bash",
+    "   gh pr edit <pr-number> --remove-label '<losing-label>'",
+    "   ```",
+    "",
+    "4. **Log every correction in the sticky `## Reviewer notes` comment**",
+    "   (Phase 4.5) on a `**Label reconciliation:**` line, naming the",
+    "   detected violation combo, the labels removed, and the surviving",
+    "   self-consistent set \u2014 for example:",
+    "   `Label reconciliation: removed review:awaiting-human (contradicted in-flight review:fixing+review:needs-worker delegation); set is now {review:fixing, review:needs-worker}`.",
+    "   The correction is part of the audit trail; it must never be a",
+    "   silent label mutation.",
+    "",
+    "After this phase the PR holds a **self-consistent** review-label set:",
+    "at most one of {`review:awaiting-human`} versus the fix-delegation",
+    "pair, and no `status:needs-attention` shadowing a live delegation.",
+    "Phase 3.5 and Phase 4 then branch on a clean state.",
+    "",
     "## Phase 3: Compare Diff to Acceptance Criteria",
     "",
     "Read the issue body for an **Acceptance Criteria** (or equivalent) section.",
@@ -18754,6 +19467,7 @@ var prReviewerSubAgent = {
     "**CI status:** green | pending | red",
     "**Outstanding:** <list of comments still open with their classification and author>",
     "**Pushbacks:** <list of disputes with reasons>",
+    "**Label reconciliation:** <consistent | corrections applied this pass>",
     "**Last pass:** <ISO timestamp>",
     "```",
     "",
@@ -18773,6 +19487,11 @@ var prReviewerSubAgent = {
     "- **Pushbacks** \u2014 every comment the reviewer reacted",
     "  `thinking_face` to on this or any prior pass, with the reason",
     "  captured in the pushback reply. Empty list when there are none.",
+    "- **Label reconciliation** \u2014 the outcome of Phase 2.8: either",
+    "  `consistent` (no mutually-exclusive labels found) or a list of",
+    "  the corrections applied this pass (the detected violation combo,",
+    "  the label(s) removed, and the resulting self-consistent set).",
+    "  Every reconciliation correction is recorded here for auditability.",
     "- **Last pass** \u2014 the ISO 8601 timestamp of this run.",
     "",
     "### Step 3: Create or edit in place",
@@ -19111,16 +19830,23 @@ var prReviewerSubAgent = {
     "### Stale-lease reclaim",
     "",
     "A crashed worker must not wedge a PR forever. A `review:fixing` lease",
-    "is **reclaimable** when it has no `review:needs-worker` companion",
+    "is **orphaned** when it has no `review:needs-worker` companion",
     "**and** no consuming worker is making progress \u2014 i.e. the lease is",
     "older than the stale threshold (the same in-progress threshold the",
     "maintenance sweep applies, 72h by default) with no worker-report",
     "comment newer than the fix-list. The reclaim is wired into the",
-    "maintenance sweep, not a reviewer pass: the sweep flags such a PR",
-    "with `status:needs-attention` so a human clears the orphaned",
-    "`review:fixing` lease and re-triggers the reviewer. See the",
-    "**Stale-lease reclaim** subsection of the `pr-review-feedback-protocol`",
-    "rule for the full lifecycle.",
+    "maintenance sweep, not a reviewer pass: the sweep **re-applies**",
+    "`review:needs-worker` (re-arming the durable work marker, leaving the",
+    "`review:fixing` lease untouched) and posts an audit-trail note",
+    "comment, so the Phase B1 feedback drain retries the delegation",
+    "autonomously \u2014 no human is needed to free the lease. The maintenance",
+    "sweep also auto-reconciles the **consumed-but-uncleared** wedge (both",
+    "labels present, branch HEAD advanced past the fix-list, no",
+    "worker-report) by removing `review:needs-worker` so the reviewer",
+    "confirm pass can merge. A lease is never silently force-released \u2014 every",
+    "reconcile posts an audit-trail note comment. See the **Stale-lease",
+    "reclaim** subsection of the `pr-review-feedback-protocol` rule for the",
+    "full lifecycle.",
     "",
     "## Phase 5: Branch Cleanup and Issue Closure Verification",
     "",
@@ -19511,7 +20237,6 @@ function buildPrReviewBundle(policy = resolvePrReviewPolicy()) {
           "",
           "human-required:",
           "  paths:",
-          '    - "docs/src/content/docs/requirements/architectural-decisions/**"',
           '    - "docs/src/content/docs/project-context.md"',
           '    - ".github/workflows/**"',
           '    - ".github/CODEOWNERS"',
@@ -19610,6 +20335,35 @@ function buildPrReviewBundle(policy = resolvePrReviewPolicy()) {
           "the carve-out check, so the rule only relaxes the threshold for",
           "PRs whose **every** changed path is doc-only.",
           "",
+          "### ADRs auto-merge as `Proposed`",
+          "",
+          "Architectural Decision Records (under",
+          "`docs/src/content/docs/requirements/architectural-decisions/**`)",
+          "are **not** a `human-required.paths` trigger. An ADR-only PR with",
+          "green CI and met acceptance criteria resolves to `auto-merge` and",
+          "squash-merges with no `review:awaiting-human` and no human action.",
+          "",
+          "Auto-merging an ADR does **not** ratify the decision it records.",
+          "An ADR is authored in `Proposed` status, and merging it simply",
+          "lands the proposal in the docs tree as written \u2014 its status stays",
+          "`Proposed`. Promotion `Proposed` \u2192 `Accepted` is a separate",
+          "human / governance step performed out of band by a",
+          "decision-maker; it is **not** a merge gate and nothing in the",
+          "review loop flips an ADR to `Accepted`. Routing ADRs to",
+          "`human-required` only piled them up at `review:awaiting-human`",
+          "waiting for a merge decision that was never the human's job \u2014",
+          "the human's job is the later acceptance decision, not the merge.",
+          "",
+          "The `requirements-writer` flow already authors ADRs in",
+          "`Proposed` status (its Decision section reads",
+          '"Pending human review"), so the merged-as-`Proposed` terminal',
+          "state is supplied by the author, not enforced at the merge gate.",
+          "Consumers that genuinely need a human to gate ADR *merges* (not",
+          "just acceptance) cannot re-add the glob via policy config \u2014 the",
+          "`human-required.paths` list is not consumer-configurable today;",
+          "they would apply the `review:human-required` label per-PR or",
+          "fork the bundle.",
+          "",
           "The `pr-reviewer` sub-agent records the decided mode, the",
           "triggering reason, and the numeric **matched-rule index** (2\u20136",
           "for human-required matches; `null` for rule 1 force-auto or",
@@ -19926,8 +20680,15 @@ function buildPrReviewBundle(policy = resolvePrReviewPolicy()) {
           "#### Stale-lease reclaim",
           "",
           "A crashed or never-launched worker must not wedge a PR by holding",
-          "the lease forever. The **maintenance sweep** (not a reviewer pass)",
-          "owns reclaim. A `review:fixing` lease is **reclaimable** when",
+          "the lease forever, and a worker that pushes but skips its hand-off",
+          "must not wedge the PR either. The **maintenance sweep** (not a",
+          "reviewer pass) owns reconcile for **both** stuck states \u2014 its",
+          "`check-blocked.sh maintenance` invocation runs the reconcile",
+          "directly and emits a `LEASE_RECONCILE orphaned=<N>",
+          "consumed_uncleared=<M>` summary line. No human is needed to free a",
+          "stuck PR.",
+          "",
+          "**Orphaned lease.** A `review:fixing` lease is **orphaned** when",
           "**both** hold:",
           "",
           "- The PR carries `review:fixing` but **not**",
@@ -19939,11 +20700,90 @@ function buildPrReviewBundle(policy = resolvePrReviewPolicy()) {
           "",
           "Together these mean a delegation was kicked off, the marker was",
           "consumed-or-dropped, but no worker result ever landed \u2014 the lease",
-          "is orphaned. The maintenance sweep flags such a PR with",
-          "`status:needs-attention` so a human clears the orphaned",
-          "`review:fixing` label and re-triggers the reviewer; the sweep",
-          "never silently force-releases the lease, mirroring the",
-          "stale-issue policy of flagging rather than auto-resetting.",
+          "is orphaned. The maintenance sweep **re-applies**",
+          "`review:needs-worker` (re-arming the durable work marker so the",
+          "Phase B1 feedback drain retries the delegation) and posts an",
+          "audit-trail note comment. The `review:fixing` lease itself is left",
+          "untouched, so the drain stays idempotent. This is a deliberate",
+          "re-arm for autonomy \u2014 never a silent force-release: the note",
+          "comment is the audit trail proving the re-arm was the sweep's",
+          "doing.",
+          "",
+          "**Consumed-but-uncleared wedge.** The existing orphaned-lease",
+          "precondition (`review:fixing` *without* `review:needs-worker`)",
+          "structurally cannot see a worker that pushed its fix and then",
+          "skipped the hand-off \u2014 the marker is still set. The sweep detects",
+          "this wedge when a PR carries **both** `review:needs-worker` and",
+          "`review:fixing`, its branch HEAD commit is **newer** than the",
+          "fix-list comment, and there is **no** worker-report. It",
+          "auto-reconciles by **removing** `review:needs-worker` (the",
+          "hand-off the worker skipped) and posting an audit-trail reconcile",
+          "note comment, flipping the PR into the lease-without-marker",
+          "confirm-trigger state so the reviewer confirm pass takes over and",
+          "merges. As with the orphaned-lease path, the `review:fixing` lease",
+          "is left for that confirm pass to release.",
+          "",
+          "### Review-Label Invariants (Phase 2.8 reconciliation)",
+          "",
+          "A PR must never carry **mutually-exclusive review-workflow",
+          "labels** after a reviewer pass \u2014 the PR equivalent of the",
+          '"exactly one `status:*`" discipline issues already follow.',
+          "Successive passes layering labels with no reconciler can drive a",
+          "PR into an impossible state (a real PR once held",
+          "`review:awaiting-human` + `status:needs-attention` +",
+          "`review:fixing` + `review:needs-worker` at the same time). The",
+          "reviewer's **Phase 2.8 \u2014 Label Reconciliation** step enforces",
+          "the invariants below early in every pass, after Phase 2.75",
+          "decides the mode and after the confirm-trigger lease detection,",
+          "but before any phase branches on review state. Every correction",
+          "is logged on a `**Label reconciliation:**` line in the sticky",
+          "`## Reviewer notes` comment \u2014 labels are never mutated silently.",
+          "",
+          "**The invariants:**",
+          "",
+          "1. **`review:awaiting-human` is mutually exclusive with the",
+          "   fix-delegation labels (`review:needs-worker`,",
+          "   `review:fixing`).** A PR is **either** in the fix-delegation",
+          "   loop **or** handed to a human \u2014 never both. Any of",
+          "   `review:awaiting-human` + `review:needs-worker`,",
+          "   `review:awaiting-human` + `review:fixing`, or all three is a",
+          "   violation.",
+          "2. **`review:fixing` WITHOUT `review:needs-worker` is the",
+          "   confirm-pending state, not a violation.** The worker finished",
+          "   and cleared its marker; a confirm pass owns the PR and will",
+          "   release the lease. The reconciler must not strip it.",
+          "3. **`review:fixing` WITH `review:needs-worker` is a valid",
+          "   in-flight delegation, not a violation.** The work is durably",
+          "   queued for a top-level `issue-worker` pass.",
+          "4. **`status:needs-attention` is additive but must not coexist",
+          "   with a live, progressing in-flight delegation.** When",
+          "   `review:fixing` + `review:needs-worker` are present, the",
+          "   fix-list is newer than the flag, and there is no failed-fix",
+          "   pushback, the flag contradicts the live progress signal and is",
+          "   removed. A flag coexisting with a *stalled* / *failed*",
+          "   delegation, an unresolved `thinking_face` pushback, or a",
+          "   `human-required` hand-off is legitimate and stays.",
+          "",
+          "(`review:human-required` and `review:auto-ok` are **policy",
+          "inputs** read in Phase 2.75, not workflow-state labels \u2014 the",
+          "reconciler never touches them.)",
+          "",
+          "**Canonical resolution.** The losing label is chosen by the",
+          "Phase 2.75 mode plus the current loop position so the surviving",
+          "set matches the action the pass will take:",
+          "",
+          "| Violation combo | Loop position / mode | Resolution (winner) |",
+          "|-----------------|----------------------|---------------------|",
+          "| `review:awaiting-human` + fix-delegation label(s) | delegation in-flight or confirm-pending, mode `auto-merge` | **remove `review:awaiting-human`** \u2014 the delegation loop owns the PR |",
+          "| `review:awaiting-human` + fix-delegation label(s) | pass decided `human-required` (rules 2\u20135), no delegation actually in flight | **remove `review:needs-worker` + `review:fixing`** \u2014 the human hand-off wins; clear stale delegation labels |",
+          "| `status:needs-attention` + live progressing delegation | mode `auto-merge`, `review:fixing` + `review:needs-worker` present | **remove `status:needs-attention`** \u2014 contradicts the live progress signal |",
+          "",
+          "Resolution is **conservative about human intent**: a genuine",
+          "`human-required` pass clears the fix-delegation labels and keeps",
+          "the human-facing label; an `auto-merge` pass with a live",
+          "delegation keeps the delegation labels and clears the stray",
+          "`review:awaiting-human`. The reconciler only ever **removes** a",
+          "contradicting label \u2014 never adds one.",
           "",
           "### Sticky `## Reviewer notes` Comment",
           "",
@@ -19967,6 +20807,9 @@ function buildPrReviewBundle(policy = resolvePrReviewPolicy()) {
           "  reviewer reaction (`eyes`, open `thinking_face`).",
           "- **Pushbacks** \u2014 every unresolved `thinking_face` the reviewer",
           "  has left, with the reason captured in its pushback reply.",
+          "- **Label reconciliation** \u2014 the Phase 2.8 outcome: `consistent`",
+          "  or the corrections applied this pass (violation combo, labels",
+          "  removed, resulting self-consistent set), recorded for audit.",
           "- **Last pass** \u2014 the ISO 8601 timestamp of the most recent run.",
           "",
           "The sticky is updated on every pass \u2014 including passes that ended",
@@ -19990,7 +20833,7 @@ function buildPrReviewBundle(policy = resolvePrReviewPolicy()) {
           "| `review:human-required` | Force human review regardless of what the policy would otherwise decide. The reviewer never enables auto-merge on a PR carrying this label. |",
           "| `review:auto-ok` | Force auto-merge regardless of what the policy would otherwise decide. **Also resolves outstanding `thinking_face` pushbacks** as an explicit maintainer override; the reviewer logs the override in the sticky summary. |",
           "| `review:awaiting-human` | Set by the reviewer when it completes its work on a `human-required` PR and is handing off the final merge decision. Cleared by a human (or by `review:auto-ok` flipping the PR back to `auto-merge` mode). |",
-          "| `review:fixing` | **Cross-session** delegation lease. Acquired by the reviewer pass that posts a fix-list; held across the worker's run; released only by a later reviewer **confirm** pass (PR carries `review:fixing` but not `review:needs-worker`). A lease held without `review:needs-worker` past the stale threshold with no worker report is orphaned and is flagged by the maintenance sweep for human reclaim. |",
+          "| `review:fixing` | **Cross-session** delegation lease. Acquired by the reviewer pass that posts a fix-list; held across the worker's run; released only by a later reviewer **confirm** pass (PR carries `review:fixing` but not `review:needs-worker`). A lease held without `review:needs-worker` past the stale threshold with no worker report is orphaned and is auto-reconciled by the maintenance sweep \u2014 it re-applies `review:needs-worker` (re-arm) so the feedback drain retries, leaving the lease for the next confirm pass and posting an audit-trail note. |",
           "| `review:needs-worker` | **Durable hand-off marker.** Applied by the reviewer alongside the fix-list so a top-level `issue-worker` session discovers the PR and pulls the work (the reviewer cannot spawn the worker in session \u2014 it may run at depth-1). Cleared by the worker when it finishes applying the fix-list, which is what triggers the reviewer's confirm pass. |",
           "",
           "### Reviewing Human-Authored PRs: the `--allow-human-author` Flag",
@@ -29812,7 +30655,7 @@ var VERSION = {
   /**
    * Version of PNPM to use in workflows at github actions.
    */
-  PNPM_VERSION: "11.6.0",
+  PNPM_VERSION: "11.7.0",
   /**
    * Version of Projen to use.
    */