@jonit-dev/night-watch-cli 1.7.29 → 1.7.31

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

@@ -1,281 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-# Night Watch QA Cron Runner (project-agnostic)
-# Usage: night-watch-qa-cron.sh /path/to/project
-#
-# NOTE: This script expects environment variables to be set by the caller.
-# The Node.js CLI will inject config values via environment variables.
-# Required env vars (with defaults shown):
-#   NW_QA_MAX_RUNTIME=3600            - Maximum runtime in seconds (1 hour)
-#   NW_PROVIDER_CMD=claude            - AI provider CLI to use (claude, codex, etc.)
-#   NW_BRANCH_PATTERNS=feat/,night-watch/ - Comma-separated branch prefixes to match
-#   NW_QA_SKIP_LABEL=skip-qa          - Label to skip QA on a PR
-#   NW_QA_ARTIFACTS=both              - Artifact mode (both, tests, report)
-#   NW_QA_AUTO_INSTALL_PLAYWRIGHT=1   - Auto-install Playwright browsers
-#   NW_DRY_RUN=0                      - Set to 1 for dry-run mode (prints diagnostics only)
-
-PROJECT_DIR="${1:?Usage: $0 /path/to/project}"
-PROJECT_NAME=$(basename "${PROJECT_DIR}")
-LOG_DIR="${PROJECT_DIR}/logs"
-LOG_FILE="${LOG_DIR}/night-watch-qa.log"
-MAX_RUNTIME="${NW_QA_MAX_RUNTIME:-3600}"  # 1 hour
-MAX_LOG_SIZE="524288"  # 512 KB
-PROVIDER_CMD="${NW_PROVIDER_CMD:-claude}"
-BRANCH_PATTERNS_RAW="${NW_BRANCH_PATTERNS:-feat/,night-watch/}"
-SKIP_LABEL="${NW_QA_SKIP_LABEL:-skip-qa}"
-QA_ARTIFACTS="${NW_QA_ARTIFACTS:-both}"
-QA_AUTO_INSTALL_PLAYWRIGHT="${NW_QA_AUTO_INSTALL_PLAYWRIGHT:-1}"
-
-# Ensure NVM / Node / Claude are on PATH
-export NVM_DIR="${HOME}/.nvm"
-[ -s "${NVM_DIR}/nvm.sh" ] && . "${NVM_DIR}/nvm.sh"
-
-# NOTE: Environment variables should be set by the caller (Node.js CLI).
-# The .env.night-watch sourcing has been removed - config is now injected via env vars.
-
-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}")
-# NOTE: Lock file path must match qaLockPath() in src/utils/status-data.ts
-LOCK_FILE="/tmp/night-watch-qa-${PROJECT_RUNTIME_KEY}.lock"
-
-emit_result() {
-  local status="${1:?status required}"
-  local details="${2:-}"
-  if [ -n "${details}" ]; then
-    echo "NIGHT_WATCH_RESULT:${status}|${details}"
-  else
-    echo "NIGHT_WATCH_RESULT:${status}"
-  fi
-}
-
-# Validate provider
-if ! validate_provider "${PROVIDER_CMD}"; then
-  echo "ERROR: Unknown provider: ${PROVIDER_CMD}" >&2
-  exit 1
-fi
-
-rotate_log
-
-if ! acquire_lock "${LOCK_FILE}"; then
-  emit_result "skip_locked"
-  exit 0
-fi
-
-cd "${PROJECT_DIR}"
-
-# Convert comma-separated branch prefixes into a regex that matches branch starts.
-BRANCH_REGEX=""
-IFS=',' read -r -a BRANCH_PATTERNS <<< "${BRANCH_PATTERNS_RAW}"
-for pattern in "${BRANCH_PATTERNS[@]}"; do
-  trimmed_pattern=$(printf '%s' "${pattern}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
-  if [ -n "${trimmed_pattern}" ]; then
-    BRANCH_REGEX="${BRANCH_REGEX}${BRANCH_REGEX:+|}^${trimmed_pattern}"
-  fi
-done
-
-if [ -z "${BRANCH_REGEX}" ]; then
-  BRANCH_REGEX='^(feat/|night-watch/)'
-fi
-
-# List open PRs with their details for filtering
-PR_JSON=$(gh pr list --state open --json number,headRefName,title,labels 2>/dev/null || echo "[]")
-
-# Count PRs matching branch patterns
-OPEN_PRS=$(
-  echo "${PR_JSON}" \
-    | jq -r '.[].headRefName' 2>/dev/null \
-    | { grep -E "${BRANCH_REGEX}" || true; } \
-    | wc -l \
-    | tr -d '[:space:]'
-)
-
-if [ "${OPEN_PRS}" -eq 0 ]; then
-  log "SKIP: No open PRs matching branch patterns (${BRANCH_PATTERNS_RAW})"
-  emit_result "skip_no_open_prs"
-  exit 0
-fi
-
-REPO=$(gh repo view --json nameWithOwner --jq '.nameWithOwner' 2>/dev/null || echo "")
-
-# Collect PRs that need QA
-PRS_NEEDING_QA=""
-QA_NEEDED=0
-
-while IFS=$'\t' read -r pr_number pr_branch pr_title pr_labels; do
-  if [ -z "${pr_number}" ] || [ -z "${pr_branch}" ]; then
-    continue
-  fi
-
-  # Filter by branch pattern
-  if ! printf '%s\n' "${pr_branch}" | grep -Eq "${BRANCH_REGEX}"; then
-    continue
-  fi
-
-  # Skip PRs with the skip label
-  if echo "${pr_labels}" | grep -q "${SKIP_LABEL}"; then
-    log "SKIP-QA: PR #${pr_number} (${pr_branch}) has '${SKIP_LABEL}' label"
-    continue
-  fi
-
-  # Skip PRs with [skip-qa] in their title
-  if echo "${pr_title}" | grep -qi '\[skip-qa\]'; then
-    log "SKIP-QA: PR #${pr_number} (${pr_branch}) has [skip-qa] in title"
-    continue
-  fi
-
-  # Skip PRs that already have a QA comment (idempotency)
-  ALL_COMMENTS=$(
-    {
-      gh pr view "${pr_number}" --json comments --jq '.comments[].body' 2>/dev/null || true
-      if [ -n "${REPO}" ]; then
-        gh api "repos/${REPO}/issues/${pr_number}/comments" --jq '.[].body' 2>/dev/null || true
-      fi
-    } | sort -u
-  )
-  if echo "${ALL_COMMENTS}" | grep -q '<!-- night-watch-qa-marker -->'; then
-    log "SKIP-QA: PR #${pr_number} (${pr_branch}) already has QA comment"
-    continue
-  fi
-
-  QA_NEEDED=1
-  PRS_NEEDING_QA="${PRS_NEEDING_QA} #${pr_number}"
-done < <(
-  echo "${PR_JSON}" \
-    | jq -r '.[] | [.number, .headRefName, .title, ([.labels[].name] | join(","))] | @tsv' 2>/dev/null || true
-)
-
-if [ "${QA_NEEDED}" -eq 0 ]; then
-  log "SKIP: All ${OPEN_PRS} open PR(s) matching patterns already have QA comments"
-  emit_result "skip_all_qa_done"
-  exit 0
-fi
-
-PRS_NEEDING_QA=$(echo "${PRS_NEEDING_QA}" \
-  | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]][[:space:]]*/ /g' -e 's/[[:space:]]*$//')
-PRS_NEEDING_QA_CSV="${PRS_NEEDING_QA// /,}"
-
-if [ -n "${NW_DEFAULT_BRANCH:-}" ]; then
-  DEFAULT_BRANCH="${NW_DEFAULT_BRANCH}"
-else
-  DEFAULT_BRANCH=$(detect_default_branch "${PROJECT_DIR}")
-fi
-QA_WORKTREE_DIR="$(dirname "${PROJECT_DIR}")/${PROJECT_NAME}-nw-qa-runner"
-
-log "START: Found PR(s) needing QA:${PRS_NEEDING_QA}"
-
-cleanup_worktrees "${PROJECT_DIR}"
-
-# Dry-run mode: print diagnostics and exit
-if [ "${NW_DRY_RUN:-0}" = "1" ]; then
-  echo "=== Dry Run: QA Runner ==="
-  echo "Provider: ${PROVIDER_CMD}"
-  echo "Branch Patterns: ${BRANCH_PATTERNS_RAW}"
-  echo "Skip Label: ${SKIP_LABEL}"
-  echo "QA Artifacts: ${QA_ARTIFACTS}"
-  echo "Auto-install Playwright: ${QA_AUTO_INSTALL_PLAYWRIGHT}"
-  echo "Open PRs needing QA:${PRS_NEEDING_QA}"
-  echo "Default Branch: ${DEFAULT_BRANCH}"
-  echo "QA Worktree: ${QA_WORKTREE_DIR}"
-  echo "Timeout: ${MAX_RUNTIME}s"
-  exit 0
-fi
-
-EXIT_CODE=0
-
-# Process each PR that needs QA
-for pr_ref in ${PRS_NEEDING_QA}; do
-  pr_num="${pr_ref#\#}"
-
-  cleanup_worktrees "${PROJECT_DIR}"
-  if ! prepare_detached_worktree "${PROJECT_DIR}" "${QA_WORKTREE_DIR}" "${DEFAULT_BRANCH}" "${LOG_FILE}"; then
-    log "FAIL: Unable to create isolated QA worktree ${QA_WORKTREE_DIR} for PR #${pr_num}"
-    EXIT_CODE=1
-    break
-  fi
-
-  log "QA: Checking out PR #${pr_num} in worktree"
-  if ! (cd "${QA_WORKTREE_DIR}" && gh pr checkout "${pr_num}" >> "${LOG_FILE}" 2>&1); then
-    log "WARN: Failed to checkout PR #${pr_num}, skipping"
-    EXIT_CODE=1
-    cleanup_worktrees "${PROJECT_DIR}"
-    continue
-  fi
-
-  case "${PROVIDER_CMD}" in
-    claude)
-      if (
-        cd "${QA_WORKTREE_DIR}" && timeout "${MAX_RUNTIME}" \
-          claude -p "/night-watch-qa" \
-            --dangerously-skip-permissions \
-            >> "${LOG_FILE}" 2>&1
-      ); then
-        log "QA: PR #${pr_num} — provider completed successfully"
-      else
-        local_exit=$?
-        log "QA: PR #${pr_num} — provider exited with code ${local_exit}"
-        if [ ${local_exit} -eq 124 ]; then
-          EXIT_CODE=124
-          break
-        fi
-        EXIT_CODE=${local_exit}
-      fi
-      ;;
-    codex)
-      if (
-        cd "${QA_WORKTREE_DIR}" && timeout "${MAX_RUNTIME}" \
-          codex --quiet \
-            --yolo \
-            --prompt "$(cat "${QA_WORKTREE_DIR}/.claude/commands/night-watch-qa.md")" \
-            >> "${LOG_FILE}" 2>&1
-      ); then
-        log "QA: PR #${pr_num} — provider completed successfully"
-      else
-        local_exit=$?
-        log "QA: PR #${pr_num} — provider exited with code ${local_exit}"
-        if [ ${local_exit} -eq 124 ]; then
-          EXIT_CODE=124
-          break
-        fi
-        EXIT_CODE=${local_exit}
-      fi
-      ;;
-    *)
-      log "ERROR: Unknown provider: ${PROVIDER_CMD}"
-      exit 1
-      ;;
-  esac
-
-  cleanup_worktrees "${PROJECT_DIR}"
-done
-
-cleanup_worktrees "${PROJECT_DIR}"
-
-if [ ${EXIT_CODE} -eq 0 ]; then
-  log "DONE: QA runner completed successfully"
-  if [ -n "${REPO}" ]; then
-    emit_result "success_qa" "prs=${PRS_NEEDING_QA_CSV}|repo=${REPO}"
-  else
-    emit_result "success_qa" "prs=${PRS_NEEDING_QA_CSV}"
-  fi
-elif [ ${EXIT_CODE} -eq 124 ]; then
-  log "TIMEOUT: QA runner killed after ${MAX_RUNTIME}s"
-  if [ -n "${REPO}" ]; then
-    emit_result "timeout" "prs=${PRS_NEEDING_QA_CSV}|repo=${REPO}"
-  else
-    emit_result "timeout" "prs=${PRS_NEEDING_QA_CSV}"
-  fi
-else
-  log "FAIL: QA runner exited with code ${EXIT_CODE}"
-  if [ -n "${REPO}" ]; then
-    emit_result "failure" "prs=${PRS_NEEDING_QA_CSV}|repo=${REPO}"
-  else
-    emit_result "failure" "prs=${PRS_NEEDING_QA_CSV}"
-  fi
-fi
-
-exit "${EXIT_CODE}"

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

