@zachjxyz/moxie 0.6.0 → 0.6.2

package/bin/moxie

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # moxie — spec-driven multi-agent development with quorum convergence
 #
-# Pipeline: rfc → audit → fix → plan → build
+# Pipeline: 01-rfc → 02-audit → 03-fix → 04-plan → 05-build
 # Each phase requires UNANIMOUS quorum from all agents.
 #
 # Usage:
@@ -17,7 +17,7 @@
 
 set -euo pipefail
 
-MOXIE_VERSION="0.6.0"
+MOXIE_VERSION="0.6.2"
 # Resolve symlinks (npm installs bin as a symlink)
 _self="$0"
 while [ -L "$_self" ]; do
@@ -50,6 +50,7 @@ case "$COMMAND" in
     cost)       cmd_cost "$@" ;;
     logs)       cmd_logs "$@" ;;
     models)     cmd_models "$@" ;;
+    key)        cmd_key "$@" ;;
     agents)     cmd_agents "$@" ;;
     doctor)     cmd_doctor "$@" ;;
     version)    echo "moxie $MOXIE_VERSION" ;;
@@ -66,6 +67,7 @@ Commands:
   cost     Token usage breakdown by phase and agent
   logs     Tail or view logs for a phase
   models   List available AI Gateway models
+  key      Manage AI Gateway API key (set, status, remove)
   agents   List configured agents (agents swap to change models)
   doctor   Check agent CLIs, auth, and project health
   version  Print version
@@ -86,9 +88,11 @@ Usage:
   moxie models                       List all AI Gateway models
   moxie models -f anthropic          Filter models by provider/name
   moxie agents swap                  Add/remove/swap gateway models
+  moxie key set                      Set or update AI Gateway API key
+  moxie key                          Check key status
   moxie doctor                       Check agents and dependencies
 
-Pipeline: rfc → audit → fix → plan → build
+Pipeline: 01-rfc → 02-audit → 03-fix → 04-plan → 05-build
 Each phase uses randomized agent rotation with UNANIMOUS quorum.
 The pipeline is durable — it resumes from where it left off.
 EOF

package/lib/agents.sh

@@ -636,6 +636,76 @@ os.rename(tmp_path, config_path)
     "$(IFS='|'; echo "${new_gw_models[*]}")"
 }
 
+# ---- Manage AI Gateway API key ----
+
+cmd_key() {
+    local subcmd="${1:-status}"
+    shift 2>/dev/null || true
+
+    case "$subcmd" in
+        set|update|add)
+            gateway_store_key "vercel-ai-gateway"
+            ;;
+        status|check)
+            if gateway_has_key "vercel-ai-gateway"; then
+                echo "AI Gateway key: configured"
+                if [ "$MOXIE_PLATFORM" = "darwin" ]; then
+                    echo "  Storage: macOS Keychain"
+                elif _is_wsl; then
+                    echo "  Storage: Windows User environment"
+                else
+                    echo "  Storage: ~/.moxie/vercel-ai-gateway.key.enc"
+                fi
+            else
+                echo "AI Gateway key: not configured"
+                echo ""
+                echo "Set one with: moxie key set"
+            fi
+            ;;
+        remove|delete)
+            if [ "$MOXIE_PLATFORM" = "darwin" ]; then
+                security delete-generic-password -a moxie -s "vercel-ai-gateway" 2>/dev/null && \
+                    echo "Key removed from macOS Keychain." || \
+                    echo "No key found to remove."
+            elif _is_wsl; then
+                powershell.exe -Command "[System.Environment]::SetEnvironmentVariable('MOXIE_GATEWAY_KEY_vercel-ai-gateway', \$null, 'User')" 2>/dev/null && \
+                    echo "Key removed from Windows environment." || \
+                    echo "No key found to remove."
+            elif [ "$MOXIE_PLATFORM" = "linux" ]; then
+                local enc_file="$HOME/.moxie/vercel-ai-gateway.key.enc"
+                if [ -f "$enc_file" ]; then
+                    rm -f "$enc_file"
+                    echo "Key removed: $enc_file"
+                else
+                    echo "No key found to remove."
+                fi
+            fi
+            ;;
+        help|--help|-h)
+            cat <<'EOF'
+Usage: moxie key [subcommand]
+
+Manage your Vercel AI Gateway API key.
+
+Subcommands:
+  set      Set or update the API key
+  status   Check if a key is configured (default)
+  remove   Delete the stored key
+
+Examples:
+  moxie key set        Enter a new API key
+  moxie key            Check current key status
+  moxie key remove     Delete stored key
+EOF
+            ;;
+        *)
+            echo "Unknown subcommand: $subcmd" >&2
+            echo "Run 'moxie key help' for usage." >&2
+            return 1
+            ;;
+    esac
+}
+
 # ---- List agents ----
 
 cmd_agents() {

package/lib/core.sh

@@ -4,7 +4,7 @@
 # ---- Constants ----
 MOXIE_DIR=".moxie"
 MOXIE_CONFIG="$MOXIE_DIR/config.toml"
-PHASES=(rfc audit fix plan build)
+PHASES=(01-rfc 02-audit 03-fix 04-plan 05-build)
 
 # ---- macOS timeout compatibility ----
 if ! command -v timeout &>/dev/null; then
@@ -101,11 +101,29 @@ banner() {
 
 phase_label() {
     case "$1" in
-        rfc)   echo "RFC" ;;
-        audit) echo "Audit" ;;
-        fix)   echo "Fix" ;;
-        plan)  echo "Plan" ;;
-        build) echo "Build" ;;
-        *)     echo "$1" ;;
+        01-rfc)   echo "RFC" ;;
+        02-audit) echo "Audit" ;;
+        03-fix)   echo "Fix" ;;
+        04-plan)  echo "Plan" ;;
+        05-build) echo "Build" ;;
+        *)        echo "$1" ;;
     esac
 }
