npm - openzoo - Versions diffs - 0.49.16 → 0.49.17 - Mend

openzoo 0.49.16 → 0.49.17

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

package/lib/grokui.mjs CHANGED Viewed

@@ -16,12 +16,6 @@ import { routeChatBody } from './modelroute.js';
 import { peekDirectiveStatus, formatRaceStatus, STALE_THINKING_MS, summarizeRaceFailures, RACE_EVERY_FAILED } from './livestatus.js';
 import { creditBalance } from './info.js';
 import { guardFindCwd } from './runguard.js';
-import {
-  SUBSCRIPTIONS_PAGE,
-  saveSubscription, clearSubscription,
-  subscriptionPublicView, parseSubscriptionPaste,
-  billingTiers, billingCheckout, fetchBillingKey, ingestBillingKeyResponse,
-} from './subscription.js';
 import {
   prepareChildDir, finishChildDir, lockWorktree, unlockWorktree,
   parsePrRef, fetchSpecsForOrigin, agentSlug,
@@ -3837,24 +3831,8 @@ const APP_HTML = `<!doctype html>
   </div>
   <div id="walletOverlay" data-component="wallet-modal">
     <div id="walletBox">
-      <h3>Pay with a card</h3>
-      <div class="wsub">Pay with a card. Basic, Pro, and Ultra are first. Wallet/x402 is the other option below — it stays; it is not the lead.</div>
-      <div id="subLane" data-component="subscribe-lane">
-        <div class="wlanetitle">Subscribe with a card</div>
-        <div class="wtag">Subscription key · no x402</div>
-        <div class="wsub">Same plans as the public page. Checkout opens in the system browser — never an in-app Stripe window. After Stripe, this app polls the site’s key endpoint with the checkout session, or you paste the key from the success page.</div>
-        <div id="subStatus"></div>
-        <div id="subTiers">loading plans…</div>
-        <div class="wpaste">
-          <div class="wlab">I already subscribed — paste key</div>
-          <input id="subKeyInp" type="text" autocomplete="off" spellcheck="false"
-                 placeholder="key, or the /billing/done?session=… URL">
-          <button type="button" id="subKeyBtn">Save key</button>
-          <button type="button" id="subForgetBtn" hidden>Remove key</button>
-        </div>
-        <div class="wnote" id="subNote"></div>
-        <div class="wquiet"><a id="subPageLink" href="${SUBSCRIPTIONS_PAGE}" target="_blank" rel="noopener">Full subscriptions page</a></div>
-      </div>
+      <h3>Pay per call</h3>
+      <div class="wsub">Wallet/x402 is the only pay lane. There is no key to buy and none to paste: every call settles on chain from the burner below.</div>
       <div class="wlane" id="x402Lane" data-component="x402-lane">
         <div class="wlanetitle">Wallet / x402</div>
         <div class="wsub">This is <b>your</b> local burner on this machine (or this box). Keys stay in ~/.openzoo/wallet.json. It is not openzoo’s wallet, not a shared zoo account, not the model’s. You fund these deposit addresses; the app pays x402 per call from this wallet. Public addresses only — the UI never shows the key.</div>
@@ -3910,7 +3888,6 @@ const APP_HTML = `<!doctype html>
     </div>
     <div id="hud">
       <div class="htitle">YOUR WALLET · THIS SESSION</div>
-      <div class="hrow" id="hSubRow" hidden><span>subscription</span><span id="hSub" class="hlime">—</span></div>
       <div class="hrow"><span>prepaid credit</span><span id="hCredit" class="hlime">—</span></div>
       <div class="hrow"><span>you've paid</span><span id="hYouSpent">—</span></div>
       <div class="hrow"><span>our cost (cogs)</span><span id="hYouCogs">—</span></div>
@@ -4389,9 +4366,8 @@ const APP_HTML = `<!doctype html>
     if (!w || (!w.solana && !w.evm && w.creditUsd == null)) {
       const p = document.createElement('div');
       p.className = 'wnote wempty';
-      p.textContent = 'Could not reach the local openzoo proxy on :8402. It may still be starting — try again in a few seconds. You can still subscribe with a card above.';
+      p.textContent = 'Could not reach the local openzoo proxy on :8402. It may still be starting — try again in a few seconds.';
       walletBody.appendChild(p);
-      renderSubLane(w && w.subscription ? w.subscription : null);
       return;
     }
     if (w.creditUsd != null && w.creditUsd !== '') {
@@ -4425,197 +4401,32 @@ const APP_HTML = `<!doctype html>
     note.className = 'wnote';
     // funded === false is the genuinely-empty case. Undefined means the proxy
     // did not say, and guessing "empty" there would send someone to top up a
-    // wallet that is fine. A live subscription is the other pay lane — do not
-    // nag an empty wallet as fatal when calls already skip x402.
-    const subOn = w.subscription && w.subscription.active;
-    note.textContent = subOn
-      ? ('Wallet is optional while a subscription is active. ' + (w.funding || ''))
-      : (w.funded === false
-        ? 'This wallet is EMPTY — wallet/x402 calls will fail with HTTP 402 until you fund the addresses above, or subscribe with a card at the top. ' + (w.funding || '')
-        : (w.funding || ''));
-    if (w.funded === false && !subOn) note.classList.add('wempty');
+    // wallet that is fine.
+    note.textContent = w.funded === false
+      ? 'This wallet is EMPTY — every call will fail with HTTP 402 until you fund the addresses above. ' + (w.funding || '')
+      : (w.funding || '');
+    if (w.funded === false) note.classList.add('wempty');
     if (note.textContent.trim()) walletBody.appendChild(note);
-    renderSubLane(w.subscription || null);
-  }
-  var subPollTimer = null;
-  var subBuying = null;
-  function setSubNote(text, empty) {
-    const el = document.getElementById('subNote');
-    if (!el) return;
-    el.textContent = text || '';
-    el.className = empty ? 'wnote wempty' : 'wnote';
-  }
-  function renderSubLane(sub) {
-    const status = document.getElementById('subStatus');
-    const forget = document.getElementById('subForgetBtn');
-    if (status) {
-      status.innerHTML = '';
-      if (sub && sub.active) {
-        const p = document.createElement('div');
-        p.className = 'wsubon';
-        p.textContent = sub.label || (sub.tierName || 'Subscription') + ' · no x402';
-        status.appendChild(p);
-      }
-    }
-    if (forget) forget.hidden = !(sub && sub.active);
-    loadSubTiers();
-  }
-  async function loadSubTiers() {
-    const box = document.getElementById('subTiers');
-    if (!box) return;
-    let body = null;
-    try {
-      const r = await fetch(API + '/billing/tiers');
-      body = r.ok ? await r.json() : null;
-    } catch (e) { body = null; }
-    box.innerHTML = '';
-    const tiers = body && body.ok && Array.isArray(body.tiers) ? body.tiers : [];
-    if (!tiers.length) {
-      const p = document.createElement('div');
-      p.className = 'wnote wempty';
-      p.textContent = 'Could not load live plans from zoo.openzoo.fun — try again, or use the full subscriptions page.';
-      box.appendChild(p);
-      return;
-    }
-    tiers.forEach(function (t) {
-      const art = document.createElement('div');
-      art.className = 'wtier' + (t.id === 'pro' ? ' hot' : '');
-      art.setAttribute('data-tier', t.id);
-      const tag = document.createElement('div');
-      tag.className = 'wtag';
-      tag.textContent = t.id === 'pro' ? 'Most teams want this' : '';
-      const name = document.createElement('div');
-      name.className = 'wtn';
-      name.textContent = t.name || t.id;
-      const price = document.createElement('div');
-      price.className = 'wtp';
-      price.textContent = '$' + ((Number(t.monthlyCents) || 0) / 100).toFixed(0) + '/mo';
-      const share = document.createElement('div');
-      share.className = 'wts';
-      share.textContent = (t.savingsSharePct != null ? t.savingsSharePct : '?') + '% savings share';
-      const blurb = document.createElement('div');
-      blurb.className = 'wtb';
-      blurb.textContent = t.blurb || '';
-      const btn = document.createElement('button');
-      btn.type = 'button';
-      btn.textContent = subBuying === t.id ? 'Opening checkout…' : ('Get ' + (t.name || t.id));
-      btn.disabled = subBuying != null;
-      btn.addEventListener('click', function () { buyTier(t.id); });
-      art.append(tag, name, price, share, blurb, btn);
-      box.appendChild(art);
-    });
-  }
-  function openSystemBrowser(url) {
-    // Electron's setWindowOpenHandler routes target=_blank to shell.openExternal.
-    // Never load Stripe inside this window.
-    window.open(url, '_blank', 'noopener,noreferrer');
-  }
-  function stopSubPoll() {
-    if (subPollTimer) { clearInterval(subPollTimer); subPollTimer = null; }
-  }
-  function startSubPoll(sessionId) {
-    stopSubPoll();
-    var tries = 0;
-    async function tick() {
-      tries += 1;
-      try {
-        const r = await fetch(API + '/billing/key?session=' + encodeURIComponent(sessionId));
-        const j = r.ok ? await r.json() : null;
-        if (j && j.saved) {
-          stopSubPoll();
-          setSubNote('Subscription key saved · no x402');
-          await openWallet();
-          return;
-        }
-        if (j && j.pending) setSubNote('Waiting for Stripe to confirm…');
-        else if (j && j.error && j.error !== 'session required') setSubNote(j.error, true);
-      } catch (e) { /* keep polling */ }
-      if (tries >= 60) {
-        stopSubPoll();
-        setSubNote('Still waiting on Stripe — paste the key from the success page if you have it.');
-      }
-    }
-    subPollTimer = setInterval(tick, 2000);
-    tick();
-  }
-  async function buyTier(tier) {
-    subBuying = tier;
-    setSubNote('');
-    loadSubTiers();
-    try {
-      const r = await fetch(API + '/billing/checkout', {
-        method: 'POST', headers: { 'content-type': 'application/json' },
-        body: JSON.stringify({ tier: tier }),
-      });
-      const j = await r.json();
-      if (!j || !j.ok || !j.url) throw new Error((j && j.error) || 'checkout failed');
-      openSystemBrowser(j.url);
-      setSubNote('Checkout opened in your system browser. This window will pick up the key when Stripe confirms.');
-      if (j.sessionId) startSubPoll(j.sessionId);
-    } catch (e) {
-      setSubNote(e.message || String(e), true);
-    }
-    subBuying = null;
-    loadSubTiers();
-  }
-  async function savePastedSub() {
-    const inp = document.getElementById('subKeyInp');
-    const paste = inp ? inp.value.trim() : '';
-    if (!paste) { setSubNote('Paste a key or the billing/done URL.', true); return; }
-    try {
-      const r = await fetch(API + '/billing/key', {
-        method: 'POST', headers: { 'content-type': 'application/json' },
-        body: JSON.stringify({ paste: paste }),
-      });
-      const j = await r.json();
-      if (j && j.pending && j.session) {
-        setSubNote('Waiting for Stripe to confirm…');
-        startSubPoll(j.session);
-        return;
-      }
-      if (!j || !j.saved) throw new Error((j && j.error) || 'could not save key');
-      if (inp) inp.value = '';
-      setSubNote('Subscription key saved · no x402');
-      await openWallet();
-    } catch (e) {
-      setSubNote(e.message || String(e), true);
-    }
-  }
-  async function forgetSub() {
-    try {
-      await fetch(API + '/billing/key', { method: 'DELETE' });
-    } catch (e) { /* still refresh */ }
-    setSubNote('Subscription key removed. Wallet/x402 is the pay method again.');
-    await openWallet();
   }
   document.getElementById('walletBtn').addEventListener('click', () => {
     echoSlash('/pay');
     openWallet();
   });