@@ -1,90 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-# Night Watch Slicer Cron Runner (project-agnostic)
-# Usage: night-watch-slicer-cron.sh /path/to/project
-#
-# This is a thin wrapper that acquires a lock and calls `night-watch slice`.
-# The CLI command handles all the logic directly in TypeScript.
-#
-# NOTE: This script expects environment variables to be set by the caller.
-# The Node.js CLI will inject config values via environment variables.
-# Required env vars (with defaults shown):
-#   NW_SLICER_MAX_RUNTIME=600  - Maximum runtime in seconds (10 minutes)
-#   NW_PROVIDER_CMD=claude     - AI provider CLI to use (claude, codex, etc.)
-#   NW_DRY_RUN=0               - Set to 1 for dry-run mode (prints diagnostics only)
-
-PROJECT_DIR="${1:?Usage: $0 /path/to/project}"
-PROJECT_NAME=$(basename "${PROJECT_DIR}")
-LOG_DIR="${PROJECT_DIR}/logs"
-LOG_FILE="${LOG_DIR}/night-watch-slicer.log"
-LOCK_FILE=""
-MAX_RUNTIME="${NW_SLICER_MAX_RUNTIME:-600}"  # 10 minutes
-MAX_LOG_SIZE="524288"  # 512 KB
-PROVIDER_CMD="${NW_PROVIDER_CMD:-claude}"
-
-# Ensure NVM / Node / Night Watch CLI are on PATH
-export NVM_DIR="${HOME}/.nvm"
-[ -s "${NVM_DIR}/nvm.sh" ] && . "${NVM_DIR}/nvm.sh"
-
-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-slicer-${PROJECT_RUNTIME_KEY}.lock"
-
-# Validate provider
-if ! validate_provider "${PROVIDER_CMD}"; then
-  echo "ERROR: Unknown provider: ${PROVIDER_CMD}" >&2
-  exit 1
-fi
-
-rotate_log
-
-if ! acquire_lock "${LOCK_FILE}"; then
-  exit 0
-fi
-
-cleanup_on_exit() {
-  rm -f "${LOCK_FILE}"
-}
-
-trap cleanup_on_exit EXIT
-
-log "START: Running roadmap slicer for ${PROJECT_DIR}"
-
-# Dry-run mode: print diagnostics and exit
-if [ "${NW_DRY_RUN:-0}" = "1" ]; then
-  echo "=== Dry Run: Roadmap Slicer ==="
-  echo "Provider: ${PROVIDER_CMD}"
-  echo "Project Dir: ${PROJECT_DIR}"
-  echo "Timeout: ${MAX_RUNTIME}s"
-  exit 0
-fi
-
-# Resolve night-watch CLI
-CLI_BIN=""
-if ! CLI_BIN=$(resolve_night_watch_cli); then
-  log "ERROR: Could not resolve night-watch CLI"
-  exit 1
-fi
-
-# Run the slice command with timeout
-EXIT_CODE=0
-if timeout "${MAX_RUNTIME}" "${CLI_BIN}" slice >> "${LOG_FILE}" 2>&1; then
-  EXIT_CODE=0
-else
-  EXIT_CODE=$?
-fi
-
-if [ ${EXIT_CODE} -eq 0 ]; then
-  log "DONE: Slicer completed successfully"
-elif [ ${EXIT_CODE} -eq 124 ]; then
-  log "TIMEOUT: Slicer killed after ${MAX_RUNTIME}s"
-else
-  log "FAIL: Slicer exited with code ${EXIT_CODE}"
-fi
-
-exit ${EXIT_CODE}