+
+# Resolve a short phase name (rfc) or full name (01-rfc) to the canonical form.
+resolve_phase() {
+    case "$1" in
+        rfc|01-rfc)     echo "01-rfc" ;;
+        audit|02-audit) echo "02-audit" ;;
+        fix|03-fix)     echo "03-fix" ;;
+        plan|04-plan)   echo "04-plan" ;;
+        build|05-build) echo "05-build" ;;
+        *) echo "$1" ;;
+    esac
+}
+
+# Extract the short name from a phase (01-rfc → RFC, 05-build → BUILD)
+phase_prefix() {
+    local short="${1#*-}"
+    echo "$short" | tr '[:lower:]' '[:upper:]'
+}

package/lib/phases.sh

@@ -551,7 +551,7 @@ cmd_init() {
 This spec will be generated by the RFC phase. The agents will analyze the codebase
 and produce a comprehensive RFC document that becomes the canonical specification.
 
-See `.moxie/phases/rfc/RFC-FINAL-*.md` once the RFC phase completes.
+See `.moxie/phases/01-rfc/RFC-FINAL-*.md` once the RFC phase completes.
 SEED
     else
         cp "$spec_path" "$MOXIE_DIR/spec.md"
@@ -590,9 +590,9 @@ SEED
     echo ""
     echo "Initialized .moxie/ with 5 phases:"
     if [ "$generate_rfc" = "1" ]; then
-        echo "  rfc (generate) -> audit -> fix -> plan -> build"
+        echo "  01-rfc (generate) -> 02-audit -> 03-fix -> 04-plan -> 05-build"
     else
-        echo "  rfc (review) -> audit -> fix -> plan -> build"
+        echo "  01-rfc (review) -> 02-audit -> 03-fix -> 04-plan -> 05-build"
     fi
 
     if [ -d "$MOXIE_DIR/context" ] && [ "$(ls -A "$MOXIE_DIR/context" 2>/dev/null)" ]; then
@@ -615,7 +615,7 @@ _init_ledger() {
     local ledger="$MOXIE_DIR/phases/$phase/ledger.json"
 
     case "$phase" in
-        rfc)
+        01-rfc)
             cat > "$ledger" <<'JSON'
 {
   "status": "pending",
@@ -624,7 +624,7 @@ _init_ledger() {
 }
 JSON
             ;;
-        audit)
+        02-audit)
             cat > "$ledger" <<'JSON'
 {
   "status": "pending",
@@ -633,7 +633,7 @@ JSON
 }
 JSON
             ;;
-        fix)
+        03-fix)
             cat > "$ledger" <<'JSON'
 {
   "status": "pending",
@@ -642,7 +642,7 @@ JSON
 }
 JSON
             ;;
