@jonit-dev/night-watch-cli 1.8.12-beta.1 → 1.8.12-beta.11

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

@@ -14,6 +14,8 @@ set -euo pipefail
 #   NW_MERGER_BRANCH_PATTERNS=               - Comma-separated branch prefixes (empty = all)
 #   NW_MERGER_REBASE_BEFORE_MERGE=1          - Set to 1 to rebase before merging
 #   NW_MERGER_MAX_PRS_PER_RUN=0             - Max PRs to merge per run (0 = unlimited)
+#   NW_MERGER_CI_MAX_WAIT=300                - Max seconds to wait for checks after rebase
+#   NW_MERGER_CI_POLL_INTERVAL=15            - Seconds between check polls after rebase
 #   NW_DRY_RUN=0                             - Set to 1 for dry-run mode
 
 PROJECT_DIR="${1:?Usage: $0 /path/to/project}"
@@ -26,7 +28,10 @@ MERGE_METHOD="${NW_MERGER_MERGE_METHOD:-squash}"
 MIN_REVIEW_SCORE="${NW_MERGER_MIN_REVIEW_SCORE:-80}"
 REBASE_BEFORE_MERGE="${NW_MERGER_REBASE_BEFORE_MERGE:-1}"
 MAX_PRS_PER_RUN="${NW_MERGER_MAX_PRS_PER_RUN:-0}"
+CI_MAX_WAIT="${NW_MERGER_CI_MAX_WAIT:-300}"
+CI_POLL_INTERVAL="${NW_MERGER_CI_POLL_INTERVAL:-15}"
 BRANCH_PATTERNS_RAW="${NW_MERGER_BRANCH_PATTERNS:-}"
+READY_TO_MERGE_LABEL="${NW_PR_RESOLVER_READY_LABEL:-ready-to-merge}"
 SCRIPT_START_TIME=$(date +%s)
 DRY_RUN="${NW_DRY_RUN:-0}"
 PROVIDER_CMD="${NW_PROVIDER_CMD:-claude}"
@@ -39,6 +44,12 @@ fi
 if ! [[ "${MIN_REVIEW_SCORE}" =~ ^[0-9]+$ ]]; then
   MIN_REVIEW_SCORE="80"
 fi
+if ! [[ "${CI_MAX_WAIT}" =~ ^[0-9]+$ ]]; then
+  CI_MAX_WAIT="300"
+fi
+if ! [[ "${CI_POLL_INTERVAL}" =~ ^[0-9]+$ ]] || [ "${CI_POLL_INTERVAL}" = "0" ]; then
+  CI_POLL_INTERVAL="15"
+fi
 # Clamp merge method to valid values
 case "${MERGE_METHOD}" in
   squash|merge|rebase) ;;
@@ -55,6 +66,7 @@ PROJECT_RUNTIME_KEY=$(project_runtime_key "${PROJECT_DIR}")
 # NOTE: Lock file path must match mergerLockPath() in src/utils/status-data.ts
 LOCK_FILE="/tmp/night-watch-merger-${PROJECT_RUNTIME_KEY}.lock"
 SCRIPT_TYPE="merger"
+skip_if_job_paused "${SCRIPT_TYPE}" "${PROJECT_DIR}"
 
 MERGED_PRS=0
 FAILED_PRS=0
@@ -103,29 +115,150 @@ get_review_score() {
   # Look for review score comment from night-watch
   local score
   score=$(gh pr view "${pr_number}" --json comments \
-    --jq '[.comments[].body | select(test("review score|score:? [0-9]+/100"; "i")) | capture("(?i)score:? *(?<s>[0-9]+)/100") | .s] | last | tonumber // -1' \
+    --jq '[.comments[].body | select(test("score[^0-9]{0,30}[0-9]+/100"; "i")) | capture("(?i)score[^0-9]{0,30}(?<s>[0-9]+)/100") | .s] | last | tonumber // -1' \
     2>/dev/null || echo "-1")
   echo "${score}"
 }
 
