openzoo 0.49.3 → 0.49.5

package/README.md

@@ -187,7 +187,7 @@ All three rails have settled real payments (2026-08-14):
 
 | rail | network | status |
 |---|---|---|
-| **Solana** (default) | `solana:5eykt…` | **live** — Token-2022 `TransferChecked`, partial-signed, gateway pays fees. Settles daily; tested end-to-end against the production 402. Settlement uses a wrapped settlement mint as internal plumbing; you only ever hold and send USDC or TOKEN. |
+| **Solana** (default) | `solana:5eykt…` | **live** — Token-2022 payment `TransferChecked`, partial-signed, gateway pays fees. Settles daily; tested end-to-end against the production 402. Settlement uses a wrapped mint as internal plumbing; you only ever hold and send USDC or TOKEN. Funding wrap is a 9-account ix (program pulls the deposit; old 5-account wrap is rejected `0x6a`). |
 | Base | `eip155:8453` | **live** — standard x402 EIP-3009 `transferWithAuthorization` against native USDC, batched settle through the facilitator. Fund the wallet's EVM address with USDC on Base; nothing is converted. |
 | Robinhood Chain | `eip155:4663` | **live** — EIP-3009, batched settle through the facilitator. Hold the plain token a row is quoted in (USDG, or the ODDBALLER / IOU / ROBINHOODS memecoins) and the shim converts exactly enough at payment time, automatically — two small on-chain steps paid from the wallet's own RH ETH. No gas? The error says exactly how much ETH to send and where. Default rail selection skips this chain unless `OPENZOO_ENABLE_RH=1`; `OPENZOO_RAIL=robinhood` forces it outright. |
 

package/lib/grokui.mjs

