openzoo 0.50.49 → 0.50.51

package/lib/cursorbackend.js

@@ -41,7 +41,7 @@ import {
   accountPodPath, accountAgentsPath, rosterForAccount, rosterForEvent,
   readHouseRoster, houseAgentsPath, shapeAgent, agentBrief, briefFromName,
   readWakeups, writeWakeups, shapeWakeup, parseWakeupEvery, wantsWakeupCron,
-  DEFAULT_WAKEUP_PROMPT,
+  DEFAULT_WAKEUP_PROMPT, addDeletedIds, filterDeleted,
 } from './grokbotAccount.js';
 import { formatSpendFooter, mergeTurnProof } from './spendProof.js';
 import { prefixVisitorRichText } from './grokbotweb.js';
@@ -363,7 +363,7 @@ function useHouseRoster() {
   return Boolean(process.env.OZ_HIJACK_POD) && !sniffOn();
 }
 function loadAgents() {
-  const house = readHouseRoster(HOME, activeAccountId) || [];
+  const house = filterDeleted(readHouseRoster(HOME, activeAccountId) || [], HOME);
   const shaped = house.map(shapeAgent);
   const dirty = shaped.some((a, i) => a.brief && a.brief !== String(house[i]?.brief || house[i]?.description || ''));
   if (dirty && shaped.length) {
@@ -1264,6 +1264,10 @@ async function fireAgentWakeup(agentId) {
     wakeupLog(`cursor-backend:      wakeup skip busy agent=${id}`);
     return;
   }
+  if (focusedAgentId && String(focusedAgentId) === id) {
+    wakeupLog(`cursor-backend:      wakeup skip focused agent=${id}`);
+    return;
+  }
   const nonce = `oz-wakeup-${id}-${rec.lastAt}`;
   const prompt = rec.prompt || DEFAULT_WAKEUP_PROMPT;
   const turn = zooTurns.begin(id, nonce);
@@ -1299,7 +1303,9 @@ export function restoreAgentWakeups(log = () => {}) {
   const ids = Object.keys(map);
   const now = Date.now();
   ids.forEach((id, i) => {
-    map[id].nextAt = now + 5000 + i * 2000;
+    // Do not fire during Grok Bot boot. 10 parallel zoo turns + CDP on the
+    // spinner page left the window on a white disc. First tick is +90s.
+    map[id].nextAt = now + 90_000 + i * 4000;
   });
   if (ids.length) persistWakeups(map);
   for (const id of ids) armWakeup(map[id]);
@@ -1534,7 +1540,7 @@ function mergeAgentLists(remote) {
     seen.add(a.id);
     out.push(stampActivity(a));
   }
-  return sortAgentsByActivity(out);
+  return sortAgentsByActivity(filterDeleted(out, HOME));
 }
 function gatewayEntry(e) {
   const { seq, pulledRemote, promptRaw, ephemeral, ...rest } = e;
@@ -2906,8 +2912,12 @@ async function handleHijackedPodHttp(req, res, full, body, log) {
     try { parsed = JSON.parse(String(body || '{}')); } catch { parsed = {}; }
     const ids = new Set([].concat(parsed.ids || parsed.id || []).map(String));
     const next = (cachedAgentList() || []).filter((a) => !ids.has(a.id));
+    addDeletedIds(HOME, [...ids]);
     saveAgents(next);
-    for (const id of ids) transcripts.delete(id);
+    for (const id of ids) {
+      transcripts.delete(id);
+      try { cancelAgentWakeup(id); } catch { /* */ }
+    }
     jsonSend(res, { ok: true, deleted: [...ids] });
     log(`cursor-backend:      deleteAgents n=${ids.size}`);
     return true;

package/lib/grokbotAccount.js

@@ -244,6 +244,31 @@ export function readWakeups(home) {
   return out;
 }
 
+export function deletedAgentsPath(home) {
+  return path.join(home, '.openzoo', 'grokbot-deleted.json');
+}
+
+export function readDeletedIds(home) {
+  const raw = readJsonFile(deletedAgentsPath(home));
+  const ids = Array.isArray(raw) ? raw : (raw && Array.isArray(raw.ids) ? raw.ids : []);
+  return new Set(ids.map(String).filter(Boolean));
+}
+
+export function addDeletedIds(home, ids) {
+  const s = readDeletedIds(home);
+  for (const id of ids) if (id) s.add(String(id));
+  const dir = path.dirname(deletedAgentsPath(home));
+  fs.mkdirSync(dir, { recursive: true });
+  fs.writeFileSync(deletedAgentsPath(home), JSON.stringify([...s], null, 2));
+  return s;
+}
+
+export function filterDeleted(agents, home) {
+  const del = readDeletedIds(home);
+  if (!del.size || !Array.isArray(agents)) return agents || [];
+  return agents.filter((a) => a && !del.has(String(a.id)));
+}
+
 export function writeWakeups(home, map) {
   const dir = path.dirname(wakeupsPath(home));
   fs.mkdirSync(dir, { recursive: true });

package/lib/grokcli.js

@@ -110,7 +110,7 @@ const GROK_BOT_BIN = `${APP}/Contents/MacOS/Grok Bot`;
 /** pids whose command is the Grok Bot main binary (not grep itself). */
 export function grokBotPids(run = execSync) {
   try {
-    return run(`pgrep -f ${JSON.stringify(GROK_BOT_BIN)}`, { encoding: 'utf8' })
+    return run(`pgrep -f ${JSON.stringify(GROK_BOT_BIN)}`, { encoding: 'utf8', shell: true })
       .trim().split('\n').map((s) => s.trim()).filter(Boolean);
   } catch {
     return [];
@@ -296,7 +296,7 @@ export async function runBot(argv = []) {
     await new Promise((r) => setTimeout(r, 1500));
   }
 
-  if (plan.spawn) {
+  const launchGrokBot = () => {
     console.error('openzoo: launching Grok Bot');
     console.error(`         CURSOR_API_BASE_URL=${url}`);
     spawn(bin, grokBotChromiumArgs(), {
@@ -315,14 +315,14 @@ export async function runBot(argv = []) {
         SAND_HOST_GATEWAY_NETWORK_TOKEN: 'openzoo',
       },
     }).unref();
-  } else {
-    console.error('openzoo: Grok Bot already hijacked — not spawning another copy');
-  }
+  };
+  if (plan.spawn) launchGrokBot();
+  else console.error('openzoo: Grok Bot already hijacked — not spawning another copy');
 
   injectSpendChipInBackground({
     port: GROKBOT_CDP_PORT,
     log: (m) => console.error(m),
-    delayMs: plan.spawn ? 500 : 200,
+    delayMs: plan.spawn ? 8000 : 2000,
   });
 
   console.error('openzoo: leave this running. ctrl-c stops the backend.');

package/lib/ozSpendChip.js

@@ -7,9 +7,27 @@
  */
 import net from 'node:net';
 import crypto from 'node:crypto';
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+import { spendChipLabel } from './spendProof.js';
 
 export const GROKBOT_CDP_PORT = Number(process.env.OZ_GROKBOT_CDP_PORT || 9444);
 
+/** Session totals for a floating pill when the open canvas has no footer. */
+export function sessionSpendLabel(home = os.homedir()) {
+  try {
+    const s = JSON.parse(fs.readFileSync(path.join(home, '.openzoo', 'session.json'), 'utf8'));
+    const spent = Number(s.spentUsd || s.spendUsd || 0);
+    const would = Number(s.directUsd || 0);
+    const saved = Number(s.savedUsd != null ? s.savedUsd : Math.max(0, would - spent));
+    if (!(spent > 0.00005)) return '';
+    return spendChipLabel({ spent, would, saved, pct: would > 0 ? (100 * saved) / would : 0 });
+  } catch {
+    return '';
+  }
+}
+
 export function grokBotChromiumArgs(port = GROKBOT_CDP_PORT) {
   return [
     '--ignore-certificate-errors',
@@ -133,9 +151,12 @@ export function spendOnlyText(t) {
 }
 
 function ozEnsureSpendCss() {
-  if (document.getElementById('oz-spend-css')) return;
-  const s = document.createElement('style');
-  s.id = 'oz-spend-css';
+  let s = document.getElementById('oz-spend-css');
+  if (!s) {
+    s = document.createElement('style');
+    s.id = 'oz-spend-css';
+    (document.head || document.documentElement).appendChild(s);
+  }
   s.textContent = [
     '.oz-spend{margin:.55rem 0 0;font-size:12px;color:inherit;opacity:.82;max-width:36em}',
     '.oz-spend>summary{cursor:help;list-style:none;display:inline-flex;align-items:center;gap:.35rem;',
@@ -144,8 +165,9 @@ function ozEnsureSpendCss() {
     '.oz-spend>summary::-webkit-details-marker{display:none}',
     '.oz-spend-body{white-space:pre-wrap;margin:.55rem 0 0;font-size:11px;line-height:1.45;opacity:.88;overflow-wrap:anywhere}',
     '[data-oz-spend-hide]{display:none!important}',
+    'button[aria-label="Start voice input"],button[aria-label*="voice input" i],',
+    'button[aria-label*="steminvoer" i],button[aria-label^="Microphone"]{display:none!important}',
   ].join('');
-  (document.head || document.documentElement).appendChild(s);
 }
 
 function ozSpendHost(el) {
@@ -292,27 +314,91 @@ function ozCollapseSpend() {
     ozAttachSpendChip(host, split);
   }
   ozHideSpendLeftovers();
+  ozEnsureFloatSpend();
+}
+
+function ozEnsureFloatSpend() {
+  const label = String(window.__OZ_SESSION_SPEND__ || '').trim();
+  const msgPills = document.querySelectorAll('.oz-spend:not(#oz-spend-float)').length;
+  let el = document.getElementById('oz-spend-float');
+  if (!label || msgPills) {
+    if (el) el.remove();
+    return;
+  }
+  ozEnsureSpendCss();
+  if (!el) {
+    el = document.createElement('details');
+    el.id = 'oz-spend-float';
+    el.className = 'oz-spend';
+    const sum = document.createElement('summary');
+    const body = document.createElement('div');
+    body.className = 'oz-spend-body';
+    body.textContent = 'session spend (this openzoo bot)';
+    el.appendChild(sum);
+    el.appendChild(body);
+    document.body.appendChild(el);
+  }
+  ozPlaceFloat(el);
+  const sum = el.querySelector('summary');
+  if (sum) sum.textContent = 'ⓘ ' + label;
+}
+
+function ozPlaceFloat(el) {
+  if (!el) return;
+  const ta = document.querySelector('textarea, [contenteditable="true"]');
+  const box = ta && ta.getBoundingClientRect();
+  el.style.position = 'fixed';
+  el.style.right = 'auto';
+  el.style.zIndex = '2147483646';
+  el.style.opacity = '0.95';
+  if (box && box.width > 80 && box.top > 48) {
+    el.style.left = Math.round(box.left) + 'px';
+    el.style.top = Math.round(Math.max(8, box.top - 56)) + 'px';
+    el.style.bottom = 'auto';
+  } else {
+    el.style.left = '96px';
+    el.style.bottom = '72px';
+    el.style.top = 'auto';
+  }
 }
 
 function ozWatchSpend() {
-  const run = () => { try { ozCollapseSpend(); } catch { /* */ } };
+  let t = 0;
+  const run = () => {
+    const a = document.activeElement;
+    if (a && (a.tagName === 'TEXTAREA' || a.tagName === 'INPUT' || a.isContentEditable)) return;
+    try { ozCollapseSpend(); } catch (e) {}
+  };
+  const debounced = () => { clearTimeout(t); t = setTimeout(run, 600); };
   if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', run);
   else run();
   try {
-    const mo = new MutationObserver(run);
-    const start = () => { if (document.body) mo.observe(document.body, { childList: true, subtree: true }); };
+    const mo = new MutationObserver(debounced);
+    const start = () => { if (document.body) mo.observe(document.body, { childList: true, subtree: false }); };
     if (document.body) start();
     else document.addEventListener('DOMContentLoaded', start);
-  } catch { /* */ }
-  setInterval(run, 1500);
+  } catch (e) {}
+  try { window.addEventListener('resize', debounced); } catch (e) {}
 }
 
 export function spendChipSource() {
   return [
     '(function ozSpendChip(){',
     "'use strict';",
-    'if (window.__OZ_SPEND_CHIP__ === 4) return;',
-    'window.__OZ_SPEND_CHIP__ = 4;',
+    'if (window.__OZ_SPEND_CHIP__ === 11) {',
+    '  const el = document.getElementById("oz-spend-float");',
+    '  const ta = document.querySelector("textarea, [contenteditable=\\"true\\"]");',
+    '  const box = ta && ta.getBoundingClientRect();',
+    '  if (el && box && box.width > 80) {',
+    '    el.style.position = "fixed";',
+    '    el.style.left = Math.round(box.left) + "px";',
+    '    el.style.top = Math.round(Math.max(8, box.top - 56)) + "px";',
+    '    el.style.right = "auto";',
+    '    el.style.bottom = "auto";',
+    '  }',
+    '  return;',
+    '}',
+    'window.__OZ_SPEND_CHIP__ = 11;',
     chipUsd.toString(),
     labelFromSpendBody.toString(),
     spendLinesOnly.toString(),
@@ -327,6 +413,8 @@ export function spendChipSource() {
     ozPreviousMessageCard.toString(),
     ozAttachSpendChip.toString(),
     ozCollapseSpend.toString(),
+    ozEnsureFloatSpend.toString(),
+    ozPlaceFloat.toString(),
     ozWatchSpend.toString(),
     'ozWatchSpend();',
     '})();',
@@ -511,12 +599,24 @@ export async function listCdpPages(port, fetchImpl = fetch) {
   return [];
 }
 
-async function injectTarget(target, source, connect) {
+async function injectTarget(target, source, connect, { waitForUi = false } = {}) {
   const session = await connect(target.webSocketDebuggerUrl);
   try {
     await session.send('Page.enable').catch(() => {});
     await session.send('Runtime.enable').catch(() => {});
     await session.send('Page.addScriptToEvaluateOnNewDocument', { source }).catch(() => {});
+    if (waitForUi) {
+      for (let i = 0; i < 32; i += 1) {
+        try {
+          const r = await session.send('Runtime.evaluate', {
+            expression: '!!document.querySelector(\'[class*="sand-"], textarea, [contenteditable="true"]\')',
+            returnByValue: true,
+          });
+          if (r?.result?.value) break;
+        } catch { /* still booting */ }
+        await new Promise((ok) => setTimeout(ok, 250));
+      }
+    }
     await session.send('Runtime.evaluate', { expression: source, awaitPromise: false });
   } finally {
     session.close();
@@ -531,6 +631,7 @@ export async function injectSpendChip({
   connect = cdpSession,
   tries = 40,
   delayMs = 400,
+  waitForUi = false,
 } = {}) {
   let targets = [];
   for (let i = 0; i < Math.max(1, tries); i += 1) {
@@ -542,10 +643,12 @@ export async function injectSpendChip({
     log(`openzoo: spend chip CDP :${port} has no pages yet`);
     return { ok: false, injected: 0 };
   }
+  const label = sessionSpendLabel();
+  const src = `window.__OZ_SESSION_SPEND__=${JSON.stringify(label)};\n${source}`;
   let injected = 0;
   for (const t of targets) {
     try {
-      await injectTarget(t, source, connect);
+      await injectTarget(t, src, connect, { waitForUi });
       injected += 1;
     } catch (e) {
       log(`openzoo: spend chip inject ${e.message}`);
@@ -555,11 +658,23 @@ export async function injectSpendChip({
   return { ok: injected > 0, injected };
 }
 
-/** Fire-and-forget wrapper used by `openzoo bot`. */
+/** One CDP attach, then drop the debugger. A loop here pauses the renderer
+ *  so the composer accepts a keystroke and then dies. Reloads pick the chip
+ *  up via Page.addScriptToEvaluateOnNewDocument from that single inject. */
 export function injectSpendChipInBackground(opts = {}) {
   const log = opts.log || ((m) => console.error(m));
-  injectSpendChip({ ...opts, log }).catch((e) => {
-    log(`openzoo: spend chip inject failed ${e.message}`);
-  });
+  const wait = Math.max(0, Number(opts.delayMs) || 400);
+  setTimeout(() => {
+    injectSpendChip({
+      tries: 24,
+      delayMs: 400,
+      waitForUi: true,
+      ...opts,
+      log,
+      connect: (ws) => cdpSession(ws, { timeoutMs: 2500 }),
+    }).catch((e) => {
+      log(`openzoo: spend chip inject failed ${e.message}`);
+    });
+  }, wait);
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openzoo",
-  "version": "0.50.49",
+  "version": "0.50.51",
   "description": "Local x402-paying proxy + MCP server for openzoo.fun — point any OpenAI-compatible harness (Cursor, Claude Code, aider, SDKs) at localhost and it pays per call from a local burner wallet. Solana and Base rails live; Robinhood experimental.",
   "license": "MIT",
   "type": "module",