@zachjxyz/moxie 0.2.3 → 0.2.5

package/bin/moxie

@@ -16,7 +16,7 @@
 
 set -euo pipefail
 
-MOXIE_VERSION="0.2.3"
+MOXIE_VERSION="0.2.5"
 # Resolve symlinks (npm installs bin as a symlink)
 _self="$0"
 while [ -L "$_self" ]; do

package/lib/agents.sh

@@ -211,15 +211,14 @@ cmd_doctor() {
     echo "Dependencies:"
     _check_dep "python3" "Required for ledger parsing and token tracking" || all_ok=0
     _check_dep "caffeinate" "Keeps machine awake during runs (macOS)" || true  # non-fatal
-    if ! command -v timeout &>/dev/null; then
-        if command -v gtimeout &>/dev/null; then
-            echo "  [OK] gtimeout (aliased as timeout)"
-        else
-            echo "  [!!] timeout — not found. Install coreutils: brew install coreutils"
-            echo "        Agent turns will have no timeout protection."
-        fi
-    else
+    if command -v timeout &>/dev/null; then
         echo "  [OK] timeout"
+    elif command -v gtimeout &>/dev/null; then
+        echo "  [OK] coreutils (gtimeout aliased as timeout)"
+    else
+        echo "  [!!] coreutils — not found. Install: brew install coreutils"
+        echo "        Provides timeout protection for agent turns (gtimeout)."
+        all_ok=0
     fi
     echo ""
 

package/lib/phases.sh

@@ -324,11 +324,11 @@ command = 'codex exec -c model_reasoning_effort="xhigh" --dangerously-bypass-app
 order = 1
 
 [agents.claude]
-command = "claude --dangerously-skip-permissions --effort max -p"
+command = "claude --dangerously-skip-permissions --effort max --output-format json -p"
 order = 2
 
 [agents.qwen]
-command = "qwen --yolo"
+command = "qwen --yolo -o json"
 order = 3
 
 [settings]
@@ -378,11 +378,12 @@ TOML
 
     echo ""
     echo "Next steps:"
-    echo "  1. Review .moxie/config.toml (agent commands, timeouts)"
+    echo "  1. Run: moxie doctor   (verify dependencies and environment)"
+    echo "  2. Review .moxie/config.toml (agent commands, timeouts)"
     if [ ! -d "$MOXIE_DIR/context" ] || [ -z "$(ls -A "$MOXIE_DIR/context" 2>/dev/null)" ]; then
         echo "     Tip: add context docs to .moxie/context/ (roadmaps, PRDs, etc.)"
     fi
-    echo "  2. Run: moxie start    (background, caffeinated)"
+    echo "  3. Run: moxie start    (background, caffeinated)"
     echo "     Or:  moxie run      (foreground, caffeinated)"
 }
 

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zachjxyz/moxie",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "description": "Run multiple AI coding agents (Claude, Codex, Qwen) through spec-driven phases with unanimous quorum convergence",
   "bin": {
     "moxie": "bin/moxie"