@jonit-dev/night-watch-cli 1.8.8-beta.1 → 1.8.8-beta.10

package/dist/scripts/night-watch-helpers.sh

@@ -589,6 +589,11 @@ cleanup_worktrees() {
   local project_name
   project_name=$(basename "${project_dir}")
 
+  # Clear stale worktree registrations first. This fixes cases where a
+  # worktree directory was deleted out-of-band (for example by an agent
+  # runtime crash), leaving Git thinking the branch is still in use.
+  git -C "${project_dir}" worktree prune >/dev/null 2>&1 || true
+
   local match_token="${project_name}-nw"
   if [ -n "${scope}" ]; then
     match_token="${scope}"
@@ -602,6 +607,10 @@ cleanup_worktrees() {
         log "CLEANUP: Removing leftover worktree ${wt}"
         git -C "${project_dir}" worktree remove --force "${wt}" 2>/dev/null || true
       done || true
+
+  # Prune again after removals so Git drops any admin entries left behind by
+  # force-removal or previously broken worktrees outside Night Watch naming.
+  git -C "${project_dir}" worktree prune >/dev/null 2>&1 || true
 }
 
 # Pick the best available ref for creating a new detached worktree.
@@ -1149,7 +1158,7 @@ dispatch_next_queued_job() {
   log "QUEUE: Checking for pending jobs to dispatch"
 
   # Call CLI to dispatch next job (this handles priority, expiration, and spawning)
-  "${cli_bin}" queue dispatch --log "${LOG_FILE:-/dev/null}" 2>/dev/null || true
+  "${cli_bin}" queue dispatch --project-dir "${PROJECT_DIR:-$(pwd)}" --log "${LOG_FILE:-/dev/null}" 2>/dev/null || true
 }
 
 complete_queued_job() {

package/dist/scripts/night-watch-pr-resolver-cron.sh

@@ -0,0 +1,402 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# Night Watch PR Resolver Cron Runner (project-agnostic)
+# Usage: night-watch-pr-resolver-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_PR_RESOLVER_MAX_RUNTIME=3600          - Maximum runtime in seconds (1 hour)
+#   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)
+#   NW_PR_RESOLVER_MAX_PRS_PER_RUN=0         - Max PRs to process per run (0 = unlimited)
+#   NW_PR_RESOLVER_PER_PR_TIMEOUT=600        - Per-PR AI timeout in seconds
+#   NW_PR_RESOLVER_AI_CONFLICT_RESOLUTION=1  - Set to 1 to use AI for conflict resolution
+#   NW_PR_RESOLVER_AI_REVIEW_RESOLUTION=0    - Set to 1 to also address review comments
+#   NW_PR_RESOLVER_READY_LABEL=ready-to-merge - Label to add when PR is conflict-free
+#   NW_PR_RESOLVER_BRANCH_PATTERNS=          - Comma-separated branch prefixes to filter (empty = all)
+
+PROJECT_DIR="${1:?Usage: $0 /path/to/project}"
+PROJECT_NAME=$(basename "${PROJECT_DIR}")
+LOG_DIR="${PROJECT_DIR}/logs"
+LOG_FILE="${LOG_DIR}/pr-resolver.log"
+MAX_RUNTIME="${NW_PR_RESOLVER_MAX_RUNTIME:-3600}"  # 1 hour
+MAX_LOG_SIZE="524288"  # 512 KB
+PROVIDER_CMD="${NW_PROVIDER_CMD:-claude}"
+PROVIDER_LABEL="${NW_PROVIDER_LABEL:-}"
+MAX_PRS_PER_RUN="${NW_PR_RESOLVER_MAX_PRS_PER_RUN:-0}"
+PER_PR_TIMEOUT="${NW_PR_RESOLVER_PER_PR_TIMEOUT:-600}"
+AI_CONFLICT_RESOLUTION="${NW_PR_RESOLVER_AI_CONFLICT_RESOLUTION:-1}"
+AI_REVIEW_RESOLUTION="${NW_PR_RESOLVER_AI_REVIEW_RESOLUTION:-0}"
+READY_LABEL="${NW_PR_RESOLVER_READY_LABEL:-ready-to-merge}"
+BRANCH_PATTERNS_RAW="${NW_PR_RESOLVER_BRANCH_PATTERNS:-}"
+SCRIPT_START_TIME=$(date +%s)
+
+# Normalize numeric settings to safe ranges
+if ! [[ "${MAX_PRS_PER_RUN}" =~ ^[0-9]+$ ]]; then
+  MAX_PRS_PER_RUN="0"
+fi
+if ! [[ "${PER_PR_TIMEOUT}" =~ ^[0-9]+$ ]]; then
+  PER_PR_TIMEOUT="600"
+fi
+if [ "${MAX_PRS_PER_RUN}" -gt 100 ]; then
+  MAX_PRS_PER_RUN="100"
+fi
+if [ "${PER_PR_TIMEOUT}" -gt 3600 ]; then
+  PER_PR_TIMEOUT="3600"
+fi
+
+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"
+
+# Ensure provider CLI is on PATH (nvm, fnm, volta, common bin dirs)
+if ! ensure_provider_on_path "${PROVIDER_CMD}"; then
+  echo "ERROR: Provider '${PROVIDER_CMD}' not found in PATH or common installation locations" >&2
+  exit 127
+fi
+PROJECT_RUNTIME_KEY=$(project_runtime_key "${PROJECT_DIR}")
+PROVIDER_MODEL_DISPLAY=$(resolve_provider_model_display "${PROVIDER_CMD}" "${PROVIDER_LABEL}")
+# NOTE: Lock file path must match resolverLockPath() in src/utils/status-data.ts
+LOCK_FILE="/tmp/night-watch-pr-resolver-${PROJECT_RUNTIME_KEY}.lock"
+SCRIPT_TYPE="pr-resolver"
+
+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
+}
+
+# ── Global Job Queue Gate ────────────────────────────────────────────────────
+# Atomically claim a DB slot or enqueue for later dispatch — no flock needed.
+if [ "${NW_QUEUE_ENABLED:-0}" = "1" ]; then
+  if [ "${NW_QUEUE_DISPATCHED:-0}" = "1" ]; then
+    arm_global_queue_cleanup
+  else
+    claim_or_enqueue "${SCRIPT_TYPE}" "${PROJECT_DIR}"
+  fi
+fi
+# ──────────────────────────────────────────────────────────────────────────────
+
+# PR discovery: returns JSON array of open PRs with required fields
+discover_open_prs() {
+  gh pr list --state open \
+    --json number,title,headRefName,mergeable,isDraft,labels \
+    2>/dev/null || echo "[]"
+}
+
+# Check if a branch matches any configured branch prefix patterns.
+# Returns 0 (match/pass) or 1 (no match, skip PR).
+matches_branch_patterns() {
+  local branch="${1}"
+  if [ -z "${BRANCH_PATTERNS_RAW}" ]; then
+    return 0  # No filter configured = match all
+  fi
+  IFS=',' read -ra patterns <<< "${BRANCH_PATTERNS_RAW}"
+  for pattern in "${patterns[@]}"; do
+    pattern="${pattern# }"  # trim leading space
+    if [[ "${branch}" == ${pattern}* ]]; then
+      return 0
+    fi
+  done
+  return 1
+}
+
+# Process a single PR: resolve conflicts and/or review comments, then label.
+# Echoes "ready" if the PR ends up conflict-free, "conflicted" otherwise.
+# Returns 0 on success, 1 on unrecoverable failure.
+process_pr() {
+  local pr_number="${1:?pr_number required}"
+  local pr_branch="${2:?pr_branch required}"
+  local pr_title="${3:-}"
+  local worktree_dir="/tmp/nw-resolver-pr${pr_number}-$$"
+
+  log "INFO: Processing PR #${pr_number}: ${pr_title}" "branch=${pr_branch}"
+
+  # Inner cleanup for worktree created during this PR's processing
+  cleanup_pr_worktree() {
+    if git -C "${PROJECT_DIR}" worktree list --porcelain 2>/dev/null \
+        | grep -qF "worktree ${worktree_dir}"; then
+      git -C "${PROJECT_DIR}" worktree remove --force "${worktree_dir}" 2>/dev/null || true
+    fi
+    rm -rf "${worktree_dir}" 2>/dev/null || true
+  }
+
+  # ── Determine default branch ─────────────────────────────────────────────
+  local default_branch
+  default_branch="${NW_DEFAULT_BRANCH:-}"
+  if [ -z "${default_branch}" ]; then
+    default_branch=$(detect_default_branch "${PROJECT_DIR}")
+  fi
+
+  # ── Check current mergeable status ──────────────────────────────────────
+  local mergeable
+  mergeable=$(gh pr view "${pr_number}" --json mergeable --jq '.mergeable' 2>/dev/null || echo "UNKNOWN")
+
+  if [ "${mergeable}" = "CONFLICTING" ]; then
+    log "INFO: PR #${pr_number} has conflicts, attempting resolution" "branch=${pr_branch}"
+
+    # Fetch the PR branch so we have an up-to-date ref
+    git -C "${PROJECT_DIR}" fetch --quiet origin "${pr_branch}" 2>/dev/null || true
+
+    # Create an isolated worktree on the PR branch
+    if ! prepare_branch_worktree "${PROJECT_DIR}" "${worktree_dir}" "${pr_branch}" "${default_branch}" "${LOG_FILE}"; then
+      log "WARN: Failed to create worktree for PR #${pr_number}" "branch=${pr_branch}"
+      cleanup_pr_worktree
+      return 1
+    fi
+
+    local rebase_success=0
+
+    # Attempt a clean rebase first (no AI needed if it auto-resolves)
+    if git -C "${worktree_dir}" rebase "origin/${default_branch}" --quiet 2>/dev/null; then
+      rebase_success=1
+      log "INFO: PR #${pr_number} rebased cleanly (no conflicts)" "branch=${pr_branch}"
+    else
+      # Clean up the failed rebase state
+      git -C "${worktree_dir}" rebase --abort 2>/dev/null || true
+
+      if [ "${AI_CONFLICT_RESOLUTION}" = "1" ]; then
+        log "INFO: Invoking AI to resolve conflicts for PR #${pr_number}" "branch=${pr_branch}"
+
+        local ai_prompt
+        ai_prompt="You are working in a git repository at ${worktree_dir}. \
+Branch '${pr_branch}' has merge conflicts with '${default_branch}'. \
+Please resolve the merge conflicts by: \
+1) Running: git rebase origin/${default_branch} \
+2) Resolving any conflict markers in the affected files \
+3) Staging resolved files with: git add <files> \
+4) Continuing the rebase with: git rebase --continue \
+5) Finally pushing with: git push --force-with-lease origin ${pr_branch} \
+Work exclusively in the directory: ${worktree_dir}"
+
+        local -a cmd_parts
+        mapfile -d '' -t cmd_parts < <(build_provider_cmd "${worktree_dir}" "${ai_prompt}")
+
+        if timeout "${PER_PR_TIMEOUT}" "${cmd_parts[@]}" >> "${LOG_FILE}" 2>&1; then
+          rebase_success=1
+          log "INFO: AI resolved conflicts for PR #${pr_number}" "branch=${pr_branch}"
+        else
+          log "WARN: AI failed to resolve conflicts for PR #${pr_number}" "branch=${pr_branch}"
+          cleanup_pr_worktree
+          return 1
+        fi
+      else
+        log "WARN: Skipping PR #${pr_number} — conflicts exist and AI resolution is disabled" "branch=${pr_branch}"
+        cleanup_pr_worktree
+        return 1
+      fi
+    fi
+
+    if [ "${rebase_success}" = "1" ]; then
+      # Safety: never force-push to the default branch
+      if [ "${pr_branch}" = "${default_branch}" ]; then
+        log "WARN: Refusing to force-push to default branch ${default_branch} for PR #${pr_number}"
+        cleanup_pr_worktree
+        return 1
+      fi
+      # Push the rebased branch (AI may have already pushed; --force-with-lease is idempotent)
+      git -C "${worktree_dir}" push --force-with-lease origin "${pr_branch}" >> "${LOG_FILE}" 2>&1 || {
+        log "WARN: Push after rebase failed for PR #${pr_number}" "branch=${pr_branch}"
+      }
+    fi
+  fi
+
+  # ── Secondary: AI review comment resolution (opt-in) ────────────────────
+  if [ "${AI_REVIEW_RESOLUTION}" = "1" ]; then
+    local unresolved_count
+    unresolved_count=$(gh api "repos/{owner}/{repo}/pulls/${pr_number}/reviews" \
+      --jq '[.[] | select(.state == "CHANGES_REQUESTED")] | length' 2>/dev/null || echo "0")
+
+    if [ "${unresolved_count}" -gt "0" ]; then
+      log "INFO: PR #${pr_number} has ${unresolved_count} change request(s), invoking AI" "branch=${pr_branch}"
+
+      local review_workdir="${worktree_dir}"
+      if [ ! -d "${review_workdir}" ]; then
+        review_workdir="${PROJECT_DIR}"
+      fi
+
+      local review_prompt
+      review_prompt="You are working in the git repository at ${review_workdir}. \
+PR #${pr_number} on branch '${pr_branch}' has unresolved review comments requesting changes. \
+Please: \
+1) Run 'gh pr view ${pr_number} --comments' to read the review comments \
+2) Implement the requested changes \
+3) Commit the changes with a descriptive message \
+4) Push with: git push origin ${pr_branch} \
+Work in the directory: ${review_workdir}"
+
+      local -a review_cmd_parts
+      mapfile -d '' -t review_cmd_parts < <(build_provider_cmd "${review_workdir}" "${review_prompt}")
+
+      if timeout "${PER_PR_TIMEOUT}" "${review_cmd_parts[@]}" >> "${LOG_FILE}" 2>&1; then
+        log "INFO: AI addressed review comments for PR #${pr_number}" "branch=${pr_branch}"
+      else
+        log "WARN: AI failed to address review comments for PR #${pr_number}" "branch=${pr_branch}"
+      fi
+    fi
+  fi
+
+  # ── Re-check mergeable status after processing ──────────────────────────
+  # Brief wait for GitHub to propagate the push and recompute mergeability
+  sleep 3
+  local final_mergeable
+  final_mergeable=$(gh pr view "${pr_number}" --json mergeable --jq '.mergeable' 2>/dev/null || echo "UNKNOWN")
+
+  # ── Labeling ─────────────────────────────────────────────────────────────
+  local result
+  if [ "${final_mergeable}" != "CONFLICTING" ]; then
+    # Ensure the ready label exists in the repo (idempotent)
+    gh label create "${READY_LABEL}" \
+      --color "0075ca" \
+      --description "PR is conflict-free and ready to merge" \
+      2>/dev/null || true
+    gh pr edit "${pr_number}" --add-label "${READY_LABEL}" 2>/dev/null || true
+    log "INFO: PR #${pr_number} marked as '${READY_LABEL}'" "branch=${pr_branch}"
+    result="ready"
+  else
+    gh pr edit "${pr_number}" --remove-label "${READY_LABEL}" 2>/dev/null || true
+    log "WARN: PR #${pr_number} still has conflicts after processing" "branch=${pr_branch}"
+    result="conflicted"
+  fi
+
+  cleanup_pr_worktree
+  echo "${result}"
+}
+
+# ── Validate provider ────────────────────────────────────────────────────────
+if ! validate_provider "${PROVIDER_CMD}"; then
+  echo "ERROR: Unknown provider: ${PROVIDER_CMD}" >&2
+  exit 1
+fi
+
+rotate_log
+log_separator
+log "RUN-START: pr-resolver invoked project=${PROJECT_DIR} provider=${PROVIDER_CMD} dry_run=${NW_DRY_RUN:-0}"
+log "CONFIG: max_runtime=${MAX_RUNTIME}s max_prs=${MAX_PRS_PER_RUN} per_pr_timeout=${PER_PR_TIMEOUT}s ai_conflict=${AI_CONFLICT_RESOLUTION} ai_review=${AI_REVIEW_RESOLUTION} ready_label=${READY_LABEL} branch_patterns=${BRANCH_PATTERNS_RAW:-<all>}"
+
+if ! acquire_lock "${LOCK_FILE}"; then
+  emit_result "skip_locked"
+  exit 0
+fi
+
+cd "${PROJECT_DIR}"
+
+# ── Dry-run mode ────────────────────────────────────────────────────────────
+if [ "${NW_DRY_RUN:-0}" = "1" ]; then
+  echo "=== Dry Run: PR Resolver ==="
+  echo "Provider (model): ${PROVIDER_MODEL_DISPLAY}"
+  echo "Branch Patterns: ${BRANCH_PATTERNS_RAW:-<all>}"
+  echo "Max PRs Per Run: ${MAX_PRS_PER_RUN}"
+  echo "Per-PR Timeout: ${PER_PR_TIMEOUT}s"
+  echo "AI Conflict Resolution: ${AI_CONFLICT_RESOLUTION}"
+  echo "AI Review Resolution: ${AI_REVIEW_RESOLUTION}"
+  echo "Ready Label: ${READY_LABEL}"
+  echo "Max Runtime: ${MAX_RUNTIME}s"
+  log "INFO: Dry run mode — exiting without processing"
+  emit_result "skip_dry_run"
+  exit 0
+fi
+
+send_telegram_status_message "Night Watch PR Resolver: started" "Project: ${PROJECT_NAME}
+Provider (model): ${PROVIDER_MODEL_DISPLAY}
+Branch patterns: ${BRANCH_PATTERNS_RAW:-all}
+Action: scanning open PRs for merge conflicts."
+
+# ── Discover open PRs ────────────────────────────────────────────────────────
+pr_json=$(discover_open_prs)
+
+if [ -z "${pr_json}" ] || [ "${pr_json}" = "[]" ]; then
+  log "SKIP: No open PRs found"
+  send_telegram_status_message "Night Watch PR Resolver: nothing to do" "Project: ${PROJECT_NAME}
+Provider (model): ${PROVIDER_MODEL_DISPLAY}
+Result: no open PRs found."
+  emit_result "skip_no_open_prs"
+  exit 0
+fi
+
+pr_count=$(printf '%s' "${pr_json}" | jq 'length' 2>/dev/null || echo "0")
+log "INFO: Found ${pr_count} open PR(s) to evaluate"
+
+# ── Main processing loop ─────────────────────────────────────────────────────
+processed=0
+conflicts_resolved=0
+reviews_addressed=0
+prs_ready=0
+prs_failed=0
+
+while IFS= read -r pr_line; do
+  [ -z "${pr_line}" ] && continue
+
+  pr_number=$(printf '%s' "${pr_line}" | jq -r '.number')
+  pr_branch=$(printf '%s' "${pr_line}" | jq -r '.headRefName')
+  pr_title=$(printf '%s' "${pr_line}" | jq -r '.title')
+  is_draft=$(printf '%s' "${pr_line}" | jq -r '.isDraft')
+  labels=$(printf '%s' "${pr_line}" | jq -r '[.labels[].name] | join(",")')
+
+  [ -z "${pr_number}" ] || [ -z "${pr_branch}" ] && continue
+
+  # Skip draft PRs
+  if [ "${is_draft}" = "true" ]; then
+    log "INFO: Skipping draft PR #${pr_number}" "branch=${pr_branch}"
+    continue
+  fi
+
+  # Skip PRs labelled skip-resolver
+  if [[ "${labels}" == *"skip-resolver"* ]]; then
+    log "INFO: Skipping PR #${pr_number} (skip-resolver label)" "branch=${pr_branch}"
+    continue
+  fi
+
+  # Apply branch pattern filter
+  if ! matches_branch_patterns "${pr_branch}"; then
+    log "DEBUG: Skipping PR #${pr_number} — branch '${pr_branch}' does not match patterns" "patterns=${BRANCH_PATTERNS_RAW}"
+    continue
+  fi
+
+  # Enforce max PRs per run
+  if [ "${MAX_PRS_PER_RUN}" -gt "0" ] && [ "${processed}" -ge "${MAX_PRS_PER_RUN}" ]; then
+    log "INFO: Reached max PRs per run (${MAX_PRS_PER_RUN}), stopping"
+    break
+  fi
+
+  # Enforce global timeout
+  elapsed=$(( $(date +%s) - SCRIPT_START_TIME ))
+  if [ "${elapsed}" -ge "${MAX_RUNTIME}" ]; then
+    log "WARN: Global timeout reached (${MAX_RUNTIME}s), stopping early"
+    break
+  fi
+
+  processed=$(( processed + 1 ))
+
+  result=""
+  if result=$(process_pr "${pr_number}" "${pr_branch}" "${pr_title}" 2>&1); then
+    # process_pr echoes "ready" or "conflicted" on the last line; extract it
+    last_line=$(printf '%s' "${result}" | tail -1)
+    if [ "${last_line}" = "ready" ]; then
+      prs_ready=$(( prs_ready + 1 ))
+      conflicts_resolved=$(( conflicts_resolved + 1 ))
+    fi
+  else
+    prs_failed=$(( prs_failed + 1 ))
+  fi
+
+done < <(printf '%s' "${pr_json}" | jq -c '.[]')
+
+log "RUN-END: pr-resolver complete processed=${processed} conflicts_resolved=${conflicts_resolved} prs_ready=${prs_ready} prs_failed=${prs_failed}"
+
+send_telegram_status_message "Night Watch PR Resolver: completed" "Project: ${PROJECT_NAME}
+Provider (model): ${PROVIDER_MODEL_DISPLAY}
+PRs processed: ${processed}
+Conflicts resolved: ${conflicts_resolved}
+PRs marked '${READY_LABEL}': ${prs_ready}
+PRs failed: ${prs_failed}"
+
+emit_result "success" "prs_processed=${processed}|conflicts_resolved=${conflicts_resolved}|reviews_addressed=${reviews_addressed}|prs_ready=${prs_ready}|prs_failed=${prs_failed}"

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

@@ -105,7 +105,9 @@ extract_review_score_from_text() {
 # ── Global Job Queue Gate ────────────────────────────────────────────────────
 # Atomically claim a DB slot or enqueue for later dispatch — no flock needed.
 if [ "${NW_QUEUE_ENABLED:-0}" = "1" ]; then
-  if [ "${NW_QUEUE_DISPATCHED:-0}" = "1" ]; then
+  if [ "${NW_QUEUE_INHERITED_SLOT:-0}" = "1" ]; then
+    :
+  elif [ "${NW_QUEUE_DISPATCHED:-0}" = "1" ]; then
     arm_global_queue_cleanup
   else
     claim_or_enqueue "${SCRIPT_TYPE}" "${PROJECT_DIR}"
@@ -664,7 +666,11 @@ while IFS=$'\t' read -r pr_number pr_branch pr_labels; do
     } | awk '!seen[$0]++'
   )
   LATEST_SCORE=$(extract_review_score_from_text "${ALL_COMMENTS}")