-        plan)
+        04-plan)
             cat > "$ledger" <<'JSON'
 {
   "status": "pending",
@@ -652,7 +652,7 @@ JSON
 }
 JSON
             ;;
-        build)
+        05-build)
             cat > "$ledger" <<'JSON'
 {
   "status": "pending",
@@ -728,7 +728,7 @@ sys.exit(0)
 _phase_is_complete() {
     local phase="$1"
     local phase_dir="$MOXIE_DIR/phases/$phase"
-    local final_prefix="$(echo "$phase" | tr '[:lower:]' '[:upper:]')-FINAL"
+    local final_prefix="$(phase_prefix "$phase")-FINAL"
     ls "$phase_dir"/${final_prefix}-*.md &>/dev/null
 }
 
@@ -764,7 +764,7 @@ cmd_run() {
 
     while [[ $# -gt 0 ]]; do
         case "$1" in
-            --phase) target_phase="$2"; shift 2 ;;
+            --phase) target_phase=$(resolve_phase "$2"); shift 2 ;;
             --dry-run) dry_run=1; shift ;;
             *) echo "Unknown option: $1" >&2; exit 1 ;;
         esac
@@ -830,7 +830,7 @@ cmd_start() {
     local target_phase=""
     while [[ $# -gt 0 ]]; do
         case "$1" in
-            --phase) target_phase="$2"; shift 2 ;;
+            --phase) target_phase=$(resolve_phase "$2"); shift 2 ;;
             *) echo "Unknown option: $1" >&2; exit 1 ;;
         esac
     done
