shipwright-cli 2.3.1 → 3.0.0

package/scripts/sw-status.sh

@@ -4,7 +4,7 @@
 # ║                                                                          ║
 # ║  Shows running teams, agent windows, and task progress.                  ║
 # ╚═══════════════════════════════════════════════════════════════════════════╝
-VERSION="2.3.1"
+VERSION="3.0.0"
 set -euo pipefail
 trap 'echo "ERROR: $BASH_SOURCE:$LINENO exited with status $?" >&2' ERR
 
@@ -17,6 +17,24 @@ _COMPAT="$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"
+[[ -f "$SCRIPT_DIR/lib/config.sh" ]] && source "$SCRIPT_DIR/lib/config.sh"
+
+# Portable ISO timestamp parsing (macOS uses -j -f, Linux uses -d)
+_parse_iso_epoch() {
+    local ts="$1"
+    if date -j -f "%Y-%m-%dT%H:%M:%SZ" "$ts" "+%s" 2>/dev/null; then
+        return
+    fi
+    # Linux: date -d handles ISO format
+    date -d "$ts" "+%s" 2>/dev/null || echo "0"
+}
+_format_iso_time() {
+    local ts="$1" fmt="${2:-+%H:%M}"
+    if date -j -f "%Y-%m-%dT%H:%M:%SZ" "$ts" "$fmt" 2>/dev/null; then
+        return
+    fi
+    date -d "$ts" "$fmt" 2>/dev/null || echo ""
+}
 # 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 $*"; }
@@ -34,15 +52,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}"
 
 # ─── Argument Parsing ─────────────────────────────────────────────────────────
 JSON_OUTPUT="false"
@@ -63,14 +72,14 @@ done
 
 # ─── JSON Output Mode ─────────────────────────────────────────────────────────
 if [[ "$JSON_OUTPUT" == "true" ]]; then
-    if ! command -v jq &>/dev/null; then
+    if ! command -v jq >/dev/null 2>&1; then
         echo "Error: jq is required for --json output" >&2
         exit 1
     fi
 
     # -- tmux windows --
     WINDOWS_JSON="[]"
