openzoo 0.21.7 → 0.22.0

package/lib/setup.js

@@ -52,21 +52,37 @@ async function catalogModels(base) {
   if (process.env.OPENZOO_MODELS) {
     return process.env.OPENZOO_MODELS.split(',').map((m) => m.trim()).filter(Boolean);
   }
+  // NAMES THE EDITOR WILL ACCEPT — this is the whole ballgame.
+  //
+  // We used to write `openzoo-<model>` twins here, on the theory that a name the
+  // editor recognises gets claimed by its own backend. That theory was never
+  // actually tested: it rested on "zero connections reached the proxy", which was
+  // equally true of both naming schemes, so it discriminated nothing. The real
+  // cause of zero connections was a stale pin trigger rewriting the base URL.
+  //
+  // MEASURED, on two machines: with openzoo-* names Cursor refuses before any
+  // request leaves the process — "Model name is not valid" — because it validates
+  // the name against its OWN catalog. The custom-OpenAI-endpoint setting only
+  // accepts OpenAI-branded ids. Those same ids route through us correctly
+  // (verified over the live tunnel: gpt-4o -> openai/gpt-4o-2024-11-20,
+  // gpt-4-turbo -> openai/gpt-4-turbo, o3 -> openai/o3-pro), because
+  // lib/models.js publishes them in /v1/models and maps them on the way through.
+  //
+  // OPENZOO_EDITOR_MODELS overrides the list; the zoo model each one lands on is
+  // still steerable per-request, and OPENZOO_DEFAULT_MODEL pins them all.
+  const fallback = ['gpt-4o', 'gpt-4.1', 'gpt-4-turbo', 'o3', 'o3-mini', 'o4-mini', 'gpt-4o-mini'];
+  if (process.env.OPENZOO_EDITOR_MODELS) {
+    return process.env.OPENZOO_EDITOR_MODELS.split(',').map((m) => m.trim()).filter(Boolean);
+  }
   try {
     const r = await fetch(`${base}/models`, { signal: AbortSignal.timeout(15000) });
     const d = await r.json();
-    const twins = (d.data || []).map((m) => m.id).filter((id) => id.startsWith('openzoo-'));
-    // Full-strength first: :free/:batch variants are opt-in, not what someone
-    // wants preselected, and a flagship should be the default entry.
-    const plain = twins.filter((t) => !t.includes(':'));
-    const rest = twins.filter((t) => t.includes(':'));
-    const preferred = ['openzoo-claude-opus-5', 'openzoo-claude-sonnet-5', 'openzoo-gpt-5.6-sol-pro'];
-    const head = preferred.filter((p) => plain.includes(p));
-    const ordered = [...head, ...plain.filter((t) => !head.includes(t)), ...rest];
-    const limit = Number(process.env.OPENZOO_MODEL_LIMIT || 0);
-    return limit > 0 ? ordered.slice(0, limit) : ordered;
+    const have = new Set((d.data || []).map((m) => m.id));
+    // Only offer ids the proxy actually serves, so a pick can never 404.
+    const usable = fallback.filter((id) => have.has(id));
+    return usable.length ? usable : fallback;
   } catch {
-    return ['openzoo-claude-opus-5', 'openzoo-deepseek-v4-pro-0813'];   // catalog unreachable
+    return fallback;
   }
 }
 
@@ -285,15 +301,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.7",
+  "version": "0.22.0",
   "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",