codex-to-im 1.0.61 → 1.0.62

package/dist/daemon.mjs

@@ -16689,7 +16689,9 @@ async function runMirrorReconcileBatch(deps) {
 }
 
 // src/lib/bridge/mirror-runtime.ts
+var MIRROR_ORPHAN_PROCESS_PROBE_INTERVAL_MS = 6e4;
 function createMirrorRuntime(getState2, options, deps) {
+  const orphanProbeAt = /* @__PURE__ */ new Map();
   function isAtOrBefore(timestamp, boundary) {
     if (!timestamp) return true;
     const timestampMs = Date.parse(timestamp);
@@ -16776,8 +16778,35 @@ function createMirrorRuntime(getState2, options, deps) {
     deps.stopMirrorStreaming(existing);
     closeMirrorWatcher(existing);
     state.mirrorSubscriptions.delete(bindingId);
+    orphanProbeAt.delete(bindingId);
     deps.syncMirrorSessionStateSafe(existing.sessionId, "mirror subscription removal");
   }
+  async function finalizeOrphanedMirrorStream(subscription, snapshot, blocked, runtimeBusy, nowMs) {
+    const pendingTurn = subscription.pendingTurn;
+    if (!pendingTurn?.streamStarted || blocked || runtimeBusy) return null;
+    const timeoutMs = options.streamOrphanTimeoutMs;
+    const lastActivityMs = Date.parse(pendingTurn.lastActivityAt);
+    if (!Number.isFinite(timeoutMs) || timeoutMs <= 0 || !Number.isFinite(lastActivityMs)) {
+      return null;
+    }
+    const sourceActivityMs = Math.max(lastActivityMs, snapshot.mtimeMs);
+    if (nowMs - sourceActivityMs < timeoutMs) return null;
+    const lastProbeAt = orphanProbeAt.get(subscription.bindingId);
+    if (typeof lastProbeAt === "number" && nowMs - lastProbeAt < MIRROR_ORPHAN_PROCESS_PROBE_INTERVAL_MS) {
+      return null;
+    }
+    orphanProbeAt.set(subscription.bindingId, nowMs);
+    if (!await deps.isThreadProcessDefinitelyGone(subscription.threadId)) return null;
+    const finalized = flushTimedOutMirrorTurn(subscription, timeoutMs, nowMs);
+    if (!finalized) return null;
+    orphanProbeAt.delete(subscription.bindingId);
+    const detail = "\u684C\u9762\u7EBF\u7A0B\u957F\u65F6\u95F4\u6CA1\u6709\u65B0\u8BB0\u5F55\uFF0C\u4E14\u672C\u673A\u672A\u627E\u5230\u5BF9\u5E94\u8FDB\u7A0B\uFF1B\u5DF2\u7ED3\u675F\u5B64\u7ACB\u7684\u6D41\u5F0F\u540C\u6B65\u3002";
+    deps.recordOrphanedMirrorTurn(subscription.sessionId, detail);
+    console.warn(
+      `[bridge-manager] Finalized orphaned mirror turn ${pendingTurn.turnId || pendingTurn.streamKey} for thread ${subscription.threadId}`
+    );
+    return finalized;
+  }
   function clearDanglingMirrorThread(subscription, reason) {
     const { store } = getBridgeContext();
     const session = store.getSession(subscription.sessionId);
@@ -16835,6 +16864,7 @@ function createMirrorRuntime(getState2, options, deps) {
     });
     if (threadChanged || filePathChanged) {
       deps.stopMirrorStreaming(existing);
+      orphanProbeAt.delete(existing.bindingId);
     }
     watchMirrorFile(existing, filePath);
     if (previousSessionId !== binding.codepilotSessionId) {
@@ -16934,6 +16964,20 @@ function createMirrorRuntime(getState2, options, deps) {
       flushTimedOutTurn: (currentSubscription) => deps.flushTimedOutMirrorTurn(currentSubscription),
       consumeBufferedTurns: (currentSubscription) => deps.consumeBufferedMirrorTurns(currentSubscription)
     });
+    const runtimeBusy = session.runtime_status === "running" || session.runtime_status === "queued";
+    const orphanedTurn = await finalizeOrphanedMirrorStream(
+      subscription,
+      snapshot,
+      blocked,
+      runtimeBusy,
+      Date.now()
+    );
+    if (orphanedTurn) {
+      deliveryPlan.finalizedTurns.push(orphanedTurn);
+      deliveryPlan.syncReason = "mirror reconcile delivered turns";
+    } else if (!subscription.pendingTurn?.streamStarted) {
+      orphanProbeAt.delete(subscription.bindingId);
+    }
     if (deliveryPlan.finalizedTurns.length > 0) {
       enqueuePendingMirrorDeliveries(subscription, deliveryPlan.finalizedTurns);
     }
@@ -17356,6 +17400,12 @@ async function probeCodexThreadProcess(threadId) {
     };
   }
 }
