@jonit-dev/night-watch-cli 1.7.25 → 1.7.29

package/scripts/night-watch-audit-cron.sh

@@ -0,0 +1,149 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# Night Watch Audit Cron Runner (project-agnostic)
+# Usage: night-watch-audit-cron.sh /path/to/project
+#
+# NOTE: This script expects environment variables to be set by the caller.
+# The Node.js CLI will inject config values via environment variables.
+# Required env vars (with defaults shown):
+#   NW_AUDIT_MAX_RUNTIME=1800    - Maximum runtime in seconds (30 minutes)
+#   NW_PROVIDER_CMD=claude       - AI provider CLI to use (claude, codex, etc.)
+#   NW_DRY_RUN=0                 - Set to 1 for dry-run mode (prints diagnostics only)
+
+PROJECT_DIR="${1:?Usage: $0 /path/to/project}"
+PROJECT_NAME=$(basename "${PROJECT_DIR}")
+LOG_DIR="${PROJECT_DIR}/logs"
+LOG_FILE="${LOG_DIR}/audit.log"
+REPORT_FILE="${PROJECT_DIR}/logs/audit-report.md"
+MAX_RUNTIME="${NW_AUDIT_MAX_RUNTIME:-1800}"  # 30 minutes
+MAX_LOG_SIZE="524288"  # 512 KB
+PROVIDER_CMD="${NW_PROVIDER_CMD:-claude}"
+
+# Ensure NVM / Node / Claude are on PATH
+export NVM_DIR="${HOME}/.nvm"
+[ -s "${NVM_DIR}/nvm.sh" ] && . "${NVM_DIR}/nvm.sh"
+
+mkdir -p "${LOG_DIR}"
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+# shellcheck source=night-watch-helpers.sh
+source "${SCRIPT_DIR}/night-watch-helpers.sh"
+PROJECT_RUNTIME_KEY=$(project_runtime_key "${PROJECT_DIR}")
+# NOTE: Lock file path must match auditLockPath() in src/utils/status-data.ts
+LOCK_FILE="/tmp/night-watch-audit-${PROJECT_RUNTIME_KEY}.lock"
+
+emit_result() {
+  local status="${1:?status required}"
+  local details="${2:-}"
+  if [ -n "${details}" ]; then
+    echo "NIGHT_WATCH_RESULT:${status}|${details}"
+  else
+    echo "NIGHT_WATCH_RESULT:${status}"
+  fi
+}
+
+# Validate provider
+if ! validate_provider "${PROVIDER_CMD}"; then
+  echo "ERROR: Unknown provider: ${PROVIDER_CMD}" >&2
+  exit 1
+fi
+
+rotate_log
+
+if ! acquire_lock "${LOCK_FILE}"; then
+  emit_result "skip_locked"
+  exit 0
+fi
+
+# Dry-run mode: print diagnostics and exit
+if [ "${NW_DRY_RUN:-0}" = "1" ]; then
+  echo "=== Dry Run: Code Auditor ==="
+  echo "Provider: ${PROVIDER_CMD}"
+  echo "Max Runtime: ${MAX_RUNTIME}s"
+  echo "Report File: ${REPORT_FILE}"
+  emit_result "skip_dry_run"
+  exit 0
+fi
+
+if [ -n "${NW_DEFAULT_BRANCH:-}" ]; then
+  DEFAULT_BRANCH="${NW_DEFAULT_BRANCH}"
+else
+  DEFAULT_BRANCH=$(detect_default_branch "${PROJECT_DIR}")
+fi
+
+AUDIT_WORKTREE_BASENAME="${PROJECT_NAME}-nw-audit-runner"
+AUDIT_WORKTREE_DIR="$(dirname "${PROJECT_DIR}")/${AUDIT_WORKTREE_BASENAME}"
+
+cleanup_worktrees "${PROJECT_DIR}" "${AUDIT_WORKTREE_BASENAME}"
+
+if ! prepare_detached_worktree "${PROJECT_DIR}" "${AUDIT_WORKTREE_DIR}" "${DEFAULT_BRANCH}" "${LOG_FILE}"; then
+  log "FAIL: Unable to create isolated audit worktree ${AUDIT_WORKTREE_DIR}"
+  exit 1
+fi
+
+# Ensure the logs dir exists inside the worktree so the provider can write the report
+mkdir -p "${AUDIT_WORKTREE_DIR}/logs"
+
+log "START: Running code audit for ${PROJECT_NAME} (provider: ${PROVIDER_CMD})"
+
+EXIT_CODE=0
+
+case "${PROVIDER_CMD}" in
+  claude)
+    if (
+      cd "${AUDIT_WORKTREE_DIR}" && timeout "${MAX_RUNTIME}" \
+        claude -p "/night-watch-audit" \
+          --dangerously-skip-permissions \
+          >> "${LOG_FILE}" 2>&1
+    ); then
+      EXIT_CODE=0
+    else
+      EXIT_CODE=$?
+    fi
+    ;;
+  codex)
+    if (
+      cd "${AUDIT_WORKTREE_DIR}" && timeout "${MAX_RUNTIME}" \
+        codex --quiet \
+          --yolo \
+          --prompt "$(cat "${AUDIT_WORKTREE_DIR}/.claude/commands/night-watch-audit.md")" \
+          >> "${LOG_FILE}" 2>&1
+    ); then
+      EXIT_CODE=0
+    else
+      EXIT_CODE=$?
+    fi
+    ;;
+  *)
+    log "ERROR: Unknown provider: ${PROVIDER_CMD}"
+    exit 1
+    ;;
+esac
+
+# Copy report back to project dir (if it was written in the worktree)
+WORKTREE_REPORT="${AUDIT_WORKTREE_DIR}/logs/audit-report.md"
+if [ -f "${WORKTREE_REPORT}" ]; then
+  cp "${WORKTREE_REPORT}" "${REPORT_FILE}"
+  log "INFO: Audit report copied to ${REPORT_FILE}"
+fi
+
+cleanup_worktrees "${PROJECT_DIR}" "${AUDIT_WORKTREE_BASENAME}"
+
+if [ "${EXIT_CODE}" -eq 0 ]; then
+  if [ -f "${REPORT_FILE}" ] && grep -q "NO_ISSUES_FOUND" "${REPORT_FILE}" 2>/dev/null; then
+    log "DONE: Audit complete — no actionable issues found"
+    emit_result "skip_clean"
+  else
+    log "DONE: Audit complete — report written to ${REPORT_FILE}"
+    emit_result "success_audit"
+  fi
+elif [ "${EXIT_CODE}" -eq 124 ]; then
+  log "TIMEOUT: Audit killed after ${MAX_RUNTIME}s"
+  emit_result "timeout"
+else
+  log "FAIL: Audit exited with code ${EXIT_CODE}"
+  emit_result "failure"
+fi
+
+exit "${EXIT_CODE}"

