openzoo 0.33.0 → 0.33.2

package/lib/hosts.js

@@ -35,19 +35,24 @@ const HOSTS = WIN
 const BACKUP = `${HOSTS}.openzoo-backup`;
 const MARK = '# openzoo: force the editor onto the local proxy';
 
-/** Hosts the editor uses for model sync + its own inference proxy. */
-export const BACKEND_HOSTS = [
-  'api2.cursor.sh',
-  // Chat inference (StreamUnifiedChat) hosts — EVERY region x privacy variant,
-  // because /etc/hosts cannot wildcard *.api5.cursor.sh and Auto picks one per
-  // the account's region + privacy mode. Missing any = the chat escapes to
-  // Cursor's servers and never reaches us (observed: only api2 blocked -> no
-  // cursor-backend lines on chat).
+/**
+ * The DEFAULT block — the model-list re-sync host only. Blocking this forces a
+ * subscribed account's editor onto our model list + endpoint without severing
+ * chat, so plain `openzoo cursor` works for subbed users.
+ *
+ * The chat-inference hosts (agent.api5.*) are NOT here: blocking them without a
+ * working StreamUnifiedChat translator severs chat entirely ("Reconnecting...",
+ * observed on a working ultra account). They live in AGENT_HOSTS, blocked only
+ * under --takeover where the impersonation backend actually answers chat.
+ */
+export const BACKEND_HOSTS = ['api2.cursor.sh'];
+
+export const AGENT_HOSTS = [
   'agent.api5.cursor.sh', 'agentn.api5.cursor.sh',
   'agent-gcpp-uswest.api5.cursor.sh', 'agentn-gcpp-uswest.api5.cursor.sh',
   'agent-gcpp-eucentral.api5.cursor.sh', 'agentn-gcpp-eucentral.api5.cursor.sh',
   'agent-gcpp-apsoutheast.api5.cursor.sh', 'agentn-gcpp-apsoutheast.api5.cursor.sh',
-]
+];
 
 export function isBlocked() {
   try {
@@ -77,17 +82,17 @@ function flushDnsCmd() {
     + ' || service nscd restart 2>/dev/null; true';
 }
 
-export function blockBackend() {
+export function blockBackend(hosts = BACKEND_HOSTS) {
   // Add only the hosts NOT already present, so a prior api2-only block still gets
   // the agent/chat hosts appended (early-returning on isBlocked left them out).
   let current = '';
   try { current = fs.readFileSync(HOSTS, 'utf8'); } catch { /* new */ }
-  const missing = BACKEND_HOSTS.filter((h) => !new RegExp(`^\\s*127\\.0\\.0\\.1\\s+${h.replace(/\./g, '\\.')}\\b`, 'm').test(current));
+  const missing = hosts.filter((h) => !new RegExp(`^\\s*127\\.0\\.0\\.1\\s+${h.replace(/\./g, '\\.')}\\b`, 'm').test(current));
   if (!missing.length) return { already: true };
   const entries = missing.map((h) => `127.0.0.1 ${h}`).join('\\n');
   console.log('');
   console.log('blocking the editor\'s backend so it cannot re-sync over your model list.');
-  console.log(`  hosts   : ${BACKEND_HOSTS.join(', ')} -> 127.0.0.1`);
+  console.log(`  hosts   : ${hosts.join(', ')} -> 127.0.0.1`);
   console.log(`  backup  : ${BACKUP}`);
   console.log('  NOTE    : that host also carries the editor\'s auth/usage — it may report');
   console.log('            being signed out. Undo any time with: npx openzoo unblock');
@@ -96,7 +101,7 @@ export function blockBackend() {
   if (WIN) {
     console.log('  windows: run this in an ADMINISTRATOR PowerShell, then relaunch:');
     console.log(`    Copy-Item "${HOSTS}" "${BACKUP}" -ErrorAction SilentlyContinue`);
-    for (const h of BACKEND_HOSTS) console.log(`    Add-Content "${HOSTS}" "127.0.0.1 ${h}"`);
+    for (const h of hosts) console.log(`    Add-Content "${HOSTS}" "127.0.0.1 ${h}"`);
     console.log('    ipconfig /flushdns');
     return { ok: false, manual: true, blocked: false };
   }
@@ -112,7 +117,7 @@ export function unblockBackend() {
   if (!isBlocked()) return { already: true };
   // Remove only OUR lines, never restore wholesale — the user may have edited
   // /etc/hosts for unrelated reasons since the backup was taken.
-  const pattern = BACKEND_HOSTS.map((h) => h.replace('.', '\\.')).join('|');
+  const pattern = [...BACKEND_HOSTS, ...AGENT_HOSTS].map((h) => h.replace(/\./g, '\\.')).join('|');
   if (WIN) {
     console.log('windows: run in an ADMINISTRATOR PowerShell:');
     console.log(`  Copy-Item "${BACKUP}" "${HOSTS}" -Force; ipconfig /flushdns`);

package/lib/launch.js

@@ -71,17 +71,31 @@ export async function launchClaude(argv) {
   const wantDesktop = argv.includes('--desktop');
   const terminal = !wantDesktop;
   const rest = argv.filter((a) => !['--terminal', '-t', '--desktop'].includes(a));
-  const env = {
-    ...process.env,
-    ANTHROPIC_BASE_URL: base,
-    ANTHROPIC_API_KEY: process.env.ANTHROPIC_API_KEY || 'sk-openzoo',
-    ANTHROPIC_AUTH_TOKEN: process.env.ANTHROPIC_AUTH_TOKEN || 'sk-openzoo',
-  };
+  // GATEWAY AUTH, NOT API-KEY. Setting ANTHROPIC_API_KEY makes Claude Code bill
+  // api.anthropic.com and it TAKES PRECEDENCE over ANTHROPIC_BASE_URL — observed:
+  // "Both ... set · auth may not work" + "API Usage Billing", never hitting the
+  // zoo. A custom gateway uses BASE_URL + AUTH_TOKEN only; API_KEY must be UNSET
+  // (including any inherited one) or it wins.
+  const env = { ...process.env };
+  delete env.ANTHROPIC_API_KEY;
+  env.ANTHROPIC_BASE_URL = base;
+  env.ANTHROPIC_AUTH_TOKEN = process.env.ANTHROPIC_AUTH_TOKEN || 'sk-openzoo';
 
   if (terminal) {
     const cli = resolveClaudeCli();
     if (!cli) { console.error('openzoo: `claude` CLI not found on PATH — install Claude Code, or drop --terminal for the desktop app'); process.exit(1); }
-    console.error(`openzoo: Claude Code (terminal) on the zoo — every turn pays x402`);
+    // A CLEAR banner BEFORE Claude Code takes the screen, so it is obvious this
+    // session routes through the zoo (the terminal title then shows live spend).
+    let wallet = '';
+    try { const { PayClient } = await import('./pay.js'); wallet = new PayClient().address; } catch { /* optional */ }
+    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('     auth     : gateway token (ANTHROPIC_API_KEY unset — no api.anthropic.com billing)');
+    if (wallet) console.error(`     wallet   : ${wallet}`);
+    console.error('     spend    : shown live in the terminal title bar; receipts in ~/.openzoo/proxy.log');
+    console.error('     every turn pays x402.');
+    console.error('');
     const child = spawn(cli, rest, { stdio: 'inherit', env });
     child.on('exit', (c) => process.exit(c ?? 0));
     child.on('error', (e) => { console.error(`openzoo: could not launch claude: ${e.message}`); process.exit(1); });
@@ -130,13 +144,10 @@ export async function launchHarness(cmd, args) {
     process.exit(1);
   }
 
-  const env = {
-    ...process.env,
-    ANTHROPIC_BASE_URL: base,
-    ANTHROPIC_API_KEY: process.env.ANTHROPIC_API_KEY || 'sk-openzoo',
-    // Claude Code sends model ids like "claude-opus-5"; the zoo serves those,
-    // and unknown ids are matched to the nearest served model regardless.
-  };
+  const env = { ...process.env };
+  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';
   console.error(`openzoo: launching \`${cmd}\` on the zoo (ANTHROPIC_BASE_URL=${base}) — every turn pays x402`);
   const child = spawn(cmd, args, { stdio: 'inherit', env });
   child.on('exit', (code) => process.exit(code ?? 0));

package/lib/proxy.js

@@ -280,6 +280,7 @@ export async function startProxy({ silent = false, requireToken = null, sessionM
   // lines / payment receipts there corrupts that program's output (observed: the
   // Solana receipt leaking into the Claude Code CLI). When silent, route this
   // channel to a log file instead; only print to the console when we own it.
+  let paidCalls = 0;
   let sayFile = null;
   if (silent) {
     try {
@@ -611,6 +612,15 @@ export async function startProxy({ silent = false, requireToken = null, sessionM
         if (requireToken) say(`${line}  ·  session $${sessionSpent.toFixed(6)}`);
         else if (viaTunnel) say(`${line}  ·  public-url session $${tunnelSpent.toFixed(6)}`);
         else say(line);
+        // ALWAYS-ON SPEND, TUI-SAFE. When a harness owns the terminal (silent),
+        // the receipt lines go to a file (they corrupt a TUI). But the running
+        // total should still be visible — so write it to the terminal TITLE via
+        // an OSC escape, which updates the window/tab title without touching the
+        // TUI's content. `openzoo ● $0.0042 · 12 calls` in the title bar, live.
+        if (receipt.ok && typeof receipt.billedUsd === 'number') { paidCalls += 1; }
+        if (sayFile) {
+          try { process.stderr.write(`]0;openzoo ● $${sessionSpent.toFixed(4)} · ${paidCalls} call${paidCalls === 1 ? '' : 's'}`); } catch { /* no tty */ }
+        }
         scheduleRefresh(4000); // settlement lands on-chain in a few seconds
       }
       // Chat completions come back as one JSON object (settle-before-serve).

package/lib/setup.js

@@ -443,8 +443,14 @@ export async function setupEditor(which, target) {
   //
   // --no-block opts out for anyone who would rather keep the vendor catalog.
   if (target0 === 'cursor' && !process.argv.includes('--no-block')) {
-    const { blockBackend, isBlocked } = await import('./hosts.js');
-    const r = blockBackend();
+    const { blockBackend, isBlocked, BACKEND_HOSTS, AGENT_HOSTS } = await import('./hosts.js');
+    // Default: block ONLY the model-list re-sync host (safe for subbed users).
+    // Under --takeover we also block the chat-inference hosts, because only then
+    // does the impersonation backend answer their chat — blocking them otherwise
+    // just severs Cursor ("Reconnecting...").
+    const hostsToBlock = process.argv.includes('--takeover')
+      ? [...BACKEND_HOSTS, ...AGENT_HOSTS] : BACKEND_HOSTS;
+    const r = blockBackend(hostsToBlock);
     if (r.already) console.log('backend: already blocked (required for routing; npx openzoo unblock to undo)');
     else if (isBlocked()) console.log('backend: blocked -> 127.0.0.1 (this is what forces the editor onto the zoo)');
     else console.log('backend: NOT blocked — the editor will keep using its own backend and\n         nothing will reach the zoo. Re-run and enter your password.');

package/package.json

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