shipwright-cli 2.4.0 → 3.1.0

package/README.md

@@ -12,8 +12,8 @@
 <p align="center">
   <a href="https://github.com/sethdford/shipwright/actions/workflows/test.yml"><img src="https://github.com/sethdford/shipwright/actions/workflows/test.yml/badge.svg" alt="Tests"></a>
   <a href="https://github.com/sethdford/shipwright/actions/workflows/shipwright-pipeline.yml"><img src="https://github.com/sethdford/shipwright/actions/workflows/shipwright-pipeline.yml/badge.svg" alt="Pipeline"></a>
-  <img src="https://img.shields.io/badge/tests-103_suites_passing-4ade80?style=flat-square" alt="103 suites">
-  <img src="https://img.shields.io/badge/version-2.4.0-00d4ff?style=flat-square" alt="v2.4.0">
+  <img src="https://img.shields.io/badge/tests-141_suites_passing-4ade80?style=flat-square" alt="141 suites">
+  <img src="https://img.shields.io/badge/version-3.1.0-00d4ff?style=flat-square" alt="v3.1.0">
   <img src="https://img.shields.io/badge/license-MIT-green?style=flat-square" alt="MIT License">
   <img src="https://img.shields.io/badge/bash-3.2%2B-7c3aed?style=flat-square" alt="Bash 3.2+">
 </p>
