@jonit-dev/night-watch-cli 1.8.10-beta.7 → 1.8.11

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

@@ -541,14 +541,14 @@ _is_lock_holder_alive() {
 
 append_exit_trap() {
   local command="${1:?command required}"
-  local existing=""
 
-  existing=$(trap -p EXIT | sed -n "s/^trap -- '\\(.*\\)' EXIT$/\\1/p")
-  if [ -n "${existing}" ]; then
-    trap "${existing}; ${command}" EXIT
+  if [ -n "${NW_EXIT_TRAP_CHAIN:-}" ]; then
+    NW_EXIT_TRAP_CHAIN="${NW_EXIT_TRAP_CHAIN}; ${command}"
   else
-    trap "${command}" EXIT
+    NW_EXIT_TRAP_CHAIN="${command}"
   fi
+
+  trap "${NW_EXIT_TRAP_CHAIN}" EXIT
 }
 
 # ── Detect default branch ───────────────────────────────────────────────────
@@ -801,6 +801,31 @@ cleanup_worktrees() {
   git -C "${project_dir}" worktree prune >/dev/null 2>&1 || true
 }
 
+cleanup_worktree_path() {
+  local project_dir="${1:?project_dir required}"
+  local worktree_dir="${2:?worktree_dir required}"
+
+  if [ -z "${worktree_dir}" ] || [ "${worktree_dir}" = "${project_dir}" ]; then
+    return 0
+  fi
+
+  git -C "${project_dir}" worktree prune >/dev/null 2>&1 || true
+
+  if git -C "${project_dir}" worktree list --porcelain 2>/dev/null \
+      | grep -qF "worktree ${worktree_dir}"; then
+    log "CLEANUP: Removing worktree ${worktree_dir}"
+    git -C "${project_dir}" worktree remove --force "${worktree_dir}" 2>/dev/null || true
+  fi
+
+  if [ -d "${worktree_dir}" ] && ! git -C "${project_dir}" worktree list --porcelain 2>/dev/null \
+      | grep -qF "worktree ${worktree_dir}"; then
+    log "CLEANUP: Removing stale worktree directory ${worktree_dir}"
+    rm -rf "${worktree_dir}" 2>/dev/null || true
+  fi
+
+  git -C "${project_dir}" worktree prune >/dev/null 2>&1 || true
+}
+
 # Pick the best available ref for creating a new detached worktree.
 resolve_worktree_base_ref() {
   local project_dir="${1:?project_dir required}"
@@ -1169,6 +1194,53 @@ Proxy quota exhausted - falling back to native Claude (${model})"
     --data-urlencode "text=${msg}" > /dev/null 2>&1 || true
 }
 
+# Send an immediate Telegram warning when a rate-limit fallback was attempted
+# but no fallback preset/model is configured for the project.
+# Preferred input: NW_TELEGRAM_RATE_LIMIT_WEBHOOKS (JSON array with botToken/chatId).
+# Legacy fallback: NW_TELEGRAM_BOT_TOKEN + NW_TELEGRAM_CHAT_ID.
+# Usage: send_missing_fallback_configuration_warning <project_name>
+send_missing_fallback_configuration_warning() {
+  local project_name="${1:-unknown}"
+  local msg="⚠️ Rate Limit Fallback Unconfigured
+
+Project: ${project_name}
+Rate-limit fallback was attempted, but no fallback preset/model is configured.
+
+Configure one in Settings -> AI Providers -> Reliability & Fallbacks
+or set primaryFallbackPreset / primaryFallbackModel in night-watch.config.json."
+
+  # Preferred path: iterate all opted-in Telegram webhooks.
+  if [ -n "${NW_TELEGRAM_RATE_LIMIT_WEBHOOKS:-}" ] && command -v jq >/dev/null 2>&1; then
+    local sent=0
+    local webhook_json
+    while IFS= read -r webhook_json; do
+      [ -z "${webhook_json}" ] && continue
+      local bot_token
+      local chat_id
+      bot_token=$(printf '%s' "${webhook_json}" | jq -r '.botToken // empty' 2>/dev/null || true)
+      chat_id=$(printf '%s' "${webhook_json}" | jq -r '.chatId // empty' 2>/dev/null || true)
+      if [ -n "${bot_token}" ] && [ -n "${chat_id}" ]; then
+        curl -s -X POST "https://api.telegram.org/bot${bot_token}/sendMessage" \
+          --data-urlencode "chat_id=${chat_id}" \
+          --data-urlencode "text=${msg}" > /dev/null 2>&1 || true
+        sent=1
+      fi
+    done < <(printf '%s' "${NW_TELEGRAM_RATE_LIMIT_WEBHOOKS}" | jq -c '.[]?' 2>/dev/null || true)
+
+    if [ "${sent}" -eq 1 ]; then
+      return 0
+    fi
+  fi
+
+  # Legacy single-webhook fallback.
+  if [ -z "${NW_TELEGRAM_BOT_TOKEN:-}" ] || [ -z "${NW_TELEGRAM_CHAT_ID:-}" ]; then
+    return 0
+  fi
+  curl -s -X POST "https://api.telegram.org/bot${NW_TELEGRAM_BOT_TOKEN}/sendMessage" \
+    --data-urlencode "chat_id=${NW_TELEGRAM_CHAT_ID}" \
+    --data-urlencode "text=${msg}" > /dev/null 2>&1 || true
+}
+
 # ── Board mode issue discovery ────────────────────────────────────────────────
 
 # Get the next eligible issue from the board provider.

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

@@ -881,6 +881,12 @@ if [ -n "${TARGET_PR}" ]; then
 fi
 REVIEW_WORKTREE_DIR="$(dirname "${PROJECT_DIR}")/${REVIEW_WORKTREE_BASENAME}"
 
+cleanup_reviewer_runner_worktree_on_exit() {
+  cleanup_worktree_path "${PROJECT_DIR}" "${REVIEW_WORKTREE_DIR}"
+}
+
+append_exit_trap "cleanup_reviewer_runner_worktree_on_exit"
+
 cleanup_reviewer_worktrees "${REVIEW_WORKTREE_BASENAME}"
 
 # Dry-run mode: print diagnostics and exit
@@ -995,7 +1001,20 @@ TOTAL_ATTEMPTS=1
 if [ -n "${TARGET_PR}" ]; then
   TOTAL_ATTEMPTS=$((REVIEWER_MAX_RETRIES + 1))
 fi
-RUN_STARTED_AT=$(date +%s)
+
+epoch_millis() {
+  local now_ms
+
+  now_ms=$(date +%s%3N 2>/dev/null || true)
+  if [[ "${now_ms}" =~ ^[0-9]+$ ]]; then
+    printf "%s" "${now_ms}"
+    return 0
+  fi
+
+  printf "%s000" "$(date +%s)"
+}
+
+RUN_STARTED_AT_MS=$(epoch_millis)
 
 # Capture current HEAD of PR branch so we can detect if the reviewer pushed any commits.
 PR_BRANCH_HEAD_BEFORE=""
@@ -1004,13 +1023,22 @@ if [ -n "${TARGET_PR}" ]; then
 fi
 
 remaining_runtime_budget() {
-  local now_ts
-  local elapsed
+  local now_ms
+  local elapsed_ms
+  local remaining_ms
   local remaining
 
-  now_ts=$(date +%s)
-  elapsed=$((now_ts - RUN_STARTED_AT))
-  remaining=$((MAX_RUNTIME - elapsed))
+  now_ms=$(epoch_millis)
+  elapsed_ms=$((now_ms - RUN_STARTED_AT_MS))
+  remaining_ms=$((MAX_RUNTIME * 1000 - elapsed_ms))
+  if [ "${remaining_ms}" -le 0 ]; then
+    printf "0"
+    return 0
+  fi
+
+  # Round up to avoid shaving nearly a full second off attempt 1 when the
+  # script crosses a wall-clock second boundary before entering `timeout`.
+  remaining=$(( (remaining_ms + 999) / 1000 ))
   printf "%s" "${remaining}"
 }
 
@@ -1057,15 +1085,12 @@ for ATTEMPT in $(seq 1 "${TOTAL_ATTEMPTS}"); do
     # Retries only happen after a quick return (low score / invalid output / rate limit);
     # a timed-out provider run is not retried, so pre-splitting the budget would
     # incorrectly cap a 1h review to ~20m on attempt 1.
-    NOW_TS=$(date +%s)
-    ELAPSED=$((NOW_TS - RUN_STARTED_AT))
-    REMAINING_BUDGET=$((MAX_RUNTIME - ELAPSED))
-    if [ "${REMAINING_BUDGET}" -le 0 ]; then
+    ATTEMPT_TIMEOUT=$(remaining_runtime_budget)
+    if [ "${ATTEMPT_TIMEOUT}" -le 0 ]; then
       EXIT_CODE=124
       log "RETRY: Runtime budget exhausted before attempt ${ATTEMPT}"
       break
     fi
-    ATTEMPT_TIMEOUT="${REMAINING_BUDGET}"
   fi
 
   # Recreate worktree if it was removed unexpectedly between attempts.

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

@@ -481,6 +481,12 @@ else
 fi
 QA_WORKTREE_DIR="$(dirname "${PROJECT_DIR}")/${PROJECT_NAME}-nw-qa-runner"
 
+cleanup_qa_worktree_on_exit() {
+  cleanup_worktree_path "${PROJECT_DIR}" "${QA_WORKTREE_DIR}"
+}
+
+append_exit_trap "cleanup_qa_worktree_on_exit"
+
 log "START: Found PR(s) needing QA:${PRS_NEEDING_QA}"
 
 cleanup_worktrees "${PROJECT_DIR}"

package/dist/templates/night-watch.config.json

@@ -55,7 +55,9 @@
       "audit": 10
     }
   },