-  if [ -n "${LATEST_SCORE}" ] && [ "${LATEST_SCORE}" -lt "${MIN_REVIEW_SCORE}" ]; then
+  if [ -z "${LATEST_SCORE}" ]; then
+    log "INFO: PR #${pr_number} (${pr_branch}) has no review score yet — needs initial review"
+    NEEDS_WORK=1
+    PRS_NEEDING_WORK="${PRS_NEEDING_WORK} #${pr_number}"
+  elif [ "${LATEST_SCORE}" -lt "${MIN_REVIEW_SCORE}" ]; then
     log "INFO: PR #${pr_number} (${pr_branch}) has review score ${LATEST_SCORE}/100 (threshold: ${MIN_REVIEW_SCORE})"
     NEEDS_WORK=1
     PRS_NEEDING_WORK="${PRS_NEEDING_WORK} #${pr_number}"
@@ -675,7 +681,7 @@ done < <(
 )
 
 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)"
+  log "SKIP: All ${OPEN_PRS} open PR(s) have passing CI and review score >= ${MIN_REVIEW_SCORE}"
 
   # ── Auto-merge eligible PRs ───────────────────────────────
   if [ "${NW_AUTO_MERGE:-0}" = "1" ]; then
@@ -814,6 +820,7 @@ if [ -z "${TARGET_PR}" ] && [ "${WORKER_MODE}" != "1" ] && [ "${PARALLEL_ENABLED
       NW_TARGET_PR="${pr_number}" \
       NW_REVIEWER_WORKER_MODE="1" \
       NW_REVIEWER_PARALLEL="0" \
+      NW_QUEUE_INHERITED_SLOT="1" \
       bash "${SCRIPT_DIR}/night-watch-pr-reviewer-cron.sh" "${PROJECT_DIR}" > "${worker_output}" 2>&1
     ) &
 
