shipwright-cli 3.1.0 → 3.3.0

package/scripts/sw-webhook.sh

@@ -6,7 +6,8 @@
 set -euo pipefail
 trap 'echo "ERROR: $BASH_SOURCE:$LINENO exited with status $?" >&2' ERR
 
-VERSION="3.1.0"
+# shellcheck disable=SC2034
+VERSION="3.3.0"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
 # ─── Cross-platform compatibility ──────────────────────────────────────────
@@ -235,6 +236,7 @@ webhook_server_bash() {
             {
                 read -r -u 3 request_line || break
                 local method path protocol
+                # shellcheck disable=SC2034
                 read -r method path protocol <<< "$request_line"
 
                 # Read headers until blank line (Bash 3.2 compatible — no associative arrays)
@@ -373,7 +375,8 @@ cmd_status() {
     echo ""
     if [[ -f "$WEBHOOK_EVENTS_FILE" ]]; then
         local event_count
-        event_count=$(wc -l < "$WEBHOOK_EVENTS_FILE" 2>/dev/null || echo 0)
+        event_count=$(wc -l < "$WEBHOOK_EVENTS_FILE" 2>/dev/null || true)
+        event_count="${event_count:-0}"
         info "Recent webhook events (${event_count} total):"
         tail -5 "$WEBHOOK_EVENTS_FILE" 2>/dev/null | jq -c '{ts, repo, issue, label}' || echo "  (no events yet)"
     else

package/scripts/sw-widgets.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.3.0"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 REPO_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
 
@@ -34,6 +34,7 @@ CONFIG_DIR="${HOME}/.shipwright"
 CONFIG_FILE="${CONFIG_DIR}/widgets-config.json"
 EVENTS_FILE="${CONFIG_DIR}/events.jsonl"
 PIPELINE_STATE="${REPO_DIR}/.claude/pipeline-state.md"
+# shellcheck disable=SC2034
 COSTS_FILE="${CONFIG_DIR}/costs.json"
 
 # ─── Helpers ───────────────────────────────────────────────────────────────
@@ -82,7 +83,8 @@ _get_test_stats() {
 
     # Count test-related events
     local pass_count
-    pass_count=$(grep -i "test.*passed" "$EVENTS_FILE" 2>/dev/null | wc -l || echo "0")
+    pass_count=$(grep -i "test.*passed" "$EVENTS_FILE" 2>/dev/null | wc -l || true)
+    pass_count="${pass_count:-0}"
     pass_count=$(_safe_num "$pass_count")
 
     echo "$pass_count"
@@ -109,11 +111,13 @@ _get_health_score() {
     recent_events=$(tail -n 100 "$EVENTS_FILE" 2>/dev/null || true)
 
     local success_count
-    success_count=$(echo "$recent_events" | grep -i "stage.*completed" | wc -l || echo "0")
+    success_count=$(echo "$recent_events" | grep -i "stage.*completed" | wc -l || true)
+    success_count="${success_count:-0}"
     success_count=$(_safe_num "$success_count")
 
     local fail_count
-    fail_count=$(echo "$recent_events" | grep -i "stage.*failed" | wc -l || echo "0")
+    fail_count=$(echo "$recent_events" | grep -i "stage.*failed" | wc -l || true)
+    fail_count="${fail_count:-0}"
     fail_count=$(_safe_num "$fail_count")
 
     local total=$((success_count + fail_count))
@@ -257,6 +261,7 @@ cmd_slack() {
 
     # Build Slack message
     local message_json
+    # shellcheck disable=SC2046
     message_json=$(jq -n \
         --arg channel "$channel" \
         --arg status "$status" \

package/scripts/sw-worktree.sh

@@ -5,7 +5,8 @@
 # ║  Each agent gets its own worktree so parallel agents don't clobber       ║
 # ║  each other's files. Worktrees live in .worktrees/ relative to root.    ║
 # ╚═══════════════════════════════════════════════════════════════════════════╝
-VERSION="3.1.0"
+# shellcheck disable=SC2034
+VERSION="3.3.0"
 set -euo pipefail
 trap 'echo "ERROR: $BASH_SOURCE:$LINENO exited with status $?" >&2' ERR
 
@@ -213,19 +214,30 @@ worktree_remove() {
     local worktree_path="$WORKTREE_DIR/$name"
     local branch="loop/$name"
 
+    # Log disk usage before removal
+    local size_before_mb=0
+    if [[ -d "$worktree_path" ]]; then
+        size_before_mb=$(du -sm "$worktree_path" 2>/dev/null | awk '{print $1}')
+    fi
+
     if [[ -d "$worktree_path" ]]; then
         git worktree remove "$worktree_path" --force 2>/dev/null || {
             warn "Could not cleanly remove worktree $name, forcing..."
+            # Validate path is under WORKTREE_DIR before rm -rf
             if [[ -n "$worktree_path" && "$worktree_path" == "$WORKTREE_DIR/"* ]]; then
                 rm -rf "$worktree_path"
+            else
+                error "Worktree path invalid (not under $WORKTREE_DIR): $worktree_path"
+                return 1
             fi
-            git worktree prune 2>/dev/null || true
         }
+        # Always run prune to clean up .git/config
+        git worktree prune 2>/dev/null || true
     fi
 
     git branch -D "$branch" 2>/dev/null || true
 
-    success "Removed worktree: ${BOLD}$name${RESET}"
+    success "Removed worktree: ${BOLD}$name${RESET}${DIM} (freed ${size_before_mb}MB)${RESET}"
 }
 
 worktree_cleanup() {