@@ -24,7 +24,7 @@
 
 - [Shipwright Builds Itself](#shipwright-builds-itself)
 - [Code Factory Pattern](#code-factory-pattern)
-- [What's New in v2.4.0](#whats-new-in-v240)
+- [What's New in v3.1.0](#whats-new-in-v310)
 - [How It Works](#how-it-works)
 - [Install](#install)
 - [Quick Start](#quick-start)
@@ -43,7 +43,7 @@
 
 This repo uses Shipwright to process its own issues. Label a GitHub issue with `shipwright` and the autonomous pipeline takes over: semantic triage, plan, design, build, test, review, quality gates, PR. No human in the loop.
 
-**[See it live](https://github.com/sethdford/shipwright/actions/workflows/shipwright-pipeline.yml)** | **[Create an issue](https://github.com/sethdford/shipwright/issues/new?template=shipwright.yml)** and watch it build.
+**[See it live](https://github.com/sethdford/shipwright/actions/workflows/shipwright-pipeline.yml)** | **[Create an issue](https://github.com/sethdford/shipwright/issues/new?template=shipwright-build.yml)** and watch it build.
 
 ---
 
@@ -77,7 +77,12 @@ Shipwright extends the Code Factory pattern with capabilities most implementatio
 - **12-stage pipeline** with self-healing builds, adversarial review, and compound quality gates
 - **Predictive risk scoring** using GitHub signals (security alerts, contributor expertise, file churn)
 - **Persistent memory** — failure patterns, fix effectiveness, and prediction accuracy compound over time
+- **Auto-learning** — self-optimize runs automatically after every pipeline completion
+- **Unified model routing** — single source of truth for model selection across all components
+- **Evidence-gated merges** — SHA discipline ensures all evidence validated against current PR head
+- **Semantic quality audits** — Claude-powered audits with grep fallback when Claude unavailable
 - **18 autonomous agents** with specialized roles (PM, reviewer, security auditor, test generator, etc.)
+- **Cross-platform compatibility** — portable date helpers, file_mtime, and compat layer for macOS/Linux
 - **Fleet operations** — the Code Factory pattern applied across every repo in your org
 - **Cost intelligence** — per-pipeline cost tracking, budget enforcement, adaptive model routing
 - **Self-optimization** — DORA metrics analysis auto-tunes daemon config and template weights
@@ -103,7 +108,7 @@ shipwright incident gap sla
 
 ---
 
-## What's New in v2.4.0
+## What's New in v3.1.0
 
 **Code Factory pattern** — deterministic, risk-aware agent delivery with machine-verifiable evidence:
 
@@ -223,7 +228,7 @@ shipwright fleet start
 shipwright fix "upgrade deps" --repos ~/a,~/b,~/c
 
 # Release automation
-shipwright version bump 2.2.2
+shipwright version bump 2.4.0
 shipwright changelog generate
 ```
 
@@ -277,7 +282,7 @@ Each stage is configurable with quality gates that auto-proceed or pause for app
 
 ### Intelligence Layer
 
-7 modules that make the pipeline smarter over time. All optional, all degrade gracefully.
+7 modules that make the pipeline smarter over time. **Auto mode**: intelligence is enabled when Claude CLI is available; set `intelligence.enabled=false` to disable. All modules degrade gracefully.
 
 | Module                       | What It Does                                                                                                          |
 | ---------------------------- | --------------------------------------------------------------------------------------------------------------------- |
@@ -442,7 +447,7 @@ shipwright fix "feat: add auth" --repos ~/a,~/b,~/c
 shipwright fleet-viz
 
 # Release automation
-shipwright version bump 2.2.2
+shipwright version bump 2.4.0
 shipwright changelog generate
 shipwright deploys list
 
@@ -494,7 +499,7 @@ shipwright templates list
 
 ## Architecture
 
-100+ bash scripts (~100K lines), 103 test suites (1000+ tests), plus a TypeScript dashboard server. Bash 3.2 compatible — runs on macOS and Linux out of the box.
+100+ bash scripts (~100K lines), 125 shell test suites + 16 dashboard test files (141 total), plus E2E system test proving full daemon→pipeline→loop→PR flow. Dashboard at 98% coverage. Bash 3.2 compatible — runs on macOS and Linux out of the box.
 
 **Core Layers:**
 
@@ -560,12 +565,12 @@ Tools & UX
 
 ## Contributing
 
-**Let Shipwright build it:** Create an issue using the [Shipwright template](https://github.com/sethdford/shipwright/issues/new?template=shipwright.yml) and label it `shipwright`. The autonomous pipeline will triage, plan, build, test, review, and create a PR.
+**Let Shipwright build it:** Create an issue using the [Shipwright template](https://github.com/sethdford/shipwright/issues/new?template=shipwright-build.yml) and label it `shipwright`. The autonomous pipeline will triage, plan, build, test, review, and create a PR.
 
 **Manual development:** Fork, branch, then:
 
 ```bash
-npm test    # 1000+ tests across 103 suites
+npm test    # 125 shell suites + 16 dashboard test files (141 total), E2E system test
 ```
 
 ## License

package/completions/_shipwright

@@ -1,4 +1,4 @@
-#compdef shipwright sw cct
+#compdef shipwright sw
 # ╔═══════════════════════════════════════════════════════════════════════════╗
 # ║  Shipwright — Zsh tab completions                                       ║
 # ║  Auto-install to ~/.zsh/completions/ during shipwright init             ║
@@ -7,11 +7,13 @@
 _shipwright() {
     local -a commands
     commands=(
+        # Command groups
         'agent:Agent management (recruit, swarm, standup, guild, oversight)'
-        'quality:Quality & review (code-review, security-audit, testgen, hygiene)'
+        'quality:Quality & review (code-review, security-audit, testgen, hygiene, validate)'
         'observe:Observability (vitals, dora, retro, stream, activity, replay)'
-        'release:Release & deploy (release, release-manager, changelog, deploy)'
+        'release:Release & deploy (release, release-manager, changelog, deploy, build)'
         'intel:Intelligence (predict, intelligence, strategic, optimize)'
+        # Core workflow
         'init:Quick tmux setup — one command, no prompts'
         'setup:Guided setup — prerequisites, init, doctor'
         'session:Create a new tmux window for a Claude team'
@@ -34,33 +36,103 @@ _shipwright() {
         'db:SQLite persistence — events, runs, developers'
         'fix:Bulk fix — apply a fix across multiple repos'
         'dashboard:Fleet Command — real-time dashboard'
-        'jira:Jira sync — bidirectional issue sync'
-        'linear:Linear sync — bidirectional issue sync'
+        # Agent management (also accessible via agent group)
+        'swarm:Dynamic agent swarm management'
+        'recruit:Agent recruitment & talent management'
+        'standup:Automated daily standups for AI teams'
+        'guild:Knowledge guilds & cross-team learning'
+        'oversight:Quality oversight board'
+        'pm:Autonomous PM agent for team orchestration'
+        'team-stages:Multi-agent execution with roles'
+        'scale:Dynamic agent team scaling'
+        # Quality (also accessible via quality group)
+        'code-review:Clean code & architecture analysis'
+        'security-audit:Comprehensive security auditing'
+        'testgen:Autonomous test generation & coverage'
+        'hygiene:Repository organization & cleanup'
+        'adversarial:Red-team code review & edge case finding'
+        'simulation:Multi-persona developer simulation'
+        'architecture:Living architecture model & enforcement'
+        # Observability (also accessible via observe group)
+        'vitals:Pipeline vitals — real-time health scoring'
+        'dora:DORA metrics dashboard with intelligence'
+        'retro:Sprint retrospective engine'
+        'stream:Live terminal output streaming from panes'
+        'activity:Live agent activity stream'
+        'replay:Pipeline run replay & timeline viewing'
+        # Release (also accessible via release group)
+        'changelog:Automated release notes & migration guides'
+        'release-manager:Autonomous release pipeline'
+        'review-rerun:SHA-deduped rerun comment writer'
+        # Intelligence (also accessible via intel group)
+        'intelligence:Run intelligence engine analysis'
+        'predict:Predictive risk assessment & anomaly detection'
+        'strategic:Strategic intelligence agent'
+        'optimize:Self-optimization based on DORA metrics'
+        'adaptive:Data-driven pipeline tuning'
+        'regression:Regression detection pipeline'
+        'model:Intelligent model routing & cost optimization'
+        'pipeline-composer:Dynamic pipeline composition'
+        # Integrations
+        'jira:Jira ↔ GitHub bidirectional sync'
+        'linear:Linear ↔ GitHub bidirectional sync'
         'tracker:Issue tracker — configure Linear/Jira'
-        'heartbeat:Agent heartbeat — write/check/list'
-        'checkpoint:Checkpoints — save/restore agent state'
+        'github:GitHub context — repo metadata'
+        'github-app:GitHub App management & webhook receiver'
+        'checks:GitHub checks — CI check runs'
+        'ci:CI/CD workflow generation'
+        'deploys:Deployments — deployment history'
         'webhook:GitHub webhooks — instant processing'
-        'decompose:Issue decomposer — analyze complexity'
+        'auth:GitHub OAuth authentication'
+        # Operations
+        'fleet-viz:Multi-repo fleet visualization'
+        'public-dashboard:Public real-time pipeline progress'
+        'mission-control:Terminal-based pipeline mission control'
         'connect:Team connect — sync local state'
         'remote:Remote machines — manage distributed workers'
         'launchd:Process supervision — auto-start on boot'
-        'docs:Documentation keeper — auto-sync docs'
-        'tmux:tmux health — doctor, install, fix'
-        'github:GitHub context — repo metadata'
-        'checks:GitHub checks — CI check runs'
-        'deploys:Deployments — deployment history'
+        'heartbeat:Agent heartbeat — write/check/list'
+        'checkpoint:Checkpoints — save/restore agent state'
+        'autonomous:AI-building-AI master controller'
+        'tmux-pipeline:Spawn and manage pipelines in tmux'
+        # Issue management
+        'triage:Intelligent issue labeling & prioritization'
+        'decompose:Issue decomposer — analyze complexity'
         'pr:PR lifecycle — auto-review, merge'
+        # Data & learning
+        'instrument:Pipeline instrumentation & feedback loops'
+        'discovery:Cross-pipeline real-time learning'
+        'feedback:Production feedback loop'
+        'eventbus:Durable event bus for components'
+        'evidence:Machine-verifiable proof for deliveries'
+        'otel:OpenTelemetry observability'
         'context:Context engine — gather context'
+        'trace:E2E traceability (Issue → Commit → PR → Deploy)'
+        # Documentation
+        'docs:Documentation keeper — auto-sync docs'
+        'docs-agent:Auto-sync README, wiki, API docs'
+        'doc-fleet:Documentation fleet orchestrator'
+        # Setup & maintenance
+        'incident:Autonomous incident detection & response'
+        'deps:Automated dependency update management'
+        'durable:Durable workflow engine for long-running ops'
+        'tmux:tmux health — doctor, install, fix'
+        'ux:Premium UX enhancement layer'
+        'widgets:Embeddable status widgets'
+        'e2e:Test suite registry & execution'
+        # Meta
         'help:Show help message'
-        'version:Show version'
+        'version:Show/bump/check version'
     )
 
+    local -a agent_cmds quality_cmds observe_cmds release_cmds intel_cmds
     local -a pipeline_cmds daemon_cmds fleet_cmds memory_cmds cost_cmds
     local -a templates_cmds worktree_cmds tracker_cmds heartbeat_cmds
     local -a checkpoint_cmds connect_cmds remote_cmds launchd_cmds
     local -a dashboard_cmds github_cmds checks_cmds deploys_cmds docs_cmds
-    local -a tmux_cmds decompose_cmds pr_cmds
-    local -a agent_cmds quality_cmds observe_cmds release_cmds intel_cmds
+    local -a tmux_cmds decompose_cmds pr_cmds db_cmds ci_cmds auth_cmds
+    local -a autonomous_cmds version_cmds jira_cmds linear_cmds
+    local -a eventbus_cmds evidence_cmds webhook_cmds
 
     agent_cmds=(
         'recruit:Agent recruitment & talent management'
@@ -74,6 +146,8 @@ _shipwright() {
         'security-audit:Comprehensive security auditing'
         'testgen:Autonomous test generation'
         'hygiene:Repository organization & cleanup'
+        'validate:Intelligent completion audits'
+        'gate:Quality gate enforcement'
     )
     observe_cmds=(
         'vitals:Pipeline vitals — real-time scoring'
@@ -89,6 +163,7 @@ _shipwright() {
         'release-manager:Autonomous release pipeline'
         'changelog:Automated release notes'
         'deploy:Deployments — deployment history'
+        'build:Build release tarballs'
     )
     intel_cmds=(
         'predict:Predictive risk assessment'
@@ -100,6 +175,9 @@ _shipwright() {
         'start:Start a new pipeline run'
         'resume:Resume from last stage'
         'status:Show pipeline progress dashboard'
+        'abort:Cancel the running pipeline'
+        'list:Browse pipeline templates'
+        'show:Show pipeline template details'
         'test:Run pipeline test suite'
     )
     daemon_cmds=(
@@ -107,23 +185,36 @@ _shipwright() {
         'stop:Graceful shutdown'
         'status:Show active pipelines and queue'
         'metrics:DORA/DX metrics dashboard'
+        'triage:Show issue triage scores'
+        'patrol:Run proactive codebase patrol'
         'test:Run daemon test suite'
+        'logs:View daemon logs'
+        'init:Initialize daemon config'
     )
     fleet_cmds=(
         'start:Start daemons for all repos'
         'stop:Stop all daemons'
         'status:Show fleet-wide status'
         'metrics:Cross-repo DORA metrics'
+        'discover:Auto-discover repos in GitHub org'
         'test:Run fleet test suite'
     )
     memory_cmds=(
         'show:Show learned patterns for this repo'
         'search:Search across all memories'
+        'forget:Remove a memory entry'
+        'export:Export memories to file'
+        'import:Import memories from file'
         'stats:Memory usage and coverage'
+        'test:Run memory test suite'
     )
     cost_cmds=(
         'show:Show cost summary'
         'budget:Manage daily budget'
+        'record:Record token usage'
+        'calculate:Calculate cost estimate'
+        'check-budget:Check budget before starting'
+        'remaining-budget:Check remaining daily budget'
     )
     templates_cmds=(
         'list:Browse team templates'
@@ -215,6 +306,62 @@ _shipwright() {
         'cleanup:Cleanup merged branches'
         'feedback:Get PR feedback'
     )
+    db_cmds=(
+        'init:Initialize database'
+        'health:Check database health'
+        'migrate:Run migrations'
+        'stats:Show database statistics'
+        'query:Run a query'
+        'export:Export data'
+    )
+    ci_cmds=(
+        'generate:Generate CI workflows'
+        'status:Show CI status'
+        'test:Run CI test suite'
+    )
+    auth_cmds=(
+        'login:Authenticate with GitHub'
+        'logout:Revoke authentication'
+        'status:Show auth status'
+        'test:Run auth test suite'
+    )
+    autonomous_cmds=(
+        'start:Start autonomous loop'
+        'status:Show autonomous status'
+        'test:Run autonomous test suite'
+    )
+    version_cmds=(
+        'show:Show current version'
+        'bump:Bump version everywhere'
+        'check:Verify version consistency'
+    )
+    jira_cmds=(
+        'sync:Sync Jira issues'
+        'status:Show Jira sync status'
+        'test:Run Jira test suite'
+    )
+    linear_cmds=(
+        'sync:Sync Linear issues'
+        'status:Show Linear sync status'
+        'test:Run Linear test suite'
+    )
+    eventbus_cmds=(
+        'emit:Emit an event'
+        'listen:Listen for events'
+        'status:Show bus status'
+        'test:Run eventbus test suite'
+    )
+    evidence_cmds=(
+        'capture:Capture evidence artifacts'
+        'verify:Verify evidence freshness'
+        'pre-pr:Run pre-PR evidence checks'
+    )
+    webhook_cmds=(
+        'start:Start webhook receiver'
+        'stop:Stop webhook receiver'
+        'status:Show webhook status'
+        'test:Run webhook test suite'
+    )
 
     _arguments -C \
         '1:command:->command' \
@@ -226,52 +373,24 @@ _shipwright() {
             ;;
         args)
             case "${words[1]}" in
-                agent)
-                    _describe -t agent-cmds 'agent command' agent_cmds
-                    ;;
-                quality)
-                    _describe -t quality-cmds 'quality command' quality_cmds
-                    ;;
-                observe)
-                    _describe -t observe-cmds 'observe command' observe_cmds
-                    ;;
-                release)
-                    _describe -t release-cmds 'release command' release_cmds
-                    ;;
-                intel)
-                    _describe -t intel-cmds 'intel command' intel_cmds
-                    ;;
+                agent)      _describe -t agent-cmds 'agent command' agent_cmds ;;
+                quality)    _describe -t quality-cmds 'quality command' quality_cmds ;;
+                observe)    _describe -t observe-cmds 'observe command' observe_cmds ;;
+                release)    _describe -t release-cmds 'release command' release_cmds ;;
+                intel)      _describe -t intel-cmds 'intel command' intel_cmds ;;
                 pipeline)
                     _describe -t pipeline-cmds 'pipeline command' pipeline_cmds
                     _arguments '*:options:_pipeline_options'
                     ;;
-                daemon)
-                    _describe -t daemon-cmds 'daemon command' daemon_cmds
-                    ;;
-                fleet)
-                    _describe -t fleet-cmds 'fleet command' fleet_cmds
-                    ;;
-                memory)
-                    _describe -t memory-cmds 'memory command' memory_cmds
-                    ;;
-                cost)
-                    _describe -t cost-cmds 'cost command' cost_cmds
-                    ;;
-                templates)
-                    _describe -t templates-cmds 'templates command' templates_cmds
-                    ;;
-                worktree)
-                    _describe -t worktree-cmds 'worktree command' worktree_cmds
-                    ;;
-                tracker)
-                    _describe -t tracker-cmds 'tracker command' tracker_cmds
-                    ;;
-                heartbeat)
-                    _describe -t heartbeat-cmds 'heartbeat command' heartbeat_cmds
-                    ;;
-                checkpoint)
-                    _describe -t checkpoint-cmds 'checkpoint command' checkpoint_cmds
-                    ;;
+                daemon)     _describe -t daemon-cmds 'daemon command' daemon_cmds ;;
+                fleet)      _describe -t fleet-cmds 'fleet command' fleet_cmds ;;
+                memory)     _describe -t memory-cmds 'memory command' memory_cmds ;;
+                cost)       _describe -t cost-cmds 'cost command' cost_cmds ;;
+                templates)  _describe -t templates-cmds 'templates command' templates_cmds ;;
+                worktree)   _describe -t worktree-cmds 'worktree command' worktree_cmds ;;
+                tracker)    _describe -t tracker-cmds 'tracker command' tracker_cmds ;;
+                heartbeat)  _describe -t heartbeat-cmds 'heartbeat command' heartbeat_cmds ;;
+                checkpoint) _describe -t checkpoint-cmds 'checkpoint command' checkpoint_cmds ;;
                 connect)
                     _describe -t connect-cmds 'connect command' connect_cmds
                     _arguments '--token[Invite token]:token'
@@ -280,33 +399,25 @@ _shipwright() {
                     _describe -t remote-cmds 'remote command' remote_cmds
                     _arguments '--host[Hostname]:host' '--port[SSH port]:port' '--key[SSH key]:file' '--user[SSH user]:user'
                     ;;
-                launchd)
-                    _describe -t launchd-cmds 'launchd command' launchd_cmds
-                    ;;
-                dashboard)
-                    _describe -t dashboard-cmds 'dashboard command' dashboard_cmds
-                    ;;
-                github)
-                    _describe -t github-cmds 'github command' github_cmds
-                    ;;
-                checks)
-                    _describe -t checks-cmds 'checks command' checks_cmds
-                    ;;
-                deploys)
-                    _describe -t deploys-cmds 'deploys command' deploys_cmds
-                    ;;
-                docs)
-                    _describe -t docs-cmds 'docs command' docs_cmds
-                    ;;
-                tmux)
-                    _describe -t tmux-cmds 'tmux command' tmux_cmds
-                    ;;
-                decompose)
-                    _describe -t decompose-cmds 'decompose command' decompose_cmds
-                    ;;
-                pr)
-                    _describe -t pr-cmds 'pr command' pr_cmds
-                    ;;
+                launchd)    _describe -t launchd-cmds 'launchd command' launchd_cmds ;;
+                dashboard)  _describe -t dashboard-cmds 'dashboard command' dashboard_cmds ;;
+                github)     _describe -t github-cmds 'github command' github_cmds ;;
+                checks)     _describe -t checks-cmds 'checks command' checks_cmds ;;
+                deploys)    _describe -t deploys-cmds 'deploys command' deploys_cmds ;;
+                docs)       _describe -t docs-cmds 'docs command' docs_cmds ;;
+                tmux)       _describe -t tmux-cmds 'tmux command' tmux_cmds ;;
+                decompose)  _describe -t decompose-cmds 'decompose command' decompose_cmds ;;
+                pr)         _describe -t pr-cmds 'pr command' pr_cmds ;;
+                db)         _describe -t db-cmds 'db command' db_cmds ;;
+                ci)         _describe -t ci-cmds 'ci command' ci_cmds ;;
+                auth)       _describe -t auth-cmds 'auth command' auth_cmds ;;
+                autonomous) _describe -t autonomous-cmds 'autonomous command' autonomous_cmds ;;
+                version)    _describe -t version-cmds 'version command' version_cmds ;;
+                jira)       _describe -t jira-cmds 'jira command' jira_cmds ;;
+                linear)     _describe -t linear-cmds 'linear command' linear_cmds ;;
+                eventbus)   _describe -t eventbus-cmds 'eventbus command' eventbus_cmds ;;
+                evidence)   _describe -t evidence-cmds 'evidence command' evidence_cmds ;;
+                webhook)    _describe -t webhook-cmds 'webhook command' webhook_cmds ;;
                 prep)
                     _arguments \
                         '--check[Audit existing prep quality]' \
@@ -319,20 +430,32 @@ _shipwright() {
                         '--repo[Directory path]:directory:_directories' \
                         '--local[Local-only mode (no GitHub)]' \
                         '--test-cmd[Test command]:command:' \
+                        '--fast-test-cmd[Fast subset test]:command:' \
+                        '--fast-test-interval[Full test every N iterations]:count:' \
                         '--max-iterations[Max iterations]:count:' \
                         '--model[Model to use]:model:(opus sonnet haiku)' \
                         '--agents[Number of agents]:count:' \
+                        '--roles[Role per agent]:roles:' \
+                        '--worktree[Use git worktrees for isolation]' \
                         '--audit[Self-reflection each iteration]' \
                         '--audit-agent[Separate auditor]' \
                         '--quality-gates[Quality checks]' \
                         '--definition-of-done[Checklist]:file:_files' \
                         '--resume[Resume interrupted loop]' \
-                        '--skip-permissions[Skip prompts]'
+                        '--max-restarts[Max session restarts]:count:' \
+                        '--max-turns[Max API turns per session]:count:' \
+                        '--skip-permissions[Skip prompts]' \
+                        '--verbose[Show full Claude output]' \
+                        '--no-auto-extend[Disable auto-extension]' \
+                        '--extension-size[Additional iterations per extension]:count:' \
+                        '--max-extensions[Max auto-extensions]:count:'
                     ;;
                 fix)
                     _arguments \
                         '1:goal:' \
-                        '--repos[Repository paths]:repos:'
+                        '--repos[Repository paths]:repos:' \
+                        '--worktree[Use git worktrees]' \
+                        '--test-cmd[Test command]:command:'
                     ;;
                 logs)
                     _arguments \
@@ -342,16 +465,30 @@ _shipwright() {
                         '--grep[Search pattern]:pattern:'
                     ;;
                 cleanup)
-                    _arguments \
-                        '--force[Kill orphaned sessions]'
+                    _arguments '--force[Kill orphaned sessions]'
                     ;;
                 upgrade)
-                    _arguments \
-                        '--apply[Apply updates]'
+                    _arguments '--apply[Apply updates]'
                     ;;
                 reaper)
+                    _arguments '--watch[Continuous watch mode]'
+                    ;;
+                status)
+                    _arguments '--json[JSON output]'
+                    ;;
+                doctor)
+                    _arguments '--json[JSON output]'
+                    ;;
+                session)
                     _arguments \
-                        '--watch[Continuous watch mode]'
+                        '1:team name:' \
+                        '--template[Team template]:template:' \
+                        '-t[Team template]:template:' \
+                        '--agents[Number of agents]:count:' \
+                        '--roles[Agent roles]:roles:'
+                    ;;
+                help)
+                    _arguments '--all[Show all commands]' '-a[Show all commands]'
                     ;;
             esac
             ;;
@@ -365,8 +502,25 @@ _pipeline_options() {
         '--repo[Directory path]:directory:_directories' \
         '--local[Local-only mode (no GitHub)]' \
         '--worktree[Use isolated worktree]' \
-        '--template[Pipeline template]:file:_files' \
-        '--skip-gates[Auto-proceed all gates]'
+        '--template[Pipeline template]:template:(fast standard full hotfix autonomous enterprise cost-aware deployed)' \
+        '--skip-gates[Auto-proceed all gates]' \
+        '--test-cmd[Test command]:command:' \
+        '--fast-test-cmd[Fast test command]:command:' \
+        '--model[Model to use]:model:(opus sonnet haiku)' \
+        '--agents[Number of agents]:count:' \
+        '--base[Base branch for PR]:branch:' \
+        '--reviewers[PR reviewers]:reviewers:' \
+        '--labels[PR labels]:labels:' \
+        '--no-github[Disable GitHub integration]' \
+        '--no-github-label[Do not modify issue labels]' \
+        '--ci[CI mode (non-interactive)]' \
+        '--ignore-budget[Skip budget enforcement]' \
+        '--dry-run[Show what would happen]' \
+        '--slack-webhook[Slack webhook URL]:url:' \
+        '--self-heal[Build retry cycles]:count:' \
+        '--max-iterations[Max build loop iterations]:count:' \
+        '--max-restarts[Max session restarts]:count:' \
+        '--completed-stages[Skip these stages]:stages:'
 }
 
 _shipwright "$@"