@@ -983,7 +983,7 @@ _run_pipeline() {
 
         # Resume: skip completed phases
         if _phase_is_complete "$phase"; then
-            local final_prefix="$(echo "$phase" | tr '[:lower:]' '[:upper:]')-FINAL"
+            local final_prefix="$(phase_prefix "$phase")-FINAL"
             local final
             final=$(ls -1 "$MOXIE_DIR/phases/$phase"/${final_prefix}-*.md 2>/dev/null | tail -1)
             echo ""
@@ -1152,10 +1152,10 @@ _run_phase() {
     local prompt_template="$phase_dir/prompt.txt"
     local log_dir="$phase_dir/logs"
     local csv="$phase_dir/token-usage.csv"
-    local final_prefix="$(echo "$phase" | tr '[:lower:]' '[:upper:]')-FINAL"
+    local final_prefix="$(phase_prefix "$phase")-FINAL"
 
     local max_rounds=$(toml_get "$MOXIE_CONFIG" "settings.max_rounds" "15")
-    if [ "$phase" = "build" ]; then
+    if [ "$phase" = "05-build" ]; then
         max_rounds=$(toml_get "$MOXIE_CONFIG" "settings.max_rounds_build" "50")
     fi
     local turn_timeout=$(toml_get "$MOXIE_CONFIG" "settings.turn_timeout" "900")
@@ -1483,7 +1483,7 @@ print('1' if d.get('$name', False) else '0')
     for phase in "${PHASES[@]}"; do
         local phase_dir="$MOXIE_DIR/phases/$phase"
         local ledger="$phase_dir/ledger.json"
-        local final_prefix="$(echo "$phase" | tr '[:lower:]' '[:upper:]')-FINAL"
+        local final_prefix="$(phase_prefix "$phase")-FINAL"
 
         printf "  %-8s" "$(phase_label "$phase"):"
 
@@ -1528,7 +1528,8 @@ else:
 cmd_logs() {
     require_moxie_project
 
-    local phase="${1:-}"
+    local phase=""
+    [ -n "${1:-}" ] && phase=$(resolve_phase "$1")
 
     if [ -z "$phase" ]; then
         # Show latest log across all phases

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zachjxyz/moxie",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "description": "Run multiple AI coding agents through spec-driven phases with quorum convergence. Supports CLI agents (Claude, Codex, Qwen, Aider, Goose, Amp, Cline, Roo) and Vercel AI Gateway models.",
   "bin": {
     "moxie": "bin/moxie"

package/templates/{rfc → 01-rfc}/prompt.txt

@@ -2,7 +2,7 @@ You are participating in a multi-agent RFC generation loop for a software projec
 
 YOUR AGENT NAME: {{AGENT_NAME}}
 PROJECT DIRECTORY: {{PROJECT_DIR}}
-LEDGER: .moxie/phases/rfc/ledger.json
+LEDGER: .moxie/phases/01-rfc/ledger.json
 CONTEXT DOCS: .moxie/context/ (if present)
 
 ## Context
@@ -15,8 +15,8 @@ can use it as the authoritative source of truth for what the project should do.
 
 ### Step 1: Read context
 
-Read the ledger at `.moxie/phases/rfc/ledger.json` to check current state.
-If a draft RFC exists (check for `.moxie/phases/rfc/{agent}-*.md` files), read the latest one.
+Read the ledger at `.moxie/phases/01-rfc/ledger.json` to check current state.
+If a draft RFC exists (check for `.moxie/phases/01-rfc/{agent}-*.md` files), read the latest one.
 If `.moxie/spec.md` exists, read it as the seed document to expand upon.
 If `.moxie/context/` exists and contains files, read ALL files in it. These are supplementary
 context documents (roadmaps, existing specs, PRDs, design docs) provided by the user. Use them
@@ -62,11 +62,11 @@ For each section, mark:
 
 ### Step 4: Write your output
 
-Save to: `.moxie/phases/rfc/{{AGENT_NAME}}-{MMDDyy-HHmmss}.md`
+Save to: `.moxie/phases/01-rfc/{{AGENT_NAME}}-{MMDDyy-HHmmss}.md`
 
 ### Step 5: Update the ledger
 
-Update `.moxie/phases/rfc/ledger.json`:
+Update `.moxie/phases/01-rfc/ledger.json`:
 - Add your agent to the `agents` map with `output_file` pointing to your file
 - If you are the FIRST agent (no prior drafts): set `reached: false` (others must review)
 - If you reviewed the draft and found ZERO inaccuracies/incompletes:
@@ -76,7 +76,7 @@ Update `.moxie/phases/rfc/ledger.json`:
 ### Step 6: Quorum check
 
 If ALL agents (every agent in the config) show `reached: true`:
-- Write `.moxie/phases/rfc/RFC-FINAL-{MMDDyy-HHmmss}.md` with the complete RFC
+- Write `.moxie/phases/01-rfc/RFC-FINAL-{MMDDyy-HHmmss}.md` with the complete RFC
 - Copy the final RFC to `.moxie/spec.md` (this becomes the canonical spec for all later phases)
 - Set ledger `status` to `"rfc_final"`
 

package/templates/{audit → 02-audit}/prompt.txt

@@ -2,7 +2,7 @@ You are participating in a multi-agent audit loop for a software project.
 
 YOUR AGENT NAME: {{AGENT_NAME}}
 SPEC: .moxie/spec.md
-LEDGER: .moxie/phases/audit/ledger.json
+LEDGER: .moxie/phases/02-audit/ledger.json
 CONTEXT DOCS: .moxie/context/ (if present)
 
 ## Context
@@ -50,7 +50,7 @@ You MUST read the actual source code to verify — do not just trust the other a
 
 ### Step 4: Write your audit
 
-Save to: `.moxie/phases/audit/{{AGENT_NAME}}-{MMDDyy-HHmmss}.md`
+Save to: `.moxie/phases/02-audit/{{AGENT_NAME}}-{MMDDyy-HHmmss}.md`
 
 Include:
 - Your complete findings list
@@ -59,7 +59,7 @@ Include:
 
 ### Step 5: Update the ledger
 
-Update `.moxie/phases/audit/ledger.json`:
+Update `.moxie/phases/02-audit/ledger.json`:
 - Add/update your agent in the `agents` map with `output_file` pointing to your file
 - If you confirmed ALL findings from ALL prior agents with ZERO new findings and ZERO corrections:
   set your entry to `reached: true`
@@ -69,7 +69,7 @@ Update `.moxie/phases/audit/ledger.json`:
 
 Check if ALL agents (every agent in the project config) show `reached: true`.
 Only when EVERY agent has independently verified and agreed:
-- Write `.moxie/phases/audit/AUDIT-FINAL-{MMDDyy-HHmmss}.md` with:
+- Write `.moxie/phases/02-audit/AUDIT-FINAL-{MMDDyy-HHmmss}.md` with:
   - The canonical, consolidated list of findings
   - Severity counts
   - "Audit phase complete — unanimous quorum reached — ready for fix phase"

package/templates/{fix → 03-fix}/prompt.txt

@@ -1,8 +1,8 @@
 You are participating in a multi-agent fix loop for a software project.
 
 YOUR AGENT NAME: {{AGENT_NAME}}
-LEDGER: .moxie/phases/fix/ledger.json
-AUDIT RESULTS: .moxie/phases/audit/AUDIT-FINAL-*.md (find the latest)
+LEDGER: .moxie/phases/03-fix/ledger.json
+AUDIT RESULTS: .moxie/phases/02-audit/AUDIT-FINAL-*.md (find the latest)
 
 ## Context
 
@@ -17,7 +17,7 @@ every fix. Do NOT rubber-stamp or skip verification — thoroughness is the goal
 
 ### Step 1: Read the audit findings and ledger
 
-Read `.moxie/phases/fix/ledger.json`. Read the AUDIT-FINAL document.
+Read `.moxie/phases/03-fix/ledger.json`. Read the AUDIT-FINAL document.
 Check each issue's status:
 1. First verify fixes by other agents (`status: "fixed"` where you're not `fixed_by`)
 2. Then fix the next `status: "unfixed"` issue (highest severity first)
@@ -46,7 +46,7 @@ If ANY issue is not fully verified, keep `reached: false`.
 ### Step 5: Quorum check
 
 ALL agents `reached: true` + ALL issues `status: "verified"` →
-Write `.moxie/phases/fix/FIX-FINAL-{MMDDyy-HHmmss}.md` with:
+Write `.moxie/phases/03-fix/FIX-FINAL-{MMDDyy-HHmmss}.md` with:
 - Summary of all fixes applied
 - Test results
 - "Fix phase complete — unanimous quorum reached — ready for plan phase"

package/templates/{plan → 04-plan}/prompt.txt

@@ -2,8 +2,8 @@ You are participating in a multi-agent implementation planning loop for a softwa
 
 YOUR AGENT NAME: {{AGENT_NAME}}
 SPEC: .moxie/spec.md
-LEDGER: .moxie/phases/plan/ledger.json
-FIX RESULTS: .moxie/phases/fix/FIX-FINAL-*.md (find the latest)
+LEDGER: .moxie/phases/04-plan/ledger.json
+FIX RESULTS: .moxie/phases/03-fix/FIX-FINAL-*.md (find the latest)
 CONTEXT DOCS: .moxie/context/ (if present)
 
 ## Context
@@ -42,7 +42,7 @@ For each section, mark:
 
 ### Step 3: Write your review
 
-Save to: `.moxie/phases/plan/{{AGENT_NAME}}-{MMDDyy-HHmmss}.md`
+Save to: `.moxie/phases/04-plan/{{AGENT_NAME}}-{MMDDyy-HHmmss}.md`
 
 ### Step 4: Update the ledger
 
@@ -52,7 +52,7 @@ Save to: `.moxie/phases/plan/{{AGENT_NAME}}-{MMDDyy-HHmmss}.md`
 ### Step 5: Quorum check
 
 ALL agents `reached: true` →
-Write `.moxie/phases/plan/PLAN-FINAL-{MMDDyy-HHmmss}.md` with the complete,
+Write `.moxie/phases/04-plan/PLAN-FINAL-{MMDDyy-HHmmss}.md` with the complete,
 self-contained implementation plan. This is the canonical build spec.
 
 Do NOT write the FINAL file unless ALL agents show `reached: true` in the ledger.

package/templates/{build → 05-build}/prompt.txt

@@ -1,8 +1,8 @@
 You are participating in a multi-agent build loop for a software project.
 
 YOUR AGENT NAME: {{AGENT_NAME}}
-LEDGER: .moxie/phases/build/ledger.json
-BUILD SPEC: .moxie/phases/plan/PLAN-FINAL-*.md (find the latest)
+LEDGER: .moxie/phases/05-build/ledger.json
+BUILD SPEC: .moxie/phases/04-plan/PLAN-FINAL-*.md (find the latest)
 
 ## Context
 
@@ -56,7 +56,7 @@ set `status: "complete"`, advance `current_phase` to the next one.
 When ALL build phases are `"complete"`:
 - Set your agent entry to `reached: true`
 - If ALL agents show `reached: true`:
-  Write `.moxie/phases/build/BUILD-FINAL-{MMDDyy-HHmmss}.md` with:
+  Write `.moxie/phases/05-build/BUILD-FINAL-{MMDDyy-HHmmss}.md` with:
   - Summary of all phases built
   - Files created/modified
   - Test results