@@ -922,7 +929,7 @@ if [ -z "${TARGET_PR}" ] && [ "${WORKER_MODE}" != "1" ] && [ "${PARALLEL_ENABLED
   cleanup_reviewer_worktrees
 
   emit_final_status "${EXIT_CODE}" "${PRS_NEEDING_WORK_CSV}" "${AUTO_MERGED_PRS}" "${AUTO_MERGE_FAILED_PRS}" "${MAX_WORKER_ATTEMPTS}" "${MAX_WORKER_FINAL_SCORE}" "0" "${NO_CHANGES_PRS}"
-  exit 0
+  exit "${EXIT_CODE}"
 fi
 
 REVIEW_RUN_TOKEN="${PROJECT_RUNTIME_KEY}-$$"
@@ -1015,8 +1022,16 @@ if [ -n "${TARGET_PR}" ]; then
   fi
   if [ -n "${TARGET_SCORE}" ]; then
     TARGET_SCOPE_PROMPT+=$'- latest review score: '"${TARGET_SCORE}"$'/100\n'
+    TARGET_SCOPE_PROMPT+=$'- action: fix\n'
+    # Inject the latest review comment body for the fix prompt
+    REVIEW_BODY=$(gh api "repos/$(gh repo view --json nameWithOwner --jq '.nameWithOwner' 2>/dev/null)/issues/${TARGET_PR}/comments" --jq '[.[] | select(.body | test("Overall Score|Score:.*[0-9]+/100"))] | last | .body // ""' 2>/dev/null || echo "")
+    if [ -n "${REVIEW_BODY}" ]; then
+      TRUNCATED_REVIEW=$(printf '%s' "${REVIEW_BODY}" | head -c 6000)
+      TARGET_SCOPE_PROMPT+=$'\n## Latest Review Feedback\n'"${TRUNCATED_REVIEW}"$'\n'
+    fi
   else
     TARGET_SCOPE_PROMPT+=$'- latest review score: not found\n'
+    TARGET_SCOPE_PROMPT+=$'- action: review\n'
   fi
 fi
 
@@ -1201,7 +1216,8 @@ for ATTEMPT in $(seq 1 "${TOTAL_ATTEMPTS}"); do
 	        fi
 	        continue
 	      fi
-	      log "RETRY: No review score found for PR #${TARGET_PR} after ${TOTAL_ATTEMPTS} attempts; failing run."
+	      log "RETRY: No review score found for PR #${TARGET_PR} after ${TOTAL_ATTEMPTS} attempts; labeling needs-human-review and failing run."
+	      gh pr edit "${TARGET_PR}" --add-label "needs-human-review" 2>/dev/null || true
       EXIT_CODE=1
       break
     fi
@@ -1316,3 +1332,4 @@ fi
 REVIEWER_TOTAL_ELAPSED=$(( $(date +%s) - SCRIPT_START_TIME ))
 log "OUTCOME: exit_code=${EXIT_CODE} total_elapsed=${REVIEWER_TOTAL_ELAPSED}s prs=${PRS_NEEDING_WORK_CSV:-none} attempts=${ATTEMPTS_MADE}"
 emit_final_status "${EXIT_CODE}" "${PRS_NEEDING_WORK_CSV}" "${AUTO_MERGED_PRS}" "${AUTO_MERGE_FAILED_PRS}" "${ATTEMPTS_MADE}" "${FINAL_SCORE}" "${NO_CHANGES_NEEDED}" "${NO_CHANGES_PRS}"
+exit "${EXIT_CODE}"

package/dist/scripts/night-watch-qa-cron.sh

@@ -25,6 +25,7 @@ PROVIDER_CMD="${NW_PROVIDER_CMD:-claude}"
 PROVIDER_LABEL="${NW_PROVIDER_LABEL:-}"
 BRANCH_PATTERNS_RAW="${NW_BRANCH_PATTERNS:-feat/,night-watch/}"
 SKIP_LABEL="${NW_QA_SKIP_LABEL:-skip-qa}"
+VALIDATED_LABEL="${NW_QA_VALIDATED_LABEL:-e2e-validated}"
 QA_ARTIFACTS="${NW_QA_ARTIFACTS:-both}"
 QA_AUTO_INSTALL_PLAYWRIGHT="${NW_QA_AUTO_INSTALL_PLAYWRIGHT:-1}"
 SCRIPT_START_TIME=$(date +%s)
@@ -55,6 +56,16 @@ emit_result() {
   fi
 }
 
+LABEL_ENSURED=0
+ensure_validated_label() {
+  if [ "${LABEL_ENSURED}" -eq 1 ]; then return 0; fi
+  gh label create "${VALIDATED_LABEL}" \
+    --description "PR acceptance requirements validated by e2e/integration tests" \
+    --color "0e8a16" \
+    --force 2>/dev/null || true
+  LABEL_ENSURED=1
+}
+
 # ── Global Job Queue Gate ────────────────────────────────────────────────────
 # Atomically claim a DB slot or enqueue for later dispatch — no flock needed.
 if [ "${NW_QUEUE_ENABLED:-0}" = "1" ]; then
@@ -487,6 +498,7 @@ fi
 EXIT_CODE=0
 PROCESSED_PRS_CSV=""
 PASSING_PRS_CSV=""
+VALIDATED_PRS_CSV=""
 ISSUES_FOUND_PRS_CSV=""
 NO_TESTS_PRS_CSV=""
 UNCLASSIFIED_PRS_CSV=""
@@ -617,12 +629,23 @@ for pr_ref in ${PRS_NEEDING_QA}; do
         case "${QA_OUTCOME}" in
           passing)
             PASSING_PRS_CSV=$(append_csv "${PASSING_PRS_CSV}" "#${pr_num}")
