@jonit-dev/night-watch-cli 1.8.8-beta.1 → 1.8.8-beta.11

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

@@ -0,0 +1,321 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# Night Watch Merge Orchestrator Cron Runner
+# Usage: night-watch-merger-cron.sh /path/to/project
+#
+# Scans all open PRs, filters eligible ones, and merges them in FIFO order
+# (oldest PR first by creation date). Rebases remaining PRs after each merge.
+#
+# Required env vars (with defaults shown):
+#   NW_MERGER_MAX_RUNTIME=1800               - Maximum runtime in seconds (30 min)
+#   NW_MERGER_MERGE_METHOD=squash            - Merge method: squash|merge|rebase
+#   NW_MERGER_MIN_REVIEW_SCORE=80            - Minimum review score threshold
+#   NW_MERGER_BRANCH_PATTERNS=               - Comma-separated branch prefixes (empty = all)
+#   NW_MERGER_REBASE_BEFORE_MERGE=1          - Set to 1 to rebase before merging
+#   NW_MERGER_MAX_PRS_PER_RUN=0             - Max PRs to merge per run (0 = unlimited)
+#   NW_DRY_RUN=0                             - Set to 1 for dry-run mode
+
+PROJECT_DIR="${1:?Usage: $0 /path/to/project}"
+PROJECT_NAME=$(basename "${PROJECT_DIR}")
+LOG_DIR="${PROJECT_DIR}/logs"
+LOG_FILE="${LOG_DIR}/merger.log"
+MAX_RUNTIME="${NW_MERGER_MAX_RUNTIME:-1800}"
+MAX_LOG_SIZE="524288"  # 512 KB
+MERGE_METHOD="${NW_MERGER_MERGE_METHOD:-squash}"
+MIN_REVIEW_SCORE="${NW_MERGER_MIN_REVIEW_SCORE:-80}"
+REBASE_BEFORE_MERGE="${NW_MERGER_REBASE_BEFORE_MERGE:-1}"
+MAX_PRS_PER_RUN="${NW_MERGER_MAX_PRS_PER_RUN:-0}"
+BRANCH_PATTERNS_RAW="${NW_MERGER_BRANCH_PATTERNS:-}"
+SCRIPT_START_TIME=$(date +%s)
+DRY_RUN="${NW_DRY_RUN:-0}"
+PROVIDER_CMD="${NW_PROVIDER_CMD:-claude}"
+PROVIDER_LABEL="${NW_PROVIDER_LABEL:-}"
+
+# Normalize numeric settings
+if ! [[ "${MAX_PRS_PER_RUN}" =~ ^[0-9]+$ ]]; then
+  MAX_PRS_PER_RUN="0"
+fi
+if ! [[ "${MIN_REVIEW_SCORE}" =~ ^[0-9]+$ ]]; then
+  MIN_REVIEW_SCORE="80"
+fi
+# Clamp merge method to valid values
+case "${MERGE_METHOD}" in
+  squash|merge|rebase) ;;
+  *) MERGE_METHOD="squash" ;;
+esac
+
+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 mergerLockPath() in src/utils/status-data.ts
+LOCK_FILE="/tmp/night-watch-merger-${PROJECT_RUNTIME_KEY}.lock"
+SCRIPT_TYPE="merger"
+
+MERGED_PRS=0
+FAILED_PRS=0
+MERGED_PR_LIST=""
+
+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
+}
+
+# ── Global Job Queue Gate ────────────────────────────────────────────────────
+# Atomically claim a DB slot or enqueue for later dispatch — no flock needed.
+if [ "${NW_QUEUE_ENABLED:-0}" = "1" ]; then
+  if [ "${NW_QUEUE_DISPATCHED:-0}" = "1" ]; then
+    arm_global_queue_cleanup
+  else
+    claim_or_enqueue "${SCRIPT_TYPE}" "${PROJECT_DIR}"
+  fi
+fi
+# ──────────────────────────────────────────────────────────────────────────────
+
+# Check if branch matches configured patterns
+matches_branch_patterns() {
+  local branch="${1}"
+  if [ -z "${BRANCH_PATTERNS_RAW}" ]; then
+    return 0  # No filter = match all
+  fi
+  IFS=',' read -ra patterns <<< "${BRANCH_PATTERNS_RAW}"
+  for pattern in "${patterns[@]}"; do
+    pattern="${pattern# }"  # trim leading space
+    if [ -n "${pattern}" ] && [[ "${branch}" == "${pattern}"* ]]; then
+      return 0
+    fi
+  done
+  return 1
+}
+
+# Get review score from PR labels/comments
+get_review_score() {
+  local pr_number="${1}"
+  # Look for review score comment from night-watch
+  local score
+  score=$(gh pr view "${pr_number}" --json comments \
+    --jq '[.comments[].body | select(test("review score|score:? [0-9]+/100"; "i")) | capture("(?i)score:? *(?<s>[0-9]+)/100") | .s] | last | tonumber // -1' \
+    2>/dev/null || echo "-1")
+  echo "${score}"
+}
+
+# Check if CI is passing for a PR (all checks must be complete and none failing)
+ci_passing() {
+  local pr_number="${1}"
+  local checks_json
+  checks_json=$(gh pr checks "${pr_number}" --json name,state,conclusion 2>/dev/null || echo "[]")
+  # Fail if any checks have explicit failures
+  local fail_count
+  fail_count=$(echo "${checks_json}" | jq '[.[] | select(.conclusion == "FAILURE" or .conclusion == "TIMED_OUT" or .conclusion == "CANCELLED" or .state == "FAILURE")] | length' 2>/dev/null || echo "999")
+  if [ "${fail_count}" != "0" ]; then
+    return 1
+  fi
+  # Fail if any checks are still pending/in-progress (not yet concluded)
+  local pending_count
+  pending_count=$(echo "${checks_json}" | jq '[.[] | select(.state == "PENDING" or .state == "IN_PROGRESS" or (.conclusion == null and .state != "SUCCESS"))] | length' 2>/dev/null || echo "999")
+  if [ "${pending_count}" != "0" ]; then
+    return 1
+  fi
+  return 0
+}
+
+# Rebase a PR against its base branch
+rebase_pr() {
+  local pr_number="${1}"
+  log "INFO: Rebasing PR #${pr_number} against base branch"
+  if [ "${DRY_RUN}" = "1" ]; then
+    log "INFO: [DRY RUN] Would rebase PR #${pr_number}"
+    return 0
+  fi
+  gh pr update-branch --rebase "${pr_number}" 2>/dev/null
+  return $?
+}
+
+log() {
+  echo "[$(date '+%Y-%m-%dT%H:%M:%S')] $*" | tee -a "${LOG_FILE}"
+}
+
+rotate_log() {
+  if [ -f "${LOG_FILE}" ] && [ "$(stat -c%s "${LOG_FILE}" 2>/dev/null || echo 0)" -ge "${MAX_LOG_SIZE}" ]; then
+    mv "${LOG_FILE}" "${LOG_FILE}.bak" 2>/dev/null || true
+  fi
+}
+
+# ── Log rotation ──────────────────────────────────────────────────────────────
+rotate_log
+# ─────────────────────────────────────────────────────────────────────────────
+
+cd "${PROJECT_DIR}"
+
+log "========================================"
+log "RUN-START: merger invoked project=${PROJECT_DIR} dry_run=${DRY_RUN}"
+log "CONFIG: merge_method=${MERGE_METHOD} min_review_score=${MIN_REVIEW_SCORE} rebase_before_merge=${REBASE_BEFORE_MERGE} max_prs=${MAX_PRS_PER_RUN} max_runtime=${MAX_RUNTIME}s branch_patterns=${BRANCH_PATTERNS_RAW:-<all>}"
+log "========================================"
+
+if ! acquire_lock "${LOCK_FILE}"; then
+  emit_result "skip_locked"
+  exit 0
+fi
+
+# ── Dry-run mode ────────────────────────────────────────────────────────────
+if [ "${DRY_RUN}" = "1" ]; then
+  echo "=== Dry Run: Merge Orchestrator ==="
+  echo "Merge Method: ${MERGE_METHOD}"
+  echo "Min Review Score: ${MIN_REVIEW_SCORE}/100"
+  echo "Rebase Before Merge: ${REBASE_BEFORE_MERGE}"
+  echo "Max PRs Per Run: ${MAX_PRS_PER_RUN} (0=unlimited)"
+  echo "Max Runtime: ${MAX_RUNTIME}s"
+  echo "Branch Patterns: ${BRANCH_PATTERNS_RAW:-<all>}"
+  log "INFO: Dry run mode — exiting without processing"
+  emit_result "skip_dry_run"
+  exit 0
+fi
+
+# Timeout watchdog
+(
+  sleep "${MAX_RUNTIME}"
+  log "TIMEOUT: Merger exceeded ${MAX_RUNTIME}s, terminating"
+  kill -TERM $$ 2>/dev/null || true
+) &
+WATCHDOG_PID=$!
+trap 'kill ${WATCHDOG_PID} 2>/dev/null || true; rm -f "${LOCK_FILE}"' EXIT
+
+# Discover open PRs sorted by creation date (oldest first = FIFO)
+log "INFO: Scanning open PRs..."
+PR_LIST_JSON=$(gh pr list --state open \
+  --json number,headRefName,createdAt,isDraft \
+  --jq 'sort_by(.createdAt)' \
+  2>/dev/null || echo "[]")
+
+PR_COUNT=$(echo "${PR_LIST_JSON}" | jq 'length')
+log "INFO: Found ${PR_COUNT} open PRs"
+
+if [ "${PR_COUNT}" = "0" ]; then
+  log "SKIP: No open PRs found. Exiting."
+  emit_result "skip_no_prs"
+  exit 0
+fi
+
+# Process each PR in FIFO order
+PROCESSED=0
+while IFS= read -r pr_json; do
+  pr_number=$(echo "${pr_json}" | jq -r '.number')
+  pr_branch=$(echo "${pr_json}" | jq -r '.headRefName')
+  is_draft=$(echo "${pr_json}" | jq -r '.isDraft')
+
+  # Skip drafts
+  if [ "${is_draft}" = "true" ]; then
+    log "INFO: PR #${pr_number} (${pr_branch}): Skipping draft"
+    continue
+  fi
+
+  # Check branch pattern filter
+  if ! matches_branch_patterns "${pr_branch}"; then
+    log "DEBUG: PR #${pr_number} (${pr_branch}): Branch pattern mismatch, skipping"
+    continue
+  fi
+
+  # Check CI status
+  if ! ci_passing "${pr_number}"; then
+    log "INFO: PR #${pr_number} (${pr_branch}): CI not passing, skipping"
+    continue
+  fi
+
+  # Check review score
+  if [ "${MIN_REVIEW_SCORE}" -gt "0" ]; then
+    score=$(get_review_score "${pr_number}")
+    if [ "${score}" -lt "0" ] || [ "${score}" -lt "${MIN_REVIEW_SCORE}" ]; then
+      log "INFO: PR #${pr_number} (${pr_branch}): Review score ${score} < ${MIN_REVIEW_SCORE} (or no score found), skipping"
+      continue
+    fi
+  fi
+
+  log "INFO: PR #${pr_number} (${pr_branch}): Eligible for merge"
+
+  # Rebase before merge if configured
+  if [ "${REBASE_BEFORE_MERGE}" = "1" ]; then
+    if ! rebase_pr "${pr_number}"; then
+      log "WARN: PR #${pr_number}: Rebase failed, skipping"
+      FAILED_PRS=$((FAILED_PRS + 1))
+      continue
+    fi
+    log "INFO: PR #${pr_number}: Rebase successful"
+
+    # Poll CI until all checks complete after rebase (up to 5 minutes)
+    local ci_max_wait=300
+    local ci_waited=0
+    local ci_poll=15
+    while [ "${ci_waited}" -lt "${ci_max_wait}" ]; do
+      sleep "${ci_poll}"
+      ci_waited=$((ci_waited + ci_poll))
+      if ci_passing "${pr_number}"; then
+        break
+      fi
+      log "INFO: PR #${pr_number}: Waiting for CI after rebase (${ci_waited}s/${ci_max_wait}s)..."
+    done
+    if ! ci_passing "${pr_number}"; then
+      log "INFO: PR #${pr_number}: CI not passing after rebase (waited ${ci_waited}s), skipping"
+      continue
+    fi
+  fi
+
+  # Merge the PR
+  log "INFO: Merging PR #${pr_number} with method: ${MERGE_METHOD}..."
+  if gh pr merge "${pr_number}" "--${MERGE_METHOD}" --delete-branch 2>&1 | tee -a "${LOG_FILE}"; then
+    log "INFO: PR #${pr_number}: Merged successfully"
+    MERGED_PRS=$((MERGED_PRS + 1))
+    MERGED_PR_LIST="${MERGED_PR_LIST}${pr_number},"
+
+    # Rebase remaining PRs after each successful merge
+    log "INFO: Rebasing remaining open PRs after merging #${pr_number}..."
+    REMAINING_JSON=$(gh pr list --state open \
+      --json number,headRefName \
+      2>/dev/null || echo "[]")
+    while IFS= read -r remaining_pr; do
+      remaining_number=$(echo "${remaining_pr}" | jq -r '.number')
+      remaining_branch=$(echo "${remaining_pr}" | jq -r '.headRefName')
+      if [ "${remaining_number}" != "${pr_number}" ]; then
+        log "INFO: Rebasing remaining PR #${remaining_number} (${remaining_branch})"
+        gh pr update-branch --rebase "${remaining_number}" 2>/dev/null || \
+          log "WARN: PR #${remaining_number}: Rebase failed (continuing)"
+      fi
+    done < <(echo "${REMAINING_JSON}" | jq -c '.[]')
+  else
+    log "WARN: PR #${pr_number}: Merge failed"
+    FAILED_PRS=$((FAILED_PRS + 1))
+  fi
+
+  PROCESSED=$((PROCESSED + 1))
+
+  # Check max PRs per run limit
+  if [ "${MAX_PRS_PER_RUN}" -gt "0" ] && [ "${PROCESSED}" -ge "${MAX_PRS_PER_RUN}" ]; then
+    log "INFO: Reached max PRs per run limit (${MAX_PRS_PER_RUN}). Stopping."
+    break
+  fi
+
+  # Enforce global timeout
+  elapsed=$(( $(date +%s) - SCRIPT_START_TIME ))
+  if [ "${elapsed}" -ge "${MAX_RUNTIME}" ]; then
+    log "WARN: Global timeout reached (${MAX_RUNTIME}s), stopping early"
+    break
+  fi
+done < <(echo "${PR_LIST_JSON}" | jq -c '.[]')
+
+# Trim trailing comma from PR list
+MERGED_PR_LIST="${MERGED_PR_LIST%,}"
+
+log "========================================"
+log "RUN-END: merger complete merged=${MERGED_PRS} failed=${FAILED_PRS}"
+log "========================================"
+
+emit_result "success" "merged=${MERGED_PRS}|failed=${FAILED_PRS}|prs=${MERGED_PR_LIST}"
+exit 0