@jonit-dev/night-watch-cli 1.8.14-beta.1 → 1.8.14-beta.3

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}"
@@ -269,19 +270,100 @@ wait_for_ci_passing_on_head() {
   [ "${LAST_CI_STATUS}" = "passing" ]
 }
 
-run_local_checks_for_head() {
+find_existing_worktree_for_head() {
+  local pr_branch="${1}"
+  local expected_head="${2}"
+  local project_real=""
+  local worktree_path=""
+  local branch=""
+  local head=""
+
+  project_real=$(cd "${PROJECT_DIR}" && pwd -P 2>/dev/null || echo "${PROJECT_DIR}")
+
+  while IFS= read -r line; do
+    if [[ "${line}" == worktree\ * ]]; then
+      worktree_path="${line#worktree }"
+      branch=""
+      head=""
+      continue
+    fi
+    if [[ "${line}" == HEAD\ * ]]; then
+      head="${line#HEAD }"
+      continue
+    fi
+    if [[ "${line}" == branch\ * ]]; then
+      branch="${line#branch refs/heads/}"
+      if [ -n "${worktree_path}" ] \
+        && [ "${branch}" = "${pr_branch}" ] \
+        && [ "${head}" = "${expected_head}" ] \
+        && [ -d "${worktree_path}" ]; then
+        local worktree_real=""
+        worktree_real=$(cd "${worktree_path}" && pwd -P 2>/dev/null || echo "${worktree_path}")
+        if [ "${worktree_real}" = "${project_real}" ]; then
+          continue
+        fi
+        if git -C "${worktree_path}" diff --quiet >/dev/null 2>&1 \
+          && git -C "${worktree_path}" diff --cached --quiet >/dev/null 2>&1; then
+          printf "%s" "${worktree_path}"
+          return 0
+        fi
+      fi
+    fi
+  done < <(git worktree list --porcelain 2>/dev/null || true)
+
+  return 1
+}
+
+run_local_check_command_in_dir() {
   local pr_number="${1}"
   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 "${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
+  fi
+
+  log "INFO: PR #${pr_number}: Local checks failed for head ${expected_head} (exit ${check_exit})"
+  return 1
+}
+
+run_local_checks_for_head() {
+  local pr_number="${1}"
+  local pr_branch="${2}"
+  local expected_head="${3}"
   local temp_parent=""
   local worktree_dir=""
+  local existing_worktree_dir=""
   local temp_ref=""
-  local check_exit=1
 
   if [ -z "${LOCAL_CHECK_COMMAND}" ]; then
     log "INFO: PR #${pr_number}: Local check command is empty, treating fallback as failed"
     return 1
   fi
 
+  if existing_worktree_dir=$(find_existing_worktree_for_head "${pr_branch}" "${expected_head}"); then
+    log "INFO: PR #${pr_number}: Reusing existing worktree for local checks: ${existing_worktree_dir}"
+    run_local_check_command_in_dir "${pr_number}" "${expected_head}" "${existing_worktree_dir}"
+    return $?
+  fi
+
   temp_parent=$(mktemp -d "${TMPDIR:-/tmp}/night-watch-merger-${pr_number}.XXXXXX")
   worktree_dir="${temp_parent}/worktree"
   temp_ref="refs/night-watch/merger/${pr_number}-${expected_head}"
@@ -311,22 +393,50 @@ run_local_checks_for_head() {
     fi
   fi
 
+  run_local_check_command_in_dir "${pr_number}" "${expected_head}" "${worktree_dir}"
+  local check_result=$?
+
+  cleanup_local_check_worktree
+
+  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
   (
-    cd "${worktree_dir}"
-    bash -lc "${LOCAL_CHECK_COMMAND}"
+    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}"
-  check_exit=${PIPESTATUS[0]}
+  reviewer_exit=${PIPESTATUS[0]}
   set -e
 
-  cleanup_local_check_worktree
-
-  if [ "${check_exit}" -eq 0 ]; then
-    log "INFO: PR #${pr_number}: Local checks passed for head ${expected_head}"
+  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}: Local checks failed for head ${expected_head} (exit ${check_exit})"
+  log "INFO: PR #${pr_number} (${pr_branch}): Targeted reviewer repair failed (exit ${reviewer_exit})"
   return 1
 }
 
@@ -349,10 +459,20 @@ ci_gate_allows_head() {
 
   if [ "${CI_POLICY}" = "fallback-local" ]; then
     log "INFO: PR #${pr_number} (${pr_branch}): ${context} not passing on head ${expected_head} (${ci_status}); trying local checks"
-    if run_local_checks_for_head "${pr_number}" "${expected_head}"; then
+    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
 
@@ -540,7 +660,7 @@ while IFS= read -r pr_json; do
       if ! wait_for_ci_passing_on_head "${pr_number}" "${pr_head_after_rebase}"; then
         log "INFO: PR #${pr_number}: Fresh CI not passing on head ${pr_head_after_rebase} after rebase (${LAST_CI_STATUS}, waited ${CI_MAX_WAIT}s)"
         if [ "${CI_POLICY}" = "fallback-local" ]; then
-          if ! run_local_checks_for_head "${pr_number}" "${pr_head_after_rebase}"; then
+          if ! run_local_checks_for_head "${pr_number}" "${pr_branch}" "${pr_head_after_rebase}"; then
             log "INFO: PR #${pr_number}: Fresh local check fallback failed after rebase, skipping"
             continue
           fi

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

@@ -1202,6 +1202,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.1",
+  "version": "1.8.14-beta.3",
   "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": {