-# Check if CI is passing for a PR (all checks must be complete and none failing)
-ci_passing() {
+# Count pending review feedback that should send the PR back through reviewer
+# instead of allowing the merger to land it. We combine GitHub's review decision
+# with unresolved review threads because some providers leave actionable feedback
+# as thread comments without lowering the score.
+get_pending_review_feedback_count() {
   local pr_number="${1}"
-  local checks_json
-  checks_json=$(gh pr checks "${pr_number}" --json name,state,conclusion 2>/dev/null || echo "[]")
-  # Fail if any checks have explicit failures
-  local fail_count
-  fail_count=$(echo "${checks_json}" | jq '[.[] | select(.conclusion == "FAILURE" or .conclusion == "TIMED_OUT" or .conclusion == "CANCELLED" or .state == "FAILURE")] | length' 2>/dev/null || echo "999")
-  if [ "${fail_count}" != "0" ]; then
-    return 1
+  local review_decision=""
+  local change_request_count="0"
+  local unresolved_thread_count="0"
+  local repo=""
+  local owner=""
+  local name=""
+
+  review_decision=$(gh pr view "${pr_number}" --json reviewDecision --jq '.reviewDecision // ""' 2>/dev/null || echo "")
+
+  change_request_count=$(gh api "repos/{owner}/{repo}/pulls/${pr_number}/reviews" \
+    --jq '[.[] | select(.state == "CHANGES_REQUESTED")] | length' 2>/dev/null || echo "0")
+  if ! [[ "${change_request_count}" =~ ^[0-9]+$ ]]; then
+    change_request_count="0"
+  fi
+
+  repo=$(gh repo view --json nameWithOwner --jq '.nameWithOwner' 2>/dev/null || echo "")
+  if [[ "${repo}" == */* ]]; then
+    owner="${repo%%/*}"
+    name="${repo#*/}"
+    unresolved_thread_count=$(gh api graphql \
+      -F owner="${owner}" \
+      -F name="${name}" \
+      -F number="${pr_number}" \
+      -f query='
+        query($owner: String!, $name: String!, $number: Int!) {
+          repository(owner: $owner, name: $name) {
+            pullRequest(number: $number) {
+              reviewThreads(first: 100) {
+                nodes {
+                  isResolved
+                }
+              }
+            }
+          }
+        }
+      ' \
+      --jq '[.data.repository.pullRequest.reviewThreads.nodes[]? | select(.isResolved == false)] | length' \
+      2>/dev/null || echo "0")
+    if ! [[ "${unresolved_thread_count}" =~ ^[0-9]+$ ]]; then
+      unresolved_thread_count="0"
+    fi
+  fi
+
+  if [ "${unresolved_thread_count}" -gt 0 ]; then
+    echo "${unresolved_thread_count}"
+    return 0
   fi
-  # Fail if any checks are still pending/in-progress (not yet concluded)
-  local pending_count
-  pending_count=$(echo "${checks_json}" | jq '[.[] | select(.state == "PENDING" or .state == "IN_PROGRESS" or (.conclusion == null and .state != "SUCCESS"))] | length' 2>/dev/null || echo "999")
-  if [ "${pending_count}" != "0" ]; then
-    return 1
+
+  if [ "${change_request_count}" -gt 0 ]; then
+    echo "${change_request_count}"
+    return 0
   fi
-  return 0
+
+  if [ "${review_decision}" = "CHANGES_REQUESTED" ]; then
+    echo "1"
+    return 0
+  fi
+
+  echo "0"
+}
+
+# Get the current head OID for a PR.
+get_pr_head_oid() {
+  local pr_number="${1}"
+  gh pr view "${pr_number}" --json headRefOid --jq '.headRefOid // ""' 2>/dev/null || echo ""
+}
+
+# Return the CI state for the PR's status rollup on the expected head OID.
+ci_status_for_head() {
+  local pr_number="${1}"
+  local expected_head="${2:-}"
+  local status_json
+
+  status_json=$(gh pr view "${pr_number}" --json headRefOid,statusCheckRollup 2>/dev/null || echo "")
+  if [ -z "${status_json}" ]; then
+    echo "unknown"
+    return 0
+  fi
+
+  echo "${status_json}" | jq -r --arg expected_head "${expected_head}" '
+    def in_list($values): . as $value | $values | index($value);
+    def check_run_failure:
+      .__typename == "CheckRun"
+      and ((.conclusion // "") | in_list(["FAILURE", "TIMED_OUT", "CANCELLED", "ACTION_REQUIRED", "STALE", "STARTUP_FAILURE"]));
+    def status_context_failure:
+      .__typename == "StatusContext"
+      and ((.state // "") | in_list(["FAILURE", "ERROR"]));
+    def check_run_pending:
+      .__typename == "CheckRun"
+      and ((.status // "") != "COMPLETED" or .conclusion == null);
+    def status_context_pending:
+      .__typename == "StatusContext"
+      and ((.state // "") | in_list(["PENDING", "EXPECTED"]));
+    def check_run_nonpassing:
+      .__typename == "CheckRun"
+      and ((.conclusion // "") | in_list(["SUCCESS", "NEUTRAL", "SKIPPED"]) | not);
+    def status_context_nonpassing:
+      .__typename == "StatusContext"
+      and (.state // "") != "SUCCESS";
+    if ($expected_head != "" and (.headRefOid // "") != $expected_head) then
+      "head_mismatch"
+    elif ((.statusCheckRollup // []) | length) == 0 then
+      "absent"
+    elif any((.statusCheckRollup // [])[]; check_run_failure or status_context_failure) then
+      "failed"
+    elif any((.statusCheckRollup // [])[]; check_run_pending or status_context_pending) then
+      "pending"
+    elif any((.statusCheckRollup // [])[]; check_run_nonpassing or status_context_nonpassing) then
+      "failed"
+    else
+      "passing"
+    end
+  ' 2>/dev/null || echo "unknown"
+}
+
+wait_for_ci_passing_on_head() {
+  local pr_number="${1}"
+  local expected_head="${2}"
+  local ci_waited=0
+  LAST_CI_STATUS="unknown"
+
+  while [ "${ci_waited}" -lt "${CI_MAX_WAIT}" ]; do
+    LAST_CI_STATUS=$(ci_status_for_head "${pr_number}" "${expected_head}")
+    if [ "${LAST_CI_STATUS}" = "passing" ]; then
+      return 0
+    fi
+    log "INFO: PR #${pr_number}: Waiting for fresh CI on head ${expected_head} (${LAST_CI_STATUS}, ${ci_waited}s/${CI_MAX_WAIT}s)..."
+    sleep "${CI_POLL_INTERVAL}"
+    ci_waited=$((ci_waited + CI_POLL_INTERVAL))
+  done
+
+  LAST_CI_STATUS=$(ci_status_for_head "${pr_number}" "${expected_head}")
+  [ "${LAST_CI_STATUS}" = "passing" ]
 }
 
 # Rebase a PR against its base branch
@@ -140,6 +273,23 @@ rebase_pr() {
   return $?
 }
 
+cleanup_watchdog() {
+  local pid="${1:-}"
+  local child_pids=""
+
+  if [ -z "${pid}" ]; then
+    return 0
+  fi
+
+  child_pids=$(pgrep -P "${pid}" 2>/dev/null || true)
+  if [ -n "${child_pids}" ]; then
+    kill ${child_pids} 2>/dev/null || true
+  fi
+
+  kill "${pid}" 2>/dev/null || true
+  wait "${pid}" 2>/dev/null || true
+}
+
 log() {
   echo "[$(date '+%Y-%m-%dT%H:%M:%S')] $*" | tee -a "${LOG_FILE}"
 }
@@ -158,7 +308,7 @@ cd "${PROJECT_DIR}"
 
 log "========================================"
 log "RUN-START: merger invoked project=${PROJECT_DIR} dry_run=${DRY_RUN}"
-log "CONFIG: merge_method=${MERGE_METHOD} min_review_score=${MIN_REVIEW_SCORE} rebase_before_merge=${REBASE_BEFORE_MERGE} max_prs=${MAX_PRS_PER_RUN} max_runtime=${MAX_RUNTIME}s branch_patterns=${BRANCH_PATTERNS_RAW:-<all>}"
+log "CONFIG: merge_method=${MERGE_METHOD} min_review_score=${MIN_REVIEW_SCORE} rebase_before_merge=${REBASE_BEFORE_MERGE} max_prs=${MAX_PRS_PER_RUN} max_runtime=${MAX_RUNTIME}s ready_label=${READY_TO_MERGE_LABEL} branch_patterns=${BRANCH_PATTERNS_RAW:-<all>}"
 log "========================================"
 
 if ! acquire_lock "${LOCK_FILE}"; then
@@ -187,7 +337,7 @@ fi
   kill -TERM $$ 2>/dev/null || true
 ) &
 WATCHDOG_PID=$!
-append_exit_trap "kill ${WATCHDOG_PID} 2>/dev/null || true"
+append_exit_trap "cleanup_watchdog ${WATCHDOG_PID}"
 
 # Discover open PRs sorted by creation date (oldest first = FIFO)
 log "INFO: Scanning open PRs..."
@@ -224,15 +374,27 @@ while IFS= read -r pr_json; do
     continue
   fi
 
+  if csv_has_label "${pr_labels:-}" "${READY_TO_MERGE_LABEL}"; then
+    log "INFO: PR #${pr_number} (${pr_branch}): Skipping PR labeled ${READY_TO_MERGE_LABEL}"
+    continue
+  fi
+
   # Check branch pattern filter
   if ! matches_branch_patterns "${pr_branch}"; then
     log "DEBUG: PR #${pr_number} (${pr_branch}): Branch pattern mismatch, skipping"
     continue
   fi
 
+  pr_head_oid=$(get_pr_head_oid "${pr_number}")
+  if [ -z "${pr_head_oid}" ]; then
+    log "INFO: PR #${pr_number} (${pr_branch}): Unable to determine PR head, skipping"
+    continue
+  fi
+
   # Check CI status
-  if ! ci_passing "${pr_number}"; then
-    log "INFO: PR #${pr_number} (${pr_branch}): CI not passing, skipping"
+  ci_status=$(ci_status_for_head "${pr_number}" "${pr_head_oid}")
+  if [ "${ci_status}" != "passing" ]; then
+    log "INFO: PR #${pr_number} (${pr_branch}): CI not passing on head ${pr_head_oid} (${ci_status}), skipping"
     continue
   fi
 
@@ -240,15 +402,22 @@ while IFS= read -r pr_json; do
   if [ "${MIN_REVIEW_SCORE}" -gt "0" ]; then
     score=$(get_review_score "${pr_number}")
     if [ "${score}" -lt "0" ] || [ "${score}" -lt "${MIN_REVIEW_SCORE}" ]; then
-      log "INFO: PR #${pr_number} (${pr_branch}): Review score ${score} < ${MIN_REVIEW_SCORE} (or no score found), skipping"
+      log "INFO: PR #${pr_number} (${pr_branch}): Review score ${score} < ${MIN_REVIEW_SCORE} (or no score found), reviewer job required before merge"
       continue
     fi
   fi
 
+  pending_review_feedback_count=$(get_pending_review_feedback_count "${pr_number}")
+  if [ "${pending_review_feedback_count}" -gt "0" ]; then
+    log "INFO: PR #${pr_number} (${pr_branch}): ${pending_review_feedback_count} pending review feedback item(s), reviewer job required before merge"
+    continue
+  fi
+
   log "INFO: PR #${pr_number} (${pr_branch}): Eligible for merge"
 
   # Rebase before merge if configured
   if [ "${REBASE_BEFORE_MERGE}" = "1" ]; then
+    pr_head_before_rebase="${pr_head_oid}"
     if ! rebase_pr "${pr_number}"; then
       log "WARN: PR #${pr_number}: Rebase failed, skipping"
       FAILED_PRS=$((FAILED_PRS + 1))
@@ -256,20 +425,20 @@ while IFS= read -r pr_json; do
     fi
     log "INFO: PR #${pr_number}: Rebase successful"
 
-    # Poll CI until all checks complete after rebase (up to 5 minutes)
-    local ci_max_wait=300
-    local ci_waited=0
-    local ci_poll=15
-    while [ "${ci_waited}" -lt "${ci_max_wait}" ]; do
-      sleep "${ci_poll}"
-      ci_waited=$((ci_waited + ci_poll))
-      if ci_passing "${pr_number}"; then
-        break
-      fi
-      log "INFO: PR #${pr_number}: Waiting for CI after rebase (${ci_waited}s/${ci_max_wait}s)..."
-    done
-    if ! ci_passing "${pr_number}"; then
-      log "INFO: PR #${pr_number}: CI not passing after rebase (waited ${ci_waited}s), skipping"
+    pr_head_after_rebase=$(get_pr_head_oid "${pr_number}")
+    if [ -z "${pr_head_after_rebase}" ]; then
+      log "INFO: PR #${pr_number}: Unable to determine PR head after rebase, skipping"
+      continue
+    fi
+    if [ "${pr_head_after_rebase}" != "${pr_head_before_rebase}" ]; then
+      log "INFO: PR #${pr_number}: Head changed after rebase ${pr_head_before_rebase} -> ${pr_head_after_rebase}; waiting for fresh CI"
+    else
+      log "INFO: PR #${pr_number}: Head unchanged after rebase (${pr_head_after_rebase}); confirming CI"
+    fi
+
+    # Poll CI until all checks attached to the post-rebase head are complete and passing.
+    if ! wait_for_ci_passing_on_head "${pr_number}" "${pr_head_after_rebase}"; then
+      log "INFO: PR #${pr_number}: Fresh CI not passing on head ${pr_head_after_rebase} after rebase (${LAST_CI_STATUS}, waited ${CI_MAX_WAIT}s), skipping"
       continue
     fi
   fi
@@ -284,12 +453,17 @@ while IFS= read -r pr_json; do
     # Rebase remaining PRs after each successful merge
     log "INFO: Rebasing remaining open PRs after merging #${pr_number}..."
     REMAINING_JSON=$(gh pr list --state open \
-      --json number,headRefName \
+      --json number,headRefName,labels \
       2>/dev/null || echo "[]")
     while IFS= read -r remaining_pr; do
       remaining_number=$(echo "${remaining_pr}" | jq -r '.number')
       remaining_branch=$(echo "${remaining_pr}" | jq -r '.headRefName')
+      remaining_labels=$(echo "${remaining_pr}" | jq -r '[.labels[]?.name] | join(",")')
       if [ "${remaining_number}" != "${pr_number}" ]; then
+        if csv_has_label "${remaining_labels:-}" "${READY_TO_MERGE_LABEL}"; then
+          log "INFO: Skipping post-merge rebase for PR #${remaining_number} (${remaining_branch}) because it is labeled ${READY_TO_MERGE_LABEL}"
+          continue
+        fi
         log "INFO: Rebasing remaining PR #${remaining_number} (${remaining_branch})"
         gh pr update-branch --rebase "${remaining_number}" 2>/dev/null || \
           log "WARN: PR #${remaining_number}: Rebase failed (continuing)"

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

@@ -61,6 +61,8 @@ PROVIDER_MODEL_DISPLAY=$(resolve_provider_model_display "${PROVIDER_CMD}" "${PRO
 PRD_DIR="${NW_PRD_DIR:-docs/PRDs}"
 PLAN_TASK="${NW_PLAN_TASK:-}"
 
+skip_if_job_paused "${SCRIPT_TYPE}" "${PROJECT_DIR}"
+
 rotate_log
 log_separator
 log "RUN-START: planner invoked project=${PROJECT_DIR} provider=${PROVIDER_CMD} dry_run=${NW_DRY_RUN:-0}"

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

@@ -63,6 +63,7 @@ PROVIDER_MODEL_DISPLAY=$(resolve_provider_model_display "${PROVIDER_CMD}" "${PRO
 # 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"
+skip_if_job_paused "${SCRIPT_TYPE}" "${PROJECT_DIR}"
 
 emit_result() {
   local status="${1:?status required}"
@@ -359,6 +360,11 @@ while IFS= read -r pr_line; do
     continue
   fi
 
+  if csv_has_label "${labels:-}" "${READY_LABEL}"; then
+    log "INFO: Skipping PR #${pr_number} (${pr_branch}) because it is labeled ${READY_LABEL}"
+    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}"

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

@@ -63,11 +63,6 @@ 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}")
 GLOBAL_LOCK_FILE="/tmp/night-watch-pr-reviewer-${PROJECT_RUNTIME_KEY}.lock"
@@ -79,6 +74,7 @@ else
 fi
 
 SCRIPT_TYPE="reviewer"
+skip_if_job_paused "${SCRIPT_TYPE}" "${PROJECT_DIR}"
 READY_FOR_REVIEW_LABEL="${NW_READY_FOR_REVIEW_LABEL:-ready-for-review}"
 READY_FOR_REVIEW_MARKER_NAME="night-watch-ready-for-review"
 READY_TO_MERGE_LABEL="${NW_PR_RESOLVER_READY_LABEL:-ready-to-merge}"
@@ -93,6 +89,13 @@ emit_result() {
   fi
 }
 
+require_provider_on_path() {
+  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
+}
+
 extract_review_score_from_text() {
   local review_text="${1:-}"
   printf '%s' "${review_text}" \
@@ -129,6 +132,72 @@ get_pr_comments() {
   } | awk '!seen[$0]++'
 }
 
+get_pr_pending_review_feedback_count() {
+  local pr_number="${1:?PR number required}"
+  local review_decision=""
+  local change_request_count="0"
+  local unresolved_thread_count="0"
+  local repo="${REPO:-}"
+  local owner=""
+  local name=""
+
+  review_decision=$(gh pr view "${pr_number}" --json reviewDecision --jq '.reviewDecision // ""' 2>/dev/null || echo "")
+
+  change_request_count=$(gh api "repos/{owner}/{repo}/pulls/${pr_number}/reviews" \
+    --jq '[.[] | select(.state == "CHANGES_REQUESTED")] | length' 2>/dev/null || echo "0")
+  if ! [[ "${change_request_count}" =~ ^[0-9]+$ ]]; then
+    change_request_count="0"
+  fi
+
+  if [ -z "${repo}" ]; then
+    repo=$(gh repo view --json nameWithOwner --jq '.nameWithOwner' 2>/dev/null || echo "")
+  fi
+
+  if [[ "${repo}" == */* ]]; then
+    owner="${repo%%/*}"
+    name="${repo#*/}"
+    unresolved_thread_count=$(gh api graphql \
+      -F owner="${owner}" \
+      -F name="${name}" \
+      -F number="${pr_number}" \
+      -f query='
+        query($owner: String!, $name: String!, $number: Int!) {
+          repository(owner: $owner, name: $name) {
+            pullRequest(number: $number) {
+              reviewThreads(first: 100) {
+                nodes {
+                  isResolved
+                }
+              }
+            }
+          }
+        }
+      ' \
+      --jq '[.data.repository.pullRequest.reviewThreads.nodes[]? | select(.isResolved == false)] | length' \
+      2>/dev/null || echo "0")
+    if ! [[ "${unresolved_thread_count}" =~ ^[0-9]+$ ]]; then
+      unresolved_thread_count="0"
+    fi
+  fi
+
+  if [ "${unresolved_thread_count}" -gt 0 ]; then
+    echo "${unresolved_thread_count}"
+    return 0
+  fi
+
+  if [ "${change_request_count}" -gt 0 ]; then
+    echo "${change_request_count}"
+    return 0
+  fi
+
+  if [ "${review_decision}" = "CHANGES_REQUESTED" ]; then
+    echo "1"
+    return 0
+  fi
+
+  echo "0"
+}
+
 get_pr_head_ref_oid() {
   local pr_number="${1:?PR number required}"
   gh pr view "${pr_number}" --json headRefOid --jq '.headRefOid' 2>/dev/null || echo ""
@@ -757,6 +826,18 @@ while IFS=$'\t' read -r pr_number pr_branch pr_labels; do
     continue
   fi
 
+  PENDING_REVIEW_FEEDBACK_COUNT=$(get_pr_pending_review_feedback_count "${pr_number}")
+  if [ "${PENDING_REVIEW_FEEDBACK_COUNT}" -gt 0 ]; then
+    if [ "${local_ready_for_review_label_present}" -eq 1 ]; then
+      log "INFO: PR #${pr_number} (${pr_branch}) has pending review feedback; removing stale ${READY_FOR_REVIEW_LABEL} label"
+      clear_ready_for_human_review_label "${pr_number}"
+    fi
+    log "INFO: PR #${pr_number} (${pr_branch}) has ${PENDING_REVIEW_FEEDBACK_COUNT} pending review feedback item(s)"
+    NEEDS_WORK=1
+    PRS_NEEDING_WORK="${PRS_NEEDING_WORK} #${pr_number}"
+    continue
+  fi
+
   if has_ready_for_human_review_marker "${all_comments}" "${current_head_sha}"; then
     SKIPPED_ALREADY_REVIEWED_CURRENT_HEAD=1
     log "INFO: PR #${pr_number} (${pr_branch}) is already marked ready for human review at head ${current_head_sha:0:12}; skipping repeat automated review"
@@ -853,6 +934,8 @@ if [ -z "${TARGET_PR}" ] && [ "${WORKER_MODE}" != "1" ] && [ "${PARALLEL_ENABLED
     exit 0
   fi
 
+  require_provider_on_path
+
   log "PARALLEL: Launching ${#PR_NUMBER_ARRAY[@]} reviewer worker(s)"
 
   declare -a WORKER_PIDS=()
@@ -1022,6 +1105,8 @@ if [ "${NW_DRY_RUN:-0}" = "1" ]; then
   exit 0
 fi
 
+require_provider_on_path
+
 if ! prepare_detached_worktree "${PROJECT_DIR}" "${REVIEW_WORKTREE_DIR}" "${DEFAULT_BRANCH}" "${LOG_FILE}"; then
   log "FAIL: Unable to create isolated reviewer worktree ${REVIEW_WORKTREE_DIR}"
   exit 1
@@ -1070,6 +1155,7 @@ if [ -n "${TARGET_PR}" ]; then
   TARGET_MERGE_STATE=$(gh pr view "${TARGET_PR}" --json mergeStateStatus --jq '.mergeStateStatus' 2>/dev/null || echo "UNKNOWN")
   TARGET_FAILED_CHECKS=$(get_pr_failed_ci_summary "${TARGET_PR}")
   TARGET_SCORE=$(get_pr_score "${TARGET_PR}")
+  TARGET_PENDING_REVIEW_FEEDBACK=$(get_pr_pending_review_feedback_count "${TARGET_PR}")
 
   TARGET_SCOPE_PROMPT+=$'\n## Preflight Data (from CLI)\n- mergeStateStatus: '"${TARGET_MERGE_STATE}"$'\n'
   if [ -n "${TARGET_FAILED_CHECKS}" ]; then
@@ -1077,6 +1163,7 @@ if [ -n "${TARGET_PR}" ]; then
   else
     TARGET_SCOPE_PROMPT+=$'- failing checks: none detected\n'
   fi
+  TARGET_SCOPE_PROMPT+=$'- pending review feedback: '"${TARGET_PENDING_REVIEW_FEEDBACK}"$' item(s)\n'
   if [ -n "${TARGET_SCORE}" ]; then
     TARGET_SCOPE_PROMPT+=$'- latest review score: '"${TARGET_SCORE}"$'/100\n'
     TARGET_SCOPE_PROMPT+=$'- action: fix\n'
@@ -1226,6 +1313,10 @@ for ATTEMPT in $(seq 1 "${TOTAL_ATTEMPTS}"); do
   LOG_LINE_BEFORE=$(wc -l < "${LOG_FILE}" 2>/dev/null || echo 0)
   REVIEWER_ATTEMPT_START=$(date +%s)
   REVIEWER_PROMPT="${REVIEWER_PROMPT_BASE}${TARGET_SCOPE_PROMPT}${PRD_CONTEXT_PROMPT}"
+  if [ -n "${NW_PROJECT_FEEDBACK_PROMPT:-}" ]; then
+    REVIEWER_PROMPT="${REVIEWER_PROMPT}"$'\n\n'"${NW_PROJECT_FEEDBACK_PROMPT}"
+    log "INFO: Added project feedback prompt context"
+  fi
 
   # Build provider command array using generic helper
   mapfile -d '' -t PROVIDER_CMD_PARTS < <(build_provider_cmd "${REVIEW_WORKTREE_DIR}" "${REVIEWER_PROMPT}")

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

@@ -26,6 +26,7 @@ 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}"
+READY_TO_MERGE_LABEL="${NW_PR_RESOLVER_READY_LABEL:-ready-to-merge}"
 QA_ARTIFACTS="${NW_QA_ARTIFACTS:-both}"
 QA_AUTO_INSTALL_PLAYWRIGHT="${NW_QA_AUTO_INSTALL_PLAYWRIGHT:-1}"
 SCRIPT_START_TIME=$(date +%s)
@@ -45,6 +46,7 @@ PROJECT_RUNTIME_KEY=$(project_runtime_key "${PROJECT_DIR}")
 # NOTE: Lock file path must match qaLockPath() in src/utils/status-data.ts
 LOCK_FILE="/tmp/night-watch-qa-${PROJECT_RUNTIME_KEY}.lock"
 SCRIPT_TYPE="qa"
+skip_if_job_paused "${SCRIPT_TYPE}" "${PROJECT_DIR}"
 
 emit_result() {
   local status="${1:?status required}"
@@ -366,7 +368,7 @@ fi
 rotate_log
 log_separator
 log "RUN-START: qa invoked project=${PROJECT_DIR} provider=${PROVIDER_CMD} dry_run=${NW_DRY_RUN:-0}"
-log "CONFIG: max_runtime=${MAX_RUNTIME}s artifacts=${QA_ARTIFACTS} skip_label=${SKIP_LABEL} branch_patterns=${BRANCH_PATTERNS_RAW}"
+log "CONFIG: max_runtime=${MAX_RUNTIME}s artifacts=${QA_ARTIFACTS} skip_label=${SKIP_LABEL} ready_label=${READY_TO_MERGE_LABEL} branch_patterns=${BRANCH_PATTERNS_RAW}"
 
 if ! acquire_lock "${LOCK_FILE}"; then
   emit_result "skip_locked"
@@ -431,6 +433,11 @@ while IFS=$'\t' read -r pr_number pr_branch pr_title pr_labels; do
     continue
   fi
 
+  if csv_has_label "${pr_labels:-}" "${READY_TO_MERGE_LABEL}"; then
+    log "SKIP-QA: PR #${pr_number} (${pr_branch}) is labeled ${READY_TO_MERGE_LABEL}"
+    continue
+  fi
+
   # Skip PRs with the skip label
   if echo "${pr_labels}" | grep -q "${SKIP_LABEL}"; then
     log "SKIP-QA: PR #${pr_number} (${pr_branch}) has '${SKIP_LABEL}' label"

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

@@ -35,6 +35,7 @@ source "${SCRIPT_DIR}/night-watch-helpers.sh"
 ensure_provider_on_path "${PROVIDER_CMD}" || true
 PROJECT_RUNTIME_KEY=$(project_runtime_key "${PROJECT_DIR}")
 LOCK_FILE="/tmp/night-watch-slicer-${PROJECT_RUNTIME_KEY}.lock"
+SCRIPT_TYPE="slicer"
 PROVIDER_MODEL_DISPLAY=$(resolve_provider_model_display "${PROVIDER_CMD}" "${PROVIDER_LABEL}")
 
 emit_result() {
@@ -53,6 +54,8 @@ if ! validate_provider "${PROVIDER_CMD}"; then
   exit 1
 fi
 
+skip_if_job_paused "${SCRIPT_TYPE}" "${PROJECT_DIR}"
+
 rotate_log
 log_separator
 log "RUN-START: slicer invoked project=${PROJECT_DIR} provider=${PROVIDER_CMD} dry_run=${NW_DRY_RUN:-0}"

package/dist/templates/night-watch-pr-reviewer.md

@@ -1,7 +1,7 @@
 You are the Night Watch PR Reviewer agent. Your job is to check open PRs for three things:
 
 1. Merge conflicts -- rebase onto the base branch and resolve them.
-2. Review comments with a score below 80 -- address the feedback.
+2. Review comments with a score below 80 or unresolved review feedback -- address the feedback.
 3. Failed CI jobs -- diagnose and fix the failures.
 
 ## Context
@@ -10,7 +10,7 @@ The repo can have multiple PR checks/workflows (project CI plus Night Watch auto
 Common examples include `typecheck`, `lint`, `test`, `build`, `verify`, `executor`, `qa`, and `audit`.
 Treat `gh pr checks <number> --json name,state,conclusion` as the source of truth for which checks failed.
 
-A PR needs attention if **any** of the following: merge conflicts present, review score below 80, or any CI job failed.
+A PR needs attention if **any** of the following: merge conflicts present, no review score yet, review score below 80, unresolved review feedback, or any CI job failed.
 
 ## PRD Context
 
@@ -21,7 +21,7 @@ If current PR code or review feedback conflicts with the PRD context, call out t
 ## Important: Early Exit
 
 - If there are **no open PRs** on `night-watch/` or `feat/` branches, **stop immediately** and report "No PRs to review."
-- If all open PRs have **no merge conflicts**, **passing CI**, and **review score >= 80**, **stop immediately** and report "All PRs are in good shape."
+- If all open PRs have **no merge conflicts**, **passing CI**, **review score >= 80**, and **no unresolved review feedback**, **stop immediately** and report "All PRs are in good shape."
 - If a PR has no review score yet, it needs a first review — do NOT skip it.
 - Do **NOT** loop or retry. Process each PR **once** per run. After processing all PRs, stop.
 - Do **NOT** re-check PRs after pushing fixes -- the CI will re-run automatically on the next push.
@@ -90,8 +90,8 @@ Parse the review score from the comment body. Look for patterns like:
   Extract the numeric score. If multiple comments have scores, use the **most recent** one.
 
 3. **Determine if PR needs work**:
-   - If no merge conflicts **AND** score >= 80 **AND** all CI checks pass --> skip this PR.
-   - If merge conflicts present **OR** score < 80 **OR** any CI check failed --> fix the issues.
+   - If no merge conflicts **AND** score >= 80 **AND** no unresolved review feedback **AND** all CI checks pass --> skip this PR.
+   - If merge conflicts present **OR** score < 80 **OR** unresolved review feedback exists **OR** any CI check failed --> fix the issues.
 
 4. **Fix the PR**:
 
@@ -122,8 +122,9 @@ Parse the review score from the comment body. Look for patterns like:
    - Push the clean branch: `git push --force-with-lease origin <branch-name>`
    - **Do NOT leave any conflict markers (`<<<<<<<`, `=======`, `>>>>>>>`) in any file.**
 
-   c. **Address review feedback** (if score < 80):
+   c. **Address review feedback** (if score < 80 or pending review feedback exists):
    - Read the review comments carefully. Extract areas for improvement, bugs found, issues found, and specific file/line suggestions.
+   - If `pending review feedback` is greater than 0 in the cron-provided preflight data, inspect review conversations with `gh pr view <number> --comments` and the GitHub PR review UI/API as needed.
    - For each review suggestion:
      - If you agree, implement the change.
      - If you do not agree, do not implement it blindly. Capture a short technical reason and include that reason in the PR comment.