@jonit-dev/night-watch-cli 1.7.49 → 1.7.51

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

@@ -32,7 +32,7 @@ source "${SCRIPT_DIR}/night-watch-helpers.sh"
 PROJECT_RUNTIME_KEY=$(project_runtime_key "${PROJECT_DIR}")
 # NOTE: Lock file path must match auditLockPath() in src/utils/status-data.ts
 LOCK_FILE="/tmp/night-watch-audit-${PROJECT_RUNTIME_KEY}.lock"
-AUDIT_PROMPT_TEMPLATE="${SCRIPT_DIR}/../templates/night-watch-audit.md"
+AUDIT_PROMPT_TEMPLATE="${SCRIPT_DIR}/../templates/audit.md"
 
 emit_result() {
   local status="${1:?status required}"
@@ -106,42 +106,65 @@ fi
 # Ensure the logs dir exists inside the worktree so the provider can write the report
 mkdir -p "${AUDIT_WORKTREE_DIR}/logs"
 
+AUDIT_MAX_RETRIES="${NW_AUDIT_MAX_RETRIES:-3}"
+AUDIT_RETRY_DELAY="${NW_AUDIT_RETRY_DELAY:-120}"
+
 log "START: Running code audit for ${PROJECT_NAME} (provider: ${PROVIDER_CMD})"
 
 EXIT_CODE=0
 
-case "${PROVIDER_CMD}" in
-  claude)
-    if (
-      cd "${AUDIT_WORKTREE_DIR}" && timeout "${MAX_RUNTIME}" \
-        claude -p "${AUDIT_PROMPT}" \
-          --dangerously-skip-permissions \
-          >> "${LOG_FILE}" 2>&1
-    ); then
-      EXIT_CODE=0
-    else
-      EXIT_CODE=$?
-    fi
-    ;;
-  codex)
-    if (
-      cd "${AUDIT_WORKTREE_DIR}" && timeout "${MAX_RUNTIME}" \
-        codex --quiet \
-          --yolo \
-          --prompt "${AUDIT_PROMPT}" \
-          >> "${LOG_FILE}" 2>&1
-    ); then
-      EXIT_CODE=0
-    else
-      EXIT_CODE=$?
-    fi
-    ;;
-  *)
-    log "ERROR: Unknown provider: ${PROVIDER_CMD}"
-    emit_result "failure" "reason=unknown_provider"
-    exit 1
-    ;;
-esac
+for AUDIT_ATTEMPT in $(seq 1 "${AUDIT_MAX_RETRIES}"); do
+  LOG_LINE_BEFORE=$(wc -l < "${LOG_FILE}" 2>/dev/null || echo 0)
+  log "AUDIT: Attempt ${AUDIT_ATTEMPT}/${AUDIT_MAX_RETRIES}"
+
+  case "${PROVIDER_CMD}" in
+    claude)
+      if (
+        cd "${AUDIT_WORKTREE_DIR}" && timeout "${MAX_RUNTIME}" \
+          claude -p "${AUDIT_PROMPT}" \
+            --dangerously-skip-permissions \
+            >> "${LOG_FILE}" 2>&1
+      ); then
+        EXIT_CODE=0
+      else
+        EXIT_CODE=$?
+      fi
+      ;;
+    codex)
+      if (
+        cd "${AUDIT_WORKTREE_DIR}" && timeout "${MAX_RUNTIME}" \
+          codex --quiet \
+            --yolo \
+            --prompt "${AUDIT_PROMPT}" \
+            >> "${LOG_FILE}" 2>&1
+      ); then
+        EXIT_CODE=0
+      else
+        EXIT_CODE=$?
+      fi
+      ;;
+    *)
+      log "ERROR: Unknown provider: ${PROVIDER_CMD}"
+      emit_result "failure" "reason=unknown_provider"
+      exit 1
+      ;;
+  esac
+
+  # Success or timeout — don't retry
+  if [ "${EXIT_CODE}" -eq 0 ] || [ "${EXIT_CODE}" -eq 124 ]; then
+    break
+  fi
+
+  # Rate-limit retry with backoff
+  if check_rate_limited "${LOG_FILE}" "${LOG_LINE_BEFORE}" && [ "${AUDIT_ATTEMPT}" -lt "${AUDIT_MAX_RETRIES}" ]; then
+    log "RATE-LIMITED: 429 detected (attempt ${AUDIT_ATTEMPT}/${AUDIT_MAX_RETRIES}), retrying in ${AUDIT_RETRY_DELAY}s..."
+    sleep "${AUDIT_RETRY_DELAY}"
+    continue
+  fi
+
+  # Non-retryable failure
+  break
+done
 
 # Copy report back to project dir (if it was written in the worktree)
 WORKTREE_REPORT="${AUDIT_WORKTREE_DIR}/logs/audit-report.md"

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

