@zachjxyz/moxie 0.2.4 → 0.3.0

package/lib/platform.sh

@@ -0,0 +1,78 @@
+#!/usr/bin/env bash
+# moxie/lib/platform.sh — Platform detection and OS-specific shims
+# Compatible with Bash 3.2 (macOS default).
+
+# ---- Platform detection ----
+
+detect_platform() {
+    local kernel
+    kernel=$(uname -s 2>/dev/null || echo "unknown")
+    case "$kernel" in
+        Darwin) MOXIE_PLATFORM="darwin" ;;
+        Linux)  MOXIE_PLATFORM="linux" ;;
+        *)      MOXIE_PLATFORM="unknown" ;;
+    esac
+}
+
+# Run at source-time so MOXIE_PLATFORM is always set
+detect_platform
+
+# ---- stat wrappers ----
+
+# Returns epoch mtime (integer) for a file.
+stat_mtime() {
+    local file="$1"
+    case "$MOXIE_PLATFORM" in
+        darwin) stat -f "%m" "$file" 2>/dev/null || echo "0" ;;
+        linux)  stat -c "%Y" "$file" 2>/dev/null || echo "0" ;;
+        *)      echo "0" ;;
+    esac
+}
+
+# Returns human-readable modification date (e.g., "Apr 11") for a file.
+stat_date() {
+    local file="$1"
+    case "$MOXIE_PLATFORM" in
+        darwin) stat -f "%Sm" -t "%b %d" "$file" 2>/dev/null || echo "unknown" ;;
+        linux)  date -r "$file" "+%b %d" 2>/dev/null || echo "unknown" ;;
+        *)      echo "unknown" ;;
+    esac
+}
+
+# ---- Package manager hints ----
+
+# Returns the appropriate install command for coreutils on this platform.
+coreutils_install_hint() {
+    case "$MOXIE_PLATFORM" in
+        darwin) echo "brew install coreutils" ;;
+        linux)
+            if command -v apt-get &>/dev/null; then
+                echo "sudo apt-get install coreutils"
+            elif command -v dnf &>/dev/null; then
+                echo "sudo dnf install coreutils"
+            elif command -v pacman &>/dev/null; then
+                echo "sudo pacman -S coreutils"
+            else
+                echo "Install coreutils via your package manager"
+            fi
+            ;;
+        *) echo "Install coreutils via your package manager" ;;
+    esac
+}
+
+# ---- Sleep inhibitor ----
+
+# Returns a human-readable label for the sleep inhibitor on this platform.
+sleep_inhibit_name() {
+    case "$MOXIE_PLATFORM" in
+        darwin) echo "caffeinate" ;;
+        linux)
+            if command -v systemd-inhibit &>/dev/null; then
+                echo "systemd-inhibit"
+            else
+                echo "(none)"
+            fi
+            ;;
+        *) echo "(none)" ;;
+    esac
+}

package/lib/tokens.sh

