npm - openzoo - Versions diffs - 0.49.6 → 0.49.8 - Mend

openzoo 0.49.6 → 0.49.8

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 (12) hide show

package/README.md CHANGED Viewed

@@ -23,7 +23,26 @@ paid $0.002137 (9.5× cheaper than direct) · rail solana · tx 5Kd…
 **Cursor** (Settings → Models → OpenAI API): set *Override OpenAI Base URL* to `http://localhost:8402/v1`, API key `sk-openzoo`. (Cursor Hobby can't BYOK; Pro can.)
-**Claude Code / any OpenAI-env tool:**
+**Claude Code (zoo catalog, not opus-5-only):**
+Prefer this. `ANTHROPIC_API_KEY` stays unset (it would bill api.anthropic.com). Base URL is `http://localhost:8402/v1`. `/model` should list zoo animals from the live OpenRouter catalog (plus `openzoo-*` twins), not a single opus-5.
+```bash
+npx openzoo claude
+```
+Leave a healthy `:8402` sidecar alone. Manual equivalent:
+```bash
+unset ANTHROPIC_API_KEY
+export ANTHROPIC_BASE_URL=http://localhost:8402/v1
+export ANTHROPIC_AUTH_TOKEN=sk-openzoo
+export CLAUDE_CODE_ENABLE_GATEWAY_MODEL_DISCOVERY=1
+curl -s "$ANTHROPIC_BASE_URL/models"   # many OpenRouter ids, not 1
+claude                                 # /model lists those zoo animals
+```
+**Any OpenAI-env tool:**
 ```bash
 export OPENAI_BASE_URL=http://localhost:8402/v1
 export OPENAI_API_KEY=sk-openzoo

package/lib/boxes.js CHANGED Viewed

@@ -77,7 +77,7 @@ const ENTRYPOINT = [
   // its HTTP port mappings). The app is read-only at runtime; mutable state
   // lives in /root/.openzoo.
   + 'until OPENZOO_BIND=0.0.0.0 node /opt/openzoo/bin/openzoo.js >> /var/log/openzoo/proxy.log 2>&1; do echo "proxy exited, restarting" >> /var/log/openzoo/proxy.log; sleep 2; done & '
-  + 'until OZ_GROKUI_BIND=0.0.0.0 OZ_GROKUI_PORT=4173 node /opt/grokui/grokui.mjs >> /var/log/openzoo/grokui.log 2>&1; do echo "grokui exited, restarting" >> /var/log/openzoo/grokui.log; sleep 2; done & '
+  + 'until OZ_GROKUI_BIND=0.0.0.0 OZ_GROKUI_PORT=4173 node /opt/openzoo/lib/grokui.mjs >> /var/log/openzoo/grokui.log 2>&1; do echo "grokui exited, restarting" >> /var/log/openzoo/grokui.log; sleep 2; done & '
   // the capture agent answers the ports Grok Bot expects a Cursor sandbox on,
   // logging the protocol we do not yet speak (see lib/podagent.mjs)
   + 'if [ -n "$OZ_PODAGENT_B64" ]; then printf %s "$OZ_PODAGENT_B64" | base64 -d > /opt/podagent.mjs; node /opt/podagent.mjs > /var/log/openzoo/agent.log 2>&1 & fi; '

package/lib/grokui.mjs CHANGED Viewed

@@ -716,8 +716,13 @@ function isTransientModelFail(text) {
   if (/returned nothing \d+ times|each returned nothing/i.test(s)) return true;
   return false;
 }
+function isEmptyWalletPayment(text) {
+  // Empty/underfunded only — not a generic HTTP 402 handshake.
+  return /\b(?:wallet is empty|empty wallet|wallet underfunded|underfunded)\b/i.test(String(text || ''));
+}
 function isPaymentFailed(text) {
-  return /\b(?:payment failed|HTTP 402|wallet is empty|empty wallet)\b/i.test(String(text || ''));
+  return isEmptyWalletPayment(text)
+    || /\b(?:payment failed|HTTP 402|payment required)\b/i.test(String(text || ''));
 }
 // Empty stdout, "(no output)", or a directive that found nothing. That is
 // still a command-output hop today, so AUTO used to chain once and then park
@@ -3212,6 +3217,10 @@ const APP_HTML = `<!doctype html>
   #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, #sitrepOverlay.show { display: flex; }
+  .payneed-btn { display: block; margin-top: 10px; border: 0; cursor: pointer;
+    background: #b8f240; color: #0b0b0d; font: 700 12px/1.2 inherit;
+    letter-spacing: .04em; padding: 7px 14px; border-radius: 999px; }
+  .payneed-btn:hover { filter: brightness(1.05); }
   #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, #sitrepBox h3 { margin: 0 0 2px; font-size: 15px; font-weight: 600; }
@@ -4056,6 +4065,15 @@ const APP_HTML = `<!doctype html>
     });
     return row;
   }
+  function isEmptyWalletPayment(text) {
+    return /\b(?:wallet is empty|empty wallet|wallet underfunded|underfunded)\b/i.test(String(text || ''));
+  }
+  var openedPayForEmpty = false;
+  function maybeOpenPayForEmptyWallet(text) {
+    if (openedPayForEmpty || !isEmptyWalletPayment(text)) return;
+    openedPayForEmpty = true;
+    openWallet();
+  }
   async function openWallet() {
     walletOverlay.classList.add('show');
     walletBody.textContent = 'loading…';
@@ -4865,6 +4883,15 @@ const APP_HTML = `<!doctype html>
         const preview = htmlPreviewUrl(text);
         if (preview) textEl.appendChild(previewFrame(preview, htmlPreviewKey(text, preview)));
       }
