codex-to-im 1.0.40 → 1.0.42

package/dist/cli.mjs

@@ -5,9 +5,9 @@ import { createRequire } from 'module'; const require = createRequire(import.met
 import { stdin as input, stdout as output } from "node:process";
 
 // src/service-manager.ts
-import fs2 from "node:fs";
+import fs3 from "node:fs";
 import os2 from "node:os";
-import path2 from "node:path";
+import path3 from "node:path";
 import { spawn } from "node:child_process";
 import { fileURLToPath } from "node:url";
 
@@ -233,42 +233,79 @@ function loadConfig() {
   return expandConfig(empty);
 }
 
-// src/service-manager.ts
-var moduleDir = path2.dirname(fileURLToPath(import.meta.url));
-var packageRoot = path2.resolve(moduleDir, "..");
+// src/bridge-instance-lock.ts
+import fs2 from "node:fs";
+import path2 from "node:path";
 var runtimeDir = path2.join(CTI_HOME, "runtime");
-var logsDir = path2.join(CTI_HOME, "logs");
-var bridgePidFile = path2.join(runtimeDir, "bridge.pid");
-var bridgeStatusFile = path2.join(runtimeDir, "status.json");
-var bridgeStartLockFile = path2.join(runtimeDir, "bridge.start.lock");
-var uiStatusFile = path2.join(runtimeDir, "ui-server.json");
+var bridgeInstanceLockFile = path2.join(runtimeDir, "bridge.instance.lock");
+function readJsonFile(filePath, fallback) {
+  try {
+    return JSON.parse(fs2.readFileSync(filePath, "utf-8"));
+  } catch {
+    return fallback;
+  }
+}
+function isProcessAlive(pid) {
+  if (!pid) return false;
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch {
+    return false;
+  }
+}
+function readBridgeInstanceLock(filePath = bridgeInstanceLockFile) {
+  const parsed = readJsonFile(filePath, null);
+  const pid = Number(parsed?.pid);
+  const createdAt = typeof parsed?.createdAt === "string" ? parsed.createdAt : "";
+  if (!Number.isFinite(pid) || pid <= 0 || !createdAt) return null;
+  return { pid, createdAt };
+}
+function clearStaleBridgeInstanceLock(filePath = bridgeInstanceLockFile, isAlive = isProcessAlive) {
+  const existing = readBridgeInstanceLock(filePath);
+  if (existing && isAlive(existing.pid)) return;
+  try {
+    fs2.unlinkSync(filePath);
+  } catch {
+  }
+}
+
+// src/service-manager.ts
+var moduleDir = path3.dirname(fileURLToPath(import.meta.url));
+var packageRoot = path3.resolve(moduleDir, "..");
+var runtimeDir2 = path3.join(CTI_HOME, "runtime");
+var logsDir = path3.join(CTI_HOME, "logs");
+var bridgePidFile = path3.join(runtimeDir2, "bridge.pid");
+var bridgeStatusFile = path3.join(runtimeDir2, "status.json");
+var bridgeStartLockFile = path3.join(runtimeDir2, "bridge.start.lock");
+var uiStatusFile = path3.join(runtimeDir2, "ui-server.json");
 var uiPort = 4781;
 var bridgeAutostartTaskName = "CodexToIMBridge";
-var bridgeAutostartLauncherFile = path2.join(runtimeDir, "bridge-autostart.ps1");
-var npmUninstallLogFile = path2.join(runtimeDir, "npm-uninstall.log");
+var bridgeAutostartLauncherFile = path3.join(runtimeDir2, "bridge-autostart.ps1");
+var npmUninstallLogFile = path3.join(runtimeDir2, "npm-uninstall.log");
 var WINDOWS_HIDE = process.platform === "win32" ? { windowsHide: true } : {};
 var BRIDGE_START_LOCK_STALE_MS = 3e4;
 function ensureDirs() {
-  fs2.mkdirSync(runtimeDir, { recursive: true });
-  fs2.mkdirSync(logsDir, { recursive: true });
+  fs3.mkdirSync(runtimeDir2, { recursive: true });
+  fs3.mkdirSync(logsDir, { recursive: true });
 }
-function readJsonFile(filePath, fallback) {
+function readJsonFile2(filePath, fallback) {
   try {
-    return JSON.parse(fs2.readFileSync(filePath, "utf-8"));
+    return JSON.parse(fs3.readFileSync(filePath, "utf-8"));
   } catch {
     return fallback;
   }
 }
 function readPid(filePath) {
   try {
-    const raw = fs2.readFileSync(filePath, "utf-8").trim();
+    const raw = fs3.readFileSync(filePath, "utf-8").trim();
     const pid = Number(raw);
     return Number.isFinite(pid) ? pid : void 0;
   } catch {
     return void 0;
   }
 }
-function isProcessAlive(pid) {
+function isProcessAlive2(pid) {
   if (!pid) return false;
   try {
     process.kill(pid, 0);
@@ -277,32 +314,37 @@ function isProcessAlive(pid) {
     return false;
   }
 }
-function collectTrackedBridgePids(bridgePid, statusPid) {
+function collectTrackedBridgePids(bridgePid, statusPid, instanceLockPid) {
   const unique = /* @__PURE__ */ new Set();
-  for (const pid of [bridgePid, statusPid]) {
+  for (const pid of [bridgePid, statusPid, instanceLockPid]) {
     if (Number.isFinite(pid) && pid > 0) {
       unique.add(pid);
     }
   }
   return [...unique];
 }
-function resolveTrackedBridgePid(bridgePid, statusPid, isAlive = isProcessAlive) {
+function resolveTrackedBridgePid(bridgePid, statusPid, instanceLockPid, isAlive = isProcessAlive2) {
   if (isAlive(bridgePid)) return bridgePid;
   if (isAlive(statusPid)) return statusPid;
-  return bridgePid ?? statusPid;
+  if (isAlive(instanceLockPid)) return instanceLockPid;
+  return bridgePid ?? statusPid ?? instanceLockPid;
 }
 function getTrackedBridgePids(status) {
-  const resolvedStatus = status ?? readJsonFile(bridgeStatusFile, { running: false });
-  return collectTrackedBridgePids(readPid(bridgePidFile), resolvedStatus.pid);
+  const resolvedStatus = status ?? readJsonFile2(bridgeStatusFile, { running: false });
+  return collectTrackedBridgePids(
+    readPid(bridgePidFile),
+    resolvedStatus.pid,
+    readBridgeInstanceLock()?.pid
+  );
 }
 function clearBridgePidFile() {
   try {
-    fs2.unlinkSync(bridgePidFile);
+    fs3.unlinkSync(bridgePidFile);
   } catch {
   }
 }
 function readBridgeStartLock(filePath = bridgeStartLockFile) {
-  const parsed = readJsonFile(filePath, null);
+  const parsed = readJsonFile2(filePath, null);
   const pid = Number(parsed?.pid);
   const createdAt = typeof parsed?.createdAt === "string" ? parsed.createdAt : "";
   if (!Number.isFinite(pid) || pid <= 0 || !createdAt) return null;
@@ -312,7 +354,7 @@ function isBridgeStartLockStale(lock, options = {}) {
   if (!lock) return true;
   const nowMs = options.nowMs ?? Date.now();
   const staleMs = options.staleMs ?? BRIDGE_START_LOCK_STALE_MS;
-  const isAlive = options.isAlive ?? isProcessAlive;
+  const isAlive = options.isAlive ?? isProcessAlive2;
   const createdAtMs = Date.parse(lock.createdAt);
   if (!Number.isFinite(createdAtMs)) return true;
   if (!isAlive(lock.pid)) return true;
@@ -328,7 +370,7 @@ function tryAcquireBridgeStartLock(options = {}) {
   };
   for (let attempt = 0; attempt < 2; attempt += 1) {
     try {
-      fs2.writeFileSync(filePath, JSON.stringify(payload, null, 2), { encoding: "utf-8", flag: "wx" });
+      fs3.writeFileSync(filePath, JSON.stringify(payload, null, 2), { encoding: "utf-8", flag: "wx" });
       return { acquired: true };
     } catch (error) {
       const code = error.code;
@@ -342,7 +384,7 @@ function tryAcquireBridgeStartLock(options = {}) {
         return { acquired: false, holderPid: existing2?.pid };
       }
       try {
-        fs2.unlinkSync(filePath);
+        fs3.unlinkSync(filePath);
       } catch {
       }
     }
@@ -354,14 +396,14 @@ function releaseBridgeStartLock(filePath = bridgeStartLockFile, ownerPid = proce
   const existing = readBridgeStartLock(filePath);
   if (!existing) {
     try {
-      fs2.unlinkSync(filePath);
+      fs3.unlinkSync(filePath);
     } catch {
     }
     return;
   }
   if (existing.pid !== ownerPid) return;
   try {
-    fs2.unlinkSync(filePath);
+    fs3.unlinkSync(filePath);
   } catch {
   }
 }
@@ -443,11 +485,11 @@ function ensureBridgeAutostartLauncher() {
     "    }",
     "  } catch { }",
     "}",
-    `& $node '${escapePowerShellSingleQuoted(path2.join(packageRoot, "dist", "cli.mjs"))}' start`,
+    `& $node '${escapePowerShellSingleQuoted(path3.join(packageRoot, "dist", "cli.mjs"))}' start`,
     "exit $LASTEXITCODE",
     ""
   ].join("\r\n");
-  fs2.writeFileSync(bridgeAutostartLauncherFile, content, "utf-8");
+  fs3.writeFileSync(bridgeAutostartLauncherFile, content, "utf-8");
   return bridgeAutostartLauncherFile;
 }
 function parsePowerShellJson(raw) {
@@ -491,7 +533,7 @@ function buildDeferredGlobalNpmUninstallLaunch(options = {}) {
 async function launchDeferredGlobalNpmUninstall() {
   ensureDirs();
   const launch = buildDeferredGlobalNpmUninstallLaunch();
-  fs2.writeFileSync(
+  fs3.writeFileSync(
     launch.logPath,
     [
       `[${(/* @__PURE__ */ new Date()).toISOString()}] Scheduling global uninstall.`,
@@ -519,14 +561,18 @@ function getUiServerUrl(port = uiPort) {
   return `http://127.0.0.1:${port}`;
 }
 function getCurrentUiServerUrl() {
-  const status = readJsonFile(uiStatusFile, null);
+  const status = readJsonFile2(uiStatusFile, null);
   if (!status?.port) return void 0;
   return getUiServerUrl(status.port);
 }
 function getBridgeStatus() {
-  const status = readJsonFile(bridgeStatusFile, { running: false });
-  const pid = resolveTrackedBridgePid(readPid(bridgePidFile), status.pid);
-  if (!isProcessAlive(pid)) {
+  const status = readJsonFile2(bridgeStatusFile, { running: false });
+  const pid = resolveTrackedBridgePid(
+    readPid(bridgePidFile),
+    status.pid,
+    readBridgeInstanceLock()?.pid
+  );
+  if (!isProcessAlive2(pid)) {
     return {
       ...status,
       pid,
@@ -540,8 +586,8 @@ function getBridgeStatus() {
   };
 }
 function getUiServerStatus() {
-  const status = readJsonFile(uiStatusFile, { running: false, port: uiPort });
-  if (!isProcessAlive(status.pid)) {
+  const status = readJsonFile2(uiStatusFile, { running: false, port: uiPort });
+  if (!isProcessAlive2(status.pid)) {
     return {
       ...status,
       running: false,
@@ -626,7 +672,7 @@ async function waitForUiServer(timeoutMs = 15e3) {
 async function startBridge() {
   ensureDirs();
   const current = getBridgeStatus();
-  const extraAlivePids = getTrackedBridgePids(current).filter((pid) => pid !== current.pid && isProcessAlive(pid));
+  const extraAlivePids = getTrackedBridgePids(current).filter((pid) => pid !== current.pid && isProcessAlive2(pid));
   if (current.running && extraAlivePids.length === 0) return current;
   if (current.running && extraAlivePids.length > 0) {
     await stopBridge();
@@ -651,17 +697,17 @@ async function startBridge() {
   startLockHeld = true;
   try {
     const currentAfterLock = getBridgeStatus();
-    const extraAlivePidsAfterLock = getTrackedBridgePids(currentAfterLock).filter((pid) => pid !== currentAfterLock.pid && isProcessAlive(pid));
+    const extraAlivePidsAfterLock = getTrackedBridgePids(currentAfterLock).filter((pid) => pid !== currentAfterLock.pid && isProcessAlive2(pid));
     if (currentAfterLock.running && extraAlivePidsAfterLock.length === 0) return currentAfterLock;
     if (currentAfterLock.running && extraAlivePidsAfterLock.length > 0) {
       await stopBridge();
     }
-    const daemonEntry = path2.join(packageRoot, "dist", "daemon.mjs");
-    if (!fs2.existsSync(daemonEntry)) {
+    const daemonEntry = path3.join(packageRoot, "dist", "daemon.mjs");
+    if (!fs3.existsSync(daemonEntry)) {
       throw new Error(`Daemon bundle not found at ${daemonEntry}. Run npm run build first.`);
     }
-    const stdoutFd = fs2.openSync(path2.join(logsDir, "bridge-launcher.out.log"), "a");
-    const stderrFd = fs2.openSync(path2.join(logsDir, "bridge-launcher.err.log"), "a");
+    const stdoutFd = fs3.openSync(path3.join(logsDir, "bridge-launcher.out.log"), "a");
+    const stderrFd = fs3.openSync(path3.join(logsDir, "bridge-launcher.err.log"), "a");
     const child = spawn(process.execPath, [daemonEntry], {
       cwd: packageRoot,
       detached: true,
@@ -684,10 +730,11 @@ async function startBridge() {
   }
 }
 async function stopBridge() {
-  const status = readJsonFile(bridgeStatusFile, { running: false });
-  const pids = getTrackedBridgePids(status).filter((pid) => isProcessAlive(pid));
+  const status = readJsonFile2(bridgeStatusFile, { running: false });
+  const pids = getTrackedBridgePids(status).filter((pid) => isProcessAlive2(pid));
   if (pids.length === 0) {
     clearBridgePidFile();
+    clearStaleBridgeInstanceLock();
     return { ...getBridgeStatus(), running: false };
   }
   for (const pid of pids) {
@@ -709,13 +756,15 @@ async function stopBridge() {
   }
   const startedAt = Date.now();
   while (Date.now() - startedAt < 1e4) {
-    if (pids.every((pid) => !isProcessAlive(pid))) {
+    if (pids.every((pid) => !isProcessAlive2(pid))) {
       clearBridgePidFile();
+      clearStaleBridgeInstanceLock();
       return getBridgeStatus();
     }
     await sleep(300);
   }
   clearBridgePidFile();
+  clearStaleBridgeInstanceLock();
   return getBridgeStatus();
 }
 async function getBridgeAutostartStatus() {
@@ -804,8 +853,8 @@ async function uninstallBridgeAutostart() {
   ].join("; ");
   await runPowerShell(script);
   try {
-    if (fs2.existsSync(bridgeAutostartLauncherFile)) {
-      fs2.unlinkSync(bridgeAutostartLauncherFile);
+    if (fs3.existsSync(bridgeAutostartLauncherFile)) {
+      fs3.unlinkSync(bridgeAutostartLauncherFile);
     }
   } catch {
   }
@@ -836,12 +885,12 @@ async function ensureUiServerRunning() {
   ensureDirs();
   const current = getUiServerStatus();
   if (current.running) return current;
-  const serverEntry = path2.join(packageRoot, "dist", "ui-server.mjs");
-  if (!fs2.existsSync(serverEntry)) {
+  const serverEntry = path3.join(packageRoot, "dist", "ui-server.mjs");
+  if (!fs3.existsSync(serverEntry)) {
     throw new Error(`UI server bundle not found at ${serverEntry}. Run npm run build first.`);
   }
-  const stdoutFd = fs2.openSync(path2.join(logsDir, "ui-server.out.log"), "a");
-  const stderrFd = fs2.openSync(path2.join(logsDir, "ui-server.err.log"), "a");
+  const stdoutFd = fs3.openSync(path3.join(logsDir, "ui-server.out.log"), "a");
+  const stderrFd = fs3.openSync(path3.join(logsDir, "ui-server.err.log"), "a");
   const child = spawn(process.execPath, [serverEntry], {
     cwd: packageRoot,
     detached: true,
@@ -861,7 +910,7 @@ async function ensureUiServerRunning() {
 }
 async function stopUiServer() {
   const status = getUiServerStatus();
-  if (!status.pid || !isProcessAlive(status.pid)) {
+  if (!status.pid || !isProcessAlive2(status.pid)) {
     const next2 = { ...status, running: false };
     writeUiServerStatus(next2);
     return next2;
@@ -898,7 +947,7 @@ async function stopUiServer() {
 }
 function writeUiServerStatus(status) {
   ensureDirs();
-  fs2.writeFileSync(uiStatusFile, JSON.stringify(status, null, 2), "utf-8");
+  fs3.writeFileSync(uiStatusFile, JSON.stringify(status, null, 2), "utf-8");
 }
 function openBrowser(url) {
   if (process.platform === "win32") {