@jonit-dev/night-watch-cli 1.8.10-beta.0 → 1.8.10-beta.2

package/dist/scripts/night-watch-helpers.sh

@@ -587,7 +587,10 @@ cleanup_worktrees() {
   local project_dir="${1:?project_dir required}"
   local scope="${2:-}"
   local project_name
+  local project_parent
+  local registered_worktrees
   project_name=$(basename "${project_dir}")
+  project_parent=$(dirname "${project_dir}")
 
   # Clear stale worktree registrations first. This fixes cases where a
   # worktree directory was deleted out-of-band (for example by an agent
@@ -599,6 +602,8 @@ cleanup_worktrees() {
     match_token="${scope}"
   fi
 
+  registered_worktrees=$(git -C "${project_dir}" worktree list --porcelain 2>/dev/null || true)
+
   git -C "${project_dir}" worktree list --porcelain 2>/dev/null \
     | grep '^worktree ' \
     | awk '{print $2}' \
@@ -608,6 +613,27 @@ cleanup_worktrees() {
         git -C "${project_dir}" worktree remove --force "${wt}" 2>/dev/null || true
       done || true
 
+  # Also remove stale worktree directories on disk that Git no longer tracks.
+  # These can accumulate after hard crashes or interrupted prompt-driven runs.
+  find "${project_parent}" -maxdepth 1 -mindepth 1 -type d -name "${match_token}*" -print0 2>/dev/null \
+    | while IFS= read -r -d '' wt; do
+        local wt_basename
+        wt_basename=$(basename "${wt}")
+
+        if [ "${wt}" = "${project_dir}" ]; then
+          continue
+        fi
+        if ! printf '%s\n' "${wt_basename}" | grep -Fq "${match_token}"; then
+          continue
+        fi
+        if printf '%s\n' "${registered_worktrees}" | grep -qF "worktree ${wt}"; then
+          continue
+        fi
+
+        log "CLEANUP: Removing unregistered stale worktree directory ${wt}"
+        rm -rf "${wt}" 2>/dev/null || true
+      done || true
+
   # Prune again after removals so Git drops any admin entries left behind by
   # force-removal or previously broken worktrees outside Night Watch naming.
   git -C "${project_dir}" worktree prune >/dev/null 2>&1 || true

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

@@ -172,7 +172,7 @@ Auto-merge failed: ${auto_merge_failed_summary}"
     if [ -n "${final_score}" ]; then
       details="${details}|final_score=${final_score}"
     fi
-    log "TIMEOUT: PR reviewer killed after ${MAX_RUNTIME}s"
+    log "TIMEOUT: PR reviewer timed out (runtime budget ${MAX_RUNTIME}s)"
     if [ "${WORKER_MODE}" != "1" ]; then
       send_telegram_status_message "🔍 Night Watch Reviewer: timeout" "Project: ${PROJECT_NAME}
 Provider (model): ${PROVIDER_MODEL_DISPLAY}
@@ -1048,7 +1048,10 @@ for ATTEMPT in $(seq 1 "${TOTAL_ATTEMPTS}"); do
 
   ATTEMPT_TIMEOUT="${MAX_RUNTIME}"
   if [ -n "${TARGET_PR}" ]; then
-    # Calculate timeout from remaining runtime budget.
+    # Give each targeted attempt the full remaining runtime budget.
+    # Retries only happen after a quick return (low score / invalid output / rate limit);
+    # a timed-out provider run is not retried, so pre-splitting the budget would
+    # incorrectly cap a 1h review to ~20m on attempt 1.
     NOW_TS=$(date +%s)
     ELAPSED=$((NOW_TS - RUN_STARTED_AT))
     REMAINING_BUDGET=$((MAX_RUNTIME - ELAPSED))
@@ -1057,12 +1060,7 @@ for ATTEMPT in $(seq 1 "${TOTAL_ATTEMPTS}"); do
       log "RETRY: Runtime budget exhausted before attempt ${ATTEMPT}"
       break
     fi
-
-    REMAINING_ATTEMPTS=$((TOTAL_ATTEMPTS - ATTEMPT + 1))
-    ATTEMPT_TIMEOUT=$((REMAINING_BUDGET / REMAINING_ATTEMPTS))
-    if [ "${ATTEMPT_TIMEOUT}" -lt 1 ]; then
-      ATTEMPT_TIMEOUT=1
-    fi
+    ATTEMPT_TIMEOUT="${REMAINING_BUDGET}"
   fi
 
   # Recreate worktree if it was removed unexpectedly between attempts.

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

@@ -313,7 +313,7 @@ classify_qa_comment_outcome() {
 pr_has_qa_generated_files() {
   local pr_number="${1:?PR number required}"
   gh pr view "${pr_number}" --json files --jq '.files[]?.path' 2>/dev/null \
-    | grep -Eq '^(qa-artifacts/|tests/.*/qa/)'
+    | grep -Eq '^(qa-artifacts/|tests/.*/qa/|(.*/)?(__tests__|tests?|spec|specs|e2e|playwright)/.*\.(test|spec)\.[[:alnum:]]+$|(.*/)?[^/]+\.(test|spec)\.[[:alnum:]]+$)'
 }
 
 provider_output_looks_invalid() {
@@ -341,7 +341,7 @@ validate_qa_evidence() {
   fi
 
   if ! pr_has_qa_generated_files "${pr_number}"; then
-    log "WARN-QA-EVIDENCE: PR #${pr_number} has QA marker comment but no qa-artifacts/ or tests/*/qa/ files"
+    log "WARN-QA-EVIDENCE: PR #${pr_number} has QA marker comment but no qa-artifacts/ or generated test files in standard locations"
     return 2
   fi
 
@@ -617,7 +617,7 @@ for pr_ref in ${PRS_NEEDING_QA}; do
       fi
       if [ ${QA_EVIDENCE_STATUS} -eq 2 ]; then
         WARNING_PRS_CSV=$(append_csv "${WARNING_PRS_CSV}" "#${pr_num}")
-        QA_WARNING_SUMMARY="${QA_WARNING_SUMMARY}${QA_WARNING_SUMMARY:+$'\n'}#${pr_num}: no qa-artifacts/ or tests/*/qa/ files"
+        QA_WARNING_SUMMARY="${QA_WARNING_SUMMARY}${QA_WARNING_SUMMARY:+$'\n'}#${pr_num}: no qa-artifacts/ or generated test files in standard locations"
         log "QA: PR #${pr_num} — provider completed with warning-only QA evidence"
       elif [ ${QA_EVIDENCE_STATUS} -ne 0 ]; then
         FAILED_AUTOMATION_PRS_CSV=$(append_csv "${FAILED_AUTOMATION_PRS_CSV}" "#${pr_num}")