@zachjxyz/moxie 0.4.4 → 0.4.6

package/bin/moxie

@@ -12,11 +12,12 @@
 #   moxie status
 #   moxie cost
 #   moxie logs [phase]
+#   moxie models [--filter <search>]
 #   moxie agents
 
 set -euo pipefail
 
-MOXIE_VERSION="0.4.4"
+MOXIE_VERSION="0.4.6"
 # Resolve symlinks (npm installs bin as a symlink)
 _self="$0"
 while [ -L "$_self" ]; do
@@ -48,6 +49,7 @@ case "$COMMAND" in
     status)     cmd_status "$@" ;;
     cost)       cmd_cost "$@" ;;
     logs)       cmd_logs "$@" ;;
+    models)     cmd_models "$@" ;;
     agents)     cmd_agents "$@" ;;
     doctor)     cmd_doctor "$@" ;;
     version)    echo "moxie $MOXIE_VERSION" ;;
@@ -63,6 +65,7 @@ Commands:
   status   Show phase progress, quorum state, and running status
   cost     Token usage breakdown by phase and agent
   logs     Tail or view logs for a phase
+  models   List available AI Gateway models
   agents   List configured agents
   doctor   Check agent CLIs, auth, and project health
   version  Print version
@@ -80,6 +83,8 @@ Usage:
   moxie run --dry-run                Trace without spawning agents
   moxie status                       Show progress and quorum
   moxie cost                         Show token usage summary
+  moxie models                       List all AI Gateway models
+  moxie models -f anthropic          Filter models by provider/name
   moxie doctor                       Check agents and dependencies
 
 Pipeline: rfc → audit → fix → plan → build

package/lib/agents.sh

@@ -554,6 +554,109 @@ cmd_agents() {
     done
 }
 
