shipwright-cli 2.2.2 → 2.3.1

package/scripts/lib/pipeline-stages.sh

@@ -1761,6 +1761,60 @@ stage_merge() {
         return 0
     fi
 
+    # ── Oversight gate: merge block on verdict (diff + review criticals + goal) ──
+    if [[ -x "$SCRIPT_DIR/sw-oversight.sh" ]] && [[ "${SKIP_GATES:-false}" != "true" ]]; then
+        local merge_diff_file="${ARTIFACTS_DIR}/review-diff.patch"
+        local merge_review_file="${ARTIFACTS_DIR}/review.md"
+        if [[ ! -s "$merge_diff_file" ]]; then
+            git diff "${BASE_BRANCH}...${GIT_BRANCH}" > "$merge_diff_file" 2>/dev/null || \
+                git diff HEAD~5 > "$merge_diff_file" 2>/dev/null || true
+        fi
+        if [[ -s "$merge_diff_file" ]]; then
+            local _merge_critical _merge_sec _merge_blocking _merge_reject
+            _merge_critical=$(grep -ciE '\*\*\[?Critical\]?\*\*' "$merge_review_file" 2>/dev/null || echo "0")
+            _merge_sec=$(grep -ciE '\*\*\[?Security\]?\*\*' "$merge_review_file" 2>/dev/null || echo "0")
+            _merge_blocking=$((${_merge_critical:-0} + ${_merge_sec:-0}))
+            [[ "$_merge_blocking" -gt 0 ]] && _merge_reject="Review found ${_merge_blocking} critical/security issue(s)"
+            if ! bash "$SCRIPT_DIR/sw-oversight.sh" gate --diff "$merge_diff_file" --description "${GOAL:-Pipeline merge}" --reject-if "${_merge_reject:-}" >/dev/null 2>&1; then
+                error "Oversight gate rejected — blocking merge"
+                emit_event "merge.oversight_blocked" "issue=${ISSUE_NUMBER:-0}"
+                log_stage "merge" "BLOCKED: oversight gate rejected"
+                return 1
+            fi
+        fi
+    fi
+
+    # ── Approval gates: block if merge requires approval and pending for this issue ──
+    local ag_file="${HOME}/.shipwright/approval-gates.json"
+    if [[ -f "$ag_file" ]] && [[ "${SKIP_GATES:-false}" != "true" ]]; then
+        local ag_enabled ag_stages ag_pending_merge ag_issue_num
+        ag_enabled=$(jq -r '.enabled // false' "$ag_file" 2>/dev/null || echo "false")
+        ag_stages=$(jq -r '.stages // [] | if type == "array" then .[] else empty end' "$ag_file" 2>/dev/null || true)
+        ag_issue_num=$(echo "${ISSUE_NUMBER:-0}" | awk '{print $1+0}')
+        if [[ "$ag_enabled" == "true" ]] && echo "$ag_stages" | grep -qx "merge" 2>/dev/null; then
+            local ha_file="${ARTIFACTS_DIR}/human-approval.txt"
+            local ha_approved="false"
+            if [[ -f "$ha_file" ]]; then
+                ha_approved=$(jq -r --arg stage "merge" 'select(.stage == $stage) | .approved // false' "$ha_file" 2>/dev/null || echo "false")
+            fi
+            if [[ "$ha_approved" != "true" ]]; then
+                ag_pending_merge=$(jq -r --argjson issue "$ag_issue_num" --arg stage "merge" \
+                    '[.pending[]? | select(.issue == $issue and .stage == $stage)] | length' "$ag_file" 2>/dev/null || echo "0")
+                if [[ "${ag_pending_merge:-0}" -eq 0 ]]; then
+                    local req_at tmp_ag
+                    req_at=$(date -u +"%Y-%m-%dT%H:%M:%SZ" 2>/dev/null || true)
+                    tmp_ag=$(mktemp "${HOME}/.shipwright/approval-gates.json.XXXXXX" 2>/dev/null || mktemp)
+                    jq --argjson issue "$ag_issue_num" --arg stage "merge" --arg requested "${req_at}" \
+                        '.pending += [{"issue": $issue, "stage": $stage, "requested_at": $requested}]' "$ag_file" > "$tmp_ag" 2>/dev/null && mv "$tmp_ag" "$ag_file" || rm -f "$tmp_ag"
+                fi
+                info "Merge requires approval — awaiting human approval via dashboard"
+                emit_event "merge.approval_pending" "issue=${ISSUE_NUMBER:-0}"
+                log_stage "merge" "BLOCKED: approval gate pending"
+                return 1
+            fi
+        fi
+    fi
+
     # ── Branch Protection Check ──
     if type gh_branch_protection &>/dev/null 2>&1 && [[ -n "$REPO_OWNER" && -n "$REPO_NAME" ]]; then
         local protection_json
@@ -2472,6 +2526,11 @@ _Created automatically by \`shipwright pipeline\` monitor stage_" 2>/dev/null ||
 
     success "Post-deploy monitoring clean (${total_errors} errors in ${duration_minutes}m)"
 
+    # Proactive feedback collection: always collect deploy logs for trend analysis
+    if [[ -f "$deploy_log_file" ]] && [[ -s "$deploy_log_file" ]] && [[ -x "$SCRIPT_DIR/sw-feedback.sh" ]]; then
+        (cd "$PROJECT_ROOT" && ARTIFACTS_DIR="$ARTIFACTS_DIR" bash "$SCRIPT_DIR/sw-feedback.sh" collect "$deploy_log_file" 2>/dev/null) || true
+    fi
+
     if [[ -n "$ISSUE_NUMBER" ]]; then
         gh_comment_issue "$ISSUE_NUMBER" "✅ **Post-deploy monitoring passed** — ${duration_minutes}m, ${total_errors} errors" 2>/dev/null || true
     fi

package/scripts/sw

@@ -5,7 +5,7 @@
 # ╚═══════════════════════════════════════════════════════════════════════════╝
 set -euo pipefail
 
-VERSION="2.2.2"
+VERSION="2.3.1"
 
 # Resolve symlinks (required for npm global install where bin/ symlinks to node_modules/)
 SOURCE="${BASH_SOURCE[0]}"
@@ -27,6 +27,19 @@ DIM='\033[2m'
 BOLD='\033[1m'
 RESET='\033[0m'
 
+# ─── Project identity (auto-detect from git remote) ───────────────────────
+_sw_github_repo() {
+    local url; url="$(git remote get-url origin 2>/dev/null || echo "")"
+    if [[ "$url" =~ github\.com[:/]([^/]+)/([^/.]+) ]]; then
+        echo "${BASH_REMATCH[1]}/${BASH_REMATCH[2]}"
+    else
+        echo "${SHIPWRIGHT_GITHUB_REPO:-sethdford/shipwright}"
+    fi
+}
+_sw_github_owner() { local r="$(_sw_github_repo)"; echo "${r%%/*}"; }
+_sw_docs_url() { echo "${SHIPWRIGHT_DOCS_URL:-https://$(_sw_github_owner).github.io/shipwright}"; }
+_sw_github_url() { echo "https://github.com/$(_sw_github_repo)"; }
+
 # ─── Cross-platform compatibility ──────────────────────────────────────────
 # shellcheck source=lib/compat.sh
 [[ -f "$SCRIPT_DIR/lib/compat.sh" ]] && source "$SCRIPT_DIR/lib/compat.sh"
@@ -76,183 +89,85 @@ show_help() {
     echo ""
     echo -e "${BOLD}USAGE${RESET}"
     echo -e "  ${CYAN}shipwright${RESET} <command> [options]    ${DIM}(also: sw, cct)${RESET}"
-    echo -e "  ${CYAN}shipwright${RESET} <group> <subcommand> [options]"
     echo ""
-    echo -e "${BOLD}COMMAND GROUPS${RESET}  ${DIM}(new grouped syntax)${RESET}"
-    echo -e "  ${CYAN}agent${RESET} <subcmd>         ${DIM}Agent management: recruit, swarm, standup, guild, oversight${RESET}"
-    echo -e "  ${CYAN}quality${RESET} <subcmd>       ${DIM}Quality & review: code-review, security-audit, testgen, hygiene${RESET}"
-    echo -e "  ${CYAN}observe${RESET} <subcmd>       ${DIM}Observability: vitals, dora, retro, stream, activity, replay${RESET}"
-    echo -e "  ${CYAN}release${RESET} <subcmd>       ${DIM}Release & deploy: release, release-manager, changelog, deploy${RESET}"
-    echo -e "  ${CYAN}intel${RESET} <subcmd>         ${DIM}Intelligence: predict, intelligence, strategic, optimize${RESET}"
-    echo ""
-    echo -e "${BOLD}CORE COMMANDS${RESET}  ${DIM}(flat aliases for backwards compat)${RESET}"
-    echo -e "  ${CYAN}session${RESET} [name]       Create a new tmux window for a Claude team"
-    echo -e "  ${CYAN}status${RESET} [--json]        Show dashboard of running teams and agents"
-    echo -e "  ${CYAN}mission-control|mc${RESET}   Terminal-based pipeline mission control (drill-down, team tree, orchestration)"
-    echo -e "  ${CYAN}ps${RESET}                    Show running agent processes and status"
-    echo -e "  ${CYAN}logs${RESET} [team] [opts]    View and search agent pane logs"
-    echo -e "  ${CYAN}activity${RESET} [cmd] [opts]  Live agent activity stream — watch Claude think"
-    echo -e "  ${CYAN}templates${RESET} [list|show]  Manage team composition templates"
+    echo -e "${BOLD}GETTING STARTED${RESET}"
+    echo -e "  ${CYAN}init${RESET}                  One-command setup — tmux, CLI, templates, hooks"
+    echo -e "  ${CYAN}setup${RESET}                 Guided interactive setup"
     echo -e "  ${CYAN}doctor${RESET}                Validate your setup and check for issues"
-    echo -e "  ${CYAN}cleanup${RESET} [--force]     Clean up orphaned team sessions"
-    echo -e "  ${CYAN}reaper${RESET} [--watch]       Automatic pane cleanup when agents exit"
-    echo -e "  ${CYAN}upgrade${RESET} [--apply]     Check for updates from the repo (dry-run by default)"
-    echo -e "  ${CYAN}loop${RESET} \"goal\" [opts]    ${BOLD}Continuous agent loop${RESET} — run until goal is achieved"
-    echo -e "  ${CYAN}pipeline${RESET} <cmd>         ${BOLD}Full delivery pipeline${RESET} — idea to production"
-    echo -e "  ${CYAN}worktree${RESET} <cmd>         Manage git worktrees for agent isolation"
-    echo -e "  ${CYAN}prep${RESET} [options]         ${BOLD}Repo preparation${RESET} — generate .claude/ configs for agents"
-    echo -e "  ${CYAN}hygiene${RESET} <cmd>         ${BOLD}Repo hygiene${RESET} — dead code, structure, deps, cleanup"
-    echo -e "  ${CYAN}daemon${RESET} <cmd>           ${BOLD}Issue watcher${RESET} — auto-process GitHub issues"
-    echo -e "  ${CYAN}autonomous|auto${RESET} <cmd>  ${BOLD}Autonomous loop${RESET} — AI-building-AI: analyze, create, build, learn"
-    echo -e "  ${CYAN}memory${RESET} <cmd>           ${BOLD}Persistent memory${RESET} — learn from every pipeline run"
-    echo -e "  ${CYAN}guild${RESET} <cmd>            ${BOLD}Knowledge guilds${RESET} — cross-team learning, shared patterns"
-    echo -e "  ${CYAN}instrument${RESET} <cmd>       ${BOLD}Pipeline instrumentation${RESET} — record predicted vs actual metrics"
-    echo -e "  ${CYAN}cost${RESET} <cmd>             ${BOLD}Cost intelligence${RESET} — track tokens, budgets, model routing"
-    echo -e "  ${CYAN}adaptive${RESET} <cmd>         ${BOLD}Adaptive tuning${RESET} — data-driven pipeline defaults from historical runs"
-    echo -e "  ${CYAN}regression${RESET} <cmd>       ${BOLD}Regression detection${RESET} — detect regressions after merge"
-    echo -e "  ${CYAN}incident${RESET} <cmd>        ${BOLD}Incident commander${RESET} — detect failures, triage, remediate"
-    echo -e "  ${CYAN}db${RESET} <cmd>               ${BOLD}SQLite persistence${RESET} — events, runs, developers, metrics"
-    echo -e "  ${CYAN}deps${RESET} <cmd>            ${BOLD}Dependency updates${RESET} — scan, classify, test, merge Dependabot/Renovate PRs"
-    echo -e "  ${CYAN}fleet${RESET} <cmd>           ${BOLD}Multi-repo fleet${RESET} — orchestrate daemons across repos"
-    echo -e "  ${CYAN}fleet-viz${RESET} <cmd>        ${BOLD}Fleet visualization${RESET} — cross-repo insights and queue"
-    echo -e "  ${CYAN}fix${RESET} \"goal\" [opts]     ${BOLD}Bulk fix${RESET} — apply a fix across multiple repos"
-    echo -e "  ${CYAN}dashboard${RESET} <cmd>        ${BOLD}Fleet Command${RESET} — real-time WebSocket dashboard"
-    echo -e "  ${CYAN}public-dashboard${RESET} <cmd> ${BOLD}Public dashboard${RESET} — shareable pipeline progress (static HTML)"
-    echo -e "  ${CYAN}share${RESET} [...]            ${BOLD}Share pipeline${RESET} — alias for ${DIM}public-dashboard share${RESET}"
-    echo -e "  ${CYAN}jira${RESET} <cmd>             ${BOLD}Jira sync${RESET} — bidirectional issue sync with Jira"
-    echo -e "  ${CYAN}linear${RESET} <cmd>           ${BOLD}Linear sync${RESET} — bidirectional issue sync with Linear"
-    echo -e "  ${CYAN}model${RESET} <cmd>            ${BOLD}Model router${RESET} — intelligent model routing and cost optimization"
-    echo -e "  ${CYAN}tracker${RESET} <cmd>           ${BOLD}Issue tracker${RESET} — configure Linear/Jira integration"
-    echo -e "  ${CYAN}heartbeat${RESET} <cmd>        ${BOLD}Agent heartbeat${RESET} — write/check/list/clear heartbeats"
-    echo -e "  ${CYAN}standup${RESET} <cmd>         ${BOLD}Daily standups${RESET} — gather status, summarize work, report blockers"
-    echo -e "  ${CYAN}checkpoint${RESET} <cmd>       ${BOLD}Checkpoints${RESET} — save/restore agent state mid-stage"
-    echo -e "  ${CYAN}durable${RESET} <cmd>          ${BOLD}Durable workflow${RESET} — event log, checkpoints, locks, exactly-once"
-    echo -e "  ${CYAN}webhook${RESET} <cmd>          ${BOLD}GitHub webhooks${RESET} — instant issue processing, no polling"
-    echo -e "  ${CYAN}decompose${RESET} <cmd>        ${BOLD}Issue decomposer${RESET} — analyze complexity, auto-create subtasks"
-    echo -e "  ${CYAN}discovery${RESET} <cmd>        ${BOLD}Cross-pipeline learning${RESET} — real-time knowledge sharing"
-    echo -e "  ${CYAN}connect${RESET} <cmd>          ${BOLD}Team connect${RESET} — sync local state to team dashboard"
-    echo -e "  ${CYAN}remote${RESET} <cmd>           ${BOLD}Remote machines${RESET} — register and manage distributed workers"
-    echo -e "  ${CYAN}launchd${RESET} <cmd>          ${BOLD}Process supervision${RESET} — auto-start daemon + dashboard on boot"
-    echo -e "  ${CYAN}auth${RESET} <cmd>            ${BOLD}GitHub authentication${RESET} — OAuth login, token management, multi-user"
-    echo -e "  ${CYAN}docs${RESET} <cmd>            ${BOLD}Documentation keeper${RESET} — auto-sync docs from source"
-    echo -e "  ${CYAN}changelog${RESET} <cmd>       ${BOLD}Changelog engine${RESET} — auto-generate release notes and migration guides"
-    echo -e "  ${CYAN}docs-agent${RESET} <cmd>      ${BOLD}Autonomous docs agent${RESET} — scan gaps, sync, coverage, API ref"
-    echo -e "  ${CYAN}doc-fleet${RESET} <cmd>       ${BOLD}Documentation fleet${RESET} — 5 specialized agents: audit, refactor, enhance docs"
-    echo -e "  ${CYAN}release${RESET} <cmd>         ${BOLD}Release automation${RESET} — bump versions, changelog, tags, releases"
-    echo -e "  ${CYAN}release-manager|rm${RESET}    ${BOLD}Autonomous release pipeline${RESET} — readiness checks, RC flow, rollback"
-    echo -e "  ${CYAN}replay${RESET} <cmd>           ${BOLD}Pipeline DVR${RESET} — list, show, narrative, diff, export, compare runs"
-    echo -e "  ${CYAN}scale${RESET} <cmd>            ${BOLD}Dynamic team scaling${RESET} — scale agents up/down during pipeline"
-    echo -e "  ${CYAN}swarm${RESET} <cmd>            ${BOLD}Agent swarm manager${RESET} — registry, spawning, scaling, health, topology"
-    echo -e "  ${CYAN}dora${RESET} <cmd>            ${BOLD}DORA metrics${RESET} — deploy frequency, lead time, CFR, MTTR dashboard"
-    echo -e "  ${CYAN}retro${RESET} <cmd>           ${BOLD}Sprint retrospective${RESET} — analyze sprints, identify improvements, create actions"
-    echo -e "  ${CYAN}tmux${RESET} <cmd>            ${BOLD}tmux health${RESET} — doctor, install plugins, fix issues"
-    echo -e "  ${CYAN}vitals${RESET}               ${BOLD}Pipeline vitals${RESET} — real-time health scoring and dashboard"
-    echo -e "  ${CYAN}stream${RESET}               ${BOLD}Terminal streaming${RESET} — live agent output to dashboard or CLI"
-    echo -e "  ${CYAN}github${RESET}               ${BOLD}GitHub context${RESET} — repo metadata, security, blame"
-    echo -e "  ${CYAN}checks${RESET}               ${BOLD}GitHub checks${RESET} — CI check runs and status"
-    echo -e "  ${CYAN}ci${RESET}                   ${BOLD}CI/CD orchestration${RESET} — workflow generation, matrix, caching, secrets"
-    echo -e "  ${CYAN}deploys${RESET}              ${BOLD}Deployments${RESET} — deployment history and environments"
-    echo -e "  ${CYAN}github-app${RESET}           ${BOLD}GitHub App management${RESET} — JWT, tokens, webhooks, manifest"
-    echo -e "  ${CYAN}pr${RESET}                   ${BOLD}PR lifecycle${RESET} — auto-review, merge, cleanup, feedback"
-    echo -e "  ${CYAN}context${RESET}              ${BOLD}Context engine${RESET} — gather context for pipeline stages"
-    echo -e "  ${CYAN}trace${RESET}                ${BOLD}E2E traceability${RESET} — issue to commit to PR to deploy"
-    echo -e "  ${CYAN}widgets${RESET}              ${BOLD}Status widgets${RESET} — embeddable badges, Slack messages, markdown"
-    echo -e "  ${CYAN}eventbus${RESET}             ${BOLD}Event bus${RESET} — real-time inter-component communication"
-    echo -e "  ${CYAN}otel${RESET}                 ${BOLD}OpenTelemetry observability${RESET} — Prometheus metrics, traces, OTLP export"
-    echo -e "  ${CYAN}triage${RESET}                ${BOLD}Issue labeling & prioritization${RESET} — auto-analyze, label, score, team sizing"
-    echo -e "  ${CYAN}quality${RESET}               ${BOLD}Quality validation${RESET} — ruthless gates, adversarial audits, completion detection"
-    echo -e "  ${CYAN}oversight${RESET}             ${BOLD}Quality oversight board${RESET} — multi-agent review council, voting, architecture governance"
-    echo -e "  ${CYAN}code-review${RESET}           ${BOLD}Autonomous code review${RESET} — clean code, SOLID, architecture boundaries, complexity"
-    echo -e "  ${CYAN}pm${RESET}                    ${BOLD}Autonomous PM agent${RESET} — intelligent team sizing, composition, orchestration"
-    echo -e "  ${CYAN}strategic${RESET}             ${BOLD}Strategic intelligence${RESET} — analyze strategy, metrics, create improvement issues"
-    echo -e "  ${CYAN}team-stages${RESET}          ${BOLD}Multi-agent stage execution${RESET} — compose teams, delegate tasks, tally votes"
-    echo -e "  ${CYAN}ux${RESET}                    ${BOLD}Premium UX layer${RESET} — themes, animations, shortcuts, accessibility"
-    echo -e "  ${CYAN}recruit${RESET}               ${BOLD}Agent recruitment${RESET} — skill matching, role definitions, performance evaluation"
-    echo -e "  ${CYAN}testgen${RESET}              ${BOLD}Test generation${RESET} — analyze coverage, generate tests, maintain thresholds"
-    echo -e "  ${CYAN}security-audit|audit${RESET} ${BOLD}Security auditing${RESET} — secrets, licenses, vulnerabilities, SBOM, compliance"
-    echo -e "  ${CYAN}init${RESET}                  ${BOLD}Quick tmux setup${RESET} — one command, no prompts"
-    echo -e "  ${CYAN}setup${RESET}                 ${BOLD}Guided setup${RESET} — prerequisites, init, doctor, quick start"
-    echo -e "  ${CYAN}help${RESET}                  Show this help message"
-    echo -e "  ${CYAN}version${RESET} [show]        Show version"
-    echo -e "  ${CYAN}version bump${RESET} <x.y.z>  Bump version everywhere (scripts, README, package.json)"
-    echo -e "  ${CYAN}version check${RESET}         Verify version consistency (CI / before release)"
-    echo -e "  ${CYAN}hello${RESET}                Say hello world"
-    echo ""
-    echo -e "${BOLD}CONTINUOUS LOOP${RESET}  ${DIM}(autonomous agent operation)${RESET}"
-    echo -e "  ${DIM}shipwright loop \"Build auth\" --test-cmd \"npm test\"${RESET}"
-    echo -e "  ${DIM}shipwright loop \"Fix bugs\" --max-iterations 10 --model sonnet${RESET}"
-    echo -e "  ${DIM}shipwright loop \"Build API\" --agents 3 --skip-permissions${RESET}"
-    echo -e "  ${DIM}shipwright loop --resume${RESET}                   # Resume interrupted loop"
     echo ""
-    echo -e "${BOLD}DELIVERY PIPELINE${RESET}  ${DIM}(idea to production)${RESET}"
-    echo -e "  ${DIM}shipwright pipeline start --goal \"Add auth\" --pipeline standard${RESET}"
-    echo -e "  ${DIM}shipwright pipeline start --issue 123 --skip-gates${RESET}"
-    echo -e "  ${DIM}shipwright pipeline resume${RESET}               # Resume from last stage"
-    echo -e "  ${DIM}shipwright pipeline status${RESET}                # Show progress dashboard"
+    echo -e "${BOLD}EVERYDAY COMMANDS${RESET}"
+    echo -e "  ${CYAN}session${RESET} [name]         Create a tmux window for a Claude agent team"
+    echo -e "  ${CYAN}loop${RESET} \"goal\" [opts]     Continuous agent loop — run until goal achieved"
+    echo -e "  ${CYAN}pipeline${RESET} <cmd>          Full delivery pipeline — issue to merged PR"
+    echo -e "  ${CYAN}daemon${RESET} <cmd>            Issue watcher — auto-process GitHub issues"
+    echo -e "  ${CYAN}status${RESET} [--json]         Show running teams and agents"
+    echo -e "  ${CYAN}ps${RESET}                      Show agent processes"
+    echo -e "  ${CYAN}logs${RESET} [team] [opts]      View and search agent pane logs"
+    echo -e "  ${CYAN}prep${RESET} [options]           Generate .claude/ configs for any repo"
     echo ""
-    echo -e "${BOLD}AUTONOMOUS DAEMON${RESET}  ${DIM}(watch GitHub, auto-deliver)${RESET}"
-    echo -e "  ${DIM}shipwright daemon start${RESET}                  # Start issue watcher (foreground)"
-    echo -e "  ${DIM}shipwright daemon start --detach${RESET}         # Start in background tmux session"
-    echo -e "  ${DIM}shipwright daemon status${RESET}                 # Show active pipelines and queue"
-    echo -e "  ${DIM}shipwright daemon metrics${RESET}                # DORA/DX metrics dashboard"
-    echo -e "  ${DIM}shipwright daemon stop${RESET}                   # Graceful shutdown"
+    echo -e "${BOLD}COMMAND GROUPS${RESET}  ${DIM}(use: shipwright <group> help)${RESET}"
+    echo -e "  ${CYAN}agent${RESET}     ${DIM}recruit, swarm, standup, guild, oversight${RESET}"
+    echo -e "  ${CYAN}quality${RESET}   ${DIM}code-review, security-audit, testgen, hygiene${RESET}"
+    echo -e "  ${CYAN}observe${RESET}   ${DIM}vitals, dora, retro, stream, activity, replay${RESET}"
+    echo -e "  ${CYAN}release${RESET}   ${DIM}release, release-manager, changelog, deploy${RESET}"
+    echo -e "  ${CYAN}intel${RESET}     ${DIM}predict, intelligence, strategic, optimize${RESET}"
     echo ""
-    echo -e "${BOLD}MEMORY & COST${RESET}  ${DIM}(intelligence layer)${RESET}"
-    echo -e "  ${DIM}shipwright memory show${RESET}                    # Show learned patterns for this repo"
-    echo -e "  ${DIM}shipwright memory search \"auth\"${RESET}            # Search across all memories"
-    echo -e "  ${DIM}shipwright memory stats${RESET}                    # Memory usage and coverage"
-    echo -e "  ${DIM}shipwright cost show${RESET}                        # Token usage and spend overview"
-    echo -e "  ${DIM}shipwright cost budget set 10.00${RESET}           # Set daily budget"
-    echo -e "  ${DIM}shipwright cost show --period 30 --by-stage${RESET} # Detailed cost report"
+    echo -e "${BOLD}OPERATIONS${RESET}"
+    echo -e "  ${CYAN}fleet${RESET} <cmd>            Multi-repo orchestration"
+    echo -e "  ${CYAN}fix${RESET} \"goal\" [opts]      Bulk fix across multiple repos"
+    echo -e "  ${CYAN}dashboard${RESET} <cmd>         Real-time WebSocket dashboard"
+    echo -e "  ${CYAN}cost${RESET} <cmd>              Token usage, budgets, model routing"
+    echo -e "  ${CYAN}memory${RESET} <cmd>            Persistent learning from pipeline runs"
     echo ""
-    echo -e "${BOLD}FLEET OPERATIONS${RESET}  ${DIM}(multi-repo management)${RESET}"
-    echo -e "  ${DIM}shipwright fleet start${RESET}                      # Start daemons for all configured repos"
-    echo -e "  ${DIM}shipwright fleet status${RESET}                     # Show fleet-wide status"
-    echo -e "  ${DIM}shipwright fleet metrics${RESET}                    # Cross-repo DORA metrics"
-    echo -e "  ${DIM}shipwright fix \"Bump deps\" --repos ~/api,~/web${RESET}  # Bulk fix"
+    echo -e "${BOLD}INTEGRATIONS${RESET}"
+    echo -e "  ${CYAN}github${RESET}                 Repo context, security, blame"
+    echo -e "  ${CYAN}jira${RESET} <cmd>              Bidirectional Jira sync"
+    echo -e "  ${CYAN}linear${RESET} <cmd>            Bidirectional Linear sync"
+    echo -e "  ${CYAN}ci${RESET} <cmd>                CI/CD workflow generation"
     echo ""
-    echo -e "${BOLD}REPO PREPARATION${RESET}  ${DIM}(prep repo for agents)${RESET}"
-    echo -e "  ${DIM}shipwright prep${RESET}                          # Analyze repo, generate .claude/ configs"
-    echo -e "  ${DIM}shipwright prep --check${RESET}                  # Audit existing prep quality"
-    echo -e "  ${DIM}shipwright prep --with-claude${RESET}            # Deep analysis using Claude Code"
+    echo -e "${BOLD}MAINTENANCE${RESET}"
+    echo -e "  ${CYAN}cleanup${RESET} [--force]       Clean up orphaned sessions"
+    echo -e "  ${CYAN}upgrade${RESET} [--apply]       Check for and apply updates"
+    echo -e "  ${CYAN}templates${RESET} [list|show]   Manage team composition templates"
+    echo -e "  ${CYAN}version${RESET}                 Show/bump/check version"
     echo ""
-    echo -e "${BOLD}GITHUB INTEGRATION${RESET}  ${DIM}(repo context, checks, deployments)${RESET}"
-    echo -e "  ${DIM}shipwright github context${RESET}              # Show repo GitHub context"
-    echo -e "  ${DIM}shipwright github security${RESET}             # Show security alerts"
-    echo -e "  ${DIM}shipwright github blame <path>${RESET}         # Show file ownership"
-    echo -e "  ${DIM}shipwright checks list${RESET}                 # Show check runs"
-    echo -e "  ${DIM}shipwright deploys list${RESET}                # Show deployment history"
-    echo ""
-    echo -e "${BOLD}TEST SUITES${RESET}  ${DIM}(validate shipwright components)${RESET}"
-    echo -e "  ${DIM}shipwright daemon test${RESET}                   # Run daemon test suite"
-    echo -e "  ${DIM}shipwright prep test${RESET}                     # Run prep test suite"
-    echo -e "  ${DIM}shipwright pipeline test${RESET}                 # Run pipeline test suite"
-    echo -e "  ${DIM}shipwright e2e${RESET} <cmd>          ${BOLD}Test orchestration${RESET} — smoke/integration/regression"
+    echo -e "${BOLD}QUICK START${RESET}"
+    echo -e "  ${DIM}shipwright loop \"Build auth\" --test-cmd \"npm test\"${RESET}"
+    echo -e "  ${DIM}shipwright pipeline start --issue 123${RESET}"
+    echo -e "  ${DIM}shipwright daemon start --detach${RESET}"
     echo ""
-    echo -e "${BOLD}AUDIT & QUALITY${RESET}  ${DIM}(loop guardrails)${RESET}"
-    echo -e "  ${DIM}shipwright loop \"goal\" --audit${RESET}                     # Self-reflection each iteration"
-    echo -e "  ${DIM}shipwright loop \"goal\" --audit-agent${RESET}               # Separate auditor reviews work"
-    echo -e "  ${DIM}shipwright loop \"goal\" --quality-gates${RESET}             # Automated quality checks"
-    echo -e "  ${DIM}shipwright loop \"goal\" --definition-of-done dod.md${RESET} # Custom completion checklist"
+    echo -e "${BOLD}TMUX KEYBINDINGS${RESET}"
+    echo -e "  ${PURPLE}prefix + T${RESET}           Launch a team session"
+    echo -e "  ${PURPLE}prefix + Ctrl-t${RESET}      Show team dashboard"
     echo ""
-    echo -e "${BOLD}TMUX KEYBINDINGS${RESET}  ${DIM}(with the bundled tmux.conf)${RESET}"
-    echo -e "  ${PURPLE}prefix + T${RESET}           Launch a team session  (runs ${DIM}shipwright session${RESET})"
-    echo -e "  ${PURPLE}prefix + Ctrl-t${RESET}      Show team dashboard    (runs ${DIM}shipwright status${RESET})"
+    echo -e "${DIM}Run ${RESET}${CYAN}shipwright help --all${RESET}${DIM} for the full command list (80+ commands)${RESET}"
+    echo -e "${DIM}Docs: $(_sw_docs_url)  |  GitHub: $(_sw_github_url)${RESET}"
+}
+
+show_help_all() {
+    show_help
     echo ""
-    echo -e "${BOLD}EXAMPLES${RESET}"
-    echo -e "  ${DIM}shipwright session refactor${RESET}      # New window named 'claude-refactor'"
-    echo -e "  ${DIM}shipwright session${RESET}               # New window with timestamp name"
-    echo -e "  ${DIM}shipwright status${RESET}                # See all active teams"
-    echo -e "  ${DIM}shipwright ps${RESET}                    # Show agent processes"
-    echo -e "  ${DIM}shipwright logs myteam${RESET}           # View logs for a team"
-    echo -e "  ${DIM}shipwright logs myteam --follow${RESET}  # Tail agent logs"
-    echo -e "  ${DIM}shipwright doctor${RESET}                # Check setup health"
-    echo -e "  ${DIM}shipwright cleanup${RESET}               # Dry-run: show what would be cleaned"
-    echo -e "  ${DIM}shipwright cleanup --force${RESET}       # Actually kill orphaned sessions"
-    echo -e "  ${DIM}shipwright upgrade${RESET}               # Check what's changed since install"
-    echo -e "  ${DIM}shipwright upgrade --apply${RESET}       # Apply available updates"
+    echo -e "${BOLD}ALL COMMANDS${RESET}  ${DIM}(complete reference)${RESET}"
+    echo -e "  ${CYAN}session${RESET}       ${CYAN}status${RESET}        ${CYAN}ps${RESET}            ${CYAN}logs${RESET}          ${CYAN}activity${RESET}"
+    echo -e "  ${CYAN}loop${RESET}          ${CYAN}pipeline${RESET}      ${CYAN}daemon${RESET}        ${CYAN}prep${RESET}          ${CYAN}worktree${RESET}"
+    echo -e "  ${CYAN}fleet${RESET}         ${CYAN}fleet-viz${RESET}     ${CYAN}fix${RESET}           ${CYAN}dashboard${RESET}     ${CYAN}public-dashboard${RESET}"
+    echo -e "  ${CYAN}memory${RESET}        ${CYAN}cost${RESET}          ${CYAN}model${RESET}         ${CYAN}adaptive${RESET}      ${CYAN}regression${RESET}"
+    echo -e "  ${CYAN}incident${RESET}      ${CYAN}db${RESET}            ${CYAN}deps${RESET}          ${CYAN}instrument${RESET}    ${CYAN}scale${RESET}"
+    echo -e "  ${CYAN}swarm${RESET}         ${CYAN}recruit${RESET}       ${CYAN}standup${RESET}       ${CYAN}guild${RESET}         ${CYAN}oversight${RESET}"
+    echo -e "  ${CYAN}code-review${RESET}   ${CYAN}testgen${RESET}       ${CYAN}security-audit${RESET}  ${CYAN}hygiene${RESET}     ${CYAN}quality${RESET}"
+    echo -e "  ${CYAN}vitals${RESET}        ${CYAN}dora${RESET}          ${CYAN}retro${RESET}         ${CYAN}stream${RESET}        ${CYAN}replay${RESET}"
+    echo -e "  ${CYAN}release${RESET}       ${CYAN}release-manager${RESET}  ${CYAN}changelog${RESET}  ${CYAN}docs${RESET}          ${CYAN}docs-agent${RESET}"
+    echo -e "  ${CYAN}doc-fleet${RESET}     ${CYAN}pr${RESET}            ${CYAN}triage${RESET}        ${CYAN}decompose${RESET}     ${CYAN}discovery${RESET}"
+    echo -e "  ${CYAN}github${RESET}        ${CYAN}github-app${RESET}    ${CYAN}checks${RESET}        ${CYAN}ci${RESET}            ${CYAN}deploys${RESET}"
+    echo -e "  ${CYAN}auth${RESET}          ${CYAN}webhook${RESET}       ${CYAN}eventbus${RESET}      ${CYAN}otel${RESET}          ${CYAN}context${RESET}"
+    echo -e "  ${CYAN}trace${RESET}         ${CYAN}widgets${RESET}       ${CYAN}connect${RESET}       ${CYAN}remote${RESET}        ${CYAN}launchd${RESET}"
+    echo -e "  ${CYAN}jira${RESET}          ${CYAN}linear${RESET}        ${CYAN}tracker${RESET}       ${CYAN}heartbeat${RESET}     ${CYAN}checkpoint${RESET}"
+    echo -e "  ${CYAN}durable${RESET}       ${CYAN}autonomous${RESET}    ${CYAN}pm${RESET}            ${CYAN}strategic${RESET}     ${CYAN}team-stages${RESET}"
+    echo -e "  ${CYAN}ux${RESET}            ${CYAN}mission-control${RESET}  ${CYAN}tmux${RESET}       ${CYAN}reaper${RESET}        ${CYAN}e2e${RESET}"
+    echo -e "  ${CYAN}init${RESET}          ${CYAN}setup${RESET}         ${CYAN}doctor${RESET}        ${CYAN}cleanup${RESET}       ${CYAN}upgrade${RESET}"
+    echo -e "  ${CYAN}templates${RESET}     ${CYAN}version${RESET}"
     echo ""
-    echo -e "${DIM}Docs: https://sethdford.github.io/shipwright  |  GitHub: https://github.com/sethdford/shipwright${RESET}"
+    echo -e "${DIM}Run ${RESET}${CYAN}shipwright <command> --help${RESET}${DIM} for details on any command${RESET}"
 }
 
 # ─── Command Group Routers ───────────────────────────────────────────────────
@@ -646,7 +561,11 @@ main() {
             exec "$SCRIPT_DIR/sw-security-audit.sh" "$@"
             ;;
         help|--help|-h)
-            show_help
+            if [[ "${1:-}" == "--all" || "${1:-}" == "-a" ]]; then
+                show_help_all
+            else
+                show_help
+            fi
             ;;
         version)
             case "${1:-show}" in

package/scripts/sw-activity.sh

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

package/scripts/sw-adaptive.sh

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

package/scripts/sw-adversarial.sh

@@ -6,7 +6,7 @@
 set -euo pipefail
 trap 'echo "ERROR: $BASH_SOURCE:$LINENO exited with status $?" >&2' ERR
 
-VERSION="2.2.2"
+VERSION="2.3.1"
 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="2.2.2"
+VERSION="2.3.1"
 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="2.2.2"
+VERSION="2.3.1"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 REPO_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
 
@@ -348,11 +348,19 @@ cmd_login() {
     info "Starting GitHub OAuth device flow..."
 
     # Initiate device flow
-    local device_flow_vars
-    device_flow_vars=$(initiate_device_flow) || return 1
-
-    # Source the variables
-    eval "$device_flow_vars"
+    local device_flow_response
+    device_flow_response=$(initiate_device_flow) || return 1
+
+    # Extract variables without eval (initiate_device_flow outputs key=value pairs)
+    local DEVICE_CODE USER_CODE INTERVAL EXPIRES_IN
+    while IFS='=' read -r key value; do
+        case "$key" in
+            DEVICE_CODE) DEVICE_CODE="$value" ;;
+            USER_CODE) USER_CODE="$value" ;;
+            INTERVAL) INTERVAL="$value" ;;
+            EXPIRES_IN) EXPIRES_IN="$value" ;;
+        esac
+    done <<< "$device_flow_response"
 
     info "Visit: ${CYAN}${DEVICE_FLOW_ENDPOINT}${RESET}"
     info "Enter code: ${BOLD}${USER_CODE}${RESET}"