@zachjxyz/moxie 0.3.4 → 0.3.7

package/bin/moxie

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

package/lib/agents.sh

@@ -271,9 +271,10 @@ dispatch_agent() {
 
     # Gateway agent: dispatch via Node.js script
     if _is_gateway_agent "$agent"; then
-        local model endpoint api_key
+        local model endpoint api_key run_id
         model=$(_agent_model "$agent")
         endpoint=$(toml_get "$MOXIE_CONFIG" "gateway.endpoint" "https://ai-gateway.vercel.sh")
+        run_id=$(toml_get "$MOXIE_CONFIG" "gateway.run_id" "")
         api_key=$(gateway_get_key "vercel-ai-gateway") || {
             echo "ERROR: Gateway API key not found. Run 'moxie init' to configure." >&2
             return 1
@@ -285,6 +286,7 @@ dispatch_agent() {
             GATEWAY_MODEL="$model" \
             GATEWAY_PHASE="$phase" \
             GATEWAY_AGENT="$agent" \
+            GATEWAY_RUN_ID="$run_id" \
             timeout "$timeout_secs" \
             node "$MOXIE_ROOT/lib/gateway-agent.mjs" "$(cat "$prompt_file")" || {
             local rc=$?

package/lib/gateway-agent.mjs

@@ -18,6 +18,7 @@ const MAX_TURNS = parseInt(process.env.GATEWAY_MAX_TURNS || '50', 10);
 const IDLE_TIMEOUT_MS = parseInt(process.env.GATEWAY_IDLE_TIMEOUT || '120000', 10);
 const PHASE = process.env.GATEWAY_PHASE || 'unknown';
 const AGENT_NAME = process.env.GATEWAY_AGENT || 'unknown';
+const RUN_ID = process.env.GATEWAY_RUN_ID || '';
 const CWD = process.cwd();
 
 if (!API_KEY) { process.stderr.write('ERROR: GATEWAY_API_KEY not set\n'); process.exit(1); }
@@ -310,7 +311,7 @@ function chatCompletion(messages) {
       stream_options: { include_usage: true },
       providerOptions: {
         gateway: {
-          tags: [`project:moxie`, `phase:${PHASE}`, `agent:${AGENT_NAME}`],
+          tags: [`project:moxie`, `phase:${PHASE}`, `agent:${AGENT_NAME}`, ...(RUN_ID ? [`run:${RUN_ID}`] : [])],
           user: 'moxie',
         },
       },

package/lib/gateway-cost.mjs

@@ -7,18 +7,34 @@ import https from 'https';
 import http from 'http';
 
 const API_KEY = process.env.GATEWAY_API_KEY;
+const RUN_ID = process.env.GATEWAY_RUN_ID || '';
 const endpoint = process.argv[2] || 'https://ai-gateway.vercel.sh';
-const startDate = process.argv[3];
-const endDate = process.argv[4];
+const startDate = process.argv[3] || '';
+const endDate = process.argv[4] || '';
 
 if (!API_KEY) { process.stderr.write('ERROR: GATEWAY_API_KEY not set\n'); process.exit(1); }
-if (!startDate || !endDate) { process.stderr.write('ERROR: start_date and end_date required\n'); process.exit(1); }
 
 const url = new URL(`${endpoint}/v1/report`);
-url.searchParams.set('start_date', startDate);
-url.searchParams.set('end_date', endDate);
 url.searchParams.set('group_by', 'tag');
-url.searchParams.set('filter_tag', 'project:moxie');
+
+if (RUN_ID) {
+  // Filter by run ID — captures the full session regardless of dates
+  url.searchParams.set('tags', `run:${RUN_ID}`);
+  // Still need dates — use a wide window
+  const now = new Date();
+  const thirtyDaysAgo = new Date(now.getTime() - 30 * 24 * 60 * 60 * 1000);
+  const tomorrow = new Date(now.getTime() + 24 * 60 * 60 * 1000);
+  url.searchParams.set('start_date', thirtyDaysAgo.toISOString().slice(0, 10));
+  url.searchParams.set('end_date', tomorrow.toISOString().slice(0, 10));
+} else if (startDate && endDate) {
+  // Fallback: filter by date range + project tag
+  url.searchParams.set('start_date', startDate);
+  url.searchParams.set('end_date', endDate);
+  url.searchParams.set('tags', 'project:moxie');
+} else {
+  process.stderr.write('ERROR: Either GATEWAY_RUN_ID or start_date/end_date required\n');
+  process.exit(1);
+}
 
 const isHttps = url.protocol === 'https:';
 const mod = isHttps ? https : http;

package/lib/phases.sh

@@ -425,9 +425,12 @@ HEADER
 
     # Gateway section (if any gateway models selected)
     if [ ${#SELECTED_GATEWAY_INDICES[@]} -gt 0 ]; then
-        cat >> "$config_file" <<'GATEWAY'
+        local run_id
+        run_id="run-$(date +%Y%m%d-%H%M%S)-$$"
+        cat >> "$config_file" <<GATEWAY
 [gateway]
 endpoint = "https://ai-gateway.vercel.sh"
+run_id = "$run_id"
 
 GATEWAY
     fi

package/lib/tokens.sh

@@ -200,36 +200,13 @@ _show_gateway_cost() {
     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
+    # Get run_id for filtering (if available, use it; otherwise fall back to dates)
+    local run_id
+    run_id=$(toml_get "$MOXIE_CONFIG" "gateway.run_id" "")
 
     # 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) || {
+    cost_json=$(GATEWAY_API_KEY="$api_key" GATEWAY_RUN_ID="$run_id" node "$MOXIE_ROOT/lib/gateway-cost.mjs" "$gw_endpoint" 2>/dev/null) || {
         echo ""
         echo "Gateway cost:"
         echo "  (unavailable — check your API key or AI Gateway dashboard)"

package/package.json

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