shipwright-cli 2.0.0 → 2.1.1

package/scripts/sw-status.sh

@@ -4,7 +4,7 @@
 # ║                                                                          ║
 # ║  Shows running teams, agent windows, and task progress.                  ║
 # ╚═══════════════════════════════════════════════════════════════════════════╝
-VERSION="2.0.0"
+VERSION="2.1.1"
 set -euo pipefail
 trap 'echo "ERROR: $BASH_SOURCE:$LINENO exited with status $?" >&2' ERR
 
@@ -188,6 +188,26 @@ if [[ "$JSON_OUTPUT" == "true" ]]; then
         fi
     fi
 
+    # -- database --
+    DATABASE_JSON="null"
+    _db_file="${HOME}/.shipwright/shipwright.db"
+    if command -v sqlite3 &>/dev/null && [[ -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")
+        _db_runs=$(sqlite3 "$_db_file" "SELECT COUNT(*) FROM pipeline_runs;" 2>/dev/null || echo "0")
+        _db_costs=$(sqlite3 "$_db_file" "SELECT COUNT(*) FROM cost_entries;" 2>/dev/null || echo "0")
+        _db_size=$(ls -l "$_db_file" 2>/dev/null | awk '{print $5}')
+        DATABASE_JSON=$(jq -n \
+            --argjson schema_version "${_db_ver:-0}" \
+            --arg wal_mode "$_db_wal" \
+            --argjson events "${_db_events:-0}" \
+            --argjson runs "${_db_runs:-0}" \
+            --argjson costs "${_db_costs:-0}" \
+            --argjson size_bytes "${_db_size:-0}" \
+            '{schema_version:$schema_version, wal_mode:$wal_mode, events:$events, runs:$runs, costs:$costs, size_bytes:$size_bytes}') || DATABASE_JSON="null"
+    fi
+
     # -- assemble and output --
     jq -n \
         --arg version "$VERSION" \
@@ -200,6 +220,7 @@ if [[ "$JSON_OUTPUT" == "true" ]]; then
         --argjson heartbeats "$HEARTBEATS_JSON" \
         --argjson remote_machines "$MACHINES_JSON" \
         --argjson connected_developers "$DEVELOPERS_JSON" \
+        --argjson database "$DATABASE_JSON" \
         '{
             version: $version,
             timestamp: $timestamp,
@@ -210,7 +231,8 @@ if [[ "$JSON_OUTPUT" == "true" ]]; then
             issue_tracker: $issue_tracker,
             heartbeats: $heartbeats,
             remote_machines: $remote_machines,
-            connected_developers: $connected_developers
+            connected_developers: $connected_developers,
+            database: $database
         }'
     exit 0
 fi
@@ -708,6 +730,26 @@ if [[ -f "$MACHINES_FILE" ]]; then
     fi
 fi
 
+# ─── Database ────────────────────────────────────────────────────────────
+
+_DB_FILE="${HOME}/.shipwright/shipwright.db"
+if command -v sqlite3 &>/dev/null && [[ -f "$_DB_FILE" ]]; then
+    echo ""
+    echo -e "${PURPLE}${BOLD}  DATABASE${RESET}  ${DIM}~/.shipwright/shipwright.db${RESET}"
+    echo -e "${DIM}  ──────────────────────────────────────────${RESET}"
+
+    _db_wal=$(sqlite3 "$_DB_FILE" "PRAGMA journal_mode;" 2>/dev/null || echo "?")
+    _db_ver=$(sqlite3 "$_DB_FILE" "SELECT MAX(version) FROM _schema;" 2>/dev/null || echo "?")
+    _db_size_bytes=$(ls -l "$_DB_FILE" 2>/dev/null | awk '{print $5}')
+    _db_size_mb=$(awk -v s="${_db_size_bytes:-0}" 'BEGIN { printf "%.1f", s / 1048576 }')
+    _db_events=$(sqlite3 "$_DB_FILE" "SELECT COUNT(*) FROM events;" 2>/dev/null || echo "0")
+    _db_runs=$(sqlite3 "$_DB_FILE" "SELECT COUNT(*) FROM pipeline_runs;" 2>/dev/null || echo "0")
+    _db_costs=$(sqlite3 "$_DB_FILE" "SELECT COUNT(*) FROM cost_entries;" 2>/dev/null || echo "0")
+
+    echo -e "  ${GREEN}●${RESET} ${BOLD}SQLite${RESET}  ${DIM}v${_db_ver} WAL=${_db_wal} ${_db_size_mb}MB${RESET}"
+    echo -e "    ${DIM}events:${_db_events}  runs:${_db_runs}  costs:${_db_costs}${RESET}"
+fi
+
 # ─── Connected Developers ─────────────────────────────────────────────────
 
 # Check if curl and jq are available

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.0.0"
+VERSION="2.1.1"
 
 # ─── Colors (matches Seth's tmux theme) ─────────────────────────────────────
 CYAN='\033[38;2;0;212;255m'
@@ -57,11 +57,92 @@ if [[ "$(type -t emit_event 2>/dev/null)" != "function" ]]; then
 fi
 
 # ─── Constants ────────────────────────────────────────────────────────────────
-STRATEGIC_MAX_ISSUES=3
-STRATEGIC_COOLDOWN_SECONDS=43200  # 12 hours
-STRATEGIC_MODEL="claude-haiku-4-5-20251001"
-STRATEGIC_MAX_TOKENS=2048
+STRATEGIC_MAX_ISSUES=5
+STRATEGIC_COOLDOWN_SECONDS=14400  # 4 hours
+STRATEGIC_MODEL="claude-sonnet-4-5-20250929"
+STRATEGIC_MAX_TOKENS=4096
 STRATEGIC_STRATEGY_LINES=200
+STRATEGIC_LABELS="auto-patrol,ready-to-build,strategic,shipwright"
+
+# ─── Semantic Dedup ─────────────────────────────────────────────────────────
+# Cache of existing issue titles (open + recently closed) loaded at cycle start.
+STRATEGIC_TITLE_CACHE=""
+STRATEGIC_OVERLAP_THRESHOLD=60  # Skip if >60% word overlap
+
+# Compute word-overlap similarity between two titles (0-100).
+# Uses lowercase word sets, ignoring common stop words.
+strategic_word_overlap() {
+    local title_a="$1"
+    local title_b="$2"
+
+    # Normalize: lowercase, strip punctuation, split to words, basic stemming
+    local words_a words_b
+    words_a=$(printf '%s' "$title_a" | tr '[:upper:]' '[:lower:]' | tr -cs '[:alnum:]' '\n' | \
+        sed -E 's/ations?$//; s/tions?$//; s/ments?$//; s/ings?$//; s/ness$//; s/ies$/y/; s/([^s])s$/\1/' | \
+        sort -u | grep -vE '^(a|an|the|and|or|for|to|in|of|is|it|by|on|at|with|from|based)$' | grep -v '^$' || true)
+    words_b=$(printf '%s' "$title_b" | tr '[:upper:]' '[:lower:]' | tr -cs '[:alnum:]' '\n' | \
+        sed -E 's/ations?$//; s/tions?$//; s/ments?$//; s/ings?$//; s/ness$//; s/ies$/y/; s/([^s])s$/\1/' | \
+        sort -u | grep -vE '^(a|an|the|and|or|for|to|in|of|is|it|by|on|at|with|from|based)$' | grep -v '^$' || true)
+
+    [[ -z "$words_a" || -z "$words_b" ]] && echo "0" && return 0
+
+    # Count words in each set
+    local count_a count_b
+    count_a=$(printf '%s\n' "$words_a" | wc -l | tr -d ' ')
+    count_b=$(printf '%s\n' "$words_b" | wc -l | tr -d ' ')
+
+    # Count shared words (intersection)
+    local shared
+    shared=$(comm -12 <(printf '%s\n' "$words_a") <(printf '%s\n' "$words_b") | wc -l | tr -d ' ')
+
+    # Overlap = shared / min(count_a, count_b) * 100
+    local min_count
+    if [[ "$count_a" -le "$count_b" ]]; then
+        min_count="$count_a"
+    else
+        min_count="$count_b"
+    fi
+
+    [[ "$min_count" -eq 0 ]] && echo "0" && return 0
+
+    echo $(( shared * 100 / min_count ))
+}
+
+# Load all open + recently closed issue titles into cache.
+strategic_load_title_cache() {
+    STRATEGIC_TITLE_CACHE=""
+
+    if [[ "${NO_GITHUB:-false}" == "true" ]]; then
+        return 0
+    fi
+
+    local open_titles closed_titles
+    open_titles=$(gh issue list --state open --json title --jq '.[].title' 2>/dev/null || echo "")
+    closed_titles=$(gh issue list --state closed --limit 30 --json title --jq '.[].title' 2>/dev/null || echo "")
+
+    STRATEGIC_TITLE_CACHE="${open_titles}
+${closed_titles}"
+}
+
+# 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() {
+    local new_title="$1"
+
+    [[ -z "$STRATEGIC_TITLE_CACHE" ]] && return 1
+
+    while IFS= read -r existing_title; do
+        [[ -z "$existing_title" ]] && continue
+        local overlap
+        overlap=$(strategic_word_overlap "$new_title" "$existing_title")
+        if [[ "$overlap" -gt "$STRATEGIC_OVERLAP_THRESHOLD" ]]; then
+            info "  Near-duplicate (${overlap}% overlap): \"${existing_title}\"" >&2
+            return 0
+        fi
+    done <<< "$STRATEGIC_TITLE_CACHE"
+
+    return 1
+}
 
 # ─── Cooldown Check ──────────────────────────────────────────────────────────
 strategic_check_cooldown() {
@@ -257,6 +338,14 @@ strategic_build_prompt() {
         open_issues="(GitHub access disabled)"
     fi
 
+    # Recently closed issues (last 20) — so we don't rebuild what was just shipped
+    local recent_closed=""
+    if [[ "${NO_GITHUB:-false}" != "true" ]]; then
+        recent_closed=$(gh issue list --state closed --limit 20 --json number,title --jq '.[] | "#\(.number): \(.title)"' 2>/dev/null || echo "(could not fetch)")
+    else
+        recent_closed="(GitHub access disabled)"
+    fi
+
     # Compose the prompt
     cat <<PROMPT_EOF
 You are the Strategic PM for Shipwright — an autonomous software delivery system. Your job is to analyze the current state and recommend 1-3 high-impact improvements to build next.
@@ -278,6 +367,9 @@ ${strategy_content}
 ## Open Issues (already in progress — do NOT duplicate these)
 ${open_issues}
 
+## Recently Completed (already built — do NOT recreate these)
+${recent_closed}
+
 ## 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.
 
@@ -292,12 +384,14 @@ ACCEPTANCE: <bullet list of acceptance criteria, one per line starting with "- "
 ---
 
 Rules:
-- Do NOT duplicate any open issue listed above
+- 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)
 - Each issue should be completable by one autonomous pipeline run
-- Prefer reliability and DX improvements over new features
-- Maximum 3 issues
+- Balance: reliability/DX fixes AND strategic new capabilities
+- Think about what would make the biggest impact on success rate, developer experience, and system intelligence
+- Be ambitious — push the platform forward, don't just maintain it
+- Maximum ${STRATEGIC_MAX_ISSUES} issues
 PROMPT_EOF
 }
 