-  "jobProviders": {},
+  "jobProviders": {
+    "reviewer": "g51claude"
+  },
   "autoMerge": false,
   "autoMergeMethod": "squash",
   "fallbackOnRateLimit": true,
@@ -73,5 +75,23 @@
     "enabled": true,
     "schedule": "50 3 * * 1",
     "maxRuntime": 1800
+  },
+  "providerPresets": {
+    "g51claude": {
+      "name": "GLM-5.1 Claude",
+      "command": "claude",
+      "promptFlag": "-p",
+      "autoApproveFlag": "--dangerously-skip-permissions",
+      "modelFlag": "--model",
+      "model": "glm-5.1",
+      "envVars": {
+        "ANTHROPIC_BASE_URL": "https://api.z.ai/api/anthropic",
+        "API_TIMEOUT_MS": "3000000",
+        "ANTHROPIC_DEFAULT_OPUS_MODEL": "glm-5.1",
+        "ANTHROPIC_DEFAULT_SONNET_MODEL": "glm-5.1",
+        "ANTHROPIC_AUTH_TOKEN": "efaeca456dab4ae69cb9ce1fa8d99a1a.KSTifNTWPS6NgC6L",
+        "ANTHROPIC_API_KEY": "efaeca456dab4ae69cb9ce1fa8d99a1a.KSTifNTWPS6NgC6L"
+      }
+    }
   }
 }