codex-to-im 1.0.30 → 1.0.32

package/dist/cli.mjs

@@ -228,12 +228,14 @@ 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 uiPort = 4781;
 var bridgeAutostartTaskName = "CodexToIMBridge";
 var bridgeAutostartLauncherFile = path2.join(runtimeDir, "bridge-autostart.ps1");
 var npmUninstallLogFile = path2.join(runtimeDir, "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 });
@@ -287,6 +289,70 @@ function clearBridgePidFile() {
   } catch {
   }
 }
+function readBridgeStartLock(filePath = bridgeStartLockFile) {
+  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 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 createdAtMs = Date.parse(lock.createdAt);
+  if (!Number.isFinite(createdAtMs)) return true;
+  if (!isAlive(lock.pid)) return true;
+  return nowMs - createdAtMs > staleMs;
+}
+function tryAcquireBridgeStartLock(options = {}) {
+  const filePath = options.filePath ?? bridgeStartLockFile;
+  const ownerPid = options.ownerPid ?? process.pid;
+  const nowMs = options.nowMs ?? Date.now();
+  const payload = {
+    pid: ownerPid,
+    createdAt: new Date(nowMs).toISOString()
+  };
+  for (let attempt = 0; attempt < 2; attempt += 1) {
+    try {
+      fs2.writeFileSync(filePath, JSON.stringify(payload, null, 2), { encoding: "utf-8", flag: "wx" });
+      return { acquired: true };
+    } catch (error) {
+      const code = error.code;
+      if (code !== "EEXIST") throw error;
+      const existing2 = readBridgeStartLock(filePath);
+      if (!isBridgeStartLockStale(existing2, {
+        nowMs,
+        staleMs: options.staleMs,
+        isAlive: options.isAlive
+      })) {
+        return { acquired: false, holderPid: existing2?.pid };
+      }
+      try {
+        fs2.unlinkSync(filePath);
+      } catch {
+      }
+    }
+  }
+  const existing = readBridgeStartLock(filePath);
+  return { acquired: false, holderPid: existing?.pid };
+}
+function releaseBridgeStartLock(filePath = bridgeStartLockFile, ownerPid = process.pid) {
+  const existing = readBridgeStartLock(filePath);
+  if (!existing) {
+    try {
+      fs2.unlinkSync(filePath);
+    } catch {
+    }
+    return;
+  }
+  if (existing.pid !== ownerPid) return;
+  try {
+    fs2.unlinkSync(filePath);
+  } catch {
+  }
+}
 function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
@@ -515,6 +581,21 @@ async function waitForBridgeRunning(timeoutMs = 2e4) {
   }
   return getBridgeStatus();
 }
