shipwright-cli 2.3.1 → 3.0.0

package/scripts/lib/daemon-dispatch.sh

@@ -37,6 +37,22 @@ daemon_spawn_pipeline() {
 
     daemon_log INFO "Spawning pipeline for issue #${issue_num}: ${issue_title}"
 
+    # ── Budget gate: hard-stop if daily budget exhausted ──
+    if [[ -x "${SCRIPT_DIR}/sw-cost.sh" ]]; then
+        local remaining
+        remaining=$("${SCRIPT_DIR}/sw-cost.sh" remaining-budget 2>/dev/null || echo "")
+        if [[ -n "$remaining" && "$remaining" != "unlimited" ]]; then
+            if awk -v r="$remaining" 'BEGIN { exit !(r <= 0) }' 2>/dev/null; then
+                daemon_log WARN "Budget exhausted (remaining: \$${remaining}) — skipping issue #${issue_num}"
+                emit_event "daemon.budget_exhausted" "remaining=$remaining" "issue=$issue_num"
+                return 1
+            fi
+            if awk -v r="$remaining" 'BEGIN { exit !(r < 1.0) }' 2>/dev/null; then
+                daemon_log WARN "Budget low: \$${remaining} remaining"
+            fi
+        fi
+    fi
+
     # ── Issue decomposition (if decomposer available) ──
     local decompose_script="${SCRIPT_DIR}/sw-decompose.sh"
     if [[ -x "$decompose_script" && "$NO_GITHUB" != "true" ]]; then
@@ -45,7 +61,7 @@ daemon_spawn_pipeline() {
         if [[ "$decompose_result" == *"decomposed"* ]]; then
             daemon_log INFO "Issue #${issue_num} decomposed into subtasks — skipping pipeline"
             # Remove the shipwright label so decomposed parent doesn't re-queue
-            gh issue edit "$issue_num" --remove-label "shipwright" 2>/dev/null || true
+            _timeout 30 gh issue edit "$issue_num" --remove-label "shipwright" 2>/dev/null || true
             return 0
         fi
     fi
@@ -54,14 +70,14 @@ daemon_spawn_pipeline() {
     local issue_goal="$issue_title"
     if [[ "$NO_GITHUB" != "true" ]]; then
         local issue_body_first
-        issue_body_first=$(gh issue view "$issue_num" --json body --jq '.body' 2>/dev/null | head -3 | tr '\n' ' ' | cut -c1-200 || true)
+        issue_body_first=$(_timeout 30 gh issue view "$issue_num" --json body --jq '.body' 2>/dev/null | head -3 | tr '\n' ' ' | cut -c1-200 || true)
         if [[ -n "$issue_body_first" ]]; then
             issue_goal="${issue_title}: ${issue_body_first}"
         fi
     fi
 
     # ── Predictive risk assessment (if enabled) ──
-    if [[ "${PREDICTION_ENABLED:-false}" == "true" ]] && type predict_pipeline_risk &>/dev/null 2>&1; then
+    if [[ "${PREDICTION_ENABLED:-false}" == "true" ]] && type predict_pipeline_risk >/dev/null 2>&1; then
         local issue_json_for_pred=""
         if [[ "$NO_GITHUB" != "true" ]]; then
             issue_json_for_pred=$(gh issue view "$issue_num" --json number,title,body,labels 2>/dev/null || echo "")
@@ -214,7 +230,7 @@ daemon_track_job() {
     local issue_num="$1" pid="$2" worktree="$3" title="${4:-}" repo="${5:-}" goal="${6:-}"
 
     # Write to SQLite (non-blocking, best-effort)
-    if type db_save_job &>/dev/null; then
+    if type db_save_job >/dev/null 2>&1; then
         local job_id="daemon-${issue_num}-$(now_epoch)"
         db_save_job "$job_id" "$issue_num" "$title" "$pid" "$worktree" "" "${PIPELINE_TEMPLATE:-autonomous}" "$goal" 2>/dev/null || true
     fi
@@ -309,7 +325,7 @@ daemon_reap_completed() {
         emit_event "daemon.reap" "issue=$issue_num" "result=$result_str" "duration_s=$dur_s"
 
         # Update SQLite (mark job complete/failed)
-        if type db_complete_job &>/dev/null && type db_fail_job &>/dev/null; then
+        if type db_complete_job >/dev/null 2>&1 && type db_fail_job >/dev/null 2>&1; then
             local _db_job_id="daemon-${issue_num}-${start_epoch}"
             if [[ "$exit_code" -eq 0 ]]; then
                 db_complete_job "$_db_job_id" "$result_str" 2>/dev/null || true
@@ -343,7 +359,7 @@ daemon_reap_completed() {
                                     --method PATCH \
                                     --field status=completed \
                                     --field conclusion=cancelled \
-                                    --silent 2>/dev/null || true
+                                    --silent --timeout 30 2>/dev/null || true
                             fi
                         fi
                     done < <(jq -r 'keys[]' "$check_ids_file" 2>/dev/null || true)
@@ -352,13 +368,18 @@ daemon_reap_completed() {
         fi
 
         # Finalize memory (capture failure patterns for future runs)
-        if type memory_finalize_pipeline &>/dev/null 2>&1; then
+        if type memory_finalize_pipeline >/dev/null 2>&1; then
             local _job_state _job_artifacts
             _job_state="${worktree:-.}/.claude/pipeline-state.md"
             _job_artifacts="${worktree:-.}/.claude/pipeline-artifacts"
             memory_finalize_pipeline "$_job_state" "$_job_artifacts" 2>/dev/null || true
         fi
 
+        # Trigger learning after pipeline reap
+        if type optimize_full_analysis &>/dev/null; then
+            optimize_full_analysis &>/dev/null &
+        fi
+
         # Clean up progress tracking for this job
         daemon_clear_progress "$issue_num"
 
@@ -400,13 +421,15 @@ daemon_reap_completed() {
         local current_active
         current_active=$(locked_get_active_count)
         if [[ "$current_active" -lt "$MAX_PARALLEL" ]]; then
-            local next_issue
-            next_issue=$(dequeue_next)
-            if [[ -n "$next_issue" ]]; then
+            local next_issue_key
+            next_issue_key=$(dequeue_next)
+            if [[ -n "$next_issue_key" ]]; then
+                local next_issue_num="$next_issue_key" next_repo=""
+                [[ "$next_issue_key" == *:* ]] && next_repo="${next_issue_key%%:*}" && next_issue_num="${next_issue_key##*:}"
                 local next_title
-                next_title=$(jq -r --arg n "$next_issue" '.titles[$n] // ""' "$STATE_FILE" 2>/dev/null || true)
-                daemon_log INFO "Dequeuing issue #${next_issue}: ${next_title}"
-                daemon_spawn_pipeline "$next_issue" "$next_title"
+                next_title=$(jq -r --arg n "$next_issue_key" '.titles[$n] // ""' "$STATE_FILE" 2>/dev/null || true)
+                daemon_log INFO "Dequeuing issue #${next_issue_num}${next_repo:+, repo=${next_repo}}: ${next_title}"
+                daemon_spawn_pipeline "$next_issue_num" "$next_title" "$next_repo"
             fi
         fi
     done <<< "$jobs"
@@ -453,12 +476,12 @@ daemon_on_success() {
 
     if [[ "$NO_GITHUB" != "true" ]]; then
         # Remove watch label, add success label
-        gh issue edit "$issue_num" \
+        _timeout 30 gh issue edit "$issue_num" \
             --remove-label "$ON_SUCCESS_REMOVE_LABEL" \
             --add-label "$ON_SUCCESS_ADD_LABEL" 2>/dev/null || true
 
         # Comment on issue
-        gh issue comment "$issue_num" --body "## ✅ Pipeline Complete
+        _timeout 30 gh issue comment "$issue_num" --body "## ✅ Pipeline Complete
 
 The autonomous pipeline finished successfully.
 
@@ -471,7 +494,7 @@ Check the associated PR for the implementation." 2>/dev/null || true
 
         # Optionally close the issue
         if [[ "$ON_SUCCESS_CLOSE_ISSUE" == "true" ]]; then
-            gh issue close "$issue_num" 2>/dev/null || true
+            _timeout 30 gh issue close "$issue_num" 2>/dev/null || true
         fi
     fi
 

package/scripts/lib/daemon-health.sh

@@ -11,7 +11,7 @@ _DAEMON_HEALTH_LOADED=1
 daemon_health_timeout_for_stage() {
     local stage="${1:-unknown}"
     local fallback="${2:-120}"
-    if type policy_get &>/dev/null 2>&1; then
+    if type policy_get >/dev/null 2>&1; then
         local policy_val
         policy_val=$(policy_get ".daemon.stage_timeouts.$stage" "")
         if [[ -n "$policy_val" && "$policy_val" =~ ^[0-9]+$ ]]; then

package/scripts/lib/daemon-patrol.sh

@@ -45,10 +45,22 @@ daemon_patrol() {
         local findings=0
 
         # npm audit
-        if [[ -f "package.json" ]] && command -v npm &>/dev/null; then
+        if [[ -f "package.json" ]] && command -v npm >/dev/null 2>&1; then
             local audit_json
-            audit_json=$(npm audit --json 2>/dev/null || true)
-            if [[ -n "$audit_json" ]]; then
+            audit_json=$(npm audit --json 2>/dev/null || echo '{}')
+            local audit_version
+            audit_version=$(echo "$audit_json" | jq -r '.auditReportVersion // 1')
+
+            local vuln_list
+            if [[ "$audit_version" == "2" ]]; then
+                # npm 7+ format: .vulnerabilities is an object keyed by package name
+                vuln_list=$(echo "$audit_json" | jq -c '[.vulnerabilities | to_entries[] | .value | {name: .name, severity: .severity, url: (.via[0].url // "N/A"), title: (.via[0].title // .name)}]' 2>/dev/null || echo '[]')
+            else
+                # npm 6 format: .advisories is an object keyed by advisory ID
+                vuln_list=$(echo "$audit_json" | jq -c '[.advisories | to_entries[] | .value | {name: .module_name, severity: .severity, url: .url, title: .title}]' 2>/dev/null || echo '[]')
+            fi
+
+            if [[ -n "$vuln_list" && "$vuln_list" != "[]" ]]; then
                 while IFS= read -r vuln; do
                     local severity name advisory_url title
                     severity=$(echo "$vuln" | jq -r '.severity // "unknown"')
@@ -90,12 +102,12 @@ Auto-detected by \`shipwright daemon patrol\`." \
                     else
                         echo -e "    ${RED}●${RESET} ${BOLD}${severity}${RESET}: ${title} in ${CYAN}${name}${RESET}"
                     fi
-                done < <(echo "$audit_json" | jq -c '.vulnerabilities | to_entries[] | .value' 2>/dev/null)
+                done < <(echo "$vuln_list" | jq -c '.[]' 2>/dev/null)
             fi
         fi
 
         # pip-audit
-        if [[ -f "requirements.txt" ]] && command -v pip-audit &>/dev/null; then
+        if [[ -f "requirements.txt" ]] && command -v pip-audit >/dev/null 2>&1; then
             local pip_json
             pip_json=$(pip-audit --format=json 2>/dev/null || true)
             if [[ -n "$pip_json" ]]; then
@@ -106,7 +118,7 @@ Auto-detected by \`shipwright daemon patrol\`." \
         fi
 
         # cargo audit
-        if [[ -f "Cargo.toml" ]] && command -v cargo-audit &>/dev/null; then
+        if [[ -f "Cargo.toml" ]] && command -v cargo-audit >/dev/null 2>&1; then
             local cargo_json
             cargo_json=$(cargo audit --json 2>/dev/null || true)
             if [[ -n "$cargo_json" ]]; then
@@ -117,8 +129,8 @@ Auto-detected by \`shipwright daemon patrol\`." \
         fi
 
         # Enrich with GitHub security alerts
-        if type gh_security_alerts &>/dev/null 2>&1 && [[ "${NO_GITHUB:-false}" != "true" ]]; then
-            if type _gh_detect_repo &>/dev/null 2>&1; then
+        if type gh_security_alerts >/dev/null 2>&1 && [[ "${NO_GITHUB:-false}" != "true" ]]; then
+            if type _gh_detect_repo >/dev/null 2>&1; then
                 _gh_detect_repo 2>/dev/null || true
             fi
             local gh_owner="${GH_OWNER:-}" gh_repo="${GH_REPO:-}"
@@ -135,7 +147,7 @@ Auto-detected by \`shipwright daemon patrol\`." \
         fi
 
         # Enrich with GitHub Dependabot alerts
-        if type gh_dependabot_alerts &>/dev/null 2>&1 && [[ "${NO_GITHUB:-false}" != "true" ]]; then
+        if type gh_dependabot_alerts >/dev/null 2>&1 && [[ "${NO_GITHUB:-false}" != "true" ]]; then
             local gh_owner="${GH_OWNER:-}" gh_repo="${GH_REPO:-}"
             if [[ -n "$gh_owner" && -n "$gh_repo" ]]; then
                 local dep_alerts
@@ -162,7 +174,7 @@ Auto-detected by \`shipwright daemon patrol\`." \
         daemon_log INFO "Patrol: checking for stale dependencies"
         local findings=0
 
-        if [[ -f "package.json" ]] && command -v npm &>/dev/null; then
+        if [[ -f "package.json" ]] && command -v npm >/dev/null 2>&1; then
             local outdated_json
             outdated_json=$(npm outdated --json 2>/dev/null || true)
             if [[ -n "$outdated_json" ]] && [[ "$outdated_json" != "{}" ]]; then
@@ -534,7 +546,7 @@ Auto-detected by \`shipwright daemon patrol\` on $(now_iso)." \
         failures_json=$(
             (
                 source "$memory_script" > /dev/null 2>&1 || true
-                if command -v memory_get_actionable_failures &>/dev/null; then
+                if command -v memory_get_actionable_failures >/dev/null 2>&1; then
                     memory_get_actionable_failures "$PATROL_FAILURES_THRESHOLD"
                 else
                     echo "[]"
@@ -1046,7 +1058,7 @@ Auto-detected by \`shipwright daemon patrol\` on $(now_iso)." \
     echo ""
 
     # ── Stage 2: AI-Powered Confirmation (if enabled) ──
-    if [[ "${PREDICTION_ENABLED:-false}" == "true" ]] && type patrol_ai_analyze &>/dev/null 2>&1; then
+    if [[ "${PREDICTION_ENABLED:-false}" == "true" ]] && type patrol_ai_analyze >/dev/null 2>&1; then
         daemon_log INFO "Intelligence: using AI patrol analysis (prediction enabled)"
         echo -e "  ${BOLD}AI Deep Analysis${RESET}"
         # Sample recent source files for AI analysis

package/scripts/lib/daemon-poll.sh

@@ -53,7 +53,7 @@ daemon_poll_issues() {
             --owner "$ORG" \
             --state open \
             --json repository,number,title,labels,body,createdAt \
-            --limit 20 2>/dev/null) || {
+            --limit "${ISSUE_LIMIT:-100}" 2>/dev/null) || {
             # Handle rate limiting with exponential backoff
             if [[ $BACKOFF_SECS -eq 0 ]]; then
                 BACKOFF_SECS=30
@@ -80,7 +80,7 @@ daemon_poll_issues() {
             --label "$WATCH_LABEL" \
             --state open \
             --json number,title,labels,body,createdAt \
-            --limit 20 2>/dev/null) || {
+            --limit 100 2>/dev/null) || {
             # Handle rate limiting with exponential backoff
             if [[ $BACKOFF_SECS -eq 0 ]]; then
                 BACKOFF_SECS=30
@@ -212,18 +212,22 @@ daemon_poll_issues() {
     while IFS='|' read -r score issue_num repo_name; do
         [[ -z "$issue_num" ]] && continue
 
+        local issue_key
+        issue_key="$issue_num"
+        [[ -n "$repo_name" ]] && issue_key="${repo_name}:${issue_num}"
+
         local issue_title labels_csv
-        issue_title=$(echo "$issues_json" | jq -r --argjson n "$issue_num" '.[] | select(.number == $n) | .title')
-        labels_csv=$(echo "$issues_json" | jq -r --argjson n "$issue_num" '.[] | select(.number == $n) | [.labels[].name] | join(",")')
+        issue_title=$(echo "$issues_json" | jq -r --argjson n "$issue_num" --arg repo "$repo_name" '.[] | select(.number == $n) | select($repo == "" or (.repository.nameWithOwner // "") == $repo) | .title')
+        labels_csv=$(echo "$issues_json" | jq -r --argjson n "$issue_num" --arg repo "$repo_name" '.[] | select(.number == $n) | select($repo == "" or (.repository.nameWithOwner // "") == $repo) | [.labels[].name] | join(",")')
 
-        # Cache title in state for dashboard visibility
+        # Cache title in state for dashboard visibility (use issue_key for org mode)
         if [[ -n "$issue_title" ]]; then
-            locked_state_update --arg num "$issue_num" --arg title "$issue_title" \
+            locked_state_update --arg num "$issue_key" --arg title "$issue_title" \
                 '.titles[$num] = $title'
         fi
 
         # Skip if already inflight
-        if daemon_is_inflight "$issue_num"; then
+        if daemon_is_inflight "$issue_key"; then
             continue
         fi
 
@@ -263,7 +267,7 @@ daemon_poll_issues() {
         # Check capacity
         active_count=$(locked_get_active_count)
         if [[ "$active_count" -ge "$MAX_PARALLEL" ]]; then
-            enqueue_issue "$issue_num"
+            enqueue_issue "$issue_key"
             continue
         fi
 
@@ -308,24 +312,26 @@ daemon_poll_issues() {
     local drain_active
     drain_active=$(locked_get_active_count)
     while [[ "$drain_active" -lt "$MAX_PARALLEL" ]]; do
-        local drain_issue
-        drain_issue=$(dequeue_next)
-        [[ -z "$drain_issue" ]] && break
+        local drain_issue_key
+        drain_issue_key=$(dequeue_next)
+        [[ -z "$drain_issue_key" ]] && break
+        local drain_issue_num="$drain_issue_key" drain_repo=""
+        [[ "$drain_issue_key" == *:* ]] && drain_repo="${drain_issue_key%%:*}" && drain_issue_num="${drain_issue_key##*:}"
         local drain_title
-        drain_title=$(jq -r --arg n "$drain_issue" '.titles[$n] // ""' "$STATE_FILE" 2>/dev/null || true)
+        drain_title=$(jq -r --arg n "$drain_issue_key" '.titles[$n] // ""' "$STATE_FILE" 2>/dev/null || true)
 
         local drain_labels drain_score drain_template
-        drain_labels=$(echo "$issues_json" | jq -r --argjson n "$drain_issue" \
-            '.[] | select(.number == $n) | [.labels[].name] | join(",")' 2>/dev/null || echo "")
-        drain_score=$(echo "$sorted_order" | grep "|${drain_issue}|" | cut -d'|' -f1 || echo "50")
+        drain_labels=$(echo "$issues_json" | jq -r --argjson n "$drain_issue_num" --arg repo "$drain_repo" \
+            '.[] | select(.number == $n) | select($repo == "" or (.repository.nameWithOwner // "") == $repo) | [.labels[].name] | join(",")' 2>/dev/null || echo "")
+        drain_score=$(echo "$sorted_order" | grep "|${drain_issue_num}|" | cut -d'|' -f1 || echo "50")
         drain_template=$(select_pipeline_template "$drain_labels" "${drain_score:-50}" 2>/dev/null | tail -1)
         drain_template=$(printf '%s' "$drain_template" | sed $'s/\x1b\\[[0-9;]*m//g' | tr -cd '[:alnum:]-_')
         [[ -z "$drain_template" ]] && drain_template="$PIPELINE_TEMPLATE"
 
-        daemon_log INFO "Draining queue: issue #${drain_issue}, template=${drain_template}"
+        daemon_log INFO "Draining queue: issue #${drain_issue_num}${drain_repo:+, repo=${drain_repo}}, template=${drain_template}"
         local orig_template="$PIPELINE_TEMPLATE"
         PIPELINE_TEMPLATE="$drain_template"
-        daemon_spawn_pipeline "$drain_issue" "$drain_title"
+        daemon_spawn_pipeline "$drain_issue_num" "$drain_title" "$drain_repo"
         PIPELINE_TEMPLATE="$orig_template"
         drain_active=$(locked_get_active_count)
     done
@@ -692,7 +698,7 @@ daemon_auto_scale() {
 
     # ── Vitals-driven scaling factor ──
     local max_by_vitals="$MAX_WORKERS"
-    if type pipeline_compute_vitals &>/dev/null 2>&1 && [[ -f "$STATE_FILE" ]]; then
+    if type pipeline_compute_vitals >/dev/null 2>&1 && [[ -f "$STATE_FILE" ]]; then
         local _total_health=0 _health_count=0
         while IFS= read -r _job; do
             local _job_issue _job_worktree
@@ -813,7 +819,7 @@ daemon_self_optimize() {
     fi
 
     # ── Intelligence-powered optimization (if enabled) ──
-    if [[ "${OPTIMIZATION_ENABLED:-false}" == "true" ]] && type optimize_full_analysis &>/dev/null 2>&1; then
+    if [[ "${OPTIMIZATION_ENABLED:-false}" == "true" ]] && type optimize_full_analysis >/dev/null 2>&1; then
         daemon_log INFO "Running intelligence-powered optimization"
         optimize_full_analysis 2>/dev/null || {
             daemon_log WARN "Intelligence optimization failed — falling back to DORA-based tuning"
@@ -968,7 +974,7 @@ daemon_cleanup_stale() {
     now_e=$(now_epoch)
 
     # ── 1. Clean old git worktrees ──
-    if command -v git &>/dev/null; then
+    if command -v git >/dev/null 2>&1; then
         while IFS= read -r line; do
             local wt_path
             wt_path=$(echo "$line" | awk '{print $1}')
@@ -976,7 +982,7 @@ daemon_cleanup_stale() {
             [[ "$wt_path" == *"daemon-issue-"* ]] || continue
             # Check worktree age via directory mtime
             local mtime
-            mtime=$(stat -f '%m' "$wt_path" 2>/dev/null || stat -c '%Y' "$wt_path" 2>/dev/null || echo "0")
+            mtime=$(file_mtime "$wt_path")
             if [[ $((now_e - mtime)) -gt $age_secs ]]; then
                 daemon_log INFO "Removing stale worktree: ${wt_path}"
                 git worktree remove "$wt_path" --force 2>/dev/null || true
@@ -1003,7 +1009,7 @@ daemon_cleanup_stale() {
         while IFS= read -r artifact_dir; do
             [[ -d "$artifact_dir" ]] || continue
             local mtime
-            mtime=$(stat -f '%m' "$artifact_dir" 2>/dev/null || stat -c '%Y' "$artifact_dir" 2>/dev/null || echo "0")
+            mtime=$(file_mtime "$artifact_dir")
             if [[ $((now_e - mtime)) -gt $age_secs ]]; then
                 daemon_log INFO "Removing stale artifact: ${artifact_dir}"
                 rm -rf "$artifact_dir"
@@ -1013,7 +1019,7 @@ daemon_cleanup_stale() {
     fi
 
     # ── 3. Clean orphaned daemon/* branches (no matching worktree or active job) ──
-    if command -v git &>/dev/null; then
+    if command -v git >/dev/null 2>&1; then
         while IFS= read -r branch; do
             [[ -z "$branch" ]] && continue
             branch="${branch## }"  # trim leading spaces
@@ -1075,7 +1081,7 @@ daemon_cleanup_stale() {
         ps_status=$(sed -n 's/^status: *//p' "$pipeline_state" 2>/dev/null | head -1 | tr -d ' ')
         if [[ "$ps_status" == "running" ]]; then
             local ps_mtime
-            ps_mtime=$(stat -f '%m' "$pipeline_state" 2>/dev/null || stat -c '%Y' "$pipeline_state" 2>/dev/null || echo "0")
+            ps_mtime=$(file_mtime "$pipeline_state")
             local ps_age=$((now_e - ps_mtime))
             # If pipeline-state.md has been "running" for more than 2 hours and no active job
             if [[ "$ps_age" -gt 7200 ]]; then
@@ -1098,7 +1104,7 @@ daemon_cleanup_stale() {
     fi
 
     # ── 7. Clean remote branches for merged pipeline/* branches ──
-    if command -v git &>/dev/null && [[ "${NO_GITHUB:-}" != "true" ]]; then
+    if command -v git >/dev/null 2>&1 && [[ "${NO_GITHUB:-}" != "true" ]]; then
         while IFS= read -r branch; do
             [[ -z "$branch" ]] && continue
             branch="${branch## }"
@@ -1138,6 +1144,12 @@ daemon_poll_loop() {
         daemon_reap_completed || daemon_log WARN "daemon_reap_completed failed — continuing"
         daemon_health_check || daemon_log WARN "daemon_health_check failed — continuing"
 
+        # Fleet failover: re-queue work from offline machines
+        if [[ -f "$HOME/.shipwright/machines.json" ]]; then
+            [[ -f "$SCRIPT_DIR/lib/fleet-failover.sh" ]] && source "$SCRIPT_DIR/lib/fleet-failover.sh" 2>/dev/null || true
+            fleet_failover_check 2>/dev/null || true
+        fi
+
         # Increment cycle counter (must be before all modulo checks)
         POLL_CYCLE_COUNT=$((POLL_CYCLE_COUNT + 1))