@jonit-dev/night-watch-cli 1.7.98 → 1.8.1

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

@@ -38,6 +38,7 @@ fi
 # Retry configuration
 REVIEWER_MAX_RETRIES="${NW_REVIEWER_MAX_RETRIES:-2}"
 REVIEWER_RETRY_DELAY="${NW_REVIEWER_RETRY_DELAY:-30}"
+REVIEWER_MAX_PRS_PER_RUN="${NW_REVIEWER_MAX_PRS_PER_RUN:-0}"
 SCRIPT_START_TIME=$(date +%s)
 
 # Normalize retry settings to safe numeric ranges
@@ -47,12 +48,18 @@ fi
 if ! [[ "${REVIEWER_RETRY_DELAY}" =~ ^[0-9]+$ ]]; then
   REVIEWER_RETRY_DELAY="30"
 fi
+if ! [[ "${REVIEWER_MAX_PRS_PER_RUN}" =~ ^[0-9]+$ ]]; then
+  REVIEWER_MAX_PRS_PER_RUN="0"
+fi
 if [ "${REVIEWER_MAX_RETRIES}" -gt 10 ]; then
   REVIEWER_MAX_RETRIES="10"
 fi
 if [ "${REVIEWER_RETRY_DELAY}" -gt 300 ]; then
   REVIEWER_RETRY_DELAY="300"
 fi
+if [ "${REVIEWER_MAX_PRS_PER_RUN}" -gt 100 ]; then
+  REVIEWER_MAX_PRS_PER_RUN="100"
+fi
 
 mkdir -p "${LOG_DIR}"
 
@@ -399,7 +406,7 @@ get_pr_score() {
       if [ -n "${REPO:-}" ]; then
         gh api "repos/${REPO}/issues/${pr_number}/comments" --jq '.[].body' 2>/dev/null || true
       fi
-    } | sort -u
+    } | awk '!seen[$0]++'
   )
   extract_review_score_from_text "${all_comments}"
 }
@@ -607,7 +614,7 @@ NEEDS_WORK=0
 REPO=$(gh repo view --json nameWithOwner --jq '.nameWithOwner' 2>/dev/null || echo "")
 PRS_NEEDING_WORK=""
 
-while IFS=$'\t' read -r pr_number pr_branch; do
+while IFS=$'\t' read -r pr_number pr_branch pr_labels; do
   if [ -z "${pr_number}" ] || [ -z "${pr_branch}" ]; then
     continue
   fi
@@ -620,6 +627,11 @@ while IFS=$'\t' read -r pr_number pr_branch; do
     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
+  fi
+
   # Merge-conflict signal: this PR needs action even if CI and score look fine.
   MERGE_STATE=$(gh pr view "${pr_number}" --json mergeStateStatus --jq '.mergeStateStatus' 2>/dev/null || echo "")
   if [ "${MERGE_STATE}" = "DIRTY" ] || [ "${MERGE_STATE}" = "CONFLICTING" ]; then
@@ -648,7 +660,7 @@ while IFS=$'\t' read -r pr_number pr_branch; do
       if [ -n "${REPO}" ]; then
         gh api "repos/${REPO}/issues/${pr_number}/comments" --jq '.[].body' 2>/dev/null || true
       fi
-    } | sort -u
+    } | awk '!seen[$0]++'
   )
   LATEST_SCORE=$(extract_review_score_from_text "${ALL_COMMENTS}")
   if [ -n "${LATEST_SCORE}" ] && [ "${LATEST_SCORE}" -lt "${MIN_REVIEW_SCORE}" ]; then
@@ -656,7 +668,10 @@ while IFS=$'\t' read -r pr_number pr_branch; do
     NEEDS_WORK=1
     PRS_NEEDING_WORK="${PRS_NEEDING_WORK} #${pr_number}"
   fi
-done < <(gh pr list --state open --json number,headRefName --jq '.[] | [.number, .headRefName] | @tsv' 2>/dev/null || true)
+done < <(
+  gh pr list --state open --json number,headRefName,labels \
+    --jq '.[] | [.number, .headRefName, ((.labels // []) | map(.name) | join(","))] | @tsv' 2>/dev/null || true
+)
 
 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)"
@@ -686,7 +701,7 @@ if [ "${NEEDS_WORK}" -eq 0 ]; then
           if [ -n "${REPO}" ]; then
             gh api "repos/${REPO}/issues/${pr_number}/comments" --jq '.[].body' 2>/dev/null || true
           fi
-        } | sort -u
+        } | awk '!seen[$0]++'
       )
       PR_SCORE=$(extract_review_score_from_text "${PR_COMMENTS}")
 
@@ -747,6 +762,16 @@ for pr_token in ${PRS_NEEDING_WORK}; do
   PR_NUMBER_ARRAY+=("${pr_token#\#}")
 done
 