@@ -320,7 +414,7 @@ strategic_call_api() {
     printf '%s' "$prompt" > "$tmp_prompt"
 
     local response_text
-    response_text=$(claude -p "$(cat "$tmp_prompt")" --max-turns 1 --model "$STRATEGIC_MODEL" 2>/dev/null || echo "")
+    response_text=$(cat "$tmp_prompt" | claude -p --max-turns 1 --model "$STRATEGIC_MODEL" 2>/dev/null || echo "")
     rm -f "$tmp_prompt"
 
     if [[ -z "$response_text" ]]; then
@@ -328,6 +422,14 @@ strategic_call_api() {
         return 1
     fi
 
+    # Strip markdown code fences if present (Sonnet sometimes wraps output)
+    response_text=$(printf '%s' "$response_text" | sed '/^```/d')
+
+    # Debug: show first 200 chars of response
+    local preview
+    preview=$(printf '%s' "$response_text" | head -c 200)
+    info "Response preview: ${preview}..." >&2
+
     printf '%s' "$response_text"
 }
 
@@ -360,7 +462,7 @@ strategic_parse_and_create() {
                 fi
 
                 if [[ "$created" -ge "$STRATEGIC_MAX_ISSUES" ]]; then
-                    info "Reached max issues per cycle (${STRATEGIC_MAX_ISSUES})"
+                    info "Reached max issues per cycle (${STRATEGIC_MAX_ISSUES})" >&2
                     break
                 fi
             fi
@@ -372,34 +474,38 @@ strategic_parse_and_create() {
             continue
         fi
 
-        # Parse fields
-        if [[ "$line" == ISSUE_TITLE:* ]]; then
-            current_title="${line#ISSUE_TITLE: }"
+        # Strip leading markdown bold/italic markers for field matching
+        local clean_line
+        clean_line=$(echo "$line" | sed 's/^\*\*//;s/\*\*$//' | sed 's/^__//;s/__$//' | sed 's/^[[:space:]]*//')
+
+        # Parse fields (match with and without markdown formatting)
+        if [[ "$clean_line" == ISSUE_TITLE:* ]]; then
+            current_title="${clean_line#ISSUE_TITLE: }"
             current_title="${current_title#ISSUE_TITLE:}"
             current_title=$(echo "$current_title" | sed 's/^[[:space:]]*//' | sed 's/[[:space:]]*$//')
             in_acceptance=false
-        elif [[ "$line" == PRIORITY:* ]]; then
-            current_priority="${line#PRIORITY: }"
+        elif [[ "$clean_line" == PRIORITY:* ]]; then
+            current_priority="${clean_line#PRIORITY: }"
             current_priority="${current_priority#PRIORITY:}"
             current_priority=$(echo "$current_priority" | sed 's/^[[:space:]]*//' | sed 's/[[:space:]]*$//')
             in_acceptance=false
-        elif [[ "$line" == COMPLEXITY:* ]]; then
-            current_complexity="${line#COMPLEXITY: }"
+        elif [[ "$clean_line" == COMPLEXITY:* ]]; then
+            current_complexity="${clean_line#COMPLEXITY: }"
             current_complexity="${current_complexity#COMPLEXITY:}"
             current_complexity=$(echo "$current_complexity" | sed 's/^[[:space:]]*//' | sed 's/[[:space:]]*$//')
             in_acceptance=false
-        elif [[ "$line" == STRATEGY_AREA:* ]]; then
-            current_strategy="${line#STRATEGY_AREA: }"
+        elif [[ "$clean_line" == STRATEGY_AREA:* ]]; then
+            current_strategy="${clean_line#STRATEGY_AREA: }"
             current_strategy="${current_strategy#STRATEGY_AREA:}"
             current_strategy=$(echo "$current_strategy" | sed 's/^[[:space:]]*//' | sed 's/[[:space:]]*$//')
             in_acceptance=false
-        elif [[ "$line" == DESCRIPTION:* ]]; then
-            current_description="${line#DESCRIPTION: }"
+        elif [[ "$clean_line" == DESCRIPTION:* ]]; then
+            current_description="${clean_line#DESCRIPTION: }"
             current_description="${current_description#DESCRIPTION:}"
             current_description=$(echo "$current_description" | sed 's/^[[:space:]]*//' | sed 's/[[:space:]]*$//')
             in_acceptance=false
-        elif [[ "$line" == ACCEPTANCE:* ]]; then
-            current_acceptance="${line#ACCEPTANCE: }"
+        elif [[ "$clean_line" == ACCEPTANCE:* ]]; then
+            current_acceptance="${clean_line#ACCEPTANCE: }"
             current_acceptance="${current_acceptance#ACCEPTANCE:}"
             current_acceptance=$(echo "$current_acceptance" | sed 's/^[[:space:]]*//' | sed 's/[[:space:]]*$//')
             in_acceptance=true
@@ -442,9 +548,15 @@ strategic_create_issue() {
         return 1
     fi
 
+    # Semantic dedup: check word overlap against cached titles
+    if strategic_is_near_duplicate "$title"; then
+        info "  Skipping near-duplicate: ${title}" >&2
+        return 1
+    fi
+
     # Dry-run mode
     if [[ "${NO_GITHUB:-false}" == "true" ]]; then
-        info "  [dry-run] Would create: ${title}"
+        info "  [dry-run] Would create: ${title}" >&2
         return 0
     fi
 
@@ -452,7 +564,7 @@ strategic_create_issue() {
     local existing
     existing=$(gh issue list --state open --search "$title" --json number,title --jq ".[].title" 2>/dev/null || echo "")
     if echo "$existing" | grep -qF "$title" 2>/dev/null; then
-        info "  Skipping duplicate: ${title}"
+        info "  Skipping duplicate: ${title}" >&2
         return 1
     fi
 
@@ -479,29 +591,53 @@ $(echo -e "$acceptance")
 BODY_EOF
 )
 
-    local labels="auto-patrol,ready-to-build,strategic"
+    local labels="${STRATEGIC_LABELS}"
+
+    # Ensure all labels exist (create if missing)
+    local IFS=','
+    for lbl in $labels; do
+        gh label create "$lbl" --color "7c3aed" 2>/dev/null || true
+    done
+    unset IFS
 
-    gh issue create \
+    local issue_url
+    issue_url=$(gh issue create \
         --title "$title" \
         --body "$body" \
-        --label "$labels" 2>/dev/null || {
-        warn "  Failed to create issue: ${title}"
+        --label "$labels" 2>/dev/null) || {
+        warn "  Failed to create issue: ${title}" >&2
         return 1
     }
 
     emit_event "strategic.issue_created" "title=$title" "priority=$priority" "complexity=$complexity"
-    success "  Created issue: ${title}"
+    # Add to title cache so subsequent issues in this cycle don't duplicate
+    STRATEGIC_TITLE_CACHE="${STRATEGIC_TITLE_CACHE}
+${title}"
+    # Output to stderr so it doesn't pollute the parse_and_create return value
+    success "  Created issue: ${title} (${issue_url})" >&2
     return 0
 }
 
 # ─── Main Strategic Run ──────────────────────────────────────────────────────
 strategic_run() {
+    local force=false
+    while [[ $# -gt 0 ]]; do
+        case "$1" in
+            --force|-f) force=true; shift ;;
+            *) shift ;;
+        esac
+    done
+
     echo -e "\n${PURPLE}${BOLD}━━━ Strategic Intelligence Agent ━━━${RESET}"
     echo -e "${DIM}  Analyzing codebase, strategy, and metrics...${RESET}\n"
 
-    # Check cooldown
-    if ! strategic_check_cooldown; then
-        return 0
+    # Check cooldown (skip if --force)
+    if [[ "$force" != true ]]; then
+        if ! strategic_check_cooldown; then
+            return 0
+        fi
+    else
+        info "Cooldown bypassed (--force)"
     fi
 
     # Check auth token
@@ -510,6 +646,10 @@ strategic_run() {
         return 1
     fi
 
+    # Load existing issue titles for semantic dedup
+    info "Loading issue title cache for dedup..."
+    strategic_load_title_cache
+
     # Build prompt with all context
     info "Gathering context..."
     local prompt
@@ -539,7 +679,13 @@ strategic_run() {
     echo -e "  Issues skipped: ${skipped} (duplicates)"
     echo ""
 
-    emit_event "strategic.cycle_complete" "issues_created=$created" "issues_skipped=$skipped"
+    # Only record cycle completion if we actually ran analysis (for cooldown tracking)
+    # This prevents a "0 issues" run from burning the cooldown timer
+    if [[ "$created" -gt 0 ]] || [[ "$skipped" -gt 0 ]]; then
+        emit_event "strategic.cycle_complete" "issues_created=$created" "issues_skipped=$skipped"
+    else
+        info "No issues produced — cooldown NOT reset (will retry next cycle)"
+    fi
 }
 
 # ─── Status Command ──────────────────────────────────────────────────────────
@@ -605,14 +751,16 @@ strategic_show_help() {
     echo -e "${BOLD}Usage:${RESET}"
     echo -e "  sw-strategic.sh <command>\n"
     echo -e "${BOLD}Commands:${RESET}"
-    echo -e "  run       Run a strategic analysis cycle"
-    echo -e "  status    Show last run stats and cooldown"
-    echo -e "  help      Show this help\n"
+    echo -e "  run [--force]  Run a strategic analysis cycle (--force bypasses cooldown)"
+    echo -e "  status         Show last run stats and cooldown"
+    echo -e "  help           Show this help\n"
     echo -e "${BOLD}Environment:${RESET}"
     echo -e "  CLAUDE_CODE_OAUTH_TOKEN  Required for Claude access"
-    echo -e "  NO_GITHUB=true       Dry-run mode (no issue creation)\n"
-    echo -e "${BOLD}Cooldown:${RESET}"
-    echo -e "  12 hours between cycles (checks events.jsonl)\n"
+    echo -e "  NO_GITHUB=true           Dry-run mode (no issue creation)\n"
+    echo -e "${BOLD}Configuration:${RESET}"
+    echo -e "  Max issues/cycle:  ${STRATEGIC_MAX_ISSUES}"
+    echo -e "  Cooldown:          $(( STRATEGIC_COOLDOWN_SECONDS / 3600 )) hours"
+    echo -e "  Model:             ${STRATEGIC_MODEL}\n"
 }
 
 # ─── Daemon Integration (sourced mode) ────────────────────────────────────────
@@ -643,7 +791,7 @@ if [[ "${BASH_SOURCE[0]}" == "$0" ]]; then
         shift 2>/dev/null || true
 
         case "$cmd" in
-            run)     strategic_run ;;
+            run)     strategic_run "$@" ;;
             status)  strategic_status ;;
             help)    strategic_show_help ;;
             *)

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.0.0"
+VERSION="2.1.1"
 set -euo pipefail
 trap 'echo "ERROR: $BASH_SOURCE:$LINENO exited with status $?" >&2' ERR
 

package/scripts/sw-swarm.sh

@@ -6,8 +6,9 @@
 set -euo pipefail
 trap 'echo "ERROR: $BASH_SOURCE:$LINENO exited with status $?" >&2' ERR
 
-VERSION="2.0.0"
+VERSION="2.1.1"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+REPO_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
 
 # ─── Colors (matches Seth's tmux theme) ─────────────────────────────────────
 CYAN='\033[38;2;0;212;255m'     # #00d4ff — primary accent
@@ -113,13 +114,33 @@ record_metric() {
 
 # ─── Spawn a new agent ────────────────────────────────────────────────────
 cmd_spawn() {
-    local agent_type="${1:-standard}"
+    local agent_type="${1:-}"
+    shift 2>/dev/null || true
+    local task_desc="${1:-}"
     shift 2>/dev/null || true
 
     ensure_dirs
     init_registry
     init_config
 
+    # Recruit-powered type selection when task description given but no explicit type
+    if [[ -z "$agent_type" || "$agent_type" == "--task" ]] && [[ -n "$task_desc" ]]; then
+        if [[ -x "${SCRIPT_DIR:-}/sw-recruit.sh" ]]; then
+            local _recruit_match
+            _recruit_match=$(bash "$SCRIPT_DIR/sw-recruit.sh" match --json "$task_desc" 2>/dev/null) || true
+            if [[ -n "$_recruit_match" ]]; then
+                local _role
+                _role=$(echo "$_recruit_match" | jq -r '.primary_role // ""' 2>/dev/null) || true
+                case "$_role" in
+                    architect|security-auditor|incident-responder) agent_type="powerful" ;;
+                    docs-writer) agent_type="fast" ;;
+                    *) agent_type="standard" ;;
+                esac
+            fi
+        fi
+    fi
+    [[ -z "$agent_type" ]] && agent_type="standard"
+
     local agent_id
     agent_id=$(gen_agent_id)
 
