@jonit-dev/night-watch-cli 1.7.50 → 1.7.52

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

@@ -20,6 +20,7 @@ LOG_FILE="${LOG_DIR}/reviewer.log"
 MAX_RUNTIME="${NW_REVIEWER_MAX_RUNTIME:-3600}"  # 1 hour
 MAX_LOG_SIZE="524288"  # 512 KB
 PROVIDER_CMD="${NW_PROVIDER_CMD:-claude}"
+PROVIDER_LABEL="${NW_PROVIDER_LABEL:-}"
 MIN_REVIEW_SCORE="${NW_MIN_REVIEW_SCORE:-80}"
 BRANCH_PATTERNS_RAW="${NW_BRANCH_PATTERNS:-feat/,night-watch/}"
 AUTO_MERGE="${NW_AUTO_MERGE:-0}"
@@ -27,6 +28,12 @@ AUTO_MERGE_METHOD="${NW_AUTO_MERGE_METHOD:-squash}"
 TARGET_PR="${NW_TARGET_PR:-}"
 PARALLEL_ENABLED="${NW_REVIEWER_PARALLEL:-1}"
 WORKER_MODE="${NW_REVIEWER_WORKER_MODE:-0}"
+PRD_DIR_REL="${NW_PRD_DIR:-docs/PRDs/night-watch}"
+if [[ "${PRD_DIR_REL}" = /* ]]; then
+  PRD_DIR="${PRD_DIR_REL}"
+else
+  PRD_DIR="${PROJECT_DIR}/${PRD_DIR_REL}"
+fi
 
 # Retry configuration
 REVIEWER_MAX_RETRIES="${NW_REVIEWER_MAX_RETRIES:-2}"
@@ -59,6 +66,7 @@ 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}")
+PROVIDER_MODEL_DISPLAY=$(resolve_provider_model_display "${PROVIDER_CMD}" "${PROVIDER_LABEL}")
 GLOBAL_LOCK_FILE="/tmp/night-watch-pr-reviewer-${PROJECT_RUNTIME_KEY}.lock"
 if [ "${WORKER_MODE}" = "1" ] && [ -n "${TARGET_PR}" ]; then
   LOCK_FILE="/tmp/night-watch-pr-reviewer-${PROJECT_RUNTIME_KEY}-pr-${TARGET_PR}.lock"
@@ -85,6 +93,21 @@ emit_final_status() {
   local attempts="${5:-1}"
   local final_score="${6:-}"
   local details=""
+  local prs_summary=""
+  local auto_merged_summary=""
+  local auto_merge_failed_summary=""
+  local final_score_summary=""
+  local final_score_line=""
+
+  prs_summary="${prs_csv:-none}"
+  auto_merged_summary="${auto_merged:-none}"
+  auto_merge_failed_summary="${auto_merge_failed:-none}"
+  final_score_summary="${final_score:-n/a}"
+  if [ -n "${final_score}" ]; then
+    final_score_line="Final score: ${final_score_summary}/100"
+  else
+    final_score_line="Final score: n/a"
+  fi
 
   if [ "${exit_code}" -eq 0 ]; then
     details="prs=${prs_csv}|auto_merged=${auto_merged}|auto_merge_failed=${auto_merge_failed}|attempts=${attempts}"
@@ -92,6 +115,15 @@ emit_final_status() {
       details="${details}|final_score=${final_score}"
     fi
     log "DONE: PR reviewer completed successfully"
+    if [ "${WORKER_MODE}" != "1" ]; then
+      send_telegram_status_message "🔍 Night Watch Reviewer: completed" "Project: ${PROJECT_NAME}
+Provider (model): ${PROVIDER_MODEL_DISPLAY}
+Processed PRs: ${prs_summary}
+Attempts: ${attempts}
+${final_score_line}
+Auto-merged PRs: ${auto_merged_summary}
+Auto-merge failed: ${auto_merge_failed_summary}"
+    fi
     emit_result "success_reviewed" "${details}"
   elif [ "${exit_code}" -eq 124 ]; then
     details="prs=${prs_csv}|attempts=${attempts}"
@@ -99,6 +131,14 @@ emit_final_status() {
       details="${details}|final_score=${final_score}"
     fi
     log "TIMEOUT: PR reviewer killed after ${MAX_RUNTIME}s"
+    if [ "${WORKER_MODE}" != "1" ]; then
+      send_telegram_status_message "🔍 Night Watch Reviewer: timeout" "Project: ${PROJECT_NAME}
+Provider (model): ${PROVIDER_MODEL_DISPLAY}
+Timeout: ${MAX_RUNTIME}s
+Processed PRs: ${prs_summary}
+Attempts: ${attempts}
+${final_score_line}"
+    fi
     emit_result "timeout" "${details}"
   else
     details="prs=${prs_csv}|attempts=${attempts}"
@@ -106,6 +146,14 @@ emit_final_status() {
       details="${details}|final_score=${final_score}"
     fi
     log "FAIL: PR reviewer exited with code ${exit_code}"
+    if [ "${WORKER_MODE}" != "1" ]; then
+      send_telegram_status_message "🔍 Night Watch Reviewer: failed" "Project: ${PROJECT_NAME}
+Provider (model): ${PROVIDER_MODEL_DISPLAY}
+Exit code: ${exit_code}
+Processed PRs: ${prs_summary}
+Attempts: ${attempts}
+${final_score_line}"
+    fi
     emit_result "failure" "${details}"
   fi
 }
@@ -124,6 +172,175 @@ append_csv() {
   fi
 }
 
+truncate_for_prompt() {
+  local text="${1:-}"
+  local limit="${2:-7000}"
+  if [ "${#text}" -le "${limit}" ]; then
+    printf "%s" "${text}"
+  else
+    printf '%s\n\n[truncated to %s chars]' "${text:0:${limit}}" "${limit}"
+  fi
+}
+
+extract_linked_issue_numbers() {
+  local body="${1:-}"
+  printf '%s\n' "${body}" \
+    | grep -Eoi '(close[sd]?|fix(e[sd])?|resolve[sd]?)[[:space:]]*:?[[:space:]]*#[0-9]+' \
+    | grep -Eo '[0-9]+' \
+    | awk '!seen[$0]++' || true
+}
+
+find_prd_file_by_branch() {
+  local branch_name="${1:-}"
+  local branch_slug="${branch_name#*/}"
+  local branch_number=""
+  local candidate_dirs=()
+  local candidate=""
+  local base_name=""
+  local dir=""
+
+  if [ -z "${branch_slug}" ]; then
+    branch_slug="${branch_name}"
+  fi
+  [ -z "${branch_slug}" ] && return 1
+
+  if [ -d "${PRD_DIR}" ]; then
+    candidate_dirs+=("${PRD_DIR}")
+  fi
+  if [ -d "${PRD_DIR}/done" ]; then
+    candidate_dirs+=("${PRD_DIR}/done")
+  fi
+  [ "${#candidate_dirs[@]}" -eq 0 ] && return 1
+
+  for dir in "${candidate_dirs[@]}"; do
+    if [ -f "${dir}/${branch_slug}.md" ]; then
+      printf "%s" "${dir}/${branch_slug}.md"
+      return 0
+    fi
+  done
+
+  branch_number=$(printf '%s' "${branch_slug}" | grep -oE '^[0-9]+' || true)
+  for dir in "${candidate_dirs[@]}"; do
+    while IFS= read -r candidate; do
+      [ -z "${candidate}" ] && continue
+      base_name=$(basename "${candidate}" .md)
+      if [[ "${base_name}" == "${branch_slug}"* ]] || [[ "${branch_slug}" == "${base_name}"* ]]; then
+        printf "%s" "${candidate}"
+        return 0
+      fi
+      if [ -n "${branch_number}" ] && [[ "${base_name}" == "${branch_number}-"* ]]; then
+        printf "%s" "${candidate}"
+        return 0
+      fi
+    done < <(find "${dir}" -maxdepth 1 -type f -name '*.md' 2>/dev/null | sort)
+  done
+
+  return 1
+}
+
+build_prd_context_for_pr() {
+  local pr_number="${1:?PR number required}"
+  local pr_payload=""
+  local pr_title=""
+  local pr_branch=""
+  local pr_body=""
+  local pr_url=""
+  local issue_context=""
+  local issue_count=0
+  local issue_number=""
+  local issue_payload=""
+  local issue_title=""
+  local issue_body=""
+  local issue_excerpt=""
+  local prd_file=""
+  local prd_payload=""
+  local prd_excerpt=""
+  local prd_rel_path=""
+  local section=""
+
+  pr_payload=$(gh pr view "${pr_number}" --json title,headRefName,body,url 2>/dev/null || true)
+  pr_title=$(printf '%s' "${pr_payload}" | jq -r '.title // ""' 2>/dev/null || echo "")
+  pr_branch=$(printf '%s' "${pr_payload}" | jq -r '.headRefName // ""' 2>/dev/null || echo "")
+  pr_body=$(printf '%s' "${pr_payload}" | jq -r '.body // ""' 2>/dev/null || echo "")
+  pr_url=$(printf '%s' "${pr_payload}" | jq -r '.url // ""' 2>/dev/null || echo "")
+
+  if [ -n "${pr_body}" ]; then
+    while IFS= read -r issue_number; do
+      [ -z "${issue_number}" ] && continue
+      issue_count=$((issue_count + 1))
+      if [ "${issue_count}" -gt 2 ]; then
+        break
+      fi
+
+      issue_payload=$(gh issue view "${issue_number}" --json title,body,url 2>/dev/null || true)
+      issue_title=$(printf '%s' "${issue_payload}" | jq -r '.title // ""' 2>/dev/null || echo "")
+      issue_body=$(printf '%s' "${issue_payload}" | jq -r '.body // ""' 2>/dev/null || echo "")
+      [ -z "${issue_body}" ] && continue
+
+      issue_excerpt=$(truncate_for_prompt "${issue_body}" 4500)
+      issue_context="${issue_context}${issue_context:+$'\n\n'}Issue #${issue_number}: ${issue_title}
+${issue_excerpt}"
+    done < <(extract_linked_issue_numbers "${pr_body}")
+  fi
+
+  if [ -z "${issue_context}" ] && [ -n "${pr_branch}" ]; then
+    prd_file=$(find_prd_file_by_branch "${pr_branch}" || true)
+    if [ -n "${prd_file}" ] && [ -f "${prd_file}" ]; then
+      prd_payload=$(cat "${prd_file}" 2>/dev/null || true)
+      if [ -n "${prd_payload}" ]; then
+        prd_excerpt=$(truncate_for_prompt "${prd_payload}" 4500)
+        if [[ "${prd_file}" == "${PROJECT_DIR}/"* ]]; then
+          prd_rel_path="${prd_file#${PROJECT_DIR}/}"
+        else
+          prd_rel_path="${prd_file}"
+        fi
+      fi
+    fi
+  fi
+
+  section="### PR #${pr_number}"
+  if [ -n "${pr_title}" ]; then
+    section="${section} — ${pr_title}"
+  fi
+  section="${section}
+- branch: ${pr_branch:-unknown}"
+  if [ -n "${pr_url}" ]; then
+    section="${section}
+- url: ${pr_url}"
+  fi
+
+  if [ -n "${issue_context}" ]; then
+    section="${section}
+- context source: linked GitHub issue body
+${issue_context}"
+  elif [ -n "${prd_excerpt}" ]; then
+    section="${section}
+- context source: ${prd_rel_path}
+${prd_excerpt}"
+  else
+    section="${section}
+- context source: not found"
+  fi
+
+  printf "%s" "${section}"
+}
+
+build_prd_context_prompt() {
+  local pr_number=""
+  local entry=""
+  local combined=""
+
+  for pr_number in "$@"; do
+    [ -z "${pr_number}" ] && continue
+    entry=$(build_prd_context_for_pr "${pr_number}")
+    [ -z "${entry}" ] && continue
+    combined="${combined}${combined:+$'\n\n'}${entry}"
+  done
+
+  [ -z "${combined}" ] && return 0
+  printf '\n\n## PRD Context\nUse this product context while reviewing and fixing PRs.\n%s\n' "${combined}"
+}
+
 # Extract the latest review score from PR comments
 # Returns empty string if no score found
 get_pr_score() {
@@ -287,6 +504,14 @@ fi
 
 cd "${PROJECT_DIR}"
 
+if [ "${WORKER_MODE}" != "1" ]; then
+  send_telegram_status_message "🔍 Night Watch Reviewer: started" "Project: ${PROJECT_NAME}
+Provider (model): ${PROVIDER_MODEL_DISPLAY}
+Branch patterns: ${BRANCH_PATTERNS_RAW}
+Target PR: ${TARGET_PR:-all matching}
+Action: scanning open PRs for failing checks or low review scores."
+fi
+
 # Convert comma-separated branch prefixes into a regex that matches branch starts.
 BRANCH_REGEX=""
 IFS=',' read -r -a BRANCH_PATTERNS <<< "${BRANCH_PATTERNS_RAW}"
@@ -320,6 +545,13 @@ fi
 
 if [ "${OPEN_PRS}" -eq 0 ]; then
   log "SKIP: No open PRs matching branch patterns (${BRANCH_PATTERNS_RAW})"
+  if [ "${WORKER_MODE}" != "1" ]; then
+    send_telegram_status_message "🔍 Night Watch Reviewer: no matching PRs" "Project: ${PROJECT_NAME}
+Provider (model): ${PROVIDER_MODEL_DISPLAY}
+Branch patterns: ${BRANCH_PATTERNS_RAW}
+Target PR: ${TARGET_PR:-all matching}
+Result: 0 open PRs matched."
+  fi
   emit_result "skip_no_open_prs"
   exit 0
 fi
@@ -443,6 +675,11 @@ if [ "${NEEDS_WORK}" -eq 0 ]; then
     fi
   fi
 
+  if [ "${WORKER_MODE}" != "1" ]; then
+    send_telegram_status_message "🔍 Night Watch Reviewer: nothing to do" "Project: ${PROJECT_NAME}
+Provider (model): ${PROVIDER_MODEL_DISPLAY}
+Result: all ${OPEN_PRS} matching PRs already pass CI and review threshold (${MIN_REVIEW_SCORE})."
+  fi
   emit_result "skip_all_passing"
   exit 0
 fi
@@ -473,7 +710,7 @@ if [ -z "${TARGET_PR}" ] && [ "${WORKER_MODE}" != "1" ] && [ "${PARALLEL_ENABLED
   # Dry-run mode: print diagnostics and exit
   if [ "${NW_DRY_RUN:-0}" = "1" ]; then
     echo "=== Dry Run: PR Reviewer ==="
-    echo "Provider: ${PROVIDER_CMD}"
+    echo "Provider (model): ${PROVIDER_MODEL_DISPLAY}"
     echo "Branch Patterns: ${BRANCH_PATTERNS_RAW}"
     echo "Min Review Score: ${MIN_REVIEW_SCORE}"
     echo "Auto-merge: ${AUTO_MERGE}"
@@ -604,7 +841,7 @@ cleanup_reviewer_worktrees "${REVIEW_WORKTREE_BASENAME}"
 # Dry-run mode: print diagnostics and exit
 if [ "${NW_DRY_RUN:-0}" = "1" ]; then
   echo "=== Dry Run: PR Reviewer ==="
-  echo "Provider: ${PROVIDER_CMD}"
+  echo "Provider (model): ${PROVIDER_MODEL_DISPLAY}"
   echo "Branch Patterns: ${BRANCH_PATTERNS_RAW}"
   echo "Min Review Score: ${MIN_REVIEW_SCORE}"
   echo "Auto-merge: ${AUTO_MERGE}"
@@ -629,16 +866,26 @@ if ! prepare_detached_worktree "${PROJECT_DIR}" "${REVIEW_WORKTREE_DIR}" "${DEFA
   exit 1
 fi
 
-REVIEWER_PROMPT_PATH=$(resolve_instruction_path "${REVIEW_WORKTREE_DIR}" "night-watch-pr-reviewer.md" || true)
+REVIEWER_PROMPT_PATH=$(resolve_instruction_path_with_fallback "${REVIEW_WORKTREE_DIR}" "pr-reviewer.md" "night-watch-pr-reviewer.md" || true)
 if [ -z "${REVIEWER_PROMPT_PATH}" ]; then
-  log "FAIL: Missing reviewer prompt file. Checked instructions/, .claude/commands/, and bundled templates/"
+  log "FAIL: Missing reviewer prompt file. Checked pr-reviewer.md/night-watch-pr-reviewer.md in instructions/, .claude/commands/, and bundled templates/"
   emit_result "failure" "reason=missing_reviewer_prompt"
   exit 1
 fi
+REVIEWER_PROMPT_BUNDLED_NAME="pr-reviewer.md"
+if [[ "${REVIEWER_PROMPT_PATH}" == */night-watch-pr-reviewer.md ]]; then
+  REVIEWER_PROMPT_BUNDLED_NAME="night-watch-pr-reviewer.md"
+fi
+REVIEWER_PROMPT_PATH=$(prefer_bundled_prompt_if_legacy_command "${REVIEW_WORKTREE_DIR}" "${REVIEWER_PROMPT_PATH}" "${REVIEWER_PROMPT_BUNDLED_NAME}")
 REVIEWER_PROMPT_BASE=$(cat "${REVIEWER_PROMPT_PATH}")
 REVIEWER_PROMPT_REF=$(instruction_ref_for_prompt "${REVIEW_WORKTREE_DIR}" "${REVIEWER_PROMPT_PATH}")
 log "INFO: Using reviewer prompt from ${REVIEWER_PROMPT_REF}"
 
+# Inject provider attribution requirement into the reviewer prompt.
+# The AI must add a footer to every review comment it posts.
+REVIEWER_PROVIDER_LABEL="${NW_PROVIDER_LABEL:-${PROVIDER_CMD}}"
+REVIEWER_PROMPT_BASE="${REVIEWER_PROMPT_BASE}"$'\n\n'"## Reviewer Attribution (Required)"$'\n'"At the very end of each review comment you post, add this footer on its own line:"$'\n'"> 🔍 Reviewed by ${REVIEWER_PROVIDER_LABEL}"
+
 EXIT_CODE=0
 ATTEMPTS_MADE=1
 FINAL_SCORE=""
@@ -663,6 +910,22 @@ if [ -n "${TARGET_PR}" ]; then
   fi
 fi
 
+PRD_CONTEXT_PROMPT=""
+if [ -n "${TARGET_PR}" ]; then
+  PRD_CONTEXT_PROMPT=$(build_prd_context_prompt "${TARGET_PR}")
+elif [ "${#PR_NUMBER_ARRAY[@]}" -gt 0 ]; then
+  PRD_CONTEXT_PROMPT=$(build_prd_context_prompt "${PR_NUMBER_ARRAY[@]}")
+fi
+if [ -n "${PRD_CONTEXT_PROMPT}" ]; then
+  if [ -n "${TARGET_PR}" ]; then
+    log "INFO: Added PRD context for PR #${TARGET_PR}"
+  else
+    log "INFO: Added PRD context for ${#PR_NUMBER_ARRAY[@]} PR(s)"
+  fi
+else
+  log "WARN: No PRD context found for current reviewer scope"
+fi
+
 # ── Retry Loop for Targeted PR Review ──────────────────────────────────────────
 # Only retry when targeting a specific PR. Non-targeted mode handles all PRs in one shot.
 TOTAL_ATTEMPTS=1
@@ -695,7 +958,7 @@ for ATTEMPT in $(seq 1 "${TOTAL_ATTEMPTS}"); do
 
   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}"
+  REVIEWER_PROMPT="${REVIEWER_PROMPT_BASE}${TARGET_SCOPE_PROMPT}${PRD_CONTEXT_PROMPT}"
 
   case "${PROVIDER_CMD}" in
     claude)