npm - openzoo - Versions diffs - 0.51.22 → 0.51.24 - Mend

openzoo 0.51.22 → 0.51.24

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

package/launcher/savings.html CHANGED Viewed

@@ -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{max-height:100vh;overflow-y:auto;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}.actions{display:flex;align-items:center;gap:8px}#deposit,.fund-button{font-size:12px;border:1px solid #ffffff60;border-radius:7px;padding:5px 10px}.fund-button{display:block;width:100%;text-align:left;margin:9px 0;overflow-wrap:anywhere;line-height:1.5}.fund-button span{display:block;font-size:11px;color:#ccc;user-select:text}[hidden]{display:none!important}#welcome p{font-size:12px;line-height:1.5;color:#ccc}#funding{border-top:1px solid #ffffff25;margin-top:12px}#funding p{font-size:12px;color:#ccc}
-</style></head><body><div class="pill"><header><span>OpenZoo · costs & savings</span><div class="actions"><button id="deposit">Deposit</button><button id="collapse" aria-label="Collapse savings" aria-expanded="true" title="Collapse">−</button><button id="close" aria-label="Close savings pill">×</button></div></header><main><section id="welcome" hidden><h3>Welcome to OpenZoo</h3><p>Pay per request from your OpenZoo wallet. Add funds before your first chat.</p><p>1. Choose card or crypto below.<br>2. Add funds to this wallet.<br>3. Once your balance appears, start chatting.</p></section><div id="totals"><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></div><section id="funding" hidden><h3>Add funds</h3><p id="fund-status" role="status">Loading your wallet…</p><button class="fund-button" id="copy-solana" disabled>Solana · USDC / KISS / LEOS / TOKEN<span id="solana-address"></span><span>Click to copy address</span></button><button class="fund-button" id="copy-evm" disabled>Base · USDC<span id="evm-address"></span><span>Click to copy address</span></button><button class="fund-button" id="card">Pay by card · Whop ↗</button><p>At checkout, paste your Solana address to link the purchase to this wallet. Your balance updates automatically after confirmation.</p><button class="fund-button" id="back">Back to savings</button><button class="fund-button" id="later" hidden>Set up later</button></section></main></div><script src="savings-renderer.js"></script></body></html>
+</style></head><body><div class="pill"><header><span>OpenZoo · costs & savings</span><div class="actions"><button id="deposit">Deposit</button><button id="collapse" aria-label="Collapse savings" aria-expanded="true" title="Collapse">−</button><button id="close" aria-label="Close savings pill">×</button></div></header><main><section id="welcome" hidden><h3>Welcome to OpenZoo</h3><p>Pay per request from your OpenZoo wallet. Add funds before your first chat.</p><p>1. Choose card or crypto below.<br>2. Add funds to this wallet.<br>3. Once your balance appears, start chatting.</p></section><div id="totals"><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></div><section id="funding" hidden><h3>Add funds</h3><p>Use native USDC or eat.ag cooked tokens. Unwrapped TOKEN, KISS and LEOS are not accepted. Cook first at eat.ag.</p><p id="fund-status" role="status">Loading your wallet…</p><button class="fund-button" id="copy-solana" disabled>Solana · native USDC / cooked KISS / LEOS / TOKEN<span id="solana-address"></span><span>Click to copy address</span></button><button class="fund-button" id="copy-evm" disabled>Base · USDC<span id="evm-address"></span><span>Click to copy address</span></button><button class="fund-button" id="card">Pay by card · Whop ↗</button><p>At checkout, paste your Solana address to link the purchase to this wallet. Your balance updates automatically after confirmation.</p><button class="fund-button" id="back">Back to savings</button><button class="fund-button" id="later" hidden>Set up later</button></section></main></div><script src="savings-renderer.js"></script></body></html>

package/lib/config.js CHANGED Viewed

