openzoo 0.48.62 → 0.48.63

package/lib/proxy.js

@@ -829,6 +829,9 @@ export async function startProxy({ silent = false, requireToken = null, sessionM
   // cost can.
   let sessionActual = 0;
   let actualCalls = 0;
+  // billed for ONLY those calls whose real cost we learned — the honest
+  // numerator for markupX. See the comment at the usage.cost site.
+  let billedWithActual = 0;
   // CREDIT, CACHED. Users cannot tell prepaid credit from wallet balance and
   // have to guess whether a call was even paid for ("I don't think x402 made me
   // pay this at all"). The status line runs EVERY turn, so this is refreshed at
@@ -980,9 +983,9 @@ export async function startProxy({ silent = false, requireToken = null, sessionM
           actual: {
             calls: actualCalls,
             upstreamUsd: Number(sessionActual.toFixed(6)),
-            billedUsd: Number(sessionSpent.toFixed(6)),
-            marginUsd: Number((sessionSpent - sessionActual).toFixed(6)),
-            markupX: sessionActual > 0 ? Number((sessionSpent / sessionActual).toFixed(2)) : null,
+            billedUsd: Number(billedWithActual.toFixed(6)),
+            marginUsd: Number((billedWithActual - sessionActual).toFixed(6)),
+            markupX: sessionActual > 0 ? Number((billedWithActual / sessionActual).toFixed(2)) : null,
           },
           mcp: `${self.replace(/\/v1$/, '')}/mcp`,
           upstream: config.apiBase,
@@ -1268,6 +1271,21 @@ export async function startProxy({ silent = false, requireToken = null, sessionM
     // Retry of a body we answered seconds ago? Serve the cached completion —
     // never pay twice for a harness's reconnect loop.
     const isChat = req.method === 'POST' && (req.url || '').includes('/chat/completions');
+    // GROUND TRUTH ON THE OUTGOING BODY. Three sessions have now reported "no
+    // actual question or task from you" while the proxy log showed a healthy
+    // forward, and two rounds of reasoning about the cut were wrong. Log what
+    // is actually in messages[] on the way out — roles, and the tail of the
+    // last user turn — so the question stops being a matter of opinion.
+    if (process.env.OPENZOO_LOG_BODY === '1' && isChat) {
+      try {
+        const b = JSON.parse(bodyBuf.toString('utf8'));
+        const ms = Array.isArray(b?.messages) ? b.messages : [];
+        const roles = ms.map((m) => (m.role || '?')[0]).join('');
+        const lastUser = [...ms].reverse().find((m) => m.role === 'user');
+        const txt = lastUser ? String(msgText(lastUser)).slice(-160).replace(/\s+/g, ' ') : '(NO USER MESSAGE)';
+        log(`  OUT roles=${roles} n=${ms.length} lastUser="${txt}"`);
+      } catch { /* not json */ }
+    }
     const rKey = isChat ? replayKey(bodyBuf, req.headers) : null;
     if (rKey) {
       const hit = replayGet(rKey);
@@ -1436,6 +1454,15 @@ export async function startProxy({ silent = false, requireToken = null, sessionM
         if (typeof data?.usage?.cost === 'number' && data.usage.cost >= 0) {
           sessionActual += data.usage.cost;
           actualCalls += 1;
+          // PAIR THE NUMERATOR WITH THE DENOMINATOR. sessionSpent is summed on
+          // three paths and sessionActual on two, so markupX divided ALL billed
+          // by the SUBSET that reported a real cost — a 402-receipt call added
+          // to billed and nothing to real, and the ratio read 12.55x on a stack
+          // running at ~1.0x. Track the billed side of exactly the calls whose
+          // cost we actually learned.
+          // Both figures ride the SAME response object, so read them together
+          // rather than carrying one across sites and hoping the order holds.
+          billedWithActual += Number(data?.x402?.billedUsd) || 0;
         }
         // PREPAID CALLS STILL COST MONEY. The block above only meters calls
         // where THIS proxy answered a 402 and paid. When prepaid credit covers
@@ -1513,7 +1540,7 @@ export async function startProxy({ silent = false, requireToken = null, sessionM
         sessionSpent += x.billedUsd;
         sessionCogs += typeof x.cogsUsd === 'number' ? x.cogsUsd : x.billedUsd / MARKUP;
         sessionDirect += typeof x.directUsd === 'number' ? x.directUsd : x.billedUsd;
-        if (typeof x.actualUsd === 'number' && x.actualUsd >= 0) { sessionActual += x.actualUsd; actualCalls += 1; }
+        if (typeof x.actualUsd === 'number' && x.actualUsd >= 0) { sessionActual += x.actualUsd; actualCalls += 1; billedWithActual += x.billedUsd || 0; }
         if (didSpill) {
           const lc = x.lecore || {};
           log(`spill priced (streamed): ${x.pricing} · basis ${x.counterfactualTokensUsed ?? '?'} tok vs sent ${lc.tokensBefore ?? '?'} -> ${lc.tokensAfter ?? '?'} · billed ${(x.billedUsd ?? 0).toFixed(5)} direct ${(x.directUsd ?? 0).toFixed(5)}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openzoo",
-  "version": "0.48.62",
+  "version": "0.48.63",
   "description": "Local x402-paying proxy + MCP server for openzoo.fun — point any OpenAI-compatible harness (Cursor, Claude Code, aider, SDKs) at localhost and it pays per call from a local burner wallet. Solana and Base rails live; Robinhood experimental.",
   "license": "MIT",
   "type": "module",