@@ -304,6 +304,16 @@ Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>" || true
 
 log "START: Processing ${ELIGIBLE_PRD} on branch ${BRANCH_NAME} (worktree: ${WORKTREE_DIR})"
 
+EXECUTOR_PROMPT_PATH=$(resolve_instruction_path "${PROJECT_DIR}" "prd-executor.md" || true)
+if [ -z "${EXECUTOR_PROMPT_PATH}" ]; then
+  log "FAIL: Missing PRD executor instructions. Checked instructions/, .claude/commands/, and bundled templates/"
+  restore_issue_to_ready "Failed to locate PRD executor instructions. Checked instructions/, .claude/commands/, and bundled templates/."
+  night_watch_history record "${PROJECT_DIR}" "${ELIGIBLE_PRD}" failure --exit-code 1 2>/dev/null || true
+  emit_result "failure" "reason=missing_executor_prompt"
+  exit 1
+fi
+EXECUTOR_PROMPT_REF=$(instruction_ref_for_prompt "${PROJECT_DIR}" "${EXECUTOR_PROMPT_PATH}")
+
 if [ -n "${ISSUE_NUMBER}" ]; then
   PROMPT="Implement the following PRD (GitHub issue #${ISSUE_NUMBER}: ${ISSUE_TITLE_RAW}):
 
@@ -317,7 +327,7 @@ ${ISSUE_BODY}
 - Install dependencies if needed and implement in the current worktree only
 
 ## Implementation — PRD Executor Workflow
-Read .claude/skills/prd-executor/SKILL.md (preferred) or .claude/commands/prd-executor.md (fallback), and follow the FULL execution pipeline:
+Read ${EXECUTOR_PROMPT_REF} and follow the FULL execution pipeline:
 1. Parse the PRD into phases and extract dependencies
 2. Build a dependency graph to identify parallelism
 3. Create a task list with one task per phase
@@ -345,7 +355,7 @@ else
 - Install dependencies if needed and implement in the current worktree only
 
 ## Implementation — PRD Executor Workflow
-Read .claude/skills/prd-executor/SKILL.md (preferred) or .claude/commands/prd-executor.md (fallback), and follow the FULL execution pipeline:
+Read ${EXECUTOR_PROMPT_REF} and follow the FULL execution pipeline:
 1. Parse the PRD into phases and extract dependencies
 2. Build a dependency graph to identify parallelism
 3. Create a task list with one task per phase

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

@@ -51,6 +51,90 @@ resolve_night_watch_cli() {
   return 1
 }
 
+resolve_instruction_path() {
+  local project_dir="${1:?project_dir required}"
+  local instruction_file="${2:?instruction_file required}"
+  local script_dir=""
+  local candidate=""
+
+  if [ -n "${SCRIPT_DIR:-}" ]; then
+    script_dir="${SCRIPT_DIR}"
+  else
+    script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+  fi
+
+  for candidate in \
+    "${project_dir}/instructions/${instruction_file}" \
+    "${project_dir}/.claude/commands/${instruction_file}" \
+    "${script_dir}/../templates/${instruction_file}"; do
+    if [ -f "${candidate}" ]; then
+      printf "%s" "${candidate}"
+      return 0
+    fi
+  done
+
+  return 1
+}
+
+resolve_instruction_path_with_fallback() {
+  local project_dir="${1:?project_dir required}"
+  shift || true
+  local instruction_file=""
+  local resolved_path=""
+
+  for instruction_file in "$@"; do
+    [ -z "${instruction_file}" ] && continue
+    resolved_path=$(resolve_instruction_path "${project_dir}" "${instruction_file}" || true)
+    if [ -n "${resolved_path}" ]; then
+      printf "%s" "${resolved_path}"
+      return 0
+    fi
+  done
+
+  return 1
+}
+
+instruction_ref_for_prompt() {
+  local root_dir="${1:?root_dir required}"
+  local instruction_path="${2:?instruction_path required}"
+
+  if [[ "${instruction_path}" == "${root_dir}/"* ]]; then
+    printf "%s" "${instruction_path#${root_dir}/}"
+  else
+    printf "%s" "${instruction_path}"
+  fi
+}
+
+prefer_bundled_prompt_if_legacy_command() {
+  local project_root="${1:?project_root required}"
+  local resolved_prompt_path="${2:?resolved_prompt_path required}"
+  local bundled_prompt_name="${3:?bundled_prompt_name required}"
+  local script_dir=""
+  local bundled_prompt_path=""
+  local rel_path=""
+
+  if [ -n "${SCRIPT_DIR:-}" ]; then
+    script_dir="${SCRIPT_DIR}"
+  else
+    script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+  fi
+
+  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
+    fi
+  fi
+
+  printf "%s" "${resolved_prompt_path}"
+}
+
 night_watch_history() {
   local cli_bin
   cli_bin=$(resolve_night_watch_cli) || return 127