-  const subKeyBtn = document.getElementById('subKeyBtn');
-  if (subKeyBtn) subKeyBtn.addEventListener('click', savePastedSub);
-  const subForgetBtn = document.getElementById('subForgetBtn');
-  if (subForgetBtn) subForgetBtn.addEventListener('click', forgetSub);
-  const subKeyInp = document.getElementById('subKeyInp');
-  if (subKeyInp) subKeyInp.addEventListener('keydown', function (e) {
-    if (e.key === 'Enter') { e.preventDefault(); savePastedSub(); }
-  });
-  // First launch: if the burner is empty AND there is no subscription, open
-  // the pay modal once so they see card plans first — and burner addresses
-  // below. localStorage so a funded session, a saved key, or a dismiss does
-  // not keep popping it.
+  // First launch: if the burner is empty, open the pay modal once so the
+  // deposit addresses are the first thing seen. localStorage so a funded
+  // session or a dismiss does not keep popping it.
   (async function maybeOpenWalletOnce() {
     if (localStorage.getItem('openzoo.wallet.seen')) return;
     for (let i = 0; i < 8; i++) {
       try {
         const r = await fetch(API + '/wallet');
         const w = r.ok ? await r.json() : null;
-        if (!w || (!w.solana && !w.evm && !(w.subscription && w.subscription.active))) {
+        if (!w || (!w.solana && !w.evm)) {
           await new Promise((res) => setTimeout(res, 400));
           continue;
         }
         localStorage.setItem('openzoo.wallet.seen', '1');
-        if (w.funded === false && !(w.subscription && w.subscription.active)) await openWallet();
+        if (w.funded === false) await openWallet();
         return;
       } catch (e) {
         await new Promise((res) => setTimeout(res, 400));
@@ -6077,16 +5888,6 @@ const APP_HTML = `<!doctype html>
       const you = await (await fetch(API + '/hud-summary')).json();
       const creditEl = document.getElementById('hCredit');
       if (creditEl) creditEl.textContent = (you.creditUsd == null) ? '—' : usd(Number(you.creditUsd) || 0);
-      const subRow = document.getElementById('hSubRow');
-      const subEl = document.getElementById('hSub');
-      if (subRow && subEl) {
-        if (you.subscription && you.subscription.active) {
-          subRow.hidden = false;
-          subEl.textContent = you.subscription.label || you.subscription.tierName || 'Subscription key · no x402';
-        } else {
-          subRow.hidden = true;
-        }
-      }
       const spent = Number(you.spentUsd) || 0;
       const cogs = Number(you.cogsUsd) || 0;
       const direct = Number(you.directUsd) || 0;
@@ -6185,116 +5986,12 @@ const server = http.createServer((req, res) => {
       try {
         w.creditUsd = await creditBalance();
       } catch { /* leave credit off if the gateway is down */ }
-      // Subscription is local (~/.openzoo/subscription.json). Merge it here so
-      // an older :8402 that does not yet know about Stripe still shows the lane.
-      w.subscription = subscriptionPublicView();
       res.writeHead(200, { 'content-type': 'application/json' });
       res.end(JSON.stringify(w));
     })();
     return;
   }
-  // Live Stripe plans — never a stale hardcoded $9/$29/$99. Same origin so
-  // the renderer does not have to talk to zoo.openzoo.fun itself.
-  if (req.method === 'GET' && req.url === '/billing/tiers') {
-    (async () => {
-      try {
-        const body = await billingTiers();
-        res.writeHead(200, { 'content-type': 'application/json' });
-        res.end(JSON.stringify(body));
-      } catch (e) {
-        res.writeHead(502, { 'content-type': 'application/json' });
-        res.end(JSON.stringify({ ok: false, error: e.message }));
-      }
-    })();
-    return;
-  }
-  if (req.method === 'POST' && req.url === '/billing/checkout') {
-    const chunks = [];
-    req.on('data', (d) => chunks.push(d));
-    req.on('end', async () => {
-      let tier = '';
-      try { tier = JSON.parse(Buffer.concat(chunks).toString('utf8') || '{}').tier || ''; }
-      catch { /* ignore */ }
-      try {
-        const body = await billingCheckout(tier);
-        res.writeHead(200, { 'content-type': 'application/json' });
-        res.end(JSON.stringify(body));
-      } catch (e) {
-        res.writeHead(502, { 'content-type': 'application/json' });
-        res.end(JSON.stringify({ ok: false, error: e.message }));
-      }
-    });
-    return;
-  }
-  // GET ?session= polls the same endpoint the public /billing/done page uses.
-  // On a key, persist it locally and return a public view — never the secret
-  // (this UI can sit on a public box URL).
-  if (req.method === 'GET' && (req.url || '').startsWith('/billing/key')) {
-    (async () => {
-      const q = new URL(req.url, 'http://x').searchParams;
-      const session = q.get('session') || q.get('session_id') || '';
-      try {
-        const body = await fetchBillingKey(session);
-        res.writeHead(200, { 'content-type': 'application/json' });
-        res.end(JSON.stringify(ingestBillingKeyResponse(body, {
-          sessionId: session,
-          tier: q.get('tier') || null,
-        })));
-      } catch (e) {
-        res.writeHead(502, { 'content-type': 'application/json' });
-        res.end(JSON.stringify({ ok: false, error: e.message }));
-      }
-    })();
-    return;
-  }
-  if (req.method === 'POST' && req.url === '/billing/key') {
-    const chunks = [];
-    req.on('data', (d) => chunks.push(d));
-    req.on('end', async () => {
-      let paste = '';
-      let tier = '';
-      try {
-        const j = JSON.parse(Buffer.concat(chunks).toString('utf8') || '{}');
-        paste = j.paste || j.key || '';
-        tier = j.tier || '';
-      } catch { /* ignore */ }
-      const parsed = parseSubscriptionPaste(paste);
-      if (parsed.error) {
-        res.writeHead(400, { 'content-type': 'application/json' });
-        res.end(JSON.stringify({ ok: false, error: parsed.error }));
-        return;
-      }
-      if (parsed.session) {
-        try {
-          const body = await fetchBillingKey(parsed.session);
-          const out = ingestBillingKeyResponse(body, { sessionId: parsed.session, tier });
-          if (out.pending) out.session = parsed.session;
-          res.writeHead(200, { 'content-type': 'application/json' });
-          res.end(JSON.stringify(out));
-        } catch (e) {
-          res.writeHead(502, { 'content-type': 'application/json' });
-          res.end(JSON.stringify({ ok: false, error: e.message }));
-        }
-        return;
-      }
-      saveSubscription({ key: parsed.key, tier: tier || null });
-      res.writeHead(200, { 'content-type': 'application/json' });
-      res.end(JSON.stringify({ ok: true, saved: true, ...subscriptionPublicView() }));
-    });
-    return;
-  }
-  if (req.method === 'DELETE' && req.url === '/billing/key') {
-    clearSubscription();
-    res.writeHead(200, { 'content-type': 'application/json' });
-    res.end(JSON.stringify({ ok: true, saved: false, ...subscriptionPublicView() }));
-    return;
-  }
   // Restart grokui in place — and ACTUALLY PICK UP THE NEW BUILD.
   //
   // Exiting is the restart: on a production box, box-server's ensureOz() poll
@@ -6351,7 +6048,6 @@ const server = http.createServer((req, res) => {
       try {
         you.creditUsd = await creditBalance();
       } catch { /* credit is advisory */ }
-      you.subscription = subscriptionPublicView();
       res.writeHead(200, { 'content-type': 'application/json' });
       res.end(JSON.stringify(you));
     })();

package/lib/info.js CHANGED Viewed

@@ -39,8 +39,11 @@ function fmtUi(raw, decimals) {
  * The quote already carries `extra.tokenUsd` for every asset it settles in —
  * the very "priced at the 402" this file kept promising in a footnote while
  * printing `$?`. So a wallet holding 845,486 TOKEN summed to "≈ $0.11 known".
- * Symbols come back wrapped (wTOKENx, wLEOSx, wUSDGx); strip the wrapper so a
- * row for the plain token the user actually holds finds its price.
+ *
+ * Symbols are the plain tickers the wallet holds. They used to arrive as
+ * wrapper twins that had to be mapped back to the underlying before a holding
+ * could find its price; the gateway quotes the native mint now, so the symbol
+ * on the row is already the symbol in the wallet.
  */
 export async function quotedPrices() {
   const out = {};
@@ -71,10 +74,7 @@ export async function quotedPrices() {
       const usd = Number(row?.extra?.tokenUsd);
       const sym = String(row?.extra?.symbol || '');
       if (!sym || !Number.isFinite(usd)) continue;
-      // wTOKENx -> TOKEN, wUSDGx -> USDG, yUSDCx -> USDC
-      const plain = sym.replace(/^[wy]/, '').replace(/x$/, '').toUpperCase();
       out[sym.toUpperCase()] = usd;
-      if (!(plain in out)) out[plain] = usd;
     }
   } catch { /* offline: fall back to printing what we know */ }
   return out;
@@ -179,11 +179,10 @@ export async function affordableUsd() {
     const perUsd = BigInt(row.maxAmountRequired || '0');
     if (perUsd <= 0n) continue;
     try {
-      // SPENDABLE, not merely wrapped. Every quote names the WRAPPER, and the
-      // plain token is converted at payment time (topUpQuotedAsset /
-      // acquireWrappedIfNeeded) — so counting only pre-wrapped balance told a
-      // user holding 14,847 TOKEN that their wallet "covers only $1.0230" and
-      // sent them off to fund an account that was already funded.
+      // The quote names the raw mint, so the wallet's balance of it IS what it
+      // can spend. Back when rows named a Token-2022 twin this had to count the
+      // convertible plain token too, and not doing so told a user holding
+      // 14,847 TOKEN their wallet "covers only $1.0230".
       let usd;
       if (client.spendableUsdForAccept) {
         usd = await client.spendableUsdForAccept(row);

package/lib/mcp.js CHANGED Viewed

@@ -8,7 +8,6 @@ import { tokenBalance } from './x402.js';
 import { askWithContext, contextCacheDisabled, BIND_MIN_CHARS } from './hrr.js';
 import { listContexts } from './contexts.js';
 import { withNamespace } from './namespace.js';
-import { subscriptionPublicView } from './subscription.js';
 const pkg = JSON.parse(readFileSync(new URL('../package.json', import.meta.url), 'utf8'));
 // The model zoo_ask uses when the caller does not name one. Opus 5 by default:
@@ -383,10 +382,9 @@ export function buildMcpServer() {
       railsLiveNow: rails?.live ?? null,
       fundWith: hint || `${FUNDING_ASSETS.map((a) => a.symbol).join(' or ')} on Solana`,
       solanaMints: Object.fromEntries(FUNDING_ASSETS.map((a) => [a.symbol, a.mint])),
-      fundHint: 'send a few cents of a listed asset to the address for that rail — Solana assets to solanaAddress, Base assets to evmAddress. The shim converts to whatever the 402 quotes, at payment time. Force a rail with OPENZOO_RAIL=solana|base|robinhood.',
+      fundHint: 'send a few cents of a listed asset to the address for that rail — Solana assets to solanaAddress, Base and Robinhood assets to evmAddress. These are the exact mints the 402 quotes: whatever you fund is what gets spent, with no conversion or wrapping step. Force a rail with OPENZOO_RAIL=solana|base|robinhood.',
       balances,
       receipts: client.receipts.map((r) => ({ at: r.at, line: r.line })),
-      subscription: subscriptionPublicView(),
     });
   });