package/scripts/night-watch-cron.sh

@@ -21,7 +21,7 @@ else
   PRD_DIR="${PROJECT_DIR}/${PRD_DIR_REL}"
 fi
 LOG_DIR="${PROJECT_DIR}/logs"
-LOG_FILE="${LOG_DIR}/night-watch.log"
+LOG_FILE="${LOG_DIR}/executor.log"
 MAX_RUNTIME="${NW_MAX_RUNTIME:-7200}"  # 2 hours
 MAX_LOG_SIZE="524288"  # 512 KB
 PROVIDER_CMD="${NW_PROVIDER_CMD:-claude}"
@@ -96,25 +96,44 @@ if [ "${NW_BOARD_ENABLED:-}" = "true" ]; then
     log "ERROR: Cannot resolve night-watch CLI for board mode"
     exit 1
   fi
-  ISSUE_JSON=$(find_eligible_board_issue)
-  if [ -z "${ISSUE_JSON}" ]; then
-    log "SKIP: No eligible issues in Ready column (board mode)"
-    emit_result "skip_no_eligible_prd"
-    exit 0
+
+  if [ -n "${NW_TARGET_ISSUE:-}" ]; then
+    # Targeted issue pickup: use specified issue directly (already "In Progress" from Slack trigger)
+    ISSUE_NUMBER="${NW_TARGET_ISSUE}"
+    log "BOARD: Using targeted issue #${ISSUE_NUMBER} (from NW_TARGET_ISSUE)"
+    ISSUE_JSON=$(gh issue view "${ISSUE_NUMBER}" --json number,title,body 2>/dev/null || true)
+    if [ -z "${ISSUE_JSON}" ]; then
+      log "ERROR: Cannot fetch issue #${ISSUE_NUMBER} via gh"
+      exit 1
+    fi
+    ISSUE_TITLE_RAW=$(printf '%s' "${ISSUE_JSON}" | jq -r '.title // empty' 2>/dev/null || true)
+    ISSUE_BODY=$(printf '%s' "${ISSUE_JSON}" | jq -r '.body // empty' 2>/dev/null || true)
+  else
+    ISSUE_JSON=$(find_eligible_board_issue)
+    if [ -z "${ISSUE_JSON}" ]; then
+      log "SKIP: No eligible issues in Ready column (board mode)"
+      emit_result "skip_no_eligible_prd"
+      exit 0
+    fi
+    ISSUE_NUMBER=$(printf '%s' "${ISSUE_JSON}" | jq -r '.number // empty' 2>/dev/null || true)
+    ISSUE_TITLE_RAW=$(printf '%s' "${ISSUE_JSON}" | jq -r '.title // empty' 2>/dev/null || true)
+    ISSUE_BODY=$(printf '%s' "${ISSUE_JSON}" | jq -r '.body // empty' 2>/dev/null || true)
+    if [ -z "${ISSUE_NUMBER}" ]; then
+      log "ERROR: Board mode: failed to parse issue number from JSON"
+      exit 1
+    fi
+    # Move issue to In Progress (claim it on the board)
+    "${NW_CLI}" board move-issue "${ISSUE_NUMBER}" --column "In Progress" 2>>"${LOG_FILE}" || \
+      log "WARN: Failed to move issue #${ISSUE_NUMBER} to In Progress"
   fi
