shipwright-cli 2.3.1 → 3.0.0

package/scripts/sw-feedback.sh

@@ -6,7 +6,7 @@
 set -euo pipefail
 trap 'echo "ERROR: $BASH_SOURCE:$LINENO exited with status $?" >&2' ERR
 
-VERSION="2.3.1"
+VERSION="3.0.0"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 REPO_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
 
@@ -34,16 +34,6 @@ if [[ "$(type -t emit_event 2>/dev/null)" != "function" ]]; then
     echo "${payload}}" >> "${HOME}/.shipwright/events.jsonl"
   }
 fi
-CYAN="${CYAN:-\033[38;2;0;212;255m}"
-PURPLE="${PURPLE:-\033[38;2;124;58;237m}"
-BLUE="${BLUE:-\033[38;2;0;102;255m}"
-GREEN="${GREEN:-\033[38;2;74;222;128m}"
-YELLOW="${YELLOW:-\033[38;2;250;204;21m}"
-RED="${RED:-\033[38;2;248;113;113m}"
-DIM="${DIM:-\033[2m}"
-BOLD="${BOLD:-\033[1m}"
-RESET="${RESET:-\033[0m}"
-
 # ─── Storage Paths ──────────────────────────────────────────────────────────
 INCIDENTS_FILE="${HOME}/.shipwright/incidents.jsonl"
 ERROR_THRESHOLD=5          # Create issue if error count >= threshold
@@ -262,7 +252,7 @@ git show $regression_commit
 EOF
     )
 
-    if ! command -v gh &>/dev/null; then
+    if ! command -v gh >/dev/null 2>&1; then
         error "gh CLI not found — cannot create issue"
         return 1
     fi
@@ -275,7 +265,7 @@ EOF
         --body "$issue_body" \
         --label "shipwright" \
         --label "hotfix" \
-        2>&1 | tail -1)
+        2>&1 | tail -1) || true
 
     if [[ -n "$issue_url" ]]; then
         success "Created issue: $issue_url"

package/scripts/sw-fix.sh

@@ -6,7 +6,7 @@
 set -euo pipefail
 trap 'echo "ERROR: $BASH_SOURCE:$LINENO exited with status $?" >&2' ERR
 
-VERSION="2.3.1"
+VERSION="3.0.0"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
 # ─── Cross-platform compatibility ──────────────────────────────────────────
@@ -25,24 +25,6 @@ if [[ "$(type -t now_iso 2>/dev/null)" != "function" ]]; then
   now_iso()   { date -u +"%Y-%m-%dT%H:%M:%SZ"; }
   now_epoch() { date +%s; }
 fi
