shipwright-cli 2.3.1 → 3.0.0

package/scripts/sw-templates.sh

@@ -5,7 +5,7 @@
 # ║  Templates define reusable agent team configurations (roles, layout,    ║
 # ║  focus areas) that shipwright session --template can use to scaffold teams.    ║
 # ╚═══════════════════════════════════════════════════════════════════════════╝
-VERSION="2.3.1"
+VERSION="3.0.0"
 set -euo pipefail
 trap 'echo "ERROR: $BASH_SOURCE:$LINENO exited with status $?" >&2' ERR
 
@@ -35,16 +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}"
-
 # ─── Template Discovery ─────────────────────────────────────────────────────
 REPO_TEMPLATES_DIR="$(cd "$SCRIPT_DIR/../tmux/templates" 2>/dev/null && pwd)" || REPO_TEMPLATES_DIR=""
 USER_TEMPLATES_DIR="${HOME}/.shipwright/templates"
@@ -79,7 +69,7 @@ find_template() {
 # Extract a top-level string field from JSON
 json_field() {
     local file="$1" field="$2"
-    if command -v jq &>/dev/null; then
+    if command -v jq >/dev/null 2>&1; then
         jq -r ".${field} // \"\"" "$file" 2>/dev/null
     else
         grep -o "\"${field}\"[[:space:]]*:[[:space:]]*\"[^\"]*\"" "$file" | head -1 | sed 's/.*: *"//;s/"$//'
@@ -89,7 +79,7 @@ json_field() {
 # Extract agent count from JSON
 json_agent_count() {
     local file="$1"
-    if command -v jq &>/dev/null; then
+    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"
@@ -99,7 +89,7 @@ json_agent_count() {
 # Print agent details from a template
 print_agents() {
     local file="$1"
-    if command -v jq &>/dev/null; then
+    if command -v jq >/dev/null 2>&1; then
         jq -r '.agents // [] | .[] | "\(.name // "?")|\(.role // "")|\(.focus // "")"' "$file" 2>/dev/null
     else
         # Best-effort grep fallback for simple cases

package/scripts/sw-testgen.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)"
 
 # ─── Handle subcommands ───────────────────────────────────────────────────────
@@ -38,16 +38,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}"
-
 # ─── Configuration ───────────────────────────────────────────────────────────
 PROJECT_ROOT="$(git rev-parse --show-toplevel 2>/dev/null || pwd)"
 SCRIPTS_DIR="$PROJECT_ROOT/scripts"
@@ -210,7 +200,7 @@ EOF
     # Generate test template; use Claude for real assertions when available
     local test_template_file="$TESTGEN_DIR/generated-tests.sh"
     local use_claude="false"
-    command -v claude &>/dev/null && use_claude="true"
+    command -v claude >/dev/null 2>&1 && use_claude="true"
     [[ "${TESTGEN_USE_CLAUDE:-true}" == "false" ]] && use_claude="false"
 
     {
@@ -468,7 +458,7 @@ detect_regressions() {
         [[ "$(basename "$test_file")" == "sw-testgen-test.sh" ]] && continue
 
         local result
-        if bash "$test_file" &>/dev/null; then
+        if bash "$test_file" >/dev/null 2>&1; then
             result="PASS"
         else
             result="FAIL"

package/scripts/sw-tmux-pipeline.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)"
 
@@ -26,24 +26,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}"
-
 # Get daemon session name
 get_daemon_session() {
     echo "sw-daemon"

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

@@ -39,16 +39,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}"
-
 # Get the active pane's title
 PANE_TITLE="$(tmux display-message -p '#{pane_title}' 2>/dev/null || echo "")"
 

package/scripts/sw-tmux-status.sh

@@ -9,6 +9,8 @@
 set -euo pipefail
 
 SCRIPT_DIR="${SCRIPT_DIR:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}"
+# 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"
@@ -29,16 +31,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}"
-
 # ─── Stage colors (match Shipwright brand palette) ────────────────────────
 # Each pipeline stage gets a distinct color for instant visual recognition
 stage_color() {
@@ -128,7 +120,7 @@ agent_widget() {
         # Heartbeat is alive if updated within last 60 seconds
         local mtime
         if [[ "$(uname)" == "Darwin" ]]; then
-            mtime="$(stat -f %m "$hb" 2>/dev/null || echo 0)"
+            mtime="$(file_mtime "$hb")"
         else
             mtime="$(stat -c %Y "$hb" 2>/dev/null || echo 0)"
         fi

package/scripts/sw-tmux.sh

@@ -11,7 +11,7 @@
 # ║    shipwright tmux fix           — Auto-fix common issues              ║
 # ║    shipwright tmux reload        — Reload tmux config                  ║
 # ╚═══════════════════════════════════════════════════════════════════════════╝
-VERSION="2.3.1"
+VERSION="3.0.0"
 set -euo pipefail
 trap 'echo "ERROR: $BASH_SOURCE:$LINENO exited with status $?" >&2' ERR
 
@@ -34,24 +34,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}"
-
 PASS=0
 WARN=0
 FAIL=0
@@ -73,7 +55,7 @@ tmux_doctor() {
 
     # ─── 1. tmux installed + version ─────────────────────────────────────
     echo -e "${BOLD}1. tmux Version${RESET}"
-    if ! command -v tmux &>/dev/null; then
+    if ! command -v tmux >/dev/null 2>&1; then
         check_fail "tmux not installed"
         echo -e "    ${DIM}brew install tmux  (macOS)${RESET}"
         echo -e "    ${DIM}sudo apt install tmux  (Ubuntu/Debian)${RESET}"

package/scripts/sw-trace.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)"
 
@@ -26,24 +26,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}"
-
 # ─── Data Paths ─────────────────────────────────────────────────────────────
 EVENTS_FILE="${HOME}/.shipwright/events.jsonl"
 SHIPWRIGHT_DIR="${REPO_DIR}/.claude/pipeline-artifacts"

package/scripts/sw-tracker-github.sh

@@ -28,16 +28,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}"
-
 # ─── Discovery & CRUD Interface ────────────────────────────────────────────
 # All functions output normalized JSON (or plain text where specified).
 # Input: normalized arguments (label, state, issue_id, etc.)

package/scripts/sw-tracker-jira.sh

@@ -28,16 +28,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}"
-
 # ─── Status Auto-Discovery ────────────────────────────────────────────────
 # Queries Jira API for project statuses and caches the transition name mapping.
 # Only fills in JIRA_TRANSITION_* values that are empty (config/env takes priority).
@@ -158,7 +148,7 @@ jira_api() {
     local auth
     auth=$(printf '%s:%s' "$JIRA_EMAIL" "$JIRA_API_TOKEN" | base64)
 
-    local args=(-sf -X "$method" \
+    local args=(-sf --connect-timeout 10 --max-time 30 -X "$method" \
         -H "Authorization: Basic $auth" \
         -H "Content-Type: application/json")
 

package/scripts/sw-tracker-linear.sh

@@ -28,16 +28,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}"
-
 # ─── Status Auto-Discovery ────────────────────────────────────────────────
 # Queries Linear API for workflow states and caches the mapping.
 # Only fills in STATUS_* values that are empty (config/env takes priority).
@@ -175,7 +165,7 @@ linear_graphql() {
     payload=$(jq -n --arg q "$query" --argjson v "$variables" '{query: $q, variables: $v}')
 
     local response
-    response=$(curl -sf -X POST "$LINEAR_API" \
+    response=$(curl -sf --connect-timeout 10 --max-time 30 -X POST "$LINEAR_API" \
         -H "Authorization: $LINEAR_API_KEY" \
         -H "Content-Type: application/json" \
         -d "$payload" 2>&1) || {

package/scripts/sw-tracker.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)"
 
@@ -17,6 +17,7 @@ REPO_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
 # Canonical helpers (colors, output, events)
 # shellcheck source=lib/helpers.sh
 [[ -f "$SCRIPT_DIR/lib/helpers.sh" ]] && source "$SCRIPT_DIR/lib/helpers.sh"
+[[ -f "$SCRIPT_DIR/lib/config.sh" ]] && source "$SCRIPT_DIR/lib/config.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 $*"; }
@@ -26,24 +27,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}"
-
 # ─── Configuration ─────────────────────────────────────────────────────────
 CONFIG_DIR="${HOME}/.shipwright"
 TRACKER_CONFIG="${CONFIG_DIR}/tracker-config.json"
@@ -127,7 +110,7 @@ _dispatch_provider() {
     local provider_func="provider_${func}"
 
     # Provider scripts define provider_* functions
-    if type "$provider_func" &>/dev/null; then
+    if type "$provider_func" >/dev/null 2>&1; then
         "$provider_func" "$@"
         return $?
     else
@@ -137,7 +120,7 @@ _dispatch_provider() {
             # Try GitHub provider
             if [[ -f "$SCRIPT_DIR/sw-tracker-github.sh" ]]; then
                 source "$SCRIPT_DIR/sw-tracker-github.sh"
-                if type "$provider_func" &>/dev/null; then
+                if type "$provider_func" >/dev/null 2>&1; then
                     "$provider_func" "$@"
                     return $?
                 fi
@@ -221,7 +204,7 @@ tracker_notify() {
     fi
 
     # Provider scripts define provider_notify()
-    if type provider_notify &>/dev/null; then
+    if type provider_notify >/dev/null 2>&1; then
         provider_notify "$event" "$gh_issue" "$detail"
     else
         warn "Provider '$TRACKER_PROVIDER' loaded but provider_notify() not defined"
@@ -330,7 +313,7 @@ _init_linear() {
     local payload
     payload=$(jq -n --arg q 'query { viewer { id name } }' '{query: $q}')
     local response
-    response=$(curl -sf -X POST "https://api.linear.app/graphql" \
+    response=$(curl -sf --connect-timeout "$(_config_get_int "network.connect_timeout" 10)" --max-time "$(_config_get_int "network.max_time" 30)" -X POST "$(_config_get "urls.linear_api" "https://api.linear.app/graphql")" \
         -H "Authorization: $api_key" \
         -H "Content-Type: application/json" \
         -d "$payload" 2>&1) || {
@@ -405,7 +388,7 @@ _init_jira() {
     local auth
     auth=$(printf '%s:%s' "$email" "$api_token" | base64)
     local response
-    response=$(curl -sf -X GET "${base_url}/rest/api/3/myself" \
+    response=$(curl -sf --connect-timeout "$(_config_get_int "network.connect_timeout" 10)" --max-time "$(_config_get_int "network.max_time" 30)" -X GET "${base_url}/rest/api/3/myself" \
         -H "Authorization: Basic $auth" \
         -H "Content-Type: application/json" 2>&1) || {
         warn "Could not validate connection — check your credentials"

package/scripts/sw-triage.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)"
 
@@ -16,7 +16,15 @@ REPO_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
 # Canonical helpers (colors, output, events)
 # shellcheck source=lib/helpers.sh
 [[ -f "$SCRIPT_DIR/lib/helpers.sh" ]] && source "$SCRIPT_DIR/lib/helpers.sh"
+[[ -f "$SCRIPT_DIR/lib/config.sh" ]] && source "$SCRIPT_DIR/lib/config.sh"
 # Fallbacks when helpers not loaded (e.g. test env with overridden SCRIPT_DIR)
+[[ -z "${CYAN:-}" ]]  && { [[ -z "${NO_COLOR:-}" ]] && CYAN='\033[38;2;0;212;255m'   || CYAN=''; } || true
+[[ -z "${RESET:-}" ]] && { [[ -z "${NO_COLOR:-}" ]] && RESET='\033[0m'               || RESET=''; } || true
+[[ -z "${BOLD:-}" ]]  && { [[ -z "${NO_COLOR:-}" ]] && BOLD='\033[1m'                || BOLD=''; } || true
+[[ -z "${DIM:-}" ]]   && { [[ -z "${NO_COLOR:-}" ]] && DIM='\033[2m'                 || DIM=''; } || true
+[[ -z "${GREEN:-}" ]] && { [[ -z "${NO_COLOR:-}" ]] && GREEN='\033[38;2;74;222;128m' || GREEN=''; } || true
+[[ -z "${RED:-}" ]]   && { [[ -z "${NO_COLOR:-}" ]] && RED='\033[38;2;248;113;113m'  || RED=''; } || true
+[[ -z "${YELLOW:-}" ]] && { [[ -z "${NO_COLOR:-}" ]] && YELLOW='\033[38;2;250;204;21m' || YELLOW=''; } || true
 [[ "$(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 $*"; }
@@ -25,24 +33,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}"
-
 # ─── GitHub API (safe when NO_GITHUB set) ──────────────────────────────────
 
 check_gh() {
@@ -50,7 +40,7 @@ check_gh() {
         error "GitHub access disabled (NO_GITHUB=1)"
         exit 1
     fi
-    if ! command -v gh &>/dev/null; then
+    if ! command -v gh >/dev/null 2>&1; then
         error "gh CLI not found. Install: https://cli.github.com"
         exit 1
     fi
@@ -178,7 +168,7 @@ analyze_with_ai() {
     if [[ ! -f "${SCRIPT_DIR}/sw-intelligence.sh" ]]; then
         return 1
     fi
-    if ! command -v claude &>/dev/null; then
+    if ! command -v claude >/dev/null 2>&1; then
         return 1
     fi
 
@@ -210,7 +200,7 @@ Return JSON with exactly these fields:
     local result
     result=$(_intelligence_call_claude "$prompt" "$cache_key" 2>/dev/null) || true
 
-    if [[ -z "$result" ]] || echo "$result" | jq -e '.' &>/dev/null; then
+    if [[ -z "$result" ]] || echo "$result" | jq -e '.' >/dev/null 2>&1; then
         :  # result is empty or valid JSON
     else
         return 1
@@ -225,7 +215,7 @@ Return JSON with exactly these fields:
     labels_val=$(echo "$result" | jq -r '.labels // []' 2>/dev/null)
 
     # Reject if we got an error object
-    if echo "$result" | jq -e '.error' &>/dev/null; then
+    if echo "$result" | jq -e '.error' >/dev/null 2>&1; then
         return 1
     fi
 
@@ -445,8 +435,8 @@ cmd_label() {
     labels_str=$(echo "$analysis" | jq -r '.suggested_labels | join(" ")')
 
     # Apply labels via gh CLI
-    local label_array
-    mapfile -t label_array <<< "$(echo "$labels_str" | tr ' ' '\n')"
+    local label_array=()
+    while IFS= read -r _l; do [[ -n "$_l" ]] && label_array+=("$_l"); done <<< "$(echo "$labels_str" | tr ' ' '\n')"
 
     for label in "${label_array[@]}"; do
         [[ -z "$label" ]] && continue
@@ -469,7 +459,7 @@ cmd_prioritize() {
 
     # Fetch all open issues
     local issues_json
-    issues_json=$(gh issue list --state open --json number,title,body,labels,createdAt,reactions --limit 100 2>/dev/null || echo "[]")
+    issues_json=$(gh issue list --state open --json number,title,body,labels,createdAt,reactions --limit "$(_config_get_int "limits.triage_issues" 100)" 2>/dev/null || echo "[]")
 
     local issue_count
     issue_count=$(echo "$issues_json" | jq 'length')
@@ -540,13 +530,13 @@ cmd_prioritize() {
     echo -e "${BOLD}Prioritized Backlog${RESET}"
     echo "─────────────────────────────────────────────────────────────────"
     echo ""
-    echo "$output_json" | jq -r '.[] | "\(.number | tostring | @json) \(.score | tostring): \(.title) [type:\(.type) complexity:\(.complexity) risk:\(.risk)]"' | while IFS= read -r line; do
+    echo "$output_json" | jq -r '.[] | "#\(.number) \(.score): \(.title) [type:\(.type) complexity:\(.complexity) risk:\(.risk)]"' | while IFS= read -r line; do
         local number score rest
-        number=$(echo "$line" | jq -r 'split(" ")[0]' <<< "$line")
-        score=$(echo "$line" | cut -d: -f2 | cut -d' ' -f1)
+        number=$(echo "$line" | cut -d' ' -f1)
+        score=$(echo "$line" | cut -d' ' -f2 | tr -d ':')
         rest=$(echo "$line" | cut -d' ' -f3-)
 
-        echo -e "  ${CYAN}#${number}${RESET} ${BOLD}${score}${RESET}  ${rest}"
+        echo -e "  ${CYAN}${number}${RESET} ${BOLD}${score}${RESET}  ${rest}"
     done
 
     echo ""
@@ -565,7 +555,7 @@ cmd_team() {
 
     # Determine if GitHub is available (don't exit — allow offline fallback)
     local gh_available=false
-    if [[ "${NO_GITHUB:-}" != "1" ]] && command -v gh &>/dev/null; then
+    if [[ "${NO_GITHUB:-}" != "1" ]] && command -v gh >/dev/null 2>&1; then
         gh_available=true
     fi
 
@@ -595,7 +585,7 @@ cmd_team() {
 
         local recruit_result
         recruit_result=$(bash "$SCRIPT_DIR/sw-recruit.sh" team --json "$issue_title" 2>/dev/null) || true
-        if [[ -n "$recruit_result" ]] && echo "$recruit_result" | jq -e '.team' &>/dev/null 2>&1; then
+        if [[ -n "$recruit_result" ]] && echo "$recruit_result" | jq -e '.team' >/dev/null 2>&1; then
             model=$(echo "$recruit_result" | jq -r '.model // "sonnet"')
             agents=$(echo "$recruit_result" | jq -r '.agents // 2')
             template=$(echo "$recruit_result" | jq -r '.template // ""')
@@ -675,7 +665,7 @@ cmd_batch() {
 
     # Fetch unlabeled open issues
     local issues_json
-    issues_json=$(gh issue list --state open --search "no:label" --json number --limit 50 2>/dev/null || echo "[]")
+    issues_json=$(gh issue list --state open --search "no:label" --json number --limit "$(_config_get_int "limits.triage_unlabeled" 50)" 2>/dev/null || echo "[]")
 
     local issue_count
     issue_count=$(echo "$issues_json" | jq 'length')
@@ -701,7 +691,7 @@ cmd_report() {
 
     # Fetch labeled issues
     local issues_json
-    issues_json=$(gh issue list --state open --json labels,title,number --limit 100 2>/dev/null || echo "[]")
+    issues_json=$(gh issue list --state open --json labels,title,number --limit "$(_config_get_int "limits.triage_issues" 100)" 2>/dev/null || echo "[]")
 
     local type_counts complexity_counts priority_counts
     type_counts='{}'

package/scripts/sw-upgrade.sh

@@ -2,7 +2,7 @@
 # ╔═══════════════════════════════════════════════════════════════════════════╗
 # ║  sw upgrade — Detect and apply updates from the repo                   ║
 # ╚═══════════════════════════════════════════════════════════════════════════╝
-VERSION="2.3.1"
+VERSION="3.0.0"
 set -euo pipefail
 trap 'echo "ERROR: $BASH_SOURCE:$LINENO exited with status $?" >&2' ERR
 
@@ -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}"
-
 # ─── Parse flags ───────────────────────────────────────────────────────────
 APPLY=false
 REPO_OVERRIDE=""
@@ -70,8 +52,8 @@ find_repo() {
     fi
 
     # 2. Environment variable
-    if [[ -n "${CCT_REPO_PATH:-}" ]]; then
-        echo "$CCT_REPO_PATH"
+    if [[ -n "${SHIPWRIGHT_REPO_PATH:-}" ]]; then
+        echo "$SHIPWRIGHT_REPO_PATH"
         return
     fi
 
@@ -102,7 +84,7 @@ REPO_PATH="$(find_repo)" || {
     error "Cannot locate the Shipwright repo."
     echo ""
     echo -e "  Try one of:"
-    echo -e "    ${DIM}export CCT_REPO_PATH=/path/to/shipwright${RESET}"
+    echo -e "    ${DIM}export SHIPWRIGHT_REPO_PATH=/path/to/shipwright${RESET}"
     echo -e "    ${DIM}shipwright upgrade --repo-path /path/to/shipwright${RESET}"
     exit 1
 }
@@ -277,7 +259,7 @@ bootstrap_manifest() {
         IFS='|' read -r key _ dest _ _ <<< "$entry"
         if [[ -f "$dest" ]]; then
             echo -e "  ${GREEN}✓${RESET} ${DIM}$key${RESET}  →  $dest"
-            ((found++))
+            found=$((found + 1))
         fi
     done