openzoo 0.51.10 → 0.51.11

package/launcher/savings-renderer.js

@@ -4,6 +4,6 @@ window.savings.listen(d => {
   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 ? (d.billing?.calls > 0 ? 'Final charges · since connection started' : 'Waiting for final billing · balance is live') : '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/lib/billing.js

@@ -2,10 +2,13 @@ const money = n => typeof n === 'number' && Number.isFinite(n) && n >= 0 ? n : n
 
 // 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, usage.cost_details?.upstream_inference_cost != null ? usage.cost : null].map(money).find(n => n !== null) ?? null;
-  const direct = x.pricing === 'counterfactual' ? money(x.directUsd) : null;
-  return { charged, direct, upstream: money(usage.cost_details?.upstream_inference_cost) };
+    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.
@@ -21,7 +24,7 @@ export function billingObserver(onReceipt) {
         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 });
+          if (value.usage || value.x402) onReceipt({ ...value.x402, usage: value.usage, _completedResponse: event.type === 'response.completed' || value.status === 'completed' });
         }
       } catch { /* Not a billing event. */ }
     }

package/lib/proxy.js

@@ -424,10 +424,10 @@ export async function startProxy({ silent = false, requireToken = null, sessionM
   let lastQuoteUsd = null;
   let sessionCogs = restored.cogsUsd;
   let sessionDirect = restored.directUsd;
-  let comparedSpent = 0, comparedDirect = 0, comparedCalls = 0;
-  let verifiedCharged = 0, verifiedCalls = 0;
+  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'}`);
@@ -656,7 +656,7 @@ 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: "verified calls since proxy startup" },
+          billing: { chargedUsd: verifiedCharged, calls: verifiedCalls, scope: "saved verified receipts" },
           comparison: { spentUsd: comparedSpent, directUsd: comparedDirect, calls: comparedCalls },
           directUsd: sessionDirect,
           savedUsd: Math.max(0, sessionDirect - sessionSpent),
@@ -996,7 +996,7 @@ export async function startProxy({ silent = false, requireToken = null, sessionM
       if (isPaidPost && response.ok && upCt.includes('application/json')) {
         let data = null;
         try { data = await response.clone().json(); } catch { /* not JSON after all */ }
-        meterFinal({ ...data?.x402, usage: data?.usage });
+        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

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/package.json

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