openzoo 0.50.33 → 0.50.35

package/bin/openzoo.js

@@ -93,6 +93,10 @@ usage:
                               :8443, then launches the app with
                               CURSOR_API_BASE_URL=https://127.0.0.1:8443
                               (no sudo, no /etc/hosts). Leave it running.
+                              After a reboot the login item comes back without
+                              that env — bot bounces it so send works. Already-
+                              hijacked sessions are left alone.
+                              --quit force bounce · --no-quit never bounce
   npx openzoo cursor [dir]    start proxy+tunnel, write MCP config + every model
                               into the picker, and LAUNCH Cursor on [dir]
                               (defaults to the current directory; ~ works;

package/lib/fetch.js

@@ -3,17 +3,20 @@
  *
  * A hung keep-alive (no headers) must not pin an undici socket forever —
  * that is what wedged GET /v1/session (LISTEN up, HTTP 000) while a
- * brainRace of 4 sat on the same pool. Once headers arrive, the body may
- * stream for as long as generation takes. Do not set fetch `family` here;
- * Happy Eyeballs + ipv4first live in bin/openzoo.js.
+ * brainRace of 4 sat on the same pool. Default 10 minutes: settle + a long
+ * grok turn can exceed 2 minutes before Fly writes status (measured: proxy
+ * aborted "This operation was aborted" after hijack timeout was already
+ * raised). Once headers arrive, the body may stream for as long as generation
+ * takes. Do not set fetch `family` here; Happy Eyeballs + ipv4first live in
+ * bin/openzoo.js.
  */
-export const HEADERS_MS = Number(process.env.OPENZOO_UPSTREAM_HEADERS_MS || 120_000);
+export const HEADERS_MS = Number(process.env.OPENZOO_UPSTREAM_HEADERS_MS || 10 * 60_000);
 export const UPSTREAM_HEADERS_MS = HEADERS_MS;
 export const CREDIT_TIMEOUT_MS = Number(process.env.OPENZOO_CREDIT_TIMEOUT_MS || 2_500);
 
 export function headersMs() {
-  const n = Number(process.env.OPENZOO_UPSTREAM_HEADERS_MS || 120_000);
-  return Number.isFinite(n) && n > 0 ? n : 120_000;
+  const n = Number(process.env.OPENZOO_UPSTREAM_HEADERS_MS || 10 * 60_000);
+  return Number.isFinite(n) && n > 0 ? n : 10 * 60_000;
 }
 
 function mergeSignal(existing, timeout) {
@@ -30,7 +33,7 @@ function mergeSignal(existing, timeout) {
 /** fetch that aborts if headers have not arrived in `ms`, then lets the stream run. */
 export async function fetchHeaders(url, init = {}, ms = headersMs()) {
   const ac = new AbortController();
-  const timer = setTimeout(() => ac.abort(), ms);
+  const timer = setTimeout(() => ac.abort(new Error(`upstream headers not in ${ms}ms`)), ms);
   timer.unref?.();
   try {
     const res = await fetch(url, {

package/lib/grokcli.js

@@ -99,6 +99,74 @@ ${body}
 `;
 }
 
+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' })
+      .trim().split('\n').map((s) => s.trim()).filter(Boolean);
+  } catch {
+    return [];
+  }
+}
+
+function pidHasNeedle(pid, needle, run = execSync) {
+  const n = Number(pid);
+  if (!Number.isInteger(n) || n <= 0) return false;
+  for (const cmd of [`ps -Eww -p ${n} -o command=`, `ps eww -p ${n}`]) {
+    try {
+      if (run(cmd, { encoding: 'utf8', timeout: 2000 }).includes(needle)) return true;
+    } catch { /* SIP / dead pid */ }
+  }
+  return false;
+}
+
+function somethingTalksToPort(port, run = execSync) {
+  try {
+    const out = run(`lsof -nP -iTCP:${Number(port)} -sTCP:ESTABLISHED`, {
+      encoding: 'utf8', timeout: 2000,
+    });
+    return /Grok|Electron|Helper/i.test(out);
+  } catch {
+    return false;
+  }
+}
+
+/** Is the running Grok Bot already pointed at our aiserver? */
+export function inspectGrokBotHijack(url, port = 8443, run = execSync) {
+  const pids = grokBotPids(run);
+  const needle = `CURSOR_API_BASE_URL=${url}`;
+  const envHit = pids.some((pid) => pidHasNeedle(pid, needle, run));
+  const tcpHit = somethingTalksToPort(port, run);
+  return { running: pids.length > 0, pids, hijacked: envHit || tcpHit };
+}
+
+/**
+ * Decide whether to osascript-quit / spawn Grok Bot.
+ * forceQuit = --quit / OZ_NO_QUIT=0
+ * neverQuit = --no-quit / OZ_NO_QUIT=1
+ */
+export function grokBotQuitPlan({ forceQuit = false, neverQuit = false, running = false, hijacked = false } = {}) {
+  if (forceQuit) return { quit: true, spawn: true, reason: 'forced --quit' };
+  if (neverQuit) {
+    return {
+      quit: false,
+      spawn: !hijacked,
+      reason: hijacked
+        ? 'explicit --no-quit (already hijacked)'
+        : 'explicit --no-quit (Grok Bot may be a login-item without hijack env)',
+    };
+  }
+  if (!running) return { quit: false, spawn: true, reason: 'Grok Bot not running' };
+  if (hijacked) return { quit: false, spawn: false, reason: 'already hijacked — leaving the session' };
+  return {
+    quit: true,
+    spawn: true,
+    reason: 'running without hijack env (reboot/login item) — bouncing so CURSOR_API_BASE_URL sticks',
+  };
+}
+
 /**
  * `openzoo bot` — Grok Bot.app on the zoo, no sudo, no /etc/hosts.
  *
@@ -185,31 +253,46 @@ export async function runBot(argv = []) {
     console.error('         EnsureSandBox HIJACKED here; StreamUnifiedChat -> :8402 (x402)');
   }
 
-  // Default: do not quit Grok Bot. Restarting the hijack used to osascript-quit
-  // the app and drop the session; pass --quit to get the old bounce.
-  if (argv.includes('--quit') || process.env.OZ_NO_QUIT === '0') {
+  // Default: leave a Grok Bot that is ALREADY hijacked. After a reboot the
+  // login item comes back WITHOUT CURSOR_API_BASE_URL; Electron's single-
+  // instance lock then swallows our env'd spawn and the overlay stays
+  // "Couldn't send your message". Bounce only that unhijacked case.
+  // --quit / OZ_NO_QUIT=0 force a bounce. --no-quit / OZ_NO_QUIT=1 never.
+  const state = inspectGrokBotHijack(url, port);
+  const plan = grokBotQuitPlan({
+    forceQuit: argv.includes('--quit') || process.env.OZ_NO_QUIT === '0',
+    neverQuit: argv.includes('--no-quit') || process.env.OZ_NO_QUIT === '1',
+    running: state.running,
+    hijacked: state.hijacked,
+  });
+  console.error(`openzoo: grokbot ${plan.reason}`);
+  if (plan.quit) {
     try { execSync('osascript -e \'tell application "Grok Bot" to quit\'', { stdio: 'ignore' }); } catch { /* ok */ }
     await new Promise((r) => setTimeout(r, 1500));
   }
 
-  console.error('openzoo: launching Grok Bot');
-  console.error(`         CURSOR_API_BASE_URL=${url}`);
-  spawn(bin, ['--ignore-certificate-errors'], {
-    stdio: 'ignore',
-    detached: true,
-    env: {
-      ...process.env,
-      NODE_TLS_REJECT_UNAUTHORIZED: '0',
-      CURSOR_API_BASE_URL: url,
-      SAND_BACKEND_URL: url,
-      // Helper daemon (local-exec-daemon/main.cjs) uses Node fetch, not Chromium.
-      // Without these it dials the cached cursorvm 1337 URL / dies on our
-      // self-signed cert and GET /local-exec/requests never arrives.
-      SAND_HOST_GATEWAY_URL: url,
-      SAND_HOST_GATEWAY_TOKEN: 'openzoo',
-      SAND_HOST_GATEWAY_NETWORK_TOKEN: 'openzoo',
-    },
-  }).unref();
+  if (plan.spawn) {
+    console.error('openzoo: launching Grok Bot');
+    console.error(`         CURSOR_API_BASE_URL=${url}`);
+    spawn(bin, ['--ignore-certificate-errors'], {
+      stdio: 'ignore',
+      detached: true,
+      env: {
+        ...process.env,
+        NODE_TLS_REJECT_UNAUTHORIZED: '0',
+        CURSOR_API_BASE_URL: url,
+        SAND_BACKEND_URL: url,
+        // Helper daemon (local-exec-daemon/main.cjs) uses Node fetch, not Chromium.
+        // Without these it dials the cached cursorvm 1337 URL / dies on our
+        // self-signed cert and GET /local-exec/requests never arrives.
+        SAND_HOST_GATEWAY_URL: url,
+        SAND_HOST_GATEWAY_TOKEN: 'openzoo',
+        SAND_HOST_GATEWAY_NETWORK_TOKEN: 'openzoo',
+      },
+    }).unref();
+  } else {
+    console.error('openzoo: Grok Bot already hijacked — not spawning another copy');
+  }
 
   console.error('openzoo: leave this running. ctrl-c stops the backend.');
   if (argv.includes('--once')) return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openzoo",
-  "version": "0.50.33",
+  "version": "0.50.35",
   "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",