@jonit-dev/night-watch-cli 1.7.0 → 1.7.2

package/scripts/night-watch-cron.sh

@@ -22,11 +22,10 @@ else
 fi
 LOG_DIR="${PROJECT_DIR}/logs"
 LOG_FILE="${LOG_DIR}/night-watch.log"
-# NOTE: Lock file path must match LOCK_FILE_PREFIX in src/constants.ts
-LOCK_FILE="/tmp/night-watch-${PROJECT_NAME}.lock"
 MAX_RUNTIME="${NW_MAX_RUNTIME:-7200}"  # 2 hours
 MAX_LOG_SIZE="524288"  # 512 KB
 PROVIDER_CMD="${NW_PROVIDER_CMD:-claude}"
+BRANCH_PREFIX="${NW_BRANCH_PREFIX:-night-watch}"
 
 # Ensure NVM / Node / Claude are on PATH
 export NVM_DIR="${HOME}/.nvm"
@@ -41,6 +40,19 @@ 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"
+PROJECT_RUNTIME_KEY=$(project_runtime_key "${PROJECT_DIR}")
+# NOTE: Lock file path must match executorLockPath() in src/utils/status-data.ts
+LOCK_FILE="/tmp/night-watch-${PROJECT_RUNTIME_KEY}.lock"
+
+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
+}
 
 # Validate provider
 if ! validate_provider "${PROVIDER_CMD}"; then
@@ -51,6 +63,7 @@ fi
 rotate_log
 
 if ! acquire_lock "${LOCK_FILE}"; then
+  emit_result "skip_locked"
   exit 0
 fi
 
@@ -60,6 +73,7 @@ ELIGIBLE_PRD=$(find_eligible_prd "${PRD_DIR}" "${MAX_RUNTIME}" "${PROJECT_DIR}")
 
 if [ -z "${ELIGIBLE_PRD}" ]; then
   log "SKIP: No eligible PRDs (all done, in-progress, or blocked)"
+  emit_result "skip_no_eligible_prd"
   exit 0
 fi
 
@@ -70,7 +84,7 @@ claim_prd "${PRD_DIR}" "${ELIGIBLE_PRD}"
 trap "rm -f '${LOCK_FILE}'; release_claim '${PRD_DIR}' '${ELIGIBLE_PRD}'" EXIT
 
 PRD_NAME="${ELIGIBLE_PRD%.md}"
-BRANCH_NAME="night-watch/${PRD_NAME}"
+BRANCH_NAME="${BRANCH_PREFIX}/${PRD_NAME}"
 WORKTREE_DIR="$(dirname "${PROJECT_DIR}")/${PROJECT_NAME}-nw-${PRD_NAME}"
 BOOKKEEP_WORKTREE_DIR="$(dirname "${PROJECT_DIR}")/${PROJECT_NAME}-nw-bookkeeping"
 if [ -n "${NW_DEFAULT_BRANCH:-}" ]; then
@@ -126,9 +140,11 @@ Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>" || true
   return 1
 }
 
+PROMPT_PRD_PATH="${PRD_DIR_REL}/${ELIGIBLE_PRD}"
+
 log "START: Processing ${ELIGIBLE_PRD} on branch ${BRANCH_NAME} (worktree: ${WORKTREE_DIR})"
 
-PROMPT="Implement the PRD at docs/PRDs/night-watch/${ELIGIBLE_PRD}
+PROMPT="Implement the PRD at ${PROMPT_PRD_PATH}
 
 ## Setup
 - You are already inside an isolated worktree at: ${WORKTREE_DIR}
@@ -174,9 +190,11 @@ MERGED_PR_COUNT=$(count_prs_for_branch merged "${BRANCH_NAME}")
 if [ "${MERGED_PR_COUNT}" -gt 0 ]; then
   log "INFO: Found merged PR for ${BRANCH_NAME}; skipping provider run"
   if finalize_prd_done "already merged on ${BRANCH_NAME}"; then
