openzoo 0.51.9 → 0.51.11

package/launcher/savings-renderer.js

@@ -1,10 +1,9 @@
 const usd = n => typeof n === 'number' && Number.isFinite(n) ? '$' + Math.abs(n).toFixed(Math.abs(n) < .01 && n !== 0 ? 4 : 2) : '—';
 window.savings.listen(d => {
-  for (const [id, value] of [['wallet',d.walletUsd],['credit',d.creditUsd],['spent',d.spendUsd],['direct',d.directUsd]]) document.getElementById(id).textContent=usd(value);
-  const comparable=typeof d.directUsd==='number' && typeof d.spendUsd==='number' && (d.directUsd>0 || d.spendUsd===0);
-  const saved=comparable ? d.directUsd-d.spendUsd : null;
+  for (const [id, value] of [['wallet',d.walletUsd],['credit',d.creditUsd],['spent',d.billing?.calls > 0 ? d.billing.chargedUsd : null],['direct',d.comparison?.calls > 0 ? d.comparison.directUsd : null]]) document.getElementById(id).textContent=usd(value);
+  const saved=d.comparison?.calls > 0 ? d.comparison.directUsd-d.comparison.spentUsd : null;
   document.getElementById('saved').textContent=usd(saved);
   document.getElementById('saving-label').textContent=saved!==null && saved<0 ? 'Extra cost' : 'Saved';
-  document.getElementById('state').textContent=d.online ? 'Balance updates automatically' : 'Reconnecting · showing last known amounts';
+  document.getElementById('state').textContent=d.online ? (d.billing?.calls > 0 ? 'Final charges · saved receipts' : 'Waiting for final billing · balance is live') : 'Reconnecting · showing last known amounts';
 });
 document.getElementById('close').addEventListener('click',()=>window.savings.close());

package/launcher/savings.html

