claude-overnight 1.23.0 → 1.23.2

package/dist/_version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "1.23.0";
+export declare const VERSION = "1.23.2";

package/dist/_version.js

@@ -1,2 +1,2 @@
 // Auto-generated by build — do not edit manually.
-export const VERSION = "1.23.0";
+export const VERSION = "1.23.2";

package/dist/index.js

@@ -221,7 +221,7 @@ async function main() {
         const proxyUp = await healthCheckCursorProxy();
         if (!proxyUp) {
             console.warn(chalk.yellow(`\n  ⚠ ${savedCursorProviders.length} Cursor provider(s) saved but proxy is not running at ${PROXY_DEFAULT_URL}`));
-            console.warn(chalk.yellow(`    Start it: npx cursor-api-proxy`));
+            console.warn(chalk.yellow(`    Start it: npx @claude-overnight/cursor-api-proxy`));
             console.warn(chalk.dim(`    (Continuing — you can still use Anthropic models)\n`));
         }
     }
@@ -740,7 +740,8 @@ async function main() {
     setPlannerEnvResolver(envForModel);
     // Fail fast if a custom provider is misconfigured  -- one bad key would
     // otherwise surface as N agent failures scattered across the run.
-    if (plannerProvider || workerProvider || fastProvider) {
+    // Skip when NO_PREFLIGHT=1 (used by e2e tests).
+    if ((plannerProvider || workerProvider || fastProvider) && process.env.NO_PREFLIGHT !== "1") {
         const seen = new Set();
         const all = [
             ["planner", plannerProvider],
@@ -767,7 +768,7 @@ async function main() {
             if (!result.ok) {
                 console.error(chalk.red(`  ✗ ${role} preflight failed: ${chalk.dim(result.error)}`));
                 if (isCursorProxyProvider(provider)) {
-                    console.error(chalk.yellow(`  The proxy at ${PROXY_DEFAULT_URL} may have crashed. Start it: npx cursor-api-proxy`));
+                    console.error(chalk.yellow(`  The proxy at ${PROXY_DEFAULT_URL} may have crashed. Start it: npx @claude-overnight/cursor-api-proxy`));
                 }
                 else {
                     console.error(chalk.red(`  Fix the provider at ~/.claude/claude-overnight/providers.json and retry.`));

package/dist/providers.d.ts

@@ -69,18 +69,14 @@ export declare function fetchCursorModels(baseUrl?: string): Promise<string[]>;
 /**
  * Auto-start the cursor-api-proxy as a detached background process.
  *
- * When the proxy is started, we also configure it to use system Node.js
- * for spawning the cursor-agent subprocess. The agent's bundled Node.js
- * segfaults with --list-models on macOS (exit 139), so we resolve the
- * system `node` binary and the agent's index.js, patch the proxy's env.js
- * to respect CURSOR_AGENT_NODE/SCRIPT on Unix, and pass those env vars.
+ * Passes CURSOR_AGENT_NODE/SCRIPT so the fork uses system Node.js for the
+ * agent subprocess (avoids segfaults with --list-models on macOS).
  *
  * Handles:
  *  - Proxy already running and verified → returns true immediately
- *  - Something on the port but not our proxy → warns, skips spawn
- *  - Port in use by nothing responsive → returns true (something bound it)
- *  - Proxy not running → spawns `npx cursor-api-proxy` detached, waits for health
- *  - Spawn fails (not installed) → returns false, caller falls back to manual instructions
+ *  - Something on the port but not our proxy → warns, kills, restarts
+ *  - Proxy not running → spawns detached, waits for health
+ *  - Spawn fails → returns false, caller falls back to manual instructions
  *
  * When `forceRestart` is true and a stale process is on the port, it will be
  * killed and the proxy restarted.

package/dist/providers.js

@@ -1,4 +1,4 @@
-import { readFileSync, writeFileSync, mkdirSync, existsSync, chmodSync, realpathSync, readdirSync } from "fs";
+import { readFileSync, writeFileSync, mkdirSync, existsSync, chmodSync, realpathSync } from "fs";
 import { homedir } from "os";
 import { join, dirname } from "path";
 import { execSync, spawn } from "child_process";
@@ -413,148 +413,17 @@ async function isPortInUse(port, host = "127.0.0.1") {
         return false;
     }
 }
-/**
- * Find the system `node` binary path. Uses `which` to bypass any bundled node.
- */
-function resolveSystemNode() {
-    try {
-        return execSync("which node 2>/dev/null", {
-            timeout: 3_000, encoding: "utf-8", shell: "bash",
-        }).trim() || null;
-    }
-    catch {
-        return null;
-    }
-}
-/**
- * Find the cursor-agent's index.js. Mirrors the logic in fetchLiveCursorModels:
- * resolves the `agent` symlink to find the version directory containing index.js.
- */
-function resolveAgentIndexJs() {
-    try {
-        const agentPath = execSync("command -v agent 2>/dev/null || command -v cursor-agent 2>/dev/null", {
-            timeout: 3_000, encoding: "utf-8", shell: "bash",
-        }).trim();
-        if (!agentPath)
-            return null;
-        const dir = dirname(realpathSync(agentPath));
-        const indexPath = `${dir}/index.js`;
-        return existsSync(indexPath) ? indexPath : null;
-    }
-    catch {
-        return null;
-    }
-}
-/**
- * Patch the proxy's env.js to use CURSOR_AGENT_NODE + CURSOR_AGENT_SCRIPT on Unix.
- *
- * The proxy already reads these env vars (lines 152-153 of env.js) but only uses
- * them on Windows in resolveAgentCommand(). We inject a Unix code path before the
- * final `return { command: cmd, args, env }` so that when these vars are set,
- * the proxy spawns system node with the agent script instead of the bundled node
- * (which segfaults with --list-models on macOS).
- *
- * Safe to call repeatedly — the patch is idempotent.
- */
-function patchProxyEnvJs(proxyDir) {
-    const envJs = join(proxyDir, "dist", "lib", "env.js");
-    if (!existsSync(envJs))
-        return false;
-    const src = readFileSync(envJs, "utf-8");
-    // Check if already patched
-    if (src.includes("/* claude-overnight patch */"))
-        return true;
-    const patch = `\n/* claude-overnight patch: use CURSOR_AGENT_NODE+SCRIPT on unix */\n` +
-        `if (platform !== "win32" && loaded.agentNode && loaded.agentScript) {\n` +
-        `  return { command: loaded.agentNode, args: [loaded.agentScript, ...args], env: { ...env, CURSOR_INVOKED_AS: "agent" }, agentScriptPath: loaded.agentScript };\n` +
-        `}`;
-    // Insert before the final return in resolveAgentCommand
-    const target = "    return { command: cmd, args, env };\n}";
-    if (!src.includes(target)) {
-        // Try minified variant
-        const target2 = "return{command:cmd,args,env}}";
-        if (!src.includes(target2))
-            return false;
-        writeFileSync(envJs, src.replace(target2, patch + "\n" + target2), "utf-8");
-    }
-    else {
-        writeFileSync(envJs, src.replace(target, patch + "\n" + target), "utf-8");
-    }
-    return true;
-}
-/**
- * Patch the proxy's token-cache.js to skip the macOS keychain read.
- *
- * The proxy calls `security find-generic-password -s "cursor-access-token" -w`
- * after every agent run to cache tokens for its multi-account pool feature.
- * This triggers a macOS keychain popup even though the key is not needed for
- * auth (the cursor-agent subprocess handles its own auth). We neutralize it.
- *
- * Safe to call repeatedly — the patch is idempotent.
- */
-function patchProxyTokenCacheJs(proxyDir) {
-    const tcJs = join(proxyDir, "dist", "lib", "token-cache.js");
-    if (!existsSync(tcJs))
-        return false;
-    const src = readFileSync(tcJs, "utf-8");
-    // Check if already patched
-    if (src.includes("/* claude-overnight patch: skip keychain */"))
-        return true;
-    const patch = `\n/* claude-overnight patch: skip keychain */\n` +
-        `return undefined;`;
-    // Replace the entire execSync chain inside readKeychainToken (multi-line)
-    const target = `const t = execSync('security find-generic-password -s "cursor-access-token" -w', { stdio: ["pipe", "pipe", "pipe"], timeout: 5000 })
-            .toString()
-            .trim();`;
-    if (!src.includes(target))
-        return false;
-    writeFileSync(tcJs, src.replace(target, patch + "\n// " + target.replace(/\n/g, "\n// ")), "utf-8");
-    return true;
-}
-/**
- * Find the cursor-api-proxy package directory (npx cache or global install).
- */
-function findProxyPackageDir() {
-    try {
-        // Try npx cache first
-        const npmCacheRoot = join(homedir(), ".npm", "_npx");
-        if (existsSync(npmCacheRoot)) {
-            const dirs = readdirSync(npmCacheRoot);
-            for (const d of dirs) {
-                const candidate = join(npmCacheRoot, d, "node_modules", "cursor-api-proxy");
-                if (existsSync(join(candidate, "dist", "lib", "env.js")))
-                    return candidate;
-            }
-        }
-    }
-    catch { }
-    // Try global install
-    try {
-        const globalDir = execSync("npm root -g 2>/dev/null", {
-            timeout: 5_000, encoding: "utf-8", shell: "bash",
-        }).trim();
-        if (globalDir && existsSync(join(globalDir, "cursor-api-proxy", "dist", "lib", "env.js"))) {
-            return join(globalDir, "cursor-api-proxy");
-        }
-    }
-    catch { }
-    return null;
-}
 /**
  * Auto-start the cursor-api-proxy as a detached background process.
  *
- * When the proxy is started, we also configure it to use system Node.js
- * for spawning the cursor-agent subprocess. The agent's bundled Node.js
- * segfaults with --list-models on macOS (exit 139), so we resolve the
- * system `node` binary and the agent's index.js, patch the proxy's env.js
- * to respect CURSOR_AGENT_NODE/SCRIPT on Unix, and pass those env vars.
+ * Passes CURSOR_AGENT_NODE/SCRIPT so the fork uses system Node.js for the
+ * agent subprocess (avoids segfaults with --list-models on macOS).
  *
  * Handles:
  *  - Proxy already running and verified → returns true immediately
- *  - Something on the port but not our proxy → warns, skips spawn
- *  - Port in use by nothing responsive → returns true (something bound it)
- *  - Proxy not running → spawns `npx cursor-api-proxy` detached, waits for health
- *  - Spawn fails (not installed) → returns false, caller falls back to manual instructions
+ *  - Something on the port but not our proxy → warns, kills, restarts
+ *  - Proxy not running → spawns detached, waits for health
+ *  - Spawn fails → returns false, caller falls back to manual instructions
  *
  * When `forceRestart` is true and a stale process is on the port, it will be
  * killed and the proxy restarted.
@@ -564,20 +433,8 @@ function findProxyPackageDir() {
 export async function ensureCursorProxyRunning(baseUrl = PROXY_DEFAULT_URL, forceRestart = false) {
     const url = new URL(baseUrl);
     const port = parseInt(url.port, 10) || 80;
-    // Always patch the npx cache on startup so proxy skips keychain reads.
-    // Idempotent — safe to call on every run.
-    const proxyDir = findProxyPackageDir();
-    if (proxyDir)
-        patchProxyTokenCacheJs(proxyDir);
     // Already healthy?
     if (await healthCheckCursorProxy(baseUrl)) {
-        // Proxy was running before the patch — restart it to load the patched token-cache.js.
-        console.log(chalk.dim(`  Proxy already running — restarting to pick up keychain patch…`));
-        const killedPid = killProcessOnPort(port, url.hostname);
-        if (killedPid) {
-            await new Promise(r => setTimeout(r, 500));
-            return startProxyProcess(baseUrl, url, port);
-        }
         return true;
     }
     // Something bound the port — verify it's actually the cursor proxy
@@ -607,35 +464,37 @@ export async function ensureCursorProxyRunning(baseUrl = PROXY_DEFAULT_URL, forc
 /** Spawn the proxy process and wait for it to become healthy. */
 async function startProxyProcess(baseUrl, url, port) {
     console.log(chalk.yellow(`\n  Proxy not running at ${baseUrl} — starting it for you…`));
-    // Resolve system node and agent index.js so the proxy doesn't use the
-    // agent's bundled node (segfaults with --list-models on macOS).
-    const sysNode = resolveSystemNode();
-    const agentJs = resolveAgentIndexJs();
-    let patchedProxy = false;
-    if (sysNode && agentJs) {
-        const proxyDir = findProxyPackageDir();
-        if (proxyDir) {
-            patchedProxy = patchProxyEnvJs(proxyDir);
-            if (patchedProxy) {
-                console.log(chalk.dim(`  Using system node for agent subprocess: ${sysNode}`));
-            }
-            else {
-                console.log(chalk.yellow(`  ⚠ Couldn't patch proxy env.js — /v1/models may fail`));
-            }
+    // Resolve system node and agent index.js so the proxy uses system Node.js
+    // for the agent subprocess (avoids segfaults with --list-models on macOS).
+    let sysNode = null;
+    let agentJs = null;
+    try {
+        sysNode = execSync("which node 2>/dev/null", { timeout: 3_000, encoding: "utf-8", shell: "bash" }).trim() || null;
+        const agentPath = execSync("command -v agent 2>/dev/null || command -v cursor-agent 2>/dev/null", {
+            timeout: 3_000, encoding: "utf-8", shell: "bash",
+        }).trim();
+        if (agentPath) {
+            const agentDir = dirname(realpathSync(agentPath));
+            const indexPath = `${agentDir}/index.js`;
+            if (existsSync(indexPath))
+                agentJs = indexPath;
         }
     }
+    catch { }
     const proxyEnv = {
         ...Object.fromEntries(Object.entries(process.env).filter(([, v]) => v !== undefined)),
         CURSOR_BRIDGE_API_KEY: process.env.CURSOR_BRIDGE_API_KEY
             || loadProviders().find(p => p.cursorProxy)?.cursorApiKey
             || "unused",
+        CURSOR_SKIP_KEYCHAIN: "1",
     };
-    if (patchedProxy && sysNode && agentJs) {
+    if (sysNode && agentJs) {
         proxyEnv.CURSOR_AGENT_NODE = sysNode;
         proxyEnv.CURSOR_AGENT_SCRIPT = agentJs;
+        console.log(chalk.dim(`  Using system node for agent subprocess: ${sysNode}`));
     }
     try {
-        const child = spawn("npx", ["cursor-api-proxy"], {
+        const child = spawn("npx", ["@claude-overnight/cursor-api-proxy"], {
             detached: true,
             stdio: "ignore",
             env: proxyEnv,
@@ -689,15 +548,15 @@ function setupSteps() {
             label: "cursor-api-proxy server",
             check: () => {
                 try {
-                    execSync("npx cursor-api-proxy --help", { stdio: "pipe", timeout: 10_000 });
+                    execSync("npx @claude-overnight/cursor-api-proxy --help", { stdio: "pipe", timeout: 10_000 });
                     return true;
                 }
                 catch {
                     return false;
                 }
             },
-            autoCmd: "npx cursor-api-proxy",
-            manualCmd: "npx cursor-api-proxy",
+            autoCmd: "npx @claude-overnight/cursor-api-proxy",
+            manualCmd: "npx @claude-overnight/cursor-api-proxy",
             successMsg: "cursor-api-proxy available",
         },
     ];
@@ -812,24 +671,24 @@ export async function setupCursorProxy() {
         if (choice === "a") {
             console.log(chalk.dim(`  Checking install…`));
             try {
-                execSync("npx cursor-api-proxy --help", { stdio: "pipe", timeout: 15_000 });
+                execSync("npx @claude-overnight/cursor-api-proxy --help", { stdio: "pipe", timeout: 15_000 });
                 console.log(chalk.green(`  ✓ cursor-api-proxy is installed`));
             }
             catch {
                 console.log(chalk.dim(`  Installing…`));
                 try {
-                    execSync("npm install -g cursor-api-proxy", { stdio: "inherit", timeout: 120_000 });
+                    execSync("npm install -g @claude-overnight/cursor-api-proxy", { stdio: "inherit", timeout: 120_000 });
                     console.log(chalk.green(`  ✓ Installed`));
                 }
                 catch {
-                    console.log(chalk.yellow("  Install failed — try manual: npm install -g cursor-api-proxy"));
+                    console.log(chalk.yellow("  Install failed — try manual: npm install -g @claude-overnight/cursor-api-proxy"));
                     return false;
                 }
             }
         }
         else if (choice === "m") {
-            console.log(chalk.cyan(`\n  Install:  ${chalk.bold("npm install -g cursor-api-proxy")}`));
-            console.log(chalk.cyan(`  Start:    ${chalk.bold("npx cursor-api-proxy")}\n`));
+            console.log(chalk.cyan(`\n  Install:  ${chalk.bold("npm install -g @claude-overnight/cursor-api-proxy")}`));
+            console.log(chalk.cyan(`  Start:    ${chalk.bold("npx @claude-overnight/cursor-api-proxy")}\n`));
             const ok = await selectKey(`  Started it?`, [
                 { key: "r", desc: "eady" },
                 { key: "c", desc: "ancel" },
@@ -847,7 +706,7 @@ export async function setupCursorProxy() {
         return true;
     // Auto-start failed or not responding — offer manual fallback
     console.log(chalk.yellow(`\n  Couldn't start the proxy automatically. Start it manually:`));
-    console.log(chalk.white(`    ${chalk.bold("npx cursor-api-proxy")}`));
+    console.log(chalk.white(`    ${chalk.bold("npx @claude-overnight/cursor-api-proxy")}`));
     for (;;) {
         const choice = await selectKey(`  Proxy started?`, [
             { key: "r", desc: "etry (re-attempt auto-start + kill stale)" },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-overnight",
-  "version": "1.23.0",
+  "version": "1.23.2",
   "description": "Background lane for your Claude Max plan. Parallel Claude Agent SDK sessions in git worktrees with a usage cap that reserves headroom for your interactive Claude Code. Crash-safe resume. Provider-agnostic model catalog with capability-based planning.",
   "type": "module",
   "bin": {
@@ -15,6 +15,7 @@
   },
   "dependencies": {
     "@anthropic-ai/claude-agent-sdk": "^0.2.92",
+    "@claude-overnight/cursor-api-proxy": "file:../cursor-api-proxy",
     "chalk": "^5.4.1",
     "jsonwebtoken": "^9.0.2"
   },

package/plugins/claude-overnight/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-overnight",
-  "version": "1.23.0",
+  "version": "1.23.2",
   "description": "Claude Code skill for understanding, installing, and inspecting claude-overnight runs  -- parallel Claude agents in git worktrees with thinking waves, multi-wave steering, and crash-safe resume. Supports Cursor API Proxy, Qwen, OpenRouter.",
   "author": {
     "name": "Francesco Fornace"