-if [[ "$(type -t emit_event 2>/dev/null)" != "function" ]]; then
-  emit_event() {
-    local event_type="$1"; shift; mkdir -p "${HOME}/.shipwright"
-    local payload="{\"ts\":\"$(date -u +%Y-%m-%dT%H:%M:%SZ)\",\"type\":\"$event_type\""
-    while [[ $# -gt 0 ]]; do local key="${1%%=*}" val="${1#*=}"; payload="${payload},\"${key}\":\"${val}\""; shift; done
-    echo "${payload}}" >> "${HOME}/.shipwright/events.jsonl"
-  }
-fi
-CYAN="${CYAN:-\033[38;2;0;212;255m}"
-PURPLE="${PURPLE:-\033[38;2;124;58;237m}"
-BLUE="${BLUE:-\033[38;2;0;102;255m}"
-GREEN="${GREEN:-\033[38;2;74;222;128m}"
-YELLOW="${YELLOW:-\033[38;2;250;204;21m}"
-RED="${RED:-\033[38;2;248;113;113m}"
-DIM="${DIM:-\033[2m}"
-BOLD="${BOLD:-\033[1m}"
-RESET="${RESET:-\033[0m}"
-
 format_duration() {
     local secs="$1"
     if [[ "$secs" -ge 3600 ]]; then
@@ -341,7 +323,7 @@ fix_start() {
 
         # Spawn pipeline in subshell
         (
-            cd "$expanded"
+            cd "$expanded" || exit 1
 
             # Determine base branch
             local base

package/scripts/sw-fleet-discover.sh

@@ -6,7 +6,7 @@
 set -euo pipefail
 trap 'echo "ERROR: $BASH_SOURCE:$LINENO exited with status $?" >&2' ERR
 
-VERSION="2.3.1"
+VERSION="3.0.0"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 REPO_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
 
@@ -34,16 +34,6 @@ if [[ "$(type -t emit_event 2>/dev/null)" != "function" ]]; then
     echo "${payload}}" >> "${HOME}/.shipwright/events.jsonl"
   }
 fi
-CYAN="${CYAN:-\033[38;2;0;212;255m}"
-PURPLE="${PURPLE:-\033[38;2;124;58;237m}"
-BLUE="${BLUE:-\033[38;2;0;102;255m}"
-GREEN="${GREEN:-\033[38;2;74;222;128m}"
-YELLOW="${YELLOW:-\033[38;2;250;204;21m}"
-RED="${RED:-\033[38;2;248;113;113m}"
-DIM="${DIM:-\033[2m}"
-BOLD="${BOLD:-\033[1m}"
-RESET="${RESET:-\033[0m}"
-
 # ─── Help ───────────────────────────────────────────────────────────────────
 
 show_help() {

package/scripts/sw-fleet-viz.sh

@@ -6,7 +6,7 @@
 set -euo pipefail
 trap 'echo "ERROR: $BASH_SOURCE:$LINENO exited with status $?" >&2' ERR
 
-VERSION="2.3.1"
+VERSION="3.0.0"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 REPO_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
 
@@ -19,6 +19,8 @@ REPO_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
 [[ -f "$SCRIPT_DIR/lib/helpers.sh" ]] && source "$SCRIPT_DIR/lib/helpers.sh"
 # Fallbacks when helpers not loaded (e.g. test env with overridden SCRIPT_DIR)
 [[ "$(type -t info 2>/dev/null)" == "function" ]]    || info()    { echo -e "\033[38;2;0;212;255m\033[1m▸\033[0m $*"; }
+# Color fallbacks when helpers not loaded
+: "${CYAN:=}" "${BOLD:=}" "${RESET:=}" "${DIM:=}" "${GREEN:=}" "${RED:=}" "${YELLOW:=}" "${PURPLE:=}" "${WHITE:=}" "${BLUE:=}"
 [[ "$(type -t success 2>/dev/null)" == "function" ]] || success() { echo -e "\033[38;2;74;222;128m\033[1m✓\033[0m $*"; }
 [[ "$(type -t warn 2>/dev/null)" == "function" ]]    || warn()    { echo -e "\033[38;2;250;204;21m\033[1m⚠\033[0m $*"; }
 [[ "$(type -t error 2>/dev/null)" == "function" ]]   || error()   { echo -e "\033[38;2;248;113;113m\033[1m✗\033[0m $*" >&2; }
@@ -34,16 +36,6 @@ if [[ "$(type -t emit_event 2>/dev/null)" != "function" ]]; then
     echo "${payload}}" >> "${HOME}/.shipwright/events.jsonl"
   }
 fi
-CYAN="${CYAN:-\033[38;2;0;212;255m}"
-PURPLE="${PURPLE:-\033[38;2;124;58;237m}"
-BLUE="${BLUE:-\033[38;2;0;102;255m}"
-GREEN="${GREEN:-\033[38;2;74;222;128m}"
-YELLOW="${YELLOW:-\033[38;2;250;204;21m}"
-RED="${RED:-\033[38;2;248;113;113m}"
-DIM="${DIM:-\033[2m}"
-BOLD="${BOLD:-\033[1m}"
-RESET="${RESET:-\033[0m}"
-
 format_duration() {
     local secs="$1"
     if [[ "$secs" -ge 3600 ]]; then
@@ -70,7 +62,7 @@ get_health_status() {
     # degraded (yellow) = some failures but recovering
     # failing (red) = persistent failures
 
-    if ! command -v jq &>/dev/null; then
+    if ! command -v jq >/dev/null 2>&1; then
         echo "unknown"
         return
     fi
@@ -98,7 +90,7 @@ color_health() {
 
 # ─── Overview Subcommand ───────────────────────────────────────────────────
 show_overview() {
-    if ! command -v jq &>/dev/null; then
+    if ! command -v jq >/dev/null 2>&1; then
         error "jq is required for fleet visualization"
         exit 1
     fi
@@ -144,7 +136,7 @@ show_overview() {
 
 # ─── Workers Subcommand ────────────────────────────────────────────────────
 show_workers() {
-    if ! command -v jq &>/dev/null; then
+    if ! command -v jq >/dev/null 2>&1; then
         error "jq is required for fleet visualization"
         exit 1
     fi
@@ -197,7 +189,7 @@ show_workers() {
 
 # ─── Insights Subcommand ───────────────────────────────────────────────────
 show_insights() {
-    if ! command -v jq &>/dev/null; then
+    if ! command -v jq >/dev/null 2>&1; then
         error "jq is required for fleet visualization"
         exit 1
     fi
@@ -238,7 +230,7 @@ show_insights() {
 
 # ─── Queue Subcommand ──────────────────────────────────────────────────────
 show_queue() {
-    if ! command -v jq &>/dev/null; then
+    if ! command -v jq >/dev/null 2>&1; then
         error "jq is required for fleet visualization"
         exit 1
     fi
@@ -281,7 +273,7 @@ show_queue() {
 
 # ─── Costs Subcommand ──────────────────────────────────────────────────────
 show_costs() {
-    if ! command -v jq &>/dev/null; then
+    if ! command -v jq >/dev/null 2>&1; then
         error "jq is required for fleet visualization"
         exit 1
     fi
@@ -323,7 +315,7 @@ show_costs() {
 
 # ─── Export Subcommand ─────────────────────────────────────────────────────
 show_export() {
-    if ! command -v jq &>/dev/null; then
+    if ! command -v jq >/dev/null 2>&1; then
         error "jq is required for fleet visualization"
         exit 1
     fi

package/scripts/sw-fleet.sh

@@ -6,7 +6,7 @@
 set -euo pipefail
 trap 'echo "ERROR: $BASH_SOURCE:$LINENO exited with status $?" >&2' ERR
 
-VERSION="2.3.1"
+VERSION="3.0.0"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 REPO_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
 
@@ -34,16 +34,6 @@ if [[ "$(type -t emit_event 2>/dev/null)" != "function" ]]; then
     echo "${payload}}" >> "${HOME}/.shipwright/events.jsonl"
   }
 fi
-CYAN="${CYAN:-\033[38;2;0;212;255m}"
-PURPLE="${PURPLE:-\033[38;2;124;58;237m}"
-BLUE="${BLUE:-\033[38;2;0;102;255m}"
-GREEN="${GREEN:-\033[38;2;74;222;128m}"
-YELLOW="${YELLOW:-\033[38;2;250;204;21m}"
-RED="${RED:-\033[38;2;248;113;113m}"
-DIM="${DIM:-\033[2m}"
-BOLD="${BOLD:-\033[1m}"
-RESET="${RESET:-\033[0m}"
-
 epoch_to_iso() {
     local epoch="$1"
     date -u -r "$epoch" +"%Y-%m-%dT%H:%M:%SZ" 2>/dev/null || \
@@ -200,7 +190,7 @@ _fleet_repo_priority() {
     local repo_path="$1"
     local priority=50  # default neutral priority
 
-    type _gh_detect_repo &>/dev/null 2>&1 || { echo "$priority"; return 0; }
+    type _gh_detect_repo >/dev/null 2>&1 || { echo "$priority"; return 0; }
 
     # Detect repo from the repo path (run in subshell to avoid cd side-effects)
     local gh_priority
@@ -213,7 +203,7 @@ _fleet_repo_priority() {
         local p=50
 
         # Factor: security alerts (urgent work)
-        if type gh_security_alerts &>/dev/null 2>&1; then
+        if type gh_security_alerts >/dev/null 2>&1; then
             local alerts
             alerts=$(gh_security_alerts "$owner" "$repo" 2>/dev/null | jq 'length' 2>/dev/null || echo "0")
             if [[ "${alerts:-0}" -gt 5 ]]; then
@@ -224,7 +214,7 @@ _fleet_repo_priority() {
         fi
 
         # Factor: contributor count (more contributors = more active = higher priority)
-        if type gh_contributors &>/dev/null 2>&1; then
+        if type gh_contributors >/dev/null 2>&1; then
             local contribs
             contribs=$(gh_contributors "$owner" "$repo" 2>/dev/null | jq 'length' 2>/dev/null || echo "0")
             if [[ "${contribs:-0}" -gt 10 ]]; then
@@ -643,6 +633,12 @@ check_machine_health() {
             emit_event "fleet.machine_offline" "machine=$name" "host=$host"
         fi
     done
+
+    # After health checks: trigger failover to re-queue work from offline machines
+    if [[ -f "$SCRIPT_DIR/lib/fleet-failover.sh" ]]; then
+        source "$SCRIPT_DIR/lib/fleet-failover.sh" 2>/dev/null || true
+        fleet_failover_check 2>/dev/null || true
+    fi
 }
 
 # ─── Cross-Machine Event Aggregation ───────────────────────────────────
@@ -749,12 +745,12 @@ fleet_start() {
     echo -e "${PURPLE}${BOLD}━━━ shipwright fleet v${VERSION} — start ━━━${RESET}"
     echo ""
 
-    if ! command -v tmux &>/dev/null; then
+    if ! command -v tmux >/dev/null 2>&1; then
         error "tmux is required for fleet mode"
         exit 1
     fi
 
-    if ! command -v jq &>/dev/null; then
+    if ! command -v jq >/dev/null 2>&1; then
         error "jq is required. Install: brew install jq"
         exit 1
     fi
@@ -1146,7 +1142,7 @@ fleet_metrics() {
         exit 1
     fi
 
-    if ! command -v jq &>/dev/null; then
+    if ! command -v jq >/dev/null 2>&1; then
         error "jq is required. Install: brew install jq"
         exit 1
     fi

package/scripts/sw-github-app.sh

@@ -6,7 +6,7 @@
 set -euo pipefail
 trap 'echo "ERROR: $BASH_SOURCE:$LINENO exited with status $?" >&2' ERR
 
-VERSION="2.3.1"
+VERSION="3.0.0"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 REPO_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
 
@@ -34,16 +34,6 @@ if [[ "$(type -t emit_event 2>/dev/null)" != "function" ]]; then
     echo "${payload}}" >> "${HOME}/.shipwright/events.jsonl"
   }
 fi
-CYAN="${CYAN:-\033[38;2;0;212;255m}"
-PURPLE="${PURPLE:-\033[38;2;124;58;237m}"
-BLUE="${BLUE:-\033[38;2;0;102;255m}"
-GREEN="${GREEN:-\033[38;2;74;222;128m}"
-YELLOW="${YELLOW:-\033[38;2;250;204;21m}"
-RED="${RED:-\033[38;2;248;113;113m}"
-DIM="${DIM:-\033[2m}"
-BOLD="${BOLD:-\033[1m}"
-RESET="${RESET:-\033[0m}"
-
 # ─── Config File Locations ────────────────────────────────────────────────
 CONFIG_DIR="${HOME}/.shipwright"
 CONFIG_FILE="${CONFIG_DIR}/github-app.json"
@@ -76,16 +66,16 @@ cmd_setup() {
     info "GitHub App Configuration"
     echo ""
 
-    read -p "App ID: " app_id
-    read -p "Private key file path: " key_path
+    read -rp "App ID: " app_id
+    read -rp "Private key file path: " key_path
 
     if [[ ! -f "$key_path" ]]; then
         error "Private key file not found: $key_path"
         return 1
     fi
 
-    read -p "Installation ID: " installation_id
-    read -p "Webhook secret (optional, press Enter to skip): " webhook_secret
+    read -rp "Installation ID: " installation_id
+    read -rp "Webhook secret (optional, press Enter to skip): " webhook_secret
 
     # Create config atomically
     local tmp_config
@@ -171,7 +161,7 @@ _get_installation_token() {
     fi
 
     local response
-    response=$(curl -s -H "Authorization: Bearer $jwt" \
+    response=$(curl -s --connect-timeout 10 --max-time 30 -H "Authorization: Bearer $jwt" \
         -H "Accept: application/vnd.github+json" \
         "https://api.github.com/app/installations/${installation_id}/access_tokens" \
         -d '{}' -X POST 2>/dev/null) || true

package/scripts/sw-github-checks.sh

@@ -6,7 +6,7 @@
 set -euo pipefail
 trap 'echo "ERROR: $BASH_SOURCE:$LINENO exited with status $?" >&2' ERR
 
-VERSION="2.3.1"
+VERSION="3.0.0"
 SCRIPT_DIR="${SCRIPT_DIR:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}"
 REPO_DIR="${REPO_DIR:-$(cd "$SCRIPT_DIR/.." && pwd)}"
 
@@ -34,16 +34,6 @@ if [[ "$(type -t emit_event 2>/dev/null)" != "function" ]]; then
     echo "${payload}}" >> "${HOME}/.shipwright/events.jsonl"
   }
 fi
-CYAN="${CYAN:-\033[38;2;0;212;255m}"
-PURPLE="${PURPLE:-\033[38;2;124;58;237m}"
-BLUE="${BLUE:-\033[38;2;0;102;255m}"
-GREEN="${GREEN:-\033[38;2;74;222;128m}"
-YELLOW="${YELLOW:-\033[38;2;250;204;21m}"
-RED="${RED:-\033[38;2;248;113;113m}"
-DIM="${DIM:-\033[2m}"
-BOLD="${BOLD:-\033[1m}"
-RESET="${RESET:-\033[0m}"
-
 # ─── Artifacts Directory ─────────────────────────────────────────────────────
 ARTIFACTS_DIR="${REPO_DIR}/.claude/pipeline-artifacts"
 

package/scripts/sw-github-deploy.sh

@@ -6,7 +6,7 @@
 set -euo pipefail
 trap 'echo "ERROR: $BASH_SOURCE:$LINENO exited with status $?" >&2' ERR
 
-VERSION="2.3.1"
+VERSION="3.0.0"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 REPO_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
 
@@ -34,16 +34,6 @@ if [[ "$(type -t emit_event 2>/dev/null)" != "function" ]]; then
     echo "${payload}}" >> "${HOME}/.shipwright/events.jsonl"
   }
 fi
-CYAN="${CYAN:-\033[38;2;0;212;255m}"
-PURPLE="${PURPLE:-\033[38;2;124;58;237m}"
-BLUE="${BLUE:-\033[38;2;0;102;255m}"
-GREEN="${GREEN:-\033[38;2;74;222;128m}"
-YELLOW="${YELLOW:-\033[38;2;250;204;21m}"
-RED="${RED:-\033[38;2;248;113;113m}"
-DIM="${DIM:-\033[2m}"
-BOLD="${BOLD:-\033[1m}"
-RESET="${RESET:-\033[0m}"
-
 # ─── Artifacts Directory ─────────────────────────────────────────────────────
 ARTIFACTS_DIR="${REPO_DIR}/.claude/pipeline-artifacts"
 

package/scripts/sw-github-graphql.sh

@@ -6,7 +6,7 @@
 set -euo pipefail
 trap 'echo "ERROR: $BASH_SOURCE:$LINENO exited with status $?" >&2' ERR
 
-VERSION="2.3.1"
+VERSION="3.0.0"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 REPO_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
 
@@ -34,16 +34,6 @@ if [[ "$(type -t emit_event 2>/dev/null)" != "function" ]]; then
     echo "${payload}}" >> "${HOME}/.shipwright/events.jsonl"
   }
 fi
-CYAN="${CYAN:-\033[38;2;0;212;255m}"
-PURPLE="${PURPLE:-\033[38;2;124;58;237m}"
-BLUE="${BLUE:-\033[38;2;0;102;255m}"
-GREEN="${GREEN:-\033[38;2;74;222;128m}"
-YELLOW="${YELLOW:-\033[38;2;250;204;21m}"
-RED="${RED:-\033[38;2;248;113;113m}"
-DIM="${DIM:-\033[2m}"
-BOLD="${BOLD:-\033[1m}"
-RESET="${RESET:-\033[0m}"
-
 # ─── Structured Event Log ──────────────────────────────────────────────────
 EVENTS_FILE="${HOME}/.shipwright/events.jsonl"
 
@@ -87,7 +77,7 @@ _gh_cache_get() {
     # Check file age
     local file_epoch now
     if [[ "$(uname)" == "Darwin" ]]; then
-        file_epoch=$(stat -f '%m' "$cache_file" 2>/dev/null || echo "0")
+        file_epoch=$(file_mtime "$cache_file")
     else
         file_epoch=$(stat -c '%Y' "$cache_file" 2>/dev/null || echo "0")
     fi

package/scripts/sw-guild.sh

@@ -6,7 +6,7 @@
 set -euo pipefail
 trap 'echo "ERROR: $BASH_SOURCE:$LINENO exited with status $?" >&2' ERR
 
-VERSION="2.3.1"
+VERSION="3.0.0"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
 # ─── Cross-platform compatibility ──────────────────────────────────────────
@@ -33,16 +33,6 @@ if [[ "$(type -t emit_event 2>/dev/null)" != "function" ]]; then
     echo "${payload}}" >> "${HOME}/.shipwright/events.jsonl"
   }
 fi
-CYAN="${CYAN:-\033[38;2;0;212;255m}"
-PURPLE="${PURPLE:-\033[38;2;124;58;237m}"
-BLUE="${BLUE:-\033[38;2;0;102;255m}"
-GREEN="${GREEN:-\033[38;2;74;222;128m}"
-YELLOW="${YELLOW:-\033[38;2;250;204;21m}"
-RED="${RED:-\033[38;2;248;113;113m}"
-DIM="${DIM:-\033[2m}"
-BOLD="${BOLD:-\033[1m}"
-RESET="${RESET:-\033[0m}"
-
 # ─── Guild Storage Paths ───────────────────────────────────────────────────
 GUILD_ROOT="${HOME}/.shipwright/guilds"
 GUILD_CONFIG="${GUILD_ROOT}/config.json"

package/scripts/sw-heartbeat.sh

@@ -6,7 +6,7 @@
 set -euo pipefail
 trap 'echo "ERROR: $BASH_SOURCE:$LINENO exited with status $?" >&2' ERR
 
-VERSION="2.3.1"
+VERSION="3.0.0"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
 # ─── Cross-platform compatibility ──────────────────────────────────────────
@@ -16,6 +16,10 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 # Canonical helpers (colors, output, events)
 # shellcheck source=lib/helpers.sh
 [[ -f "$SCRIPT_DIR/lib/helpers.sh" ]] && source "$SCRIPT_DIR/lib/helpers.sh"
+
+# SQLite persistence (DB as primary read path)
+# shellcheck source=sw-db.sh
+[[ -f "$SCRIPT_DIR/sw-db.sh" ]] && source "$SCRIPT_DIR/sw-db.sh"
 # Fallbacks when helpers not loaded (e.g. test env with overridden SCRIPT_DIR)
 [[ "$(type -t info 2>/dev/null)" == "function" ]]    || info()    { echo -e "\033[38;2;0;212;255m\033[1m▸\033[0m $*"; }
 [[ "$(type -t success 2>/dev/null)" == "function" ]] || success() { echo -e "\033[38;2;74;222;128m\033[1m✓\033[0m $*"; }
@@ -33,16 +37,6 @@ if [[ "$(type -t emit_event 2>/dev/null)" != "function" ]]; then
     echo "${payload}}" >> "${HOME}/.shipwright/events.jsonl"
   }
 fi
-CYAN="${CYAN:-\033[38;2;0;212;255m}"
-PURPLE="${PURPLE:-\033[38;2;124;58;237m}"
-BLUE="${BLUE:-\033[38;2;0;102;255m}"
-GREEN="${GREEN:-\033[38;2;74;222;128m}"
-YELLOW="${YELLOW:-\033[38;2;250;204;21m}"
-RED="${RED:-\033[38;2;248;113;113m}"
-DIM="${DIM:-\033[2m}"
-BOLD="${BOLD:-\033[1m}"
-RESET="${RESET:-\033[0m}"
-
 # ─── Constants ──────────────────────────────────────────────────────────────
 HEARTBEAT_DIR="$HOME/.shipwright/heartbeats"
 
@@ -167,6 +161,11 @@ cmd_write() {
 
     # Atomic write
     mv "$tmp_file" "${HEARTBEAT_DIR}/${job_id}.json"
+
+    # Dual-write to DB when available
+    if type db_record_heartbeat >/dev/null 2>&1 && db_available 2>/dev/null; then
+        db_record_heartbeat "$job_id" "$pid" "${issue:-0}" "$stage" "${iteration:-0}" "$activity" "$memory_mb" 2>/dev/null || true
+    fi
 }
 
 # ─── Check Heartbeat ───────────────────────────────────────────────────────
@@ -190,6 +189,30 @@ cmd_check() {
         esac
     done
 
+    # Try DB first when available
+    if type db_list_heartbeats >/dev/null 2>&1 && db_available 2>/dev/null; then
+        local hb_json
+        hb_json=$(db_list_heartbeats 2>/dev/null | jq -r --arg id "$job_id" '.[] | select(.job_id == $id) | .updated_at' 2>/dev/null || true)
+        if [[ -n "$hb_json" ]]; then
+            local updated_at="$hb_json"
+            local hb_epoch now_epoch age_secs
+            if TZ=UTC date -j -f "%Y-%m-%dT%H:%M:%SZ" "$updated_at" +%s >/dev/null 2>&1; then
+                hb_epoch="$(TZ=UTC date -j -f "%Y-%m-%dT%H:%M:%SZ" "$updated_at" +%s 2>/dev/null)"
+            else
+                hb_epoch="$(date -d "$updated_at" +%s 2>/dev/null || echo 0)"
+            fi
+            now_epoch="$(date +%s)"
+            age_secs=$((now_epoch - hb_epoch))
+            if [[ "$age_secs" -le "$timeout" ]]; then
+                success "Job ${job_id} alive (${age_secs}s ago)"
+                return 0
+            else
+                warn "Job ${job_id} stale (${age_secs}s ago, timeout: ${timeout}s)"
+                return 1
+            fi
+        fi
+    fi
+
     local hb_file="${HEARTBEAT_DIR}/${job_id}.json"
 
     if [[ ! -f "$hb_file" ]]; then
@@ -209,7 +232,7 @@ cmd_check() {
     local hb_epoch now_epoch age_secs
 
     # macOS date -j -f vs GNU date -d (TZ=UTC since timestamps are UTC)
-    if TZ=UTC date -j -f "%Y-%m-%dT%H:%M:%SZ" "$updated_at" +%s &>/dev/null; then
+    if TZ=UTC date -j -f "%Y-%m-%dT%H:%M:%SZ" "$updated_at" +%s >/dev/null 2>&1; then
         hb_epoch="$(TZ=UTC date -j -f "%Y-%m-%dT%H:%M:%SZ" "$updated_at" +%s 2>/dev/null)"
     else
         hb_epoch="$(date -d "$updated_at" +%s 2>/dev/null || echo 0)"
@@ -231,6 +254,16 @@ cmd_check() {
 cmd_list() {
     ensure_dir
 
+    # Try DB first when available
+    if type db_list_heartbeats >/dev/null 2>&1 && db_available 2>/dev/null; then
+        local db_result
+        db_result=$(db_list_heartbeats 2>/dev/null || echo "[]")
+        if [[ -n "$db_result" ]] && echo "$db_result" | jq -e 'length > 0' >/dev/null 2>&1; then
+            echo "$db_result" | jq -c '[.[] | . + {cpu_pct: 0}]' 2>/dev/null || echo "[]"
+            return 0
+        fi
+    fi
+
     local result="["
     local first=true
 
@@ -272,6 +305,10 @@ cmd_clear() {
 
     local hb_file="${HEARTBEAT_DIR}/${job_id}.json"
 
+    if type db_clear_heartbeat >/dev/null 2>&1 && db_available 2>/dev/null; then
+        db_clear_heartbeat "$job_id" 2>/dev/null || true
+    fi
+
     if [[ -f "$hb_file" ]]; then
         rm -f "$hb_file"
         success "Cleared heartbeat for job: ${job_id}"