@@ -1,3 +1,3 @@
 <!doctype html><html><head><meta charset="utf-8"><meta http-equiv="Content-Security-Policy" content="default-src 'none'; style-src 'unsafe-inline'; script-src 'self'"><title>OpenZoo savings</title><style>
 *{box-sizing:border-box}body{margin:0;padding:8px;background:transparent;font:13px system-ui;color:#fff}.pill{border-radius:20px;background:#18181bf5;border:1px solid #ffffff25;overflow:hidden;box-shadow:0 4px 14px #0004}header{background:#e85d1c;padding:12px 16px;font-weight:650;-webkit-app-region:drag;display:flex;justify-content:space-between;align-items:center}button{-webkit-app-region:no-drag;border:0;background:none;color:inherit;font:18px system-ui;cursor:pointer;padding:0 5px}main{padding:12px 16px}dl{display:grid;grid-template-columns:1fr auto;margin:0;gap:7px}dd{margin:0;font-variant-numeric:tabular-nums}small{color:#bbb;display:block;margin-top:12px;font-size:11px}#state{color:#d8ff76}
-</style></head><body><div class="pill"><header><span>OpenZoo · costs & savings</span><button id="close" aria-label="Close savings pill">×</button></header><main><dl><dt>Wallet balance</dt><dd id="wallet">—</dd><dt>Prepaid credit</dt><dd id="credit">—</dd><dt>Spent</dt><dd id="spent">—</dd><dt>Would’ve cost · estimate</dt><dd id="direct">—</dd><dt id="saving-label">Saved</dt><dd id="saved">—</dd></dl><small id="state" role="status">Checking your balance…</small><small>Shared OpenZoo totals · drag the orange bar to move</small></main></div><script src="savings-renderer.js"></script></body></html>
+</style></head><body><div class="pill"><header><span>OpenZoo · costs & savings</span><button id="close" aria-label="Close savings pill">×</button></header><main><dl><dt>Wallet balance</dt><dd id="wallet">—</dd><dt>Prepaid credit</dt><dd id="credit">—</dd><dt>Charged · verified calls</dt><dd id="spent">—</dd><dt>Direct cost · verified calls</dt><dd id="direct">—</dd><dt id="saving-label">Saved</dt><dd id="saved">—</dd></dl><small id="state" role="status">Checking your balance…</small><small>Savings cover matching verified calls only. Drag the orange bar to move.</small></main></div><script src="savings-renderer.js"></script></body></html>

package/lib/billing.js

@@ -0,0 +1,33 @@
+const money = n => typeof n === 'number' && Number.isFinite(n) && n >= 0 ? n : null;
+
+// Only final, explicitly reported charges. Never substitute upstream cost or a quote.
+export function finalBilling(x = {}, usage = {}) {
+  const receipt = x._completedResponse === true || x.settle?.success === true;
+  const charged = [usage.billedUsd, x.billedActualUsd, x.settledBilledUsd, x.chargedUsd,
+    x.settledUsd, receipt ? x.billedUsd : null,
+    usage.cost_details?.upstream_inference_cost != null ? usage.cost : null].map(money).find(n => n !== null) ?? null;
+  const direct = receipt ? money(x.directUsd) : null;
+  const upstream = money(usage.cost_details?.upstream_inference_cost) ?? (receipt ? money(x.actualUsd) : null);
+  return { charged, direct, upstream };
+}
+
+// Observe billing without retaining prompts, output text, or changing the stream.
+export function billingObserver(onReceipt) {
+  let pending = '';
+  return chunk => {
+    pending += chunk;
+    let i;
+    while ((i = pending.indexOf('\n')) >= 0) {
+      const line = pending.slice(0, i).trimEnd(); pending = pending.slice(i + 1);
+      try {
+        if (line.startsWith(': x402 ')) onReceipt(JSON.parse(line.slice(7)));
+        else if (line.startsWith('data:')) {
+          const event = JSON.parse(line.slice(5).trim());
+          const value = event.response || event;
+          if (value.usage || value.x402) onReceipt({ ...value.x402, usage: value.usage, _completedResponse: event.type === 'response.completed' || value.status === 'completed' });
+        }
+      } catch { /* Not a billing event. */ }
+    }
+    if (pending.length > 2_000_000) pending = '';
+  };
+}

package/lib/proxy.js

@@ -1,3 +1,4 @@
+import { billingObserver, finalBilling } from './billing.js';
 import { liveBalance } from './funding-status.js';
 import { paymentError } from './payment-error.js';
 import { readFileSync, appendFileSync, mkdirSync } from 'node:fs';
@@ -234,16 +235,10 @@ function relay(res, upstream, onReceipt) {
     res.on('close', () => body.destroy());
     body.on('end', resolve);
     if (!sse || typeof onReceipt !== 'function') { body.pipe(res); return; }
-    let pending = '';
+    const observe = billingObserver(onReceipt);
     body.on('data', (c) => {
       res.write(c);
-      pending += c.toString('utf8');
-      const lines = pending.split('\n');
-      pending = lines.pop() ?? '';   // a comment can straddle two chunks
-      for (const line of lines) {
-        if (!line.startsWith(': x402 ')) continue;
-        try { onReceipt(JSON.parse(line.slice(7))); } catch { /* not our frame */ }
-      }
+      observe(c.toString('utf8'));
     });
     body.on('end', () => res.end());
   });