+    emit_result "success_already_merged" "prd=${ELIGIBLE_PRD}|branch=${BRANCH_NAME}"
     exit 0
   fi
   night_watch_history record "${PROJECT_DIR}" "${ELIGIBLE_PRD}" failure --exit-code 1 2>/dev/null || true
+  emit_result "failure_finalize" "prd=${ELIGIBLE_PRD}|branch=${BRANCH_NAME}"
   exit 1
 fi
 
@@ -258,26 +276,39 @@ done
 if [ ${EXIT_CODE} -eq 0 ]; then
   OPEN_PR_COUNT=$(count_prs_for_branch open "${BRANCH_NAME}")
   if [ "${OPEN_PR_COUNT}" -gt 0 ]; then
-    if ! finalize_prd_done "implemented, PR opened on ${BRANCH_NAME}"; then
+    if finalize_prd_done "implemented, PR opened on ${BRANCH_NAME}"; then
+      emit_result "success_open_pr" "prd=${ELIGIBLE_PRD}|branch=${BRANCH_NAME}"
+    else
       night_watch_history record "${PROJECT_DIR}" "${ELIGIBLE_PRD}" failure --exit-code 1 2>/dev/null || true
+      emit_result "failure_finalize" "prd=${ELIGIBLE_PRD}|branch=${BRANCH_NAME}"
+      EXIT_CODE=1
     fi
   else
     MERGED_PR_COUNT=$(count_prs_for_branch merged "${BRANCH_NAME}")
     if [ "${MERGED_PR_COUNT}" -gt 0 ]; then
-      if ! finalize_prd_done "already merged on ${BRANCH_NAME}"; then
+      if finalize_prd_done "already merged on ${BRANCH_NAME}"; then
+        emit_result "success_already_merged" "prd=${ELIGIBLE_PRD}|branch=${BRANCH_NAME}"
+      else
         night_watch_history record "${PROJECT_DIR}" "${ELIGIBLE_PRD}" failure --exit-code 1 2>/dev/null || true
+        emit_result "failure_finalize" "prd=${ELIGIBLE_PRD}|branch=${BRANCH_NAME}"
+        EXIT_CODE=1
       fi
     else
       log "WARN: ${PROVIDER_CMD} exited 0 but no open/merged PR found on ${BRANCH_NAME} — recording cooldown to avoid repeated stuck runs"
       night_watch_history record "${PROJECT_DIR}" "${ELIGIBLE_PRD}" failure --exit-code 1 2>/dev/null || true
+      emit_result "failure_no_pr_after_success" "prd=${ELIGIBLE_PRD}|branch=${BRANCH_NAME}"
+      EXIT_CODE=1
     fi
   fi
 elif [ ${EXIT_CODE} -eq 124 ]; then
   log "TIMEOUT: Night watch killed after ${MAX_RUNTIME}s while processing ${ELIGIBLE_PRD}"
   night_watch_history record "${PROJECT_DIR}" "${ELIGIBLE_PRD}" timeout --exit-code 124 2>/dev/null || true
+  emit_result "timeout" "prd=${ELIGIBLE_PRD}|branch=${BRANCH_NAME}"
 else
   log "FAIL: Night watch exited with code ${EXIT_CODE} while processing ${ELIGIBLE_PRD}"
   night_watch_history record "${PROJECT_DIR}" "${ELIGIBLE_PRD}" failure --exit-code "${EXIT_CODE}" 2>/dev/null || true
+  emit_result "failure" "prd=${ELIGIBLE_PRD}|branch=${BRANCH_NAME}"
 fi
 
 cleanup_worktrees "${PROJECT_DIR}"
+exit "${EXIT_CODE}"

package/scripts/night-watch-helpers.sh

