@jonit-dev/night-watch-cli 1.8.10-beta.11 → 1.8.10-beta.12

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

@@ -116,6 +116,12 @@ fi
 AUDIT_WORKTREE_BASENAME="${PROJECT_NAME}-nw-audit-runner"
 AUDIT_WORKTREE_DIR="$(dirname "${PROJECT_DIR}")/${AUDIT_WORKTREE_BASENAME}"
 
+cleanup_audit_worktree_on_exit() {
+  cleanup_worktree_path "${PROJECT_DIR}" "${AUDIT_WORKTREE_DIR}"
+}
+
+append_exit_trap "cleanup_audit_worktree_on_exit"
+
 cleanup_worktrees "${PROJECT_DIR}" "${AUDIT_WORKTREE_BASENAME}"
 
 if ! prepare_detached_worktree "${PROJECT_DIR}" "${AUDIT_WORKTREE_DIR}" "${DEFAULT_BRANCH}" "${LOG_FILE}"; then

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

@@ -292,6 +292,14 @@ if [ -n "${NW_DEFAULT_BRANCH:-}" ]; then
 else
   DEFAULT_BRANCH=$(detect_default_branch "${PROJECT_DIR}")
 fi
+
+cleanup_executor_worktrees_on_exit() {
+  cleanup_worktree_path "${PROJECT_DIR}" "${WORKTREE_DIR}"
+  cleanup_worktree_path "${PROJECT_DIR}" "${BOOKKEEP_WORKTREE_DIR}"
+}
+
+append_exit_trap "cleanup_executor_worktrees_on_exit"
+
 if [[ "${PRD_DIR_REL}" = /* ]]; then
   BOOKKEEP_PRD_DIR="${PRD_DIR_REL}"
 else

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

@@ -541,14 +541,14 @@ _is_lock_holder_alive() {
 
 append_exit_trap() {
   local command="${1:?command required}"
-  local existing=""
 
-  existing=$(trap -p EXIT | sed -n "s/^trap -- '\\(.*\\)' EXIT$/\\1/p")
-  if [ -n "${existing}" ]; then
-    trap "${existing}; ${command}" EXIT
+  if [ -n "${NW_EXIT_TRAP_CHAIN:-}" ]; then
+    NW_EXIT_TRAP_CHAIN="${NW_EXIT_TRAP_CHAIN}; ${command}"
   else
-    trap "${command}" EXIT
+    NW_EXIT_TRAP_CHAIN="${command}"
   fi
+
+  trap "${NW_EXIT_TRAP_CHAIN}" EXIT
 }
 
 # ── Detect default branch ───────────────────────────────────────────────────
@@ -801,6 +801,31 @@ cleanup_worktrees() {
   git -C "${project_dir}" worktree prune >/dev/null 2>&1 || true
 }
 
+cleanup_worktree_path() {
+  local project_dir="${1:?project_dir required}"
+  local worktree_dir="${2:?worktree_dir required}"
+
+  if [ -z "${worktree_dir}" ] || [ "${worktree_dir}" = "${project_dir}" ]; then
+    return 0
+  fi
+
+  git -C "${project_dir}" worktree prune >/dev/null 2>&1 || true
+
+  if git -C "${project_dir}" worktree list --porcelain 2>/dev/null \
+      | grep -qF "worktree ${worktree_dir}"; then
+    log "CLEANUP: Removing worktree ${worktree_dir}"
+    git -C "${project_dir}" worktree remove --force "${worktree_dir}" 2>/dev/null || true
+  fi
+
+  if [ -d "${worktree_dir}" ] && ! git -C "${project_dir}" worktree list --porcelain 2>/dev/null \
+      | grep -qF "worktree ${worktree_dir}"; then
+    log "CLEANUP: Removing stale worktree directory ${worktree_dir}"
+    rm -rf "${worktree_dir}" 2>/dev/null || true
+  fi
+
+  git -C "${project_dir}" worktree prune >/dev/null 2>&1 || true
+}
+
 # Pick the best available ref for creating a new detached worktree.
 resolve_worktree_base_ref() {
   local project_dir="${1:?project_dir required}"

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

@@ -881,6 +881,12 @@ if [ -n "${TARGET_PR}" ]; then
 fi
 REVIEW_WORKTREE_DIR="$(dirname "${PROJECT_DIR}")/${REVIEW_WORKTREE_BASENAME}"
 
+cleanup_reviewer_runner_worktree_on_exit() {
+  cleanup_worktree_path "${PROJECT_DIR}" "${REVIEW_WORKTREE_DIR}"
+}
+
+append_exit_trap "cleanup_reviewer_runner_worktree_on_exit"
+
 cleanup_reviewer_worktrees "${REVIEW_WORKTREE_BASENAME}"
 
 # Dry-run mode: print diagnostics and exit

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

@@ -481,6 +481,12 @@ else
 fi
 QA_WORKTREE_DIR="$(dirname "${PROJECT_DIR}")/${PROJECT_NAME}-nw-qa-runner"
 
+cleanup_qa_worktree_on_exit() {
+  cleanup_worktree_path "${PROJECT_DIR}" "${QA_WORKTREE_DIR}"
+}
+
+append_exit_trap "cleanup_qa_worktree_on_exit"
+
 log "START: Found PR(s) needing QA:${PRS_NEEDING_QA}"
 
 cleanup_worktrees "${PROJECT_DIR}"

package/package.json

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