@jonit-dev/night-watch-cli 1.5.1 → 1.5.2

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

@@ -15,12 +15,14 @@ PROJECT_DIR="${1:?Usage: $0 /path/to/project}"
 PROJECT_NAME=$(basename "${PROJECT_DIR}")
 LOG_DIR="${PROJECT_DIR}/logs"
 LOG_FILE="${LOG_DIR}/night-watch-pr-reviewer.log"
-LOCK_FILE="/tmp/night-watch-pr-reviewer-${PROJECT_NAME}.lock"
+LOCK_FILE=""
 MAX_RUNTIME="${NW_REVIEWER_MAX_RUNTIME:-3600}"  # 1 hour
 MAX_LOG_SIZE="524288"  # 512 KB
 PROVIDER_CMD="${NW_PROVIDER_CMD:-claude}"
 MIN_REVIEW_SCORE="${NW_MIN_REVIEW_SCORE:-80}"
 BRANCH_PATTERNS_RAW="${NW_BRANCH_PATTERNS:-feat/,night-watch/}"
+RUNTIME_MIRROR_DIR=""
+RUNTIME_PROJECT_DIR=""
 
 # Ensure NVM / Node / Claude are on PATH
 export NVM_DIR="${HOME}/.nvm"
@@ -34,6 +36,8 @@ mkdir -p "${LOG_DIR}"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 # shellcheck source=night-watch-helpers.sh
 source "${SCRIPT_DIR}/night-watch-helpers.sh"
+PROJECT_RUNTIME_KEY=$(project_runtime_key "${PROJECT_DIR}")
+LOCK_FILE="/tmp/night-watch-pr-reviewer-${PROJECT_RUNTIME_KEY}.lock"
 
 # Validate provider
 if ! validate_provider "${PROVIDER_CMD}"; then
@@ -47,7 +51,37 @@ if ! acquire_lock "${LOCK_FILE}"; then
   exit 0
 fi
 
-cd "${PROJECT_DIR}"
+cleanup_on_exit() {
+  rm -f "${LOCK_FILE}"
+
+  if [ -n "${RUNTIME_MIRROR_DIR}" ] && [ -n "${RUNTIME_PROJECT_DIR}" ]; then
+    cleanup_runtime_workspace "${RUNTIME_MIRROR_DIR}" "${RUNTIME_PROJECT_DIR}" || true
+  fi
+}
+
+trap cleanup_on_exit EXIT
+
+if [ -n "${NW_DEFAULT_BRANCH:-}" ]; then
+  DEFAULT_BRANCH="${NW_DEFAULT_BRANCH}"
+else
+  DEFAULT_BRANCH=$(detect_default_branch "${PROJECT_DIR}")
+fi
+
+runtime_info=()
+if mapfile -t runtime_info < <(prepare_runtime_workspace "${PROJECT_DIR}" "${DEFAULT_BRANCH}" "${LOG_FILE}"); then
+  RUNTIME_MIRROR_DIR="${runtime_info[0]:-}"
+  RUNTIME_PROJECT_DIR="${runtime_info[1]:-}"
+else
+  log "FAIL: Could not prepare runtime workspace for reviewer"
+  exit 1
+fi
+
+if [ -z "${RUNTIME_MIRROR_DIR}" ] || [ -z "${RUNTIME_PROJECT_DIR}" ]; then
+  log "FAIL: Runtime workspace paths are missing for reviewer"
+  exit 1
+fi
+
+cd "${RUNTIME_PROJECT_DIR}"
 
 # Convert comma-separated branch prefixes into a regex that matches branch starts.
 BRANCH_REGEX=""
@@ -122,38 +156,55 @@ fi
 
 log "START: Found PR(s) needing work:${PRS_NEEDING_WORK}"
 
-cleanup_worktrees "${PROJECT_DIR}"
-
 # Dry-run mode: print diagnostics and exit
 if [ "${NW_DRY_RUN:-0}" = "1" ]; then
   echo "=== Dry Run: PR Reviewer ==="
   echo "Provider: ${PROVIDER_CMD}"
   echo "Branch Patterns: ${BRANCH_PATTERNS_RAW}"
   echo "Min Review Score: ${MIN_REVIEW_SCORE}"