+# ---- List available gateway models ----
+
+cmd_models() {
+    local filter=""
+    while [ $# -gt 0 ]; do
+        case "$1" in
+            --filter|-f) filter="$2"; shift 2 ;;
+            --help|-h)
+                cat <<'EOF'
+Usage: moxie models [--filter <search>]
+
+List models available through your Vercel AI Gateway.
+Requires a stored gateway API key (run 'moxie init' to set one up).
+
+Options:
+  --filter, -f <search>   Filter models by provider or name (e.g. "anthropic", "gpt")
+
+Examples:
+  moxie models                  List all available models
+  moxie models -f anthropic     Show only Anthropic models
+  moxie models -f gemini        Search for Gemini models
+EOF
+                return 0
+                ;;
+            *) filter="$1"; shift ;;
+        esac
+    done
+
+    if ! command -v node &>/dev/null; then
+        echo "ERROR: node not found on PATH. Required for gateway API calls." >&2
+        return 1
+    fi
+
+    if ! gateway_has_key "vercel-ai-gateway"; then
+        echo "ERROR: No AI Gateway API key configured." >&2
+        echo "Run 'moxie init' to set one up, or store a key with:" >&2
+        echo "  moxie doctor  (will prompt for key setup)" >&2
+        return 1
+    fi
+
+    local api_key
+    api_key=$(gateway_get_key "vercel-ai-gateway") || {
+        echo "ERROR: Failed to retrieve gateway API key." >&2
+        return 1
+    }
+
+    local endpoint="https://ai-gateway.vercel.sh"
+    if [ -f "${MOXIE_CONFIG:-}" ]; then
+        local cfg_endpoint
+        cfg_endpoint=$(toml_get "$MOXIE_CONFIG" "gateway.endpoint" "") || true
+        [ -n "$cfg_endpoint" ] && endpoint="$cfg_endpoint"
+    fi
+
+    local json
+    json=$(GATEWAY_API_KEY="$api_key" node "$MOXIE_LIB/gateway-models.mjs" "$endpoint" "$filter" 2>&1) || {
+        echo "ERROR: Failed to fetch models from gateway." >&2
+        echo "$json" >&2
+        return 1
+    }
+
+    # Parse JSON with python3 for pretty display
+    python3 -c "
+import json, sys
+
+data = json.loads(sys.stdin.read())
+models = data.get('models', [])
+
+if not models:
+    print('No models found.' + (' Try a different filter.' if '$filter' else ''))
+    sys.exit(0)
+
+# Group by provider
+providers = {}
+for m in models:
+    p = m['provider']
+    providers.setdefault(p, []).append(m)
+
+# Hardcoded models for marking
+hardcoded = set('''$(printf '%s\n' "${KNOWN_GATEWAY_MODELS[@]}")'''.strip().split('\n'))
+
+total = len(models)
+filter_note = ' matching \"$filter\"' if '$filter' else ''
+print(f'Available gateway models ({total}{filter_note}):')
+print()
+
+for provider in sorted(providers.keys()):
+    pmodels = providers[provider]
+    print(f'  \033[1m{provider}\033[0m ({len(pmodels)} models)')
+    for m in pmodels:
+        marker = ' \033[32m●\033[0m' if m['id'] in hardcoded else '  '
+        print(f'   {marker} {m[\"id\"]}')
+    print()
+
+print('\033[32m●\033[0m = currently in moxie defaults')
+print()
+print('To use any model, add it to .moxie/config.toml:')
+print('  [agents.my-model]')
+print('  type = \"gateway\"')
+print('  model = \"provider/model-name\"')
+print('  order = 10')
+" <<< "$json"
+}
+
 # ---- Doctor: health checks ----
 
 cmd_doctor() {

package/lib/gateway-models.mjs

@@ -0,0 +1,84 @@
+#!/usr/bin/env node
+// moxie/lib/gateway-models.mjs — List available models from Vercel AI Gateway
+// Zero npm dependencies. Node 14+ compatible.
+// Usage: GATEWAY_API_KEY=xxx node gateway-models.mjs [endpoint] [--filter provider]
+
+import https from 'https';
+import http from 'http';
+
+const API_KEY = process.env.GATEWAY_API_KEY;
+const endpoint = process.argv[2] || 'https://ai-gateway.vercel.sh';
+const filter = process.argv[3] || '';
+
+if (!API_KEY) { process.stderr.write('ERROR: GATEWAY_API_KEY not set\n'); process.exit(1); }
+
+const url = new URL(`${endpoint}/v1/models`);
+
+const isHttps = url.protocol === 'https:';
+const mod = isHttps ? https : http;
+
+const options = {
+  hostname: url.hostname,
+  port: url.port || (isHttps ? 443 : 80),
+  path: url.pathname + url.search,
+  method: 'GET',
+  headers: {
+    'Authorization': `Bearer ${API_KEY}`,
+    'Accept': 'application/json',
+  },
+};
+
+const req = mod.request(options, (res) => {
+  let body = '';
+  res.on('data', (chunk) => { body += chunk; });
+  res.on('end', () => {
+    if (res.statusCode !== 200) {
+      process.stderr.write(`API error ${res.statusCode}: ${body.slice(0, 500)}\n`);
+      process.exit(1);
+    }
+
+    try {
+      const data = JSON.parse(body);
+      // OpenAI-compatible /v1/models returns { data: [...] }
+      let models = data.data || data.models || data || [];
+      if (!Array.isArray(models)) models = [];
+
+      // Normalize each model to { id, provider, name, created }
+      const normalized = models.map((m) => {
+        const id = m.id || m.model || '';
+        const parts = id.split('/');
+        const provider = parts.length > 1 ? parts[0] : (m.owned_by || 'unknown');
+        const name = parts.length > 1 ? parts.slice(1).join('/') : id;
+        return {
+          id,
+          provider,
+          name,
+          created: m.created || 0,
+        };
+      });
+
+      // Apply filter if provided
+      const filtered = filter
+        ? normalized.filter((m) => m.id.toLowerCase().includes(filter.toLowerCase()))
+        : normalized;
+
+      // Sort by provider, then name
+      filtered.sort((a, b) => {
+        if (a.provider !== b.provider) return a.provider.localeCompare(b.provider);
+        return a.name.localeCompare(b.name);
+      });
+
+      process.stdout.write(JSON.stringify({ models: filtered }) + '\n');
+    } catch (err) {
+      process.stderr.write(`Failed to parse response: ${err.message}\n`);
+      process.exit(1);
+    }
+  });
+});
+
+req.on('error', (err) => {
+  process.stderr.write(`Network error: ${err.message}\n`);
+  process.exit(1);
+});
+
+req.end();

package/lib/phases.sh

@@ -216,6 +216,7 @@ _select_context_docs() {
 _select_agents() {
     SELECTED_AGENT_INDICES=()
     SELECTED_GATEWAY_INDICES=()
+    SELECTED_CUSTOM_GATEWAY_INDICES=()
 
     # Build unified item list: CLI agents, separator, gateway models
     local item_labels=()
@@ -262,6 +263,19 @@ _select_agents() {
         [ "$len" -gt "$max_label_len" ] && max_label_len=$len
     done
 
+    # Custom model entry point
+    item_labels+=("+ Add custom model...")
+    item_meta+=("type provider/model-name")
+    item_types+=("custom_add")
+    item_sources+=("-1")
+    local _custom_label="+ Add custom model..."
+    local len=${#_custom_label}
+    [ "$len" -gt "$max_label_len" ] && max_label_len=$len
+
+    # Track custom models added during this session
+    local custom_gateway_names=()
+    local custom_gateway_models=()
+
     local count=${#item_labels[@]}
 
     # State: pre-select CLI agents, gateway unselected
@@ -299,6 +313,10 @@ _select_agents() {
             fi
             local marker="  "
             [ "$cursor" -eq "$i" ] && marker="> "
+            if [ "${item_types[$i]}" = "custom_add" ]; then
+                printf "\\r\\033[K  %s    \\033[36m%s\\033[0m  \\033[2m(%s)\\033[0m\\n" "$marker" "${item_labels[$i]}" "${item_meta[$i]}" >&2
+                continue
+            fi
             local check="[ ]"
             [ "${selected[$i]}" = "1" ] && check="[x]"
             if [ -n "${item_meta[$i]}" ]; then
@@ -318,7 +336,7 @@ _select_agents() {
             printf "\\r\\033[K  %s\\033[2m%s\\033[0m\\n" "$submit_marker" "Submit (need at least 2)" >&2
         fi
 
-        printf "\\r\\033[K\\n\\033[K  \\033[2m↑↓ navigate · space/enter toggle · enter submit (min 2)\\033[0m" >&2
+        printf "\\r\\033[K\\n\\033[K  \\033[2m↑↓ navigate · space toggle · enter submit/add · 'moxie models' to browse\\033[0m" >&2
     }
 
     printf "Select agents (at least 2). CLI agents pre-selected, gateway models available below:\\n\\n" >&2
@@ -361,16 +379,82 @@ _select_agents() {
                 esac
             fi
         elif [ "$key" = " " ]; then
-            if [ "$cursor" -lt "$count" ] && [ "${item_types[$cursor]}" != "separator" ]; then
+            if [ "$cursor" -lt "$count" ] && [ "${item_types[$cursor]}" != "separator" ] && [ "${item_types[$cursor]}" != "custom_add" ]; then
                 [ "${selected[$cursor]}" = "0" ] && selected[$cursor]=1 || selected[$cursor]=0
             fi
         elif [ "$key" = "" ]; then
             if [ "$cursor" -eq "$count" ]; then
+                # Submit
                 local sel_count=0
                 for (( i = 0; i < count; i++ )); do
                     [ "${selected[$i]}" = "1" ] && sel_count=$(( sel_count + 1 ))
                 done
                 [ "$sel_count" -ge 2 ] && break
+            elif [ "${item_types[$cursor]}" = "custom_add" ]; then
+                # Prompt for custom model string
+                printf "\\033[?25h" >&2
+                stty echo icanon < /dev/tty 2>/dev/null
+                printf "\\n\\r\\033[K  Model ID (provider/model-name): " >&2
+                local custom_model=""
+                read -r custom_model < /dev/tty
+                stty -echo -icanon min 1 < /dev/tty 2>/dev/null
+                printf "\\033[?25l" >&2
+
+                if [ -n "$custom_model" ] && [[ "$custom_model" == */* ]]; then
+                    # Derive a short name from the model ID: provider-modelbase
+                    local custom_provider="${custom_model%%/*}"
+                    local custom_name_part="${custom_model#*/}"
+                    local custom_slug="${custom_provider}-${custom_name_part}"
+                    # Sanitize slug for TOML key
+                    custom_slug=$(echo "$custom_slug" | tr '[:upper:]' '[:lower:]' | tr ' .' '-' | tr -cd 'a-z0-9-')
+                    custom_slug="${custom_slug}-gw"
+
+                    # Insert before the custom_add row (which is at current cursor)
+                    local insert_at=$cursor
+
+                    # Shift arrays to insert new item
+                    local new_labels=() new_meta=() new_types=() new_sources=() new_selected=()
+                    for (( i = 0; i < count; i++ )); do
+                        if [ "$i" -eq "$insert_at" ]; then
+                            new_labels+=("$custom_name_part")
+                            new_meta+=("$custom_model")
+                            new_types+=("custom_gateway")
+                            new_sources+=("${#custom_gateway_names[@]}")
+                            new_selected+=(1)
+                        fi
+                        new_labels+=("${item_labels[$i]}")
+                        new_meta+=("${item_meta[$i]}")
+                        new_types+=("${item_types[$i]}")
+                        new_sources+=("${item_sources[$i]}")
+                        new_selected+=("${selected[$i]}")
+                    done
+
+                    item_labels=("${new_labels[@]}")
+                    item_meta=("${new_meta[@]}")
+                    item_types=("${new_types[@]}")
+                    item_sources=("${new_sources[@]}")
+                    selected=("${new_selected[@]}")
+
+                    custom_gateway_names+=("$custom_slug")
+                    custom_gateway_models+=("$custom_model")
+
+                    count=${#item_labels[@]}
+                    jump_back=$(( count + 3 ))
+
+                    # Update max_label_len if needed
+                    local len=${#custom_name_part}
+                    [ "$len" -gt "$max_label_len" ] && max_label_len=$len
+                    sep=""
+                    for (( i = 0; i < max_label_len + 40; i++ )); do sep="${sep}-"; done
+                else
+                    # Invalid — erase the prompt line
+                    if [ -n "$custom_model" ]; then
+                        printf "\\r\\033[K  \\033[31mInvalid format. Use provider/model-name (e.g. anthropic/claude-sonnet-4-6)\\033[0m" >&2
+                        sleep 1
+                    fi
+                fi
+                # Erase the prompt lines and re-render
+                printf "\\033[2A" >&2
             elif [ "${item_types[$cursor]}" != "separator" ]; then
                 [ "${selected[$cursor]}" = "0" ] && selected[$cursor]=1 || selected[$cursor]=0
             fi
@@ -387,6 +471,10 @@ _select_agents() {
     trap - INT TERM
     printf "\\n\\n" >&2
 
+    # Export custom models for config writer
+    CUSTOM_GATEWAY_NAMES=("${custom_gateway_names[@]}")
+    CUSTOM_GATEWAY_MODELS=("${custom_gateway_models[@]}")
+
     # Collect selections by type
     local has_gateway=0
     for (( i = 0; i < count; i++ )); do
@@ -397,6 +485,10 @@ _select_agents() {
                 SELECTED_GATEWAY_INDICES+=("${item_sources[$i]}")
                 has_gateway=1
                 ;;
+            custom_gateway)
+                SELECTED_CUSTOM_GATEWAY_INDICES+=("${item_sources[$i]}")
+                has_gateway=1
+                ;;
         esac
     done
 
@@ -406,6 +498,7 @@ _select_agents() {
         gateway_store_key "vercel-ai-gateway" || {
             echo "ERROR: Failed to store gateway key. Gateway models will not work." >&2
             SELECTED_GATEWAY_INDICES=()
+            SELECTED_CUSTOM_GATEWAY_INDICES=()
         }
     fi
 }
@@ -424,7 +517,10 @@ path = "spec.md"
 HEADER
 
     # Gateway section (if any gateway models selected)
-    if [ ${#SELECTED_GATEWAY_INDICES[@]} -gt 0 ]; then
+    local has_any_gw=0
+    [ ${#SELECTED_GATEWAY_INDICES[@]} -gt 0 ] && has_any_gw=1
+    [ ${#SELECTED_CUSTOM_GATEWAY_INDICES[@]} -gt 0 ] && has_any_gw=1
+    if [ "$has_any_gw" = "1" ]; then
         local run_id
         run_id="run-$(date +%Y%m%d-%H%M%S)-$$"
         cat >> "$config_file" <<GATEWAY
@@ -458,7 +554,7 @@ AGENT
         done
     fi
 
-    # Gateway agents
+    # Gateway agents (built-in)
     for idx in "${SELECTED_GATEWAY_INDICES[@]}"; do
         local name="${KNOWN_GATEWAY_NAMES[$idx]}"
         local model="${KNOWN_GATEWAY_MODELS[$idx]}"
@@ -468,6 +564,20 @@ type = "gateway"
 model = "${model}"
 order = ${order}
 
+GWAGENT
+        order=$((order + 1))
+    done
+
+    # Custom gateway agents (added during init)
+    for idx in "${SELECTED_CUSTOM_GATEWAY_INDICES[@]}"; do
+        local name="${CUSTOM_GATEWAY_NAMES[$idx]}"
+        local model="${CUSTOM_GATEWAY_MODELS[$idx]}"
+        cat >> "$config_file" <<GWAGENT
+[agents.${name}]
+type = "gateway"
+model = "${model}"
+order = ${order}
+
 GWAGENT
         order=$((order + 1))
     done

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zachjxyz/moxie",
-  "version": "0.4.4",
+  "version": "0.4.6",
   "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"