+      if (who === 'bot' && isEmptyWalletPayment(text)) {
+        const pay = document.createElement('button');
+        pay.type = 'button';
+        pay.className = 'payneed-btn';
+        pay.textContent = 'payment required';
+        pay.addEventListener('click', function (e) { e.preventDefault(); openWallet(); });
+        textEl.appendChild(pay);
+        maybeOpenPayForEmptyWallet(text);
+      }
       bubble.appendChild(textEl);
       row.appendChild(bubble);
       // Copy the message SOURCE, not rendered HTML — markdown, code fences and
@@ -5889,7 +5916,7 @@ export {
   parseRun, looksLikeMcpAsBash, stripThinkTags, safeResolveIn, inDir, listDir,
   handleSlash, newThread, setRunTurnForTest, setBrainAskForTest, runTurn,
   AUTO_CONTINUE, AUTO_RACE_RETRY, AUTO_EMPTY_RETRY, pingWakeText, pingCanWake, shouldKeepAuto,
-  isDoneReply, isTransientModelFail, isEmptyToolResult, enqueueAutoHop, childKickoff, findByName,
+  isDoneReply, isTransientModelFail, isPaymentFailed, isEmptyWalletPayment, isEmptyToolResult, enqueueAutoHop, childKickoff, findByName,
   attachChildDir, finishChildDir,
   lockWorktree, unlockWorktree, parsePrRef, fetchSpecsForOrigin, agentSlug,
   filesForCorpus, noteFileForCorpus, noteRunForCorpus, resetFilesForCorpus,

package/lib/launch.js CHANGED Viewed

@@ -15,6 +15,30 @@ import os from 'node:os';
 import path from 'node:path';
 import { config } from './config.js';
+/**
+ * Claude Code ≥2.1.129 only reads GET /v1/models when gateway discovery is
+ * opted in. Without this flag the picker stays the built-in opus-5 / tiny
+ * claude-* set instead of the zoo catalog the proxy publishes.
+ * CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC (even "0") blocks that GET.
+ *
+ * Do NOT invent ANTHROPIC_MODEL=openzoo-claude-sonnet-5. That pin hid the
+ * live OpenRouter catalog behind one Anthropic-native row. Only alias a
+ * model the caller already chose (OPENZOO_CLAUDE_ALIAS or ANTHROPIC_MODEL).
+ */
+export function applyClaudeCodeCatalogEnv(env) {
+  if (env.OPENZOO_NO_GATEWAY_DISCOVERY !== '1') {
+    env.CLAUDE_CODE_ENABLE_GATEWAY_MODEL_DISCOVERY = env.CLAUDE_CODE_ENABLE_GATEWAY_MODEL_DISCOVERY || '1';
+    delete env.CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC;
+  }
+  if (env.OPENZOO_NO_ALIAS === '1') return env;
+  const want = env.OPENZOO_CLAUDE_ALIAS || env.ANTHROPIC_MODEL;
+  if (!want) return env;
+  const bare = String(want).replace(/^openzoo-/, '').replace(/^[^/]+\//, '');
+  const SAFE = /^claude-(opus|sonnet|fable)-/;
+  if (SAFE.test(bare)) env.ANTHROPIC_MODEL = `openzoo-${bare}`;
+  return env;
+}
 /** Resolve the Claude DESKTOP app binary, platform-agnostically. Spawn the
  *  binary directly (not `open -a`) so the env — ANTHROPIC_BASE_URL — survives;
  *  macOS `open` hands off to launchd and drops it. */
@@ -143,40 +167,9 @@ export async function launchClaude(argv) {
   delete env.ANTHROPIC_API_KEY;
   env.ANTHROPIC_BASE_URL = base;
   env.ANTHROPIC_AUTH_TOKEN = process.env.ANTHROPIC_AUTH_TOKEN || 'sk-openzoo';
-  // STOP CLAUDE CODE COMPACTING ON A WINDOW THAT IS NOT REAL.
-  //
-  // It counts the WHOLE local transcript and compacts against a window it looks
-  // up from the MODEL NAME — hardcoded 200k for a recognised Claude id, which is
-  // why `/autocompact 1m` answered "capped to 200k by model" and why raising
-  // CLAUDE_CODE_MAX_CONTEXT_TOKENS alone did nothing. It never sees that the
-  // proxy binds the prefix and forwards ~8 of 166 turns.
-  //
-  // An `openzoo-` alias is the same model upstream (models.js resolves by
-  // SUFFIX, so openzoo-claude-sonnet-5 -> anthropic/claude-sonnet-5) but is not
-  // in that table, so the client falls back to the advertised context_length —
-  // which this gateway publishes as 128,000,000.
-  //
-  // OPENZOO_NO_ALIAS=1 opts out. Worth knowing: model-specific client behaviour
-  // (thinking budget, tool formats) also keys off the name, so if a session
-  // behaves oddly this is the first thing to turn off.
-  // Applies to WHATEVER model you are on — opus, fable, sonnet, haiku. The
-  // 200k table is keyed by name, so every recognised Claude id hits it; the
-  // alias is minted from the requested model rather than pinned to sonnet.
-  if (process.env.OPENZOO_NO_ALIAS !== '1') {
-    const want = process.env.OPENZOO_CLAUDE_ALIAS
-      || process.env.ANTHROPIC_MODEL
-      || 'claude-sonnet-5';
-    // idempotent: never openzoo-openzoo-…; strip a vendor prefix so the SUFFIX
-    // resolver in models.js gets the bare family name it matches on.
-    const bare = String(want).replace(/^openzoo-/, '').replace(/^[^/]+\//, '');
-    // ONLY families whose alias was VERIFIED to resolve back to themselves.
-    // openzoo-claude-haiku-4-5 resolved to deepseek/deepseek-v4-pro-0813 — the
-    // suffix scorer found no haiku in the catalog and picked a neighbour, so
-    // aliasing it would silently swap the user's model. A compaction fix is
-    // never worth answering as a different model than the one asked for.
-    const SAFE = /^claude-(opus|sonnet|fable)-/;
-    if (SAFE.test(bare)) env.ANTHROPIC_MODEL = `openzoo-${bare}`;
-  }
+  applyClaudeCodeCatalogEnv(env);
+  // ANTHROPIC_MODEL is only aliased (never invented) in applyClaudeCodeCatalogEnv.
+  // A default pin to openzoo-claude-sonnet-5 hid the live zoo catalog.
   // THE ACTUAL SWITCHES. Three earlier attempts missed these entirely:
   // autoCompactEnabled in settings (global, trapped a session), a raised
   // CLAUDE_CODE_MAX_CONTEXT_TOKENS (clamped to 200k by the model table), and an
@@ -319,6 +312,7 @@ export async function launchClaude(argv) {
     console.error('');
     console.error('  \x1b[38;5;208m●\x1b[0m openzoo — this Claude Code session routes through the zoo');
     console.error(`     endpoint : ${base}`);
+    console.error('     models   : GET /v1/models (zoo catalog — /model lists zoo animals, not opus-5-only)');
     console.error('     auth     : gateway token (ANTHROPIC_API_KEY unset — no api.anthropic.com billing)');
     if (wallet) console.error(`     wallet   : ${wallet}`);
     console.error('     spend    : live in the status line below (bottom of screen); receipts in ~/.openzoo/proxy.log');
@@ -425,40 +419,9 @@ export async function launchHarness(cmd, args) {
   delete env.ANTHROPIC_API_KEY;   // conflicts with the gateway auth-token path
   env.ANTHROPIC_BASE_URL = base;
   env.ANTHROPIC_AUTH_TOKEN = process.env.ANTHROPIC_AUTH_TOKEN || 'sk-openzoo';
-  // STOP CLAUDE CODE COMPACTING ON A WINDOW THAT IS NOT REAL.
-  //
-  // It counts the WHOLE local transcript and compacts against a window it looks
-  // up from the MODEL NAME — hardcoded 200k for a recognised Claude id, which is
-  // why `/autocompact 1m` answered "capped to 200k by model" and why raising
-  // CLAUDE_CODE_MAX_CONTEXT_TOKENS alone did nothing. It never sees that the
-  // proxy binds the prefix and forwards ~8 of 166 turns.
-  //
-  // An `openzoo-` alias is the same model upstream (models.js resolves by
-  // SUFFIX, so openzoo-claude-sonnet-5 -> anthropic/claude-sonnet-5) but is not
-  // in that table, so the client falls back to the advertised context_length —
-  // which this gateway publishes as 128,000,000.
-  //
-  // OPENZOO_NO_ALIAS=1 opts out. Worth knowing: model-specific client behaviour
-  // (thinking budget, tool formats) also keys off the name, so if a session
-  // behaves oddly this is the first thing to turn off.
-  // Applies to WHATEVER model you are on — opus, fable, sonnet, haiku. The
-  // 200k table is keyed by name, so every recognised Claude id hits it; the
-  // alias is minted from the requested model rather than pinned to sonnet.
-  if (process.env.OPENZOO_NO_ALIAS !== '1') {
-    const want = process.env.OPENZOO_CLAUDE_ALIAS
-      || process.env.ANTHROPIC_MODEL
-      || 'claude-sonnet-5';
-    // idempotent: never openzoo-openzoo-…; strip a vendor prefix so the SUFFIX
-    // resolver in models.js gets the bare family name it matches on.
-    const bare = String(want).replace(/^openzoo-/, '').replace(/^[^/]+\//, '');
-    // ONLY families whose alias was VERIFIED to resolve back to themselves.
-    // openzoo-claude-haiku-4-5 resolved to deepseek/deepseek-v4-pro-0813 — the
-    // suffix scorer found no haiku in the catalog and picked a neighbour, so
-    // aliasing it would silently swap the user's model. A compaction fix is
-    // never worth answering as a different model than the one asked for.
-    const SAFE = /^claude-(opus|sonnet|fable)-/;
-    if (SAFE.test(bare)) env.ANTHROPIC_MODEL = `openzoo-${bare}`;
-  }
+  applyClaudeCodeCatalogEnv(env);
+  // ANTHROPIC_MODEL is only aliased (never invented) in applyClaudeCodeCatalogEnv.
+  // A default pin to openzoo-claude-sonnet-5 hid the live zoo catalog.
   // THE ACTUAL SWITCHES. Three earlier attempts missed these entirely:
   // autoCompactEnabled in settings (global, trapped a session), a raised
   // CLAUDE_CODE_MAX_CONTEXT_TOKENS (clamped to 200k by the model table), and an

package/lib/livestatus.js CHANGED Viewed

@@ -118,7 +118,7 @@ export function clipRacePreview(text, maxLines = 8, maxChars = 420) {
 /** Race-level failure when no countable answer exists. Never a single model name. */
 export const RACE_EVERY_FAILED = '(race: every model failed — no reply)';
-const RACE_HTTP_NOTE = /^\((?:upstream error|request failed|payment failed|rate limited|stream timed out|stream stalled)/i;
+const RACE_HTTP_NOTE = /^\((?:upstream error|request failed|payment failed|payment required|rate limited|stream timed out|stream stalled)/i;
 const RACE_MODEL_FAILED = /^\([^)]+ (?:failed:|returned nothing)/i;
 const RACE_FETCH_FAILED = /^(?:typeerror:\s*)?fetch failed$/i;
@@ -159,7 +159,7 @@ export function raceFailKind(arrival) {
   const s = `${err} ${text}`.trim();
   if (!s) return 'empty body';
   if (/timeout|STREAM_IDLE|aborted|AbortError/i.test(s)) return 'timeout';
-  if (/402|payment failed/i.test(s)) return 'pay';
+  if (/402|payment failed|payment required/i.test(s)) return 'pay';
   if (/fetch failed/i.test(s)) return 'fetch failed';
   const http = /HTTP\s+(\d{3})/i.exec(s);
   if (http) return `HTTP ${http[1]}`;

package/lib/models.js CHANGED Viewed

@@ -251,6 +251,92 @@ export function augmentModelList(payload) {
   return { ...payload, object: payload?.object || 'list', data: [...data, ...branded, ...aliases] };
 }
+/**
+ * Label a catalog id for a picker without minting a new id.
+ * `x-ai/grok-4.6` stays `x-ai/grok-4.6` on the wire; the label is just
+ * "grok-4.6 (x-ai)". Never invents a `claude-*` name for a non-Anthropic animal.
+ */
+export function displayNameFor(id) {
+  const raw = String(id || '').trim();
+  if (!raw) return raw;
+  if (raw.includes('/')) {
+    const slash = raw.indexOf('/');
+    return `${raw.slice(slash + 1)} (${raw.slice(0, slash)})`;
+  }
+  return raw;
+}
+function decorateModelEntry(m) {
+  if (!m || typeof m !== 'object') return m;
+  return {
+    ...m,
+    object: m.object || 'model',
+    type: m.type || 'model',
+    display_name: m.display_name || displayNameFor(m.id),
+  };
+}
+/**
+ * OpenAI-compatible /v1/models body Claude Code and every other harness can
+ * read. The full zoo catalog is kept — no claude-* filter, no single opus-5
+ * collapse. Extra Anthropic fields (`type`, `display_name`) sit alongside
+ * OpenAI ones so a Messages-API client can label rows without a second
+ * endpoint. Existing OpenAI clients ignore the extras.
+ */
+export function publishModelList(payload) {
+  const merged = augmentModelList(payload);
+  const data = (merged.data || []).map(decorateModelEntry);
+  return {
+    ...merged,
+    object: merged.object || 'list',
+    data,
+    has_more: false,
+    first_id: data[0]?.id ?? null,
+    last_id: data[data.length - 1]?.id ?? null,
+  };
+}
+/**
+ * Anthropic GET /v1/models shape (id + display_name + type).
+ * Claude Code gateway discovery reads `data[].id` and optional `display_name`.
+ * Ids are the zoo's real catalog ids — never rewritten to fake `claude-*`
+ * aliases for grok / deepseek / gemini / etc.
+ */
+export function anthropicModelList(payload) {
+  const published = publishModelList(payload);
+  const data = (published.data || []).map((m) => ({
+    type: 'model',
+    id: m.id,
+    display_name: m.display_name || displayNameFor(m.id),
+    ...(m.created_at ? { created_at: m.created_at } : {}),
+    ...(m.served_by ? { served_by: m.served_by } : {}),
+  }));
+  return {
+    data,
+    has_more: false,
+    first_id: data[0]?.id ?? null,
+    last_id: data[data.length - 1]?.id ?? null,
+  };
+}
+/** Claude Code / Anthropic SDKs send anthropic-version or an x-app / UA hint. */
+export function wantsAnthropicModelList(headers = {}) {
+  const h = headers && typeof headers === 'object' ? headers : {};
+  const get = (k) => h[k] ?? h[k.toLowerCase()] ?? '';
+  return Boolean(get('anthropic-version'))
+    || /claude|anthropic/i.test(String(get('x-app')))
+    || /claude|anthropic/i.test(String(get('user-agent')));
+}
+/**
+ * Body for GET /v1/models. Always the full zoo catalog (never opus-5-only).
+ * Anthropic-shaped clients get id+display_name; OpenAI clients keep object:list.
+ */
+export function modelsListForRequest(payload, headers) {
+  const published = publishModelList(payload);
+  return wantsAnthropicModelList(headers) ? anthropicModelList(published) : published;
+}
 /**
  * Which request paths carry a rewritable model field. POST-only; embeddings /
  * audio / image / moderation models are DIFFERENT model families — rewriting
@@ -323,10 +409,24 @@ export function isTinyClassify(body, bodyLen) {
   return messages.length <= CLASSIFY_MAX_MSGS && len < CLASSIFY_MAX_BODY;
 }
+/**
+ * Ids that must never serve Claude Code / grokui AUTO's tiny yes/no classify.
+ * REASONING_MODEL_RE is the thinking floor; HEAVY_RE is the flagship set
+ * (opus/pro/max/…). opus-5 is openzoo's default session model and does NOT
+ * match the reasoning regex, so a catalog that lists opus before flash — or
+ * lists only opus + grok — used to pick opus as "first non-reasoner". That
+ * classify is a 402 handshake on a big model; AUTO's timeout then hard-blocks
+ * Bash instead of prompting.
+ */
+function isSlowClassifier(id) {
+  const s = String(id || '');
+  return REASONING_MODEL_RE.test(s) || HEAVY_RE.test(s);
+}
 /**
  * Fast non-reasoning id that is actually on the zoo. Prefer an explicit
  * OPENZOO_CLASSIFIER_MODEL, then flash, then haiku, then the first catalog
- * id that does not match the reasoning regex.
+ * id that is neither a reasoner nor a heavy/flagship (opus/pro/max/…).
  */
 export function pickClassifierModel(ids, preferred = process.env.OPENZOO_CLASSIFIER_MODEL) {
   if (!Array.isArray(ids) || !ids.length) return null;
@@ -334,7 +434,7 @@ export function pickClassifierModel(ids, preferred = process.env.OPENZOO_CLASSIF
   for (const id of CLASSIFIER_PREFS) {
     if (ids.includes(id)) return id;
   }
-  return ids.find((id) => !REASONING_MODEL_RE.test(id)) || null;
+  return ids.find((id) => !isSlowClassifier(id)) || null;
 }
 /**
@@ -362,14 +462,22 @@ export function raiseReasoningMaxTokens(parsed, env = process.env) {
  * Model + max_tokens policy for one chat body.
  *
  * Tiny classify: pin to a fast non-reasoning catalog id, leave max_tokens
- * alone, ignore OPENZOO_DEFAULT_MODEL. Everything else: resolveModel (which
- * honours the default) then the reasoning floor.
+ * alone, ignore OPENZOO_DEFAULT_MODEL. Never fall back to `from` when that
+ * id is a reasoner or a heavy/flagship (the zoo default is opus-5). A
+ * catalog miss or an opus-only list used to keep the classify on opus-5
+ * and AUTO hard-blocked Bash. Everything else: resolveModel (which honours
+ * the default) then the reasoning floor.
  */
 export function rewriteChatModel(parsed, ids, { bodyLen } = {}) {
   const from = parsed?.model;
   const len = bodyLen ?? (parsed == null ? 0 : Buffer.byteLength(JSON.stringify(parsed)));
   if (isTinyClassify(parsed, len)) {
-    const to = (typeof from === 'string' && pickClassifierModel(ids)) || from;
+    const picked = pickClassifierModel(ids);
+    // pickClassifierModel returns null on an empty catalog or a zoo that
+    // only lists reasoners/heavies. `(picked) || from` left those on
+    // anthropic/claude-opus-5 (openzoo's default). Pin to flash instead —
+    // never ship a classify body AUTO would time out and hard-block on.
+    const to = picked || (typeof from === 'string' && !isSlowClassifier(from) ? from : CLASSIFIER_PREFS[0]);
     return {
       parsed: (to && to !== from) ? { ...parsed, model: to } : parsed,
       tiny: true,

package/lib/pay.js CHANGED Viewed

@@ -1,6 +1,6 @@
 import { Connection, PublicKey } from '@solana/web3.js';
 import { getAssociatedTokenAddressSync } from '@solana/spl-token';
-import { config, fundingLine, evmRpcFor } from './config.js';
+import { config, fundingLine, evmRpcFor, FUNDING_ASSETS } from './config.js';
 import { loadOrCreateWallet } from './wallet.js';
 import {
   parse402, orderAccepts, railOf, buildPaymentOnline, tokenBalance,
@@ -120,6 +120,37 @@ export function resetRailMemory() {
   lastGoodAsset = null;
 }
+/**
+ * Skip wrap / pool / sendWrap when there is nothing to convert.
+ * wrapped < need AND underlying == 0 → UnderfundedError, no RPC walk.
+ * A funded wallet (underlying > 0) still wraps.
+ */
+export function skipWrapWhenEmpty(wrappedRaw, underlyingRaw, need) {
+  const wrapped = wrappedRaw == null ? 0n : BigInt(wrappedRaw);
+  const underlying = underlyingRaw == null ? 0n : BigInt(underlyingRaw);
+  const want = need == null ? 0n : BigInt(need);
+  return wrapped < want && underlying <= 0n;
+}
+/**
+ * Cheap underlying mint for a 402 row — directory acquire address, or the
+ * known USDC / TOKEN / LEOS twin named in extra.symbol. No chain probe.
+ */
+export function hintedUnderlyingMint(accept) {
+  const acq = accept?.extra?.acquire?.underlying;
+  const addr = typeof acq === 'string' ? acq : acq?.address;
+  if (addr && /^[1-9A-HJ-NP-Za-km-z]{32,44}$/.test(addr)) return addr;
+  const plain = String(accept?.extra?.symbol || '').replace(/^[wy]/i, '').replace(/x$/i, '').toUpperCase();
+  return FUNDING_ASSETS.find((a) => a.symbol === plain)?.mint || null;
+}
+/** True when every Solana funding mint (USDC / TOKEN / LEOS) reads 0. */
+export function solanaFundingEmpty(balances) {
+  const rows = Array.isArray(balances) ? balances : [];
+  if (!rows.length) return false;
+  return rows.every((b) => (b?.raw == null ? 0n : BigInt(b.raw)) <= 0n);
+}
 export class PayClient {
   constructor() {
     const w = loadOrCreateWallet();
@@ -213,6 +244,11 @@ export class PayClient {
     }
   }
+  async solanaFundingBalances() {
+    const owner = this.keypair.publicKey;
+    return Promise.all(FUNDING_ASSETS.map((a) => cachedTokenBalance(this.connection, owner, a.mint)));
+  }
   async buildPaymentFor(accept, onStage) {
     const rail = railOf(accept);
     if (rail === 'solana') {
@@ -224,6 +260,22 @@ export class PayClient {
         bal = await cachedTokenBalance(this.connection, this.keypair.publicKey, accept.asset, { force: true });
       }
       if (bal.raw < need) {
+        // Empty first-run burner: 0 wrapped + 0 USDC/TOKEN/LEOS. Do not
+        // resolvePool / poolState / sendWrap just to learn that.
+        const funding = await this.solanaFundingBalances();
+        if (solanaFundingEmpty(funding)) {
+          throw new UnderfundedError(accept, 0, this.address);
+        }
+        const underMint = hintedUnderlyingMint(accept);
+        if (underMint) {
+          let under = await cachedTokenBalance(this.connection, this.keypair.publicKey, underMint);
+          if (under.raw <= 0n && under.cached) {
+            under = await cachedTokenBalance(this.connection, this.keypair.publicKey, underMint, { force: true });
+          }
+          if (skipWrapWhenEmpty(bal.raw, under.raw, need)) {
+            throw new UnderfundedError(accept, under.ui, this.address);
+          }
+        }
         const topUp = await this.topUpQuotedAsset(accept, need, onStage);
         if (topUp.preInstructions) {
           return buildPaymentOnline(this.connection, this.keypair, accept, {
@@ -290,14 +342,26 @@ export class PayClient {
     const pool = await resolvePool(this.connection, accept.asset).catch(() => null);
     if (!pool) throw new UnderfundedError(accept, null, this.address);
+    // Balances first. 0 wrapped + 0 underlying → throw. Never poolState or
+    // sendWrap just to discover an empty burner (measured ~4.5s per row).
+    const [wrappedNow, underlyingNow] = await Promise.all([
+      tokenBalance(this.connection, owner, accept.asset),
+      tokenBalance(this.connection, owner, pool.underlying.toBase58()),
+    ]);
+    if (skipWrapWhenEmpty(wrappedNow.raw, underlyingNow.raw, need)) {
+      throw new UnderfundedError(accept, underlyingNow.ui, this.address);
+    }
     for (let attempt = 0; attempt < 3; attempt++) {
-      const bal = await tokenBalance(this.connection, owner, accept.asset);
+      const bal = attempt === 0 ? wrappedNow : await tokenBalance(this.connection, owner, accept.asset);
       const short = need - bal.raw;
       if (short <= 0n) return {};
       const { reserves, supply } = await poolState(this.connection, pool);
       const deposit = depositForShares(short, reserves, supply);
-      const underlyingBal = await tokenBalance(this.connection, owner, pool.underlying.toBase58());
+      const underlyingBal = attempt === 0
+        ? underlyingNow
+        : await tokenBalance(this.connection, owner, pool.underlying.toBase58());
       if (underlyingBal.raw < deposit) {
         throw new UnderfundedError(accept, underlyingBal.ui, this.address);
       }

package/lib/podagent.mjs CHANGED Viewed

@@ -247,7 +247,7 @@ async function httpErrorNote(status) {
         // funded === false is the genuinely-empty case; funded === true after
         // the retries above means the rail/quote failed, not the balance
         if (w.funded === false) {
-          return `(payment failed — HTTP 402, the wallet is empty. ${w.funding}. EVM (Base/Robinhood): ${w.evm}.)`;
+          return `(payment required — HTTP 402, the wallet is empty. ${w.funding}. EVM (Base/Robinhood): ${w.evm}.)`;
         }
         return `(payment failed — HTTP 402 after ${PAYMENT_RETRIES} retries, though the wallet holds ${w.balances || 'a balance'}. Send it again; if it keeps failing the quoted asset may not be convertible right now. Fund with: ${w.funding})`;
       }
@@ -276,7 +276,13 @@ function sanitizeProxiedError(msg) {
 // this attempt, but the NEXT attempt usually settles (measured: same wallet,
 // same rail, second call pays fine). Surfacing that as a chat message makes
 // the user do the retry by hand — so do it here instead.
+// Empty/underfunded is NOT that handshake: retrying just re-walks wrap.
 const PAYMENT_RETRIES = 3;
+export function isUnderfunded402Body(body) {
+  const msg = String(body?.error?.message || body?.error || body?.message || '');
+  return /\b(?:underfunded|wallet is empty|empty wallet)\b/i.test(msg);
+}
 /**
  * ADAPTIVE top_k. We have learned this one the expensive way already.
  *
@@ -329,6 +335,10 @@ async function postChat(body, contextId, topK, onStatus, signal) {
       ...(signal ? { signal } : {}),
     });
     if (r.status !== 402 || attempt === PAYMENT_RETRIES) return r;
+    // Handshake 402 (funded, settle flake) → retry. Empty-wallet 402 → stop.
+    // Opening Pay / parking happens on the empty body, not on every 402.
+    const peek = await r.clone().json().catch(() => null);
+    if (isUnderfunded402Body(peek)) return r;
     // A 402 retry used to be silent — grokui sat on mute "…" for the whole
     // settle. Tell the watcher this attempt is paying, not wedged.
     onStatus?.(formatPayStatus(attempt));