@jonit-dev/night-watch-cli 1.5.7 → 1.5.9

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

@@ -67,14 +67,15 @@ A PR needs attention if **either** the review score is below 80 **or** any CI jo
 
 4. **Fix the PR**:
 
-   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**:
+   a. **Create an isolated review worktree**:
       ```
       git fetch origin
+      git worktree add --detach ../${PROJECT_NAME}-nw-review-<branch-name> origin/${DEFAULT_BRANCH}
+      ```
+
+   b. **Check out the PR branch inside that worktree**:
+      ```
+      cd ../${PROJECT_NAME}-nw-review-<branch-name>
       git checkout <branch-name>
       git pull origin <branch-name>
       ```
@@ -135,6 +136,10 @@ 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,13 +20,14 @@ 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. **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.
+   c. **Create an isolated worktree + branch** from ${DEFAULT_BRANCH}:
 
-   d. Install dependencies in the current runtime workspace (npm install, yarn install, or pnpm install as appropriate).
+   ```
+   git fetch origin ${DEFAULT_BRANCH}
+   git worktree add -b night-watch/<prd-filename-without-.md> ../${PROJECT_NAME}-nw-<prd-name> origin/${DEFAULT_BRANCH}
+   ```
+
+   d. `cd` into the worktree and run package install (npm install, yarn install, or pnpm install as appropriate). Keep all implementation steps inside this worktree.
 
    e. **Implement the PRD using the PRD Executor workflow**:
       - Read `.claude/commands/prd-executor.md` and follow its full execution pipeline.
@@ -57,9 +58,11 @@ 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**:
+   j. **Move PRD to done** (back in main repo on ${DEFAULT_BRANCH}):
 
    ```
+   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/
    ```
@@ -82,8 +85,10 @@ 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. **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. **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.
 
-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.
+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.
 
 Start now. Scan for available PRDs and process the first eligible one.