@jonit-dev/night-watch-cli 1.8.4-beta.8 → 1.8.4-beta.9

package/dist/cli.js

@@ -6966,7 +6966,7 @@ async function fetchAmplitudeData(apiKey, secretKey, lookbackDays) {
   const baseUrl = "https://amplitude.com/api/2";
   const allEventsParam = encodeURIComponent('{"event_type":"_all"}');
   const [activeUsers, eventSegmentation, retention, userSessions] = await Promise.allSettled([
-    amplitudeFetch(`${baseUrl}/users/active?start=${start}&end=${end}`, authHeader, "active users"),
+    amplitudeFetch(`${baseUrl}/users?m=active&start=${start}&end=${end}`, authHeader, "active users"),
     amplitudeFetch(`${baseUrl}/events/segmentation?start=${start}&end=${end}&e=${allEventsParam}`, authHeader, "event segmentation"),
     amplitudeFetch(`${baseUrl}/retention?se=${allEventsParam}&re=${allEventsParam}&start=${start}&end=${end}`, authHeader, "retention"),
     amplitudeFetch(`${baseUrl}/sessions/average?start=${start}&end=${end}`, authHeader, "user sessions")
@@ -7037,9 +7037,13 @@ ${JSON.stringify(data, null, 2)}`;
   fs19.writeFileSync(promptFile, prompt, "utf-8");
   try {
     const provider = resolveJobProvider(config, "analytics");
-    const providerCmd = PROVIDER_COMMANDS[provider];
+    let providerCmd = PROVIDER_COMMANDS[provider];
+    if (!providerCmd) {
+      const preset = resolvePreset(config, provider);
+      providerCmd = preset.command;
+    }
     let scriptContent;
-    if (provider === "claude") {
+    if (providerCmd === "claude") {
       const modelId = CLAUDE_MODEL_IDS[config.claudeModel ?? "sonnet"];
       scriptContent = `#!/usr/bin/env bash
 set -euo pipefail

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

@@ -242,7 +242,7 @@ count_prs_for_branch() {
   local branch_name="${2:?branch_name required}"
   local count
   count=$(
-    { gh pr list --state "${pr_state}" --json headRefName --jq '.[].headRefName' 2>/dev/null || true; } \
+    { gh pr list --state "${pr_state}" --limit 200 --json headRefName --jq '.[].headRefName' 2>/dev/null || true; } \
       | { grep -xF "${branch_name}" || true; } \
       | wc -l \
       | tr -d '[:space:]'
@@ -773,6 +773,20 @@ fi
 TOTAL_ELAPSED=$(( $(date +%s) - SCRIPT_START_TIME ))
 log "OUTCOME: exit_code=${EXIT_CODE} total_elapsed=${TOTAL_ELAPSED}s prd=${ELIGIBLE_PRD} branch=${BRANCH_NAME}"
 
+# Detect false-success from budget exhaustion.
+# Claude exits 0 even when it hits the $ budget cap, so scan the log.
+if [ "${EXIT_CODE}" -eq 0 ] && grep -qiF 'Exceeded USD budget' "${LOG_FILE}" 2>/dev/null; then
+  log "WARN: provider exited 0 but budget was exceeded — reclassifying as failure"
+  if [ -n "${ISSUE_NUMBER}" ]; then
+    "${NW_CLI}" board move-issue "${ISSUE_NUMBER}" --column "Ready" 2>>"${LOG_FILE}" || true
+    "${NW_CLI}" board comment "${ISSUE_NUMBER}" \
+      --body "Budget limit reached (via ${EFFECTIVE_PROVIDER_LABEL}). Moved back to Ready." 2>>"${LOG_FILE}" || true
+  fi
+  night_watch_history record "${PROJECT_DIR}" "${ELIGIBLE_PRD}" failure --exit-code 1 2>/dev/null || true
+  emit_result "failure_budget_exceeded" "prd=${ELIGIBLE_PRD}|branch=${BRANCH_NAME}|reason=budget_exceeded"
+  EXIT_CODE=1
+fi
+
 if [ ${EXIT_CODE} -eq 0 ]; then
   OPEN_PR_COUNT=$(count_prs_for_branch open "${BRANCH_NAME}")
   if [ "${OPEN_PR_COUNT}" -gt 0 ]; then

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

@@ -830,13 +830,33 @@ if [ -z "${TARGET_PR}" ] && [ "${WORKER_MODE}" != "1" ] && [ "${PARALLEL_ENABLED
     worker_pr="${WORKER_PRS[$idx]}"
     worker_output="${WORKER_OUTPUTS[$idx]}"
 
+    # Guard: abort the wait loop when the global budget is exhausted
+    PARENT_ELAPSED=$(( $(date +%s) - SCRIPT_START_TIME ))
+    PARENT_REMAINING=$(( MAX_RUNTIME - PARENT_ELAPSED ))
+    if [ "${PARENT_REMAINING}" -le 0 ]; then
+      log "PARALLEL: global timeout exhausted — killing remaining workers"
+      for remaining_idx in $(seq "${idx}" $(( ${#WORKER_PIDS[@]} - 1 ))); do
+        kill "${WORKER_PIDS[$remaining_idx]}" 2>/dev/null || true
+      done
+      EXIT_CODE=124
+      break
+    fi
+
+    # Watchdog: kill the worker if it outlives the remaining budget
+    ( sleep "${PARENT_REMAINING}" 2>/dev/null; kill "${worker_pid}" 2>/dev/null || true ) &
+    watchdog_pid=$!
+
     worker_exit_code=0
-    if wait "${worker_pid}"; then
+    if wait "${worker_pid}" 2>/dev/null; then
       worker_exit_code=0
     else
       worker_exit_code=$?
     fi
 
+    # Cancel the watchdog — the worker finished in time
+    kill "${watchdog_pid}" 2>/dev/null || true
+    wait "${watchdog_pid}" 2>/dev/null || true
+
     if [ -f "${worker_output}" ] && [ -s "${worker_output}" ]; then
       cat "${worker_output}" >> "${LOG_FILE}"
     fi

package/package.json

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