@@ -14,38 +14,64 @@ extract_tokens() {
         return
     fi
 
-    # ---- Strategy 2: Claude JSON output ----
-    # If output-format=json, extract from usage block
+    # ---- Strategy 2: NDJSON / JSON array with usage block ----
+    # Claude (--output-format json) and Qwen (-o json) emit NDJSON or a JSON
+    # array.  The final "type":"result" object contains a top-level "usage" key.
+    # Logs may also contain non-JSON noise (e.g. hook errors on stderr).
     tokens=$(python3 -c "
 import json, sys
 try:
-    # The log may have non-JSON preamble; find the JSON object
     with open('$logfile') as f:
         text = f.read()
-    # Try parsing the whole thing as JSON first
+
+    # Collect candidate JSON objects from three formats:
+    #   1) Single JSON object   2) JSON array   3) NDJSON (one obj per line)
+    candidates = []
+    # 1) Single object
     try:
-        d = json.loads(text)
-    except:
-        # Find the last { ... } block (Claude JSON output is at the end)
-        import re
-        matches = list(re.finditer(r'\{', text))
-        d = None
-        for m in reversed(matches):
+        obj = json.loads(text)
+        if isinstance(obj, list):
+            candidates.extend(obj)          # 2) JSON array
+        elif isinstance(obj, dict):
+            candidates.append(obj)
+    except Exception:
+        # 3) NDJSON — try each line independently (skips noise)
+        for line in text.splitlines():
+            line = line.strip()
+            if not line or line[0] not in ('{', '['):
+                continue
             try:
-                d = json.loads(text[m.start():])
-                break
-            except:
+                obj = json.loads(line)
+                if isinstance(obj, list):
+                    candidates.extend(obj)
+                elif isinstance(obj, dict):
+                    candidates.append(obj)
+            except Exception:
                 continue
-    if d and 'usage' in d:
-        u = d['usage']
-        total = u.get('input_tokens', 0) + u.get('output_tokens', 0)
-        total += u.get('cache_creation_input_tokens', 0)
-        total += u.get('cache_read_input_tokens', 0)
+
+    # Find the last 'result' object with a usage block
+    result_usage = None
+    for obj in reversed(candidates):
+        if isinstance(obj, dict) and obj.get('type') == 'result' and 'usage' in obj:
+            result_usage = obj['usage']
+            break
+
+    # Fallback: any object with a top-level 'usage' dict
+    if result_usage is None:
+        for obj in reversed(candidates):
+            if isinstance(obj, dict) and isinstance(obj.get('usage'), dict):
+                result_usage = obj['usage']
+                break
+
+    if result_usage:
+        total = result_usage.get('input_tokens', 0) + result_usage.get('output_tokens', 0)
+        total += result_usage.get('cache_creation_input_tokens', 0)
+        total += result_usage.get('cache_read_input_tokens', 0)
         if total > 0:
             print(total)
             sys.exit(0)
     sys.exit(1)
-except:
+except Exception:
     sys.exit(1)
 " 2>/dev/null)
     if [ -n "$tokens" ] && [ "$tokens" -gt 0 ] 2>/dev/null; then
@@ -159,4 +185,79 @@ for f in glob.glob('$MOXIE_DIR/phases/*/token-usage.csv'):
 suffix = f' (+{unknown} unknown turns)' if unknown > 0 else ''
 print(f'  {grand:,} tokens{suffix}')
 " 2>/dev/null || echo "  (unknown)"
+
+    # Gateway cost reporting (if gateway agents are configured)
+    _show_gateway_cost
+}
+
+_show_gateway_cost() {
+    # Check if gateway section exists in config
+    local gw_endpoint
+    gw_endpoint=$(toml_get "$MOXIE_CONFIG" "gateway.endpoint" "")
+    [ -z "$gw_endpoint" ] && return
+
+    # Get API key (silently fail if not available)
+    local api_key
+    api_key=$(gateway_get_key "vercel-ai-gateway" 2>/dev/null) || return
+
+    # Find earliest timestamp across all CSV files to determine date range
+    local start_date
+    start_date=$(python3 -c "
+import csv, glob, datetime
+earliest = None
+for f in glob.glob('$MOXIE_DIR/phases/*/token-usage.csv'):
+    with open(f) as fh:
+        for row in csv.DictReader(fh):
+            ts = row.get('timestamp', '')
+            if len(ts) >= 13:
+                try:
+                    dt = datetime.datetime.strptime(ts[:13], '%m%d%y-%H%M%S')
+                    if earliest is None or dt < earliest:
+                        earliest = dt
+                except ValueError:
+                    pass
+if earliest:
+    print(earliest.strftime('%Y-%m-%d'))
+else:
+    print(datetime.date.today().strftime('%Y-%m-%d'))
+" 2>/dev/null)
+
+    local end_date
+    end_date=$(date +"%Y-%m-%d")
+
+    [ -z "$start_date" ] && return
+
+    # Call the reporting API
+    local cost_json
+    cost_json=$(GATEWAY_API_KEY="$api_key" node "$MOXIE_ROOT/lib/gateway-cost.mjs" "$gw_endpoint" "$start_date" "$end_date" 2>/dev/null) || {
+        echo ""
+        echo "Gateway cost:"
+        echo "  (unavailable — check your API key or AI Gateway dashboard)"
+        return
+    }
+
+    [ -z "$cost_json" ] && return
+
+    # Parse and display
+    echo ""
+    echo "Gateway cost (via Vercel AI Gateway):"
+    python3 -c "
+import json, sys
+data = json.loads('''$cost_json''')
+costs = data.get('costs', [])
+if not costs:
+    print('  (no gateway usage recorded)')
+    sys.exit(0)
+total = 0.0
+for c in sorted(costs, key=lambda x: x.get('agent', '')):
+    agent = c.get('agent', 'unknown')
+    cost = c.get('total_cost', 0.0) or c.get('market_cost', 0.0)
+    inp = c.get('input_tokens', 0)
+    out = c.get('output_tokens', 0)
+    total += cost
+    print(f'  {agent:<20s} \${cost:>8.2f}  ({inp:,} input + {out:,} output tokens)')
+print(f'  {\"TOTAL\":<20s} \${total:>8.2f}')
+print()
+print('  Dashboard: https://vercel.com/~/ai')
+" 2>/dev/null || echo "  (could not parse cost data)"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@zachjxyz/moxie",
-  "version": "0.2.4",
-  "description": "Run multiple AI coding agents (Claude, Codex, Qwen) through spec-driven phases with unanimous quorum convergence",
+  "version": "0.3.0",
+  "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"
   },
@@ -22,7 +22,13 @@
     "qwen",
     "spec-driven",
     "quorum",
-    "ensemble"
+    "ensemble",
+    "gateway-agent",
+    "vercel",
+    "aider",
+    "goose",
+    "cline",
+    "roo"
   ],
   "author": "Zach Johnson",
   "license": "MIT",