+if [ "${REVIEWER_MAX_PRS_PER_RUN}" -gt 0 ] && [ "${#PR_NUMBER_ARRAY[@]}" -gt "${REVIEWER_MAX_PRS_PER_RUN}" ]; then
+  log "LIMIT: Restricting reviewer run to first ${REVIEWER_MAX_PRS_PER_RUN} PR(s) out of ${#PR_NUMBER_ARRAY[@]} needing work"
+  PR_NUMBER_ARRAY=("${PR_NUMBER_ARRAY[@]:0:${REVIEWER_MAX_PRS_PER_RUN}}")
+  PRS_NEEDING_WORK=""
+  for pr_number in "${PR_NUMBER_ARRAY[@]}"; do
+    PRS_NEEDING_WORK="${PRS_NEEDING_WORK}${PRS_NEEDING_WORK:+ }#${pr_number}"
+  done
+  PRS_NEEDING_WORK_CSV="${PRS_NEEDING_WORK// /,}"
+fi
+
 if [ -z "${TARGET_PR}" ] && [ "${WORKER_MODE}" != "1" ] && [ "${PARALLEL_ENABLED}" = "1" ] && [ "${#PR_NUMBER_ARRAY[@]}" -gt 1 ]; then
   # Dry-run mode: print diagnostics and exit
   if [ "${NW_DRY_RUN:-0}" = "1" ]; then
@@ -758,6 +783,7 @@ if [ -z "${TARGET_PR}" ] && [ "${WORKER_MODE}" != "1" ] && [ "${PARALLEL_ENABLED
     if [ "${AUTO_MERGE}" = "1" ]; then
       echo "Auto-merge Method: ${AUTO_MERGE_METHOD}"
     fi
+    echo "Max PRs Per Run: ${REVIEWER_MAX_PRS_PER_RUN}"
     echo "Open PRs needing work:${PRS_NEEDING_WORK}"
     echo "Default Branch: ${DEFAULT_BRANCH}"
     echo "Parallel Workers: ${#PR_NUMBER_ARRAY[@]}"
@@ -892,6 +918,7 @@ if [ "${NW_DRY_RUN:-0}" = "1" ]; then
   fi
   echo "Max Retries: ${REVIEWER_MAX_RETRIES}"
   echo "Retry Delay: ${REVIEWER_RETRY_DELAY}s"
+  echo "Max PRs Per Run: ${REVIEWER_MAX_PRS_PER_RUN}"
   echo "Open PRs needing work:${PRS_NEEDING_WORK}"
   echo "Default Branch: ${DEFAULT_BRANCH}"
   echo "Review Worktree: ${REVIEW_WORKTREE_DIR}"
@@ -1204,7 +1231,7 @@ if [ "${AUTO_MERGE}" = "1" ] && [ ${EXIT_CODE} -eq 0 ]; then
         if [ -n "${REPO}" ]; then
           gh api "repos/${REPO}/issues/${pr_number}/comments" --jq '.[].body' 2>/dev/null || true
         fi
-      } | sort -u
+      } | awk '!seen[$0]++'
     )
     LATEST_SCORE=$(extract_review_score_from_text "${ALL_COMMENTS}")
 

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

@@ -446,7 +446,7 @@ while IFS=$'\t' read -r pr_number pr_branch pr_title pr_labels; do
       if [ -n "${REPO}" ]; then
         gh api "repos/${REPO}/issues/${pr_number}/comments" --jq '.[].body' 2>/dev/null || true
       fi
-    } | sort -u
+    } | awk '!seen[$0]++'
   )
   if echo "${ALL_COMMENTS}" | grep -q '<!-- night-watch-qa-marker -->'; then
     log "SKIP-QA: PR #${pr_number} (${pr_branch}) already has QA comment"

package/dist/templates/night-watch-pr-reviewer.md

@@ -153,8 +153,9 @@ Parse the review score from the comment body. Look for patterns like:
    - Re-run local equivalents of the failing jobs before pushing to confirm the CI issues are fixed.
 
    e. **Run verification**: Run the project's test/lint commands (e.g., `npm test`, `npm run lint`, `npm run verify` or equivalent). Fix until it passes.
+   - **Do NOT paste verification command output anywhere** — not in the PR comment, not in the commit message. Only note pass/fail.
 
-   f. **Commit and push** the fixes (only if there are staged changes beyond the rebase):
+   f. **Commit and push** the fixes (required whenever any code changes were made):
 
    ```
    git add <files>
@@ -197,11 +198,13 @@ Parse the review score from the comment body. Look for patterns like:
    <If CI was fixed>### CI Failures Fixed:
    - <job>: <what was wrong and how it was fixed><end>
 
-   \`npm run verify\` passes locally. Ready for re-review.
+   Verification: ✅ passes locally. Ready for re-review.
 
    Night Watch PR Reviewer"
    ```
 
+   **Important**: Do NOT paste any command output (verify, lint, test logs) into the PR comment. Keep comments concise — bullet points only, no terminal output.
+
    h. **Do not manage worktrees directly**:
    - Do **not** run `git worktree add`, `git worktree remove`, or `git worktree prune`.
    - The cron wrapper handles worktree lifecycle.