@@ -165,6 +186,16 @@ cmd_spawn() {
     mv "$tmp_file" "$REGISTRY_FILE"
     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
+        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 && \
+                info "Tmux session created: $session_name" || warn "Tmux session creation failed (agent still in registry)"
+        fi
+    fi
+
     success "Spawned agent: ${CYAN}${agent_id}${RESET} (type: ${agent_type})"
     echo ""
     echo -e "  Agent ID:    ${CYAN}${agent_id}${RESET}"
@@ -206,18 +237,24 @@ cmd_retire() {
         echo ""
     fi
 
-    # Mark as retiring
+    # 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
+        tmux kill-session -t "$session_name" 2>/dev/null && info "Tmux session killed: $session_name" || warn "Tmux kill failed for $session_name"
+    fi
+
+    # Mark as retiring / remove from registry
     local tmp_file
     tmp_file=$(mktemp)
 
     jq --arg aid "$agent_id" \
-       '.agents |= map(if .id == $aid then .status = "retiring" else . end) | .last_updated = "'$(now_iso)'"' \
+       '.agents |= map(select(.id != $aid)) | .active_count = ([.agents[] | select(.status == "active")] | length) | .last_updated = "'$(now_iso)'"' \
         "$REGISTRY_FILE" > "$tmp_file"
 
     mv "$tmp_file" "$REGISTRY_FILE"
     record_metric "$agent_id" "retire" "1" "graceful_shutdown"
 
-    success "Retiring agent: ${CYAN}${agent_id}${RESET}"
+    success "Retired agent: ${CYAN}${agent_id}${RESET}"
     echo ""
 }
 

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.0.0"
+VERSION="2.1.1"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 REPO_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
 

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.0.0"
+VERSION="2.1.1"
 set -euo pipefail
 trap 'echo "ERROR: $BASH_SOURCE:$LINENO exited with status $?" >&2' ERR
 
@@ -20,6 +20,8 @@ DIM='\033[2m'
 BOLD='\033[1m'
 RESET='\033[0m'
 
+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"
@@ -29,8 +31,6 @@ warn()    { echo -e "${YELLOW}${BOLD}⚠${RESET} $*"; }
 error()   { echo -e "${RED}${BOLD}✗${RESET} $*" >&2; }
 
 # ─── Template Discovery ─────────────────────────────────────────────────────
-
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 REPO_TEMPLATES_DIR="$(cd "$SCRIPT_DIR/../tmux/templates" 2>/dev/null && pwd)" || REPO_TEMPLATES_DIR=""
 USER_TEMPLATES_DIR="${HOME}/.shipwright/templates"
 
@@ -77,7 +77,7 @@ json_agent_count() {
     if command -v jq &>/dev/null; then
         jq -r '.agents // [] | length' "$file" 2>/dev/null
     else
-        grep -c '"name"' "$file" 2>/dev/null | head -1
+        grep -c '"name"' "$file" 2>/dev/null || echo "0"
     fi
 }