@jonit-dev/night-watch-cli 1.7.43 → 1.7.46

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

@@ -74,6 +74,13 @@ if ! acquire_lock "${LOCK_FILE}"; then
   exit 0
 fi
 
+# Ensure all repo-scoped gh/night-watch commands run against this project.
+if ! cd "${PROJECT_DIR}"; then
+  log "ERROR: Cannot access project directory ${PROJECT_DIR}"
+  emit_result "failure" "reason=invalid_project_dir"
+  exit 1
+fi
+
 cleanup_worktrees "${PROJECT_DIR}"
 
 ISSUE_NUMBER=""    # board mode: GitHub issue number
@@ -286,8 +293,9 @@ MERGED_PR_COUNT=$(count_prs_for_branch merged "${BRANCH_NAME}")
 if [ "${MERGED_PR_COUNT}" -gt 0 ]; then
   log "INFO: Found merged PR for ${BRANCH_NAME}; skipping provider run"
   if [ -n "${ISSUE_NUMBER}" ]; then
-    # Board mode: move issue to Done
-    "${NW_CLI}" board move-issue "${ISSUE_NUMBER}" --column "Done" 2>>"${LOG_FILE}" || true
+    # Board mode: close issue and move to Done
+    "${NW_CLI}" board close-issue "${ISSUE_NUMBER}" 2>>"${LOG_FILE}" || \
+      "${NW_CLI}" board move-issue "${ISSUE_NUMBER}" --column "Done" 2>>"${LOG_FILE}" || true
     emit_result "success_already_merged" "prd=${ELIGIBLE_PRD}|branch=${BRANCH_NAME}"
     exit 0
   elif finalize_prd_done "already merged on ${BRANCH_NAME}"; then
@@ -420,13 +428,14 @@ if [ ${EXIT_CODE} -eq 0 ]; then
   OPEN_PR_COUNT=$(count_prs_for_branch open "${BRANCH_NAME}")
   if [ "${OPEN_PR_COUNT}" -gt 0 ]; then
     if [ -n "${ISSUE_NUMBER}" ]; then
-      # Board mode: move to Review and comment with PR URL
+      # Board mode: comment with PR URL, then close issue and move to Done
       PR_URL=$(gh pr list --state open --json headRefName,url \
         --jq ".[] | select(.headRefName == \"${BRANCH_NAME}\") | .url" 2>/dev/null || true)
-      "${NW_CLI}" board move-issue "${ISSUE_NUMBER}" --column "Review" 2>>"${LOG_FILE}" || true
       if [ -n "${PR_URL}" ]; then
         "${NW_CLI}" board comment "${ISSUE_NUMBER}" --body "PR opened: ${PR_URL}" 2>>"${LOG_FILE}" || true
       fi
+      "${NW_CLI}" board close-issue "${ISSUE_NUMBER}" 2>>"${LOG_FILE}" || \
+        "${NW_CLI}" board move-issue "${ISSUE_NUMBER}" --column "Done" 2>>"${LOG_FILE}" || true
       emit_result "success_open_pr" "prd=${ELIGIBLE_PRD}|branch=${BRANCH_NAME}"
     elif finalize_prd_done "implemented, PR opened on ${BRANCH_NAME}"; then
       emit_result "success_open_pr" "prd=${ELIGIBLE_PRD}|branch=${BRANCH_NAME}"
@@ -439,7 +448,8 @@ if [ ${EXIT_CODE} -eq 0 ]; then
     MERGED_PR_COUNT=$(count_prs_for_branch merged "${BRANCH_NAME}")
     if [ "${MERGED_PR_COUNT}" -gt 0 ]; then
       if [ -n "${ISSUE_NUMBER}" ]; then
-        "${NW_CLI}" board move-issue "${ISSUE_NUMBER}" --column "Done" 2>>"${LOG_FILE}" || true
+        "${NW_CLI}" board close-issue "${ISSUE_NUMBER}" 2>>"${LOG_FILE}" || \
+          "${NW_CLI}" board move-issue "${ISSUE_NUMBER}" --column "Done" 2>>"${LOG_FILE}" || true
         emit_result "success_already_merged" "prd=${ELIGIBLE_PRD}|branch=${BRANCH_NAME}"
       elif finalize_prd_done "already merged on ${BRANCH_NAME}"; then
         emit_result "success_already_merged" "prd=${ELIGIBLE_PRD}|branch=${BRANCH_NAME}"

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