+async function waitForBridgeStartupTurn(timeoutMs = 2e4) {
+  const startedAt = Date.now();
+  while (Date.now() - startedAt < timeoutMs) {
+    const status = getBridgeStatus();
+    if (status.running) return status;
+    const lock = readBridgeStartLock();
+    if (!lock) return status;
+    if (isBridgeStartLockStale(lock)) {
+      releaseBridgeStartLock();
+      return getBridgeStatus();
+    }
+    await sleep(300);
+  }
+  return getBridgeStatus();
+}
 async function waitForUiServer(timeoutMs = 15e3) {
   const startedAt = Date.now();
   while (Date.now() - startedAt < timeoutMs) {
@@ -543,27 +624,52 @@ async function startBridge() {
   if (preflightFailure) {
     throw new Error(preflightFailure);
   }
-  const daemonEntry = path2.join(packageRoot, "dist", "daemon.mjs");
-  if (!fs2.existsSync(daemonEntry)) {
-    throw new Error(`Daemon bundle not found at ${daemonEntry}. Run npm run build first.`);
+  let startLockHeld = false;
+  let lockState = tryAcquireBridgeStartLock();
+  if (!lockState.acquired) {
+    const status = await waitForBridgeStartupTurn();
+    if (status.running) return status;
+    lockState = tryAcquireBridgeStartLock();
+    if (!lockState.acquired) {
+      throw new Error(
+        describeBridgeActivationFailure(status, config.channels) || `\u53E6\u4E00\u4E2A\u6865\u63A5\u670D\u52A1\u542F\u52A8\u8BF7\u6C42\u4ECD\u5728\u8FDB\u884C\u4E2D\uFF08PID: ${lockState.holderPid || "unknown"}\uFF09\u3002\u8BF7\u7A0D\u540E\u91CD\u8BD5\u3002`
+      );
+    }
   }
-  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 child = spawn(process.execPath, [daemonEntry], {
-    cwd: packageRoot,
-    detached: true,
-    env: buildDaemonEnv(),
-    stdio: ["ignore", stdoutFd, stderrFd],
-    ...WINDOWS_HIDE
-  });
-  child.unref();
-  const status = await waitForBridgeRunning();
-  if (!status.running) {
-    throw new Error(
-      describeBridgeActivationFailure(status, config.channels) || "Bridge failed to report running=true."
-    );
+  startLockHeld = true;
+  try {
+    const currentAfterLock = getBridgeStatus();
+    const extraAlivePidsAfterLock = getTrackedBridgePids(currentAfterLock).filter((pid) => pid !== currentAfterLock.pid && isProcessAlive(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)) {
+      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 child = spawn(process.execPath, [daemonEntry], {
+      cwd: packageRoot,
+      detached: true,
+      env: buildDaemonEnv(),
+      stdio: ["ignore", stdoutFd, stderrFd],
+      ...WINDOWS_HIDE
+    });
+    child.unref();
+    const status = await waitForBridgeRunning();
+    if (!status.running) {
+      throw new Error(
+        describeBridgeActivationFailure(status, config.channels) || "Bridge failed to report running=true."
+      );
+    }
+    return status;
+  } finally {
+    if (startLockHeld) {
+      releaseBridgeStartLock();
+    }
   }
-  return status;
 }
 async function stopBridge() {
   const status = readJsonFile(bridgeStatusFile, { running: false });

package/dist/daemon.mjs

@@ -18175,6 +18175,29 @@ function buildMirrorTitle(threadTitle, markdown = false) {
 function buildMirrorSpeakerLabel(label, markdown = false) {
   return markdown ? `**${label}:**` : `${label}:`;
 }
+var MIRROR_USER_WRAPPER_LABELS = /* @__PURE__ */ new Map([
+  ["# Review findings:", "Review findings"],
+  ["# Context from my IDE setup:", "IDE setup"],
+  ["# Files mentioned by the user:", "Files"]
+]);
+var MIRROR_USER_REQUEST_MARKER = "## My request for Codex:";
+function formatMirrorUserText(text2) {
+  const normalized = (text2 || "").replace(/\r\n?/g, "\n").trim();
+  if (!normalized) return null;
+  const lines = normalized.split("\n");
+  const firstNonEmptyIndex = lines.findIndex((line) => line.trim().length > 0);
+  if (firstNonEmptyIndex < 0) return null;
+  const wrapperLabel = MIRROR_USER_WRAPPER_LABELS.get(lines[firstNonEmptyIndex].trim());
+  if (!wrapperLabel) return normalized;
+  const requestMarkerIndex = lines.findIndex(
+    (line, index) => index > firstNonEmptyIndex && line.trim() === MIRROR_USER_REQUEST_MARKER
+  );
+  if (requestMarkerIndex < 0) return normalized;
+  const requestBody = lines.slice(requestMarkerIndex + 1).join("\n").trim();
+  if (!requestBody) return normalized;
+  return `\uFF08\u57FA\u4E8E ${wrapperLabel}\uFF09
+${requestBody}`;
+}
 function formatMirrorSpeakerBlock(label, text2, markdown = false, forceLabel = false) {
   const normalized = (text2 || "").trim();
   if (!normalized) {
@@ -18353,7 +18376,7 @@ function createMirrorTurnState(sessionId, timestamp, turnId) {
   };
 }
 function appendMirrorUserText(turnState, chunk) {
-  const normalized = chunk.trim();
+  const normalized = formatMirrorUserText(chunk);
   if (!normalized) return;
   if (!turnState.userText) {
     turnState.userText = normalized;

package/dist/ui-server.mjs

@@ -5611,12 +5611,14 @@ var runtimeDir = path4.join(CTI_HOME, "runtime");
 var logsDir = path4.join(CTI_HOME, "logs");
 var bridgePidFile = path4.join(runtimeDir, "bridge.pid");
 var bridgeStatusFile = path4.join(runtimeDir, "status.json");
+var bridgeStartLockFile = path4.join(runtimeDir, "bridge.start.lock");
 var uiStatusFile = path4.join(runtimeDir, "ui-server.json");
 var uiPort = 4781;
 var bridgeAutostartTaskName = "CodexToIMBridge";
 var bridgeAutostartLauncherFile = path4.join(runtimeDir, "bridge-autostart.ps1");
 var npmUninstallLogFile = path4.join(runtimeDir, "npm-uninstall.log");
 var WINDOWS_HIDE = process.platform === "win32" ? { windowsHide: true } : {};
+var BRIDGE_START_LOCK_STALE_MS = 3e4;
 function ensureDirs() {
   fs3.mkdirSync(runtimeDir, { recursive: true });
   fs3.mkdirSync(logsDir, { recursive: true });
@@ -5670,6 +5672,70 @@ function clearBridgePidFile() {
   } catch {
   }
 }
+function readBridgeStartLock(filePath = bridgeStartLockFile) {
+  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 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 createdAtMs = Date.parse(lock.createdAt);
+  if (!Number.isFinite(createdAtMs)) return true;
+  if (!isAlive(lock.pid)) return true;
+  return nowMs - createdAtMs > staleMs;
+}
+function tryAcquireBridgeStartLock(options = {}) {
+  const filePath = options.filePath ?? bridgeStartLockFile;
+  const ownerPid = options.ownerPid ?? process.pid;
+  const nowMs = options.nowMs ?? Date.now();
+  const payload = {
+    pid: ownerPid,
+    createdAt: new Date(nowMs).toISOString()
+  };
+  for (let attempt = 0; attempt < 2; attempt += 1) {
+    try {
+      fs3.writeFileSync(filePath, JSON.stringify(payload, null, 2), { encoding: "utf-8", flag: "wx" });
+      return { acquired: true };
+    } catch (error) {
+      const code = error.code;
+      if (code !== "EEXIST") throw error;
+      const existing2 = readBridgeStartLock(filePath);
+      if (!isBridgeStartLockStale(existing2, {
+        nowMs,
+        staleMs: options.staleMs,
+        isAlive: options.isAlive
+      })) {
+        return { acquired: false, holderPid: existing2?.pid };
+      }
+      try {
+        fs3.unlinkSync(filePath);
+      } catch {
+      }
+    }
+  }
+  const existing = readBridgeStartLock(filePath);
+  return { acquired: false, holderPid: existing?.pid };
+}
+function releaseBridgeStartLock(filePath = bridgeStartLockFile, ownerPid = process.pid) {
+  const existing = readBridgeStartLock(filePath);
+  if (!existing) {
+    try {
+      fs3.unlinkSync(filePath);
+    } catch {
+    }
+    return;
+  }
+  if (existing.pid !== ownerPid) return;
+  try {
+    fs3.unlinkSync(filePath);
+  } catch {
+  }
+}
 function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
@@ -5792,6 +5858,21 @@ async function waitForBridgeRunning(timeoutMs = 2e4) {
   }
   return getBridgeStatus();
 }
+async function waitForBridgeStartupTurn(timeoutMs = 2e4) {
+  const startedAt = Date.now();
+  while (Date.now() - startedAt < timeoutMs) {
+    const status = getBridgeStatus();
+    if (status.running) return status;
+    const lock = readBridgeStartLock();
+    if (!lock) return status;
+    if (isBridgeStartLockStale(lock)) {
+      releaseBridgeStartLock();
+      return getBridgeStatus();
+    }
+    await sleep(300);
+  }
+  return getBridgeStatus();
+}
 async function startBridge() {
   ensureDirs();
   const current = getBridgeStatus();
@@ -5805,27 +5886,52 @@ async function startBridge() {
   if (preflightFailure) {
     throw new Error(preflightFailure);
   }
-  const daemonEntry = path4.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 = fs3.openSync(path4.join(logsDir, "bridge-launcher.out.log"), "a");
-  const stderrFd = fs3.openSync(path4.join(logsDir, "bridge-launcher.err.log"), "a");
-  const child = spawn(process.execPath, [daemonEntry], {
-    cwd: packageRoot,
-    detached: true,
-    env: buildDaemonEnv(),
-    stdio: ["ignore", stdoutFd, stderrFd],
-    ...WINDOWS_HIDE
-  });
-  child.unref();
-  const status = await waitForBridgeRunning();
-  if (!status.running) {
-    throw new Error(
-      describeBridgeActivationFailure(status, config.channels) || "Bridge failed to report running=true."
-    );
+  let startLockHeld = false;
+  let lockState = tryAcquireBridgeStartLock();
+  if (!lockState.acquired) {
+    const status = await waitForBridgeStartupTurn();
+    if (status.running) return status;
+    lockState = tryAcquireBridgeStartLock();
+    if (!lockState.acquired) {
+      throw new Error(
+        describeBridgeActivationFailure(status, config.channels) || `\u53E6\u4E00\u4E2A\u6865\u63A5\u670D\u52A1\u542F\u52A8\u8BF7\u6C42\u4ECD\u5728\u8FDB\u884C\u4E2D\uFF08PID: ${lockState.holderPid || "unknown"}\uFF09\u3002\u8BF7\u7A0D\u540E\u91CD\u8BD5\u3002`
+      );
+    }
+  }
+  startLockHeld = true;
+  try {
+    const currentAfterLock = getBridgeStatus();
+    const extraAlivePidsAfterLock = getTrackedBridgePids(currentAfterLock).filter((pid) => pid !== currentAfterLock.pid && isProcessAlive(pid));
+    if (currentAfterLock.running && extraAlivePidsAfterLock.length === 0) return currentAfterLock;
+    if (currentAfterLock.running && extraAlivePidsAfterLock.length > 0) {
+      await stopBridge();
+    }
+    const daemonEntry = path4.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 = fs3.openSync(path4.join(logsDir, "bridge-launcher.out.log"), "a");
+    const stderrFd = fs3.openSync(path4.join(logsDir, "bridge-launcher.err.log"), "a");
+    const child = spawn(process.execPath, [daemonEntry], {
+      cwd: packageRoot,
+      detached: true,
+      env: buildDaemonEnv(),
+      stdio: ["ignore", stdoutFd, stderrFd],
+      ...WINDOWS_HIDE
+    });
+    child.unref();
+    const status = await waitForBridgeRunning();
+    if (!status.running) {
+      throw new Error(
+        describeBridgeActivationFailure(status, config.channels) || "Bridge failed to report running=true."
+      );
+    }
+    return status;
+  } finally {
+    if (startLockHeld) {
+      releaseBridgeStartLock();
+    }
   }
-  return status;
 }
 async function stopBridge() {
   const status = readJsonFile(bridgeStatusFile, { running: false });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codex-to-im",
-  "version": "1.0.30",
+  "version": "1.0.32",
   "description": "Installable Codex-to-IM bridge with local setup UI and background service",
   "license": "MIT",
   "homepage": "https://github.com/zhangle1987/codex-to-im#readme",