shipwright-cli 3.1.0 → 3.3.0

package/scripts/sw-swarm.sh

@@ -6,7 +6,8 @@
 set -euo pipefail
 trap 'echo "ERROR: $BASH_SOURCE:$LINENO exited with status $?" >&2' ERR
 
-VERSION="3.1.0"
+# shellcheck disable=SC2034
+VERSION="3.3.0"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 REPO_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
 
@@ -28,7 +29,8 @@ 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\""
+    local payload
+    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"
   }
@@ -38,6 +40,7 @@ SWARM_DIR="${HOME}/.shipwright/swarm"
 REGISTRY_FILE="${SWARM_DIR}/registry.json"
 CONFIG_FILE="${SWARM_DIR}/config.json"
 METRICS_FILE="${SWARM_DIR}/metrics.jsonl"
+# shellcheck disable=SC2034
 HEALTH_LOG="${SWARM_DIR}/health.jsonl"
 
 # ─── Ensure directories exist ──────────────────────────────────────────────
@@ -50,6 +53,7 @@ init_config() {
     if [[ ! -f "$CONFIG_FILE" ]]; then
         local tmp_file
         tmp_file=$(mktemp)
+    # shellcheck disable=SC2064
         trap "rm -f '$tmp_file'" RETURN
         cat > "$tmp_file" << 'JSON'
 {
@@ -76,6 +80,7 @@ init_registry() {
     if [[ ! -f "$REGISTRY_FILE" ]]; then
         local tmp_file
         tmp_file=$(mktemp)
+    # shellcheck disable=SC2064
         trap "rm -f '$tmp_file'" RETURN
         cat > "$tmp_file" << 'JSON'
 {
@@ -165,6 +170,7 @@ cmd_spawn() {
     # Add agent to registry
     local tmp_file
     tmp_file=$(mktemp)
+    # shellcheck disable=SC2064
     trap "rm -f '$tmp_file'" RETURN
 
     jq --arg agent_id "$agent_id" \
@@ -173,7 +179,7 @@ cmd_spawn() {
            id: $agent_id,
            type: $agent_type,
            status: "active",
-           spawned_at: "'$(now_iso)'",
+           spawned_at: "'"$(now_iso)"'",
            current_task: null,
            task_started_at: null,
            success_count: 0,
@@ -181,8 +187,8 @@ cmd_spawn() {
            avg_completion_time: 0,
            quality_score: 100,
            resource_usage: {cpu: 0, memory: 0},
-           last_heartbeat: "'$(now_iso)'"
-       }] | .active_count += 1 | .last_updated = "'$(now_iso)'"' \
+           last_heartbeat: "'"$(now_iso)"'"
+       }] | .active_count += 1 | .last_updated = "'"$(now_iso)"'"' \
         "$REGISTRY_FILE" > "$tmp_file" && [[ -s "$tmp_file" ]] && \
     mv "$tmp_file" "$REGISTRY_FILE" || { rm -f "$tmp_file"; error "Failed to update registry"; return 1; }
     record_metric "$agent_id" "spawn" "1" "$agent_type"
@@ -247,10 +253,12 @@ cmd_retire() {
     # Mark as retiring / remove from registry
     local tmp_file
     tmp_file=$(mktemp)
+    # shellcheck disable=SC2064
     trap "rm -f '$tmp_file'" RETURN
 
+    # shellcheck disable=SC2046
     jq --arg aid "$agent_id" \
-       '.agents |= map(select(.id != $aid)) | .active_count = ([.agents[] | select(.status == "active")] | length) | .last_updated = "'$(now_iso)'"' \
+       '.agents |= map(select(.id != $aid)) | .active_count = ([.agents[] | select(.status == "active")] | length) | .last_updated = "'"$(now_iso)"'"' \
         "$REGISTRY_FILE" > "$tmp_file" && [[ -s "$tmp_file" ]] && \
     mv "$tmp_file" "$REGISTRY_FILE" || { rm -f "$tmp_file"; error "Failed to update registry"; return 1; }
     record_metric "$agent_id" "retire" "1" "graceful_shutdown"
@@ -334,9 +342,11 @@ cmd_health() {
 
 # ─── Swarm spawn helper (for cmd_scale) ───────────────────────────────────
 swarm_spawn_agent() {
+    # shellcheck disable=SC2034
     local role="${1:-builder}"
     local count="${2:-1}"
     local i
+    # shellcheck disable=SC2034
     for i in $(seq 1 "$count"); do
         cmd_spawn "standard" 2>/dev/null || true
     done
@@ -359,7 +369,8 @@ cmd_scale() {
         fi
 
         local current_agents
-        current_agents=$(tmux list-sessions -F '#{session_name}' 2>/dev/null | grep -cE '^shipwright-sw-agent|^swarm-' || echo "0")
+        current_agents=$(tmux list-sessions -F '#{session_name}' 2>/dev/null | grep -cE '^shipwright-sw-agent|^swarm-' || true)
+        current_agents="${current_agents:-0}"
 
         local target_agents=1
         if [[ "$queue_depth" -gt 5 ]]; then
@@ -383,6 +394,7 @@ cmd_scale() {
                 local agent_id
                 agent_id=$(jq -r '.agents[0].id // empty' "$REGISTRY_FILE" 2>/dev/null)
                 if [[ -n "$agent_id" ]]; then
+                    # shellcheck disable=SC2034
                     cmd_retire "$agent_id" 2>/dev/null && retired=1 || true
                 fi
             fi
@@ -526,6 +538,7 @@ cmd_config() {
 
             local tmp_file
             tmp_file=$(mktemp)
+    # shellcheck disable=SC2064
             trap "rm -f '$tmp_file'" RETURN
 
             jq --arg key "$key" --arg value "$value" \

package/scripts/sw-team-stages.sh

@@ -6,7 +6,7 @@
 set -euo pipefail
 trap 'echo "ERROR: $BASH_SOURCE:$LINENO exited with status $?" >&2' ERR
 
-VERSION="3.1.0"
+VERSION="3.3.0"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 REPO_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
 
@@ -29,12 +29,14 @@ 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\""
+    local payload
+    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
 # ─── Structured Event Log ──────────────────────────────────────────────────
+# shellcheck disable=SC2034
 EVENTS_FILE="${HOME}/.shipwright/events.jsonl"
 
 # ─── Team Configuration ─────────────────────────────────────────────────────
@@ -102,6 +104,7 @@ cmd_compose() {
     local spec_count
     spec_count=$(echo "$specialists" | wc -w)
 
+    # shellcheck disable=SC2046
     team_json=$(jq -n \
         --arg stage "$stage" \
         --arg complexity "$complexity" \
@@ -111,7 +114,7 @@ cmd_compose() {
         '{
             stage: $stage,
             complexity: $complexity,
-            created_at: "'$(now_iso)'",
+            created_at: "'"$(now_iso)"'",
             leader: $leader,
             specialists: ($specialists | split(" ")),
             specialist_count: $spec_count,
@@ -139,6 +142,7 @@ cmd_delegate() {
     # Read hotspots from intelligence cache if available
     local hotspots=""
     if [[ -f "$INTELLIGENCE_CACHE" ]]; then
+        # shellcheck disable=SC2034
         hotspots=$(jq -r '.hotspots[]? // empty' "$INTELLIGENCE_CACHE" 2>/dev/null | head -10 || true)
     fi
 
@@ -160,6 +164,7 @@ cmd_delegate() {
         [[ -z "$file" ]] && continue
         local spec_idx=$((file_count % specialist_count))
         local task_json
+        # shellcheck disable=SC2046
         task_json=$(jq -n \
             --arg file "$file" \
             --arg spec_idx "$spec_idx" \
@@ -168,7 +173,7 @@ cmd_delegate() {
                 file: $file,
                 specialist_idx: ($spec_idx | tonumber),
                 status: $status,
-                assigned_at: "'$(now_iso)'",
+                assigned_at: "'"$(now_iso)"'",
                 result: null
             }')
         tasks=$(echo "$tasks" | jq ". += [$task_json]")
@@ -303,6 +308,7 @@ cmd_vote() {
     fi
 
     local result
+    # shellcheck disable=SC2046
     result=$(jq -n \
         --argjson approve_count "$approve_count" \
         --argjson reject_count "$reject_count" \
@@ -315,7 +321,7 @@ cmd_vote() {
             neutral: $neutral_count,
             total: $total,
             consensus: $consensus,
-            decided_at: "'$(now_iso)'"
+            decided_at: "'"$(now_iso)"'"
         }')
 
     echo "$result"
@@ -370,6 +376,7 @@ cmd_aggregate() {
 
     # Build aggregated output
     local aggregated
+    # shellcheck disable=SC2046
     aggregated=$(jq -n \
         --arg stage "$stage" \
         --argjson results "$results" \
@@ -382,7 +389,7 @@ cmd_aggregate() {
             failure_count: $failure_count,
             success_rate: (if ($results | length) > 0 then ($success_count / ($results | length) * 100) | floor else 0 end),
             results: $results,
-            aggregated_at: "'$(now_iso)'"
+            aggregated_at: "'"$(now_iso)"'"
         }')
 
     echo "$aggregated"

package/scripts/sw-templates.sh

@@ -5,36 +5,12 @@
 # ║  Templates define reusable agent team configurations (roles, layout,    ║
 # ║  focus areas) that shipwright session --template can use to scaffold teams.    ║
 # ╚═══════════════════════════════════════════════════════════════════════════╝
-VERSION="3.1.0"
+# shellcheck disable=SC2034
+VERSION="3.3.0"
 set -euo pipefail
-trap 'echo "ERROR: $BASH_SOURCE:$LINENO exited with status $?" >&2' ERR
-
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-
-# ─── Cross-platform compatibility ──────────────────────────────────────────
-# shellcheck source=lib/compat.sh
-[[ -f "$SCRIPT_DIR/lib/compat.sh" ]] && source "$SCRIPT_DIR/lib/compat.sh"
-
-# Canonical helpers (colors, output, events)
-# shellcheck source=lib/helpers.sh
-[[ -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 $*"; }
-[[ "$(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; }
-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
+
+# shellcheck source=lib/bootstrap.sh
+source "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/lib/bootstrap.sh"
 # ─── Template Discovery ─────────────────────────────────────────────────────
 REPO_TEMPLATES_DIR="$(cd "$SCRIPT_DIR/../tmux/templates" 2>/dev/null && pwd)" || REPO_TEMPLATES_DIR=""
 USER_TEMPLATES_DIR="${HOME}/.shipwright/templates"
@@ -82,8 +58,8 @@ json_agent_count() {
     if command -v jq >/dev/null 2>&1; then
         jq -r '.agents // [] | length' "$file" 2>/dev/null
     else
-        grep -c '"name"' "$file" 2>/dev/null || echo "0"
-    fi
+        grep -c '"name"' "$file" 2>/dev/null || true
+    fi | tr -d ' ' | sed 's/^$/0/'
 }
 
 # Print agent details from a template

package/scripts/sw-testgen.sh

@@ -6,7 +6,7 @@
 set -euo pipefail
 trap 'echo "ERROR: $BASH_SOURCE:$LINENO exited with status $?" >&2' ERR
 
-VERSION="3.1.0"
+VERSION="3.3.0"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
 # ─── Handle subcommands ───────────────────────────────────────────────────────
@@ -33,6 +33,7 @@ fi
 if [[ "$(type -t emit_event 2>/dev/null)" != "function" ]]; then
   emit_event() {
     local event_type="$1"; shift; mkdir -p "${HOME}/.shipwright"
+    # shellcheck disable=SC2155
     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"
@@ -40,11 +41,14 @@ if [[ "$(type -t emit_event 2>/dev/null)" != "function" ]]; then
 fi
 # ─── Configuration ───────────────────────────────────────────────────────────
 PROJECT_ROOT="$(git rev-parse --show-toplevel 2>/dev/null || pwd)"
+# shellcheck disable=SC2034
 SCRIPTS_DIR="$PROJECT_ROOT/scripts"
 TEST_SUITES_DIR="$PROJECT_ROOT/scripts"
 COVERAGE_THRESHOLD=70
 TESTGEN_DIR="${TESTGEN_DIR:-.claude/testgen}"
+# shellcheck disable=SC2034
 COVERAGE_DB="$TESTGEN_DIR/coverage.json"
+# shellcheck disable=SC2034
 QUALITY_DB="$TESTGEN_DIR/quality.json"
 REGRESSION_DB="$TESTGEN_DIR/regressions.json"
 
@@ -98,7 +102,8 @@ analyze_coverage() {
     if [[ -f "$target_script" ]]; then
         # Parse function definitions
         function_names=$(grep -E '^[a-zA-Z_][a-zA-Z0-9_]*\(\)' "$target_script" | sed 's/().*//' || echo "")
-        total_functions=$(echo "$function_names" | grep -c . || echo "0")
+        total_functions=$(echo "$function_names" | grep -c . || true)
+        total_functions="${total_functions:-0}"
     fi
 
     # Find existing tests that call these functions
@@ -153,6 +158,7 @@ EOF
 
 generate_tests() {
     local target_script="${1:-.}"
+    # shellcheck disable=SC2034
     local threshold="${2:-$COVERAGE_THRESHOLD}"
 
     mkdir -p "$TESTGEN_DIR"
@@ -182,7 +188,8 @@ EOF
     fi
 
     local untested_count=0
-    [[ -n "$untested_functions" ]] && untested_count=$(echo "$untested_functions" | grep -c . || echo "0")
+    [[ -n "$untested_functions" ]] && untested_count=$(echo "$untested_functions" | grep -c . || true)
+    untested_count="${untested_count:-0}"
 
     if [[ $untested_count -eq 0 ]]; then
         success "All functions have tests"
@@ -231,6 +238,7 @@ EOF
                 func_snippet=$(awk "/^${func}\(\\)/,/^[a-zA-Z_][a-zA-Z0-9_]*\(\)|^$/" "$target_script" 2>/dev/null | head -40 || true)
                 local prompt_file
                 prompt_file=$(mktemp "${TMPDIR:-/tmp}/sw-testgen-prompt.XXXXXX")
+                # shellcheck disable=SC2064
                 trap "rm -f '$prompt_file'" RETURN
                 {
                     echo "Generate a bash test function for the following shell function. Use real assertions (assert_equal, assert_contains, or test exit code). Test happy path and at least one edge or error case. Output only the bash function body."
@@ -338,15 +346,18 @@ score_quality() {
 
     # Count assertions
     local assertion_count=0
-    assertion_count=$(grep -c -E '(assert_|test_|expect_)' "$test_file" || echo "0")
+    assertion_count=$(grep -c -E '(assert_|test_|expect_)' "$test_file" || true)
+    assertion_count="${assertion_count:-0}"
 
     # Count edge case patterns
     local edge_case_count=0
-    edge_case_count=$(grep -c -E '(empty|null|nil|missing|invalid|error|fail)' "$test_file" || echo "0")
+    edge_case_count=$(grep -c -E '(empty|null|nil|missing|invalid|error|fail)' "$test_file" || true)
+    edge_case_count="${edge_case_count:-0}"
 
     # Count error path tests
     local error_path_count=0
-    error_path_count=$(grep -c -E '(exit|return 1|error|ERROR)' "$test_file" || echo "0")
+    error_path_count=$(grep -c -E '(exit|return 1|error|ERROR)' "$test_file" || true)
+    error_path_count="${error_path_count:-0}"
 
     # Calculate score (0-100)
     local quality_score=0

package/scripts/sw-tmux-pipeline.sh

@@ -6,7 +6,8 @@
 set -euo pipefail
 trap 'echo "ERROR: $BASH_SOURCE:$LINENO exited with status $?" >&2' ERR
 
-VERSION="3.1.0"
+# shellcheck disable=SC2034
+VERSION="3.3.0"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 REPO_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
 
@@ -100,6 +101,7 @@ cmd_spawn() {
 
     local tmp_file
     tmp_file=$(mktemp)
+    # shellcheck disable=SC2064
     trap "rm -f '$tmp_file'" RETURN
     cat > "$tmp_file" << EOF
 {
@@ -293,6 +295,7 @@ cmd_list() {
         [[ -z "$line" ]] && continue
 
         # Parse window line: "0: pipeline-42 (1 panes)"
+        # shellcheck disable=SC2034
         local window_num window_name status
         window_num=$(echo "$line" | cut -d: -f1)
         window_name=$(echo "$line" | cut -d' ' -f2)

package/scripts/sw-tmux-role-color.sh

@@ -34,6 +34,7 @@ fi
 if [[ "$(type -t emit_event 2>/dev/null)" != "function" ]]; then
   emit_event() {
     local event_type="$1"; shift; mkdir -p "${HOME}/.shipwright"
+    # shellcheck disable=SC2155
     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"
@@ -48,6 +49,7 @@ TITLE_LOWER="$(echo "$PANE_TITLE" | tr '[:upper:]' '[:lower:]')"
 # Map role keywords to colors
 COLOR="#00d4ff"  # default: cyan
 
+# shellcheck disable=SC2221,SC2222
 case "$TITLE_LOWER" in
     *leader*|*lead*|*pm*|*manager*|*orchestrat*)
         COLOR="#00d4ff"  # cyan — command & control

package/scripts/sw-tmux-status.sh

@@ -26,6 +26,7 @@ fi
 if [[ "$(type -t emit_event 2>/dev/null)" != "function" ]]; then
   emit_event() {
     local event_type="$1"; shift; mkdir -p "${HOME}/.shipwright"
+    # shellcheck disable=SC2155
     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"
@@ -140,7 +141,6 @@ case "${1:-pipeline}" in
     agents)   agent_widget ;;
     all)
         # Combine both widgets
-        local p a
         p="$(pipeline_widget)"
         a="$(agent_widget)"
         echo "${a}${p}"

package/scripts/sw-tmux.sh

@@ -11,7 +11,8 @@
 # ║    shipwright tmux fix           — Auto-fix common issues              ║
 # ║    shipwright tmux reload        — Reload tmux config                  ║
 # ╚═══════════════════════════════════════════════════════════════════════════╝
-VERSION="3.1.0"
+# shellcheck disable=SC2034
+VERSION="3.3.0"
 set -euo pipefail
 trap 'echo "ERROR: $BASH_SOURCE:$LINENO exited with status $?" >&2' ERR
 
@@ -227,6 +228,16 @@ tmux_doctor() {
             check_warn "pane-border-status: ${border_status} — agent names won't show"
         fi
 
+        # Check pane-active-border-style for cyan accent
+        local border_style
+        border_style="$(tmux show-option -gv pane-active-border-style 2>/dev/null || echo "")"
+        if [[ "$border_style" == *"#00d4ff"* ]]; then
+            check_pass "pane-active-border-style: cyan accent applied"
+        else
+            check_warn "Pane border format missing cyan accent"
+            echo -e "    ${DIM}Fix: set -g pane-active-border-style 'fg=#00d4ff,bg=#1a1a2e'${RESET}"
+        fi
+
         # Check dark theme hooks
         if tmux show-hooks -g 2>/dev/null | grep -q "after-split-window"; then
             check_pass "Dark theme hooks active"
@@ -344,6 +355,7 @@ tmux_install() {
             cp "$REPO_DIR/tmux/tmux.conf" "$HOME/.tmux.conf"
             success "Installed ~/.tmux.conf"
         else
+            # shellcheck disable=SC2088
             info "~/.tmux.conf exists — run 'shipwright init' to update"
         fi
     fi
@@ -499,6 +511,30 @@ tmux_fix() {
         fixed=$((fixed + 1))
     fi
 
+    # Fix 11: default-terminal
+    local term
+    term="$(tmux show-option -gv default-terminal 2>/dev/null || echo "unknown")"
+    if [[ "$term" != *"256color"* ]]; then
+        tmux set -g default-terminal "tmux-256color" 2>/dev/null
+        success "Fixed: default-terminal → tmux-256color (was ${term})"
+        fixed=$((fixed + 1))
+    fi
+
+    # Fix 12: pane-active-border-style (cyan accent)
+    local border_style
+    border_style="$(tmux show-option -gv pane-active-border-style 2>/dev/null || echo "")"
+    if [[ "$border_style" != *"#00d4ff"* ]]; then
+        tmux set -g pane-active-border-style "fg=#00d4ff,bg=#1a1a2e" 2>/dev/null
+        success "Fixed: pane-active-border-style → cyan accent (#00d4ff)"
+        fixed=$((fixed + 1))
+    fi
+
+    # Source overlay for complete styling (pane-border-format, hooks, etc.)
+    if [[ -f "$HOME/.tmux/shipwright-overlay.conf" ]]; then
+        tmux source-file "$HOME/.tmux/shipwright-overlay.conf" 2>/dev/null && \
+            success "Sourced: shipwright-overlay.conf" || true
+    fi
+
     echo ""
     if [[ $fixed -eq 0 ]]; then
         success "No fixes needed — tmux is already optimized!"

package/scripts/sw-trace.sh

@@ -6,7 +6,8 @@
 set -euo pipefail
 trap 'echo "ERROR: $BASH_SOURCE:$LINENO exited with status $?" >&2' ERR
 
-VERSION="3.1.0"
+# shellcheck disable=SC2034
+VERSION="3.3.0"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 REPO_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
 
@@ -112,6 +113,7 @@ trace_show() {
     echo -e "${BOLD}FEATURE BRANCH${RESET}"
 
     local feature_branch
+    # shellcheck disable=SC2034
     feature_branch="feat/issue-${issue}"
 
     # Check if worktree exists

package/scripts/sw-tracker-github.sh

@@ -23,6 +23,7 @@ fi
 if [[ "$(type -t emit_event 2>/dev/null)" != "function" ]]; then
   emit_event() {
     local event_type="$1"; shift; mkdir -p "${HOME}/.shipwright"
+    # shellcheck disable=SC2155
     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"
@@ -54,6 +55,7 @@ provider_discover_issues() {
     fi
 
     # Fetch as JSON: number, title, labels, state
+    # shellcheck disable=SC2054
     gh_args+=(--json number,title,labels,state)
 
     local response
@@ -198,6 +200,7 @@ provider_create_issue() {
 provider_notify() {
     local event="$1"
     local gh_issue="${2:-}"
+    # shellcheck disable=SC2034
     local detail="${3:-}"
 
     # GitHub is the native provider — no external sync needed

package/scripts/sw-tracker-jira.sh

@@ -23,6 +23,7 @@ fi
 if [[ "$(type -t emit_event 2>/dev/null)" != "function" ]]; then
   emit_event() {
     local event_type="$1"; shift; mkdir -p "${HOME}/.shipwright"
+    # shellcheck disable=SC2155
     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"
@@ -95,7 +96,9 @@ provider_discover_statuses() {
     mkdir -p "$cache_dir"
     local tmp_cache
     tmp_cache=$(mktemp)
+    # shellcheck disable=SC2064
     trap "rm -f '$tmp_cache'" RETURN
+    # shellcheck disable=SC1010
     jq -n \
         --arg ts "$(date +%s)" \
         --arg in_progress "${discovered_in_progress:-}" \

package/scripts/sw-tracker-linear.sh

@@ -23,6 +23,7 @@ fi
 if [[ "$(type -t emit_event 2>/dev/null)" != "function" ]]; then
   emit_event() {
     local event_type="$1"; shift; mkdir -p "${HOME}/.shipwright"
+    # shellcheck disable=SC2155
     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"
@@ -105,7 +106,9 @@ provider_discover_statuses() {
     mkdir -p "$cache_dir"
     local tmp_cache
     tmp_cache=$(mktemp)
+    # shellcheck disable=SC2064
     trap "rm -f '$tmp_cache'" RETURN
+    # shellcheck disable=SC1010
     jq -n \
         --arg ts "$(date +%s)" \
         --arg backlog "${discovered_backlog:-}" \

package/scripts/sw-tracker.sh

@@ -6,8 +6,10 @@
 set -euo pipefail
 trap 'echo "ERROR: $BASH_SOURCE:$LINENO exited with status $?" >&2' ERR
 
-VERSION="3.1.0"
+# shellcheck disable=SC2034
+VERSION="3.3.0"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+# shellcheck disable=SC2034
 REPO_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
 
 # ─── Cross-platform compatibility ──────────────────────────────────────────

package/scripts/sw-triage.sh

@@ -6,7 +6,8 @@
 set -euo pipefail
 trap 'echo "ERROR: $BASH_SOURCE:$LINENO exited with status $?" >&2' ERR
 
-VERSION="3.1.0"
+# shellcheck disable=SC2034
+VERSION="3.3.0"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 REPO_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
 
@@ -601,7 +602,7 @@ cmd_team() {
         fi
     fi
 
-    # ── Fallback: hardcoded complexity/risk mapping ──
+    # ── Fallback: default complexity/risk mapping ──
     if [[ -z "$template" ]]; then
         case "${complexity}-${risk}" in
             trivial-low|simple-low)

package/scripts/sw-upgrade.sh

@@ -2,7 +2,8 @@
 # ╔═══════════════════════════════════════════════════════════════════════════╗
 # ║  sw upgrade — Detect and apply updates from the repo                   ║
 # ╚═══════════════════════════════════════════════════════════════════════════╝
-VERSION="3.1.0"
+# shellcheck disable=SC2034
+VERSION="3.3.0"
 set -euo pipefail
 trap 'echo "ERROR: $BASH_SOURCE:$LINENO exited with status $?" >&2' ERR
 
@@ -217,6 +218,7 @@ read_manifest_checksum() {
 
 write_manifest() {
     mkdir -p "$MANIFEST_DIR"
+    # shellcheck disable=SC2155
     local json='{\n  "schema": 1,\n  "version": "1.1.0",\n  "installed_at": "'$(date -u +%Y-%m-%dT%H:%M:%SZ)'",\n  "repo_path": "'"$REPO_PATH"'",\n  "files": {'
     local first=true
 

package/scripts/sw-ux.sh

@@ -6,7 +6,8 @@
 set -euo pipefail
 trap 'echo "ERROR: $BASH_SOURCE:$LINENO exited with status $?" >&2' ERR
 
-VERSION="3.1.0"
+# shellcheck disable=SC2034
+VERSION="3.3.0"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
 # ─── Cross-platform compatibility ──────────────────────────────────────────
@@ -27,10 +28,12 @@ if [[ "$(type -t now_iso 2>/dev/null)" != "function" ]]; then
   now_epoch() { date +%s; }
 fi
 # ─── Structured Event Log ──────────────────────────────────────────────────
+# shellcheck disable=SC2034
 EVENTS_FILE="${HOME}/.shipwright/events.jsonl"
 
 # ─── UX Configuration ──────────────────────────────────────────────────────
 UX_CONFIG_GLOBAL="${HOME}/.shipwright/ux-config.json"
+# shellcheck disable=SC2034
 UX_CONFIG_REPO="./.claude/ux-config.json"
 
 # Detect accessibility modes
@@ -324,7 +327,7 @@ table_header() {
 
     # Print separator
     for w in "${widths[@]}"; do
-        printf '%*s' "$w" | tr ' ' '─'
+        printf '%*s' "$w" "" | tr ' ' '─'
     done
     echo ""
 }