-  ISSUE_NUMBER=$(printf '%s' "${ISSUE_JSON}" | jq -r '.number // empty' 2>/dev/null || true)
-  ISSUE_TITLE_RAW=$(printf '%s' "${ISSUE_JSON}" | jq -r '.title // empty' 2>/dev/null || true)
-  ISSUE_BODY=$(printf '%s' "${ISSUE_JSON}" | jq -r '.body // empty' 2>/dev/null || true)
+
   if [ -z "${ISSUE_NUMBER}" ]; then
-    log "ERROR: Board mode: failed to parse issue number from JSON"
+    log "ERROR: Board mode: no issue number resolved"
     exit 1
   fi
   # Slugify title for branch naming
   ELIGIBLE_PRD="${ISSUE_NUMBER}-$(printf '%s' "${ISSUE_TITLE_RAW}" | tr '[:upper:]' '[:lower:]' | tr -cs 'a-z0-9' '-' | sed 's/^-\|-$//g')"
-  log "BOARD: Found ready issue #${ISSUE_NUMBER}: ${ISSUE_TITLE_RAW}"
-  # Move issue to In Progress (claim it on the board)
-  "${NW_CLI}" board move-issue "${ISSUE_NUMBER}" --column "In Progress" 2>>"${LOG_FILE}" || \
-    log "WARN: Failed to move issue #${ISSUE_NUMBER} to In Progress"
+  log "BOARD: Processing issue #${ISSUE_NUMBER}: ${ISSUE_TITLE_RAW}"
   trap "rm -f '${LOCK_FILE}'" EXIT
 else
   # Filesystem mode: scan PRD directory

package/scripts/night-watch-helpers.sh

@@ -305,17 +305,25 @@ find_eligible_prd() {
 }
 
 # ── Clean up worktrees ───────────────────────────────────────────────────────