@@ -77,6 +77,25 @@ rotate_log() {
 
 # ── Lock management ──────────────────────────────────────────────────────────
 
+project_runtime_key() {
+  local project_dir="${1:?project_dir required}"
+  local project_name
+  local project_hash=""
+  project_name=$(basename "${project_dir}")
+
+  if command -v sha1sum >/dev/null 2>&1; then
+    project_hash=$(printf '%s' "${project_dir}" | sha1sum | awk '{print $1}')
+  elif command -v shasum >/dev/null 2>&1; then
+    project_hash=$(printf '%s' "${project_dir}" | shasum -a 1 | awk '{print $1}')
+  elif command -v openssl >/dev/null 2>&1; then
+    project_hash=$(printf '%s' "${project_dir}" | openssl sha1 | awk '{print $NF}')
+  else
+    return 1
+  fi
+
+  printf '%s-%s' "${project_name}" "${project_hash:0:12}"
+}
+
 acquire_lock() {
   local lock_file="${1:?lock_file required}"
 

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

@@ -15,8 +15,6 @@ PROJECT_DIR="${1:?Usage: $0 /path/to/project}"
 PROJECT_NAME=$(basename "${PROJECT_DIR}")
 LOG_DIR="${PROJECT_DIR}/logs"
 LOG_FILE="${LOG_DIR}/night-watch-pr-reviewer.log"
-# NOTE: Lock file path must match LOCK_FILE_PREFIX in src/constants.ts (reviewer: prefix + "pr-reviewer-" + name)
-LOCK_FILE="/tmp/night-watch-pr-reviewer-${PROJECT_NAME}.lock"
 MAX_RUNTIME="${NW_REVIEWER_MAX_RUNTIME:-3600}"  # 1 hour
 MAX_LOG_SIZE="524288"  # 512 KB
 PROVIDER_CMD="${NW_PROVIDER_CMD:-claude}"
@@ -35,6 +33,19 @@ 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"
+PROJECT_RUNTIME_KEY=$(project_runtime_key "${PROJECT_DIR}")
+# NOTE: Lock file path must match reviewerLockPath() in src/utils/status-data.ts
+LOCK_FILE="/tmp/night-watch-pr-reviewer-${PROJECT_RUNTIME_KEY}.lock"
+
+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
+}
 
 # Validate provider
 if ! validate_provider "${PROVIDER_CMD}"; then
@@ -45,6 +56,7 @@ fi
 rotate_log
 
 if ! acquire_lock "${LOCK_FILE}"; then
+  emit_result "skip_locked"
   exit 0
 fi
 
@@ -73,6 +85,7 @@ OPEN_PRS=$(
 
 if [ "${OPEN_PRS}" -eq 0 ]; then
   log "SKIP: No open PRs matching branch patterns (${BRANCH_PATTERNS_RAW})"
+  emit_result "skip_no_open_prs"
   exit 0
 fi
 
@@ -118,9 +131,14 @@ done < <(gh pr list --state open --json number,headRefName --jq '.[] | [.number,
 
 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)"
+  emit_result "skip_all_passing"
   exit 0
 fi
 
+PRS_NEEDING_WORK=$(echo "${PRS_NEEDING_WORK}" \
+  | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]][[:space:]]*/ /g' -e 's/[[:space:]]*$//')
+PRS_NEEDING_WORK_CSV="${PRS_NEEDING_WORK// /,}"
+
 if [ -n "${NW_DEFAULT_BRANCH:-}" ]; then
   DEFAULT_BRANCH="${NW_DEFAULT_BRANCH}"
 else
@@ -188,8 +206,11 @@ cleanup_worktrees "${PROJECT_DIR}"
 
 if [ ${EXIT_CODE} -eq 0 ]; then
   log "DONE: PR reviewer completed successfully"
+  emit_result "success_reviewed" "prs=${PRS_NEEDING_WORK_CSV}"
 elif [ ${EXIT_CODE} -eq 124 ]; then
   log "TIMEOUT: PR reviewer killed after ${MAX_RUNTIME}s"
+  emit_result "timeout" "prs=${PRS_NEEDING_WORK_CSV}"
 else
   log "FAIL: PR reviewer exited with code ${EXIT_CODE}"
+  emit_result "failure" "prs=${PRS_NEEDING_WORK_CSV}"
 fi