openzoo 0.20.3 → 0.20.5

package/bin/openzoo.js

@@ -12,11 +12,16 @@ usage:
                                a missing dir is created)
                               --profile  use an isolated editor profile the
                                          vendor account cannot re-sync over
+                              (also points cursor's own backend at 127.0.0.1 in
+                               the hosts file so it cannot re-sync over your model
+                               list or route inference around the proxy — asks for
+                               your password; --no-block skips it)
   npx openzoo vscode [path]   same, for VS Code
   npx openzoo editor [path]   whichever is installed (Cursor wins if both)
   npx openzoo launch <cmd> [args]   launch a TERMINAL Messages API client
                                     (claude, aider...) already pointed at the zoo
   npx openzoo mcp        stdio MCP server (tools: zoo_ask, zoo_bind, zoo_models, zoo_wallet, zoo_contexts)
+  npx openzoo unblock    restore the editor's own backend in the hosts file
   npx openzoo tunnel     public-url-only mode (everything key-gated, no keyless localhost)
   npx openzoo demo       ~1M-token needle demo: direct refuses, the zoo answers
                          (run it twice — the second run reuses the bound corpus and is near-free)
@@ -70,6 +75,12 @@ async function main() {
       await (await import('../lib/launch.js')).launchHarness(harness, hargs);
       break;
     }
+    case 'unblock': {
+      const { unblockBackend, isBlocked } = await import('../lib/hosts.js');
+      const r = unblockBackend();
+      console.log(r.already ? 'not blocked — nothing to undo' : (isBlocked() ? 'still blocked (sudo declined?)' : 'restored: the editor can reach its own backend again'));
+      break;
+    }
     case 'tunnel':
       await (await import('../lib/tunnel.js')).runTunnel();
       break;

package/lib/hosts.js

@@ -13,8 +13,8 @@
  *
  * COLLATERAL, STATED PLAINLY: that host also carries auth and usage reporting.
  * The editor may report being signed out or degraded. This is a system-wide
- * change requiring sudo — so it is OPT-IN (`--block-backend`), always backs up
- * to /etc/hosts.openzoo-backup, and `--unblock` restores it.
+ * change needing a password, so it always backs up the hosts file first and
+ * `npx openzoo unblock` restores it. `--no-block` skips it entirely.
  */
 import fs from 'node:fs';
 import { execFileSync, spawnSync } from 'node:child_process';
