@jonit-dev/night-watch-cli 1.1.4 → 1.1.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jonit-dev/night-watch-cli",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "description": "Autonomous PRD execution using AI Provider CLIs + cron",
   "type": "module",
   "bin": {
@@ -40,11 +40,11 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/joaopio/night-watch-cli.git"
+    "url": "https://github.com/jonit-dev/night-watch-cli.git"
   },
-  "homepage": "https://github.com/joaopio/night-watch-cli#readme",
+  "homepage": "https://github.com/jonit-dev/night-watch-cli#readme",
   "bugs": {
-    "url": "https://github.com/joaopio/night-watch-cli/issues"
+    "url": "https://github.com/jonit-dev/night-watch-cli/issues"
   },
   "dependencies": {
     "chalk": "^5.6.2",

package/scripts/night-watch-cron.sh

@@ -55,13 +55,19 @@ fi
 
 cleanup_worktrees "${PROJECT_DIR}"
 
-ELIGIBLE_PRD=$(find_eligible_prd "${PRD_DIR}")
+ELIGIBLE_PRD=$(find_eligible_prd "${PRD_DIR}" "${MAX_RUNTIME}")
 
 if [ -z "${ELIGIBLE_PRD}" ]; then
   log "SKIP: No eligible PRDs (all done, in-progress, or blocked)"
   exit 0
 fi
 
+# Claim the PRD to prevent other runs from selecting it
+claim_prd "${PRD_DIR}" "${ELIGIBLE_PRD}"
+
+# Update EXIT trap to also release claim
+trap "rm -f '${LOCK_FILE}'; release_claim '${PRD_DIR}' '${ELIGIBLE_PRD}'" EXIT
+
 PRD_NAME="${ELIGIBLE_PRD%.md}"
 BRANCH_NAME="night-watch/${PRD_NAME}"
 if [ -n "${NW_DEFAULT_BRANCH:-}" ]; then
@@ -146,6 +152,7 @@ esac
 if [ ${EXIT_CODE} -eq 0 ]; then
   PR_EXISTS=$(gh pr list --state open --json headRefName --jq '.[].headRefName' 2>/dev/null | grep -cF "${BRANCH_NAME}" || echo "0")
   if [ "${PR_EXISTS}" -gt 0 ]; then
+    release_claim "${PRD_DIR}" "${ELIGIBLE_PRD}"
     mark_prd_done "${PRD_DIR}" "${ELIGIBLE_PRD}"
     git -C "${PROJECT_DIR}" add -A docs/PRDs/night-watch/
     git -C "${PROJECT_DIR}" commit -m "chore: mark ${ELIGIBLE_PRD} as done (PR opened on ${BRANCH_NAME})

package/scripts/night-watch-helpers.sh

@@ -118,10 +118,55 @@ detect_default_branch() {
   echo "main"
 }
 
+# ── Claim management ─────────────────────────────────────────────────────────
+
+claim_prd() {
+  local prd_dir="${1:?prd_dir required}"
+  local prd_file="${2:?prd_file required}"
+  local claim_file="${prd_dir}/${prd_file}.claim"
+
+  printf '{"timestamp":%d,"hostname":"%s","pid":%d}\n' \
+    "$(date +%s)" "$(hostname)" "$$" > "${claim_file}"
+}
+
+release_claim() {
+  local prd_dir="${1:?prd_dir required}"
+  local prd_file="${2:?prd_file required}"
+  local claim_file="${prd_dir}/${prd_file}.claim"
+
+  rm -f "${claim_file}"
+}
+
+is_claimed() {
+  local prd_dir="${1:?prd_dir required}"
+  local prd_file="${2:?prd_file required}"
+  local max_runtime="${3:-7200}"
+  local claim_file="${prd_dir}/${prd_file}.claim"
+
+  if [ ! -f "${claim_file}" ]; then
+    return 1
+  fi
+
+  local claim_ts
+  claim_ts=$(grep -o '"timestamp":[0-9]*' "${claim_file}" 2>/dev/null | grep -o '[0-9]*' || echo "0")
+  local now
+  now=$(date +%s)
+  local age=$(( now - claim_ts ))
+
+  if [ "${age}" -lt "${max_runtime}" ]; then
+    return 0  # actively claimed
+  else
+    # Stale claim — remove it
+    rm -f "${claim_file}"
+    return 1
+  fi
+}
+
 # ── Find next eligible PRD ───────────────────────────────────────────────────
 
 find_eligible_prd() {
   local prd_dir="${1:?prd_dir required}"
+  local max_runtime="${2:-7200}"
   local done_dir="${prd_dir}/done"
 
   local prd_files
@@ -139,6 +184,12 @@ find_eligible_prd() {
     prd_file=$(basename "${prd_path}")
     local prd_name="${prd_file%.md}"
 
+    # Skip if claimed by another process
+    if is_claimed "${prd_dir}" "${prd_file}" "${max_runtime}"; then
+      log "SKIP-PRD: ${prd_file} — claimed by another process"
+      continue
+    fi
+
     # Skip if a PR already exists for this PRD
     if echo "${open_branches}" | grep -qF "${prd_name}"; then
       log "SKIP-PRD: ${prd_file} — open PR already exists"

package/scripts/test-helpers.bats

@@ -0,0 +1,77 @@
+#!/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/prd.md

@@ -0,0 +1,26 @@
+# PRD: {{TITLE}}
+
+{{DEPENDS_ON}}
+
+**Complexity: {{COMPLEXITY_SCORE}} → {{COMPLEXITY_LEVEL}} mode**
+{{COMPLEXITY_BREAKDOWN}}
+
+---
+
+## Problem
+
+<!-- What problem does this solve? Describe in 1-2 sentences. -->
+
+## Solution
+
+<!-- How will you solve it? 3-5 bullets explaining the approach. -->
+
+## Phases
+
+{{PHASES}}
+
+## Acceptance Criteria
+
+- [ ] All phases complete
+- [ ] All tests pass
+- [ ] Feature is reachable (not orphaned code)