openzoo 0.51.8 → 0.51.10

package/launcher/README.md

@@ -0,0 +1,7 @@
+# OpenZoo Launcher
+
+One installer for ChatGPT. Setup starts automatically when you open the launcher, with a floating savings window showing wallet balance, spend, and savings. Node and npm are bundled; no global runtime or terminal is required. The launcher checks npm's stable `openzoo` release on each launch, installs newer versions into its per-user application data directory, and falls back to the bundled or last successfully installed CLI when offline. It never downgrades. The selected CLI downloads the current chat app if missing and preserves existing installations.
+
+Build natively with `npm ci`, `npm run prepare:bundle`, then `npm run dist`. Preparation resolves current Node LTS from nodejs.org, checks the archive SHA-256, and bundles this checkout's OpenZoo package. Push a `launcher-v1.0.0` style tag to publish six native installers through Actions; manual dispatch builds downloadable workflow artifacts without publishing a release. macOS uses existing Apple signing/notarization secrets. Windows currently ships unsigned.
+
+Downloaded CLI updates execute as the current user, just like installing OpenZoo from npm. Updates are staged and promoted after a CLI smoke check. Launcher/Electron updates require downloading a newer installer. Configuration, wallets, downloaded apps and background proxy processes belong to OpenZoo and survive closing/uninstalling the launcher.

package/launcher/main.cjs

@@ -0,0 +1,34 @@
+const { app, BrowserWindow, ipcMain } = require('electron');
+const path = require('node:path');
+const { resolveCLI, run } = require('./runtime.cjs');
+const { showSavings } = require('./savings.cjs');
+let window, busy = false;
+if (!app.requestSingleInstanceLock({ savingsReady: process.env.OPENZOO_SAVINGS_READY })) app.quit();
+else {
+  app.on('second-instance', (_event, argv, _cwd, data) => { if (argv.includes('--savings-only')) {
+    const pill = showSavings();
+    const ready = () => { if (data?.savingsReady) { try { require('node:fs').writeFileSync(data.savingsReady, 'ready'); } catch {} } };
+    if (pill.webContents.isLoading()) pill.webContents.once('did-finish-load', ready); else ready();
+  } else { window?.show(); window?.focus(); } });
+  app.whenReady().then(() => {
+    if (process.argv.includes('--savings-only')) { showSavings(); return; }
+    window = new BrowserWindow({ width: 740, height: 660, backgroundColor: '#101110', webPreferences: { preload: path.join(__dirname, 'preload.cjs'), contextIsolation: true, nodeIntegration: false, sandbox: true } });
+    window.webContents.setWindowOpenHandler(() => ({ action: 'deny' }));
+    window.webContents.on('will-navigate', event => event.preventDefault());
+    window.loadFile(path.join(__dirname, 'index.html'));
+    ipcMain.handle('launch', async (event, command) => {
+      if (event.sender !== window.webContents || command !== 'chatgpt' || busy) throw new Error('Launch unavailable');
+      busy = true;
+      const log = message => { if (!window.isDestroyed()) window.webContents.send('log', message); };
+      try {
+        const bundle = app.isPackaged ? path.join(process.resourcesPath, 'bundle') : path.join(__dirname, 'bundle');
+        const { node, cli } = await resolveCLI(bundle, app.getPath('userData'), log);
+        showSavings();
+        await run(node, [cli, 'chatgpt', '--no-pill'], log);
+        log('\nLaunched. You can close this window.\n');
+      } catch (e) { log(`\n${e.message}\n`); throw e; }
+      finally { busy = false; }
+    });
+  });
+  app.on('window-all-closed', () => app.quit());
+}

package/launcher/package.json

