openzoo 0.20.4 → 0.20.6

package/lib/models.js

@@ -99,6 +99,19 @@ export function resolveModel(requested, ids) {
   const bare = String(requested).replace(/^openzoo[-/]/i, '');
   if (bare !== requested) {
     if (ids.includes(bare)) return bare;
+    // EXACT INVERSE OF MINTING. augmentModelList creates each twin as
+    // `openzoo-<suffix>` where suffix = id.split('/')[1], so the way back is a
+    // suffix match — not the similarity scorer below. Without this, a twin fell
+    // through to scoring and could land on a NEIGHBOUR of its own source:
+    // openzoo-claude-opus-5 resolved to anthropic/claude-opus-5-FAST, and with
+    // OPENZOO_DEFAULT_MODEL set in the environment every twin resolved to that
+    // one model instead — the user picked a model in the editor and silently got
+    // a different one. A twin is an EXPLICIT choice, so it is honoured before
+    // both the env override and the scorer.
+    const suffixed = ids.filter((id) => id.slice(id.indexOf('/') + 1) === bare);
+    // Full-strength before :free/:batch, mirroring the ordering everywhere else.
+    const exact = suffixed.find((id) => !id.includes(':')) || suffixed[0];
+    if (exact) return exact;
     requested = bare;
   }
   const env = process.env.OPENZOO_DEFAULT_MODEL;

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

package/package.json

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