@@ -38,12 +38,12 @@ export const config = {
  */
 export const FUNDING_ASSETS = [
   { symbol: 'USDC', mint: 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v' },
-  { symbol: 'KISS', mint: '7K2iAPzHddrghwBF7S7oA9qHr7dDR4QvFmdD1sZgRJxF' },
-  // LEOS is NINE decimals, and a LEGACY SPL mint rather than Token-2022 —
+  { symbol: 'KISS', mint: '9TVSmJj6UbZHMoqdYwjTwTdr6AfT9tjTzT27hvyZxsbX' },
+  // Cooked LEOS is NINE decimals and uses Token-2022 —
   // balance reads must not assume either, so nothing here hardcodes them;
   // decimals come off the mint on chain.
-  { symbol: 'LEOS', mint: '5xgsnby6P9zqGK71J7H4yJLxzqPvNbC7rDZxNzjHmj7e' },
-  { symbol: 'TOKEN', mint: 'EVULoNF4DeMBN4dGiZiDfpiiTfNZgoCvXWWgaV3epump' },
+  { symbol: 'LEOS', mint: '2tXdVsqrMYZhXGQSErTL5FmF2qCiL9tsQQ9pVafYmzf3' },
+  { symbol: 'TOKEN', mint: '4JSgUyRRgrNSK5pA3wQMp61vP5RRuLeynmPbRwMkvrex' },
 ];
 export const USDC_MINT = FUNDING_ASSETS[0].mint;
@@ -134,7 +134,7 @@ export function evmRpcFor(rail) {
  * also has an EVM address for the Base / Robinhood rails.
  */
 export function fundingLine(address) {
-  return `send a few cents of USDC (${USDC_MINT}) or KISS (${TOKEN_MINT}) on Solana to ${address}`;
+  return `Send native USDC or eat.ag cooked TOKEN, KISS, or LEOS on Solana to ${address}. Unwrapped project tokens are not accepted. Cook first: ${FUNDING_ASSETS.filter(a => a.symbol !== "USDC").map(a => `${a.symbol}: https://eat.ag/cook/${a.mint}`).join(" · ")}`;
 }
 /**

package/lib/pay.js CHANGED Viewed

@@ -258,6 +258,7 @@ export class PayClient {
   async buildPaymentFor(accept, onStage, challenge) {
     const rail = railOf(accept);
     if (rail === 'solana') {
+      if (['7K2iAPzHddrghwBF7S7oA9qHr7dDR4QvFmdD1sZgRJxF','EVULoNF4DeMBN4dGiZiDfpiiTfNZgoCvXWWgaV3epump','5xgsnby6P9zqGK71J7H4yJLxzqPvNbC7rDZxNzjHmj7e'].includes(accept.asset)) throw new Error('Unwrapped project tokens are no longer accepted. Cook your tokens at eat.ag first.');
       const need = BigInt(accept.maxAmountRequired);
       const bal = await cachedTokenBalance(this.connection, this.keypair.publicKey, accept.asset, { force: true }).catch(() => { throw new BalanceUnavailableError(); });
       // SHORT IS SHORT. The 402 quotes the raw native mint, so there is nothing
@@ -267,7 +268,7 @@ export class PayClient {
       if (bal.raw < need) {
         const usd = Number(accept?.extra?.billedUsd);
         const line = await withOnrampLink(
-          `Send USDC (or KISS/LEOS) on Solana to ${this.address}.`,
+          fundingLine(this.address),
           { solana: this.address, usd },
         );
         throw new UnderfundedError(accept, bal.ui, this.address, { line });

package/lib/proxy.js CHANGED Viewed

@@ -27,16 +27,27 @@ import { detectModelCommand, applyModelCommand, serveModelCommand, readOverride
  * Free read, but harnesses probe on every /model keystroke confirmation —
  * without a cache each probe is an upstream round trip.
  */
-let catalogIdsMemo = { at: 0, ids: [] };
+let catalogIdsMemo = { at: 0, ids: [], house: new Set() };
 async function catalogIdsCached(modelsUrl, headers) {
   if (Date.now() - catalogIdsMemo.at < 5 * 60_000 && catalogIdsMemo.ids.length) return catalogIdsMemo.ids;
   const r = await fetch(modelsUrl, { headers, signal: AbortSignal.timeout(8000) });
   if (!r.ok) throw new Error(`catalog ${r.status}`);
   const payload = await r.json();
-  const ids = quoteableRows(payload?.data).map((m) => m.id);
-  if (ids.length) catalogIdsMemo = { at: Date.now(), ids };
+  const rows = quoteableRows(payload?.data);
+  const ids = rows.map((m) => m.id);
+  // House doors (`owned_by: "openzoo"` — abliterated-model*, openzoo/auto)
+  // take plain `function` tools only; see responsestools.js.
+  const house = new Set(rows.filter((m) => m.owned_by === 'openzoo').map((m) => m.id));
+  if (ids.length) catalogIdsMemo = { at: Date.now(), ids, house };
   return ids;
 }
+/** Models we have SEEN reject Responses tool groups with `invalid_tools`,
+ *  so the next request flattens before paying instead of after. */
+const flattenLearned = new Set();
+function wantsFlatTools(model) {
+  const id = String(model || '');
+  return flattenLearned.has(id) || catalogIdsMemo.house.has(id) || /^abliterated-model/.test(id);
+}
 import { withNamespace } from './namespace.js';
 import { loadSessionSpend, saveSessionSpend, sessionSpendFile } from './session.js';
 import { creditBalance, quotedPrices } from './info.js';
@@ -44,6 +55,7 @@ import { priceHoldings } from './livestatus.js';
 import { receiptUsedCogs, receiptDirectUsd, pairActualBilled } from './racesettle.js';
 import { fetchHeaders } from './fetch.js';
 import { attachX402Proof } from './spendProof.js';
+import { flattenResponsesTools, restoreResponsesPayload, sseNamespaceRestorer, isInvalidToolsError } from './responsestools.js';
 /** Kill whatever is LISTEN on this port except this process.
  *  lsof first (macOS), then fuser, then /proc (Omarchy/Arch with neither).
@@ -224,7 +236,7 @@ async function readBody(req) {
  *
  *  Sniffing NEVER delays a byte: each chunk is written to the client first and
  *  only then scanned. */
-function relay(res, upstream, onReceipt) {
+function relay(res, upstream, onReceipt, rewriter = null) {
   const headers = {};
   upstream.headers.forEach((v, k) => {
     if (!['transfer-encoding', 'connection', 'content-encoding', 'content-length'].includes(k)) headers[k] = v;
@@ -237,13 +249,20 @@ function relay(res, upstream, onReceipt) {
     body.on('error', () => res.destroy());
     res.on('close', () => body.destroy());
     body.on('end', resolve);
-    if (!sse || typeof onReceipt !== 'function') { body.pipe(res); return; }
-    const observe = billingObserver(onReceipt);
+    if (!sse || (typeof onReceipt !== 'function' && !rewriter)) { body.pipe(res); return; }
+    const observe = typeof onReceipt === 'function' ? billingObserver(onReceipt) : () => {};
+    // A rewriter (Responses tool un-flattening) needs whole `data:` lines, so
+    // it re-chunks on newlines; the billing sniff reads the rewritten text,
+    // which leaves the trailing receipt comment untouched.
     body.on('data', (c) => {
-      res.write(c);
-      observe(c.toString('utf8'));
+      const text = rewriter ? rewriter.push(c.toString('utf8')) : c;
+      if (text.length) res.write(text);
+      observe(text.toString('utf8'));
+    });
+    body.on('end', () => {
+      if (rewriter) { const rest = rewriter.flush(); if (rest) { res.write(rest); observe(rest); } }
+      res.end();
     });
-    body.on('end', () => res.end());
   });
 }
@@ -769,9 +788,13 @@ export async function startProxy({ silent = false, requireToken = null, sessionM
     // The BODY IS NOT TOUCHED — the parse below is read-only, to learn the
     // client's streaming intent for the JSON→SSE compatibility path.
     const isChat = req.method === 'POST' && rawPath.includes('/chat/completions');
+    const isResponses = req.method === 'POST' && /\/responses$/.test(rawPath);
     const isPaidPost = req.method === 'POST'
       && /\/(chat\/completions|completions|messages|responses)$/.test(rawPath);
     let wantsStream = false;
+    // Flat-name → {namespace, name} for this request's Responses tools; set
+    // only when the body was flattened, so the reply can be un-flattened.
+    let nsMap = null;
     // RECEIPTS ARE OPT-OUT. `disableStats: true` in the body (or the
     // x-openzoo-disable-stats header) means this caller does not want the x402
     // block, so we neither attach our settle proof nor pass the gateway's
@@ -843,6 +866,23 @@ export async function startProxy({ silent = false, requireToken = null, sessionM
           }
         }
       } catch { /* not JSON */ }
+      // RESPONSES TOOL GROUPS vs HOUSE DOORS. Codex sends `namespace` tool
+      // groups + `web_search`; abliterated-model* rejects both with a PAID
+      // 400 `invalid_tools`. Flatten before the wire for models known to
+      // need it (catalog house doors, or learned from a prior 400 below).
+      if (isResponses) {
+        try {
+          const parsed = JSON.parse(bodyBuf.toString('utf8'));
+          if (parsed && wantsFlatTools(parsed.model)) {
+            const flat = flattenResponsesTools(parsed);
+            if (flat.map) {
+              nsMap = flat.map;
+              bodyBuf = Buffer.from(JSON.stringify(flat.body));
+              say(`   tools flattened for ${parsed.model}: ${flat.map.size} namespaced → function${flat.dropped.length ? `, dropped ${flat.dropped.join(', ')}` : ''}`);
+            }
+          }
+        } catch { /* not JSON */ }
+      }
     }
     // Retry of a body we answered seconds ago? Serve the cached completion —
@@ -958,6 +998,25 @@ export async function startProxy({ silent = false, requireToken = null, sessionM
           result = await client.fetch(url, init);
         }
       }
+      // A PAID 400 `invalid_tools` on a Responses body we did not flatten:
+      // this model is a function-tools-only door we had not learned yet.
+      // Flatten, remember it, and buy the turn once more — one billed miss
+      // instead of every turn for the rest of the session.
+      if (isResponses && !nsMap && result.response?.status === 400) {
+        let e400 = null;
+        try { e400 = await result.response.clone().json(); } catch { e400 = null; }
+        if (isInvalidToolsError(e400)) {
+          let flat = null;
+          try { flat = flattenResponsesTools(JSON.parse(String(init.body || '{}'))); } catch { flat = null; }
+          if (flat?.map) {
+            flattenLearned.add(outageKey(init));
+            nsMap = flat.map;
+            init = { ...init, body: JSON.stringify(flat.body) };
+            say(`   invalid_tools from ${outageKey(init)} — flattened ${flat.map.size} namespaced tools${flat.dropped.length ? `, dropped ${flat.dropped.join(', ')}` : ''}; retrying`);
+            result = await client.fetch(url, init);
+          }
+        }
+      }
       const { response, paid, receipt, accept } = result;
       if (paid && receipt) {
         if (receipt.ok && typeof receipt.billedUsd === 'number') {
@@ -1038,6 +1097,16 @@ export async function startProxy({ silent = false, requireToken = null, sessionM
           res.end(JSON.stringify(data));
           return;
         }
+        // Un-flatten a JSON Responses reply so Codex can route the calls.
+        if (nsMap && data?.object === 'response') {
+          restoreResponsesPayload(data, nsMap);
+          const h = { 'content-type': 'application/json' };
+          const settleHdr = response.headers.get('x-payment-response');
+          if (settleHdr) h['x-payment-response'] = settleHdr;
+          res.writeHead(200, h);
+          res.end(JSON.stringify(data));
+          return;
+        }
       }
       // 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
@@ -1085,7 +1154,7 @@ export async function startProxy({ silent = false, requireToken = null, sessionM
         paymentError(res, req, init, paid ? copy.status : 402, msg);
         return;
       }
-      await relay(res, response, meterStreamed);
+      await relay(res, response, meterStreamed, nsMap ? sseNamespaceRestorer(nsMap) : null);
     } catch (err) {
       if (err instanceof QuoteTooHighError) {
         log(err.message);

package/lib/responsestools.js ADDED Viewed

Binary file

package/lib/stripeOnramp.js CHANGED Viewed

@@ -101,8 +101,9 @@ export function whopFundBlurb(solana, evm) {
     'Funding options:',
     `Card: ${url}`,
     `At checkout, use this Solana wallet address to link your purchase: ${addr}`,
-    `Solana deposit wallet (USDC / LEOS / KISS / TOKEN): ${addr}`,
-    ...FUNDING_ASSETS.filter(a => ['LEOS', 'KISS', 'TOKEN'].includes(a.symbol)).map(a => `${a.symbol} mint (CA): ${a.mint}`),
+    `Solana deposit wallet (native USDC / cooked LEOS / cooked KISS / cooked TOKEN): ${addr}`,
+    ...FUNDING_ASSETS.filter(a => ['LEOS', 'KISS', 'TOKEN'].includes(a.symbol)).map(a => `Cooked ${a.symbol} mint (CA): ${a.mint} — https://eat.ag/cook/${a.mint}`),
+    'Cook TOKEN, KISS, or LEOS at eat.ag first. Unwrapped versions are not accepted. USDC stays native.',
     'Send funds to your deposit wallet, not the mint address.',
     ...(base ? [`Base (USDC): ${base}`] : []),
     'Your balance refreshes automatically once the payment is confirmed.',

package/package.json CHANGED Viewed

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