@@ -429,8 +424,10 @@ export async function startProxy({ silent = false, requireToken = null, sessionM
   let lastQuoteUsd = null;
   let sessionCogs = restored.cogsUsd;
   let sessionDirect = restored.directUsd;
+  let comparedSpent = restored.comparison?.spentUsd ?? 0, comparedDirect = restored.comparison?.directUsd ?? 0, comparedCalls = restored.comparison?.calls ?? 0;
+  let verifiedCharged = restored.billing?.chargedUsd ?? 0, verifiedCalls = restored.billing?.calls ?? 0;
   const rememberSpend = () => {
-    saveSessionSpend({ spentUsd: sessionSpent, cogsUsd: sessionCogs, directUsd: sessionDirect, paidCalls });
+    saveSessionSpend({ spentUsd: sessionSpent, cogsUsd: sessionCogs, directUsd: sessionDirect, paidCalls, billing: { chargedUsd: verifiedCharged, calls: verifiedCalls }, comparison: { spentUsd: comparedSpent, directUsd: comparedDirect, calls: comparedCalls } });
   };
   if (restored.ok && (sessionSpent > 0 || paidCalls > 0)) {
     say(`session restored: $${sessionSpent.toFixed(6)} · ${paidCalls} paid call${paidCalls === 1 ? '' : 's'}`);
@@ -659,6 +656,8 @@ export async function startProxy({ silent = false, requireToken = null, sessionM
           creditUsd,
           // WHAT THE SAME CALLS WOULD HAVE COST DIRECT. Spend on its own is a
           // bill; spend beside the counterfactual is the product.
+          billing: { chargedUsd: verifiedCharged, calls: verifiedCalls, scope: "saved verified receipts" },
+          comparison: { spentUsd: comparedSpent, directUsd: comparedDirect, calls: comparedCalls },
           directUsd: sessionDirect,
           savedUsd: Math.max(0, sessionDirect - sessionSpent),
           savingX: sessionSpent > 0 ? Number((sessionDirect / sessionSpent).toFixed(4)) : null,
@@ -965,36 +964,39 @@ export async function startProxy({ silent = false, requireToken = null, sessionM
         }
         scheduleRefresh(4000); // settlement lands on-chain in a few seconds
       }
+      let accounted = paid && receipt?.ok && typeof receipt.billedUsd === 'number' ? receipt.billedUsd : 0;
+      let counted = paid && receipt?.ok && typeof receipt.billedUsd === 'number';
+      let finalX = {}, finalUsage = {}, comparison = null, actualPair = null, verified = null;
+      const meterFinal = (x = {}) => {
+        const { usage, ...fields } = x;
+        finalX = { ...finalX, ...fields };
+        finalUsage = { ...finalUsage, ...usage };
+        const final = finalBilling(finalX, finalUsage);
+        if (final.charged === null) return;
+        if (verified === null) verifiedCalls++;
+        verifiedCharged += final.charged - (verified ?? 0);
+        verified = final.charged;
+        const delta = final.charged - accounted;
+        sessionSpent += delta;
+        if (viaTunnel) tunnelSpent += delta;
+        if (!counted) { paidCalls++; counted = true; }
+        accounted = final.charged;
+        if (comparison) { comparedSpent -= comparison.charged; comparedDirect -= comparison.direct; comparedCalls--; comparison = null; }
+        if (final.direct !== null) {
+          comparison = final;
+          comparedSpent += final.charged; comparedDirect += final.direct; comparedCalls++;
+        }
+        if (actualPair) { sessionActual -= actualPair.upstream; billedWithActual -= actualPair.charged; actualCalls--; }
+        actualPair = final.upstream === null ? null : final;
+        if (actualPair) { sessionActual += final.upstream; billedWithActual += final.charged; actualCalls++; }
+        rememberSpend();
+        log(`final billing: charged $${final.charged.toFixed(6)} · upstream ${final.upstream === null ? 'unreported' : '$' + final.upstream.toFixed(6)} · direct ${final.direct === null ? 'unreported' : '$' + final.direct.toFixed(6)}`);
+      };
       const upCt = response.headers.get('content-type') || '';
       if (isPaidPost && response.ok && upCt.includes('application/json')) {
         let data = null;
         try { data = await response.clone().json(); } catch { /* not JSON after all */ }
-        // WHAT IT REALLY COST, straight from the provider — rides every
-        // completion already; no extra call.
-        {
-          // PAIR THE NUMERATOR WITH THE DENOMINATOR: usage.cost with the
-          // post-completion billed twin, never the quote reserve.
-          const pair = pairActualBilled(data?.x402, data?.usage);
-          if (pair) {
-            sessionActual += pair.upstreamUsd;
-            actualCalls += 1;
-            billedWithActual += pair.billedUsd;
-          }
-        }
-        // PREPAID CALLS STILL COST MONEY. When prepaid credit covers the quote
-        // the gateway serves 200 on the FIRST request — no 402, no payment, no
-        // receipt. The receipt still rides the response body, so meter it there.
-        if (!paid && data?.x402 && typeof data.x402.billedUsd === 'number') {
-          const x = data.x402;
-          sessionSpent += x.billedUsd;
-          sessionCogs += receiptUsedCogs(x);
-          noteQuote(x);
-          sessionDirect += receiptDirectUsd(x);
-          paidCalls += 1;
-          if (viaTunnel) tunnelSpent += x.billedUsd;
-          rememberSpend();
-          say(`credit -> $${x.billedUsd.toFixed(6)}  ·  session $${sessionSpent.toFixed(6)}`);
-        }
+        meterFinal({ ...data?.x402, usage: data?.usage, _completedResponse: response.ok });
         if (data?.object === 'chat.completion') {
           if (statsOff) {
             // The gateway already dropped its half; drop ours, and any block an
@@ -1020,23 +1022,7 @@ export async function startProxy({ silent = false, requireToken = null, sessionM
       // A STREAMED call is metered from the gateway's trailing SSE comment —
       // same figures the JSON path reads out of `data.x402`, same counters, so
       // the status line does not care which transport served the answer.
-      const meterStreamed = (x) => {
-        const pair = pairActualBilled(x, x?.usage);
-        if (pair) {
-          sessionActual += pair.upstreamUsd;
-          actualCalls += 1;
-          billedWithActual += pair.billedUsd;
-        }
-        if (paid || typeof x?.billedUsd !== 'number') return;
-        sessionSpent += x.billedUsd;
-        sessionCogs += receiptUsedCogs(x);
-        noteQuote(x);
-        sessionDirect += receiptDirectUsd(x);
-        paidCalls += 1;
-        if (viaTunnel) tunnelSpent += x.billedUsd;
-        rememberSpend();
-        say(`credit -> $${x.billedUsd.toFixed(6)}  ·  session $${sessionSpent.toFixed(6)}`);
-      };
+      const meterStreamed = meterFinal;
       // A 402 AFTER we attempted payment is a SETTLEMENT failure, not a quote.
       // The client-side balance check is advisory, so a funded wallet can still
       // fail on-chain / at the facilitator, and the gateway answers the paid

package/lib/session.js

@@ -30,6 +30,8 @@ export function loadSessionSpend(file = sessionSpendFile()) {
   try { data = JSON.parse(raw); }
   catch { return { ...EMPTY, ok: false, reason: 'corrupt' }; }
   return {
+    ...(data.billing ? { billing: { chargedUsd: num(data.billing.chargedUsd), calls: Math.floor(num(data.billing.calls)) } } : {}),
+    ...(data.comparison ? { comparison: { spentUsd: num(data.comparison.spentUsd), directUsd: num(data.comparison.directUsd), calls: Math.floor(num(data.comparison.calls)) } } : {}),
     spentUsd: num(data.spentUsd),
     cogsUsd: num(data.cogsUsd),
     directUsd: num(data.directUsd),
@@ -40,6 +42,8 @@ export function loadSessionSpend(file = sessionSpendFile()) {
 
 export function saveSessionSpend(stats, file = sessionSpendFile()) {
   const payload = {
+    ...(stats?.billing ? { billing: { chargedUsd: num(stats.billing.chargedUsd), calls: Math.floor(num(stats.billing.calls)) } } : {}),
+    ...(stats?.comparison ? { comparison: { spentUsd: num(stats.comparison.spentUsd), directUsd: num(stats.comparison.directUsd), calls: Math.floor(num(stats.comparison.calls)) } } : {}),
     spentUsd: num(stats?.spentUsd),
     cogsUsd: num(stats?.cogsUsd),
     directUsd: num(stats?.directUsd),

package/lib/x402.js

@@ -432,49 +432,22 @@ export async function tokenBalance(connection, owner, mintStr) {
 export function receiptLine(accept, settle) {
   const x = accept.extra || {};
   const usd = x.billedUsd != null ? `$${Number(x.billedUsd).toFixed(6)}` : `${accept.maxAmountRequired} raw units`;
-  // "1.0× cheaper than direct" is a sentence that means nothing, and a user
-  // read it as a bug — rightly. Since the gateway repriced to an OpenRouter
-  // CEILING, an uncompressed call bills exactly the direct rate, so the ratio
-  // is 1.0 by design rather than by accident. Say what actually happened:
-  // below 1.05× there is no saving to report, so report the price instead.
-  //
-  // The saving comes from leCore forwarding fewer tokens. A short body never
-  // reaches the spill threshold, so there is nothing to compress and nothing
-  // to save — which is worth saying out loud, because the fix on the caller's
-  // side is to BIND a corpus, not to change models.
   const billed = Number(x.billedUsd);
   const direct = x.directUsd != null ? Number(x.directUsd) : null;
   const saved = x.savedUsd != null ? Number(x.savedUsd)
     : (Number.isFinite(billed) && Number.isFinite(direct) ? Math.max(0, direct - billed) : null);
   const ratio = x.savesVsDirect != null ? Number(x.savesVsDirect)
     : (Number.isFinite(billed) && billed > 0 && Number.isFinite(direct) ? direct / billed : null);
-  // Wallet path: OpenRouter price, plus 33% of savings vs direct when any.
-  // Never print extra.markup — that field is leftover 3× and is not the quote.
-  //
-  // THE BASIS DECIDES THE CLAIM, NOT THE RATIO'S SIZE.
-  //
-  // This used to gate the discount purely on `ratio >= 1.05`, which is the
-  // wrong test: on the `markup` basis the gateway sets directUsd to its OWN
-  // forwarded cost so downstream sums stay like-for-like (quote.ts), and
-  // savesVsDirect is computed against that same internal number — so the ratio
-  // can read well above 1 while billedUsd and directUsd are IDENTICAL.
-  // MEASURED 2026-08-28 on a live short-body call: billed $0.0013178, direct
-  // $0.0013178, savesVsDirect 1.457 — and this line printed "1.5× cheaper than
-  // direct" on a call that by its own two dollar figures saved nothing.
-  //
-  // The 402's own `description` already guards this correctly by branching on
-  // q.pricing; the receipt did not, so the challenge told the truth and the
-  // receipt for the same call did not. Only the counterfactual basis — leCore
-  // actually spilled, so "what this would have cost sent whole" is a real
-  // computed number — has earned the discount claim.
+  // Only counterfactual pricing supplies a retail comparison. Other modes
+  // may put internal costs in directUsd; they do not establish price parity.
   const counterfactual = x.pricing === 'counterfactual';
   const saves = !counterfactual
-    ? ' (at OpenRouter price — nothing to compress; bind a corpus to save)'
+    ? ' (direct-price comparison unavailable)'
     : ratio != null && ratio >= 1.05
       ? ` (${ratio.toFixed(1)}× cheaper than direct)`
       : Number.isFinite(saved) && saved > 0
         ? ` ($${saved.toFixed(4)} saved vs direct)`
-        : ' (at OpenRouter price — nothing to compress; bind a corpus to save)';
+        : ' (direct-price comparison unavailable)';
   const tx = settle?.transaction || settle?.txHash || settle?.signature;
   const rail = railOf(accept);
   return `paid ${usd}${saves}${rail ? ` · rail ${rail}` : ''}${tx ? ` · tx ${tx}` : ''}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openzoo",
-  "version": "0.51.9",
+  "version": "0.51.11",
   "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",