+  echo "Default Branch: ${DEFAULT_BRANCH}"
+  echo "Runtime Dir: ${RUNTIME_PROJECT_DIR}"
   echo "Open PRs needing work:${PRS_NEEDING_WORK}"
   echo "Timeout: ${MAX_RUNTIME}s"
   exit 0
 fi
 
+if [ -f "${RUNTIME_PROJECT_DIR}/.claude/commands/night-watch-pr-reviewer.md" ]; then
+  REVIEW_WORKFLOW=$(cat "${RUNTIME_PROJECT_DIR}/.claude/commands/night-watch-pr-reviewer.md")
+else
+  REVIEW_WORKFLOW=$(cat "${SCRIPT_DIR}/../templates/night-watch-pr-reviewer.md")
+fi
+
+REVIEW_PROMPT="You are running in an isolated runtime workspace at ${RUNTIME_PROJECT_DIR}.
+Do not run git checkout/switch in ${PROJECT_DIR}.
+Do not create or remove worktrees; the runtime controller handles that.
+Apply all fixes only inside the current runtime workspace.
+
+${REVIEW_WORKFLOW}"
+
 EXIT_CODE=0
 
 case "${PROVIDER_CMD}" in
   claude)
-    if timeout "${MAX_RUNTIME}" \
-      claude -p "/night-watch-pr-reviewer" \
-        --dangerously-skip-permissions \
-        >> "${LOG_FILE}" 2>&1; then
+    if (
+      cd "${RUNTIME_PROJECT_DIR}" && timeout "${MAX_RUNTIME}" \
+        claude -p "${REVIEW_PROMPT}" \
+          --dangerously-skip-permissions \
+          >> "${LOG_FILE}" 2>&1
+    ); then
       EXIT_CODE=0
     else
       EXIT_CODE=$?
     fi
     ;;
   codex)
-    if timeout "${MAX_RUNTIME}" \
-      codex --quiet \
-        --yolo \
-        --prompt "$(cat "${PROJECT_DIR}/.claude/commands/night-watch-pr-reviewer.md")" \
-        >> "${LOG_FILE}" 2>&1; then
+    if (
+      cd "${RUNTIME_PROJECT_DIR}" && timeout "${MAX_RUNTIME}" \
+        codex --quiet \
+          --yolo \
+          --prompt "${REVIEW_PROMPT}" \
+          >> "${LOG_FILE}" 2>&1
+    ); then
       EXIT_CODE=0
     else
       EXIT_CODE=$?
@@ -165,8 +216,6 @@ case "${PROVIDER_CMD}" in
     ;;
 esac
 
-cleanup_worktrees "${PROJECT_DIR}"
-
 if [ ${EXIT_CODE} -eq 0 ]; then
   log "DONE: PR reviewer completed successfully"
 elif [ ${EXIT_CODE} -eq 124 ]; then

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

@@ -67,18 +67,18 @@ A PR needs attention if **either** the review score is below 80 **or** any CI jo
 
 4. **Fix the PR**:
 
-   a. **Check out the PR branch**:
+   a. **Use the pre-provisioned runtime workspace**:
+      - You are already running in an isolated runtime workspace.
+      - Do **not** run `git checkout`/`git switch` in the original project directory.
+      - Do **not** create/remove worktrees manually; the runtime controller handles isolation and cleanup.
+
+   b. **Check out the PR branch inside the runtime workspace**:
       ```
       git fetch origin
       git checkout <branch-name>
       git pull origin <branch-name>
       ```
-
-   b. **Create a worktree** for the fixes:
-      ```
-      git worktree add ../${PROJECT_NAME}-nw-review-<branch-name> <branch-name>
-      ```
-      `cd` into worktree, run package install (npm install, yarn install, or pnpm install as appropriate).
+      Run package install (npm install, yarn install, or pnpm install as appropriate).
 
    c. **Address CI failures** (if any):
       - Read the failed job logs carefully to understand the root cause.