package/scripts/test-helpers.bats

@@ -1,77 +0,0 @@
-#!/usr/bin/env bats
-
-# Tests for night-watch-helpers.sh claim functions
-
-setup() {
-  # Source the helpers
-  SCRIPT_DIR="$(cd "$(dirname "${BATS_TEST_FILENAME}")" && pwd)"
-
-  # Set required globals
-  export LOG_FILE="/tmp/night-watch-test-$$.log"
-
-  source "${SCRIPT_DIR}/night-watch-helpers.sh"
-
-  # Create temp PRD directory
-  TEST_PRD_DIR=$(mktemp -d)
-  echo "# Test PRD" > "${TEST_PRD_DIR}/01-test-prd.md"
-  echo "# Test PRD 2" > "${TEST_PRD_DIR}/02-test-prd.md"
-}
-
-teardown() {
-  rm -rf "${TEST_PRD_DIR}"
-  rm -f "${LOG_FILE}"
-}
-
-@test "claim_prd creates .claim file with JSON" {
-  claim_prd "${TEST_PRD_DIR}" "01-test-prd.md"
-
-  [ -f "${TEST_PRD_DIR}/01-test-prd.md.claim" ]
-
-  local content
-  content=$(cat "${TEST_PRD_DIR}/01-test-prd.md.claim")
-
-  # Check JSON contains expected fields
-  echo "${content}" | grep -q '"timestamp":'
-  echo "${content}" | grep -q '"hostname":'
-  echo "${content}" | grep -q '"pid":'
-}
-
-@test "is_claimed returns 0 for active claim" {
-  claim_prd "${TEST_PRD_DIR}" "01-test-prd.md"
-
-  run is_claimed "${TEST_PRD_DIR}" "01-test-prd.md" 7200
-  [ "$status" -eq 0 ]
-}
-
-@test "is_claimed returns 1 for stale claim" {
-  # Write a claim with an old timestamp (1 second)
-  printf '{"timestamp":1000000000,"hostname":"test","pid":1}\n' \
-    > "${TEST_PRD_DIR}/01-test-prd.md.claim"
-
-  run is_claimed "${TEST_PRD_DIR}" "01-test-prd.md" 7200
-  [ "$status" -eq 1 ]
-}
-
-@test "is_claimed returns 1 for no claim" {
-  run is_claimed "${TEST_PRD_DIR}" "01-test-prd.md" 7200
-  [ "$status" -eq 1 ]
-}
-
-@test "release_claim removes .claim file" {
-  claim_prd "${TEST_PRD_DIR}" "01-test-prd.md"
-  [ -f "${TEST_PRD_DIR}/01-test-prd.md.claim" ]
-
-  release_claim "${TEST_PRD_DIR}" "01-test-prd.md"
-  [ ! -f "${TEST_PRD_DIR}/01-test-prd.md.claim" ]
-}
-
-@test "find_eligible_prd skips claimed PRD" {
-  # Claim the first PRD
-  claim_prd "${TEST_PRD_DIR}" "01-test-prd.md"
-
-  # find_eligible_prd should skip 01 and return 02
-  local result
-  result=$(find_eligible_prd "${TEST_PRD_DIR}" 7200)
-
-  [ "${result}" = "02-test-prd.md" ]
-}

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

