shipwright-cli 2.4.0 → 3.0.0

package/scripts/sw-autonomous.sh

@@ -7,7 +7,7 @@
 set -euo pipefail
 trap 'echo "ERROR: $BASH_SOURCE:$LINENO exited with status $?" >&2' ERR
 
-VERSION="2.4.0"
+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}"
-
 format_duration() {
     local secs="$1"
     if [[ "$secs" -ge 3600 ]]; then
@@ -266,7 +256,7 @@ ingest_strategic_findings() {
         complexity=$(echo "$line" | jq -r '.complexity // "standard"' 2>/dev/null) || true
 
         local issue_num=""
-        if [[ "${NO_GITHUB:-false}" != "true" ]] && command -v gh &>/dev/null; then
+        if [[ "${NO_GITHUB:-false}" != "true" ]] && command -v gh >/dev/null 2>&1; then
             issue_num=$(gh issue list --state open --search "$title" --json number -q '.[0].number' 2>/dev/null || echo "")
         fi
 
@@ -285,6 +275,100 @@ ingest_strategic_findings() {
     echo "$findings"
 }
 
+# ─── Codebase Analysis (Claude fallback) ────────────────────────────────────
+# When Claude is unavailable, scan the codebase for real findings.
+# Outputs pipe-delimited lines: title|type|complexity (converted to JSON by caller).
+autonomous_heuristic_analysis() {
+    local findings=()
+    local repo_root
+    repo_root=$(git rev-parse --show-toplevel 2>/dev/null || echo ".")
+
+    # 1. Find scripts with no test files
+    local untested_scripts=0
+    for script in "$repo_root"/scripts/sw-*.sh; do
+        [[ -e "$script" ]] || continue
+        [[ "$script" == *-test.sh ]] && continue
+        local base
+        base=$(basename "$script" .sh)
+        if [[ ! -f "$repo_root/scripts/${base}-test.sh" ]]; then
+            untested_scripts=$((untested_scripts + 1))
+            if [[ "$untested_scripts" -le 2 ]]; then
+                findings+=("Add test coverage for ${base}.sh|testing|5")
+            fi
+        fi
+    done
+
+    # 2. Find large files that could be refactored
+    while IFS= read -r line; do
+        [[ -z "$line" ]] && continue
+        local lcount file
+        lcount=$(echo "$line" | awk '{print $1}')
+        file=$(echo "$line" | awk '{$1=""; print substr($0,2)}')
+        if [[ "$lcount" =~ ^[0-9]+$ ]] && [[ "$lcount" -gt 1500 ]]; then
+            local base
+            base=$(basename "$file")
+            findings+=("Refactor ${base} (${lcount} lines) into smaller modules|refactor|7")
+        fi
+    done < <(find "$repo_root/scripts" -name "*.sh" -not -name "*-test.sh" -exec wc -l {} \; 2>/dev/null | sort -rn | head -5)
+
+    # 3. Check for shellcheck warnings
+    if command -v shellcheck &>/dev/null; then
+        local sc_warnings
+        sc_warnings=$(shellcheck -S warning "$repo_root"/scripts/sw-*.sh 2>/dev/null | grep -c "^In " || true)
+        if [[ "${sc_warnings:-0}" -gt 10 ]]; then
+            findings+=("Fix ${sc_warnings} shellcheck warnings across scripts|quality|4")
+        fi
+    fi
+
+    # 4. Check for TODO/FIXME in production code
+    local todo_count
+    todo_count=$(find "$repo_root/scripts" -name "sw-*.sh" ! -name "*-test.sh" -exec grep -oh 'TODO\|FIXME\|HACK\|XXX' {} \; 2>/dev/null | wc -l | tr -d ' ')
+    if [[ "${todo_count:-0}" -gt 5 ]]; then
+        findings+=("Address ${todo_count} TODO/FIXME items in production scripts|quality|3")
+    fi
+
+    # 5. Check recent failures from events
+    local events_file="$HOME/.shipwright/events.jsonl"
+    if [[ -f "$events_file" ]]; then
+        local recent_failures
+        recent_failures=$(tail -200 "$events_file" 2>/dev/null | grep '"result":"failure"' | wc -l | tr -d ' ')
+        if [[ "${recent_failures:-0}" -gt 3 ]]; then
+            local common_stage
+            common_stage=$(tail -200 "$events_file" 2>/dev/null | grep '"result":"failure"' | grep -oE '"stage":"[^"]*"' | sort | uniq -c | sort -rn | head -1 | sed 's/.*"stage":"\([^"]*\)".*/\1/' || true)
+            findings+=("Investigate ${recent_failures} recent pipeline failures${common_stage:+ (common: ${common_stage})}|bug|6")
+        fi
+    fi
+
+    # Output findings (at most 5) — pipe-delimited: title|type|complexity
+    local count=0
+    for f in "${findings[@]}"; do
+        [[ "$count" -ge 5 ]] && break
+        echo "$f"
+        count=$((count + 1))
+    done
+}
+
+# Convert pipe-delimited heuristic output (title|type|complexity) to JSON array.
+autonomous_heuristic_to_json() {
+    local json="[]"
+    while IFS= read -r line; do
+        [[ -z "$line" ]] || [[ "$line" != *"|"* ]] && continue
+        local title type complexity
+        title="${line%%|*}"
+        line="${line#*|}"
+        type="${line%%|*}"
+        complexity="${line##*|}"
+        local effort="M"
+        [[ "$complexity" =~ ^[0-9]+$ ]] && {
+            [[ "$complexity" -le 4 ]] && effort="S"
+            [[ "$complexity" -ge 7 ]] && effort="L"
+        }
+        json=$(echo "$json" | jq -c --arg t "$title" --arg c "$type" --arg e "$effort" \
+            '. + [{title: $t, description: $t, priority: "medium", effort: $e, labels: [$c], category: $c}]' 2>/dev/null || echo "$json")
+    done
+    echo "$json"
+}
+
 # ─── Analysis Cycle ────────────────────────────────────────────────────────
 
 run_analysis_cycle() {
@@ -297,7 +381,7 @@ run_analysis_cycle() {
     findings=$(mktemp "${TMPDIR:-/tmp}/sw-autonomous-findings.XXXXXX")
 
     # Use Claude to analyze the codebase
-    if command -v claude &>/dev/null; then
+    if command -v claude >/dev/null 2>&1; then
         info "Running codebase analysis with Claude..."
 
         claude -p 'You are Shipwright'"'"'s autonomous PM. Analyze this repository for:
@@ -313,35 +397,13 @@ For each finding, output JSON with fields: title, description, priority (critica
 Output ONLY a JSON array, no other text.' --max-turns 3 > "$findings" 2>/dev/null || true
 
     else
-        warn "Claude CLI not available, using static heuristics..."
-
-        # Static heuristics for analysis
-        {
-            local has_tests=$(find . -type f -name "*test*" -o -name "*spec*" | wc -l || echo "0")
-            local shell_scripts=$(find scripts -type f -name "*.sh" | wc -l || echo "0")
-
-            jq -n \
-                --argjson test_count "$has_tests" \
-                --argjson script_count "$shell_scripts" \
-                '[
-                    {
-                        title: "Add comprehensive test coverage for critical paths",
-                        description: "Several scripts lack unit test coverage",
-                        priority: "high",
-                        effort: "L",
-                        labels: ["test", "quality"],
-                        category: "test"
-                    },
-                    {
-                        title: "Simplify error handling in daemon.sh",
-                        description: "Daemon error handling could be more robust",
-                        priority: "medium",
-                        effort: "M",
-                        labels: ["refactor", "self-improvement"],
-                        category: "self-improvement"
-                    }
-                ]'
-        } > "$findings"
+        warn "Claude CLI not available, using codebase-aware analysis..."
+
+        autonomous_heuristic_analysis | autonomous_heuristic_to_json > "$findings"
+        if [[ ! -s "$findings" ]] || [[ "$(cat "$findings")" == "[]" ]]; then
+            # No findings from heuristic analysis
+            echo "[]" > "$findings"
+        fi
     fi
 
     # Ingest strategic findings and merge with Claude/heuristic findings
@@ -354,10 +416,10 @@ Output ONLY a JSON array, no other text.' --max-turns 3 > "$findings" 2>/dev/nul
     local claude_array
     claude_array=$(jq -c '.' "$findings" 2>/dev/null || echo "[]")
     # Extract JSON array from potential markdown-wrapped output
-    if ! echo "$claude_array" | jq -e 'type == "array"' &>/dev/null; then
+    if ! echo "$claude_array" | jq -e 'type == "array"' >/dev/null 2>&1; then
         claude_array=$(sed -n '/^\[/,/^\]/p' "$findings" 2>/dev/null | jq -c '.' 2>/dev/null || echo "[]")
     fi
-    if ! echo "$claude_array" | jq -e 'type == "array"' &>/dev/null; then
+    if ! echo "$claude_array" | jq -e 'type == "array"' >/dev/null 2>&1; then
         claude_array="[]"
     fi
 
@@ -485,13 +547,13 @@ trigger_pipeline_for_finding() {
     fi
 
     if [[ "$daemon_aware" == "true" ]] && daemon_is_running; then
-        # Daemon running: label ready-to-build and let daemon pick it up
+        # Daemon running: add shipwright (daemon watch label) + ready-to-build (status), let daemon pick it up
         if [[ "$NO_GITHUB" != "true" ]]; then
-            gh issue edit "$issue_num" --add-label "ready-to-build" 2>/dev/null || {
-                warn "Failed to add ready-to-build label to #${issue_num}"
+            gh issue edit "$issue_num" --add-label "shipwright" --add-label "ready-to-build" 2>/dev/null || {
+                warn "Failed to add shipwright/ready-to-build labels to #${issue_num}"
             }
         fi
-        info "Delegated issue #${issue_num} to daemon (labeled ready-to-build)"
+        info "Delegated issue #${issue_num} to daemon (labeled shipwright, ready-to-build)"
         emit_event "autonomous.delegated_to_daemon" "issue=$issue_num" "title=$title"
         return 0
     fi
@@ -597,7 +659,7 @@ process_findings() {
 
         # Strategic findings: issue already created by strategic agent; trigger pipeline and register, skip create
         if [[ "$source" == "strategic" ]]; then
-            [[ -z "$issue_num" && "${NO_GITHUB:-false}" != "true" ]] && command -v gh &>/dev/null && \
+            [[ -z "$issue_num" && "${NO_GITHUB:-false}" != "true" ]] && command -v gh >/dev/null 2>&1 && \
                 issue_num=$(gh issue list --state open --search "$title" --json number -q '.[0].number' 2>/dev/null || echo "")
             if [[ -n "$issue_num" && "$issue_num" =~ ^[0-9]+$ ]]; then
                 trigger_pipeline_for_finding "$issue_num" "$title"

package/scripts/sw-changelog.sh

@@ -7,7 +7,7 @@
 set -euo pipefail
 trap 'echo "ERROR: $BASH_SOURCE:$LINENO exited with status $?" >&2' ERR
 
-VERSION="2.4.0"
+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}"
-
 # ─── Commit Parsing ──────────────────────────────────────────────────────────
 
 # Extract conventional commit type (feat, fix, perf, security, etc.)

package/scripts/sw-checkpoint.sh

@@ -8,8 +8,8 @@
 set -euo pipefail
 trap 'echo "ERROR: $BASH_SOURCE:$LINENO exited with status $?" >&2' ERR
 
-VERSION="2.4.0"
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+VERSION="3.0.0"
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]:-$0}")" && pwd)"
 
 # ─── Cross-platform compatibility ──────────────────────────────────────────
 # shellcheck source=lib/compat.sh
@@ -35,15 +35,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}"
 
 # ─── Checkpoint Directory ───────────────────────────────────────────────────
 CHECKPOINT_DIR=".claude/pipeline-artifacts/checkpoints"
@@ -57,6 +48,102 @@ checkpoint_file() {
     echo "${CHECKPOINT_DIR}/${stage}-checkpoint.json"
 }
 
+# Context file for Claude prompt reconstruction on resume
+claude_context_file() {
+    local stage="$1"
+    echo "${CHECKPOINT_DIR}/${stage}-claude-context.json"
+}
+
+# ─── Save/Restore Claude Context (for meaningful resume) ────────────────────────
+# Captures goal, findings, modified files, test output so resume can reconstruct prompt.
+checkpoint_save_context() {
+    local stage="${1:-build}"
+    local context_file
+    context_file="$(claude_context_file "$stage")"
+    ensure_checkpoint_dir
+
+    local context="{}"
+
+    # Save current goal (from env or file)
+    local goal_content=""
+    if [[ -n "${SW_LOOP_GOAL:-}" ]]; then
+        goal_content="${SW_LOOP_GOAL}"
+    elif [[ -n "${SW_LOOP_GOAL_FILE:-}" && -f "${SW_LOOP_GOAL_FILE:-}" ]]; then
+        goal_content="$(cat "${SW_LOOP_GOAL_FILE}" 2>/dev/null || true)"
+    fi
+    if [[ -n "$goal_content" ]]; then
+        context=$(printf '%s' "$context" | jq --arg g "$goal_content" '.goal = $g' 2>/dev/null || echo "$context")
+    fi
+
+    # Save accumulated findings
+    local findings_content=""
+    if [[ -n "${SW_LOOP_FINDINGS:-}" ]]; then
+        findings_content="${SW_LOOP_FINDINGS}"
+    elif [[ -n "${SW_LOOP_FINDINGS_FILE:-}" && -f "${SW_LOOP_FINDINGS_FILE:-}" ]]; then
+        findings_content="$(cat "${SW_LOOP_FINDINGS_FILE}" 2>/dev/null || true)"
+    fi
+    if [[ -n "$findings_content" ]]; then
+        context=$(printf '%s' "$context" | jq --arg f "$findings_content" '.findings = $f' 2>/dev/null || echo "$context")
+    fi
+
+    # Save files modified (git diff)
+    local modified
+    modified="$(git diff --name-only HEAD 2>/dev/null | head -50 || true)"
+    if [[ -z "$modified" ]]; then
+        modified="${SW_LOOP_MODIFIED:-}"
+    fi
+    context=$(printf '%s' "$context" | jq --arg m "${modified:-}" '.modified_files = $m' 2>/dev/null || echo "$context")
+
+    # Save last test output
+    local test_content=""
+    if [[ -n "${SW_LOOP_TEST_OUTPUT:-}" ]]; then
+        test_content="${SW_LOOP_TEST_OUTPUT}"
+    elif [[ -n "${SW_LOOP_TEST_OUTPUT_FILE:-}" && -f "${SW_LOOP_TEST_OUTPUT_FILE:-}" ]]; then
+        test_content="$(tail -100 "${SW_LOOP_TEST_OUTPUT_FILE}" 2>/dev/null || true)"
+    fi
+    if [[ -n "$test_content" ]]; then
+        context=$(printf '%s' "$context" | jq --arg t "$test_content" '.last_test_output = $t' 2>/dev/null || echo "$context")
+    fi
+
+    # Save iteration count and status
+    local iter="${SW_LOOP_ITERATION:-0}"
+    local status="${SW_LOOP_STATUS:-running}"
+    context=$(printf '%s' "$context" | jq --argjson i "${iter}" --arg s "$status" '.iteration = ($i | tonumber) | .status = $s' 2>/dev/null || echo "$context")
+
+    printf '%s' "$context" > "$context_file" 2>/dev/null || true
+}
+
+checkpoint_restore_context() {
+    local stage="${1:-build}"
+    local context_file
+    context_file="$(claude_context_file "$stage")"
+
+    [[ ! -f "$context_file" ]] && return 1
+
+    local goal findings modified test_output iter status
+    goal="$(jq -r '.goal // empty' "$context_file" 2>/dev/null)"
+    findings="$(jq -r '.findings // empty' "$context_file" 2>/dev/null)"
+    modified="$(jq -r '.modified_files // empty' "$context_file" 2>/dev/null)"
+    test_output="$(jq -r '.last_test_output // empty' "$context_file" 2>/dev/null)"
+    iter="$(jq -r '.iteration // 0' "$context_file" 2>/dev/null)"
+    status="$(jq -r '.status // empty' "$context_file" 2>/dev/null)"
+
+    # Export both RESTORED_* (for restore-context CLI) and SW_LOOP_* (for sw-loop.sh)
+    export RESTORED_GOAL="$goal"
+    export RESTORED_FINDINGS="$findings"
+    export RESTORED_MODIFIED="$modified"
+    export RESTORED_TEST_OUTPUT="$test_output"
+    export RESTORED_ITERATION="$iter"
+    export RESTORED_STATUS="$status"
+    export SW_LOOP_GOAL="$goal"
+    export SW_LOOP_FINDINGS="$findings"
+    export SW_LOOP_MODIFIED="$modified"
+    export SW_LOOP_TEST_OUTPUT="$test_output"
+    export SW_LOOP_ITERATION="$iter"
+    export SW_LOOP_STATUS="$status"
+    return 0
+}
+
 # ─── Save ────────────────────────────────────────────────────────────────────
 
 cmd_save() {
@@ -314,7 +401,10 @@ cmd_clear() {
             local file
             for file in "${CHECKPOINT_DIR}"/*-checkpoint.json; do
                 [[ -f "$file" ]] || continue
+                local stage_name
+                stage_name="$(basename "$file" -checkpoint.json)"
                 rm -f "$file"
+                rm -f "$(claude_context_file "$stage_name")" 2>/dev/null || true
                 count=$((count + 1))
             done
             success "Cleared ${count} checkpoint(s)"
@@ -334,6 +424,7 @@ cmd_clear() {
 
     if [[ -f "$target" ]]; then
         rm -f "$target"
+        rm -f "$(claude_context_file "$stage")" 2>/dev/null || true
         success "Cleared checkpoint for stage ${BOLD}${stage}${RESET}"
     else
         warn "No checkpoint found for stage ${BOLD}${stage}${RESET}"
@@ -399,7 +490,7 @@ cmd_expire() {
         else
             # Fallback: check file mtime
             local mtime
-            mtime=$(stat -f '%m' "$file" 2>/dev/null || stat -c '%Y' "$file" 2>/dev/null || echo "0")
+            mtime=$(file_mtime "$file")
             if [[ "$mtime" -gt 0 && $((now_e - mtime)) -gt $max_secs ]]; then
                 rm -f "$file"
                 expired=$((expired + 1))
@@ -421,8 +512,10 @@ show_help() {
     echo -e "  ${CYAN}shipwright checkpoint${RESET} <command> [options]"
     echo ""
     echo -e "${BOLD}COMMANDS${RESET}"
-    echo -e "  ${CYAN}save${RESET}      Save a checkpoint for a stage"
-    echo -e "  ${CYAN}restore${RESET}   Restore a checkpoint (prints JSON to stdout)"
+    echo -e "  ${CYAN}save${RESET}           Save a checkpoint for a stage"
+    echo -e "  ${CYAN}restore${RESET}        Restore a checkpoint (prints JSON to stdout)"
+    echo -e "  ${CYAN}save-context${RESET}   Save Claude context (goal, findings, test output) for resume"
+    echo -e "  ${CYAN}restore-context${RESET} Restore Claude context (exports RESTORED_* and SW_LOOP_* vars)"
     echo -e "  ${CYAN}list${RESET}      Show all available checkpoints"
     echo -e "  ${CYAN}clear${RESET}     Remove checkpoint(s)"
     echo -e "  ${CYAN}expire${RESET}    Remove checkpoints older than N hours"
@@ -455,6 +548,32 @@ show_help() {
     echo -e "  ${DIM}shipwright checkpoint expire --hours 48${RESET}"
 }
 
+# ─── Save Context / Restore Context (subcommands) ─────────────────────────────
+
+cmd_save_context() {
+    local stage="build"
+    while [[ $# -gt 0 ]]; do
+        case "$1" in
+            --stage) stage="${2:-build}"; shift 2 ;;
+            --stage=*) stage="${1#--stage=}"; shift ;;
+            *) shift ;;
+        esac
+    done
+    checkpoint_save_context "$stage"
+}
+
+cmd_restore_context() {
+    local stage="build"
+    while [[ $# -gt 0 ]]; do
+        case "$1" in
+            --stage) stage="${2:-build}"; shift 2 ;;
+            --stage=*) stage="${1#--stage=}"; shift ;;
+            *) shift ;;
+        esac
+    done
+    checkpoint_restore_context "$stage"
+}
+
 # ─── Command Router ─────────────────────────────────────────────────────────
 
 main() {
@@ -462,11 +581,13 @@ main() {
     shift 2>/dev/null || true
 
     case "$cmd" in
-        save)       cmd_save "$@" ;;
-        restore)    cmd_restore "$@" ;;
-        list)       cmd_list ;;
-        clear)      cmd_clear "$@" ;;
-        expire)     cmd_expire "$@" ;;
+        save)           cmd_save "$@" ;;
+        restore)        cmd_restore "$@" ;;
+        save-context)   cmd_save_context "$@" ;;
+        restore-context) cmd_restore_context "$@" ;;
+        list)           cmd_list ;;
+        clear)          cmd_clear "$@" ;;
+        expire)         cmd_expire "$@" ;;
         help|--help|-h) show_help ;;
         *)
             error "Unknown command: ${cmd}"
@@ -477,4 +598,7 @@ main() {
     esac
 }
 
-main "$@"
+# Only run main when executed directly (not when sourced)
+if [[ -n "${BASH_SOURCE[0]:-}" && "${BASH_SOURCE[0]}" == "${0}" ]]; then
+    main "$@"
+fi

package/scripts/sw-ci.sh

@@ -6,7 +6,7 @@
 set -euo pipefail
 trap 'echo "ERROR: $BASH_SOURCE:$LINENO exited with status $?" >&2' ERR
 
-VERSION="2.4.0"
+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}"
-
 # ─── Generate Workflow YAML from Pipeline Template ──────────────────────────
 
 cmd_generate() {
@@ -464,7 +454,7 @@ cmd_validate() {
     info "Validating workflow YAML: $workflow_file"
 
     # Check for valid YAML structure
-    if ! jq -e 'type' <<< "$(yq eval -o=json "$workflow_file" 2>/dev/null || echo '{}')" &>/dev/null; then
+    if ! jq -e 'type' <<< "$(yq eval -o=json "$workflow_file" 2>/dev/null || echo '{}')" >/dev/null 2>&1; then
         # Fallback: basic validation
         if grep -q "^name:" "$workflow_file" && grep -q "^on:" "$workflow_file" && grep -q "^jobs:" "$workflow_file"; then
             success "Workflow structure looks valid"

package/scripts/sw-cleanup.sh

@@ -5,7 +5,7 @@
 # ║  Default: dry-run (shows what would be cleaned).                         ║
 # ║  Use --force to actually kill sessions and remove files.                 ║
 # ╚═══════════════════════════════════════════════════════════════════════════╝
-VERSION="2.4.0"
+VERSION="3.0.0"
 set -euo pipefail
 trap 'echo "ERROR: $BASH_SOURCE:$LINENO exited with status $?" >&2' ERR
 
@@ -14,6 +14,12 @@ 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"
+# shellcheck source=lib/compat.sh
+[[ -f "$SCRIPT_DIR/lib/compat.sh" ]] && source "$SCRIPT_DIR/lib/compat.sh"
+[[ -f "$SCRIPT_DIR/lib/config.sh" ]] && source "$SCRIPT_DIR/lib/config.sh"
+
+PROJECT_ROOT="$(git rev-parse --show-toplevel 2>/dev/null || pwd)"
+
 # 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 $*"; }
@@ -31,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}"
-
 # ─── Parse Args ──────────────────────────────────────────────────────────────
 
 FORCE=false
@@ -181,7 +177,7 @@ echo ""
 echo -e "${BOLD}Pipeline Artifacts${RESET}  ${DIM}.claude/pipeline-artifacts/${RESET}"
 echo -e "${DIM}────────────────────────────────────────${RESET}"
 
-PIPELINE_ARTIFACTS=".claude/pipeline-artifacts"
+PIPELINE_ARTIFACTS="$PROJECT_ROOT/.claude/pipeline-artifacts"
 if [[ -d "$PIPELINE_ARTIFACTS" ]]; then
     artifact_file_count=$(find "$PIPELINE_ARTIFACTS" -type f 2>/dev/null | wc -l | tr -d ' ')
     if [[ "${artifact_file_count:-0}" -gt 0 ]]; then
@@ -211,7 +207,7 @@ echo ""
 echo -e "${BOLD}Checkpoints${RESET}  ${DIM}.claude/pipeline-artifacts/checkpoints/${RESET}"
 echo -e "${DIM}────────────────────────────────────────${RESET}"
 
-CHECKPOINT_DIR=".claude/pipeline-artifacts/checkpoints"
+CHECKPOINT_DIR="$PROJECT_ROOT/.claude/pipeline-artifacts/checkpoints"
 if [[ -d "$CHECKPOINT_DIR" ]]; then
     cp_file_count=0
     for cp_file in "${CHECKPOINT_DIR}"/*-checkpoint.json; do
@@ -242,7 +238,7 @@ echo ""
 echo -e "${BOLD}Pipeline State${RESET}  ${DIM}.claude/pipeline-state.md${RESET}"
 echo -e "${DIM}────────────────────────────────────────${RESET}"
 
-PIPELINE_STATE=".claude/pipeline-state.md"
+PIPELINE_STATE="$PROJECT_ROOT/.claude/pipeline-state.md"
 if [[ -f "$PIPELINE_STATE" ]]; then
     state_status=$(sed -n 's/^status: *//p' "$PIPELINE_STATE" | head -1 || true)
     state_issue=$(sed -n 's/^issue: *//p' "$PIPELINE_STATE" | head -1 || true)
@@ -277,11 +273,11 @@ echo -e "${DIM}─────────────────────
 HEARTBEAT_DIR="${HOME}/.shipwright/heartbeats"
 if [[ -d "$HEARTBEAT_DIR" ]]; then
     now_e=$(date +%s)
-    stale_threshold=3600  # 1 hour
+    stale_threshold=$(_config_get_int "cleanup.heartbeat_stale_seconds" 3600)
 
     while IFS= read -r hb_file; do
         [[ -f "$hb_file" ]] || continue
-        hb_mtime=$(stat -f '%m' "$hb_file" 2>/dev/null || stat -c '%Y' "$hb_file" 2>/dev/null || echo "0")
+        hb_mtime=$(file_mtime "$hb_file")
         if [[ $((now_e - hb_mtime)) -gt $stale_threshold ]]; then
             HEARTBEATS_FOUND=$((HEARTBEATS_FOUND + 1))
             hb_name=$(basename "$hb_file" .json)
@@ -310,7 +306,7 @@ echo ""
 echo -e "${BOLD}Orphaned Branches${RESET}  ${DIM}pipeline/* and daemon/*${RESET}"
 echo -e "${DIM}────────────────────────────────────────${RESET}"
 
-if command -v git &>/dev/null && git rev-parse --is-inside-work-tree &>/dev/null; then
+if command -v git >/dev/null 2>&1 && git rev-parse --is-inside-work-tree >/dev/null 2>&1; then
     # Collect active worktree paths
     active_worktrees=""
     while IFS= read -r wt_line; do