@jonit-dev/night-watch-cli 1.7.55 → 1.7.57

package/dist/commands/update.d.ts

@@ -7,13 +7,14 @@ export declare const DEFAULT_GLOBAL_SPEC = "@jonit-dev/night-watch-cli@latest";
 export interface IUpdateOptions {
     projects?: string;
     globalSpec: string;
-    noGlobal?: boolean;
+    global?: boolean;
 }
 /**
  * Parse project directories from a comma-separated CLI option.
  * Defaults to current working directory when option is omitted.
  */
 export declare function parseProjectDirs(projects: string | undefined, cwd: string): string[];
+export declare function shouldInstallGlobal(options: Pick<IUpdateOptions, 'global'>): boolean;
 /**
  * Register update command.
  */

package/dist/commands/update.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../src/commands/update.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAKpC,eAAO,MAAM,mBAAmB,sCAAsC,CAAC;AAEvE,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAYpF;AAgCD;;GAEG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAsCpD"}
+{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../src/commands/update.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAKpC,eAAO,MAAM,mBAAmB,sCAAsC,CAAC;AAEvE,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAYpF;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,IAAI,CAAC,cAAc,EAAE,QAAQ,CAAC,GAAG,OAAO,CAEpF;AAgCD;;GAEG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAsCpD"}

package/dist/commands/update.js

@@ -22,6 +22,9 @@ export function parseProjectDirs(projects, cwd) {
         .map((entry) => path.resolve(cwd, entry));
     return Array.from(new Set(dirs));
 }
+export function shouldInstallGlobal(options) {
+    return options.global !== false;
+}
 function runCommand(command, args, cwd) {
     const result = spawnSync(command, args, {
         cwd,
@@ -60,7 +63,7 @@ export function updateCommand(program) {
         try {
             const cwd = process.cwd();
             const projectDirs = parseProjectDirs(options.projects, cwd);
-            if (!options.noGlobal) {
+            if (shouldInstallGlobal(options)) {
                 dim(`Updating global install: npm install -g ${options.globalSpec}`);
                 runCommand('npm', ['install', '-g', options.globalSpec]);
                 success('Global CLI update completed.');

package/dist/commands/update.js.map

@@ -1 +1 @@
-{"version":3,"file":"update.js","sourceRoot":"","sources":["../../src/commands/update.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"update.js","sourceRoot":"","sources":["../../src/commands/update.ts"],"names":[],"mappings":"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"}

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

@@ -112,6 +112,8 @@ prefer_bundled_prompt_if_legacy_command() {
   local script_dir=""
   local bundled_prompt_path=""
   local rel_path=""
+  local first_content_line=""
+  local looks_like_wrapper=1
 
   if [ -n "${SCRIPT_DIR:-}" ]; then
     script_dir="${SCRIPT_DIR}"
@@ -121,15 +123,27 @@ prefer_bundled_prompt_if_legacy_command() {
 
   bundled_prompt_path="${script_dir}/../templates/${bundled_prompt_name}"
 
-  # Legacy .claude command prompt files often contain slash-command wrappers
-  # rather than the full automation prompt. Prefer bundled templates in that case.
-  if [[ "${resolved_prompt_path}" == "${project_root}/.claude/commands/"* ]] && [ -f "${bundled_prompt_path}" ]; then
-    rel_path="${resolved_prompt_path#${project_root}/}"
-    if grep -Eqi '^[[:space:]]*/[a-z0-9._/-]+' "${resolved_prompt_path}" 2>/dev/null; then
-      log "WARN: Prompt ${rel_path} looks like a slash-command wrapper; using bundled template ${bundled_prompt_name}"
-      printf "%s" "${bundled_prompt_path}"
-      return 0
+  # Some instruction files only contain slash-command wrappers (e.g. "/night-watch-qa")
+  # rather than the full automation prompt. If detected, force bundled templates.
+  if [ -f "${bundled_prompt_path}" ] && [ -f "${resolved_prompt_path}" ]; then
+    first_content_line=$(
+      awk 'NF {print; exit}' "${resolved_prompt_path}" 2>/dev/null \
+        | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//'
+    )
+    if printf '%s' "${first_content_line}" | grep -Eqi '^/[a-z0-9._/-]+'; then
+      looks_like_wrapper=0
+    fi
+  fi
+
+  if [ "${looks_like_wrapper}" -eq 0 ]; then
+    if [[ "${resolved_prompt_path}" == "${project_root}/"* ]]; then
+      rel_path="${resolved_prompt_path#${project_root}/}"
+    else
+      rel_path="${resolved_prompt_path}"
     fi
+    log "WARN: Prompt ${rel_path} looks like a slash-command wrapper; using bundled template ${bundled_prompt_name}"
+    printf "%s" "${bundled_prompt_path}"
+    return 0
   fi
 
   printf "%s" "${resolved_prompt_path}"

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

@@ -172,6 +172,17 @@ append_csv() {
   fi
 }
 
+provider_output_looks_invalid() {
+  local from_line="${1:-0}"
+  if [ ! -f "${LOG_FILE}" ]; then
+    return 1
+  fi
+
+  tail -n "+$((from_line + 1))" "${LOG_FILE}" 2>/dev/null \
+    | grep -Eqi \
+      'Unknown skill:|session is in a broken state|working directory .* no longer exists|Path ".*" does not exist|Please restart this session|failed to start LSP server plugin|spawn .* ENOENT'
+}
+
 truncate_for_prompt() {
   local text="${1:-}"
   local limit="${2:-7000}"
@@ -830,9 +841,10 @@ if [ -z "${TARGET_PR}" ] && [ "${WORKER_MODE}" != "1" ] && [ "${PARALLEL_ENABLED
   exit 0
 fi
 
-REVIEW_WORKTREE_BASENAME="${PROJECT_NAME}-nw-review-runner"
+REVIEW_RUN_TOKEN="${PROJECT_RUNTIME_KEY}-$$"
+REVIEW_WORKTREE_BASENAME="${PROJECT_NAME}-nw-review-runner-${REVIEW_RUN_TOKEN}"
 if [ -n "${TARGET_PR}" ]; then
-  REVIEW_WORKTREE_BASENAME="${REVIEW_WORKTREE_BASENAME}-pr-${TARGET_PR}"
+  REVIEW_WORKTREE_BASENAME="${PROJECT_NAME}-nw-review-runner-pr-${TARGET_PR}-${REVIEW_RUN_TOKEN}"
 fi
 REVIEW_WORKTREE_DIR="$(dirname "${PROJECT_DIR}")/${REVIEW_WORKTREE_BASENAME}"
 
@@ -934,6 +946,51 @@ if [ -n "${TARGET_PR}" ]; then
 fi
 RUN_STARTED_AT=$(date +%s)
 
+remaining_runtime_budget() {
+  local now_ts
+  local elapsed
+  local remaining
+
+  now_ts=$(date +%s)
+  elapsed=$((now_ts - RUN_STARTED_AT))
+  remaining=$((MAX_RUNTIME - elapsed))
+  printf "%s" "${remaining}"
+}
+
+sleep_with_runtime_budget() {
+  local requested_sleep="${1:-0}"
+  local remaining
+  local sleep_for
+
+  if ! [[ "${requested_sleep}" =~ ^[0-9]+$ ]]; then
+    requested_sleep=0
+  fi
+  if [ "${requested_sleep}" -le 0 ]; then
+    return 0
+  fi
+
+  if [ -z "${TARGET_PR}" ]; then
+    sleep "${requested_sleep}"
+    return 0
+  fi
+
+  remaining=$(remaining_runtime_budget)
+  if [ "${remaining}" -le 0 ]; then
+    return 124
+  fi
+
+  sleep_for="${requested_sleep}"
+  if [ "${sleep_for}" -gt "${remaining}" ]; then
+    sleep_for="${remaining}"
+  fi
+  if [ "${sleep_for}" -le 0 ]; then
+    return 124
+  fi
+
+  sleep "${sleep_for}"
+  return 0
+}
+
 for ATTEMPT in $(seq 1 "${TOTAL_ATTEMPTS}"); do
   ATTEMPTS_MADE="${ATTEMPT}"
 
@@ -956,6 +1013,17 @@ for ATTEMPT in $(seq 1 "${TOTAL_ATTEMPTS}"); do
     fi
   fi
 
+  # Recreate worktree if it was removed unexpectedly between attempts.
+  if [ ! -d "${REVIEW_WORKTREE_DIR}" ] || ! git -C "${REVIEW_WORKTREE_DIR}" rev-parse --is-inside-work-tree >/dev/null 2>&1; then
+    log "RETRY: Reviewer worktree missing for attempt ${ATTEMPT}; recreating ${REVIEW_WORKTREE_DIR}"
+    cleanup_reviewer_worktrees "${REVIEW_WORKTREE_BASENAME}"
+    if ! prepare_detached_worktree "${PROJECT_DIR}" "${REVIEW_WORKTREE_DIR}" "${DEFAULT_BRANCH}" "${LOG_FILE}"; then
+      EXIT_CODE=1
+      log "RETRY: Unable to recreate reviewer worktree; aborting"
+      break
+    fi
+  fi
+
   log "RETRY: Starting attempt ${ATTEMPT}/${TOTAL_ATTEMPTS} (timeout: ${ATTEMPT_TIMEOUT}s)"
   LOG_LINE_BEFORE=$(wc -l < "${LOG_FILE}" 2>/dev/null || echo 0)
   REVIEWER_PROMPT="${REVIEWER_PROMPT_BASE}${TARGET_SCOPE_PROMPT}${PRD_CONTEXT_PROMPT}"
@@ -994,23 +1062,56 @@ for ATTEMPT in $(seq 1 "${TOTAL_ATTEMPTS}"); do
 
   # If provider failed (non-zero exit), check for rate limit before giving up
   if [ "${EXIT_CODE}" -ne 0 ]; then
-    if [ "${EXIT_CODE}" -ne 124 ] && \
-       check_rate_limited "${LOG_FILE}" "${LOG_LINE_BEFORE}" && \
-       [ -n "${TARGET_PR}" ] && \
-       [ "${ATTEMPT}" -lt "${TOTAL_ATTEMPTS}" ]; then
-      log "RATE-LIMITED: 429 detected for PR #${TARGET_PR} (attempt ${ATTEMPT}/${TOTAL_ATTEMPTS}), retrying in 120s..."
-      sleep 120
-      continue
-    fi
+	    if [ "${EXIT_CODE}" -ne 124 ] && \
+	       check_rate_limited "${LOG_FILE}" "${LOG_LINE_BEFORE}" && \
+	       [ -n "${TARGET_PR}" ] && \
+	       [ "${ATTEMPT}" -lt "${TOTAL_ATTEMPTS}" ]; then
+	      log "RATE-LIMITED: 429 detected for PR #${TARGET_PR} (attempt ${ATTEMPT}/${TOTAL_ATTEMPTS}), retrying in 120s..."
+	      if ! sleep_with_runtime_budget 120; then
+	        EXIT_CODE=124
+	        log "RETRY: Runtime budget exhausted while waiting to retry PR #${TARGET_PR}"
+	        break
+	      fi
+	      continue
+	    fi
     log "RETRY: Provider exited with code ${EXIT_CODE}, not retrying"
     break
   fi
 
+	  if provider_output_looks_invalid "${LOG_LINE_BEFORE}"; then
+	    log "RETRY: Invalid provider output detected for attempt ${ATTEMPT} (broken session/wrapper output)"
+	    if [ "${ATTEMPT}" -lt "${TOTAL_ATTEMPTS}" ]; then
+	      if ! sleep_with_runtime_budget "${REVIEWER_RETRY_DELAY}"; then
+	        EXIT_CODE=124
+	        log "RETRY: Runtime budget exhausted before retrying invalid provider output"
+	        break
+	      fi
+	      continue
+	    fi
+	    EXIT_CODE=1
+    break
+  fi
+
   # Re-check score for the target PR (only in targeted mode)
   if [ -n "${TARGET_PR}" ]; then
     CURRENT_SCORE=$(get_pr_score "${TARGET_PR}")
     if [ -z "${CURRENT_SCORE}" ]; then
-      log "RETRY: No review score found for PR #${TARGET_PR} after attempt ${ATTEMPT}; not retrying"
+      CURRENT_FAILED_CHECKS=$(get_pr_failed_ci_summary "${TARGET_PR}")
+      if [ -z "${CURRENT_FAILED_CHECKS}" ]; then
+        log "RETRY: No review score for PR #${TARGET_PR}, but CI shows no failing checks; treating as successful."
+        break
+	      fi
+	      if [ "${ATTEMPT}" -lt "${TOTAL_ATTEMPTS}" ]; then
+	        log "RETRY: No review score found for PR #${TARGET_PR} after attempt ${ATTEMPT}; retrying in ${REVIEWER_RETRY_DELAY}s..."
+	        if ! sleep_with_runtime_budget "${REVIEWER_RETRY_DELAY}"; then
+	          EXIT_CODE=124
+	          log "RETRY: Runtime budget exhausted before retrying missing score for PR #${TARGET_PR}"
+	          break
+	        fi
+	        continue
+	      fi
+	      log "RETRY: No review score found for PR #${TARGET_PR} after ${TOTAL_ATTEMPTS} attempts; failing run."
+      EXIT_CODE=1
       break
     fi
 
@@ -1018,13 +1119,17 @@ for ATTEMPT in $(seq 1 "${TOTAL_ATTEMPTS}"); do
     if [ "${CURRENT_SCORE}" -ge "${MIN_REVIEW_SCORE}" ]; then
       log "RETRY: PR #${TARGET_PR} now scores ${CURRENT_SCORE}/100 (>= ${MIN_REVIEW_SCORE}) after attempt ${ATTEMPT}"
       break
-    fi
-    if [ "${ATTEMPT}" -lt "${TOTAL_ATTEMPTS}" ]; then
-      log "RETRY: PR #${TARGET_PR} scores ${CURRENT_SCORE:-unknown}/100 after attempt ${ATTEMPT}/${TOTAL_ATTEMPTS}, retrying in ${REVIEWER_RETRY_DELAY}s..."
-      sleep "${REVIEWER_RETRY_DELAY}"
-    else
-      log "RETRY: PR #${TARGET_PR} still at ${CURRENT_SCORE:-unknown}/100 after ${TOTAL_ATTEMPTS} attempts - giving up"
-      gh pr edit "${TARGET_PR}" --add-label "needs-human-review" 2>/dev/null || true
+	    fi
+	    if [ "${ATTEMPT}" -lt "${TOTAL_ATTEMPTS}" ]; then
+	      log "RETRY: PR #${TARGET_PR} scores ${CURRENT_SCORE:-unknown}/100 after attempt ${ATTEMPT}/${TOTAL_ATTEMPTS}, retrying in ${REVIEWER_RETRY_DELAY}s..."
+	      if ! sleep_with_runtime_budget "${REVIEWER_RETRY_DELAY}"; then
+	        EXIT_CODE=124
+	        log "RETRY: Runtime budget exhausted before retrying low score for PR #${TARGET_PR}"
+	        break
+	      fi
+	    else
+	      log "RETRY: PR #${TARGET_PR} still at ${CURRENT_SCORE:-unknown}/100 after ${TOTAL_ATTEMPTS} attempts - giving up"
+	      gh pr edit "${TARGET_PR}" --add-label "needs-human-review" 2>/dev/null || true
     fi
   else
     # Non-targeted mode: no retry (reviewer handles all PRs in one shot)

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

@@ -514,14 +514,19 @@ Action: generating QA tests and evidence."
   fi
 
   log "QA: Checking out PR #${pr_num} in worktree"
-  if ! (cd "${QA_WORKTREE_DIR}" && gh pr checkout "${pr_num}" >> "${LOG_FILE}" 2>&1); then
-    log "WARN: Failed to checkout PR #${pr_num}, skipping"
-    FAILED_AUTOMATION_PRS_CSV=$(append_csv "${FAILED_AUTOMATION_PRS_CSV}" "#${pr_num}")
-    FAILED_PR="#${pr_num}"
-    FAILED_REASON="checkout_failed"
-    EXIT_CODE=1
-    cleanup_worktrees "${PROJECT_DIR}"
-    continue
+  # Prefer detached checkout to avoid "branch already used by worktree" failures
+  # when the same branch is already checked out in another local worktree.
+  if ! (cd "${QA_WORKTREE_DIR}" && gh pr checkout "${pr_num}" --detach >> "${LOG_FILE}" 2>&1); then
+    log "WARN: Detached checkout failed for PR #${pr_num}; retrying with standard checkout"
+    if ! (cd "${QA_WORKTREE_DIR}" && gh pr checkout "${pr_num}" >> "${LOG_FILE}" 2>&1); then
+      log "WARN: Failed to checkout PR #${pr_num}, skipping"
+      FAILED_AUTOMATION_PRS_CSV=$(append_csv "${FAILED_AUTOMATION_PRS_CSV}" "#${pr_num}")
+      FAILED_PR="#${pr_num}"
+      FAILED_REASON="checkout_failed"
+      EXIT_CODE=1
+      cleanup_worktrees "${PROJECT_DIR}"
+      continue
+    fi
   fi
 
   QA_PROMPT_PATH=$(resolve_instruction_path_with_fallback "${QA_WORKTREE_DIR}" "qa.md" "night-watch-qa.md" || true)