shipwright-cli 2.4.0 → 3.1.0

package/scripts/sw-scale.sh

@@ -6,11 +6,11 @@
 set -euo pipefail
 trap 'echo "ERROR: $BASH_SOURCE:$LINENO exited with status $?" >&2' ERR
 
-VERSION="2.4.0"
+VERSION="3.1.0"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
 # ─── Dependency check ─────────────────────────────────────────────────────────
-if ! command -v jq &>/dev/null; then
+if ! command -v jq >/dev/null 2>&1; then
     echo "ERROR: sw-scale.sh requires 'jq'. Install with: brew install jq (macOS) or apt install jq (Linux)" >&2
     exit 1
 fi
@@ -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}"
-
 # ─── Constants ──────────────────────────────────────────────────────────────
 SCALE_RULES_FILE="${HOME}/.shipwright/scale-rules.json"
 SCALE_EVENTS_FILE="${HOME}/.shipwright/scale-events.jsonl"
@@ -148,13 +138,19 @@ emit_scale_event() {
         '{ts: $ts, action: $action, role: $role, reason: $reason, context: $context}')
 
     echo "$event" >> "$SCALE_EVENTS_FILE"
-    type rotate_jsonl &>/dev/null 2>&1 && rotate_jsonl "$SCALE_EVENTS_FILE" 5000
+    type rotate_jsonl >/dev/null 2>&1 && rotate_jsonl "$SCALE_EVENTS_FILE" 5000
 }
 
 # ─── Scale Up: spawn new agent ───────────────────────────────────────────
 cmd_up() {
-    local role="${1:-builder}"
-    shift 2>/dev/null || true
+    local count="${1:-1}"
+    local role="${2:-builder}"
+
+    # Parse: "up builder" -> count=1 role=builder; "up 2 tester" -> count=2 role=tester
+    if ! [[ "$count" =~ ^[0-9]+$ ]]; then
+        role="$count"
+        count=1
+    fi
 
     ensure_dirs
     init_rules
@@ -178,43 +174,124 @@ cmd_up() {
     local max_size
     max_size=$(jq -r '.max_team_size // 8' "$SCALE_RULES_FILE")
 
-    info "Scaling up team with ${role} agent"
+    info "Scaling up team with ${count} ${role} agent(s)"
     echo -e "  Max team size: ${CYAN}${max_size}${RESET}"
     echo -e "  Role:          ${CYAN}${role}${RESET}"
     echo ""
 
-    # TODO: Integrate with tmux/SendMessage to spawn agent
-    # For now, emit event and log
-    emit_scale_event "up" "$role" "manual" "$*"
+    local repo_root
+    repo_root=$(git rev-parse --show-toplevel 2>/dev/null) || repo_root="$(cd "$SCRIPT_DIR/.." 2>/dev/null && pwd)"
+
+    if ! command -v tmux &>/dev/null; then
+        warn "tmux not available - cannot spawn agents"
+        echo "Install tmux to enable agent scaling: brew install tmux"
+        emit_scale_event "up" "$role" "manual" "tmux_unavailable"
+        update_scale_state
+        success "Scale-up event recorded (role: ${role})"
+        echo ""
+        echo -e "  ${DIM}Note: Actual agent spawn requires tmux (brew install tmux)${RESET}"
+        return 1
+    fi
+
+    for i in $(seq 1 "$count"); do
+        local agent_name="sw-agent-${role}-$(date +%s)-${i}"
+        local session_name="shipwright-${agent_name}"
+
+        # Spawn a real agent in a tmux session
+        tmux new-session -d -s "$session_name" \
+            "cd \"${repo_root}\" && SW_AGENT_ROLE=$role SW_AGENT_NAME=$agent_name bash scripts/sw-daemon.sh start --role $role 2>&1 | tee /tmp/sw-agent-${agent_name}.log" 2>/dev/null && {
+            emit_scale_event "up" "$role" "agent_started" "agent=$agent_name"
+            echo "Started agent $agent_name in tmux session $session_name"
+        } || {
+            warn "Failed to spawn agent $agent_name in tmux"
+        }
+    done
+
+    emit_scale_event "up" "$role" "manual" "count=$count"
     update_scale_state
 
-    success "Scale-up event recorded (role: ${role})"
+    success "Scale-up event recorded (role: ${role}, count: ${count})"
     echo ""
-    echo -e "  ${DIM}Note: Actual agent spawn requires tmux/claude integration${RESET}"
 }
 
 # ─── Scale Down: send shutdown to agent ──────────────────────────────────
 cmd_down() {
-    local agent_id="${1:-}"
-    shift 2>/dev/null || true
+    local first_arg="${1:-}"
+    local second_arg="${2:-}"
 
-    if [[ -z "$agent_id" ]]; then
-        error "Usage: shipwright scale down <agent-id>"
+    # Require at least one argument for backward compat (down <agent-id> or down <count> [role])
+    if [[ -z "$first_arg" ]]; then
+        error "Usage: shipwright scale down <agent-id|count> [role]"
         return 1
     fi
 
+    local count="$first_arg"
+    local role="$second_arg"
+
+    # Backward compat: "down agent-42" -> treat as session/agent identifier
+    if [[ -n "$count" ]] && [[ "$count" != *[0-9]* ]] || [[ "$count" == agent-* ]]; then
+        # Specific agent/session id
+        local session_pattern="*${count}*"
+        local sessions
+        sessions=$(tmux list-sessions -F '#{session_name}' 2>/dev/null | grep -E "shipwright|swarm" | grep -i "$count" || true)
+        if [[ -z "$sessions" ]]; then
+            emit_scale_event "down" "unknown" "manual" "agent_id=$count"
+            update_scale_state
+            success "Scale-down event recorded (agent: ${count})"
+            return 0
+        fi
+        local session
+        session=$(echo "$sessions" | head -1)
+        tmux kill-session -t "$session" 2>/dev/null && {
+            emit_scale_event "down" "unknown" "agent_stopped" "session=$session"
+            echo "Stopped agent session: $session"
+        }
+        emit_scale_event "down" "unknown" "manual" "agent_id=$count"
+        update_scale_state
+        success "Scale-down event recorded (agent: ${count})"
+        return 0
+    fi
+
+    # Numeric count
+    if ! [[ "$count" =~ ^[0-9]+$ ]]; then
+        count=1
+    fi
+
     ensure_dirs
     init_rules
 
-    info "Scaling down agent: ${agent_id}"
-    echo ""
+    # Find running agent sessions
+    local sessions
+    sessions=$(tmux list-sessions -F '#{session_name}' 2>/dev/null | grep '^shipwright-sw-agent\|^swarm-' || true)
 
-    # TODO: Integrate with SendMessage to shut down agent
-    emit_scale_event "down" "unknown" "manual" "agent_id=$agent_id"
-    update_scale_state
+    if [[ -z "$sessions" ]]; then
+        echo "No running agents to stop"
+        emit_scale_event "down" "unknown" "manual" "none_running"
+        update_scale_state
+        return 0
+    fi
 
-    success "Scale-down event recorded (agent: ${agent_id})"
-    echo -e "  ${DIM}Note: Agent shutdown requires SendMessage integration${RESET}"
+    local stopped=0
+    while IFS= read -r session; do
+        [[ "$stopped" -ge "$count" ]] && break
+        [[ -z "$session" ]] && continue
+
+        # Filter by role if specified
+        if [[ -n "$role" ]] && ! echo "$session" | grep -q "$role"; then
+            continue
+        fi
+
+        if tmux kill-session -t "$session" 2>/dev/null; then
+            stopped=$((stopped + 1))
+            emit_scale_event "down" "unknown" "agent_stopped" "session=$session"
+            echo "Stopped agent session: $session"
+        fi
+    done <<< "$sessions"
+
+    emit_scale_event "down" "unknown" "manual" "count=$stopped"
+    update_scale_state
+    echo "Stopped $stopped agent(s)"
+    success "Scale-down event recorded"
 }
 
 # ─── Manage scaling rules ────────────────────────────────────────────────
@@ -347,16 +424,72 @@ cmd_recommend() {
     echo -e "    Modules changed:   ${CYAN}${module_threshold}${RESET} (add reviewer above this)"
     echo ""
 
-    # TODO: Parse pipeline context to generate actual recommendations
-    echo -e "  ${DIM}Recommendations require active pipeline context (passed via environment)${RESET}"
-    echo ""
+    # Read pipeline context from env or pipeline-state.md
+    local actual_iterations="${ACTUAL_ITERATIONS:-0}"
+    local test_coverage="${TEST_COVERAGE:-0}"
+    local module_count="${MODULE_COUNT:-0}"
+
+    # Try to extract from pipeline-state.md if env vars not set
+    local state_file=".claude/pipeline-state.md"
+    if [[ "$actual_iterations" == "0" && -f "$state_file" ]]; then
+        actual_iterations=$(grep -oE 'iterations?[: ]+([0-9]+)' "$state_file" 2>/dev/null | grep -oE '[0-9]+' | tail -1 || echo "0")
+        actual_iterations="${actual_iterations:-0}"
+    fi
+    if [[ "$test_coverage" == "0" && -f "$state_file" ]]; then
+        test_coverage=$(grep -oE 'coverage[: ]+([0-9]+)' "$state_file" 2>/dev/null | grep -oE '[0-9]+' | tail -1 || echo "0")
+        test_coverage="${test_coverage:-0}"
+    fi
+
+    # Count changed modules via git diff
+    if [[ "$module_count" == "0" ]] && command -v git >/dev/null 2>&1; then
+        local base_branch="${BASE_BRANCH:-main}"
+        if git rev-parse --verify "$base_branch" >/dev/null 2>&1; then
+            module_count=$(git diff --name-only "${base_branch}..HEAD" 2>/dev/null \
+                | sed 's|/[^/]*$||' | sort -u | wc -l | xargs || echo "0")
+        fi
+        module_count="${module_count:-0}"
+    fi
+
+    local has_recommendations=false
+
+    # Check iterations against threshold
+    if [[ "$actual_iterations" -gt 0 && "$actual_iterations" -ge "$iteration_threshold" ]]; then
+        echo -e "  ${YELLOW}⚠${RESET}  Failed ${actual_iterations} iterations (threshold: ${iteration_threshold})"
+        echo -e "       ${CYAN}→ Recommend adding: tester${RESET}"
+        echo ""
+        has_recommendations=true
+    fi
+
+    # Check coverage against threshold
+    if [[ "$test_coverage" -gt 0 && "$test_coverage" -lt "$coverage_threshold" ]]; then
+        echo -e "  ${YELLOW}⚠${RESET}  Coverage at ${test_coverage}% (threshold: ${coverage_threshold}%)"
+        echo -e "       ${CYAN}→ Recommend adding: tester${RESET}"
+        echo ""
+        has_recommendations=true
+    fi
+
+    # Check module count against threshold
+    if [[ "$module_count" -gt 0 && "$module_count" -ge "$module_threshold" ]]; then
+        echo -e "  ${YELLOW}⚠${RESET}  ${module_count} modules changed (threshold: ${module_threshold})"
+        echo -e "       ${CYAN}→ Recommend adding: reviewer${RESET}"
+        echo ""
+        has_recommendations=true
+    fi
+
+    if [[ "$has_recommendations" == "false" ]]; then
+        if [[ "$actual_iterations" == "0" && "$test_coverage" == "0" && "$module_count" == "0" ]]; then
+            echo -e "  ${DIM}No pipeline context available — run during an active pipeline or set ACTUAL_ITERATIONS, TEST_COVERAGE, MODULE_COUNT${RESET}"
+        else
+            success "All metrics within thresholds — no scaling changes needed"
+        fi
+        echo ""
+    fi
 
-    # Example output when context is available:
-    # echo -e "  ${YELLOW}⚠${RESET}  Failed 4 iterations (threshold: 3)"
-    # echo -e "       ${CYAN}→ Recommend adding: tester${RESET}"
-    # echo ""
-    # echo -e "  ${YELLOW}⚠${RESET}  Coverage at 45% (threshold: 60%)"
-    # echo -e "       ${CYAN}→ Recommend adding: tester${RESET}"
+    emit_event "scale.recommendation" \
+        "iterations=$actual_iterations" \
+        "coverage=$test_coverage" \
+        "modules=$module_count" \
+        "has_recommendations=$has_recommendations"
 }
 
 # ─── Help message ────────────────────────────────────────────────────────

package/scripts/sw-security-audit.sh

@@ -6,7 +6,7 @@
 set -euo pipefail
 trap 'echo "ERROR: $BASH_SOURCE:$LINENO exited with status $?" >&2' ERR
 
-VERSION="2.4.0"
+VERSION="3.1.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}"
-
 # ─── Audit State ───────────────────────────────────────────────────────────
 FINDINGS=()
 CRITICAL_COUNT=0
@@ -60,10 +50,10 @@ add_finding() {
 
     local color=""
     case "$priority" in
-        CRITICAL) color="$RED"; ((CRITICAL_COUNT++)) ;;
-        HIGH) color="$RED"; ((HIGH_COUNT++)) ;;
-        MEDIUM) color="$YELLOW"; ((MEDIUM_COUNT++)) ;;
-        LOW) color="$BLUE"; ((LOW_COUNT++)) ;;
+        CRITICAL) color="$RED"; CRITICAL_COUNT=$((CRITICAL_COUNT + 1)) ;;
+        HIGH) color="$RED"; HIGH_COUNT=$((HIGH_COUNT + 1)) ;;
+        MEDIUM) color="$YELLOW"; MEDIUM_COUNT=$((MEDIUM_COUNT + 1)) ;;
+        LOW) color="$BLUE"; LOW_COUNT=$((LOW_COUNT + 1)) ;;
     esac
 
     FINDINGS+=("${priority}|${category}|${title}|${description}|${remediation}")