@@ -1,174 +0,0 @@
-You are the Night Watch PR Reviewer agent. Your job is to check open PRs for three things:
-1. Merge conflicts -- rebase onto the base branch and resolve them.
-2. Review comments with a score below 80 -- address the feedback.
-3. Failed CI jobs -- diagnose and fix the failures.
-
-## Context
-
-The repo has two GitHub Actions workflows that run on PRs:
-- **`.github/workflows/pr-review.yml`** -- AI review that posts a score (0-100) as a comment.
-- **`.github/workflows/ci.yml`** -- CI pipeline with jobs: `typecheck`, `lint`, `test`, `build`, and `verify`.
-
-A PR needs attention if **any** of the following: merge conflicts present, review score below 80, or any CI job failed.
-
-## Important: Early Exit
-
-- If there are **no open PRs** on `night-watch/` or `feat/` branches, **stop immediately** and report "No PRs to review."
-- If all open PRs have **no merge conflicts**, **passing CI**, and **review score >= 80** (or no review score yet), **stop immediately** and report "All PRs are in good shape."
-- Do **NOT** loop or retry. Process each PR **once** per run. After processing all PRs, stop.
-- Do **NOT** re-check PRs after pushing fixes -- the CI will re-run automatically on the next push.
-
-## Instructions
-
-1. **Find open PRs** created by Night Watch:
-   ```
-   gh pr list --state open --json number,title,headRefName,url
-   ```
-   Filter for PRs on `night-watch/` or `feat/` branches.
-
-2. **For each PR**, check three things:
-
-### A. Check for Merge Conflicts
-
-   ```
-   gh pr view <number> --json mergeStateStatus --jq '.mergeStateStatus'
-   ```
-   If the result is `DIRTY` or `CONFLICTING`, the PR has merge conflicts that **must** be resolved before anything else.
-
-### B. Check CI Status
-
-   Fetch the CI check status for the PR:
-   ```
-   gh pr checks <number> --json name,state,conclusion
-   ```
-   If any check has `conclusion` of `failure` (or `state` is not `completed`/`success`), the PR has CI failures that need fixing.
-
-   To get details on why a CI job failed, fetch the workflow run logs:
-   ```
-   gh run list --branch <branch-name> --limit 1 --json databaseId,conclusion,status
-   ```
-   Then view the failed job logs:
-   ```
-   gh run view <run-id> --log-failed
-   ```
-
-### C. Check Review Score
-
-   Fetch the **comments** (NOT reviews -- the bot posts as a regular issue comment):
-   ```
-   gh pr view <number> --json comments --jq '.comments[].body'
-   ```
-   If that returns nothing, also try:
-   ```
-   gh api repos/{owner}/{repo}/issues/<number>/comments --jq '.[].body'
-   ```
-
-   Parse the review score from the comment body. Look for patterns like:
-   - `**Overall Score:** XX/100`
-   - `**Score:** XX/100`
-   - `Overall Score:** XX/100`
-   Extract the numeric score. If multiple comments have scores, use the **most recent** one.
-
-3. **Determine if PR needs work**:
-   - If no merge conflicts **AND** score >= 80 **AND** all CI checks pass --> skip this PR.
-   - If merge conflicts present **OR** score < 80 **OR** any CI check failed --> fix the issues.
-
-4. **Fix the PR**:
-
-   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>
-      ```
-      Run package install (npm install, yarn install, or pnpm install as appropriate).
-
-   c. **Resolve merge conflicts** (if `mergeStateStatus` was `DIRTY` or `CONFLICTING`):
-      - Get the base branch: `gh pr view <number> --json baseRefName --jq '.baseRefName'`
-      - Rebase the PR branch onto the latest base branch:
-        ```
-        git fetch origin
-        git rebase origin/<base-branch>
-        ```
-      - For each conflicted file, examine the conflict markers carefully. Preserve the PR's intended changes while incorporating upstream updates. Resolve each conflict, then stage it:
-        ```
-        git add <resolved-file>
-        ```
-      - Continue the rebase: `git rebase --continue`
-      - Repeat until the rebase completes without conflicts.
-      - 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):
-      - Read the review comments carefully. Extract areas for improvement, bugs found, issues found, and specific file/line suggestions.
-      - 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).
-
-   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):
-      ```
-      git add <files>
-      git commit -m "fix: address PR review feedback and CI failures
-
-      - <bullet point for each fix>
-
-      <If merge conflicts resolved>Rebased onto <base-branch> and resolved merge conflicts.<end>
-      <If review score existed>Review score was <XX>/100.<end>
-      <If CI failed>CI failures fixed: <job1>, <job2>.<end>
-
-      Addressed:
-      - <issue 1>
-      - <issue 2>
-
-      Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>"
-
-      git push origin <branch-name>
-      ```
-      Note: if the only change was a conflict-free rebase, the `--force-with-lease` push from step (c) is sufficient -- no extra commit needed.
-
-   h. **Comment on the PR** summarizing what was addressed:
-      ```
-      gh pr comment <number> --body "## Night Watch PR Fix
-
-      <If merge conflicts resolved>### Merge Conflicts Resolved:
-      Rebased onto `<base-branch>`. Resolved conflicts in: <file1>, <file2>.<end>
-
-      <If review score existed>Previous review score: **<XX>/100**<end>
-
-      ### Changes made:
-      - <fix 1>
-      - <fix 2>
-
-      <If CI was fixed>### CI Failures Fixed:
-      - <job>: <what was wrong and how it was fixed><end>
-
-      \`npm run verify\` passes locally. Ready for re-review.
-
-      Night Watch PR Reviewer"
-      ```
-
-   i. **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 merge conflicts resolved, review feedback addressed, or CI failures fixed.