openzoo 0.50.95 → 0.50.97

package/bin/claude-zoo.js

@@ -6,7 +6,7 @@
  * the local openzoo proxy on :8402 (x402 per-call payment, no Anthropic
  * subscription, no login):
  *
- *   - starts the proxy if it is not already listening
+ *   - starts the proxy if it is not already THIS version on :8402 (steals stale)
  *   - applies claudeZooEnv(): ANTHROPIC_BASE_URL=localhost:PORT/v1,
  *     AUTH_TOKEN=sk-openzoo, ANTHROPIC_API_KEY deleted, compaction disabled
  *     (the proxy binds the prefix), 1M-token ceiling restored
@@ -16,7 +16,8 @@
  * `claude-code-cli` (same directory, symlinked to occ).
  */
 import { spawn } from 'node:child_process';
-import { existsSync, readdirSync as fsReaddir } from 'node:fs';
+import { existsSync, readdirSync as fsReaddir, readFileSync } from 'node:fs';
+import { execSync } from 'node:child_process';
 import { homedir, platform } from 'node:os';
 import { dirname, join, sep } from 'node:path';
 import { fileURLToPath } from 'node:url';
@@ -50,10 +51,34 @@ if (!occ) {
 const PROXY_PORT = Number(process.env.OPENZOO_PROXY_PORT || 8402);
 const PROXY_URL = `http://localhost:${PROXY_PORT}/v1`;
 
+function mineVersion() {
+  try {
+    return JSON.parse(readFileSync(join(shimRoot, 'package.json'), 'utf8')).version;
+  } catch { return ''; }
+}
+
+function stealPort(port) {
+  const n = Number(port);
+  for (const cmd of [
+    `lsof -t -iTCP:${n} -sTCP:LISTEN | xargs kill -9`,
+    `fuser -k ${n}/tcp`,
+  ]) {
+    try { execSync(cmd, { stdio: 'ignore', timeout: 2000, shell: true }); } catch { /* missing */ }
+  }
+}
+
 async function proxyUp() {
   try {
     const r = await fetch(`http://localhost:${PROXY_PORT}/v1/info`, { signal: AbortSignal.timeout(1500) });
-    return r.ok;
+    if (!r.ok) return false;
+    const j = await r.json().catch(() => ({}));
+    const mine = mineVersion();
+    if (mine && String(j.version || '') !== mine) {
+      console.error(`claude: stale proxy v${j.version || '?'} on :${PROXY_PORT} — stealing for v${mine}`);
+      stealPort(PROXY_PORT);
+      return false;
+    }
+    return true;
   } catch { return false; }
 }
 

package/lib/aoe.js

@@ -287,9 +287,15 @@ export async function setupAoe(argv = []) {
 
   const base = `http://localhost:${config.port}/v1`;
   if (!flags.has('--no-proxy')) {
-    if (await proxyUp(base)) {
-      console.error(`openzoo: proxy already up on ${base}`);
+    const { oursOn, packageVersion, killListen } = await import('./proxy.js');
+    if (await oursOn(config.port)) {
+      console.error(`openzoo: proxy v${packageVersion()} already on ${base}`);
     } else {
+      if (await proxyUp(base)) {
+        console.error(`openzoo: stale proxy on ${base} — stealing :${config.port}`);
+        killListen(config.port);
+        await new Promise((r) => setTimeout(r, 400));
+      }
       const { pid, logPath } = startDetachedProxy({ tunnel: flags.has('--tunnel') });
       let up = false;
       for (let i = 0; i < 40 && !up; i++) {

package/lib/cursorbackend.js

@@ -44,7 +44,8 @@ import {
   readWakeups, writeWakeups, shapeWakeup, parseWakeupEvery, wantsWakeupCron,
   DEFAULT_WAKEUP_PROMPT, addDeletedIds, filterDeleted,
 } from './grokbotAccount.js';
-import { formatSpendFooter, mergeTurnProof } from './spendProof.js';
+import { spendChipLabel, formatSpendFooter, mergeTurnProof } from './spendProof.js';
+import { spendLinesOnly, writeSpendHud } from './ozSpendChip.js';
 import { zooModelIds, zooModelRow, mediaKindOf } from './models.js';
 import { prefixVisitorRichText } from './grokbotweb.js';
 import {
@@ -651,10 +652,10 @@ async function fetchEnsureSandBox(req, body, log) {
   try {
     const remote = await podJson('/api/listAgents', {}, log);
     if (Array.isArray(remote) && remote.length) {
-      const merged = rosterForEvent(mergeAgentLists(remote), agentActivity);
+      const merged = rosterForEvent(mergeAgentLists(remote), agentActivity, { includeHidden: true }); // GROKROOM-HIDDEN-BOTS
       saveAgents(merged);
       const active = focusedAgentId || merged[0]?.id;
-      ssePush('agents', { agents: merged, activeAgentId: active });
+      ssePush('agents', { agents: merged.filter((a) => !a.hidden), activeAgentId: active }); // GROKROOM-HIDDEN-BOTS
       log(`cursor-backend:      discovered roster n=${merged.length} account=${realPod.accountId}`);
     }
   } catch (e) {
@@ -836,9 +837,9 @@ async function proxyPodHttp(req, res, full, body, log) {
       try {
         const parsed = JSON.parse(String(inflateBody(cap.buf, cap.respHeaders)));
         if (Array.isArray(parsed)) {
-          const merged = rosterForEvent(mergeAgentLists(parsed), agentActivity);
+          const merged = rosterForEvent(mergeAgentLists(parsed), agentActivity, { includeHidden: true }); // GROKROOM-HIDDEN-BOTS
           saveAgents(merged);
-          jsonSend(res, merged);
+          jsonSend(res, merged.filter((a) => !a.hidden)); // GROKROOM-HIDDEN-BOTS
           log(`cursor-backend:      listAgents 200 merged n=${merged.length} account=${activeAccountId || '?'}`);
           return true;
         }
@@ -971,7 +972,7 @@ function pushCreatedAgent(agent, { select = true } = {}) {
   const active = focusedAgentId || agent.id;
   const list = rosterForEvent(cachedAgentList() || [], agentActivity);
   ssePush('agent-upserted', { agent, activeAgentId: active });
-  ssePush('agents', { agents: list, activeAgentId: active });
+  ssePush('agents', { agents: list.filter((a) => !a.hidden), activeAgentId: active }); // GROKROOM-HIDDEN-BOTS
 }
 
 /** Grok Bot Helper daemon: GET /local-exec/requests is SSE, POST /local-exec/responses
@@ -1880,7 +1881,15 @@ async function zooSpendOverlay(data) {
   const bal = Number.isFinite(wallet) && wallet > 0.004
     ? wallet
     : (Number.isFinite(credit) && credit > 0.004 ? credit : null);
-  return formatSpendFooter({
+  const label = spent > 0.00005 ? spendChipLabel({
+    billedUsd: x.billedUsd,
+    directUsd: x.directUsd,
+    spent,
+    would,
+    saved,
+    pct,
+  }) : '';
+  const footer = formatSpendFooter({
     billedUsd: x.billedUsd,
     directUsd: x.directUsd,
     spent,
@@ -1890,6 +1899,12 @@ async function zooSpendOverlay(data) {
     balance: bal,
     x402: x,
   });
+  const body = spendLinesOnly(footer) || (spent > 0.00005
+    ? `spent $${spent.toFixed(4)} · OpenRouter would $${would.toFixed(4)} · saved $${saved.toFixed(4)} (${pct.toFixed(0)}%)`
+    : '');
+  const state = { spent, would, saved, pct, label, billedUsd: x.billedUsd, directUsd: x.directUsd, balance: bal, body };
+  try { writeSpendHud(state); } catch { /* */ }
+  return state;
 }
 
 const MODELS_PATH = path.join(os.homedir(), '.openzoo', 'grokbot-models.json');
@@ -2941,7 +2956,7 @@ async function zooComplete(prompt, log, agentId, parsed = {}, opts = {}) {
           'This is a public visitor chat. You do not have filesystem, shell, or local-exec access on the host Mac.',
           'Reply in chat only. Do not claim you will write files, run commands, or use local tools.',
           'Each human line is prefixed with that visitor\'s shortname and a colon, like "rex: hello". Different shortnames are different people. Address them by that name.',
-          'A spend footer is appended after your reply by the host -- ignore it.',
+          'Do not write spend totals, solscan links, memos, or ::oz-spend:: into the reply. The host paints a HUD pill.',
           'Prior turns of THIS Grok Bot chat are in the messages below. Do not claim the thread starts blank or that earlier questions did not arrive.',
         ].join(' ')
         : [
@@ -2984,8 +2999,8 @@ async function zooComplete(prompt, log, agentId, parsed = {}, opts = {}) {
           'Never claim you lack filesystem access or local-exec. If a tool errors, report the error.',
           'After using tools you MUST still write a normal chat reply: what you did, file paths written, and what to open. Empty content is a bug. A new user message cancels this turn — leave a visible reply before that happens.',
           'Do not stop mid-task. Do not write "Stopped on research", "nothing to open yet", "no app files written this turn", or "say go again". Keep using tools until the files the user asked for exist on disk THIS turn. Summarize only after those writes succeed.',
-          'A spend footer is appended after your reply by the host — ignore it.',
-          'The operator wallet pays every zoo call via x402 (TOKEN/USDC on Solana; SOL gas is sponsored). If this thread has a spend footer or solscan/basescan tx, the call WAS paid. Do not say you have no money, cannot afford tools, or need the human to fund you. A 402/underfunded tool error is a host retry — continue the job.',
+          'Do not write spend totals, solscan links, memos, or ::oz-spend:: into the reply. The host paints a HUD pill.',
+          'The operator wallet pays every zoo call via x402 (TOKEN/USDC on Solana; SOL gas is sponsored). If the spend HUD is visible or a prior turn paid, the call WAS paid. Do not say you have no money, cannot afford tools, or need the human to fund you. A 402/underfunded tool error is a host retry — continue the job.',
           'Prior turns of THIS Grok Bot chat are in the messages below. Do not claim the thread starts blank or that earlier questions did not arrive.',
         ].join(' '),
     },
@@ -3075,17 +3090,22 @@ async function zooComplete(prompt, log, agentId, parsed = {}, opts = {}) {
     if (r.status === 402) {
       const raw = zooTextFromMessage(data?.choices?.[0]?.message, data)
         || data?.error?.message
-        || 'openzoo wallet underfunded.';
+        || 'openzoo payment required (HTTP 402).';
+      data.error = data.error || {};
+      data.error.message = raw;
       try {
-        const { withOnrampLink } = await import('./stripeOnramp.js');
-        const { loadOrCreateWallet } = await import('./wallet.js');
-        const w = loadOrCreateWallet();
-        const usd = Number(String(raw).match(/≈\$([0-9.]+)/)?.[1]);
-        data.error = data.error || {};
-        data.error.message = await withOnrampLink(raw, {
-          solana: w.keypair.publicKey.toBase58(),
-          usd,
-        });
+        const { withOnrampLink, isFundInstruction } = await import('./stripeOnramp.js');
+        // Settle/upstream 402s keep the real message. Whop copy-paste only
+        // when this is a genuine empty-wallet / fund-me instruction.
+        if (isFundInstruction(raw)) {
+          const { loadOrCreateWallet } = await import('./wallet.js');
+          const w = loadOrCreateWallet();
+          const usd = Number(String(raw).match(/≈\$([0-9.]+)/)?.[1]);
+          data.error.message = await withOnrampLink(raw, {
+            solana: w.keypair.publicKey.toBase58(),
+            usd,
+          });
+        }
       } catch { /* keep proxy copy */ }
     }
     return { r, data };
@@ -3232,7 +3252,7 @@ async function zooComplete(prompt, log, agentId, parsed = {}, opts = {}) {
   if (lastData && typeof lastData === 'object') {
     lastData.x402 = mergeTurnProof(turnX402, lastData);
   }
-  try { text += await zooSpendOverlay(lastData); } catch { /* overlay must never eat the reply */ }
+  try { await zooSpendOverlay(lastData); } catch { /* HUD dump; never append to the reply */ }
   return { text, data: lastData };
 }
 
@@ -3297,6 +3317,12 @@ async function handleHijackedPodHttp(req, res, full, body, log) {
   // Revive: the minutely cron (scripts/revive-bots.sh) calls this after it has
   // made sure the hijack + app are alive. Every non-group bot gets a wakeup
   // timer if it lost one; nothing is spawned, nothing already armed is touched.
+  if (name === 'ozSpend') {
+    let state = { spent: 0, would: 0, saved: 0, pct: 0, label: '' };
+    try { state = await zooSpendOverlay(null); } catch { /* */ }
+    jsonSend(res, { ok: true, ...state });
+    return true;
+  }
   if (name === 'ozRevive') {
     let parsed = {};
     try { parsed = JSON.parse(String(body || '{}')); } catch { parsed = {}; }
@@ -3603,7 +3629,6 @@ async function handleHijackedPodHttp(req, res, full, body, log) {
               text = `model set to ${id}`;
             }
           }
-          try { text += await zooSpendOverlay({}); } catch { /* */ }
         } else {
           const members = groupMemberIds(agentId);
           if (members.length) {