@@ -0,0 +1,56 @@
+{
+  "name": "openzoo-launcher",
+  "version": "1.1.0",
+  "private": true,
+  "main": "main.cjs",
+  "scripts": {
+    "prepare:bundle": "node prepare.mjs",
+    "dist": "electron-builder",
+    "test": "node --test test.cjs"
+  },
+  "devDependencies": {
+    "electron": "44.3.0",
+    "electron-builder": "26.15.3"
+  },
+  "build": {
+    "appId": "fun.openzoo.launcher",
+    "productName": "OpenZoo Launcher",
+    "files": [
+      "main.cjs",
+      "runtime.cjs",
+      "preload.cjs",
+      "index.html",
+      "savings.cjs",
+      "savings-preload.cjs",
+      "savings.html",
+      "savings-renderer.js"
+    ],
+    "extraResources": [
+      {
+        "from": "bundle",
+        "to": "bundle"
+      },
+      {
+        "from": "openzoo-overlay.json",
+        "to": "openzoo-overlay.json"
+      }
+    ],
+    "artifactName": "OpenZoo-Launcher-${version}-${os}-${arch}.${ext}",
+    "mac": {
+      "target": "dmg",
+      "hardenedRuntime": true
+    },
+    "win": {
+      "target": "nsis"
+    },
+    "nsis": {
+      "oneClick": false,
+      "perMachine": false,
+      "allowToChangeInstallationDirectory": true
+    },
+    "linux": {
+      "target": "AppImage",
+      "category": "Network"
+    }
+  }
+}

package/launcher/runtime.cjs

@@ -0,0 +1,59 @@
+const path = require('node:path');
+const fs = require('node:fs/promises');
+const { spawn } = require('node:child_process');
+const stable = v => /^\d+\.\d+\.\d+$/.test(v);
+const newer = (a, b) => {
+  if (!stable(a) || !stable(b)) return false;
+  const aa = a.split('.').map(Number), bb = b.split('.').map(Number);
+  for (let i = 0; i < 3; i++) if (aa[i] !== bb[i]) return aa[i] > bb[i];
+  return false;
+};
+function environment(node) {
+  const env = { ...process.env, PATH: `${path.dirname(node)}${path.delimiter}${process.env.PATH || ''}` };
+  delete env.ELECTRON_RUN_AS_NODE;
+  delete env.NODE_OPTIONS;
+  return env;
+}
+function run(node, args, log, timeout = 600000) {
+  return new Promise((resolve, reject) => {
+    const child = spawn(node, args, { env: environment(node), windowsHide: true });
+    const timer = setTimeout(() => { child.kill(); reject(new Error('Operation timed out. Please try again.')); }, timeout);
+    child.stdout.on('data', b => log(b.toString()));
+    child.stderr.on('data', b => log(b.toString()));
+    child.on('error', e => { clearTimeout(timer); reject(e); });
+    child.on('exit', code => { clearTimeout(timer); code === 0 ? resolve() : reject(new Error(`OpenZoo exited with code ${code}`)); });
+  });
+}
+async function resolveCLI(bundle, userData, log) {
+  const node = path.join(bundle, 'runtime', process.platform === 'win32' ? 'node.exe' : 'bin/node');
+  const npm = path.join(bundle, 'runtime', process.platform === 'win32' ? 'node_modules/npm/bin/npm-cli.js' : 'lib/node_modules/npm/bin/npm-cli.js');
+  const pkg = dir => path.join(dir, 'node_modules/openzoo');
+  let selected = path.join(bundle, 'sidecar');
+  let version = JSON.parse(await fs.readFile(path.join(pkg(selected), 'package.json'), 'utf8')).version;
+  const updates = path.join(userData, 'versions');
+  await fs.mkdir(updates, { recursive: true });
+  for (const v of await fs.readdir(updates)) {
+    if (newer(v, version)) {
+      try { if (JSON.parse(await fs.readFile(path.join(pkg(path.join(updates, v)), 'package.json'), 'utf8')).version === v) { selected = path.join(updates, v); version = v; } } catch {}
+    }
+  }
+  try {
+    log('Checking for the latest OpenZoo…\n');
+    const response = await fetch('https://registry.npmjs.org/openzoo/latest', { signal: AbortSignal.timeout(10000) });
+    if (!response.ok) throw new Error(`Registry returned ${response.status}`);
+    const latest = (await response.json()).version;
+    if (newer(latest, version)) {
+      const stage = await fs.mkdtemp(path.join(updates, '.install-'));
+      try {
+        await run(node, [npm, 'install', '--prefix', stage, '--registry=https://registry.npmjs.org', '--omit=dev', '--no-audit', '--no-fund', `openzoo@${latest}`], log);
+        await run(node, [path.join(stage, 'node_modules/dugite/script/download-git.js')], log);
+        await run(node, [path.join(pkg(stage), 'bin/openzoo.js'), '--help'], () => {}, 30000);
+        await fs.rename(stage, path.join(updates, latest));
+        selected = path.join(updates, latest); version = latest;
+      } finally { await fs.rm(stage, { recursive: true, force: true }); }
+    }
+  } catch (e) { log(`Update unavailable (${e.message}). Using installed OpenZoo ${version}.\n`); }
+  log(`Starting OpenZoo ${version}…\n`);
+  return { node, cli: path.join(pkg(selected), 'bin/openzoo.js') };
+}
+module.exports = { newer, environment, resolveCLI, run };

