openzoo 0.21.6 → 0.21.8

package/lib/setup.js

@@ -202,17 +202,26 @@ export async function setupEditor(which, target) {
     // With --edge-ip-version 4 the tunnel comes up in seconds; if it somehow
     // does not, we say so plainly and still launch.
     if (!publicUrl) {
-      process.stdout.write('waiting for the public tunnel');
-      for (let i = 0; i < 180 && !started?.publicUrl; i++) {    // up to 90s
+      // VISIBLY ALIVE, AND SHORT. A silent 90s wait is indistinguishable from a
+      // hang — which is exactly how it was read, correctly. One dot per second
+      // with a countdown, capped at 25s, because with --edge-ip-version 4 a
+      // healthy tunnel registers in ~5-10s; longer than that means it is broken,
+      // not slow, and waiting more does not help.
+      const LIMIT = Number(process.env.OPENZOO_TUNNEL_WAIT_S || 25);
+      for (let i = 0; i < LIMIT * 2 && !started?.publicUrl; i++) {
         await new Promise((r) => setTimeout(r, 500));
-        if (i % 4 === 3) process.stdout.write('.');
+        if (i % 2 === 1) process.stdout.write(`\rwaiting for the public tunnel — ${LIMIT - Math.floor(i / 2) - 1}s `);
       }
-      console.log('');
+      process.stdout.write('\r\x1b[K');
       publicUrl = started?.publicUrl ?? null;
       tunnelKey = started?.tunnelToken ?? tunnelKey;
     }
     if (publicUrl) console.log(`tunnel:  ${publicUrl}/v1   api_key ${tunnelKey}`);
-    else console.log('tunnel:  did not come up in 90s.');
+    else {
+      console.log('tunnel:  did NOT come up. cloudflared could not reach Cloudflare\'s edge.');
+      console.log('         most common cause here: no working IPv6 route (we already force');
+      console.log('         --edge-ip-version 4). check: npx openzoo tunnel   for the raw log.');
+    }
   } else {
     console.log(`proxy already running on ${base}`);
     // A proxy someone else started owns the tunnel; ask it for the public URL.
@@ -276,15 +285,39 @@ export async function setupEditor(which, target) {
   const models = await catalogModels(base);
   let wrote = null;
   if (editorBase) {
+    // UNPIN FIRST — THIS IS THE BUG THAT BROKE THE TUNNEL ALL NIGHT.
+    // pinEditorProviderConfig installs a SQL trigger that re-applies the URL it
+    // was pinned with on EVERY update to that row. A previous run's trigger
+    // therefore silently rewrote each new tunnel URL back to its own, dead one:
+    // the banner printed the live tunnel while the DB (and Cursor) got the old
+    // hostname, which answered 530. Observed verbatim in one run —
+    //   tunnel:   https://friendly-api-suppliers-suits.trycloudflare.com/v1
+    //   settings: openAIBaseUrl -> https://motors-multiple-parade-surround...
+    // Two hostnames, one run, because the printed value is read BACK from the DB
+    // after the trigger has had its say.
+    try { unpinEditorProviderConfig(target0); } catch { /* nothing pinned yet */ }
     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 || editorBase}`);
-    console.log('          useOpenAIKey  -> true');
-    // PIN so the editor's account-sync cannot revert it on launch.
+    // SELF-HEAL: verify what actually landed, and if anything rewrote it, drop
+    // the pin and write again rather than launching an editor we know is
+    // pointed at a dead host.
+    for (let attempt = 0; attempt < 2 && wrote && !wrote.error; attempt++) {
+      const got = wrote.verified?.openAIBaseUrl;
+      if (!got || got === editorBase) break;
+      console.log(`settings: something rewrote the url (${got}) — unpinning and retrying`);
+      try { unpinEditorProviderConfig(target0); } catch { /* ignore */ }
+      try { wrote = writeEditorProviderConfig(target0, { baseUrl: editorBase, models, apiKey: tunnelKey }); } catch (e) { wrote = { error: e.message }; }
+    }
     const pin = pinEditorProviderConfig(target0, { baseUrl: editorBase, models });
+    // A pin that re-applies the WRONG url is worse than no pin at all.
+    try {
+      const after = writeEditorProviderConfig(target0, { baseUrl: editorBase, models, apiKey: tunnelKey });
+      const got = after?.verified?.openAIBaseUrl;
+      if (got && got !== editorBase) {
+        console.log(`settings: the pin re-applied ${got} — removing it so the live url stands`);
+        unpinEditorProviderConfig(target0);
+        writeEditorProviderConfig(target0, { baseUrl: editorBase, models, apiKey: tunnelKey });
+      }
+    } catch { /* advisory */ }
     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.21.6",
+  "version": "0.21.8",
   "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",