@jonit-dev/night-watch-cli 1.8.14-beta.2 → 1.8.14-beta.4

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

@@ -79,6 +79,7 @@ skip_if_job_paused "${SCRIPT_TYPE}" "${PROJECT_DIR}"
 MERGED_PRS=0
 FAILED_PRS=0
 MERGED_PR_LIST=""
+LAST_LOCAL_CHECK_OUTPUT=""
 
 emit_result() {
   local status="${1:?status required}"
@@ -318,15 +319,22 @@ run_local_check_command_in_dir() {
   local expected_head="${2}"
   local check_dir="${3}"
   local check_exit=1
+  local output_file=""
+
+  output_file=$(mktemp "${TMPDIR:-/tmp}/night-watch-merger-local-check-${pr_number}.XXXXXX")
+  LAST_LOCAL_CHECK_OUTPUT=""
 
   set +e
   (
     cd "${check_dir}"
     bash -lc "${LOCAL_CHECK_COMMAND}"
-  ) 2>&1 | tee -a "${LOG_FILE}"
+  ) 2>&1 | tee "${output_file}" | tee -a "${LOG_FILE}"
   check_exit=${PIPESTATUS[0]}
   set -e
 
+  LAST_LOCAL_CHECK_OUTPUT=$(head -c 10000 "${output_file}" 2>/dev/null || true)
+  rm -f "${output_file}" 2>/dev/null || true
+
   if [ "${check_exit}" -eq 0 ]; then
     log "INFO: PR #${pr_number}: Local checks passed for head ${expected_head}"
     return 0
@@ -393,6 +401,45 @@ run_local_checks_for_head() {
   return "${check_result}"
 }
 
+run_reviewer_repair_for_pr() {
+  local pr_number="${1}"
+  local pr_branch="${2}"
+  local expected_head="${3}"
+  local elapsed=0
+  local remaining=0
+  local reviewer_exit=1
+
+  elapsed=$(( $(date +%s) - SCRIPT_START_TIME ))
+  remaining=$(( MAX_RUNTIME - elapsed - 30 ))
+  if [ "${remaining}" -lt 120 ]; then
+    log "INFO: PR #${pr_number} (${pr_branch}): Not enough merger runtime left for targeted reviewer repair (${remaining}s), skipping repair"
+    return 1
+  fi
+
+  log "INFO: PR #${pr_number} (${pr_branch}): Running targeted reviewer repair after local check failure on head ${expected_head}"
+
+  set +e
+  (
+    NW_TARGET_PR="${pr_number}" \
+    NW_REVIEWER_WORKER_MODE="1" \
+    NW_REVIEWER_PARALLEL="0" \
+    NW_REVIEWER_MAX_RUNTIME="${remaining}" \
+    NW_TARGET_LOCAL_CHECK_COMMAND="${LOCAL_CHECK_COMMAND}" \
+    NW_TARGET_LOCAL_CHECK_OUTPUT="${LAST_LOCAL_CHECK_OUTPUT}" \
+    bash "${SCRIPT_DIR}/night-watch-pr-reviewer-cron.sh" "${PROJECT_DIR}"
+  ) 2>&1 | tee -a "${LOG_FILE}"
+  reviewer_exit=${PIPESTATUS[0]}
+  set -e
+
+  if [ "${reviewer_exit}" -eq 0 ]; then
+    log "INFO: PR #${pr_number} (${pr_branch}): Targeted reviewer repair completed"
+    return 0
+  fi
+
+  log "INFO: PR #${pr_number} (${pr_branch}): Targeted reviewer repair failed (exit ${reviewer_exit})"
+  return 1
+}
+
 ci_gate_allows_head() {
   local pr_number="${1}"
   local pr_branch="${2}"
@@ -415,7 +462,17 @@ ci_gate_allows_head() {
     if run_local_checks_for_head "${pr_number}" "${pr_branch}" "${expected_head}"; then
       return 0
     fi
-    log "INFO: PR #${pr_number} (${pr_branch}): Local check fallback failed, skipping"
+    if run_reviewer_repair_for_pr "${pr_number}" "${pr_branch}" "${expected_head}"; then
+      local repaired_head=""
+      repaired_head=$(get_pr_head_oid "${pr_number}")
+      if [ -n "${repaired_head}" ]; then
+        log "INFO: PR #${pr_number} (${pr_branch}): Re-checking local checks after targeted repair on head ${repaired_head}"
+        if run_local_checks_for_head "${pr_number}" "${pr_branch}" "${repaired_head}"; then
+          return 0
+        fi
+      fi
+    fi
+    log "INFO: PR #${pr_number} (${pr_branch}): Local check fallback failed after repair attempt, skipping"
     return 1
   fi
 

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

@@ -858,6 +858,17 @@ while IFS=$'\t' read -r pr_number pr_branch pr_labels; do
     continue
   fi
 
+  if [ -n "${TARGET_PR}" ] && [ "${pr_number}" = "${TARGET_PR}" ] && [ -n "${NW_TARGET_LOCAL_CHECK_COMMAND:-}" ]; then
+    if [ "${local_ready_for_review_label_present}" -eq 1 ]; then
+      log "INFO: PR #${pr_number} (${pr_branch}) failed merge-gate local checks; removing stale ${READY_FOR_REVIEW_LABEL} label"
+      clear_ready_for_human_review_label "${pr_number}"
+    fi
+    log "INFO: PR #${pr_number} (${pr_branch}) failed merge-gate local checks; targeted repair required"
+    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"
@@ -1202,6 +1213,15 @@ if [ -n "${TARGET_PR}" ]; then
     TARGET_SCOPE_PROMPT+=$'- latest review score: not found\n'
     TARGET_SCOPE_PROMPT+=$'- action: review\n'
   fi
+  if [ -n "${NW_TARGET_LOCAL_CHECK_COMMAND:-}" ]; then
+    TARGET_SCOPE_PROMPT+=$'\n## Local Check Failure From Merge Gate\n'
+    TARGET_SCOPE_PROMPT+=$'- command: '"${NW_TARGET_LOCAL_CHECK_COMMAND}"$'\n'
+    TARGET_SCOPE_PROMPT+=$'- action: fix the PR so this local command passes before the PR can merge\n'
+    if [ -n "${NW_TARGET_LOCAL_CHECK_OUTPUT:-}" ]; then
+      TRUNCATED_LOCAL_CHECK_OUTPUT=$(printf '%s' "${NW_TARGET_LOCAL_CHECK_OUTPUT}" | head -c 10000)
+      TARGET_SCOPE_PROMPT+=$'\n### Local Check Output\n```text\n'"${TRUNCATED_LOCAL_CHECK_OUTPUT}"$'\n```\n'
+    fi
+  fi
 fi
 
 PRD_CONTEXT_PROMPT=""

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jonit-dev/night-watch-cli",
-  "version": "1.8.14-beta.2",
+  "version": "1.8.14-beta.4",
   "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": {