package/launcher/savings-preload.cjs

@@ -0,0 +1,5 @@
+const { contextBridge, ipcRenderer } = require('electron');
+contextBridge.exposeInMainWorld('savings', {
+  listen: fn => ipcRenderer.on('savings', (_event, value) => fn(value)),
+  close: () => ipcRenderer.send('close-savings'),
+});

package/launcher/savings-renderer.js

@@ -0,0 +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.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 ? (d.billing?.calls > 0 ? 'Final charges · since connection started' : 'Waiting for final billing · balance is live') : 'Reconnecting · showing last known amounts';
+});
+document.getElementById('close').addEventListener('click',()=>window.savings.close());

package/launcher/savings.cjs

@@ -0,0 +1,41 @@
+const { BrowserWindow, screen, ipcMain } = require('electron');
+const path = require('node:path');
+let pill;
+function showSavings(port = Number(process.env.OPENZOO_SAVINGS_PORT) || 8402) {
+  if (pill && !pill.isDestroyed()) { pill.show(); return pill; }
+  const { x, y, width, height } = screen.getPrimaryDisplay().workArea;
+  pill = new BrowserWindow({ width: 420, height: 270, x: x + width - 440, y: y + height - 290,
+    frame: false, transparent: true, alwaysOnTop: true, skipTaskbar: true, resizable: false,
+    webPreferences: { preload: path.join(__dirname, 'savings-preload.cjs'), contextIsolation: true, sandbox: true, nodeIntegration: false } });
+  pill.setAlwaysOnTop(true, 'floating');
+  pill.setVisibleOnAllWorkspaces(true, { visibleOnFullScreen: true });
+  pill.webContents.setWindowOpenHandler(() => ({ action: 'deny' }));
+  pill.webContents.on('will-navigate', e => e.preventDefault());
+  pill.loadFile(path.join(__dirname, 'savings.html'));
+  const window = pill;
+  let busy = false, last = null;
+  const poll = async () => {
+    if (busy || window.isDestroyed()) return;
+    busy = true;
+    try {
+      const r = await fetch(`http://127.0.0.1:${port}/v1/info`, { signal: AbortSignal.timeout(2500) });
+      const d = await r.json();
+      if (!r.ok || d.youAreTalkingTo !== 'openzoo proxy') throw Error('Unavailable');
+      last = d;
+      if (!window.isDestroyed()) window.webContents.send('savings', { ...d, online: true });
+    } catch { if (!window.isDestroyed()) window.webContents.send('savings', { ...last, online: false }); }
+    finally { busy = false; }
+  };
+  window.webContents.on('did-finish-load', () => {
+    poll();
+    if (process.env.OPENZOO_SAVINGS_READY) {
+      try { require('node:fs').writeFileSync(process.env.OPENZOO_SAVINGS_READY, 'ready'); } catch {}
+    }
+  });
+  const timer = setInterval(poll, 3000);
+  const close = event => { if (event.sender === window.webContents) window.close(); };
+  ipcMain.on('close-savings', close);
+  window.on('closed', () => { clearInterval(timer); ipcMain.removeListener('close-savings', close); if (pill === window) pill = null; });
+  return pill;
+}
+module.exports = { showSavings };

package/launcher/savings.html

@@ -0,0 +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>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,30 @@
+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 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) };
+}
+
+// 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 });
+        }
+      } catch { /* Not a billing event. */ }
+    }
+    if (pending.length > 2_000_000) pending = '';
+  };
+}

package/lib/chatgpt-spend.js