-    if command -v tmux &>/dev/null; then
+    if command -v tmux >/dev/null 2>&1; then
         WINDOWS_JSON=$(tmux list-windows -a -F '#{session_name}:#{window_index}|#{window_name}|#{window_panes}|#{window_active}' 2>/dev/null | \
             while IFS='|' read -r sw wn pc act; do
                 is_claude="false"
@@ -195,7 +204,7 @@ if [[ "$JSON_OUTPUT" == "true" ]]; then
     _team_cfg="${HOME}/.shipwright/team-config.json"
     if [[ -f "$_team_cfg" ]]; then
         _dash_url=$(jq -r '.dashboard_url // ""' "$_team_cfg" 2>/dev/null || true)
-        if [[ -n "$_dash_url" ]] && command -v curl &>/dev/null; then
+        if [[ -n "$_dash_url" ]] && command -v curl >/dev/null 2>&1; then
             _api_resp=$(curl -s --max-time 3 "${_dash_url}/api/status" 2>/dev/null || echo "")
             if [[ -n "$_api_resp" ]] && echo "$_api_resp" | jq empty 2>/dev/null; then
                 _online=$(echo "$_api_resp" | jq '.total_online // 0' 2>/dev/null || echo "0")
@@ -211,7 +220,7 @@ if [[ "$JSON_OUTPUT" == "true" ]]; then
     # -- database --
     DATABASE_JSON="null"
     _db_file="${HOME}/.shipwright/shipwright.db"
-    if command -v sqlite3 &>/dev/null && [[ -f "$_db_file" ]]; then
+    if command -v sqlite3 >/dev/null 2>&1 && [[ -f "$_db_file" ]]; then
         _db_ver=$(sqlite3 "$_db_file" "SELECT MAX(version) FROM _schema;" 2>/dev/null || echo "0")
         _db_wal=$(sqlite3 "$_db_file" "PRAGMA journal_mode;" 2>/dev/null || echo "unknown")
         _db_events=$(sqlite3 "$_db_file" "SELECT COUNT(*) FROM events;" 2>/dev/null || echo "0")
@@ -433,7 +442,7 @@ if [[ -f "$STATE_FILE" ]]; then
             # Calculate uptime
             uptime_str=""
             if [[ "$started_at" != "unknown" && "$started_at" != "null" ]]; then
-                start_epoch=$(TZ=UTC date -j -f "%Y-%m-%dT%H:%M:%SZ" "$started_at" +%s 2>/dev/null || echo 0)
+                start_epoch=$(_parse_iso_epoch "$started_at")
                 if [[ "$start_epoch" -gt 0 ]]; then
                     now_e=$(date +%s)
                     elapsed=$((now_e - start_epoch))
@@ -471,7 +480,7 @@ if [[ -f "$STATE_FILE" ]]; then
                 # Time elapsed
                 age_str=""
                 if [[ -n "$a_started" && "$a_started" != "null" ]]; then
-                    s_epoch=$(TZ=UTC date -j -f "%Y-%m-%dT%H:%M:%SZ" "$a_started" +%s 2>/dev/null || echo 0)
+                    s_epoch=$(_parse_iso_epoch "$a_started")
                     if [[ "$s_epoch" -gt 0 ]]; then
                         now_e=$(date +%s)
                         el=$((now_e - s_epoch))
@@ -592,7 +601,7 @@ if [[ -f "$STATE_FILE" ]]; then
                     # Format timestamp as HH:MM
                     evt_time=""
                     if [[ -n "$evt_ts" && "$evt_ts" != "null" ]]; then
-                        evt_time=$(TZ=UTC date -j -f "%Y-%m-%dT%H:%M:%SZ" "$evt_ts" +"%H:%M" 2>/dev/null || echo "")
+                        evt_time=$(_format_iso_time "$evt_ts" "+%H:%M")
                     fi
 
                     case "$evt_type" in
@@ -678,7 +687,7 @@ if [[ -d "$HEARTBEAT_DIR" ]]; then
 
         for hb_file in "${HEARTBEAT_DIR}"/*.json; do
             [[ -f "$hb_file" ]] || continue
-            local_job_id="$(basename "$hb_file" .json)"
+            job_id="$(basename "$hb_file" .json)"
             hb_pid=$(jq -r '.pid // ""' "$hb_file" 2>/dev/null || true)
             hb_stage=$(jq -r '.stage // ""' "$hb_file" 2>/dev/null || true)
             hb_issue=$(jq -r '.issue // ""' "$hb_file" 2>/dev/null || true)
@@ -696,7 +705,7 @@ if [[ -d "$HEARTBEAT_DIR" ]]; then
             # Calculate age
             hb_age_str=""
             if [[ -n "$hb_updated" && "$hb_updated" != "null" ]]; then
-                hb_epoch=$(TZ=UTC date -j -f "%Y-%m-%dT%H:%M:%SZ" "$hb_updated" +%s 2>/dev/null || echo 0)
+                hb_epoch=$(_parse_iso_epoch "$hb_updated")
                 if [[ "$hb_epoch" -gt 0 ]]; then
                     now_e=$(date +%s)
                     hb_age=$((now_e - hb_epoch))
@@ -714,7 +723,7 @@ if [[ -d "$HEARTBEAT_DIR" ]]; then
                 hb_icon="${RED}●${RESET}"
             fi
 
-            echo -e "  ${hb_icon} ${BOLD}${local_job_id}${RESET}  ${DIM}pid:${hb_pid}${RESET}"
+            echo -e "  ${hb_icon} ${BOLD}${job_id}${RESET}  ${DIM}pid:${hb_pid}${RESET}"
             detail_line="    "
             [[ -n "$hb_issue" && "$hb_issue" != "null" && "$hb_issue" != "0" ]] && detail_line+="${CYAN}#${hb_issue}${RESET}  "
             [[ -n "$hb_stage" && "$hb_stage" != "null" ]] && detail_line+="${BLUE}${hb_stage}${RESET}  "
@@ -753,7 +762,7 @@ fi
 # ─── Database ────────────────────────────────────────────────────────────
 
 _DB_FILE="${HOME}/.shipwright/shipwright.db"
-if command -v sqlite3 &>/dev/null && [[ -f "$_DB_FILE" ]]; then
+if command -v sqlite3 >/dev/null 2>&1 && [[ -f "$_DB_FILE" ]]; then
     echo ""
     echo -e "${PURPLE}${BOLD}  DATABASE${RESET}  ${DIM}~/.shipwright/shipwright.db${RESET}"
     echo -e "${DIM}  ──────────────────────────────────────────${RESET}"
@@ -773,14 +782,14 @@ fi
 # ─── Connected Developers ─────────────────────────────────────────────────
 
 # Check if curl and jq are available
-if command -v curl &>/dev/null && command -v jq &>/dev/null; then
+if command -v curl >/dev/null 2>&1 && command -v jq >/dev/null 2>&1; then
     # Read dashboard URL from config, fall back to default
     TEAM_CONFIG="${HOME}/.shipwright/team-config.json"
     DASHBOARD_URL=""
     if [[ -f "$TEAM_CONFIG" ]]; then
         DASHBOARD_URL=$(jq -r '.dashboard_url // ""' "$TEAM_CONFIG" 2>/dev/null || true)
     fi
-    [[ -z "$DASHBOARD_URL" ]] && DASHBOARD_URL="http://localhost:8767"
+    [[ -z "$DASHBOARD_URL" ]] && DASHBOARD_URL="http://localhost:$(_config_get_int "dashboard.port" 8767)"
 
     # Try to reach the dashboard /api/team endpoint with 3s timeout
     api_response=$(curl -s --max-time 3 "$DASHBOARD_URL/api/team" 2>/dev/null || true)

package/scripts/sw-strategic.sh

@@ -7,7 +7,7 @@
 # When sourced, do NOT add set -euo pipefail — the parent handles that.
 # When run directly, main() sets up the error handling.
 
-VERSION="2.3.1"
+VERSION="3.0.0"
 
 # ─── Paths (set defaults if not provided by parent) ──────────────────────────
 SCRIPT_DIR="${SCRIPT_DIR:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}"
@@ -34,15 +34,14 @@ 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
-CYAN="${CYAN:-\033[38;2;0;212;255m}"
-PURPLE="${PURPLE:-\033[38;2;124;58;237m}"
-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}"
-
+# Color fallbacks when helpers not loaded (e.g. test env with overridden SCRIPT_DIR)
+[[ -z "${PURPLE+set}" ]] && PURPLE='\033[38;2;124;58;237m'
+[[ -z "${BOLD+set}" ]] && BOLD='\033[1m'
+[[ -z "${DIM+set}" ]] && DIM='\033[2m'
+[[ -z "${RESET+set}" ]] && RESET='\033[0m'
+[[ -z "${YELLOW+set}" ]] && YELLOW='\033[38;2;250;204;21m'
+[[ -z "${GREEN+set}" ]] && GREEN='\033[38;2;74;222;128m'
+[[ -z "${RED+set}" ]] && RED='\033[38;2;248;113;113m'
 # ─── Constants (policy overrides when config/policy.json exists) ─────────────
 STRATEGIC_MAX_ISSUES=5
 STRATEGIC_COOLDOWN_SECONDS=14400  # 4 hours
@@ -52,7 +51,7 @@ STRATEGIC_STRATEGY_LINES=200
 STRATEGIC_LABELS="auto-patrol,ready-to-build,strategic,shipwright"
 STRATEGIC_OVERLAP_THRESHOLD=60  # Skip if >60% word overlap
 [[ -f "${SCRIPT_DIR:-}/lib/policy.sh" ]] && source "${SCRIPT_DIR:-}/lib/policy.sh"
-if type policy_get &>/dev/null 2>&1; then
+if type policy_get >/dev/null 2>&1; then
     STRATEGIC_MAX_ISSUES=$(policy_get ".strategic.max_issues_per_cycle" "5")
     STRATEGIC_COOLDOWN_SECONDS=$(policy_get ".strategic.cooldown_seconds" "14400")
     STRATEGIC_STRATEGY_LINES=$(policy_get ".strategic.strategy_lines" "200")
@@ -118,6 +117,55 @@ strategic_load_title_cache() {
 ${closed_titles}"
 }
 
+# ─── Outcome Tracking (Learning Loop) ────────────────────────────────────────
+# Tracks which strategic issues shipped vs closed unshipped, so we learn from outcomes.
+strategic_track_outcomes() {
+    local outcomes_file="$HOME/.shipwright/strategic/outcomes.jsonl"
+    mkdir -p "$HOME/.shipwright/strategic"
+
+    if [[ "${NO_GITHUB:-false}" == "true" ]]; then
+        return 0
+    fi
+
+    local strategic_issues
+    strategic_issues=$(gh issue list --label "strategic" --state all --json number,title,state,closedAt,labels --limit 50 2>/dev/null) || return 0
+
+    [[ -z "$strategic_issues" || "$strategic_issues" == "[]" ]] && return 0
+
+    touch "$outcomes_file" 2>/dev/null || true
+
+    while IFS= read -r issue; do
+        [[ -z "$issue" || "$issue" == "null" ]] && continue
+        local num title state
+        num=$(echo "$issue" | jq -r '.number')
+        title=$(echo "$issue" | jq -r '.title')
+        state=$(echo "$issue" | jq -r '.state')
+
+        # Check if already tracked
+        if grep -q "\"issue\":$num" "$outcomes_file" 2>/dev/null; then
+            continue
+        fi
+
+        # Determine outcome
+        local outcome="pending"
+        local success=false
+        if [[ "$state" == "CLOSED" ]]; then
+            local merged_prs
+            merged_prs=$(gh pr list --search "closes #$num" --state merged --json number --limit 1 2>/dev/null)
+            if [[ "$(echo "$merged_prs" | jq 'length' 2>/dev/null)" -gt 0 ]]; then
+                outcome="shipped"
+                success=true
+            else
+                outcome="closed_unshipped"
+            fi
+        fi
+
+        local title_escaped
+        title_escaped=$(echo "$title" | jq -R . 2>/dev/null || echo "null")
+        echo "{\"issue\":$num,\"title\":$title_escaped,\"outcome\":\"$outcome\",\"success\":$success,\"tracked_at\":\"$(date -u +%Y-%m-%dT%H:%M:%SZ)\"}" >> "$outcomes_file"
+    done < <(echo "$strategic_issues" | jq -c '.[]' 2>/dev/null)
+}
+
 # Check if a title has >threshold% overlap with any cached title.
 # Returns 0 (true) if a near-duplicate is found, 1 (false) otherwise.
 strategic_is_near_duplicate() {
@@ -340,6 +388,25 @@ strategic_build_prompt() {
         recent_closed="(GitHub access disabled)"
     fi
 
+    # Outcome history (shipped vs closed_unshipped) — learning loop
+    local outcomes_section="(No past outcomes yet — run a few cycles to build history)"
+    local outcomes_file="$HOME/.shipwright/strategic/outcomes.jsonl"
+    if [[ -f "$outcomes_file" ]]; then
+        local shipped failed
+        shipped=$(grep '"outcome":"shipped"' "$outcomes_file" 2>/dev/null | tail -10 | jq -r '.title' 2>/dev/null | sed 's/^/  - SUCCEEDED: /' || true)
+        failed=$(grep -E '"outcome":"closed_unshipped"' "$outcomes_file" 2>/dev/null | tail -10 | jq -r '.title' 2>/dev/null | sed 's/^/  - FAILED: /' || true)
+        if [[ -n "$shipped" || -n "$failed" ]]; then
+            outcomes_section="
+Learn from these outcomes. Suggest more things like the successes, avoid patterns similar to failures.
+
+SUCCEEDED (shipped with merged PR):
+${shipped:-  (none yet)}
+
+FAILED (closed without shipping):
+${failed:-  (none yet)}"
+        fi
+    fi
+
     # Platform health (hygiene + platform-refactor scan) — for AGI-level self-improvement
     local platform_health_section="(No platform hygiene data — run \`shipwright hygiene platform-refactor\` or \`shipwright hygiene scan\` to generate .claude/platform-hygiene.json)"
     if [[ -f "${repo_dir}/.claude/platform-hygiene.json" ]]; then
@@ -381,6 +448,9 @@ ${recent_closed}
 ## Platform Health (refactor / hardcoded / AGI-level readiness)
 ${platform_health_section}
 
+## Past Strategic Suggestions and Outcomes (learn from these)
+${outcomes_section}
+
 ## Your Task
 Based on the strategy priorities and current data, recommend 1-3 concrete improvements to build next. Each should be a single, well-scoped task completable by one autonomous pipeline run.
 
@@ -395,6 +465,7 @@ ACCEPTANCE: <bullet list of acceptance criteria, one per line starting with "- "
 ---
 
 Rules:
+- Learn from PAST STRATEGIC SUGGESTIONS: prefer patterns that succeeded, avoid patterns similar to failures
 - Do NOT duplicate any open issue OR any recently completed issue
 - Prioritize based on STRATEGY.md priorities (P0 > P1 > P2 > ...)
 - Focus on concrete, actionable improvements (not vague goals)
@@ -416,7 +487,7 @@ strategic_call_api() {
         return 1
     fi
 
-    if ! command -v claude &>/dev/null; then
+    if ! command -v claude >/dev/null 2>&1; then
         error "Claude Code CLI not found — install with: npm install -g @anthropic-ai/claude-code"
         return 1
     fi
@@ -659,6 +730,10 @@ strategic_run() {
         return 1
     fi
 
+    # Track outcomes of past strategic issues (learning loop)
+    info "Tracking outcomes of past strategic issues..."
+    strategic_track_outcomes || true
+
     # Load existing issue titles for semantic dedup
     info "Loading issue title cache for dedup..."
     strategic_load_title_cache
@@ -757,6 +832,45 @@ strategic_status() {
     echo ""
 }
 
+# ─── Outcomes Command ─────────────────────────────────────────────────────────
+strategic_outcomes() {
+    local outcomes_file="$HOME/.shipwright/strategic/outcomes.jsonl"
+
+    echo -e "\n${PURPLE}${BOLD}━━━ Strategic Outcomes (Learning Loop) ━━━${RESET}\n"
+
+    if [[ ! -f "$outcomes_file" ]]; then
+        info "No outcomes tracked yet. Run \`shipwright strategic run\` to start the learning loop."
+        echo ""
+        return 0
+    fi
+
+    local shipped_count failed_count pending_count
+    shipped_count=$(grep -c '"outcome":"shipped"' "$outcomes_file" 2>/dev/null || echo "0")
+    failed_count=$(grep -cE '"outcome":"closed_unshipped"' "$outcomes_file" 2>/dev/null || echo "0")
+    pending_count=$(grep -c '"outcome":"pending"' "$outcomes_file" 2>/dev/null || echo "0")
+
+    echo -e "  ${GREEN}Shipped:${RESET}       $shipped_count (closed with merged PR)"
+    echo -e "  ${RED}Closed unshipped:${RESET} $failed_count (closed without merge)"
+    echo -e "  ${DIM}Pending:${RESET}        $pending_count (still open)"
+    echo ""
+
+    echo -e "  ${BOLD}Recent shipped:${RESET}"
+    grep '"outcome":"shipped"' "$outcomes_file" 2>/dev/null | tail -5 | while IFS= read -r line; do
+        local title
+        title=$(echo "$line" | jq -r '.title // "?"' 2>/dev/null)
+        echo -e "    ${GREEN}✓${RESET} $title"
+    done
+    echo ""
+
+    echo -e "  ${BOLD}Recent failed (closed without shipping):${RESET}"
+    grep -E '"outcome":"closed_unshipped"' "$outcomes_file" 2>/dev/null | tail -5 | while IFS= read -r line; do
+        local title
+        title=$(echo "$line" | jq -r '.title // "?"' 2>/dev/null)
+        echo -e "    ${RED}✗${RESET} $title"
+    done
+    echo ""
+}
+
 # ─── Help ─────────────────────────────────────────────────────────────────────
 strategic_show_help() {
     echo -e "${PURPLE}${BOLD}Shipwright Strategic Intelligence Agent${RESET} v${VERSION}\n"
@@ -765,7 +879,8 @@ strategic_show_help() {
     echo -e "  sw-strategic.sh <command>\n"
     echo -e "${BOLD}Commands:${RESET}"
     echo -e "  run [--force]  Run a strategic analysis cycle (--force bypasses cooldown)"
-    echo -e "  status         Show last run stats and cooldown"
+    echo -e "  status        Show last run stats and cooldown"
+    echo -e "  outcomes      Show outcome tracking (shipped vs failed suggestions)"
     echo -e "  help           Show this help\n"
     echo -e "${BOLD}Environment:${RESET}"
     echo -e "  CLAUDE_CODE_OAUTH_TOKEN  Required for Claude access"
@@ -806,6 +921,7 @@ if [[ "${BASH_SOURCE[0]}" == "$0" ]]; then
         case "$cmd" in
             run)     strategic_run "$@" ;;
             status)  strategic_status ;;
+            outcomes) strategic_outcomes ;;
             help)    strategic_show_help ;;
             *)
                 error "Unknown command: $cmd"

package/scripts/sw-stream.sh

@@ -5,7 +5,7 @@
 # ║  Streams tmux pane output in real-time to the dashboard or CLI.         ║
 # ║  Captures output periodically, tags by agent/team, supports replay.     ║
 # ╚═══════════════════════════════════════════════════════════════════════════╝
-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}"
-
 # ─── Stream configuration ─────────────────────────────────────────────────────
 STREAM_CONFIG="${HOME}/.shipwright/stream-config.json"
 STREAM_DIR="${HOME}/.shipwright/streams"

package/scripts/sw-swarm.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)"
 
@@ -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}"
-
 # ─── Constants ──────────────────────────────────────────────────────────────
 SWARM_DIR="${HOME}/.shipwright/swarm"
 REGISTRY_FILE="${SWARM_DIR}/registry.json"
@@ -197,12 +187,12 @@ cmd_spawn() {
     mv "$tmp_file" "$REGISTRY_FILE" || { rm -f "$tmp_file"; error "Failed to update registry"; return 1; }
     record_metric "$agent_id" "spawn" "1" "$agent_type"
 
-    # Create real tmux session for the agent (so scale/loop can send commands)
-    if command -v tmux &>/dev/null; then
+    # Create real tmux session for the agent (run actual daemon)
+    if command -v tmux >/dev/null 2>&1; then
         local session_name="swarm-${agent_id}"
         if ! tmux has-session -t "$session_name" 2>/dev/null; then
             tmux new-session -d -s "$session_name" -c "$REPO_DIR" \
-                "echo \"Agent $agent_id ready (type: $agent_type)\"; while true; do sleep 3600; done" 2>/dev/null && \
+                "SW_AGENT_ROLE=builder bash scripts/sw-daemon.sh start --role builder 2>&1 | tee /tmp/sw-swarm-${agent_id}.log" 2>/dev/null && \
                 info "Tmux session created: $session_name" || warn "Tmux session creation failed (agent still in registry)"
         fi
     fi
@@ -250,7 +240,7 @@ cmd_retire() {
 
     # Kill real tmux session if present
     local session_name="swarm-${agent_id}"
-    if command -v tmux &>/dev/null && tmux has-session -t "$session_name" 2>/dev/null; then
+    if command -v tmux >/dev/null 2>&1 && tmux has-session -t "$session_name" 2>/dev/null; then
         tmux kill-session -t "$session_name" 2>/dev/null && info "Tmux session killed: $session_name" || warn "Tmux kill failed for $session_name"
     fi
 
@@ -342,37 +332,87 @@ cmd_health() {
     fi
 }
 
+# ─── Swarm spawn helper (for cmd_scale) ───────────────────────────────────
+swarm_spawn_agent() {
+    local role="${1:-builder}"
+    local count="${2:-1}"
+    local i
+    for i in $(seq 1 "$count"); do
+        cmd_spawn "standard" 2>/dev/null || true
+    done
+}
+
 # ─── Auto-scale logic ────────────────────────────────────────────────────
 cmd_scale() {
+    local target="${1:-auto}"
+
     ensure_dirs
     init_registry
     init_config
 
-    local auto_scale_enabled
-    auto_scale_enabled=$(jq -r '.auto_scaling_enabled' "$CONFIG_FILE")
+    if [[ "$target" == "auto" ]]; then
+        # Auto-scale based on queue depth
+        local queue_depth=0
+        local state_file="$HOME/.shipwright/daemon-state.json"
+        if [[ -f "$state_file" ]]; then
+            queue_depth=$(jq '.queued | length' "$state_file" 2>/dev/null || echo "0")
+        fi
 
-    if [[ "$auto_scale_enabled" != "true" ]]; then
-        warn "Auto-scaling is disabled"
-        return 0
-    fi
+        local current_agents
+        current_agents=$(tmux list-sessions -F '#{session_name}' 2>/dev/null | grep -cE '^shipwright-sw-agent|^swarm-' || echo "0")
 
-    local min_agents max_agents target_util
-    min_agents=$(jq -r '.min_agents // 1' "$CONFIG_FILE")
-    max_agents=$(jq -r '.max_agents // 8' "$CONFIG_FILE")
-    target_util=$(jq -r '.target_utilization // 0.75' "$CONFIG_FILE")
+        local target_agents=1
+        if [[ "$queue_depth" -gt 5 ]]; then
+            target_agents=3
+        elif [[ "$queue_depth" -gt 2 ]]; then
+            target_agents=2
+        fi
 
-    local active_count
-    active_count=$(jq -r '.active_count // 0' "$REGISTRY_FILE")
+        if [[ "$current_agents" -lt "$target_agents" ]]; then
+            local to_spawn=$((target_agents - current_agents))
+            echo "Queue depth: $queue_depth, scaling up by $to_spawn"
+            swarm_spawn_agent "builder" "$to_spawn"
+        elif [[ "$current_agents" -gt "$target_agents" && "$current_agents" -gt 1 ]]; then
+            local to_retire=$((current_agents - target_agents))
+            echo "Queue depth: $queue_depth, scaling down by $to_retire"
+            # Retire oldest agents from registry (tmux sessions are managed by scale down)
+            local registry_count
+            registry_count=$(jq -r '.agents | length' "$REGISTRY_FILE" 2>/dev/null || echo "0")
+            local retired=0
+            if [[ "$registry_count" -gt 0 ]] && [[ "$to_retire" -gt 0 ]]; then
+                local agent_id
+                agent_id=$(jq -r '.agents[0].id // empty' "$REGISTRY_FILE" 2>/dev/null)
+                if [[ -n "$agent_id" ]]; then
+                    cmd_retire "$agent_id" 2>/dev/null && retired=1 || true
+                fi
+            fi
+        else
+            echo "Queue depth: $queue_depth, agents: $current_agents (optimal)"
+        fi
+    else
+        # Scale to specific count - show current state
+        local auto_scale_enabled
+        auto_scale_enabled=$(jq -r '.auto_scaling_enabled' "$CONFIG_FILE")
 
-    # TODO: Implement queue depth and resource monitoring
-    # For now, just show current state
-    info "Auto-Scaling Analysis"
-    echo ""
-    echo -e "  Current agents:     ${CYAN}${active_count}/${max_agents}${RESET}"
-    echo -e "  Min agents:         ${CYAN}${min_agents}${RESET}"
-    echo -e "  Target utilization: ${CYAN}${target_util}${RESET}"
-    echo ""
-    echo -e "  ${DIM}Queue depth monitoring and scaling recommendations require active pipeline${RESET}"
+        if [[ "$auto_scale_enabled" != "true" ]]; then
+            warn "Auto-scaling is disabled"
+        fi
+
+        local min_agents max_agents target_util
+        min_agents=$(jq -r '.min_agents // 1' "$CONFIG_FILE")
+        max_agents=$(jq -r '.max_agents // 8' "$CONFIG_FILE")
+        target_util=$(jq -r '.target_utilization // 0.75' "$CONFIG_FILE")
+
+        local active_count
+        active_count=$(jq -r '.active_count // 0' "$REGISTRY_FILE")
+
+        info "Auto-Scaling Analysis"
+        echo ""
+        echo -e "  Current agents:     ${CYAN}${active_count}/${max_agents}${RESET}"
+        echo -e "  Min agents:         ${CYAN}${min_agents}${RESET}"
+        echo -e "  Target utilization: ${CYAN}${target_util}${RESET}"
+        echo ""
+    fi
 }
 
 # ─── Performance leaderboard ──────────────────────────────────────────────

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="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"
 
@@ -182,7 +172,7 @@ cmd_delegate() {
                 result: null
             }')
         tasks=$(echo "$tasks" | jq ". += [$task_json]")
-        ((file_count++))
+        file_count=$((file_count + 1))
     done < <(echo "$changed_files")
 
     # Output delegation result
@@ -216,7 +206,7 @@ cmd_status() {
         for team_file in "$TEAM_STATE_DIR"/*.json; do
             [[ -f "$team_file" ]] || continue
             local ts
-            ts=$(stat -f %Bm "$team_file" 2>/dev/null || stat -c %Y "$team_file" 2>/dev/null || echo 0)
+            ts=$(file_mtime "$team_file")
             local name
             name=$(basename "$team_file" .json)
             local status
@@ -255,7 +245,7 @@ cmd_status() {
         local spec_status
         spec_status=$(echo "$team_json" | jq -r ".specialist_status[$spec_idx] // \"pending\"" 2>/dev/null || echo "pending")
         printf "    ${DIM}%-3d${RESET}  %-20s  %-15s\n" "$((spec_idx + 1))" "$spec" "$spec_status"
-        ((spec_idx++))
+        spec_idx=$((spec_idx + 1))
     done < <(echo "$specs")
     echo ""
 }
@@ -292,11 +282,11 @@ cmd_vote() {
         local verdict
         verdict=$(echo "$team_json" | jq -r ".verdicts[\"$spec\"]? // \"neutral\"" 2>/dev/null || echo "neutral")
         case "$verdict" in
-            approve) ((approve_count++)) ;;
-            reject)  ((reject_count++)) ;;
-            *)       ((neutral_count++)) ;;
+            approve) approve_count=$((approve_count + 1)) ;;
+            reject)  reject_count=$((reject_count + 1)) ;;
+            *)       neutral_count=$((neutral_count + 1)) ;;
         esac
-        ((total++))
+        total=$((total + 1))
     done < <(echo "$specs")
 
     # Consensus: majority vote with leader tiebreak
@@ -370,9 +360,9 @@ cmd_aggregate() {
 
         if [[ -n "$result" ]]; then
             if echo "$result" | jq -e '.success' >/dev/null 2>&1; then
-                ((success_count++))
+                success_count=$((success_count + 1))
             else
-                ((failure_count++))
+                failure_count=$((failure_count + 1))
             fi
             results=$(echo "$results" | jq ". += [$result]")
         fi