-# Removes any worktrees with "-nw-" in the path (night-watch worktrees).
+# Removes night-watch worktrees for this project.
+# Optional second argument narrows cleanup to worktrees containing that token.
+# This prevents parallel reviewer workers from deleting each other's worktrees.
 
 cleanup_worktrees() {
   local project_dir="${1:?project_dir required}"
+  local scope="${2:-}"
   local project_name
   project_name=$(basename "${project_dir}")
 
+  local match_token="${project_name}-nw"
+  if [ -n "${scope}" ]; then
+    match_token="${scope}"
+  fi
+
   git -C "${project_dir}" worktree list --porcelain 2>/dev/null \
     | grep '^worktree ' \
     | awk '{print $2}' \
-    | grep "${project_name}-nw" \
+    | grep -F "${match_token}" \
     | while read -r wt; do
         log "CLEANUP: Removing leftover worktree ${wt}"
         git -C "${project_dir}" worktree remove --force "${wt}" 2>/dev/null || true

package/scripts/night-watch-pr-reviewer-cron.sh

@@ -16,7 +16,7 @@ set -euo pipefail
 PROJECT_DIR="${1:?Usage: $0 /path/to/project}"
 PROJECT_NAME=$(basename "${PROJECT_DIR}")
 LOG_DIR="${PROJECT_DIR}/logs"
-LOG_FILE="${LOG_DIR}/night-watch-pr-reviewer.log"
+LOG_FILE="${LOG_DIR}/reviewer.log"
 MAX_RUNTIME="${NW_REVIEWER_MAX_RUNTIME:-3600}"  # 1 hour
 MAX_LOG_SIZE="524288"  # 512 KB
 PROVIDER_CMD="${NW_PROVIDER_CMD:-claude}"
@@ -25,6 +25,8 @@ BRANCH_PATTERNS_RAW="${NW_BRANCH_PATTERNS:-feat/,night-watch/}"
 AUTO_MERGE="${NW_AUTO_MERGE:-0}"
 AUTO_MERGE_METHOD="${NW_AUTO_MERGE_METHOD:-squash}"
 TARGET_PR="${NW_TARGET_PR:-}"
+PARALLEL_ENABLED="${NW_REVIEWER_PARALLEL:-1}"
+WORKER_MODE="${NW_REVIEWER_WORKER_MODE:-0}"
 
 # Ensure NVM / Node / Claude are on PATH
 export NVM_DIR="${HOME}/.nvm"
@@ -39,8 +41,13 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 # shellcheck source=night-watch-helpers.sh
 source "${SCRIPT_DIR}/night-watch-helpers.sh"
 PROJECT_RUNTIME_KEY=$(project_runtime_key "${PROJECT_DIR}")
-# NOTE: Lock file path must match reviewerLockPath() in src/utils/status-data.ts
-LOCK_FILE="/tmp/night-watch-pr-reviewer-${PROJECT_RUNTIME_KEY}.lock"
+GLOBAL_LOCK_FILE="/tmp/night-watch-pr-reviewer-${PROJECT_RUNTIME_KEY}.lock"
+if [ "${WORKER_MODE}" = "1" ] && [ -n "${TARGET_PR}" ]; then
+  LOCK_FILE="/tmp/night-watch-pr-reviewer-${PROJECT_RUNTIME_KEY}-pr-${TARGET_PR}.lock"
+else
+  # NOTE: Lock file path must match reviewerLockPath() in src/utils/status-data.ts
+  LOCK_FILE="${GLOBAL_LOCK_FILE}"
+fi
 
 emit_result() {
   local status="${1:?status required}"
@@ -52,6 +59,38 @@ emit_result() {
   fi
 }
 
+emit_final_status() {
+  local exit_code="${1:?exit code required}"
+  local prs_csv="${2:-}"
+  local auto_merged="${3:-}"
+  local auto_merge_failed="${4:-}"
+
+  if [ "${exit_code}" -eq 0 ]; then
+    log "DONE: PR reviewer completed successfully"
+    emit_result "success_reviewed" "prs=${prs_csv}|auto_merged=${auto_merged}|auto_merge_failed=${auto_merge_failed}"
+  elif [ "${exit_code}" -eq 124 ]; then
+    log "TIMEOUT: PR reviewer killed after ${MAX_RUNTIME}s"
+    emit_result "timeout" "prs=${prs_csv}"
+  else
+    log "FAIL: PR reviewer exited with code ${exit_code}"
+    emit_result "failure" "prs=${prs_csv}"
+  fi
+}
+
+append_csv() {
+  local current="${1:-}"
+  local incoming="${2:-}"
+  if [ -z "${incoming}" ]; then
+    printf "%s" "${current}"
+    return 0
+  fi
+  if [ -z "${current}" ]; then
+    printf "%s" "${incoming}"
+  else
+    printf "%s,%s" "${current}" "${incoming}"
+  fi
+}
+
 # Validate provider
 if ! validate_provider "${PROVIDER_CMD}"; then
   echo "ERROR: Unknown provider: ${PROVIDER_CMD}" >&2
@@ -159,6 +198,62 @@ done < <(gh pr list --state open --json number,headRefName --jq '.[] | [.number,
 
 if [ "${NEEDS_WORK}" -eq 0 ]; then
   log "SKIP: All ${OPEN_PRS} open PR(s) have passing CI and review score >= ${MIN_REVIEW_SCORE} (or no score yet)"
+
+  # ── Auto-merge eligible PRs ───────────────────────────────
+  if [ "${NW_AUTO_MERGE:-0}" = "1" ]; then
+    AUTO_MERGE_METHOD="${NW_AUTO_MERGE_METHOD:-squash}"
+    AUTO_MERGED_COUNT=0
+
+    log "AUTO-MERGE: Checking for merge-ready PRs (method: ${AUTO_MERGE_METHOD})"
+
+    while IFS=$'\t' read -r pr_number pr_branch; do
+      [ -z "${pr_number}" ] || [ -z "${pr_branch}" ] && continue
+      printf '%s\n' "${pr_branch}" | grep -Eq "${BRANCH_REGEX}" || continue
+
+      # Check CI status
+      FAILED_CHECKS=$(gh pr checks "${pr_number}" 2>/dev/null | grep -ci 'fail' || true)
+      [ "${FAILED_CHECKS}" -gt 0 ] && continue
+
+      # Check review score
+      PR_COMMENTS=$(
+        {
+          gh pr view "${pr_number}" --json comments --jq '.comments[].body' 2>/dev/null || true
+          if [ -n "${REPO}" ]; then
+            gh api "repos/${REPO}/issues/${pr_number}/comments" --jq '.[].body' 2>/dev/null || true
+          fi
+        } | sort -u
+      )
+      PR_SCORE=$(echo "${PR_COMMENTS}" \
+        | grep -oP 'Overall Score:\*?\*?\s*(\d+)/100' \
+        | tail -1 \
+        | grep -oP '\d+(?=/100)' || echo "")
+
+      # Skip PRs without a score or with score below threshold
+      [ -z "${PR_SCORE}" ] && continue
+      [ "${PR_SCORE}" -lt "${MIN_REVIEW_SCORE}" ] && continue
+
+      # PR is merge-ready
+      log "AUTO-MERGE: PR #${pr_number} (${pr_branch}) — score ${PR_SCORE}/100, CI passing"
+
+      # Dry-run mode: show what would be merged
+      if [ "${NW_DRY_RUN:-0}" = "1" ]; then
+        log "AUTO-MERGE (dry-run): Would queue merge for PR #${pr_number} using ${AUTO_MERGE_METHOD}"
+        continue
+      fi
+
+      if gh pr merge "${pr_number}" --"${AUTO_MERGE_METHOD}" --auto --delete-branch 2>>"${LOG_FILE}"; then
+        log "AUTO-MERGE: Successfully queued merge for PR #${pr_number}"
+        AUTO_MERGED_COUNT=$((AUTO_MERGED_COUNT + 1))
+      else
+        log "WARN: Auto-merge failed for PR #${pr_number}"
+      fi
+    done < <(gh pr list --state open --json number,headRefName --jq '.[] | [.number, .headRefName] | @tsv' 2>/dev/null || true)
+
+    if [ "${AUTO_MERGED_COUNT}" -gt 0 ]; then
+      log "AUTO-MERGE: Queued ${AUTO_MERGED_COUNT} PR(s) for merge"
+    fi
+  fi
+
   emit_result "skip_all_passing"
   exit 0
 fi
@@ -172,11 +267,121 @@ if [ -n "${NW_DEFAULT_BRANCH:-}" ]; then
 else
   DEFAULT_BRANCH=$(detect_default_branch "${PROJECT_DIR}")
 fi
-REVIEW_WORKTREE_DIR="$(dirname "${PROJECT_DIR}")/${PROJECT_NAME}-nw-review-runner"
 
 log "START: Found PR(s) needing work:${PRS_NEEDING_WORK}"
 
-cleanup_worktrees "${PROJECT_DIR}"
+# Convert "#12 #34" into ["12", "34"] for worker fan-out.
+PR_NUMBER_ARRAY=()
+for pr_token in ${PRS_NEEDING_WORK}; do
+  PR_NUMBER_ARRAY+=("${pr_token#\#}")
+done
+
+if [ -z "${TARGET_PR}" ] && [ "${WORKER_MODE}" != "1" ] && [ "${PARALLEL_ENABLED}" = "1" ] && [ "${#PR_NUMBER_ARRAY[@]}" -gt 1 ]; then
+  # Dry-run mode: print diagnostics and exit
+  if [ "${NW_DRY_RUN:-0}" = "1" ]; then
+    echo "=== Dry Run: PR Reviewer ==="
+    echo "Provider: ${PROVIDER_CMD}"
+    echo "Branch Patterns: ${BRANCH_PATTERNS_RAW}"
+    echo "Min Review Score: ${MIN_REVIEW_SCORE}"
+    echo "Auto-merge: ${AUTO_MERGE}"
+    if [ "${AUTO_MERGE}" = "1" ]; then
+      echo "Auto-merge Method: ${AUTO_MERGE_METHOD}"
+    fi
+    echo "Open PRs needing work:${PRS_NEEDING_WORK}"
+    echo "Default Branch: ${DEFAULT_BRANCH}"
+    echo "Parallel Workers: ${#PR_NUMBER_ARRAY[@]}"
+    echo "Timeout: ${MAX_RUNTIME}s"
+    exit 0
+  fi
+
+  log "PARALLEL: Launching ${#PR_NUMBER_ARRAY[@]} reviewer worker(s)"
+
+  declare -a WORKER_PIDS=()
+  declare -a WORKER_PRS=()
+  declare -a WORKER_OUTPUTS=()
+
+  for pr_number in "${PR_NUMBER_ARRAY[@]}"; do
+    worker_output=$(mktemp "/tmp/night-watch-pr-reviewer-${PROJECT_RUNTIME_KEY}-pr-${pr_number}.XXXXXX")
+    WORKER_OUTPUTS+=("${worker_output}")
+    WORKER_PRS+=("${pr_number}")
+
+    (
+      NW_TARGET_PR="${pr_number}" \
+      NW_REVIEWER_WORKER_MODE="1" \
+      NW_REVIEWER_PARALLEL="0" \
+      bash "${SCRIPT_DIR}/night-watch-pr-reviewer-cron.sh" "${PROJECT_DIR}" > "${worker_output}" 2>&1
+    ) &
+
+    worker_pid=$!
+    WORKER_PIDS+=("${worker_pid}")
+    log "PARALLEL: Worker PID ${worker_pid} started for PR #${pr_number}"
+  done
+
+  EXIT_CODE=0
+  AUTO_MERGED_PRS=""
+  AUTO_MERGE_FAILED_PRS=""
+
+  for idx in "${!WORKER_PIDS[@]}"; do
+    worker_pid="${WORKER_PIDS[$idx]}"
+    worker_pr="${WORKER_PRS[$idx]}"
+    worker_output="${WORKER_OUTPUTS[$idx]}"
+
+    worker_exit_code=0
+    if wait "${worker_pid}"; then
+      worker_exit_code=0
+    else
+      worker_exit_code=$?
+    fi
+
+    if [ -f "${worker_output}" ] && [ -s "${worker_output}" ]; then
+      cat "${worker_output}" >> "${LOG_FILE}"
+    fi
+
+    worker_result=$(grep -o 'NIGHT_WATCH_RESULT:.*' "${worker_output}" 2>/dev/null | tail -1 || true)
+    worker_status=$(printf '%s' "${worker_result}" | sed -n 's/^NIGHT_WATCH_RESULT:\([^|]*\).*$/\1/p')
+    worker_auto_merged=$(printf '%s' "${worker_result}" | grep -oP '(?<=auto_merged=)[^|]+' || true)
+    worker_auto_merge_failed=$(printf '%s' "${worker_result}" | grep -oP '(?<=auto_merge_failed=)[^|]+' || true)
+
+    AUTO_MERGED_PRS=$(append_csv "${AUTO_MERGED_PRS}" "${worker_auto_merged}")
+    AUTO_MERGE_FAILED_PRS=$(append_csv "${AUTO_MERGE_FAILED_PRS}" "${worker_auto_merge_failed}")
+
+    rm -f "${worker_output}"
+
+    if [ "${worker_status}" = "failure" ] || { [ -n "${worker_status}" ] && [ "${worker_status}" != "success_reviewed" ] && [ "${worker_status}" != "timeout" ] && [ "${worker_status#skip_}" = "${worker_status}" ]; }; then
+      if [ "${EXIT_CODE}" -eq 0 ] || [ "${EXIT_CODE}" -eq 124 ]; then
+        EXIT_CODE=1
+      fi
+      log "PARALLEL: Worker for PR #${worker_pr} reported status '${worker_status:-unknown}'"
+    elif [ "${worker_status}" = "timeout" ]; then
+      if [ "${EXIT_CODE}" -eq 0 ]; then
+        EXIT_CODE=124
+      fi
+      log "PARALLEL: Worker for PR #${worker_pr} timed out"
+    elif [ "${worker_exit_code}" -ne 0 ]; then
+      if [ "${worker_exit_code}" -eq 124 ]; then
+        if [ "${EXIT_CODE}" -eq 0 ]; then
+          EXIT_CODE=124
+        fi
+      elif [ "${EXIT_CODE}" -eq 0 ] || [ "${EXIT_CODE}" -eq 124 ]; then
+        EXIT_CODE="${worker_exit_code}"
+      fi
+      log "PARALLEL: Worker for PR #${worker_pr} exited with code ${worker_exit_code}"
+    else
+      log "PARALLEL: Worker for PR #${worker_pr} completed"
+    fi
+  done
+
+  emit_final_status "${EXIT_CODE}" "${PRS_NEEDING_WORK_CSV}" "${AUTO_MERGED_PRS}" "${AUTO_MERGE_FAILED_PRS}"
+  exit 0
+fi
+
+REVIEW_WORKTREE_BASENAME="${PROJECT_NAME}-nw-review-runner"
+if [ -n "${TARGET_PR}" ]; then
+  REVIEW_WORKTREE_BASENAME="${REVIEW_WORKTREE_BASENAME}-pr-${TARGET_PR}"
+fi
+REVIEW_WORKTREE_DIR="$(dirname "${PROJECT_DIR}")/${REVIEW_WORKTREE_BASENAME}"
+
+cleanup_worktrees "${PROJECT_DIR}" "${REVIEW_WORKTREE_BASENAME}"
 
 # Dry-run mode: print diagnostics and exit
 if [ "${NW_DRY_RUN:-0}" = "1" ]; then
@@ -191,6 +396,10 @@ if [ "${NW_DRY_RUN:-0}" = "1" ]; then
   echo "Open PRs needing work:${PRS_NEEDING_WORK}"
   echo "Default Branch: ${DEFAULT_BRANCH}"
   echo "Review Worktree: ${REVIEW_WORKTREE_DIR}"
+  echo "Target PR: ${TARGET_PR:-all}"
+  if [ -n "${TARGET_PR}" ]; then
+    echo "Worker Mode: ${WORKER_MODE}"
+  fi
   echo "Timeout: ${MAX_RUNTIME}s"
   exit 0
 fi
@@ -201,12 +410,17 @@ if ! prepare_detached_worktree "${PROJECT_DIR}" "${REVIEW_WORKTREE_DIR}" "${DEFA
 fi
 
 EXIT_CODE=0
+TARGET_SCOPE_PROMPT=""
+if [ -n "${TARGET_PR}" ]; then
+  TARGET_SCOPE_PROMPT=$'\n\n## Target Scope\n- Only process PR #'"${TARGET_PR}"$'.\n- Ignore all other PRs.\n- If this PR no longer needs work, stop immediately.\n'
+fi
 
 case "${PROVIDER_CMD}" in
   claude)
+    CLAUDE_PROMPT="/night-watch-pr-reviewer${TARGET_SCOPE_PROMPT}"
     if (
       cd "${REVIEW_WORKTREE_DIR}" && timeout "${MAX_RUNTIME}" \
-        claude -p "/night-watch-pr-reviewer" \
+        claude -p "${CLAUDE_PROMPT}" \
           --dangerously-skip-permissions \
           >> "${LOG_FILE}" 2>&1
     ); then
@@ -216,11 +430,12 @@ case "${PROVIDER_CMD}" in
     fi
     ;;
   codex)
+    CODEX_PROMPT="$(cat "${REVIEW_WORKTREE_DIR}/.claude/commands/night-watch-pr-reviewer.md")${TARGET_SCOPE_PROMPT}"
     if (
       cd "${REVIEW_WORKTREE_DIR}" && timeout "${MAX_RUNTIME}" \
         codex --quiet \
           --yolo \
-          --prompt "$(cat "${REVIEW_WORKTREE_DIR}/.claude/commands/night-watch-pr-reviewer.md")" \
+          --prompt "${CODEX_PROMPT}" \
           >> "${LOG_FILE}" 2>&1
     ); then
       EXIT_CODE=0
@@ -234,7 +449,7 @@ case "${PROVIDER_CMD}" in
     ;;
 esac
 
-cleanup_worktrees "${PROJECT_DIR}"
+cleanup_worktrees "${PROJECT_DIR}" "${REVIEW_WORKTREE_BASENAME}"
 
 # ── Auto-merge eligible PRs ─────────────────────────────────────────────────────
 # After the reviewer completes, check for PRs that are merge-ready and queue them
@@ -310,13 +525,4 @@ if [ "${AUTO_MERGE}" = "1" ] && [ ${EXIT_CODE} -eq 0 ]; then
   done < <(gh pr list --state open --json number,headRefName --jq '.[] | [.number, .headRefName] | @tsv' 2>/dev/null || true)
 fi
 
-if [ ${EXIT_CODE} -eq 0 ]; then
-  log "DONE: PR reviewer completed successfully"
-  emit_result "success_reviewed" "prs=${PRS_NEEDING_WORK_CSV}|auto_merged=${AUTO_MERGED_PRS}|auto_merge_failed=${AUTO_MERGE_FAILED_PRS}"
-elif [ ${EXIT_CODE} -eq 124 ]; then
-  log "TIMEOUT: PR reviewer killed after ${MAX_RUNTIME}s"
-  emit_result "timeout" "prs=${PRS_NEEDING_WORK_CSV}"
-else
-  log "FAIL: PR reviewer exited with code ${EXIT_CODE}"
-  emit_result "failure" "prs=${PRS_NEEDING_WORK_CSV}"
-fi
+emit_final_status "${EXIT_CODE}" "${PRS_NEEDING_WORK_CSV}" "${AUTO_MERGED_PRS}" "${AUTO_MERGE_FAILED_PRS}"