@jonit-dev/night-watch-cli 1.8.12-beta.10 → 1.8.12-beta.11

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

@@ -120,6 +120,73 @@ get_review_score() {
   echo "${score}"
 }
 
+# Count pending review feedback that should send the PR back through reviewer
+# instead of allowing the merger to land it. We combine GitHub's review decision
+# with unresolved review threads because some providers leave actionable feedback
+# as thread comments without lowering the score.
+get_pending_review_feedback_count() {
+  local pr_number="${1}"
+  local review_decision=""
+  local change_request_count="0"
+  local unresolved_thread_count="0"
+  local repo=""
+  local owner=""
+  local name=""
+
+  review_decision=$(gh pr view "${pr_number}" --json reviewDecision --jq '.reviewDecision // ""' 2>/dev/null || echo "")
+
+  change_request_count=$(gh api "repos/{owner}/{repo}/pulls/${pr_number}/reviews" \
+    --jq '[.[] | select(.state == "CHANGES_REQUESTED")] | length' 2>/dev/null || echo "0")
+  if ! [[ "${change_request_count}" =~ ^[0-9]+$ ]]; then
+    change_request_count="0"
+  fi
+
+  repo=$(gh repo view --json nameWithOwner --jq '.nameWithOwner' 2>/dev/null || echo "")
+  if [[ "${repo}" == */* ]]; then
+    owner="${repo%%/*}"
+    name="${repo#*/}"
+    unresolved_thread_count=$(gh api graphql \
+      -F owner="${owner}" \
+      -F name="${name}" \
+      -F number="${pr_number}" \
+      -f query='
+        query($owner: String!, $name: String!, $number: Int!) {
+          repository(owner: $owner, name: $name) {
+            pullRequest(number: $number) {
+              reviewThreads(first: 100) {
+                nodes {
+                  isResolved
+                }
+              }
+            }
+          }
+        }
+      ' \
+      --jq '[.data.repository.pullRequest.reviewThreads.nodes[]? | select(.isResolved == false)] | length' \
+      2>/dev/null || echo "0")
+    if ! [[ "${unresolved_thread_count}" =~ ^[0-9]+$ ]]; then
+      unresolved_thread_count="0"
+    fi
+  fi
+
+  if [ "${unresolved_thread_count}" -gt 0 ]; then
+    echo "${unresolved_thread_count}"
+    return 0
+  fi
+
+  if [ "${change_request_count}" -gt 0 ]; then
+    echo "${change_request_count}"
+    return 0
+  fi
+
+  if [ "${review_decision}" = "CHANGES_REQUESTED" ]; then
+    echo "1"
+    return 0
+  fi
+
+  echo "0"
+}
+
 # Get the current head OID for a PR.
 get_pr_head_oid() {
   local pr_number="${1}"
@@ -335,11 +402,17 @@ while IFS= read -r pr_json; do
   if [ "${MIN_REVIEW_SCORE}" -gt "0" ]; then
     score=$(get_review_score "${pr_number}")
     if [ "${score}" -lt "0" ] || [ "${score}" -lt "${MIN_REVIEW_SCORE}" ]; then
-      log "INFO: PR #${pr_number} (${pr_branch}): Review score ${score} < ${MIN_REVIEW_SCORE} (or no score found), skipping"
+      log "INFO: PR #${pr_number} (${pr_branch}): Review score ${score} < ${MIN_REVIEW_SCORE} (or no score found), reviewer job required before merge"
       continue
     fi
   fi
 
+  pending_review_feedback_count=$(get_pending_review_feedback_count "${pr_number}")
+  if [ "${pending_review_feedback_count}" -gt "0" ]; then
+    log "INFO: PR #${pr_number} (${pr_branch}): ${pending_review_feedback_count} pending review feedback item(s), reviewer job required before merge"
+    continue
+  fi
+
   log "INFO: PR #${pr_number} (${pr_branch}): Eligible for merge"
 
   # Rebase before merge if configured

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

@@ -132,6 +132,72 @@ get_pr_comments() {
   } | awk '!seen[$0]++'
 }
 
+get_pr_pending_review_feedback_count() {
+  local pr_number="${1:?PR number required}"
+  local review_decision=""
+  local change_request_count="0"
+  local unresolved_thread_count="0"
+  local repo="${REPO:-}"
+  local owner=""
+  local name=""
+
+  review_decision=$(gh pr view "${pr_number}" --json reviewDecision --jq '.reviewDecision // ""' 2>/dev/null || echo "")
+
+  change_request_count=$(gh api "repos/{owner}/{repo}/pulls/${pr_number}/reviews" \
+    --jq '[.[] | select(.state == "CHANGES_REQUESTED")] | length' 2>/dev/null || echo "0")
+  if ! [[ "${change_request_count}" =~ ^[0-9]+$ ]]; then
+    change_request_count="0"
+  fi
+
+  if [ -z "${repo}" ]; then
+    repo=$(gh repo view --json nameWithOwner --jq '.nameWithOwner' 2>/dev/null || echo "")
+  fi
+
+  if [[ "${repo}" == */* ]]; then
+    owner="${repo%%/*}"
+    name="${repo#*/}"
+    unresolved_thread_count=$(gh api graphql \
+      -F owner="${owner}" \
+      -F name="${name}" \
+      -F number="${pr_number}" \
+      -f query='
+        query($owner: String!, $name: String!, $number: Int!) {
+          repository(owner: $owner, name: $name) {
+            pullRequest(number: $number) {
+              reviewThreads(first: 100) {
+                nodes {
+                  isResolved
+                }
+              }
+            }
+          }
+        }
+      ' \
+      --jq '[.data.repository.pullRequest.reviewThreads.nodes[]? | select(.isResolved == false)] | length' \
+      2>/dev/null || echo "0")
+    if ! [[ "${unresolved_thread_count}" =~ ^[0-9]+$ ]]; then
+      unresolved_thread_count="0"
+    fi
+  fi
+
+  if [ "${unresolved_thread_count}" -gt 0 ]; then
+    echo "${unresolved_thread_count}"
+    return 0
+  fi
+
+  if [ "${change_request_count}" -gt 0 ]; then
+    echo "${change_request_count}"
+    return 0
+  fi
+
+  if [ "${review_decision}" = "CHANGES_REQUESTED" ]; then
+    echo "1"
+    return 0
+  fi
+
+  echo "0"
+}
+
 get_pr_head_ref_oid() {
   local pr_number="${1:?PR number required}"
   gh pr view "${pr_number}" --json headRefOid --jq '.headRefOid' 2>/dev/null || echo ""
@@ -760,6 +826,18 @@ while IFS=$'\t' read -r pr_number pr_branch pr_labels; do
     continue
   fi
 
+  PENDING_REVIEW_FEEDBACK_COUNT=$(get_pr_pending_review_feedback_count "${pr_number}")
+  if [ "${PENDING_REVIEW_FEEDBACK_COUNT}" -gt 0 ]; then
+    if [ "${local_ready_for_review_label_present}" -eq 1 ]; then
+      log "INFO: PR #${pr_number} (${pr_branch}) has pending review feedback; removing stale ${READY_FOR_REVIEW_LABEL} label"
+      clear_ready_for_human_review_label "${pr_number}"
+    fi
+    log "INFO: PR #${pr_number} (${pr_branch}) has ${PENDING_REVIEW_FEEDBACK_COUNT} pending review feedback item(s)"
+    NEEDS_WORK=1
+    PRS_NEEDING_WORK="${PRS_NEEDING_WORK} #${pr_number}"
+    continue
+  fi
+
   if has_ready_for_human_review_marker "${all_comments}" "${current_head_sha}"; then
     SKIPPED_ALREADY_REVIEWED_CURRENT_HEAD=1
     log "INFO: PR #${pr_number} (${pr_branch}) is already marked ready for human review at head ${current_head_sha:0:12}; skipping repeat automated review"
@@ -1077,6 +1155,7 @@ if [ -n "${TARGET_PR}" ]; then
   TARGET_MERGE_STATE=$(gh pr view "${TARGET_PR}" --json mergeStateStatus --jq '.mergeStateStatus' 2>/dev/null || echo "UNKNOWN")
   TARGET_FAILED_CHECKS=$(get_pr_failed_ci_summary "${TARGET_PR}")
   TARGET_SCORE=$(get_pr_score "${TARGET_PR}")
+  TARGET_PENDING_REVIEW_FEEDBACK=$(get_pr_pending_review_feedback_count "${TARGET_PR}")
 
   TARGET_SCOPE_PROMPT+=$'\n## Preflight Data (from CLI)\n- mergeStateStatus: '"${TARGET_MERGE_STATE}"$'\n'
   if [ -n "${TARGET_FAILED_CHECKS}" ]; then
@@ -1084,6 +1163,7 @@ if [ -n "${TARGET_PR}" ]; then
   else
     TARGET_SCOPE_PROMPT+=$'- failing checks: none detected\n'
   fi
+  TARGET_SCOPE_PROMPT+=$'- pending review feedback: '"${TARGET_PENDING_REVIEW_FEEDBACK}"$' item(s)\n'
   if [ -n "${TARGET_SCORE}" ]; then
     TARGET_SCOPE_PROMPT+=$'- latest review score: '"${TARGET_SCORE}"$'/100\n'
     TARGET_SCOPE_PROMPT+=$'- action: fix\n'

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

@@ -1,7 +1,7 @@
 You are the Night Watch PR Reviewer agent. Your job is to check open PRs for three things:
 
 1. Merge conflicts -- rebase onto the base branch and resolve them.
-2. Review comments with a score below 80 -- address the feedback.
+2. Review comments with a score below 80 or unresolved review feedback -- address the feedback.
 3. Failed CI jobs -- diagnose and fix the failures.
 
 ## Context
@@ -10,7 +10,7 @@ The repo can have multiple PR checks/workflows (project CI plus Night Watch auto
 Common examples include `typecheck`, `lint`, `test`, `build`, `verify`, `executor`, `qa`, and `audit`.
 Treat `gh pr checks <number> --json name,state,conclusion` as the source of truth for which checks failed.
 
-A PR needs attention if **any** of the following: merge conflicts present, review score below 80, or any CI job failed.
+A PR needs attention if **any** of the following: merge conflicts present, no review score yet, review score below 80, unresolved review feedback, or any CI job failed.
 
 ## PRD Context
 
@@ -21,7 +21,7 @@ If current PR code or review feedback conflicts with the PRD context, call out t
 ## Important: Early Exit
 
 - If there are **no open PRs** on `night-watch/` or `feat/` branches, **stop immediately** and report "No PRs to review."
-- If all open PRs have **no merge conflicts**, **passing CI**, and **review score >= 80**, **stop immediately** and report "All PRs are in good shape."
+- If all open PRs have **no merge conflicts**, **passing CI**, **review score >= 80**, and **no unresolved review feedback**, **stop immediately** and report "All PRs are in good shape."
 - If a PR has no review score yet, it needs a first review — do NOT skip it.
 - Do **NOT** loop or retry. Process each PR **once** per run. After processing all PRs, stop.
 - Do **NOT** re-check PRs after pushing fixes -- the CI will re-run automatically on the next push.
@@ -90,8 +90,8 @@ Parse the review score from the comment body. Look for patterns like:
   Extract the numeric score. If multiple comments have scores, use the **most recent** one.
 
 3. **Determine if PR needs work**:
-   - If no merge conflicts **AND** score >= 80 **AND** all CI checks pass --> skip this PR.
-   - If merge conflicts present **OR** score < 80 **OR** any CI check failed --> fix the issues.
+   - If no merge conflicts **AND** score >= 80 **AND** no unresolved review feedback **AND** all CI checks pass --> skip this PR.
+   - If merge conflicts present **OR** score < 80 **OR** unresolved review feedback exists **OR** any CI check failed --> fix the issues.
 
 4. **Fix the PR**:
 
@@ -122,8 +122,9 @@ Parse the review score from the comment body. Look for patterns like:
    - Push the clean branch: `git push --force-with-lease origin <branch-name>`
    - **Do NOT leave any conflict markers (`<<<<<<<`, `=======`, `>>>>>>>`) in any file.**
 
-   c. **Address review feedback** (if score < 80):
+   c. **Address review feedback** (if score < 80 or pending review feedback exists):
    - Read the review comments carefully. Extract areas for improvement, bugs found, issues found, and specific file/line suggestions.
+   - If `pending review feedback` is greater than 0 in the cron-provided preflight data, inspect review conversations with `gh pr view <number> --comments` and the GitHub PR review UI/API as needed.
    - For each review suggestion:
      - If you agree, implement the change.
      - If you do not agree, do not implement it blindly. Capture a short technical reason and include that reason in the PR comment.

package/dist/templates/pr-reviewer.md

@@ -1,7 +1,7 @@
 You are the Night Watch PR Reviewer agent. Your job is to check open PRs for three things:
 
 1. Merge conflicts -- rebase onto the base branch and resolve them.
-2. Review comments with a score below 80 -- address the feedback.
+2. Review comments with a score below 80 or unresolved review feedback -- address the feedback.
 3. Failed CI jobs -- diagnose and fix the failures.
 
 ## Context
@@ -10,7 +10,7 @@ The repo can have multiple PR checks/workflows (project CI plus Night Watch auto
 Common examples include `typecheck`, `lint`, `test`, `build`, `verify`, `executor`, `qa`, and `audit`.
 Treat `gh pr checks <number> --json name,state,conclusion` as the source of truth for which checks failed.
 
-A PR needs attention if **any** of the following: merge conflicts present, review score below 80, or any CI job failed.
+A PR needs attention if **any** of the following: merge conflicts present, no review score yet, review score below 80, unresolved review feedback, or any CI job failed.
 
 ## PRD Context
 
@@ -21,7 +21,7 @@ If current PR code or review feedback conflicts with the PRD context, call out t
 ## Important: Early Exit
 
 - If there are **no open PRs** on `night-watch/` or `feat/` branches, **stop immediately** and report "No PRs to review."
-- If all open PRs have **no merge conflicts**, **passing CI**, and **review score >= 80**, **stop immediately** and report "All PRs are in good shape."
+- If all open PRs have **no merge conflicts**, **passing CI**, **review score >= 80**, and **no unresolved review feedback**, **stop immediately** and report "All PRs are in good shape."
 - If a PR has no review score yet, it needs a first review — do NOT skip it.
 - Do **NOT** loop or retry. Process each PR **once** per run. After processing all PRs, stop.
 - Do **NOT** re-check PRs after pushing fixes -- the CI will re-run automatically on the next push.
@@ -90,8 +90,8 @@ Parse the review score from the comment body. Look for patterns like:
   Extract the numeric score. If multiple comments have scores, use the **most recent** one.
 
 3. **Determine if PR needs work**:
-   - If no merge conflicts **AND** score >= 80 **AND** all CI checks pass --> skip this PR.
-   - If merge conflicts present **OR** score < 80 **OR** any CI check failed --> fix the issues.
+   - If no merge conflicts **AND** score >= 80 **AND** no unresolved review feedback **AND** all CI checks pass --> skip this PR.
+   - If merge conflicts present **OR** score < 80 **OR** unresolved review feedback exists **OR** any CI check failed --> fix the issues.
 
 4. **Fix the PR**:
 
@@ -122,8 +122,9 @@ Parse the review score from the comment body. Look for patterns like:
    - Push the clean branch: `git push --force-with-lease origin <branch-name>`
    - **Do NOT leave any conflict markers (`<<<<<<<`, `=======`, `>>>>>>>`) in any file.**
 
-   c. **Address review feedback** (if score < 80):
+   c. **Address review feedback** (if score < 80 or pending review feedback exists):
    - Read the review comments carefully. Extract areas for improvement, bugs found, issues found, and specific file/line suggestions.
+   - If `pending review feedback` is greater than 0 in the cron-provided preflight data, inspect review conversations with `gh pr view <number> --comments` and the GitHub PR review UI/API as needed.
    - For each review suggestion:
      - If you agree, implement the change.
      - If you do not agree, do not implement it blindly. Capture a short technical reason and include that reason in the PR comment.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jonit-dev/night-watch-cli",
-  "version": "1.8.12-beta.10",
+  "version": "1.8.12-beta.11",
   "description": "AI agent that implements your specs, opens PRs, and reviews code overnight. Queue GitHub issues or PRDs, wake up to pull requests.",
   "type": "module",
   "bin": {