@@ -133,7 +123,7 @@ scan_licenses() {
     [[ -f "$REPO_DIR/Cargo.toml" ]] && has_cargo=true
 
     # Check npm licenses
-    if $has_npm && command -v npm &>/dev/null; then
+    if $has_npm && command -v npm >/dev/null 2>&1; then
         while IFS= read -r line; do
             [[ "$line" =~ GPL|AGPL ]] && [[ ! "$line" =~ MIT|Apache|BSD ]] && \
                 add_finding "MEDIUM" "licenses" "GPL/AGPL dependency in npm project" \
@@ -173,10 +163,10 @@ scan_vulnerabilities() {
     local vuln_count=0
 
     # Check npm vulnerabilities
-    if [[ -f "$REPO_DIR/package.json" ]] && command -v npm &>/dev/null; then
+    if [[ -f "$REPO_DIR/package.json" ]] && command -v npm >/dev/null 2>&1; then
         while IFS= read -r line; do
             [[ -z "$line" ]] && continue
-            ((vuln_count++))
+            vuln_count=$((vuln_count + 1))
             add_finding "HIGH" "vulnerabilities" "npm security vulnerability" \
                 "Found npm audit issue: $line" \
                 "Run 'npm audit fix' to remediate. Update vulnerable dependencies. Re-test after updates."
@@ -184,11 +174,11 @@ scan_vulnerabilities() {
     fi
 
     # Check pip vulnerabilities
-    if [[ -f "$REPO_DIR/requirements.txt" ]] && command -v pip &>/dev/null; then
-        if command -v safety &>/dev/null; then
+    if [[ -f "$REPO_DIR/requirements.txt" ]] && command -v pip >/dev/null 2>&1; then
+        if command -v safety >/dev/null 2>&1; then
             while IFS= read -r line; do
                 [[ -z "$line" ]] && continue
-                ((vuln_count++))
+                vuln_count=$((vuln_count + 1))
                 add_finding "HIGH" "vulnerabilities" "Python package vulnerability" \
                     "Found via safety: $line" \
                     "Update vulnerable package. Test compatibility. Run safety check after updates."
@@ -210,7 +200,7 @@ generate_sbom() {
     local sbom='{"bomFormat":"CycloneDX","specVersion":"1.4","version":1,"components":[]}'
 
     # Add npm packages
-    if [[ -f "$REPO_DIR/package.json" ]] && command -v npm &>/dev/null; then
+    if [[ -f "$REPO_DIR/package.json" ]] && command -v npm >/dev/null 2>&1; then
         local npm_list
         npm_list=$(npm list --json 2>/dev/null || echo '{"dependencies":{}}')
         while IFS='=' read -r name version; do