+            # Apply e2e-validated label
+            ensure_validated_label
+            gh pr edit "${pr_num}" --add-label "${VALIDATED_LABEL}" 2>/dev/null || true
+            VALIDATED_PRS_CSV=$(append_csv "${VALIDATED_PRS_CSV}" "#${pr_num}")
+            log "QA: PR #${pr_num} — added '${VALIDATED_LABEL}' label (tests passing)"
             ;;
           issues_found)
             ISSUES_FOUND_PRS_CSV=$(append_csv "${ISSUES_FOUND_PRS_CSV}" "#${pr_num}")
+            # Remove e2e-validated label if present
+            gh pr edit "${pr_num}" --remove-label "${VALIDATED_LABEL}" 2>/dev/null || true
+            log "QA: PR #${pr_num} — removed '${VALIDATED_LABEL}' label (issues found)"
             ;;
           no_tests_needed)
             NO_TESTS_PRS_CSV=$(append_csv "${NO_TESTS_PRS_CSV}" "#${pr_num}")
+            # Remove e2e-validated label — no tests doesn't prove acceptance
+            gh pr edit "${pr_num}" --remove-label "${VALIDATED_LABEL}" 2>/dev/null || true
+            log "QA: PR #${pr_num} — removed '${VALIDATED_LABEL}' label (no tests needed)"
             ;;
           *)
             UNCLASSIFIED_PRS_CSV=$(append_csv "${UNCLASSIFIED_PRS_CSV}" "#${pr_num}")