@@ -163,21 +163,41 @@ export function nativeSavingsLauncher({ platform = process.platform, home = os.h
   return null;
 }
 
-export async function startChatGptSpend({ profile, proxyPort, spawnImpl = spawn } = {}) {
-  const native = nativeSavingsLauncher();
-  if (native && proxyPort === 8402) {
-    const child = spawnImpl(native, ['--savings-only'], { detached: true, stdio: 'ignore' });
-    await new Promise((resolve, reject) => { child.once('spawn', resolve); child.once('error', reject); });
-    child.unref();
-    return;
-  }
-  fs.mkdirSync(profile, { recursive: true });
-  const fd = fs.openSync(path.join(profile, 'openzoo-savings.log'), 'a', 0o600);
+export async function startChatGptSpend({ profile, proxyPort = 8402, spawnImpl = spawn } = {}) {
+  const app = fileURLToPath(new URL('../launcher/', import.meta.url));
+  const electron = path.join(app, 'node_modules/electron/dist', process.platform === 'darwin'
+    ? 'Electron.app/Contents/MacOS/Electron' : process.platform === 'win32' ? 'electron.exe' : 'electron');
+  const env = { ...process.env, OPENZOO_SAVINGS_PORT: String(proxyPort) };
+  delete env.ELECTRON_RUN_AS_NODE;
+  const readyDir = fs.mkdtempSync(path.join(os.tmpdir(), 'openzoo-pill-'));
+  env.OPENZOO_SAVINGS_READY = path.join(readyDir, 'ready');
+  const logDir = profile || path.join(os.homedir(), '.openzoo');
+  fs.mkdirSync(logDir, { recursive: true });
+  const logPath = path.join(logDir, 'openzoo-savings.log');
+  const fd = fs.openSync(logPath, 'a', 0o600);
+  let child, failure;
   try {
-    const child = spawnImpl(process.execPath, [fileURLToPath(import.meta.url), '--watch', profile, String(proxyPort)], { detached: true, stdio: ['ignore', fd, fd] });
-    await new Promise((resolve, reject) => { child.once('spawn', resolve); child.once('error', reject); });
+    if (fs.existsSync(electron)) {
+      child = spawnImpl(electron, [app, '--savings-only'], { detached: true, stdio: ['ignore', fd, fd], env });
+    } else {
+      // npm caches the standalone display runtime. The CLI ships the display itself.
+      // No ChatGPT debugging port or separate OpenZoo installer is required.
+      const args = ['exec', '--yes', '--package=electron@44.3.0', '--', 'electron', app, '--savings-only'];
+      const npmScript = process.env.npm_execpath;
+      child = npmScript && fs.existsSync(npmScript)
+        ? spawnImpl(process.execPath, [npmScript, ...args], { detached: true, stdio: ['ignore', fd, fd], env })
+        : spawnImpl(process.platform === 'win32' ? 'npm.cmd' : 'npm', args, { detached: true, stdio: ['ignore', fd, fd], env, shell: process.platform === 'win32' });
+    }
+    child.once('error', error => { failure = error; });
+    child.once('exit', code => { if (code) failure = new Error(`Display exited (${code})`); });
     child.unref();
-  } finally { fs.closeSync(fd); }
+    const deadline = Date.now() + 120000;
+    while (!fs.existsSync(env.OPENZOO_SAVINGS_READY)) {
+      if (failure) throw failure;
+      if (Date.now() > deadline) throw new Error(`Display did not open. See ${logPath}`);
+      await new Promise(resolve => setTimeout(resolve, 200));
+    }
+  } finally { fs.closeSync(fd); fs.rmSync(readyDir, { recursive: true, force: true }); }
 }
 
 /** One watcher per profile, including concurrent launcher invocations. */

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,6 +424,8 @@ 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;
   const rememberSpend = () => {
     saveSessionSpend({ spentUsd: sessionSpent, cogsUsd: sessionCogs, directUsd: sessionDirect, paidCalls });
   };
@@ -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: "verified calls since proxy startup" },
+          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 });
         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/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.8",
+  "version": "0.51.10",
   "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",
@@ -10,7 +10,14 @@
   "files": [
     "bin",
     "lib",
-    "README.md"
+    "README.md",
+    "launcher/main.cjs",
+    "launcher/runtime.cjs",
+    "launcher/package.json",
+    "launcher/savings.cjs",
+    "launcher/savings.html",
+    "launcher/savings-preload.cjs",
+    "launcher/savings-renderer.js"
   ],
   "engines": {
     "node": ">=18"