@jonit-dev/night-watch-cli 1.8.12-beta.0 → 1.8.12-beta.10

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

@@ -126,6 +126,7 @@ project_git_push_command() {
 NW_EXECUTOR_PARTIAL_LABEL="${NW_EXECUTOR_PARTIAL_LABEL:-nw:partial}"
 NW_EXECUTOR_RESUMABLE_LABEL="${NW_EXECUTOR_RESUMABLE_LABEL:-nw:resumable}"
 NW_EXECUTOR_READY_REVIEW_LABEL="${NW_EXECUTOR_READY_REVIEW_LABEL:-nw:ready-review}"
+NW_PR_RESOLVER_READY_LABEL="${NW_PR_RESOLVER_READY_LABEL:-ready-to-merge}"
 
 csv_has_label() {
   local csv="${1:-}"
@@ -188,7 +189,8 @@ find_executor_resume_pr() {
   printf '%s' "${pr_list}" \
     | jq -c \
         --arg primary_prefix "${branch_prefix}/" \
-        --arg resumable_label "${NW_EXECUTOR_RESUMABLE_LABEL}" '
+        --arg resumable_label "${NW_EXECUTOR_RESUMABLE_LABEL}" \
+        --arg ready_label "${NW_PR_RESOLVER_READY_LABEL}" '
         [
           .[]
           | select(
@@ -198,6 +200,7 @@ find_executor_resume_pr() {
             )
           | .labelNames = ((.labels // []) | map(.name))
           | select((.labelNames | index($resumable_label)) != null)
+          | select((.labelNames | index($ready_label)) == null)
         ]
         | sort_by(.createdAt // "")
         | .[0] // empty
@@ -1243,8 +1246,40 @@ or set primaryFallbackPreset / primaryFallbackModel in night-watch.config.json."
 
 # ── Board mode issue discovery ────────────────────────────────────────────────
 
+is_audit_board_issue_json() {
+  local issue_json="${1:?issue_json required}"
+
+  printf '%s' "${issue_json}" \
+    | jq -r '[.title // "", .body // ""] | join("\n")' 2>/dev/null \
+    | grep -Eiq '(^|[[:space:]])Audit:|Night Watch audit detected|Report:[[:space:]]+`?logs/audit-report\.md`?|Finding:[[:space:]]+[0-9]+'
+}
+
+is_audit_paused_or_disabled() {
+  local cli_bin="${1:?cli_bin required}"
+  local project_dir="${2:?project_dir required}"
+
+  if (cd "${project_dir}" && "${cli_bin}" job is-paused audit >/dev/null 2>&1); then
+    return 0
+  fi
+
+  local audit_enabled
+  audit_enabled=$(
+    cd "${project_dir}" \
+      && "${cli_bin}" config get audit.enabled 2>/dev/null \
+      | tr '[:upper:]' '[:lower:]' \
+      | sed -E 's/^[[:space:]]+//; s/[[:space:]]+$//'
+  ) || true
+
+  if [ "${audit_enabled}" = "false" ]; then
+    return 0
+  fi
+
+  return 1
+}
+
 # Get the next eligible issue from the board provider.
-# Iterates through Ready issues sorted by priority, skipping any in cooldown.
+# Iterates through Ready issues sorted by priority, skipping audit findings when
+# audit is disabled/paused and skipping any in cooldown.
 # Prints the JSON of the first eligible issue to stdout, or nothing if none found.
 # Returns 0 on success, 1 if no Ready issues were returned, 2 if Ready issues
 # were found but every candidate was skipped due to cooldown.
@@ -1292,6 +1327,16 @@ find_eligible_board_issue() {
     number=$(printf '%s' "${issue}" | jq -r '.number' 2>/dev/null)
     title=$(printf '%s' "${issue}" | jq -r '.title // empty' 2>/dev/null)
 
+    # Skip stale audit findings while the audit job is paused/disabled. Audit
+    # cron/config gates stop new scans, but Ready board issues can outlive them.
+    if [ -n "${project_dir}" ] \
+      && is_audit_board_issue_json "${issue}" \
+      && is_audit_paused_or_disabled "${cli_bin}" "${project_dir}"; then
+      log "SKIP-BOARD: Issue #${number} — audit issue skipped because audit is paused or disabled"
+      i=$((i + 1))
+      continue
+    fi
+
     # Derive PRD name (same slug format used by the cron script for history keys)
     prd_name="${number}-$(printf '%s' "${title}" | tr '[:upper:]' '[:lower:]' | tr -cs 'a-z0-9' '-' | sed 's/^-\|-$//g')"
 
@@ -1335,6 +1380,22 @@ arm_global_queue_cleanup() {
   append_exit_trap "__night_watch_queue_cleanup \$?"
 }
 
+skip_if_job_paused() {
+  local script_type="${1:?script_type required}"
+  local project_dir="${2:?project_dir required}"
+
+  local cli_bin
+  cli_bin=$(resolve_night_watch_cli) || return 0
+
+  if (cd "${project_dir}" && "${cli_bin}" job is-paused "${script_type}" >/dev/null 2>&1); then
+    log "SKIP: ${script_type} is paused in night-watch.config.json"
+    if command -v emit_result >/dev/null 2>&1; then
+      emit_result "skip_paused"
+    fi
+    exit 0
+  fi
+}
+
 # Atomically claim a queue slot or enqueue for later dispatch.
 # Uses DB transaction (via `queue claim` CLI) for atomicity — no flock needed.
 # Sets NW_QUEUE_ENTRY_ID on success and arms the cleanup trap.
@@ -1342,6 +1403,8 @@ arm_global_queue_cleanup() {
 claim_or_enqueue() {
   local script_type="${1:?script_type required}"
   local project_dir="${2:?project_dir required}"
+  skip_if_job_paused "${script_type}" "${project_dir}"
+
   local provider_key
   provider_key=$(resolve_provider_key "${project_dir}" "${script_type}")
 

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,83 @@ 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() {
+# Get the current head OID for a PR.
+get_pr_head_oid() {
   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
-  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
+  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
-  return 0
+
+  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 +206,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 +241,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 +270,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 +307,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
 
@@ -249,6 +344,7 @@ while IFS= read -r pr_json; do
 
   # 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 +352,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 +380,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,8 +74,10 @@ 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}"
 
 emit_result() {
   local status="${1:?status required}"
@@ -92,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}" \
@@ -701,6 +705,11 @@ while IFS=$'\t' read -r pr_number pr_branch pr_labels; do
     continue
   fi
 
+  if csv_has_label "${pr_labels:-}" "${READY_TO_MERGE_LABEL}"; then
+    log "INFO: PR #${pr_number} (${pr_branch}) is labeled ${READY_TO_MERGE_LABEL}; skipping automated review"
+    continue
+  fi
+
   if printf '%s\n' "${pr_labels:-}" | tr ',' '\n' | grep -Fxq 'needs-human-review'; then
     log "INFO: PR #${pr_number} (${pr_branch}) is labeled needs-human-review; skipping automated review"
     continue
@@ -847,6 +856,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=()
@@ -1016,6 +1027,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
@@ -1220,6 +1233,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.config.json

@@ -55,9 +55,28 @@
       "audit": 10
     }
   },
-  "jobProviders": {
-    "reviewer": "g51claude"
+  "webhookTriggers": {
+    "enabled": false,
+    "secretEnv": "NIGHT_WATCH_WEBHOOK_SECRET",
+    "allowedJobIds": [
+      "executor",
+      "reviewer",
+      "pr-resolver",
+      "slicer",
+      "qa",
+      "audit",
+      "analytics",
+      "merger"
+    ],
+    "requireTimestamp": false,
+    "maxSkewSeconds": 300,
+    "github": {
+      "enabled": false,
+      "events": [],
+      "rules": []
+    }
   },
+  "jobProviders": {},
   "autoMerge": false,
   "autoMergeMethod": "squash",
   "fallbackOnRateLimit": true,
@@ -75,23 +94,5 @@
     "enabled": true,
     "schedule": "50 3 * * 1",
     "maxRuntime": 1800
-  },
-  "providerPresets": {
-    "g51claude": {
-      "name": "GLM-5.1 Claude",
-      "command": "claude",
-      "promptFlag": "-p",
-      "autoApproveFlag": "--dangerously-skip-permissions",
-      "modelFlag": "--model",
-      "model": "glm-5.1",
-      "envVars": {
-        "ANTHROPIC_BASE_URL": "https://api.z.ai/api/anthropic",
-        "API_TIMEOUT_MS": "3000000",
-        "ANTHROPIC_DEFAULT_OPUS_MODEL": "glm-5.1",
-        "ANTHROPIC_DEFAULT_SONNET_MODEL": "glm-5.1",
-        "ANTHROPIC_AUTH_TOKEN": "efaeca456dab4ae69cb9ce1fa8d99a1a.KSTifNTWPS6NgC6L",
-        "ANTHROPIC_API_KEY": "efaeca456dab4ae69cb9ce1fa8d99a1a.KSTifNTWPS6NgC6L"
-      }
-    }
   }
 }

package/dist/templates/slicer.md

@@ -32,6 +32,8 @@ The PRD directory is: `{{PRD_DIR}}`
 
 3. **Write a Complete PRD** — Follow the exact template structure below. Every section must be filled with concrete information. No placeholder text.
 
+   The PRD MUST include these sections: Context (with Problem, Files Analyzed, Current Behavior, Integration Points), Solution (with Approach, Key Decisions), Execution Phases (with Files, Implementation steps, Tests), and Acceptance Criteria.
+
 4. **Write the PRD File** — Use the Write tool to create the PRD file at `{{OUTPUT_FILE_PATH}}`.
 
 ---
@@ -146,6 +148,7 @@ sequenceDiagram
 ## 4. Execution Phases
 
 Critical rules:
+
 1. Each phase = ONE user-testable vertical slice
 2. Max 5 files per phase (split if larger)
 3. Each phase MUST include concrete tests