@@ -646,6 +669,7 @@ cleanup_worktrees "${PROJECT_DIR}"
 
 FINAL_PROCESSED_PRS_CSV="${PROCESSED_PRS_CSV:-${PRS_NEEDING_QA_CSV}}"
 PASSING_PRS_SUMMARY=$(csv_or_none "${PASSING_PRS_CSV}")
+VALIDATED_PRS_SUMMARY=$(csv_or_none "${VALIDATED_PRS_CSV}")
 ISSUES_FOUND_PRS_SUMMARY=$(csv_or_none "${ISSUES_FOUND_PRS_CSV}")
 NO_TESTS_PRS_SUMMARY=$(csv_or_none "${NO_TESTS_PRS_CSV}")
 UNCLASSIFIED_PRS_SUMMARY=$(csv_or_none "${UNCLASSIFIED_PRS_CSV}")
@@ -664,6 +688,7 @@ Provider (model): ${PROVIDER_MODEL_DISPLAY}
 Artifacts: ${QA_ARTIFACTS_DESC} (mode=${QA_ARTIFACTS})
 Processed PRs: ${FINAL_PROCESSED_PRS_CSV}
 Passing tests: ${PASSING_PRS_SUMMARY}
+E2E validated: ${VALIDATED_PRS_SUMMARY}
 Issues found by tests: ${ISSUES_FOUND_PRS_SUMMARY}
 No tests needed: ${NO_TESTS_PRS_SUMMARY}
 Reported (unclassified): ${UNCLASSIFIED_PRS_SUMMARY}
