shipwright-cli 3.1.0 → 3.2.0

package/scripts/lib/pipeline-stages.sh

@@ -3,6 +3,108 @@
 [[ -n "${_PIPELINE_STAGES_LOADED:-}" ]] && return 0
 _PIPELINE_STAGES_LOADED=1
 
+# ─── Context pruning helpers ────────────────────────────────────────────────
+
+# prune_context_section — Intelligently truncate a context section to fit a char budget.
+#   $1: section name (for logging/markers)
+#   $2: content string
+#   $3: max_chars (default 5000)
+# For JSON content (starts with { or [): extracts summary fields via jq.
+# For text content: sandwich approach — keeps first + last N lines.
+# Outputs the (possibly truncated) content to stdout.
+prune_context_section() {
+    local section_name="${1:-section}"
+    local content="${2:-}"
+    local max_chars="${3:-5000}"
+
+    [[ -z "$content" ]] && return 0
+
+    local content_len=${#content}
+    if [[ "$content_len" -le "$max_chars" ]]; then
+        printf '%s' "$content"
+        return 0
+    fi
+
+    # JSON content — try jq summary extraction
+    local first_char="${content:0:1}"
+    if [[ "$first_char" == "{" || "$first_char" == "[" ]]; then
+        local summary=""
+        # Try extracting summary/results fields
+        summary=$(printf '%s' "$content" | jq -r '
+            if type == "object" then
+                to_entries | map(
+                    if (.value | type) == "array" then
+                        "\(.key): \(.value | length) items"
+                    elif (.value | type) == "object" then
+                        "\(.key): \(.value | keys | join(", "))"
+                    else
+                        "\(.key): \(.value)"
+                    end
+                ) | join("\n")
+            elif type == "array" then
+                .[:5] | map(tostring) | join("\n")
+            else . end
+        ' 2>/dev/null) || true
+
+        if [[ -n "$summary" && ${#summary} -le "$max_chars" ]]; then
+            printf '%s' "$summary"
+            return 0
+        fi
+        # jq failed or still too large — fall through to text truncation
+    fi
+
+    # Text content — sandwich approach (first N + last N lines)
+    local line_count=0
+    line_count=$(printf '%s\n' "$content" | wc -l | xargs)
+
+    # Calculate how many lines to keep from each end
+    # Approximate chars-per-line to figure out line budget
+    local avg_chars_per_line=80
+    if [[ "$line_count" -gt 0 ]]; then
+        avg_chars_per_line=$(( content_len / line_count ))
+        [[ "$avg_chars_per_line" -lt 20 ]] && avg_chars_per_line=20
+    fi
+    local total_lines_budget=$(( max_chars / avg_chars_per_line ))
+    [[ "$total_lines_budget" -lt 4 ]] && total_lines_budget=4
+    local half=$(( total_lines_budget / 2 ))
+
+    local head_part=""
+    local tail_part=""
+    head_part=$(printf '%s\n' "$content" | head -"$half")
+    tail_part=$(printf '%s\n' "$content" | tail -"$half")
+
+    printf '%s\n[... %s truncated: %d→%d chars ...]\n%s' \
+        "$head_part" "$section_name" "$content_len" "$max_chars" "$tail_part"
+}
+
+# guard_prompt_size — Warn and hard-truncate if prompt exceeds budget.
+#   $1: stage name (for logging)
+#   $2: prompt content
+#   $3: max_chars (default 100000)
+# Outputs the (possibly truncated) prompt to stdout.
+PIPELINE_PROMPT_BUDGET="${PIPELINE_PROMPT_BUDGET:-100000}"
+
+guard_prompt_size() {
+    local stage_name="${1:-stage}"
+    local prompt="${2:-}"
+    local max_chars="${3:-$PIPELINE_PROMPT_BUDGET}"
+
+    local prompt_len=${#prompt}
+    if [[ "$prompt_len" -le "$max_chars" ]]; then
+        printf '%s' "$prompt"
+        return 0
+    fi
+
+    warn "${stage_name} prompt too large (${prompt_len} chars, budget ${max_chars}) — truncating"
+    emit_event "pipeline.prompt_truncated" \
+        "stage=$stage_name" \
+        "original=$prompt_len" \
+        "budget=$max_chars" 2>/dev/null || true
+
+    printf '%s\n\n... [CONTEXT TRUNCATED: %s prompt exceeded %d char budget. Focus on the goal and requirements.]' \
+        "${prompt:0:$max_chars}" "$stage_name" "$max_chars"
+}
+
 # ─── Safe git helpers ────────────────────────────────────────────────────────
 # BASE_BRANCH may not exist locally (e.g. --local mode with no remote).
 # These helpers return empty output instead of crashing under set -euo pipefail.
@@ -178,6 +280,7 @@ ${ISSUE_BODY}
 
     # Inject architecture context (import graph, modules, test map)
     if [[ -n "$arch_context" ]]; then
+        arch_context=$(prune_context_section "architecture" "$arch_context" 5000)
         plan_prompt="${plan_prompt}
 ## Architecture Context
 ${arch_context}
@@ -189,6 +292,7 @@ ${arch_context}
     if [[ -f "$_context_bundle" ]]; then
         local _cb_content
         _cb_content=$(cat "$_context_bundle" 2>/dev/null | head -100 || true)
+        _cb_content=$(prune_context_section "context-bundle" "$_cb_content" 8000)
         if [[ -n "$_cb_content" ]]; then
             plan_prompt="${plan_prompt}
 ## Pipeline Context
@@ -204,6 +308,7 @@ ${_cb_content}
         if [[ -n "$plan_memory" && "$plan_memory" != *'"results":[]'* && "$plan_memory" != *'"error"'* ]]; then
             local memory_summary
             memory_summary=$(echo "$plan_memory" | jq -r '.results[]? | "- \(.)"' 2>/dev/null | head -10 || true)
+            memory_summary=$(prune_context_section "memory" "$memory_summary" 10000)
             if [[ -n "$memory_summary" ]]; then
                 plan_prompt="${plan_prompt}
 ## Historical Context (from previous pipelines)
@@ -228,6 +333,7 @@ ${plan_hint}
     if [[ -x "$SCRIPT_DIR/sw-discovery.sh" ]]; then
         local plan_discoveries
         plan_discoveries=$("$SCRIPT_DIR/sw-discovery.sh" inject "*.md,*.json" 2>/dev/null | head -20 || true)
+        plan_discoveries=$(prune_context_section "discoveries" "$plan_discoveries" 3000)
         if [[ -n "$plan_discoveries" ]]; then
             plan_prompt="${plan_prompt}
 ## Discoveries from Other Pipelines
@@ -248,6 +354,7 @@ ${plan_discoveries}
             "Patterns: \((.patterns // []) | join(", "))",
             "Rules: \((.rules // []) | join("; "))"
         ' "$arch_file_plan" 2>/dev/null || true)
+        arch_patterns=$(prune_context_section "intelligence" "$arch_patterns" 5000)
         if [[ -n "$arch_patterns" ]]; then
             plan_prompt="${plan_prompt}
 ## Architecture Patterns
@@ -284,6 +391,12 @@ Focus on: threat modeling, OWASP top 10, input validation, authentication/author
 - Test command: ${TEST_CMD:-not configured}
 - Task type: ${TASK_TYPE:-feature}
 
+## Context Efficiency
+- Batch independent tool calls in parallel when possible
+- Read specific file sections (offset/limit) instead of entire large files
+- Use targeted grep searches — avoid scanning entire codebases into context
+- Delegate multi-file analysis to subagents when available
+
 ## Required Output
 Create a Markdown plan with these sections:
 
@@ -306,6 +419,9 @@ How to verify the implementation works.
 Checklist of completion criteria.
 "
 
+    # Guard total prompt size
+    plan_prompt=$(guard_prompt_size "plan" "$plan_prompt")
+
     local plan_model
     plan_model=$(jq -r --arg id "plan" '(.stages[] | select(.id == $id) | .config.model) // .defaults.model // "opus"' "$PIPELINE_CONFIG" 2>/dev/null) || true
     [[ -n "$MODEL" ]] && plan_model="$MODEL"
@@ -615,6 +731,7 @@ stage_design() {
     if type gather_architecture_context &>/dev/null; then
         arch_struct_context=$(gather_architecture_context "${PROJECT_ROOT:-.}" 2>/dev/null || true)
     fi
+    arch_struct_context=$(prune_context_section "architecture" "$arch_struct_context" 5000)
 
     # Memory integration — inject context if memory system available
     local memory_context=""
@@ -625,12 +742,14 @@ stage_design() {
     if [[ -z "$memory_context" ]] && [[ -x "$SCRIPT_DIR/sw-memory.sh" ]]; then
         memory_context=$(bash "$SCRIPT_DIR/sw-memory.sh" inject "design" 2>/dev/null) || true
     fi
+    memory_context=$(prune_context_section "memory" "$memory_context" 10000)
 
     # Inject cross-pipeline discoveries for design stage
     local design_discoveries=""
     if [[ -x "$SCRIPT_DIR/sw-discovery.sh" ]]; then
         design_discoveries=$("$SCRIPT_DIR/sw-discovery.sh" inject "*.md,*.ts,*.tsx,*.js" 2>/dev/null | head -20 || true)
     fi
+    design_discoveries=$(prune_context_section "discoveries" "$design_discoveries" 3000)
 
     # Inject architecture model patterns if available
     local arch_context=""
@@ -654,6 +773,7 @@ ${arch_patterns}
 ${arch_layers}}"
         fi
     fi
+    arch_context=$(prune_context_section "intelligence" "$arch_context" 5000)
 
     # Inject rejected design approaches and anti-patterns from memory
     local design_antipatterns=""
@@ -661,6 +781,7 @@ ${arch_layers}}"
         local rejected_designs
         rejected_designs=$(intelligence_search_memory "rejected design approaches anti-patterns for: ${GOAL:-}" "${HOME}/.shipwright/memory" 3 2>/dev/null) || true
         if [[ -n "$rejected_designs" ]]; then
+            rejected_designs=$(prune_context_section "antipatterns" "$rejected_designs" 5000)
             design_antipatterns="
 ## Rejected Approaches (from past reviews)
 These design approaches were rejected in past reviews. Avoid repeating them:
@@ -726,6 +847,9 @@ Produce this EXACT format:
 
 Be concrete and specific. Reference actual file paths in the codebase. Consider edge cases and failure modes."
 
+    # Guard total prompt size
+    design_prompt=$(guard_prompt_size "design" "$design_prompt")
+
     local design_model
     design_model=$(jq -r --arg id "design" '(.stages[] | select(.id == $id) | .config.model) // .defaults.model // "opus"' "$PIPELINE_CONFIG" 2>/dev/null) || true
     [[ -n "$MODEL" ]] && design_model="$MODEL"
@@ -1242,7 +1366,8 @@ stage_test() {
         # Post failure to GitHub with more context
         if [[ -n "$ISSUE_NUMBER" ]]; then
             local log_lines
-            log_lines=$(wc -l < "$test_log" 2>/dev/null || echo "0")
+            log_lines=$(wc -l < "$test_log" 2>/dev/null || true)
+            log_lines="${log_lines:-0}"
             local log_excerpt
             if [[ "$log_lines" -lt 60 ]]; then
                 log_excerpt="$(cat "$test_log" 2>/dev/null || true)"
@@ -1383,6 +1508,7 @@ If no issues are found, write: \"Review clean — no issues found.\"
     if type intelligence_search_memory >/dev/null 2>&1; then
         local review_memory
         review_memory=$(intelligence_search_memory "code review findings anti-patterns for: ${GOAL:-}" "${HOME}/.shipwright/memory" 5 2>/dev/null) || true
+        review_memory=$(prune_context_section "memory" "$review_memory" 10000)
         if [[ -n "$review_memory" ]]; then
             review_prompt+="
 ## Known Issues from Previous Reviews
@@ -1430,6 +1556,9 @@ $(cat "$dod_file")
 ## Diff to Review
 $(cat "$diff_file")"
 
+    # Guard total prompt size
+    review_prompt=$(guard_prompt_size "review" "$review_prompt")
+
     # Skip permissions — pipeline runs headlessly (claude -p) and has no terminal
     # for interactive permission prompts. Same rationale as build stage (line ~1083).
     local review_args=(--print --model "$review_model" --max-turns 25 --dangerously-skip-permissions)
@@ -1837,7 +1966,8 @@ stage_pr() {
     real_changes=$(_safe_base_diff --name-only \
         -- . ':!.claude/loop-state.md' ':!.claude/pipeline-state.md' \
         ':!.claude/pipeline-artifacts/*' ':!**/progress.md' \
-        ':!**/error-summary.json' | wc -l | xargs || echo "0")
+        ':!**/error-summary.json' | wc -l | xargs || true)
+    real_changes="${real_changes:-0}"
     if [[ "${real_changes:-0}" -eq 0 ]]; then
         error "No meaningful code changes detected — only bookkeeping files modified"
         error "Refusing to create PR with zero real changes"

package/scripts/sw

@@ -5,7 +5,7 @@
 # ╚═══════════════════════════════════════════════════════════════════════════╝
 set -euo pipefail
 
-VERSION="3.1.0"
+VERSION="3.2.0"
 
 # Resolve symlinks (required for npm global install where bin/ symlinks to node_modules/)
 SOURCE="${BASH_SOURCE[0]}"

package/scripts/sw-activity.sh

@@ -6,7 +6,7 @@
 set -euo pipefail
 trap 'echo "ERROR: $BASH_SOURCE:$LINENO exited with status $?" >&2' ERR
 
-VERSION="3.1.0"
+VERSION="3.2.0"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
 # ─── Cross-platform compatibility ──────────────────────────────────────────
@@ -332,7 +332,6 @@ cmd_stats() {
     local end_time=""
 
     # Read directly to avoid subshell issues
-    echo "DEBUG: Starting read loop..." >&2
     while IFS= read -r line; do
         [ -z "$line" ] && continue
 
@@ -363,14 +362,9 @@ cmd_stats() {
         end_time="$ts"
     done < <(grep -v '^$' "$EVENTS_FILE" 2>/dev/null)
 
-    echo "DEBUG: Read complete, total=$total_events" >&2
-    echo "DEBUG: agents_seen length: ${#agents_seen}" >&2
     local unique_agents
-    echo "DEBUG: About to compute unique..." >&2
     unique_agents=$(sort -u <<< "$agents_seen" | grep -v '^$' | wc -l | tr -d ' ')
-    echo "DEBUG: unique_agents=$unique_agents" >&2
 
-    echo "DEBUG: About to print results..." >&2
     printf "${BOLD}Total Events:${RESET} %d\n" "$total_events"
     printf "${BOLD}Commits:${RESET} %d\n" "$commits"
     printf "${BOLD}Tests:${RESET} %d\n" "$tests"

package/scripts/sw-adaptive.sh

@@ -1,12 +1,12 @@
 #!/usr/bin/env bash
 # ╔═══════════════════════════════════════════════════════════════════════════╗
 # ║  shipwright adaptive — data-driven pipeline tuning                       ║
-# ║  Replace 83+ hardcoded values with learned defaults from historical runs  ║
+# ║  Replace static defaults with learned values from historical runs         ║
 # ╚═══════════════════════════════════════════════════════════════════════════╝
 set -euo pipefail
 trap 'echo "ERROR: $BASH_SOURCE:$LINENO exited with status $?" >&2' ERR
 
-VERSION="3.1.0"
+VERSION="3.2.0"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
 # ─── Cross-platform compatibility ──────────────────────────────────────────
@@ -712,10 +712,10 @@ cmd_compare() {
         esac
     done
 
-    info "Learned vs Hardcoded Values for ${CYAN}${repo}${RESET}"
+    info "Learned vs Default Values for ${CYAN}${repo}${RESET}"
     echo ""
 
-    printf "%-25s %-15s %-15s %-15s\n" "Metric" "Hardcoded" "Learned" "Difference"
+    printf "%-25s %-15s %-15s %-15s\n" "Metric" "Default" "Learned" "Difference"
     printf "%s\n" "$(printf '%.0s─' {1..70})"
 
     # Timeout
@@ -841,7 +841,7 @@ ${BOLD}USAGE${RESET}
 
 ${BOLD}SUBCOMMANDS${RESET}
   ${CYAN}get${RESET} <metric> [--stage S] [--repo R] [--complexity C] [--default V]
-    Return adaptive value for a metric (replaces hardcoded defaults)
+    Return adaptive value for a metric (replaces static defaults)
     Metrics: timeout, iterations, model, team_size, template, poll_interval,
              retry_limit, quality_threshold, coverage_min
 
@@ -852,7 +852,7 @@ ${BOLD}SUBCOMMANDS${RESET}
     Rebuild models from events.jsonl (run after significant pipeline activity)
 
   ${CYAN}compare${RESET} [--repo REPO]
-    Side-by-side table: learned vs hardcoded values
+    Side-by-side table: learned vs default values
 
   ${CYAN}recommend${RESET} --issue N [--repo REPO]
     Full JSON recommendation for an issue (template, model, team_size, etc.)
@@ -876,7 +876,7 @@ ${BOLD}EXAMPLES${RESET}
   # Get complete recommendation for issue #42
   sw adaptive recommend --issue 42
 
-  # Compare learned vs hardcoded
+  # Compare learned vs defaults
   sw adaptive compare
 
 ${BOLD}STORAGE${RESET}

package/scripts/sw-adversarial.sh

@@ -6,7 +6,7 @@
 set -euo pipefail
 trap 'echo "ERROR: $BASH_SOURCE:$LINENO exited with status $?" >&2' ERR
 
-VERSION="3.1.0"
+VERSION="3.2.0"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 REPO_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
 

package/scripts/sw-architecture-enforcer.sh

@@ -6,7 +6,7 @@
 set -euo pipefail
 trap 'echo "ERROR: $BASH_SOURCE:$LINENO exited with status $?" >&2' ERR
 
-VERSION="3.1.0"
+VERSION="3.2.0"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 REPO_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
 

package/scripts/sw-auth.sh

@@ -6,7 +6,7 @@
 set -euo pipefail
 trap 'echo "ERROR: $BASH_SOURCE:$LINENO exited with status $?" >&2' ERR
 
-VERSION="3.1.0"
+VERSION="3.2.0"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 REPO_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
 

package/scripts/sw-autonomous.sh

@@ -7,7 +7,7 @@
 set -euo pipefail
 trap 'echo "ERROR: $BASH_SOURCE:$LINENO exited with status $?" >&2' ERR
 
-VERSION="3.1.0"
+VERSION="3.2.0"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 REPO_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
 

package/scripts/sw-changelog.sh

@@ -7,7 +7,7 @@
 set -euo pipefail
 trap 'echo "ERROR: $BASH_SOURCE:$LINENO exited with status $?" >&2' ERR
 
-VERSION="3.1.0"
+VERSION="3.2.0"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 REPO_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
 

package/scripts/sw-checkpoint.sh

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

package/scripts/sw-ci.sh

@@ -6,7 +6,7 @@
 set -euo pipefail
 trap 'echo "ERROR: $BASH_SOURCE:$LINENO exited with status $?" >&2' ERR
 
-VERSION="3.1.0"
+VERSION="3.2.0"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 REPO_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
 
@@ -227,15 +227,20 @@ cmd_analyze() {
     info "Analyzing workflow efficiency"
 
     local job_count step_count matrix_enabled
-    job_count=$(grep -c "^  [a-z_-]*:" "$workflow_file" 2>/dev/null || echo "0")
-    step_count=$(grep -c "      - name:" "$workflow_file" 2>/dev/null || echo "0")
-    matrix_enabled=$(grep -c "matrix:" "$workflow_file" 2>/dev/null || echo "0")
+    job_count=$(grep -c "^  [a-z_-]*:" "$workflow_file" 2>/dev/null || true)
+    job_count="${job_count:-0}"
+    step_count=$(grep -c "      - name:" "$workflow_file" 2>/dev/null || true)
+    step_count="${step_count:-0}"
+    matrix_enabled=$(grep -c "matrix:" "$workflow_file" 2>/dev/null || true)
+    matrix_enabled="${matrix_enabled:-0}"
 
     local has_cache
-    has_cache=$(grep -c "actions/cache" "$workflow_file" 2>/dev/null || echo "0")
+    has_cache=$(grep -c "actions/cache" "$workflow_file" 2>/dev/null || true)
+    has_cache="${has_cache:-0}"
 
     local has_timeout
-    has_timeout=$(grep -c "timeout-minutes:" "$workflow_file" 2>/dev/null || echo "0")
+    has_timeout=$(grep -c "timeout-minutes:" "$workflow_file" 2>/dev/null || true)
+    has_timeout="${has_timeout:-0}"
 
     echo ""
     echo -e "${BOLD}Workflow Analysis: $(basename "$workflow_file")${RESET}"

package/scripts/sw-cleanup.sh

@@ -5,7 +5,7 @@
 # ║  Default: dry-run (shows what would be cleaned).                         ║
 # ║  Use --force to actually kill sessions and remove files.                 ║
 # ╚═══════════════════════════════════════════════════════════════════════════╝
-VERSION="3.1.0"
+VERSION="3.2.0"
 set -euo pipefail
 trap 'echo "ERROR: $BASH_SOURCE:$LINENO exited with status $?" >&2' ERR
 

package/scripts/sw-code-review.sh

@@ -6,7 +6,7 @@
 set -euo pipefail
 trap 'echo "ERROR: $BASH_SOURCE:$LINENO exited with status $?" >&2' ERR
 
-VERSION="3.1.0"
+VERSION="3.2.0"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 REPO_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
 
@@ -72,7 +72,8 @@ detect_code_smells() {
 
     # Check 1: Long functions (>60 lines in bash)
     local func_count
-    func_count=$(grep -c "^[a-zA-Z_][a-zA-Z0-9_]*().*{" "$target_file" 2>/dev/null || echo "0")
+    func_count=$(grep -c "^[a-zA-Z_][a-zA-Z0-9_]*().*{" "$target_file" 2>/dev/null || true)
+    func_count="${func_count:-0}"
     if [[ "$func_count" -gt 0 ]]; then
         while IFS= read -r line; do
             if [[ "$line" =~ ^[a-zA-Z_][a-zA-Z0-9_]*\(\).*\{ ]]; then
@@ -106,7 +107,8 @@ detect_code_smells() {
 
     # Check 3: Duplicate code patterns (repeated >3 times)
     local dup_count=0
-    dup_count=$(grep -c '^\s*\(cd\|cd\|mkdir\|rm\|echo\)' "$target_file" 2>/dev/null || echo "0")
+    dup_count=$(grep -c '^\s*\(cd\|cd\|mkdir\|rm\|echo\)' "$target_file" 2>/dev/null || true)
+    dup_count="${dup_count:-0}"
     if [[ $dup_count -gt 3 ]]; then
         issues+=("REPEATED_PATTERNS: Common operations appear $dup_count times (consider helper functions)")
     fi
@@ -139,7 +141,8 @@ check_solid_principles() {
 
     # Single Responsibility: Check if scripts do multiple unrelated things
     local sourced_count
-    sourced_count=$(grep -c '^\s*source\|^\s*\.\s' "$target_file" 2>/dev/null || echo "0")
+    sourced_count=$(grep -c '^\s*source\|^\s*\.\s' "$target_file" 2>/dev/null || true)
+    sourced_count="${sourced_count:-0}"
     if [[ $sourced_count -gt 3 ]]; then
         violations+=("SRP_VIOLATION: Script sources $sourced_count modules (too many responsibilities)")
     fi
@@ -159,7 +162,8 @@ check_solid_principles() {
         if [[ "$line" =~ ^[a-zA-Z_][a-zA-Z0-9_]*\(\) ]]; then
             local func_name="${line%%(*}"
             local body
-            body=$(awk "/^${func_name}\\(\\)/,/^}/" "$target_file" | grep -c '\$[0-9]' || echo "0")
+            body=$(awk "/^${func_name}\\(\\)/,/^}/" "$target_file" | grep -c '\$[0-9]' || true)
+            body="${body:-0}"
             if [[ $body -gt 5 ]]; then
                 violations+=("ISP_VIOLATION: Function $func_name uses >5 parameters")
             fi
@@ -227,7 +231,9 @@ analyze_complexity() {
 
             # Cyclomatic complexity: count decision points (if, elif, case, &&, ||)
             local cc=1
-            cc=$((cc + $(sed -n "${start_line},${end_line}p" "$target_file" | grep -cE '\s(if|elif|case|&&|\|\|)' || echo 0)))
+            local _cc_count
+            _cc_count=$(sed -n "${start_line},${end_line}p" "$target_file" | grep -cE '\s(if|elif|case|&&|\|\|)' || true)
+            cc=$((cc + ${_cc_count:-0}))
 
             # Lines of code
             local loc=$((end_line - start_line))
@@ -266,8 +272,12 @@ check_style_consistency() {
     local has_trap=false
     local has_set_e=false
 
-    [[ $(grep -c 'trap.*ERR' "$target_file" 2>/dev/null || echo 0) -gt 0 ]] && has_trap=true
-    [[ $(grep -c 'set -e' "$target_file" 2>/dev/null || echo 0) -gt 0 ]] && has_set_e=true
+    local _trap_count
+    _trap_count=$(grep -c 'trap.*ERR' "$target_file" 2>/dev/null || true)
+    [[ "${_trap_count:-0}" -gt 0 ]] && has_trap=true
+    local _set_e_count
+    _set_e_count=$(grep -c 'set -e' "$target_file" 2>/dev/null || true)
+    [[ "${_set_e_count:-0}" -gt 0 ]] && has_set_e=true
 
     if [[ "$has_set_e" == "true" ]] && [[ "$has_trap" == "false" ]]; then
         issues+=("STYLE: Missing ERR trap despite 'set -e' (inconsistent error handling)")
@@ -276,8 +286,10 @@ check_style_consistency() {
     # Check for inconsistent quote usage
     local single_quotes
     local double_quotes
-    single_quotes=$(grep -o "'" "$target_file" 2>/dev/null | wc -l || echo 0)
-    double_quotes=$(grep -o '"' "$target_file" 2>/dev/null | wc -l || echo 0)
+    single_quotes=$(grep -o "'" "$target_file" 2>/dev/null | wc -l || true)
+    single_quotes="${single_quotes:-0}"
+    double_quotes=$(grep -o '"' "$target_file" 2>/dev/null | wc -l || true)
+    double_quotes="${double_quotes:-0}"
     if [[ $single_quotes -gt $((double_quotes * 3)) ]] || [[ $double_quotes -gt $((single_quotes * 3)) ]]; then
         issues+=("STYLE: Inconsistent quote style (mix of single and double quotes)")
     fi
@@ -285,8 +297,10 @@ check_style_consistency() {
     # Check for inconsistent spacing/indentation
     local tab_count
     local space_count
-    tab_count=$(grep -c $'^\t' "$target_file" 2>/dev/null || echo 0)
-    space_count=$(grep -c '^  ' "$target_file" 2>/dev/null || echo 0)
+    tab_count=$(grep -c $'^\t' "$target_file" 2>/dev/null || true)
+    tab_count="${tab_count:-0}"
+    space_count=$(grep -c '^  ' "$target_file" 2>/dev/null || true)
+    space_count="${space_count:-0}"
     if [[ $tab_count -gt 0 ]] && [[ $space_count -gt 0 ]]; then
         issues+=("STYLE: Mixed tabs and spaces")
     fi
@@ -333,7 +347,8 @@ auto_fix() {
 
     # Fix 2: Trailing whitespace
     local trailing_ws
-    trailing_ws=$(grep -c '[[:space:]]$' "$target_file" 2>/dev/null || echo "0")
+    trailing_ws=$(grep -c '[[:space:]]$' "$target_file" 2>/dev/null || true)
+    trailing_ws="${trailing_ws:-0}"
     if [[ $trailing_ws -gt 0 ]]; then
         sed -i '' 's/[[:space:]]*$//' "$target_file"
         info "Removed $trailing_ws lines of trailing whitespace"
@@ -349,7 +364,8 @@ auto_fix() {
 
     # Fix 4: Consistent spacing around operators (simple cases)
     local spacing_fixes=0
-    spacing_fixes=$(grep -c '==' "$target_file" 2>/dev/null || echo "0")
+    spacing_fixes=$(grep -c '==' "$target_file" 2>/dev/null || true)
+    spacing_fixes="${spacing_fixes:-0}"
     if [[ $spacing_fixes -gt 0 ]]; then
         info "Flagged $spacing_fixes operator spacing cases (manual review recommended)"
     fi
@@ -507,9 +523,12 @@ scan_codebase() {
         local solids=0
         local arch_issues=0
 
-        smells=$(detect_code_smells "$file" 2>/dev/null | wc -l || echo 0)
-        solids=$(check_solid_principles "$file" 2>/dev/null | wc -l || echo 0)
-        arch_issues=$(check_architecture_boundaries "$file" 2>/dev/null | wc -l || echo 0)
+        smells=$(detect_code_smells "$file" 2>/dev/null | wc -l || true)
+        smells="${smells:-0}"
+        solids=$(check_solid_principles "$file" 2>/dev/null | wc -l || true)
+        solids="${solids:-0}"
+        arch_issues=$(check_architecture_boundaries "$file" 2>/dev/null | wc -l || true)
+        arch_issues="${arch_issues:-0}"
 
         local file_issues=$((smells + solids + arch_issues))
         total_issues=$((total_issues + file_issues))

package/scripts/sw-connect.sh

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

package/scripts/sw-context.sh

@@ -6,7 +6,7 @@
 set -euo pipefail
 trap 'echo "ERROR: $BASH_SOURCE:$LINENO exited with status $?" >&2' ERR
 
-VERSION="3.1.0"
+VERSION="3.2.0"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 REPO_DIR="${SHIPWRIGHT_REPO_DIR:-$(cd "$SCRIPT_DIR/.." && pwd)}"