@@ -210,9 +210,12 @@ if [ "${NEEDS_WORK}" -eq 0 ]; then
       [ -z "${pr_number}" ] || [ -z "${pr_branch}" ] && continue
       printf '%s\n' "${pr_branch}" | grep -Eq "${BRANCH_REGEX}" || continue
 
-      # Check CI status
-      FAILED_CHECKS=$(gh pr checks "${pr_number}" 2>/dev/null | grep -ci 'fail' || true)
-      [ "${FAILED_CHECKS}" -gt 0 ] && continue
+      # Check CI status - must have ALL checks passing (not just "no failures")
+      # gh pr checks exits 0 if all pass, 8 if pending, non-zero otherwise
+      if ! gh pr checks "${pr_number}" --required >/dev/null 2>&1; then
+        log "AUTO-MERGE: PR #${pr_number} has pending or failed CI checks"
+        continue
+      fi
 
       # Check review score
       PR_COMMENTS=$(
@@ -474,9 +477,10 @@ if [ "${AUTO_MERGE}" = "1" ] && [ ${EXIT_CODE} -eq 0 ]; then
       continue
     fi
 
-    # Check CI status - must have no failures
-    FAILED_CHECKS=$(gh pr checks "${pr_number}" 2>/dev/null | grep -ci 'fail' || true)
-    if [ "${FAILED_CHECKS}" -gt 0 ]; then
+    # Check CI status - must have ALL checks passing (not just "no failures")
+    # gh pr checks exits 0 if all pass, 8 if pending, non-zero otherwise
+    if ! gh pr checks "${pr_number}" --required >/dev/null 2>&1; then
+      log "AUTO-MERGE: PR #${pr_number} has pending or failed CI checks"
       continue
     fi
 

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

@@ -105,22 +105,30 @@ A PR needs attention if **any** of the following: merge conflicts present, revie
       - Push the clean branch: `git push --force-with-lease origin <branch-name>`
       - **Do NOT leave any conflict markers (`<<<<<<<`, `=======`, `>>>>>>>`) in any file.**
 
-   d. **Address CI failures** (if any):
-      - Read the failed job logs carefully to understand the root cause.
-      - **typecheck failures**: Fix TypeScript type errors.
-      - **lint failures**: Fix ESLint violations.
-      - **test failures**: Fix broken tests or update tests to match code changes.
-      - **build failures**: Fix compilation/bundling errors.
-      - **verify failures**: This runs after all others -- usually means one of the above needs fixing.
-
-   e. **Address review feedback** (if score < 80):
+   d. **Address review feedback** (if score < 80):
       - Read the review comments carefully. Extract areas for improvement, bugs found, issues found, and specific file/line suggestions.
+      - 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.
       - Fix bugs identified.
       - Improve error handling if flagged.
       - Add missing tests if coverage was noted.
       - Refactor code if structure was criticized.
       - Follow all project conventions from AI assistant documentation files (e.g., CLAUDE.md, AGENTS.md, or similar).
 
+   e. **Address CI failures** (if any):
+      - Check CI status and identify non-passing checks:
+        ```
+        gh pr checks <number> --json name,state,conclusion
+        ```
+      - Read the failed job logs carefully to understand the root cause.
+      - **typecheck failures**: Fix TypeScript type errors.
+      - **lint failures**: Fix ESLint violations.
+      - **test failures**: Fix broken tests or update tests to match code changes.
+      - **build failures**: Fix compilation/bundling errors.
+      - **verify failures**: This runs after all others -- usually means one of the above needs fixing.
+      - Re-run local equivalents of the failing jobs before pushing to confirm the CI issues are fixed.
+
    f. **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.
 
    g. **Commit and push** the fixes (only if there are staged changes beyond the rebase):
@@ -157,6 +165,9 @@ A PR needs attention if **any** of the following: merge conflicts present, revie
       - <fix 1>
       - <fix 2>
 
+      <If any review suggestions were not applied>### Review Feedback Not Applied:
+      - <suggestion>: <short technical reason><end>
+
       <If CI was fixed>### CI Failures Fixed:
       - <job>: <what was wrong and how it was fixed><end>
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jonit-dev/night-watch-cli",
-  "version": "1.7.43",
+  "version": "1.7.46",
   "description": "Autonomous PRD execution using AI Provider CLIs + cron",
   "type": "module",
   "bin": {