@@ -680,9 +705,9 @@ ${QA_SCREENSHOT_SUMMARY}"
     fi
     send_telegram_status_message "🧪 Night Watch QA: warning" "${TELEGRAM_WARNING_BODY}"
     if [ -n "${REPO}" ]; then
-      emit_result "warning_qa" "prs=${FINAL_PROCESSED_PRS_CSV}|passing=${PASSING_PRS_SUMMARY}|issues=${ISSUES_FOUND_PRS_SUMMARY}|no_tests=${NO_TESTS_PRS_SUMMARY}|unclassified=${UNCLASSIFIED_PRS_SUMMARY}|warnings=${WARNING_PRS_SUMMARY}|repo=${REPO}"
+      emit_result "warning_qa" "prs=${FINAL_PROCESSED_PRS_CSV}|passing=${PASSING_PRS_SUMMARY}|validated=${VALIDATED_PRS_SUMMARY}|issues=${ISSUES_FOUND_PRS_SUMMARY}|no_tests=${NO_TESTS_PRS_SUMMARY}|unclassified=${UNCLASSIFIED_PRS_SUMMARY}|warnings=${WARNING_PRS_SUMMARY}|repo=${REPO}"
     else
-      emit_result "warning_qa" "prs=${FINAL_PROCESSED_PRS_CSV}|passing=${PASSING_PRS_SUMMARY}|issues=${ISSUES_FOUND_PRS_SUMMARY}|no_tests=${NO_TESTS_PRS_SUMMARY}|unclassified=${UNCLASSIFIED_PRS_SUMMARY}|warnings=${WARNING_PRS_SUMMARY}"
+      emit_result "warning_qa" "prs=${FINAL_PROCESSED_PRS_CSV}|passing=${PASSING_PRS_SUMMARY}|validated=${VALIDATED_PRS_SUMMARY}|issues=${ISSUES_FOUND_PRS_SUMMARY}|no_tests=${NO_TESTS_PRS_SUMMARY}|unclassified=${UNCLASSIFIED_PRS_SUMMARY}|warnings=${WARNING_PRS_SUMMARY}"
     fi
   else
     log "DONE: QA runner completed successfully"