+async function isCodexThreadProcessDefinitelyGone(threadId, probe = probeCodexThreadProcess) {
+  const threadProbe = await probe(threadId);
+  if (threadProbe.status !== "not_found") return false;
+  const hostProbe = await probe("app-server");
+  return hostProbe.status === "not_found";
+}
 
 // src/lib/bridge/session-health-reducer.ts
 var HEALTH_RECENT_PROGRESS_MS = 10 * 60 * 1e3;
@@ -17495,7 +17545,9 @@ function computeBaseDiagnosis(session, nowMs) {
   const sdkSessionId = trimOrNull(session.sdk_session_id);
   const lastProgressMs = parseIsoMs(lastProgressAt || void 0);
   const previousStatus = session.health_status || "idle";
-  if (!isRunningRuntimeStatus(runtimeStatus) && isRunningHealthStatus(previousStatus)) {
+  const terminalHealth = previousStatus === "completed" || previousStatus === "failed" || previousStatus === "aborted";
+  const activeDesktopMirror = session.thread_origin === "desktop" && session.mirror_status === "watching" && isRunningHealthStatus(previousStatus);
+  if (!isRunningRuntimeStatus(runtimeStatus) && !terminalHealth && !activeDesktopMirror) {
     return {
       sessionId: session.id,
       checkedAt: null,
@@ -17583,6 +17635,12 @@ function applyProcessProbeDiagnosis(diagnosis, processProbe) {
       processProbe: null
     };
   }
+  if (!isRunningHealthStatus(diagnosis.healthStatus)) {
+    return {
+      ...diagnosis,
+      processProbe
+    };
+  }
   if (processProbe.status === "alive") {
     const healthStatus = diagnosis.activeToolName ? "waiting_tool" : "slow_observed";
     const healthReason = diagnosis.activeToolName ? "\u68C0\u6D4B\u5230\u672C\u673A\u7EBF\u7A0B\u8FDB\u7A0B\u4ECD\u5728\u8FD0\u884C\uFF0C\u5F53\u524D\u66F4\u50CF\u662F\u957F\u65F6\u5DE5\u5177\u6267\u884C\u3002" : "\u68C0\u6D4B\u5230\u672C\u673A\u7EBF\u7A0B\u8FDB\u7A0B\u4ECD\u5728\u8FD0\u884C\uFF0C\u5F53\u524D\u66F4\u50CF\u662F\u957F\u65F6\u4EFB\u52A1\u3002";
@@ -18076,6 +18134,7 @@ var MIRROR_PROMPT_MATCH_GRACE_MS = 12e4;
 var DESKTOP_TERMINAL_FINALIZATION_TIMEOUT_MS = 3e4;
 var MIRROR_STREAM_STATUS_IDLE_START_MS = 18e4;
 var MIRROR_STREAM_STATUS_HEARTBEAT_MS = 1e4;
+var MIRROR_STREAM_ORPHAN_TIMEOUT_MS = 30 * 6e4;
 var MIRROR_TURN_BUFFER_TIMEOUT_MS = 10 * 6e4;
 function describeUnknownError(error) {
   if (error instanceof Error) {
@@ -18305,7 +18364,8 @@ var MIRROR_RUNTIME = createMirrorRuntime(getState, {
   watchDebounceMs: MIRROR_WATCH_DEBOUNCE_MS,
   danglingThreadRetryLimit: DANGLING_MIRROR_THREAD_RETRY_LIMIT,
   failureSuspendThreshold: MIRROR_FAILURE_SUSPEND_THRESHOLD,
-  failureSuspendMs: MIRROR_FAILURE_SUSPEND_MS
+  failureSuspendMs: MIRROR_FAILURE_SUSPEND_MS,
+  streamOrphanTimeoutMs: MIRROR_STREAM_ORPHAN_TIMEOUT_MS
 }, {
   nowIso: nowIso3,
   describeUnknownError,
@@ -18315,6 +18375,10 @@ var MIRROR_RUNTIME = createMirrorRuntime(getState, {
   observeSessionHealthRecords: (sessionId, threadId, records) => {
     SESSION_HEALTH_RUNTIME.observeDesktopMirrorRecords(sessionId, threadId, records);
   },
+  recordOrphanedMirrorTurn: (sessionId, detail) => {
+    SESSION_HEALTH_RUNTIME.recordInteractiveEnd(sessionId, "aborted", detail);
+  },
+  isThreadProcessDefinitelyGone: isCodexThreadProcessDefinitelyGone,
   routeDesktopRecords: (sessionId, threadId, records) => routeDesktopRecords(
     sessionId,
     threadId,

package/package.json

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