openzoo 0.30.2 → 0.30.4

package/lib/cursorcfg.js

@@ -306,3 +306,31 @@ export function unpinEditorProviderConfig(which) {
   try { sqlite(db, 'DROP TRIGGER IF EXISTS openzoo_pin;'); return { unpinned: true }; }
   catch (e) { return { error: e.message }; }
 }
+
+/**
+ * Force the CACHED membership the editor stores in its own auth table to an
+ * entitled value. MEASURED: the working (ultra) machine held
+ * `cursorAuth/stripeMembershipType = "ultra"` right here in ItemTable, the free
+ * machine held "free" — and the model-selection gate reads this cached value,
+ * NOT the api2 responses (which we already answer entitled, to no effect). The
+ * api2 impersonation's job is then to stop the editor RE-SYNCING this back to
+ * free on the next focus. Best-effort; returns what it set.
+ */
+export function forceMembership(which, type = 'pro') {
+  const db = storagePath(which);
+  if (!db || !fs.existsSync(db)) return { error: 'no editor db' };
+  try { execFileSync('sqlite3', ['-version'], { stdio: 'ignore' }); } catch { return { error: 'sqlite3 not available' }; }
+  const q = (k) => `'${String(k).replace(/'/g, "''")}'`;
+  const set = (key, val) => {
+    // These auth values are stored as raw JSON strings (quoted), e.g. "ultra".
+    const json = JSON.stringify(String(val));
+    sqlite(db, `INSERT INTO ItemTable(key,value) VALUES(${q(key)},${q(json)}) `
+      + `ON CONFLICT(key) DO UPDATE SET value=${q(json)};`);
+  };
+  try {
+    set('cursorAuth/stripeMembershipType', type);
+    set('cursorAuth/stripeSubscriptionStatus', 'active');
+    const got = sqlite(db, `SELECT value FROM ItemTable WHERE key='cursorAuth/stripeMembershipType';`).trim();
+    return { set: type, verified: got };
+  } catch (e) { return { error: e.message }; }
+}

package/lib/launch.js

@@ -9,7 +9,7 @@
  * harness with the two env vars set. The proxy must already be running
  * (`npx openzoo` in another terminal); we check first and say so if not.
  */
-import { spawn } from 'node:child_process';
+import { spawn, spawnSync } from 'node:child_process';
 import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
@@ -84,29 +84,29 @@ export async function launchClaude(argv) {
     return;
   }
 
-  // DESKTOP: launch via `open`, NOT by spawning the bundle binary.
+  // DESKTOP, ROUTED THROUGH THE ZOO.
   //
-  // Spawning /Applications/Claude.app/Contents/MacOS/Claude directly breaks
-  // macOS Launch Services — the app detects it was not started properly and
-  // force-quits (observed). `open -a` is the correct, reliable way to start a
-  // .app; the tradeoff is it hands off to launchd and drops our env, so the
-  // desktop app cannot be pointed at the zoo this way. It is a CHAT app, not
-  // Claude Code, and does not honour ANTHROPIC_BASE_URL regardless — so the
-  // routing was never going to happen here. For x402 routing use --terminal
-  // (Claude Code CLI), which is why we say so loudly.
+  // The force-quit was NOT Launch Services — it was the single-instance lock:
+  // spawning the bundle binary while a Claude instance is already running makes
+  // the new process detect the existing one and immediately exit ("force
+  // quited"). `open -a` dodges that but hands off to launchd and DROPS our env,
+  // so ANTHROPIC_BASE_URL never reaches the app and it cannot route.
+  //
+  // To get BOTH — no force-quit AND our env — quit any running instance first,
+  // then spawn the bundle binary directly with the env set. Whether the desktop
+  // app honours ANTHROPIC_BASE_URL is up to the app; this at least gives it the
+  // variable, which `open` never could.
+  const app = resolveClaudeDesktop();
+  if (!app) { console.error('openzoo: Claude desktop app not found — install it, or use `npx openzoo claude --terminal`'); process.exit(1); }
   if (process.platform === 'darwin') {
-    console.error('openzoo: opening the Claude DESKTOP app.');
-    console.error('         it will NOT route through the zoo — the desktop app ignores ANTHROPIC_BASE_URL.');
-    console.error('         for x402-paid inference use:  npx openzoo claude --terminal');
-    const child = spawn('open', ['-a', 'Claude', ...(rest.length ? ['--args', ...rest] : [])], { stdio: 'ignore', detached: true });
-    child.on('error', () => console.error('openzoo: Claude desktop app not found — install it, or use --terminal'));
-    child.unref();
-    return;
+    // Quit a running instance so the fresh one is not killed by the single-
+    // instance lock. `osascript quit` is graceful; pkill is the backstop.
+    try { spawnSync('osascript', ['-e', 'tell application "Claude" to quit'], { stdio: 'ignore', timeout: 4000 }); } catch { /* not running */ }
+    try { spawnSync('pkill', ['-x', 'Claude'], { stdio: 'ignore' }); } catch { /* already gone */ }
+    await new Promise((r) => setTimeout(r, 800));
   }
-  // Non-macOS: spawn the resolved binary (Launch Services is a mac concept).
-  const app = resolveClaudeDesktop();
-  if (!app) { console.error('openzoo: Claude desktop app not found — use `npx openzoo claude --terminal` for the CLI'); process.exit(1); }
-  console.error(`openzoo: Claude desktop (ANTHROPIC_BASE_URL=${base}); --terminal is the guaranteed-x402 path.`);
+  console.error(`openzoo: Claude desktop with ANTHROPIC_BASE_URL=${base} (quit any running instance first).`);
+  console.error('         if the desktop app ignores that variable, use --terminal for guaranteed x402.');
   const child = spawn(app, rest, { stdio: 'ignore', env, detached: true });
   child.on('error', (e) => console.error(`openzoo: could not launch Claude desktop: ${e.message}`));
   child.unref();

package/lib/setup.js

@@ -22,7 +22,7 @@ import { spawn } from 'node:child_process';
 import { config } from './config.js';
 import {
   writeEditorProviderConfig, editorRunning, quitEditor,
-  pinEditorProviderConfig, unpinEditorProviderConfig,
+  pinEditorProviderConfig, unpinEditorProviderConfig, forceMembership,
 } from './cursorcfg.js';
 
 /**
@@ -503,6 +503,14 @@ export async function setupEditor(which, target) {
             + '          The 443->8443 redirect is not delivering (pfctl/loopback). Tell me and I switch to a root-bound 443.');
       } catch (e) { console.log(`takeover: self-test error (${e.message})`); }
 
+      // WRITE THE CACHED MEMBERSHIP the model-gate actually reads (measured: the
+      // ultra machine held "ultra" here; api2 responses alone did not move the
+      // gate). The impersonation keeps it from re-syncing back to free.
+      try {
+        const fm = forceMembership(target0, process.env.OPENZOO_MEMBERSHIP || 'pro');
+        console.log(fm.error ? `takeover: membership write skipped (${fm.error})`
+          : `takeover: cached membership -> ${fm.verified} (was gating model selection)`);
+      } catch (e) { console.log(`takeover: membership write failed (${e.message})`); }
       console.log('takeover: launching with --ignore-certificate-errors so the self-signed cert is trusted (no CA install)');
     } catch (e) {
       console.log(`takeover: failed to start (${e.message}) — falling back to plain routing`);

package/package.json

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