@@ -135,10 +135,6 @@ A PR needs attention if **either** the review score is below 80 **or** any CI jo
       Night Watch PR Reviewer"
       ```
 
-   h. **Clean up worktree**: `git worktree remove ../${PROJECT_NAME}-nw-review-<branch-name>`
-
 5. **Repeat** for all open PRs that need work.
 
-6. When done, return to ${DEFAULT_BRANCH}: `git checkout ${DEFAULT_BRANCH}`
-
 Start now. Check for open PRs that need review feedback addressed or CI failures fixed.

package/templates/night-watch.md

@@ -20,20 +20,13 @@ You are the Night Watch agent. Your job is to autonomously pick up PRD tickets a
 
    b. **Branch naming**: The branch MUST be named exactly `night-watch/<prd-filename-without-.md>`. Do NOT use `feat/`, `feature/`, or any other prefix. Example: for `health-check-endpoints.md` the branch is `night-watch/health-check-endpoints`.
 
-   c. **Create a feature branch** from ${DEFAULT_BRANCH}:
+   c. **Use the pre-provisioned runtime workspace**:
+      - You are already running in an isolated runtime workspace.
+      - The target branch `night-watch/<prd-filename-without-.md>` is already prepared.
+      - Do **not** run `git checkout`/`git switch` in the original project directory.
+      - Do **not** create/remove worktrees manually; the runtime controller handles isolation and cleanup.
 
-   ```
-   git checkout ${DEFAULT_BRANCH} && git pull origin ${DEFAULT_BRANCH}
-   git checkout -b night-watch/<prd-filename-without-.md>
-   ```
-
-   d. **Create a git worktree** for isolated work:
-
-   ```
-   git worktree add ../${PROJECT_NAME}-nw-<prd-name> night-watch/<prd-name>
-   ```
-
-   Then `cd` into the worktree and run package install (npm install, yarn install, or pnpm install as appropriate).
+   d. Install dependencies in the current runtime workspace (npm install, yarn install, or pnpm install as appropriate).
 
    e. **Implement the PRD using the PRD Executor workflow**:
       - Read `.claude/commands/prd-executor.md` and follow its full execution pipeline.
@@ -64,11 +57,9 @@ You are the Night Watch agent. Your job is to autonomously pick up PRD tickets a
    gh pr create --title "feat: <short title>" --body "<summary with PRD reference>"
    ```
 
-   j. **Move PRD to done** (back in main repo on ${DEFAULT_BRANCH}):
+   j. **Move PRD to done**:
 
    ```
-   cd ${PROJECT_DIR}
-   git checkout ${DEFAULT_BRANCH}
    mkdir -p docs/PRDs/night-watch/done
    mv docs/PRDs/night-watch/<file>.md docs/PRDs/night-watch/done/
    ```
@@ -91,10 +82,8 @@ You are the Night Watch agent. Your job is to autonomously pick up PRD tickets a
 
    l. **Commit** the move + summary update, push ${DEFAULT_BRANCH}.
 
-   m. **Clean up worktree**: `git worktree remove ../${PROJECT_NAME}-nw-<prd-name>`
-
-   n. **STOP after this PRD**. Do NOT continue to the next PRD. One PRD per run prevents timeouts and reduces risk. The next cron trigger will pick up the next PRD.
+   m. **STOP after this PRD**. Do NOT continue to the next PRD. One PRD per run prevents timeouts and reduces risk. The next cron trigger will pick up the next PRD.
 
-5. **On failure**: Do NOT move the PRD to done. Log the failure in NIGHT-WATCH-SUMMARY.md with status "Failed" and the reason. Clean up worktree and **stop** -- do not attempt the next PRD.
+5. **On failure**: Do NOT move the PRD to done. Log the failure in NIGHT-WATCH-SUMMARY.md with status "Failed" and the reason. The runtime controller handles cleanup. Then **stop** -- do not attempt the next PRD.
 
 Start now. Scan for available PRDs and process the first eligible one.