claude-overnight 1.24.4 → 1.24.5

package/dist/_version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "1.24.4";
+export declare const VERSION = "1.24.5";

package/dist/_version.js

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

package/dist/index.js

@@ -223,7 +223,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-composer-in-claude`));
+            console.warn(chalk.yellow(`    Start it: npm exec cursor-composer-in-claude (from this tool's install directory)`));
             console.warn(chalk.dim(`    (Continuing — you can still use Anthropic models)\n`));
         }
     }
@@ -776,7 +776,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-composer-in-claude`));
+                    console.error(chalk.yellow(`  The proxy at ${PROXY_DEFAULT_URL} may have crashed or timed out (e.g. keychain/UI). Retry, or start the same version as this install: npm exec cursor-composer-in-claude (from the claude-overnight folder, not bare npx — avoids a stale global cache).`));
                 }
                 else {
                     console.error(chalk.red(`  Fix the provider at ~/.claude/claude-overnight/providers.json and retry.`));

package/dist/providers.js

@@ -9,6 +9,7 @@ import { ask, select, selectKey } from "./cli.js";
 import { getBearerToken, clearTokenCache } from "./auth.js";
 import { DEFAULT_MODEL } from "./models.js";
 import { CURSOR_PRIORITY_MODELS, CURSOR_KNOWN_MODELS, KNOWN_CURSOR_MODEL_IDS, cursorModelHint, } from "./cursor-models.js";
+import { VERSION } from "./_version.js";
 /** Run the installed package CLI with `node` (avoids npx/npm invoking extra tooling on macOS). */
 function resolveCursorComposerCli() {
     try {
@@ -22,6 +23,18 @@ function resolveCursorComposerCli() {
         return null;
     }
 }
+/** Version from the dependency bundled with claude-overnight (not `npx` cache). */
+function getEmbeddedComposerProxyVersion() {
+    try {
+        const require = createRequire(import.meta.url);
+        const pkgJsonPath = require.resolve("cursor-composer-in-claude/package.json");
+        const j = JSON.parse(readFileSync(pkgJsonPath, "utf-8"));
+        return typeof j.version === "string" ? j.version : null;
+    }
+    catch {
+        return null;
+    }
+}
 // ── Store ──
 const STORE_PATH = join(homedir(), ".claude", "claude-overnight", "providers.json");
 export function getStorePath() { return STORE_PATH; }
@@ -84,6 +97,9 @@ export function envFor(p) {
         const key = process.env.CURSOR_BRIDGE_API_KEY || p.cursorApiKey;
         base.ANTHROPIC_AUTH_TOKEN = key || "unused";
         delete base.ANTHROPIC_API_KEY;
+        // SDK replaces env for subprocesses — force these so nothing inherits a bad CI / skip flag.
+        base.CI = "true";
+        base.CURSOR_SKIP_KEYCHAIN = "1";
         return base;
     }
     const key = resolveKey(p);
@@ -321,6 +337,45 @@ export async function healthCheckCursorProxy(baseUrl = PROXY_DEFAULT_URL) {
         return false;
     }
 }
+/** GET /health JSON — used to detect stale `npx` proxies older than this package's dependency. */
+async function getCursorProxyHealthInfo(baseUrl = PROXY_DEFAULT_URL) {
+    try {
+        const url = `${baseUrl.replace(/\/$/, "")}/health`;
+        const res = await fetch(url, { method: "GET", signal: AbortSignal.timeout(3_000), ...cursorProxyFetchOpts() });
+        if (!res.ok)
+            return null;
+        const json = (await res.json());
+        return {
+            ok: json.ok,
+            version: typeof json.version === "string" ? json.version : undefined,
+        };
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * If something is listening and reports a different package version than our
+ * embedded `cursor-composer-in-claude`, kill the port and start the bundled CLI.
+ * Stops `npx` leaving an ancient proxy alive while preflight times out behind keychain/UI.
+ */
+async function maybeRestartStaleProxy(baseUrl, url, port) {
+    const embedded = getEmbeddedComposerProxyVersion();
+    const info = await getCursorProxyHealthInfo(baseUrl);
+    const runningV = info?.version;
+    if (embedded && runningV && embedded !== runningV) {
+        console.log(chalk.yellow(`  ⚠ Running proxy is v${runningV} but claude-overnight depends on cursor-composer-in-claude v${embedded} — restarting…`));
+        killProcessOnPort(port, url.hostname);
+        await new Promise(r => setTimeout(r, 500));
+        return startProxyProcess(baseUrl, url, port);
+    }
+    console.log(chalk.dim(JSON.stringify({
+        claudeOvernight: VERSION,
+        cursorComposerExpected: embedded,
+        cursorComposerRunning: runningV ?? "unknown",
+    })));
+    return true;
+}
 /**
  * Fetch available Cursor models via GET /v1/models on the proxy.
  * Returns model IDs like ["auto", "composer", "composer-2", "opus-4.6", ...].
@@ -466,14 +521,14 @@ export async function ensureCursorProxyRunning(baseUrl = PROXY_DEFAULT_URL, forc
     const port = parseInt(url.port, 10) || 80;
     // Already healthy?
     if (await healthCheckCursorProxy(baseUrl)) {
-        return true;
+        return await maybeRestartStaleProxy(baseUrl, url, port);
     }
     // Something bound the port — verify it's actually the cursor proxy
     if (await isPortInUse(port, url.hostname)) {
         const isProxy = await verifyCursorProxy(baseUrl);
         if (isProxy) {
             console.log(chalk.dim(`  Proxy verified at port ${port}`));
-            return true;
+            return await maybeRestartStaleProxy(baseUrl, url, port);
         }
         // Stale process on the port — kill it if forceRestart, or try automatically
         if (!forceRestart) {
@@ -516,41 +571,19 @@ async function startProxyProcess(baseUrl, url, port) {
     const apiKeyEnv = process.env.CURSOR_BRIDGE_API_KEY;
     const apiKeyStored = loadProviders().find(p => p.cursorProxy)?.cursorApiKey;
     const keySource = apiKeyEnv ? "env CURSOR_BRIDGE_API_KEY" : (apiKeyStored ? "providers.json (stored)" : "none — using 'unused'");
-    // Log the installed proxy version
-    let proxyVersion = "unknown";
-    try {
-        const pkgPath = execSync("node -e \"try{console.log(require('cursor-composer-in-claude/package.json').version)}catch(e){}\" 2>/dev/null", {
-            timeout: 3_000, encoding: "utf-8", shell: "bash",
-        }).trim();
-        if (pkgPath)
-            proxyVersion = pkgPath;
-    }
-    catch {
-        // Fallback: try resolving from npx cache location
-        try {
-            const out = execSync("npm ls cursor-composer-in-claude --depth=0 2>/dev/null | grep cursor-composer", {
-                timeout: 5_000, encoding: "utf-8", shell: "bash",
-            }).trim();
-            const verMatch = out.match(/@(\d+\.\d+\.\d+)/);
-            if (verMatch)
-                proxyVersion = verMatch[1];
-        }
-        catch { }
-    }
-    console.log(chalk.dim(`  cursor-composer-in-claude v${proxyVersion}`));
-    console.log(chalk.dim(`  API key: ${keySource}`));
-    console.log(chalk.dim(`  CI=true (skips Cursor agent keychain probe on startup)`));
-    console.log(chalk.dim(`  CURSOR_SKIP_KEYCHAIN=1 (proxy-side keychain access disabled)`));
-    if (sysNode)
-        console.log(chalk.dim(`  System node: ${sysNode}`));
-    if (agentJs)
-        console.log(chalk.dim(`  Agent script: ${agentJs}`));
+    const proxyVersion = getEmbeddedComposerProxyVersion() ?? "unknown";
     const composerCli = resolveCursorComposerCli();
     if (!composerCli) {
         console.log(chalk.yellow(`  ⚠ cursor-composer-in-claude is not installed (missing from node_modules). Run: npm install`));
         return false;
     }
-    console.log(chalk.dim(`  Command: ${process.execPath} ${composerCli}`));
+    let cliResolved;
+    try {
+        cliResolved = realpathSync(composerCli);
+    }
+    catch {
+        cliResolved = composerCli;
+    }
     const proxyEnv = {
         ...Object.fromEntries(Object.entries(process.env).filter(([, v]) => v !== undefined)),
         CI: "true",
@@ -561,6 +594,18 @@ async function startProxyProcess(baseUrl, url, port) {
         proxyEnv.CURSOR_AGENT_NODE = sysNode;
         proxyEnv.CURSOR_AGENT_SCRIPT = agentJs;
     }
+    console.log(chalk.dim(JSON.stringify({
+        claudeOvernight: VERSION,
+        spawnProxy: {
+            pkg: "cursor-composer-in-claude",
+            version: proxyVersion,
+            cliPath: cliResolved,
+            nodeExec: process.execPath,
+            apiKey: keySource,
+            agentPaths: sysNode && agentJs ? { node: sysNode, script: agentJs } : undefined,
+            childEnv: { CI: proxyEnv.CI, CURSOR_SKIP_KEYCHAIN: proxyEnv.CURSOR_SKIP_KEYCHAIN },
+        },
+    })));
     try {
         console.log(chalk.dim(`  Spawning proxy…`));
         const child = spawn(process.execPath, [composerCli], {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-overnight",
-  "version": "1.24.4",
+  "version": "1.24.5",
   "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": {
@@ -16,7 +16,7 @@
   "dependencies": {
     "@anthropic-ai/claude-agent-sdk": "^0.2.92",
     "chalk": "^5.4.1",
-    "cursor-composer-in-claude": "^0.7.6",
+    "cursor-composer-in-claude": "0.7.7",
     "jsonwebtoken": "^9.0.2"
   },
   "devDependencies": {

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

@@ -1,6 +1,6 @@
 {
   "name": "claude-overnight",
-  "version": "1.24.4",
+  "version": "1.24.5",
   "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"