@@ -73,6 +73,7 @@ export function blockBackend() {
   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');
+  console.log('            skip this next time with: --no-block');
   console.log('  sudo will ask for your password now.');
   if (WIN) {
     console.log('  windows: run this in an ADMINISTRATOR PowerShell, then relaunch:');

package/lib/setup.js

@@ -175,24 +175,39 @@ export async function setupEditor(which, target) {
     // the user staring at "waiting for tunnel.." while nothing else happened —
     // and if it never came up, the editor never launched at all. Announce it
     // when it arrives instead.
+    // THE EDITOR CONFIG CANNOT USE LOCALHOST. Cursor does not call the custom
+    // endpoint from your machine — its SERVER makes the request, so a private
+    // address is unreachable from there and it answers, verbatim:
+    //   "Provider returned error: Access to private networks is forbidden"
+    // (see the header of lib/tunnel.js). So the public URL is a HARD dependency
+    // of the editor path, and we wait for it — bounded, with progress, because
+    // an unbounded wait once left the editor never launching at all.
     if (!publicUrl) {
-      const started0 = started;
-      (async () => {
-        for (let i = 0; i < 240; i++) {          // up to 2 min, in the background
-          await new Promise((r) => setTimeout(r, 500));
-          if (started0?.publicUrl) {
-            console.log('');
-            console.log(`tunnel:  ${started0.publicUrl}/v1   api_key ${started0.tunnelToken}`);
-            console.log('         (for a cloud-run harness — it cannot reach localhost)');
-            return;
-          }
-        }
-        console.log('tunnel:  still not up — localhost is unaffected; OPENZOO_NO_TUNNEL=1 to skip it');
-      })();
+      process.stdout.write('waiting for the public tunnel (the editor\'s server cannot reach localhost)');
+      for (let i = 0; i < 120 && !started?.publicUrl; i++) {   // up to 60s
+        await new Promise((r) => setTimeout(r, 500));
+        if (i % 4 === 3) process.stdout.write('.');
+      }
+      console.log('');
+      publicUrl = started?.publicUrl ?? null;
+      tunnelKey = started?.tunnelToken ?? tunnelKey;
     }
+    if (publicUrl) console.log(`tunnel:  ${publicUrl}/v1   api_key ${tunnelKey}`);
+    else console.log('tunnel:  NOT up — the editor will not be able to reach the proxy\n         (OPENZOO_NO_TUNNEL=1 to skip; terminal harnesses still work on localhost)');
   } else {
     console.log(`proxy already running on ${base}`);
+    // A proxy someone else started owns the tunnel; ask it for the public URL.
+    try {
+      const info = await (await fetch(`${base}/info`)).json();
+      publicUrl = (info?.publicTunnel || '').replace(/\/v1$/, '') || null;
+      tunnelKey = info?.tunnelToken ?? tunnelKey;
+      if (publicUrl) console.log(`tunnel:  ${publicUrl}/v1 (from the running proxy)`);
+    } catch { /* no /info — fall through to the localhost warning below */ }
   }
+  // What the EDITOR is configured with. Localhost only as a last resort, and
+  // said out loud, because it will fail with the private-networks error.
+  const editorBase = publicUrl ? `${publicUrl}/v1` : base;
+  if (!publicUrl) console.log('settings: falling back to localhost — expect "Access to private networks is forbidden"');
 
   // 2. ENV INTO THE EDITOR. Both vendor shapes, so an OpenAI-compatible pane
   //    and an Anthropic-shaped one (Claude Code extension) both route here.
@@ -230,14 +245,14 @@ export async function setupEditor(which, target) {
   }
   const models = await catalogModels(base);
   let wrote = null;
-  try { wrote = writeEditorProviderConfig(target0, { baseUrl: base, models }); } catch (e) { wrote = { error: e.message }; }
+  try { wrote = writeEditorProviderConfig(target0, { baseUrl: editorBase, models, apiKey: tunnelKey }); } catch (e) { wrote = { error: e.message }; }
   if (wrote?.error) {
     console.log(`settings: could not write automatically (${wrote.error}) — set them in Settings → Models`);
   } else if (wrote) {
-    console.log(`settings: openAIBaseUrl -> ${wrote.verified?.openAIBaseUrl || base}`);
+    console.log(`settings: openAIBaseUrl -> ${wrote.verified?.openAIBaseUrl || editorBase}`);
     console.log('          useOpenAIKey  -> true');
     // PIN so the editor's account-sync cannot revert it on launch.
-    const pin = pinEditorProviderConfig(target0, { baseUrl: base, models });
+    const pin = pinEditorProviderConfig(target0, { baseUrl: editorBase, models });
     console.log(`          models        -> ${models.join(', ')}`);
     console.log(`          selected      -> ${models[0]}`);
     console.log(pin?.pinned
@@ -246,6 +261,19 @@ export async function setupEditor(which, target) {
     console.log('  verify: send one message, watch for "paid $0.0… · rail solana · tx …" here.');
   }
 
+  // 2b. THE BACKEND BLOCK. Pinning the database is not sufficient on its own:
+  //     the editor re-syncs its model list from its own backend into MEMORY on
+  //     window focus and repaints the picker empty, and that same host is the
+  //     route its own inference takes. Blackholing it in the hosts file is what
+  //     leaves the configured base URL as the only way out. System-wide and
+  //     needs a password, so it is opt-in and reversible.
+  if (target0 === 'cursor' && !process.argv.includes('--no-block')) {
+    const { blockBackend, isBlocked } = await import('./hosts.js');
+    const r = blockBackend();
+    if (r.already) console.log('backend: already blocked (npx openzoo unblock to restore)');
+    else console.log(`backend: ${isBlocked() ? 'blocked -> 127.0.0.1' : 'NOT blocked — the editor will re-sync over your model list'}`);
+  }
+
   // 3. LAUNCH with that env. Editor resolved platform-agnostically; Cursor
   //    wins when both are installed.
   // Open the directory you ran this from, or the one you named. The earlier

package/package.json

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