@@ -431,6 +431,7 @@ function loadThreads() {
       if (t.status === 'thinking') {
         t.status = 'idle';
         t.liveStatus = '';
+        t.liveRace = null;
       }
       if (Array.isArray(t.history)) {
         for (const h of t.history) {
@@ -1058,6 +1059,7 @@ const SLASH_COMMANDS = [
   { name: '/models', args: '[filter]', help: 'search the ~435 served models' },
   { name: '/tier', args: 'cheap|medium|expensive|grok 4.6', help: 'how much to spend per turn when no model is pinned' },
   { name: '/race', args: '<n> | <k> <n>', help: 'launch n models; judge the first k back (k=1 = fastest wins)' },
+  { name: '/sitrep', args: '', help: 'session sitrep (drawer)' },
   { name: '/compact', args: '', help: 'summarise history to shrink context' },
   { name: '/clear', args: '', help: 'wipe this thread’s history' },
   { name: '/undo', args: '', help: 'drop the last exchange' },
@@ -1150,6 +1152,7 @@ async function handleSlash(task, t) {
   const cmd = m[1].toLowerCase();
   const arg = m[2].trim();
 
+  if (cmd === 'sitrep') return null; // drawer-only — never a transcript line
   if (cmd === 'help') {
     return 'Commands:\n'
       + SLASH_COMMANDS.map((c) => `  ${(c.name + ' ' + c.args).padEnd(26)} ${c.help}`).join('\n')
@@ -1448,6 +1451,7 @@ setInterval(() => {
     } else {
       t.status = 'idle';
       t.liveStatus = '';
+      t.liveRace = null;
       unlockWorktree(t);
     }
     dirty = true;
@@ -2448,11 +2452,12 @@ async function mcpDirective(url, tool, args) {
 
 // onEvent (optional) gets live progress for whoever's actually watching this
 // call: {type:'start',name,color} when a bot begins its turn, {type:'status',
-// detail} while paying / waiting / racing / walking tools, {type:'delta',name,
-// color,delta} per streamed token (replace:true swaps the bubble once),
-// {type:'final',name,color,text} once its full reply (or directive ack) is
-// settled. Background turns go through kickTurn → emitToThread, which is a
-// no-op if nobody has the thread open.
+// detail} while paying / waiting / racing / walking tools, {type:'race',race}
+// for the spectator grid (one cell per launched model + a judging beat),
+// {type:'delta',name,color,delta} per streamed token (replace:true swaps the
+// bubble once), {type:'final',name,color,text} once its full reply (or
+// directive ack) is settled. Background turns go through kickTurn →
+// emitToThread, which is a no-op if nobody has the thread open.
 async function runTurn(threadId, userText, onEvent, images) {
   const t = threads.get(threadId);
   if (!t) return;
@@ -2469,7 +2474,8 @@ async function runTurn(threadId, userText, onEvent, images) {
   const paint = (ev) => {
     if (!stillMine()) return;
     if (ev.type === 'status' && ev.detail && t.status === 'thinking') t.liveStatus = ev.detail;
-    if (ev.type === 'delta' || ev.type === 'status' || ev.type === 'start') t.lastDeltaAt = Date.now();
+    if (ev.type === 'race' && ev.race && t.status === 'thinking') t.liveRace = ev.race;
+    if (ev.type === 'delta' || ev.type === 'status' || ev.type === 'start' || ev.type === 'race') t.lastDeltaAt = Date.now();
     onEvent?.(ev);
   };
   t.history.push(images && images.length ? { who: 'user', text: userText, images } : { who: 'user', text: userText });
@@ -2483,6 +2489,7 @@ async function runTurn(threadId, userText, onEvent, images) {
   lockWorktree(t);
   const raceN = Math.min(Number(t.race) || 0, 4);
   const raceNeed = Math.min(Math.max(Number(t.raceNeed) || 1, 1), raceN || 1);
+  t.liveRace = null;
   t.liveStatus = (!t.model && raceN >= 2) ? formatRaceStatus(0, raceNeed) : 'waiting on model…';
   let chained = false;
   let parked = false;
@@ -2604,6 +2611,7 @@ async function runTurn(threadId, userText, onEvent, images) {
       return (await brainRace(callMsgs, emit, t.contextId, models, need, undefined, emitStatus, {
         signal: turnAbort.signal,
         onArrivals: (arr) => { t.lastRaceFail = summarizeRaceFailures(arr); },
+        onRace: (snap) => paint({ type: 'race', name: t.name, color: t.color, race: snap }),
         tier: t.tier || 'medium',
       })).trim();
     }
@@ -2757,6 +2765,7 @@ async function runTurn(threadId, userText, onEvent, images) {
       } else if (!t.pendingRun) {
         t.status = 'idle';
         t.liveStatus = '';
+        t.liveRace = null;
         unlockWorktree(t);
       }
     }
@@ -3031,12 +3040,20 @@ const APP_HTML = `<!doctype html>
      whose entire premise is that the box pays for itself. Click-to-copy is a
      shortcut; the address is selectable so Cmd/Ctrl+C still works if copy
      fails. */
-  #walletOverlay { position: fixed; inset: 0; background: rgba(0,0,0,.66); z-index: 1200;
+  #walletOverlay, #sitrepOverlay { position: fixed; inset: 0; background: rgba(0,0,0,.66); z-index: 1200;
                    display: none; align-items: center; justify-content: center; padding: 24px; }
-  #walletOverlay.show { display: flex; }
-  #walletBox { width: 100%; max-width: 560px; max-height: 82vh; overflow-y: auto; background: #111113;
+  #walletOverlay.show, #sitrepOverlay.show { display: flex; }
+  #walletBox, #sitrepBox { width: 100%; max-width: 560px; max-height: 82vh; overflow-y: auto; background: #111113;
                border: 1px solid #2c2c2e; border-radius: 16px; padding: 20px 22px; }
-  #walletBox h3 { margin: 0 0 2px; font-size: 15px; font-weight: 600; }
+  #walletBox h3, #sitrepBox h3 { margin: 0 0 2px; font-size: 15px; font-weight: 600; }
+  #sitrepBox { max-width: 420px; }
+  .srow { display: flex; justify-content: space-between; align-items: baseline; gap: 14px;
+          padding: 8px 0; border-bottom: 1px solid #1c1c1e; }
+  .srow:last-child { border-bottom: 0; }
+  .slab { color: #6f7080; font-size: 11px; letter-spacing: .06em; text-transform: uppercase; flex: 0 0 auto; }
+  .sval { color: #ececec; font-size: 13px; text-align: right; word-break: break-word; min-width: 0; }
+  .sval.hlime { color: #b8f240; }
+  .sval.hember { color: #f28c4d; }
   .wsub { color: #8e8e93; font-size: 12px; margin-bottom: 16px; }
   .wrow { border: 1px solid #1c1c1e; border-radius: 12px; padding: 10px 12px; margin-bottom: 10px;
           display: flex; align-items: center; gap: 10px; cursor: pointer; }
@@ -3121,7 +3138,7 @@ const APP_HTML = `<!doctype html>
                 color: #f0c9a8; font-size: 10.5px; line-height: 1.45; }
   #hud .hhint.show { display: block; }
   #hud .hhint b { color: #f28c4d; font-weight: 600; }
-  #sidebar, #main, #walletOverlay, #composeOverlay,
+  #sidebar, #main, #walletOverlay, #sitrepOverlay, #composeOverlay,
   #inp, #search, #composeInp, .bubble, .md-pre, .runoutput, .runcmd {
     -webkit-app-region: no-drag; }
   #log { flex: 1; min-width: 0; overflow-y: auto; overflow-x: hidden; padding: 20px 24px 12px;
@@ -3223,6 +3240,46 @@ const APP_HTML = `<!doctype html>
   @keyframes blink { 0%, 80%, 100% { opacity: .25; } 40% { opacity: 1; } }
   .tstatus { color: #8e8e93; font-size: 13px; margin-left: 6px; }
   .ttrail { display: block; color: #8e8e93; font-size: 12.5px; margin-top: 8px; }
+  /* Race spectator board. Lives in the transcript, never over the header
+     dials / wallet / cost HUD. 2×2 for four, a row for two, wrap otherwise. */
+  .row.bot:has(.raceboard) { max-width: 92%; }
+  .bubble.raceboard { padding: 10px 11px; background: #1a1a1d; }
+  .racewrap { display: flex; flex-direction: column; gap: 8px; min-width: 0; }
+  .racecaption { color: #6f7080; font-size: 11px; letter-spacing: .04em; text-transform: uppercase; }
+  .racegrid { display: grid; gap: 7px; grid-template-columns: 1fr 1fr; }
+  .racegrid.n1 { grid-template-columns: 1fr; }
+  .racegrid.n2 { grid-template-columns: 1fr 1fr; }
+  .racegrid.n3 { grid-template-columns: 1fr 1fr; }
+  @media (min-width: 720px) { .racegrid.n3 { grid-template-columns: 1fr 1fr 1fr; } }
+  .racecell { border: 1px solid #2c2c32; border-radius: 12px; padding: 8px 9px 7px;
+              background: #141416; min-width: 0; min-height: 0; transition: opacity .18s ease, border-color .18s ease; }
+  .racecell.streaming { border-color: #3d3d4a; }
+  .racecell.back { border-color: #2a3a18; }
+  .racecell.failed { border-color: #3a2424; }
+  .racecell.abandoned { opacity: .42; }
+  .racecell.winner { border-color: #b8f240; box-shadow: 0 0 0 1px rgba(184,242,64,.28); }
+  .racehead { display: flex; align-items: center; gap: 6px; margin-bottom: 6px; min-width: 0; }
+  .racename { font-size: 12px; font-weight: 600; color: #ececec; white-space: nowrap;
+              overflow: hidden; text-overflow: ellipsis; min-width: 0; }
+  .racechip { flex: 0 0 auto; font-size: 10px; letter-spacing: .03em; color: #8e8e93;
+              border: 1px solid #2c2c32; border-radius: 999px; padding: 1px 7px; }
+  .racecell.streaming .racechip { color: #b8f240; border-color: #3a4a18; }
+  .racecell.back .racechip { color: #b8f240; border-color: #2a3a18; }
+  .racecell.failed .racechip { color: #f28c4d; border-color: #5a3020; }
+  .racecell.abandoned .racechip { color: #6f7080; }
+  .racecell.winner .racechip { color: #0b0b0d; background: #b8f240; border-color: #b8f240; }
+  .raceprev { font: 11.5px/1.35 ui-monospace, SFMono-Regular, Menlo, monospace; color: #9a9aa6;
+              white-space: pre-wrap; word-break: break-word; max-height: 8.2em; overflow: hidden; }
+  .racefail { display: inline-block; margin-top: 2px; font-size: 11px; color: #f28c4d; letter-spacing: .03em; }
+  .racejudge { border: 1px dashed #3a4a18; border-radius: 12px; padding: 9px 11px;
+               background: rgba(184,242,64,.05); color: #c8c8b8; }
+  .racejudge.won { border-style: solid; border-color: #b8f240; }
+  .racejudge-lab { font-size: 10px; letter-spacing: .06em; text-transform: uppercase; color: #b8f240;
+                   margin-bottom: 3px; }
+  .racejudge-msg { font-size: 13px; color: #ececec; }
+  @media (prefers-reduced-motion: reduce) {
+    .racecell { transition: none; }
+  }
   #bar { padding: 10px 16px 18px; position: relative; }
   #row-input { display: flex; align-items: center; gap: 8px; }
   #plusMenu { position: absolute; bottom: 62px; left: 16px; background: #1c1c1e; border-radius: 14px;
@@ -3354,6 +3411,13 @@ const APP_HTML = `<!doctype html>
       </div>
     </div>
   </div>
+  <div id="sitrepOverlay" data-component="sitrep-drawer">
+    <div id="sitrepBox">
+      <h3>Sitrep</h3>
+      <div class="wsub">This thread and this session. No keys.</div>
+      <div id="sitrepBody">loading…</div>
+    </div>
+  </div>
   <div id="main">
     <div id="chatHeader">
       <div id="chatHeaderId"></div>
@@ -3373,17 +3437,17 @@ const APP_HTML = `<!doctype html>
       </select>
       <select class="dial" id="raceSel" data-component="model-race" aria-label="Race models"
               title="Ask N models from the tier at once, drawn at random — fastest real answer wins. You pay for every entrant.">
-        <option value="0" selected>1 model</option>
+        <option value="0" selected>1 model  0%</option>
         <optgroup label="first back wins">
-          <option value="2">race 2</option>
-          <option value="3">race 3</option>
-          <option value="4">race 4</option>
+          <option value="2">race 2  −50%</option>
+          <option value="3">race 3  −67%</option>
+          <option value="4">race 4  −75%</option>
         </optgroup>
         <optgroup label="judge the first k back">
-          <option value="2 3">best 2 of 3</option>
-          <option value="2 4">best 2 of 4</option>
-          <option value="3 4">best 3 of 4</option>
-          <option value="4 4">best 4 of 4</option>
+          <option value="2 3">best 2 of 3  −67%</option>
+          <option value="2 4">best 2 of 4  −75%</option>
+          <option value="3 4">best 3 of 4  −75%</option>
+          <option value="4 4">best 4 of 4  −75%</option>
         </optgroup>
       </select>
       <button class="dial" id="walletBtn" data-component="wallet-open"
@@ -3411,6 +3475,10 @@ const APP_HTML = `<!doctype html>
           <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M21.44 11.05l-9.19 9.19a5 5 0 0 1-7.07-7.07l9.19-9.19a3.5 3.5 0 0 1 4.95 4.95l-9.2 9.19a2 2 0 0 1-2.83-2.83l8.49-8.48"/></svg>
           <span>Attach files</span>
         </div>
+        <div class="pop-item" id="sitrepBtn">
+          <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="5" y="3" width="14" height="18" rx="2"/><line x1="8" y1="8" x2="16" y2="8"/><line x1="8" y1="12" x2="16" y2="12"/><line x1="8" y1="16" x2="13" y2="16"/></svg>
+          <span>Sitrep</span>
+        </div>
       </div>
       <input id="fileInp" type="file" multiple style="position:absolute;width:1px;height:1px;opacity:0;pointer-events:none;">
       <div id="attachChips"></div>
@@ -4068,8 +4136,73 @@ const APP_HTML = `<!doctype html>
   walletOverlay.addEventListener('click', (e) => {
     if (e.target === walletOverlay) walletOverlay.classList.remove('show');
   });
+  const sitrepOverlay = document.getElementById('sitrepOverlay');
+  const sitrepBody = document.getElementById('sitrepBody');
+  function raceCutPct(y) {
+    const n = Math.max(1, Number(y) || 1);
+    return Math.round((1 - 1 / n) * 100);
+  }
+  function raceChoiceLabel(y, need) {
+    const n = Math.max(1, Number(y) || 1);
+    const k = Math.max(1, Math.min(Number(need) || 1, n));
+    const cut = raceCutPct(n);
+    const cutTxt = cut === 0 ? '0%' : ('−' + cut + '%');
+    if (n < 2) return '1 model  ' + cutTxt;
+    if (k > 1) return 'best ' + k + ' of ' + n + '  ' + cutTxt;
+    return 'race ' + n + '  ' + cutTxt;
+  }
+  function sitrepRow(lab, val, cls) {
+    return '<div class="srow"><span class="slab">' + escapeHtml(lab) + '</span><span class="sval'
+      + (cls ? (' ' + cls) : '') + '">' + escapeHtml(val) + '</span></div>';
+  }
+  async function openSitrep() {
+    sitrepOverlay.classList.add('show');
+    sitrepBody.textContent = 'loading…';
+    const t = knownThreads.find((x) => x.id === activeId) || {};
+    let full = null;
+    try { if (activeId) full = await (await fetch(API + '/threads/' + activeId)).json(); } catch (e) { full = null; }
+    let you = {};
+    try { you = await (await fetch(API + '/hud-summary')).json(); } catch (e) { you = {}; }
+    const y = Number(t.race) || 0;
+    const need = Number(t.raceNeed) || 1;
+    const raceY = y >= 2 ? y : 1;
+    const spent = Number(you.spentUsd) || 0;
+    const cogs = Number(you.cogsUsd) || 0;
+    const direct = Number(you.directUsd) || 0;
+    const mult = spent > 0 ? direct / spent : null;
+    const saved = mult == null ? '—'
+      : ((mult >= 100 ? Math.round(mult) : mult.toFixed(mult >= 10 ? 1 : 2)) + 'x');
+    const savedCls = mult == null ? '' : (mult >= 1 ? 'hlime' : 'hember');
+    const thinking = (full && full.status === 'thinking') || t.status === 'thinking';
+    const race = (full && full.liveRace) || null;
+    let flight = 'idle';
+    if (thinking && race && race.phase === 'judging') flight = 'classifier judging';
+    else if (thinking && race && race.phase === 'winner') flight = 'winner';
+    else if (thinking && (full && full.liveStatus)) flight = full.liveStatus;
+    else if (thinking && t.liveStatus) flight = t.liveStatus;
+    else if (thinking) flight = 'in flight';
+    const cwd = (full && full.dir) || t.dir || '—';
+    sitrepBody.innerHTML =
+      sitrepRow('race', raceChoiceLabel(raceY, need))
+      + sitrepRow('band', t.tier || 'medium')
+      + sitrepRow('mode', t.runMode || 'ask')
+      + sitrepRow('cwd', cwd)
+      + sitrepRow('in flight', flight)
+      + '<div class="wlanetitle" style="margin-top:16px">this session</div>'
+      + sitrepRow('paid', '$' + (spent >= 0.01 || spent === 0 ? spent.toFixed(2) : spent.toFixed(5)))
+      + sitrepRow('cogs', '$' + (cogs >= 0.01 || cogs === 0 ? cogs.toFixed(2) : cogs.toFixed(5)))
+      + sitrepRow('direct', '$' + (direct >= 0.01 || direct === 0 ? direct.toFixed(2) : direct.toFixed(5)))
+      + sitrepRow('saved vs naked', saved, savedCls)
+      + sitrepRow('paid calls', String(you.paidCalls || 0))
+      + sitrepRow('prepaid', (Number(you.creditUsd) > 0) ? 'yes' : 'no');
+  }
+  function closeSitrep() { sitrepOverlay.classList.remove('show'); }
+  sitrepOverlay.addEventListener('click', (e) => {
+    if (e.target === sitrepOverlay) closeSitrep();
+  });
   document.addEventListener('keydown', (e) => {
     if (e.key === 'Escape' && walletOverlay.classList.contains('show')) walletOverlay.classList.remove('show');
+    if (e.key === 'Escape' && sitrepOverlay.classList.contains('show')) closeSitrep();
   });
 
   document.getElementById('tierSel').addEventListener('change', (e) => setDial('tier', e.target.value));
@@ -4611,6 +4744,12 @@ const APP_HTML = `<!doctype html>
     }
     if (full.status === 'thinking') {
       if (full.liveStatus) streamStatus = full.liveStatus;
+      if (full.liveRace && full.liveRace.racers && full.liveRace.racers.length >= 2) {
+        streamRace = full.liveRace;
+        streamRaceId = full.id;
+      } else if (streamRaceId !== full.id) {
+        streamRace = null;
+      }
       addRow('bot', streamBuf || '…', t.color, t.name);
       // Tag the live bubble so deltas can repaint just this node instead of
       // re-rendering (and re-fetching) the whole thread on every token.
@@ -4625,8 +4764,60 @@ const APP_HTML = `<!doctype html>
   // so a turn showed "…" for its whole duration and then arrived in one lump.
   let streamBuf = '';
   let streamStatus = '';
+  let streamRace = null;
+  let streamRaceId = '';
+  let raceHandoff = 0;
   let es = null, esId = null;
+  function raceIsLive(r) {
+    return !!(r && r.racers && r.racers.length >= 2 && streamRaceId === activeId);
+  }
+  function shortRaceName(id) {
+    const s = String(id || '');
+    const i = s.lastIndexOf('/');
+    return (i >= 0 ? s.slice(i + 1) : s) || 'model';
+  }
+  function raceGridHtml(race) {
+    const racers = race.racers || [];
+    const n = racers.length;
+    const need = Math.max(1, Number(race.need) || 1);
+    const caption = (need > 1 ? ('first ' + need + ' of ' + n) : (n + ' launched'))
+      + (race.recut ? ' · recut' : '');
+    let cells = '';
+    for (let i = 0; i < racers.length; i++) {
+      const r = racers[i];
+      const win = race.phase === 'winner' && race.winner && r.model === race.winner;
+      const cls = 'racecell ' + (r.status || 'waiting') + (win ? ' winner' : '');
+      const chip = win ? 'winner' : (r.status || 'waiting');
+      let body = '';
+      if (r.status === 'failed') {
+        body = '<span class="racefail">' + escapeHtml(r.fail ? ('fail · ' + r.fail) : 'fail') + '</span>';
+      } else if (r.preview) {
+        body = '<div class="raceprev">' + escapeHtml(r.preview) + '</div>';
+      } else if (r.status === 'abandoned') {
+        body = '<div class="raceprev">abandoned</div>';
+      } else {
+        body = '<div class="raceprev"></div>';
+      }
+      cells += '<div class="' + cls + '"><div class="racehead"><span class="racename">'
+        + escapeHtml(r.short || shortRaceName(r.model)) + '</span><span class="racechip">'
+        + escapeHtml(chip) + '</span></div>' + body + '</div>';
+    }
+    let judge = '';
+    if (need > 1 && (race.phase === 'judging' || race.phase === 'winner')) {
+      const won = race.phase === 'winner' && race.winner;
+      const msg = won
+        ? ('goes to ' + shortRaceName(race.winner))
+        : ('looking at the ' + need + ' that made it back');
+      judge = '<div class="racejudge' + (won ? ' won' : '') + '"><div class="racejudge-lab">classifier</div>'
+        + '<div class="racejudge-msg">' + escapeHtml(msg)
+        + (won ? '' : ' <span class="dots"><span></span><span></span><span></span></span>')
+        + '</div></div>';
+    }
+    return '<div class="racewrap"><div class="racecaption">' + escapeHtml(caption) + '</div>'
+      + '<div class="racegrid n' + n + '">' + cells + '</div>' + judge + '</div>';
+  }
   function liveBubbleHtml() {
+    if (raceIsLive(streamRace)) return raceGridHtml(streamRace);
     if (streamBuf) {
       const trail = streamStatus && /^(RUN|READ|WRITE|EDIT|SPAWN|SEND|GLOB|GREP|MCP|FETCH|TODO|SERVE|PING|PEEK|MULTIEDIT|NOTEBOOK):/i.test(streamStatus)
         ? '<span class="ttrail">' + escapeHtml(streamStatus) + '</span>' : '';
@@ -4639,6 +4830,13 @@ const APP_HTML = `<!doctype html>
   function paintStream() {
     const b = document.getElementById('streamBubble');
     if (!b) { render(); return; }
+    if (raceIsLive(streamRace)) {
+      b.classList.add('raceboard');
+      b.innerHTML = liveBubbleHtml();
+      if (log.scrollHeight - log.scrollTop - log.clientHeight < 140) log.scrollTop = log.scrollHeight;
+      return;
+    }
+    b.classList.remove('raceboard');
     // Deltas stay as text; a silent wait paints dots + one mutating status
     // line so a 20–40s pay/model wait is obviously alive.
     if (streamBuf && !(streamStatus && /^(RUN|READ|WRITE|EDIT|SPAWN|SEND|GLOB|GREP|MCP|FETCH|TODO|SERVE|PING|PEEK|MULTIEDIT|NOTEBOOK):/i.test(streamStatus))) {
@@ -4654,17 +4852,50 @@ const APP_HTML = `<!doctype html>
     esId = id;
     streamBuf = '';
     streamStatus = '';
+    streamRace = null;
+    streamRaceId = id;
+    raceHandoff += 1;
     es = new EventSource('/stream/' + id);   // EventSource reconnects on its own
     es.onmessage = (e) => {
       let ev;
       try { ev = JSON.parse(e.data); } catch { return; }
-      if (ev.type === 'start') { streamBuf = ''; streamStatus = ev.detail || 'waiting on model…'; paintStream(); }
+      if (ev.type === 'start') {
+        streamBuf = '';
+        streamStatus = ev.detail || 'waiting on model…';
+        streamRace = null;
+        streamRaceId = id;
+        paintStream();
+      }
       else if (ev.type === 'status') { streamStatus = ev.detail || streamStatus; paintStream(); }
+      else if (ev.type === 'race') {
+        if (ev.race && ev.race.racers && ev.race.racers.length >= 2) {
+          streamRace = ev.race;
+          streamRaceId = id;
+        }
+        paintStream();
+      }
       else if (ev.type === 'delta') {
         streamBuf = ev.replace ? (ev.delta || '') : streamBuf + (ev.delta || '');
         paintStream();
       }
-      else if (ev.type === 'final' || ev.type === 'run-pending') { streamBuf = ''; streamStatus = ''; render(); }
+      else if (ev.type === 'final' || ev.type === 'run-pending') {
+        if (ev.type === 'final' && raceIsLive(streamRace)) {
+          paintStream();
+          const token = ++raceHandoff;
+          setTimeout(function () {
+            if (token !== raceHandoff) return;
+            streamBuf = '';
+            streamStatus = '';
+            streamRace = null;
+            render();
+          }, 420);
+          return;
+        }
+        streamBuf = '';
+        streamStatus = '';
+        streamRace = null;
+        render();
+      }
     };
     es.onerror = () => { /* EventSource retries; the 1.2s poll is the backstop */ };
   }
@@ -4721,6 +4952,12 @@ const APP_HTML = `<!doctype html>
 
   async function submit() {
     const task = inp.value.trim();
+    if (/^\/sitrep\b/i.test(task)) {
+      inp.value = '';
+      send.classList.remove('show');
+      openSitrep();
+      return;
+    }
     if ((!task && !pendingFiles.length && !pendingImages.length) || !activeId) return;
     inp.value = '';
     send.classList.remove('show');
@@ -4775,6 +5012,12 @@ const APP_HTML = `<!doctype html>
   function slashAccept(i) {
     const c = slashHits[i];
     if (!c) return;
+    if (c.name === '/sitrep') {
+      inp.value = '';
+      slashMenu.classList.remove('show');
+      openSitrep();
+      return;
+    }
     // Commands that take arguments keep the caret going; ones that don't are
     // ready to send, so don't make the user delete a trailing space.
     inp.value = c.name + (c.args ? ' ' : '');
@@ -4807,6 +5050,11 @@ const APP_HTML = `<!doctype html>
   plusBtn.addEventListener('click', (e) => { e.stopPropagation(); plusMenu.classList.toggle('show'); });
   document.addEventListener('click', () => plusMenu.classList.remove('show'));
   document.getElementById('attachBtn').addEventListener('click', (e) => { e.stopPropagation(); plusMenu.classList.remove('show'); fileInp.click(); });
+  document.getElementById('sitrepBtn').addEventListener('click', (e) => {
+    e.stopPropagation();
+    plusMenu.classList.remove('show');
+    openSitrep();
+  });
   fileInp.addEventListener('change', async () => {
     for (const f of Array.from(fileInp.files)) {
       const looksText = /^text\\//.test(f.type) || /\\.(txt|md|js|mjs|ts|tsx|jsx|py|json|css|html|csv|log|ya?ml|sh)$/i.test(f.name);
@@ -5325,6 +5573,7 @@ const server = http.createServer((req, res) => {
     res.end(t ? JSON.stringify({
       id: t.id, history: t.history, status: t.status,
       liveStatus: t.status === 'thinking' ? (t.liveStatus || '') : '',
+      liveRace: t.status === 'thinking' ? (t.liveRace || null) : null,
       lastRaceFail: t.lastRaceFail || null,
       workspacePort: workspacePort || 0, dir: t.dir || WORKSPACE_DIR,
     }) : '{}');
@@ -5417,6 +5666,8 @@ const server = http.createServer((req, res) => {
       // checking your spend or clearing a thread never costs anything.
       // /dir and /mode keep their own handlers below, untouched.
       if (t && /^\//.test(task.trim())) {
+        // Drawer-only. Never dump sitrep into the transcript.
+        if (/^\/sitrep\b/i.test(task.trim())) return;
         const handled = await handleSlash(task.trim(), t).catch((e) => `error: ${e.message}`);
         if (handled !== null && handled !== undefined) {
           t.history.push({ who: 'bot', text: handled });

package/lib/livestatus.js

@@ -28,6 +28,68 @@ export function formatPayStatus(attempt = 0) {
   return Number(attempt) > 0 ? 'waiting on x402…' : 'paying…';
 }
 
+/** Cut from 1-model savings. X does not change it — they pay every launched racer. */
+export function raceSavingsCutPct(y) {
+  const n = Math.max(1, Number(y) || 1);
+  return Math.round((1 - 1 / n) * 100);
+}
+
+function sitrepUsd(n) {
+  const x = Number(n) || 0;
+  return x >= 0.01 || x === 0 ? `$${x.toFixed(2)}` : `$${x.toFixed(5)}`;
+}
+
+function sitrepFlight({ status, liveStatus, liveRace } = {}) {
+  if (status !== 'thinking') return 'idle';
+  if (liveRace?.phase === 'judging') return 'classifier judging';
+  if (liveRace?.phase === 'winner') return 'winner';
+  if (liveStatus) return String(liveStatus);
+  return 'in flight';
+}
+
+/**
+ * Compact sitrep field list (drawer). No keys, no .npmrc.
+ * Prepaid is yes/no — never a secret.
+ */
+export function formatSitrep(info = {}) {
+  const y = Number(info.race) >= 2 ? Number(info.race) : 1;
+  const need = Number(info.raceNeed) || 1;
+  const spent = Number(info.spentUsd) || 0;
+  const cogs = Number(info.cogsUsd) || 0;
+  const direct = Number(info.directUsd) || 0;
+  const mult = spent > 0 ? direct / spent : null;
+  const saved = mult == null
+    ? '—'
+    : `${mult >= 100 ? Math.round(mult) : mult.toFixed(mult >= 10 ? 1 : 2)}x`;
+  const credit = Number(info.creditUsd);
+  const prepaid = Number.isFinite(credit) && credit > 0 ? 'yes' : 'no';
+  return [
+    'Sitrep',
+    `  race        ${raceChoiceLabel(y, need)}`,
+    `  band        ${info.tier || 'medium'}`,
+    `  mode        ${info.runMode || 'ask'}`,
+    `  cwd         ${info.dir || '—'}`,
+    `  in flight   ${sitrepFlight(info)}`,
+    `  paid        ${sitrepUsd(spent)}`,
+    `  cogs        ${sitrepUsd(cogs)}`,
+    `  direct      ${sitrepUsd(direct)}`,
+    `  saved       ${saved}`,
+    `  paid calls  ${Number(info.paidCalls) || 0}`,
+    `  prepaid     ${prepaid}`,
+  ].join('\n');
+}
+
+/** Picker / sitrep label: `best 2 of 4  −75%`, `1 model  0%`. */
+export function raceChoiceLabel(y, need = 1) {
+  const n = Math.max(1, Number(y) || 1);
+  const k = Math.max(1, Math.min(Number(need) || 1, n));
+  const cut = raceSavingsCutPct(n);
+  const cutTxt = cut === 0 ? '0%' : `−${cut}%`;
+  if (n < 2) return `1 model  ${cutTxt}`;
+  if (k > 1) return `best ${k} of ${n}  ${cutTxt}`;
+  return `race ${n}  ${cutTxt}`;
+}
+
 /** First-X-back race: how many of the K we asked for have actually landed. */
 export function formatRaceStatus(back, need) {
   const n = Math.max(1, Number(need) || 1);
@@ -35,6 +97,24 @@ export function formatRaceStatus(back, need) {
   return `racing ${b}/${n} back…`;
 }
 
+/** OpenRouter id → short cell label. `z-ai/glm-4.7` → `glm-4.7`. */
+export function shortModelName(id) {
+  const s = String(id || '').trim();
+  if (!s) return 'model';
+  const parts = s.split('/');
+  return parts[parts.length - 1] || s;
+}
+
+/** Compact spectator preview — opening lines, not the whole answer. */
+export function clipRacePreview(text, maxLines = 8, maxChars = 420) {
+  const s = String(text || '').replace(/\r/g, '');
+  if (!s) return '';
+  const lines = s.split('\n');
+  let out = lines.length > maxLines ? lines.slice(0, maxLines).join('\n') + '\n…' : s;
+  if (out.length > maxChars) out = `${out.slice(0, maxChars - 1)}…`;
+  return out;
+}
+
 /** Race-level failure when no countable answer exists. Never a single model name. */
 export const RACE_EVERY_FAILED = '(race: every model failed — no reply)';
 
@@ -154,20 +234,76 @@ export function pickRaceWinner(cands, minScore = RACE_MIN_SCORE) {
 /**
  * Live race bubble: stream the fastest still-alive entrant, swap once if the
  * winner is someone else. `onDelta(text, { replace, model })`.
+ *
+ * `onRace(snap)` is the spectator feed — one cell per launched model, with
+ * waiting/streaming/back/failed/abandoned plus a truncated preview. Not a
+ * second racer: `phase: 'judging'` is the classifier looking at the X that
+ * already made it back.
  */
-export function createRaceFeed(onDelta, onStatus, need) {
+export function createRaceFeed(onDelta, onStatus, need, onRace) {
   let live = null;
   let settled = false;
   let back = 0;
+  let phase = 'racing';
+  let winnerModel = '';
+  let recutNote = '';
   const buf = new Map();
   const dead = new Set();
+  const order = [];
+  const cells = new Map();
   const paintStatus = () => { onStatus?.(formatRaceStatus(back, need)); };
+  const ensure = (model) => {
+    const id = String(model || '').trim() || 'model';
+    if (cells.has(id)) return cells.get(id);
+    const row = { model: id, status: 'waiting', preview: '', fail: '' };
+    cells.set(id, row);
+    order.push(id);
+    return row;
+  };
+  const freezeStragglers = () => {
+    if (back < need) return;
+    for (const row of cells.values()) {
+      if (row.status === 'waiting' || row.status === 'streaming') row.status = 'abandoned';
+    }
+  };
+  const snapshot = () => ({
+    need,
+    launched: order.length,
+    back,
+    phase,
+    winner: winnerModel || '',
+    recut: recutNote || '',
+    racers: order.map((id) => {
+      const row = cells.get(id);
+      return {
+        model: id,
+        short: shortModelName(id),
+        status: row.status,
+        preview: row.status === 'failed' ? '' : clipRacePreview(row.preview),
+        fail: row.fail || '',
+      };
+    }),
+  });
+  const emitRace = () => { onRace?.(snapshot()); };
   return {
-    start() { paintStatus(); },
+    start(models, extra) {
+      if (Array.isArray(models)) {
+        for (const m of models) if (m) ensure(m);
+      }
+      if (extra && extra.recut) recutNote = String(extra.recut);
+      paintStatus();
+      emitRace();
+    },
+    snapshot,
     liveModel() { return live; },
     onToken(model, chunk) {
       if (settled || chunk == null || chunk === '') return;
+      const row = ensure(model);
+      if (row.status === 'abandoned' || row.status === 'failed' || row.status === 'back') return;
       buf.set(model, (buf.get(model) || '') + chunk);
+      row.preview = buf.get(model) || '';
+      if (row.status === 'waiting') row.status = 'streaming';
+      emitRace();
       if (!live) {
         live = model;
         onDelta?.(chunk, { model });
@@ -175,8 +311,15 @@ export function createRaceFeed(onDelta, onStatus, need) {
       }
       if (live === model) onDelta?.(chunk, { model });
     },
-    onFail(model) {
+    onFail(model, arrival) {
       dead.add(model);
+      const row = ensure(model);
+      if (row.status !== 'abandoned' && row.status !== 'back') {
+        row.status = 'failed';
+        row.fail = raceFailKind(arrival || { model, text: '', error: 'error' });
+        row.preview = '';
+        emitRace();
+      }
       if (settled || live !== model) return;
       const next = [...buf.entries()].find(([m, t]) => m !== model && t && !dead.has(m));
       if (next) {
@@ -186,18 +329,44 @@ export function createRaceFeed(onDelta, onStatus, need) {
         live = null;
       }
     },
-    onBack() {
+    onBack(model) {
       // Late countable stragglers after ship used to paint "racing 4/2 back…"
       // onto an already-idle thread (GET /threads/:id returns raw liveStatus).
       if (settled || back >= need) return;
       back += 1;
+      let row = model ? ensure(model) : null;
+      if (!row) {
+        row = [...cells.values()].find((r) => r.status === 'streaming' || r.status === 'waiting');
+      }
+      if (row && row.status !== 'abandoned' && row.status !== 'failed') {
+        row.status = 'back';
+        if (buf.has(row.model)) row.preview = buf.get(row.model);
+      }
+      freezeStragglers();
       paintStatus();
+      emitRace();
+    },
+    judge() {
+      if (settled) return;
+      phase = 'judging';
+      freezeStragglers();
+      emitRace();
     },
     settle(winner) {
       settled = true;
+      phase = 'winner';
       const text = String(winner?.text || '').trim()
         ? winner.text
         : RACE_EVERY_FAILED;
+      winnerModel = winner?.error ? '' : (winner?.model || '');
+      if (winnerModel) {
+        const row = ensure(winnerModel);
+        if (row.status !== 'failed') {
+          row.status = 'back';
+          if (winner?.text) row.preview = String(winner.text);
+        }
+      }
+      emitRace();
       // Live stream already showing this answer — keep going, do not re-dump.
       if (winner?.model && live === winner.model && !winner.error) return;
       live = winner?.model || live;

package/lib/pay.js

@@ -12,6 +12,7 @@ import { privateKeyToAccount } from 'viem/accounts';
 import { withNamespace } from './namespace.js';
 import {
   resolvePool, poolState, depositForShares, buildWrapInstructions, sendWrap,
+  rewriteWrapClientError,
 } from './wrap.js';
 import { applySubscriptionHeaders, loadSubscription, stripAuthorization } from './subscription.js';
 import { fetchHeaders } from './fetch.js';
@@ -434,7 +435,7 @@ export class PayClient {
       body: JSON.stringify(bodyObj),
     }, { onStage });
     if (!response.ok) {
-      const text = (await response.text()).slice(0, 500);
+      const text = rewriteWrapClientError((await response.text()).slice(0, 500));
       throw new Error(`zoo returned HTTP ${response.status}: ${text}`);
     }
     return { data: await response.json(), receipt };

package/lib/podagent.mjs

@@ -30,6 +30,7 @@ import {
 } from './livestatus.js';
 import {
   probeGatewayRace, capRaceByCredit, inferRaceTier, RACE_NO_CREDIT,
+  recutRaceByHud, sessionDollarX,
 } from './racesettle.js';
 import { homedir } from 'node:os';
 
@@ -258,6 +259,19 @@ async function httpErrorNote(status) {
   return status ? `(request failed — HTTP ${status})` : '';
 }
 
+/** Do not dump raw Solana wrap-sim logs into the chat bubble. */
+function sanitizeProxiedError(msg) {
+  if (!msg) return msg;
+  const s = String(msg);
+  if (/0x6a\b|custom program error:\s*106\b|NotEnoughAccounts/i.test(s)) {
+    return 'wrap ix has too few accounts (need 9); old 5-account wrap is dead';
+  }
+  if (/0x70\b|custom program error:\s*112\b|TokenProgramMismatch/i.test(s)) {
+    return 'unwrap ix is missing the unwrapped token program (account 8); 8-account unwrap is dead';
+  }
+  return s;
+}
+
 // A 402 that reached this layer means the proxy's own x402 retry gave up on
 // this attempt, but the NEXT attempt usually settles (measured: same wallet,
 // same rail, second call pays fine). Surfacing that as a chat message makes
@@ -407,7 +421,7 @@ export async function brainStream(messages, onDelta, contextId, modelOverride, m
     // fall back to the non-streaming path rather than fail outright
     const j = await r.json().catch(() => ({}));
     const content = j?.choices?.[0]?.message?.content;
-    const proxied = j?.error?.message;
+    const proxied = sanitizeProxiedError(j?.error?.message);
     const text = content || (r.ok ? '' : (proxied ? `(request failed — HTTP ${r.status}: ${proxied})` : await httpErrorNote(r.status)));
     if (text) onDelta(text);
     return text;
@@ -666,8 +680,16 @@ async function readProxySession(proxy = completionsProxy()) {
 }
 
 async function raceBudget(hooks) {
-  if (hooks.creditUsd != null || hooks.quoteUsd != null) {
-    return { creditUsd: hooks.creditUsd, quoteUsd: hooks.quoteUsd };
+  const injected = hooks.creditUsd != null || hooks.quoteUsd != null
+    || hooks.spentUsd != null || hooks.directUsd != null || hooks.dollarX != null;
+  if (injected) {
+    return {
+      creditUsd: hooks.creditUsd,
+      quoteUsd: hooks.quoteUsd,
+      spentUsd: hooks.spentUsd,
+      directUsd: hooks.directUsd,
+      dollarX: hooks.dollarX,
+    };
   }
   // Injected stream = unit-test N-parallel path. Do not poke :8402.
   if (hooks.stream) return {};
@@ -675,6 +697,8 @@ async function raceBudget(hooks) {
   return {
     creditUsd: s?.creditUsd,
     quoteUsd: s?.lastQuoteUsd ?? s?.quoteUsd,
+    spentUsd: s?.spentUsd,
+    directUsd: s?.directUsd,
   };
 }
 
@@ -706,8 +730,8 @@ async function brainGatewayRace(messages, onDelta, contextId, models, need, maxT
   const classify = hooks.classify || classifyRaceAnswer;
   const pairwise = hooks.pairwise || pairwiseTied;
   const minScore = hooks.minScore != null ? Number(hooks.minScore) : RACE_MIN_SCORE;
-  const feed = createRaceFeed(onDelta, onStatus, want);
-  feed.start();
+  const feed = createRaceFeed(onDelta, onStatus, want, hooks.onRace);
+  feed.start(models, hooks.raceRecut ? { recut: hooks.raceRecut } : undefined);
 
   const arrivals = [];
   const done = [];
@@ -753,13 +777,13 @@ async function brainGatewayRace(messages, onDelta, contextId, models, need, maxT
       if (!r.ok || !r.body) {
         const j = await r.json().catch(() => ({}));
         const content = j?.choices?.[0]?.message?.content;
-        const proxied = j?.error?.message;
+        const proxied = sanitizeProxiedError(j?.error?.message);
         const text = content || (r.ok ? '' : (proxied ? `(request failed — HTTP ${r.status}: ${proxied})` : await httpErrorNote(r.status)));
         lastFail = { model: 'gateway', text: text || '', error: r.ok ? undefined : `HTTP ${r.status}` };
         if (isRaceCountable(lastFail)) {
           arrivals.push(lastFail);
           done.push(lastFail);
-          feed.onBack();
+          feed.onBack(lastFail.model);
           if (text) onDelta(text);
           break;
         }
@@ -772,9 +796,9 @@ async function brainGatewayRace(messages, onDelta, contextId, models, need, maxT
         arrivals.push(a);
         if (isRaceCountable(a)) {
           done.push(a);
-          feed.onBack();
+          feed.onBack(a.model);
         } else {
-          feed.onFail(a.model);
+          feed.onFail(a.model, a);
         }
       }
       lastFail = parsed.arrivals[parsed.arrivals.length - 1] || lastFail;
@@ -791,6 +815,7 @@ async function brainGatewayRace(messages, onDelta, contextId, models, need, maxT
   if (cands.length === 1) return ship(cands[0]);
 
   onStatus?.('judging…');
+  feed.judge();
   const scored = await Promise.all(cands.map(async (c) => {
     let score = 0;
     try { score = Number(await classify(messages, c)) || 0; } catch { score = 0; }
@@ -947,6 +972,31 @@ export async function brainRace(messages, onDelta, contextId, models, need = 1,
   const minScore = hooks.minScore != null ? Number(hooks.minScore) : RACE_MIN_SCORE;
   let list = (models || []).filter(Boolean).slice(0, RACE_MAX);
   const budget = await raceBudget(hooks);
+  let tier = hooks.tier || inferRaceTier(list, 'medium');
+  let wantNeed = Math.max(1, Math.min(Number(need) || 1, list.length || 1));
+  const dollarX = sessionDollarX(budget);
+  const hud = recutRaceByHud({
+    y: list.length, need: wantNeed, dollarX, tier,
+  });
+  let raceRecut = '';
+  if (hud.recut) {
+    raceRecut = 'savings';
+    if (hud.tier !== tier && !hooks.stream) {
+      try {
+        const next = await tierModels(hud.tier, hud.y, true);
+        if (next.length) { list = next; tier = hud.tier; }
+        else list = list.slice(0, hud.y);
+      } catch { list = list.slice(0, hud.y); }
+    } else {
+      list = list.slice(0, hud.y);
+      tier = hud.tier;
+    }
+    wantNeed = Math.min(hud.need, list.length);
+    onStatus?.(hud.y < 2
+      ? 'race recut to 1 — savings'
+      : `race recut to ${hud.y} — savings`);
+  }
+  hooks = { ...hooks, tier, raceRecut };
   const capped = capRaceByCredit(list.length, budget);
   if (capped.n < 1) {
     onStatus?.('race refused — no credit');
@@ -957,7 +1007,7 @@ export async function brainRace(messages, onDelta, contextId, models, need = 1,
     onStatus?.(capped.n < 2 ? 'race shrunk to 1 — credit' : `race shrunk to ${capped.n} — credit`);
   }
   if (list.length < 2) return stream(messages, onDelta, contextId, list[0], maxTokens, 0, 0, onStatus);
-  const want = Math.max(1, Math.min(Number(need) || 1, list.length));
+  const want = Math.max(1, Math.min(wantNeed, list.length));
 
   // One Fly settle when the completions door honors `race:`. Custom stream
   // hooks (unit tests of the N-parallel judge) keep the old path. Old
@@ -972,8 +1022,8 @@ export async function brainRace(messages, onDelta, contextId, models, need = 1,
     return brainGatewayRace(messages, onDelta, contextId, list, want, maxTokens, onStatus, hooks);
   }
 
-  const feed = createRaceFeed(onDelta, onStatus, want);
-  feed.start();
+  const feed = createRaceFeed(onDelta, onStatus, want, hooks.onRace);
+  feed.start(list, raceRecut ? { recut: raceRecut } : undefined);
 
   const done = [];
   const arrivals = [];
@@ -1021,7 +1071,7 @@ export async function brainRace(messages, onDelta, contextId, models, need = 1,
         if (isRaceCountable(last)) {
           arrivals.push(last);
           done.push(last);
-          feed.onBack();
+          feed.onBack(m);
           return;
         }
       } catch (e) {
@@ -1030,7 +1080,7 @@ export async function brainRace(messages, onDelta, contextId, models, need = 1,
       if (!shouldRetryRaceArrival(last) || attempt === 1 || raceAbort.signal.aborted) break;
     }
     arrivals.push(last);
-    feed.onFail(m);
+    feed.onFail(m, last);
   };
 
   const attempts = list.map((m) => runOne(m).finally(() => {
@@ -1055,6 +1105,7 @@ export async function brainRace(messages, onDelta, contextId, models, need = 1,
   if (cands.length === 1) return ship(cands[0]);
 
   onStatus?.('judging…');
+  feed.judge();
   const scored = await Promise.all(cands.map(async (c) => {
     let score = 0;
     try { score = Number(await classify(messages, c)) || 0; } catch { score = 0; }

package/lib/proxy.js

@@ -27,6 +27,7 @@ import { creditBalance, quotedPrices } from './info.js';
 import { subscriptionPublicView } from './subscription.js';
 import { priceHoldings } from './livestatus.js';
 import { receiptUsedCogs } from './racesettle.js';
+import { rewriteWrapClientError } from './wrap.js';
 
 const HOP_BY_HOP = new Set([
   'host', 'connection', 'keep-alive', 'transfer-encoding', 'upgrade',
@@ -1726,7 +1727,8 @@ export async function startProxy({ silent = false, requireToken = null, sessionM
         // network error in `cause`. Surface it (and log the stack) or every
         // transport hiccup looks identical to a payment bug.
         const cause = err.cause?.message || err.cause?.code || err.cause;
-        const detail = cause ? `${err.message} (${cause})` : err.message;
+        const raw = cause ? `${err.message} (${cause})` : err.message;
+        const detail = rewriteWrapClientError(raw);
         log(`proxy error: ${detail}`);
         if (process.env.OPENZOO_DEBUG) console.error(err.stack);
         jsonErr(res, 502, `openzoo proxy error: ${detail}`);

package/lib/racesettle.js

@@ -8,6 +8,62 @@
 
 export const FLY_GATEWAY_HOST = 'x402-tokens.fly.dev';
 export const RACE_NO_CREDIT = '(race: not enough prepaid credit — shrink N or top up, rather than fire on $0)';
+/** Low end of the pitched 5–10× vs frontier. Session green HUD below this recuts Y. */
+export const RACE_HUD_TARGET = 5;
+
+const TIER_DOWN = {
+  'grok4.6': 'medium',
+  grok46: 'medium',
+  expensive: 'medium',
+  medium: 'cheap',
+  cheap: 'cheap',
+};
+
+export function cheaperRaceTier(tier) {
+  const t = String(tier || 'medium');
+  return TIER_DOWN[t] || 'cheap';
+}
+
+/** Same number the HUD green `x` uses: direct/spent. */
+export function sessionDollarX({ dollarX, spentUsd, directUsd } = {}) {
+  const given = Number(dollarX);
+  if (Number.isFinite(given) && given > 0) return given;
+  const spent = Number(spentUsd);
+  const direct = Number(directUsd);
+  if (spent > 0 && Number.isFinite(direct)) return direct / spent;
+  return null;
+}
+
+/**
+ * Recut launched Y (and maybe drop a band) when session green HUD is thin.
+ * Assumes the current multiple already includes this Y tax, so implied
+ * single-model x ≈ dollarX × y. Need (X) scales with Y. No user refunds.
+ *
+ * 2.09x on a 4-racer → implied ~8.4x single → Y=1 (back in the 5–10× band).
+ */
+export function recutRaceByHud({
+  y, need = 1, dollarX, tier = 'medium', target = RACE_HUD_TARGET,
+} = {}) {
+  const launched = Math.max(1, Math.floor(Number(y) || 1));
+  const k = Math.max(1, Math.min(Math.floor(Number(need) || 1), launched));
+  const x = Number(dollarX);
+  const band = String(tier || 'medium');
+  if (!Number.isFinite(x) || x <= 0 || x >= target) {
+    return { y: launched, need: k, tier: band, recut: false, reason: null };
+  }
+  const impliedSingle = x * launched;
+  const maxY = Math.max(1, Math.min(launched, Math.floor(impliedSingle / target)));
+  const nextTier = impliedSingle < target ? cheaperRaceTier(band) : band;
+  const nextNeed = Math.max(1, Math.min(k, maxY));
+  const recut = maxY < launched || nextTier !== band;
+  return {
+    y: maxY,
+    need: nextNeed,
+    tier: nextTier,
+    recut,
+    reason: recut ? 'savings' : null,
+  };
+}
 
 const FLY_RE = /x402-tokens\.fly\.dev/i;
 

package/lib/wrap.js

@@ -8,23 +8,45 @@
  * shim. Nothing here is user-facing; never surface wrapped tickers or mints
  * in messages that reach the user.
  *
- * Verified against the deployed program's own e2e (solana-token-wrap/e2e/e2e.mjs)
- * and live mainnet wrap transactions:
- *   wrap ix: data = [1][amount u64 LE][authority bump]
- *            keys = [escrow(w), wrappedMint(w), userWrappedAta(w),
- *                    authorityPDA, wrappedTokenProgram]
- *   shares minted = floor(amount * supply / reserves), reserves read at ix
- *   execution — so the wrap ix is placed BEFORE the deposit TransferChecked.
- *   First deposit is 1:1 minus MINIMUM_LIQUIDITY (1000) locked forever.
- *   authority = PDA(['mint_authority', wrappedMint]); escrow = ATA(underlying,
- *   authority); registry = PDA(['backpointer', wrappedMint]) when present.
+ * CLIENT BUILDER COPY — extra.acquire.steps / 402 help (WRAP_ACQUIRE_STEPS).
+ *
+ * Wrap ix has 9 accounts. 0x6a = 106 = NotEnoughAccounts, thrown at
+ * need(accounts, 9)?. Old 5-account Wrap is rejected.
+ *
+ * Program FrSERTNCPvTtaDS9AvQp9u1nYGzXDb3kC9MdL8Xxn2NE now CPIs the deposit.
+ * Delete the separate TransferChecked. Sending both double-transfers.
+ *
+ * data = [1] ++ u64 amount LE ++ [bump]  (authority PDA bump, passed not derived)
+ *
+ * Accounts in exact order:
+ *   0 [writable] escrow (authority PDA ATA for UNDERLYING mint)
+ *   1 [writable] wrapped mint
+ *   2 [writable] recipient wrapped token account
+ *   3 []         wrapped mint authority PDA = PDA(["mint_authority", wrapped_mint], FrSER…)
+ *   4 []         wrapped token program (must equal wrapped_mint.owner; Token-2022 on shares)
+ *   5 [writable] depositor UNDERLYING token account
+ *   6 [signer]   depositor (owner of account 5)
+ *   7 []         unwrapped mint
+ *   8 []         unwrapped token program (must equal escrow.owner)
+ *
+ * Account 4 and 8 are not interchangeable (LEOS: shares Token-2022, escrow
+ * TokenkegQ). Derive each ATA under its own token program.
+ * Prepend createAssociatedTokenAccountIdempotentInstruction for the recipient
+ * wrapped ATA. The program mints into it; it does not create it.
+ *
+ * Unwrap: 9 accounts, account 8 = unwrapped token program. 8 accounts → 0x70
+ * TokenProgramMismatch. Prepend idempotent ATA create for recipient underlying
+ * (may have been closed after wrapping).
+ *
+ * First deposit is 1:1 minus MINIMUM_LIQUIDITY (1000) locked forever.
+ * authority = PDA(['mint_authority', wrappedMint]); escrow = ATA(underlying,
+ * authority); registry = PDA(['backpointer', wrappedMint]) when present.
  */
 import { PublicKey, Transaction, TransactionInstruction } from '@solana/web3.js';
 import {
   TOKEN_PROGRAM_ID,
   TOKEN_2022_PROGRAM_ID,
   createAssociatedTokenAccountIdempotentInstruction,
-  createTransferCheckedInstruction,
   getAssociatedTokenAddressSync,
   unpackAccount,
   unpackMint,
@@ -34,6 +56,47 @@ export const WRAP_PROGRAM_ID = new PublicKey('FrSERTNCPvTtaDS9AvQp9u1nYGzXDb3kC9
 const AUTHORITY_SEED = Buffer.from('mint_authority');
 const BACKPOINTER_SEED = Buffer.from('backpointer');
 export const MINIMUM_LIQUIDITY = 1000n;
+export const WRAP_IX_ACCOUNT_COUNT = 9;
+export const WRAP_TOO_FEW_ACCOUNTS =
+  'wrap ix has too few accounts (need 9); old 5-account wrap is dead';
+
+/** extra.acquire.steps / 402 help — the copy clients build the Wrap ix from. */
+export const WRAP_ACQUIRE_STEPS = {
+  method: 'spl-token-wrap',
+  program: 'FrSERTNCPvTtaDS9AvQp9u1nYGzXDb3kC9MdL8Xxn2NE',
+  help: 'Wrap ix has 9 accounts. Program CPIs the deposit — do not send a separate TransferChecked. 0x6a = NotEnoughAccounts (old 5-account wrap is dead).',
+  data: '[1] ++ u64 amount LE ++ [bump] (authority PDA bump, passed not derived)',
+  prepend: 'createAssociatedTokenAccountIdempotentInstruction for the recipient wrapped ATA',
+  accounts: [
+    { i: 0, writable: true, name: 'escrow', note: 'authority PDA ATA for UNDERLYING mint' },
+    { i: 1, writable: true, name: 'wrappedMint' },
+    { i: 2, writable: true, name: 'recipientWrappedAta' },
+    { i: 3, writable: false, name: 'mintAuthorityPda', note: 'PDA(["mint_authority", wrapped_mint], FrSER…)' },
+    { i: 4, writable: false, name: 'wrappedTokenProgram', note: 'must equal wrapped_mint.owner; Token-2022 on shares' },
+    { i: 5, writable: true, name: 'depositorUnderlyingAta' },
+    { i: 6, writable: false, signer: true, name: 'depositor', note: 'owner of account 5' },
+    { i: 7, writable: false, name: 'unwrappedMint' },
+    { i: 8, writable: false, name: 'unwrappedTokenProgram', note: 'must equal escrow.owner; not interchangeable with account 4' },
+  ],
+  unwrap: {
+    accounts: 9,
+    account8: 'unwrapped token program',
+    prepend: 'idempotent ATA create for recipient underlying (may have been closed)',
+    note: '8 accounts → 0x70 TokenProgramMismatch',
+  },
+};
+
+/** Short 402-help / chat copy. Never dump raw Solana simulation logs. */
+export function rewriteWrapClientError(message) {
+  const s = String(message ?? '');
+  if (/0x6a\b|custom program error:\s*106\b|NotEnoughAccounts/i.test(s)) {
+    return WRAP_TOO_FEW_ACCOUNTS;
+  }
+  if (/0x70\b|custom program error:\s*112\b|TokenProgramMismatch/i.test(s)) {
+    return 'unwrap ix is missing the unwrapped token program (account 8); 8-account unwrap is dead';
+  }
+  return s;
+}
 
 // Machine-readable per-asset acquire directory published by the facilitator.
 // Consulted first so newly listed twins work with zero code changes; on-chain
@@ -172,27 +235,15 @@ export async function poolState(connection, pool) {
 }
 
 /**
- * The three instructions of a conversion, in the mainnet-proven order:
- * ensure the wrapped ATA, mint shares (program reads pre-deposit reserves),
- * then move the deposit into escrow. `rentPayer` funds ATA creation (defaults
+ * ATA-create + 9-account Wrap. The program CPIs the deposit itself — there
+ * is no trailing TransferChecked. `rentPayer` funds ATA creation (defaults
  * to the owner; the gateway feePayer when riding inside a payment tx).
  */
 export function buildWrapInstructions({ pool, owner, depositRaw, rentPayer = owner }) {
   const userWrapped = getAssociatedTokenAddressSync(pool.wrapped, owner, false, pool.wrappedProgram);
   const userUnderlying = getAssociatedTokenAddressSync(pool.underlying, owner, false, pool.underlyingProgram);
-  // NINE ACCOUNTS, AND THE PROGRAM PULLS THE DEPOSIT ITSELF.
-  //
-  // This used to emit three instructions — ensure ATA, Wrap, then a separate
-  // TransferChecked moving the underlying into escrow — because the program
-  // only minted shares and trusted that the caller's own transfer would follow.
-  // Nothing enforced it. On 2026-08-18 a caller sent the Wrap instruction ALONE
-  // and minted shares backed by nothing, then unwrapped them: 829,559 TOKEN out
-  // of the vault, NAV 1 -> 0.000177.
-  //
-  // The deployed program (slot 440219442) now CPIs the transfer itself, so the
-  // Wrap instruction carries the depositor's source account and signature and
-  // the separate transfer is GONE. A 5-account call is rejected outright with
-  // NotEnoughAccounts (0x6a) — verified against mainnet by simulation.
+  // 9-account Wrap. Program CPIs the deposit. No TransferChecked after this.
+  // Old 5-account Wrap is rejected 0x6a (NotEnoughAccounts).
   const wrapIx = new TransactionInstruction({
     programId: pool.programId || WRAP_PROGRAM_ID,
     keys: [
@@ -254,6 +305,14 @@ export async function sendWrap(connection, keypair, pool, depositRaw) {
   tx.recentBlockhash = blockhash;
   tx.feePayer = keypair.publicKey;
   tx.sign(keypair);
-  const sig = await connection.sendRawTransaction(tx.serialize());
-  return confirmSignatureByPolling(connection, sig, { commitment: 'confirmed' });
+  try {
+    const sig = await connection.sendRawTransaction(tx.serialize());
+    return confirmSignatureByPolling(connection, sig, { commitment: 'confirmed' });
+  } catch (err) {
+    const rewritten = rewriteWrapClientError(err?.message || String(err));
+    if (rewritten !== (err?.message || String(err))) {
+      throw new Error(rewritten);
+    }
+    throw err;
+  }
 }

package/lib/x402.js

@@ -22,12 +22,18 @@ import {
  *                  payTo: "<wallet>", resource, description, maxTimeoutSeconds,
  *                  extra: { facilitator, feePayer, symbol, billedUsd, tokenUsd,
  *                           pricedAt, pricing: "markup"|"counterfactual",
- *                           markup? , directUsd?, savesVsDirect? } } ],
- *     error: "payment required", help: "..." }
+ *                           markup? , directUsd?, savesVsDirect?,
+ *                           acquire?: { method: "spl-token-wrap", steps: WRAP_ACQUIRE_STEPS } } } ],
+ *     error: "payment required",
+ *     help: "Wrap ix has 9 accounts. Program CPIs the deposit — do not send a separate TransferChecked. 0x6a = NotEnoughAccounts (old 5-account wrap is dead)." }
  *
- * Payment: ONE Token-2022 TransferChecked (payer ATA -> payTo ATA) for exactly
- * maxAmountRequired, feePayer = extra.feePayer (the gateway pays SOL fees),
- * partial-signed by the payer, serialized requireAllSignatures=false, base64.
+ * Payment of the quoted (already-wrapped) mint: ONE Token-2022 TransferChecked
+ * (payer ATA -> payTo ATA) for exactly maxAmountRequired, feePayer =
+ * extra.feePayer (the gateway pays SOL fees), partial-signed by the payer,
+ * serialized requireAllSignatures=false, base64.
+ * Funding a short wrapped balance is a *separate* 9-account Wrap prepended as
+ * preInstructions (lib/wrap.js WRAP_ACQUIRE_STEPS). Do not follow Wrap with a
+ * deposit TransferChecked — the program pulls the underlying itself.
  * X-PAYMENT header = base64 of
  *   {"x402Version":1,"scheme":"exact","network":"<network>","payload":{"transaction":"<b64 tx>"}}
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openzoo",
-  "version": "0.49.3",
+  "version": "0.49.5",
   "description": "Local x402-paying proxy + MCP server for openzoo.fun \u2014 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",