@@ -691,6 +716,7 @@ Provider (model): ${PROVIDER_MODEL_DISPLAY}
 Artifacts: ${QA_ARTIFACTS_DESC} (mode=${QA_ARTIFACTS})
 Processed PRs: ${FINAL_PROCESSED_PRS_CSV}
 Passing tests: ${PASSING_PRS_SUMMARY}
+E2E validated: ${VALIDATED_PRS_SUMMARY}
 Issues found by tests: ${ISSUES_FOUND_PRS_SUMMARY}
 No tests needed: ${NO_TESTS_PRS_SUMMARY}
 Reported (unclassified): ${UNCLASSIFIED_PRS_SUMMARY}"
@@ -701,9 +727,9 @@ ${QA_SCREENSHOT_SUMMARY}"
     fi
     send_telegram_status_message "🧪 Night Watch QA: completed" "${TELEGRAM_SUCCESS_BODY}"
     if [ -n "${REPO}" ]; then
-      emit_result "success_qa" "prs=${FINAL_PROCESSED_PRS_CSV}|passing=${PASSING_PRS_SUMMARY}|issues=${ISSUES_FOUND_PRS_SUMMARY}|no_tests=${NO_TESTS_PRS_SUMMARY}|unclassified=${UNCLASSIFIED_PRS_SUMMARY}|repo=${REPO}"
+      emit_result "success_qa" "prs=${FINAL_PROCESSED_PRS_CSV}|passing=${PASSING_PRS_SUMMARY}|validated=${VALIDATED_PRS_SUMMARY}|issues=${ISSUES_FOUND_PRS_SUMMARY}|no_tests=${NO_TESTS_PRS_SUMMARY}|unclassified=${UNCLASSIFIED_PRS_SUMMARY}|repo=${REPO}"
     else
