@bitkyc08/opencodex 2.6.17 → 2.6.18-preview.20260703

package/README.md

@@ -181,12 +181,21 @@ next Codex session. opencodex keeps two separate behaviors:
 | Kimi (Moonshot) | `openai-chat` | oauth / key |
 | Google Gemini | `google` | key |
 | Azure OpenAI | `azure-openai` | key |
+| Cursor (experimental) | `cursor` | dashboard/local config; live transport + native exec |
 | Ollama Cloud + 17-provider catalog | `openai-chat` | key |
 | Ollama / vLLM / LM Studio (local) | `openai-chat` | key (usually blank) |
 | Any OpenAI-compatible endpoint | `openai-chat` | key |
 
 Plus DeepSeek, Groq, OpenRouter, Together, Fireworks, Cerebras, Mistral, Hugging Face, NVIDIA NIM, MiniMax, Qwen Portal, and more. See the full list with `ocx init` or in the [provider docs](https://lidge-jun.github.io/opencodex/reference/configuration/).
 
+Cursor support is a staged experimental bridge: it appears in `ocx init` and the dashboard Add
+Provider picker as a local config with Cursor's static public model catalog. Live
+HTTP/2 transport is enabled when a Cursor access token is configured, and Cursor native
+read/write/delete/ls/grep/shell/fetch requests are handled by opencodex. MCP, screen recording,
+and computer-use are exposed through executor hooks; when no local executor is configured,
+opencodex returns typed no-executor results instead of policy-blocking the request. Cursor OAuth
+and live model discovery remain separate future phases.
+
 ## CLI
 
 ```bash

package/bin/ocx.mjs

@@ -10,7 +10,7 @@
  */
 import { spawn, spawnSync } from "node:child_process";
 import { createRequire } from "node:module";
-import { existsSync, readFileSync, statSync } from "node:fs";
+import { existsSync, readFileSync, readdirSync, statSync } from "node:fs";
 import { homedir } from "node:os";
 import { dirname, join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
@@ -41,19 +41,43 @@ function currentPackageVersion() {
 }
 
 function updateTag(currentVersion) {
+  // Allowlist the tag: the value is argv-controlled and (on Windows) flows into a
+  // shell-joined spawnSync — never forward arbitrary strings.
   const tagIndex = process.argv.indexOf("--tag");
-  if (tagIndex !== -1 && process.argv[tagIndex + 1]) return process.argv[tagIndex + 1];
+  const explicit = tagIndex !== -1 ? process.argv[tagIndex + 1] : undefined;
+  if (explicit === "preview" || explicit === "latest") return explicit;
   return String(currentVersion).includes("-preview.") ? "preview" : "latest";
 }
 
+function expandUserPath(raw) {
+  // Mirror src/config.ts expandUserPath — the Bun proxy expands `~`, so this launcher's
+  // pid/state gates must resolve the same directory or they silently check the wrong path.
+  if (raw === "~") return homedir();
+  if (raw.startsWith("~/") || raw.startsWith("~\\")) return join(homedir(), raw.slice(2));
+  return raw;
+}
+
 function configDir() {
-  return resolve(process.env.OPENCODEX_HOME?.trim() || join(homedir(), ".opencodex"));
+  const raw = process.env.OPENCODEX_HOME?.trim();
+  return resolve(raw ? expandUserPath(raw) : join(homedir(), ".opencodex"));
 }
 
 function shouldRepairCodexShim() {
   return existsSync(join(configDir(), "codex-shim.json"));
 }
 
+function historyRestoreIncomplete() {
+  // Mirror src/update.ts historyRestoreIncomplete — a codex-history-backup-*.json surviving
+  // a stop means the native-history restore was skipped (locked state DB).
+  try {
+    return readdirSync(configDir()).some(
+      name => name.startsWith("codex-history-backup-") && name.endsWith(".json"),
+    );
+  } catch {
+    return false;
+  }
+}
+
 function repairCodexShimIfNeeded() {
   if (!shouldRepairCodexShim()) return;
   const launcher = fileURLToPath(import.meta.url);
@@ -70,10 +94,14 @@ function runNpmSelfUpdate() {
   const current = currentPackageVersion();
   const tag = updateTag(current);
   const npm = npmBin();
+  // Node ≥18.20/20.12 refuses to spawn .cmd/.bat without a shell (CVE-2024-27980
+  // hardening) — spawning "npm.cmd" shell-less throws EINVAL on Windows.
+  const winShell = process.platform === "win32";
   const latestResult = spawnSync(npm, ["view", `${PKG}@${tag}`, "version"], {
     encoding: "utf8",
     timeout: 12000,
     windowsHide: true,
+    shell: winShell,
   });
   const latest = latestResult.status === 0 ? latestResult.stdout.trim() : "";
 
@@ -83,17 +111,54 @@ function runNpmSelfUpdate() {
     process.exit(0);
   }
 
+  // Remember whether a background service manages the proxy BEFORE stopping — `ocx stop`
+  // unloads it permanently, so a successful update must reinstall it afterwards.
+  const serviceWasInstalled = existsSync(join(configDir(), "service-state.json"));
+
+  // Never replace package files under a live proxy — stop it first (full `ocx stop`
+  // semantics: graceful drain, service stop, native Codex restore). Gate on the service
+  // and the runtime-port record too: a service-managed or orphaned proxy can be live
+  // while ocx.pid is stale/missing.
+  const launcher = fileURLToPath(import.meta.url);
+  const hasRuntimeState =
+    existsSync(join(configDir(), "ocx.pid")) || existsSync(join(configDir(), "runtime-port.json"));
+  if (serviceWasInstalled || hasRuntimeState) {
+    console.log("⏹  Stopping the running proxy before updating...");
+    const stopRes = spawnSync(process.execPath, [launcher, "stop"], { stdio: "inherit", windowsHide: true });
+    const stillHasRuntimeState =
+      existsSync(join(configDir(), "ocx.pid")) || existsSync(join(configDir(), "runtime-port.json"));
+    if (stopRes.status !== 0 || stillHasRuntimeState) {
+      console.error("opencodex: could not stop the running proxy; aborting the update. Run 'ocx stop' and retry.");
+      process.exit(1);
+    }
+    if (historyRestoreIncomplete()) {
+      console.warn(
+        "opencodex: WARNING — Codex resume history was NOT restored (history DB locked; Codex app/IDE open?).\n" +
+        "  Routed threads stay hidden in the native Codex app until restored.\n" +
+        "  After the update: close the Codex app, then run 'ocx stop' once to restore.",
+      );
+    }
+  }
+
   console.log(`Updating${latest ? ` to v${latest}` : ""}...\n$ ${npm} install -g ${PKG}@${tag}`);
   const res = spawnSync(npm, ["install", "-g", `${PKG}@${tag}`], {
     stdio: "inherit",
     timeout: 180000,
     windowsHide: true,
+    shell: winShell,
   });
   if (res.status === 0) {
     console.log(`\nUpdated${latest ? ` to v${latest}` : ""}.`);
     repairCodexShimIfNeeded();
-    console.log("Restart the proxy:  ocx stop && ocx start");
-    console.log("If a background service is installed, refresh its baked path:  ocx service install");
+    // The stop above unloaded any managed service; reinstall via the freshly-installed
+    // launcher so the new files write the baked paths and the service restarts.
+    if (serviceWasInstalled) {
+      console.log("Reinstalling the background service with the updated files...");
+      const svc = spawnSync(process.execPath, [launcher, "service", "install"], { stdio: "inherit", windowsHide: true });
+      if (svc.status !== 0) console.warn("opencodex: service refresh failed — run 'ocx service install' manually.");
+    } else {
+      console.log("Restart the proxy:  ocx start");
+    }
     process.exit(0);
   }
   console.error(`\nUpdate failed (${npm} exit ${res.status ?? "?"}). Try manually:  ${npm} install -g ${PKG}@${tag}`);