-      emit_result "success_qa" "prs=${FINAL_PROCESSED_PRS_CSV}|passing=${PASSING_PRS_SUMMARY}|issues=${ISSUES_FOUND_PRS_SUMMARY}|no_tests=${NO_TESTS_PRS_SUMMARY}|unclassified=${UNCLASSIFIED_PRS_SUMMARY}"
+      emit_result "success_qa" "prs=${FINAL_PROCESSED_PRS_CSV}|passing=${PASSING_PRS_SUMMARY}|validated=${VALIDATED_PRS_SUMMARY}|issues=${ISSUES_FOUND_PRS_SUMMARY}|no_tests=${NO_TESTS_PRS_SUMMARY}|unclassified=${UNCLASSIFIED_PRS_SUMMARY}"
     fi
   fi
 elif [ ${EXIT_CODE} -eq 124 ]; then

package/dist/scripts/test-helpers.bats

@@ -75,3 +75,48 @@ teardown() {
 
   [ "${result}" = "02-test-prd.md" ]
 }
+
+# ── pr-resolver lock acquisition ─────────────────────────────────────────────
+
+@test "pr-resolver lock acquisition: acquire_lock succeeds when no lock exists" {
+  local test_lock="/tmp/nw-test-resolver-$$.lock"
+
+  # Ensure clean state
+  rm -f "${test_lock}"
+
+  run acquire_lock "${test_lock}"
+  [ "$status" -eq 0 ]
+  [ -f "${test_lock}" ]
+
+  # PID written to lock file must be the current test process
+  local lock_pid
+  lock_pid=$(cat "${test_lock}")
+  [ -n "${lock_pid}" ]
+
+  rm -f "${test_lock}"
+}
+
+@test "pr-resolver lock acquisition: acquire_lock fails when active lock exists" {
+  local test_lock="/tmp/nw-test-resolver-active-$$.lock"
+
+  # Write current PID as an active lock holder
+  echo $$ > "${test_lock}"
+
+  run acquire_lock "${test_lock}"
+  [ "$status" -eq 1 ]
+
+  rm -f "${test_lock}"
+}
+
+@test "pr-resolver lock acquisition: acquire_lock removes stale lock and succeeds" {
+  local test_lock="/tmp/nw-test-resolver-stale-$$.lock"
+
+  # Write a PID that does not exist (use a very high number unlikely to be running)
+  echo "999999999" > "${test_lock}"
+
+  run acquire_lock "${test_lock}"
+  [ "$status" -eq 0 ]
+  [ -f "${test_lock}" ]
+
+  rm -f "${test_lock}"
+}