codex-to-im 1.0.19 → 1.0.20

package/dist/daemon.mjs

@@ -5649,7 +5649,16 @@ var FeishuAdapter = class extends BaseChannelAdapter {
         status: statusLabels[status] || status,
         elapsed: formatElapsed(elapsedMs)
       };
-      const finalCardJson = buildFinalCardJson(responseText, state.toolCalls, footer);
+      const existingText = state.pendingText || "";
+      const trimmedExisting = existingText.trim();
+      const trimmedResponse = responseText.trim();
+      let finalText = trimmedResponse || trimmedExisting;
+      if (status === "interrupted" && trimmedExisting && trimmedResponse && trimmedResponse !== trimmedExisting && !trimmedExisting.includes(trimmedResponse)) {
+        finalText = `${trimmedExisting}
+
+${trimmedResponse}`;
+      }
+      const finalCardJson = buildFinalCardJson(finalText, state.toolCalls, footer);
       state.sequence++;
       await cardkit.card.update({
         path: { card_id: state.cardId },
@@ -16798,7 +16807,8 @@ var MIRROR_WATCH_DEBOUNCE_MS = 350;
 var MIRROR_EVENT_BATCH_LIMIT = 8;
 var MIRROR_SUPPRESSION_WINDOW_MS = 4e3;
 var MIRROR_PROMPT_MATCH_GRACE_MS = 12e4;
-var MIRROR_IDLE_TIMEOUT_MS = 12e5;
+var INTERACTIVE_IDLE_REMINDER_MS = 6e5;
+var MIRROR_IDLE_TIMEOUT_MS = 6e5;
 var AVAILABLE_CODEX_MODELS = listSelectableCodexModels();
 var AVAILABLE_CODEX_MODEL_MAP = new Map(AVAILABLE_CODEX_MODELS.map((model) => [model.slug, model]));
 function generateDraftId() {
@@ -17486,6 +17496,53 @@ function getQueuedCount(sessionId) {
   const state = getState();
   return state.queuedCounts.get(sessionId) || 0;
 }
+function buildInteractiveIdleReminderNotice() {
+  return [
+    "\u63D0\u9192\uFF1A\u8FD9\u8F6E\u4EFB\u52A1\u4ECD\u5728\u8FD0\u884C\uFF0C\u4F46\u5DF2\u7ECF\u8D85\u8FC7 10 \u5206\u949F\u6CA1\u6709\u65B0\u7684\u6267\u884C\u8F93\u51FA\u3002",
+    "\u7CFB\u7EDF\u4E0D\u4F1A\u81EA\u52A8\u7EC8\u6B62\u5B83\uFF1B\u5982\u679C\u4F60\u4ECD\u5728\u5BF9\u5E94\u7EBF\u7A0B\uFF0C\u53EF\u53D1\u9001 `/stop` \u4E3B\u52A8\u505C\u6B62\uFF1B\u5982\u679C\u5DF2\u7ECF\u5207\u5230\u522B\u7684\u7EBF\u7A0B\uFF0C\u9700\u8981\u5148\u5207\u56DE\u5BF9\u5E94\u7EBF\u7A0B\u3002"
+  ].join("\n");
+}
+function isCurrentInteractiveTask(sessionId, taskId) {
+  return getState().activeTasks.get(sessionId)?.id === taskId;
+}
+function touchInteractiveTask(sessionId, taskId) {
+  const task = getState().activeTasks.get(sessionId);
+  if (task?.id !== taskId) return;
+  task.lastActivityAt = Date.now();
+  task.idleReminderSent = false;
+}
+function releaseInteractiveTask(sessionId, taskId) {
+  const state = getState();
+  const current = state.activeTasks.get(sessionId);
+  if (current?.id !== taskId) return;
+  state.activeTasks.delete(sessionId);
+  syncSessionRuntimeState(sessionId);
+}
+async function remindIdleInteractiveTask(task) {
+  if (!isCurrentInteractiveTask(task.sessionId, task.id) || task.idleReminderSent) return;
+  task.idleReminderSent = true;
+  try {
+    await deliver(task.adapter, {
+      address: task.address,
+      text: renderFeedbackTextForChannel(
+        task.adapter.channelType,
+        buildInteractiveIdleReminderNotice()
+      ),
+      parseMode: getFeedbackParseMode(task.adapter.channelType),
+      replyToMessageId: task.requestMessageId
+    });
+  } catch {
+  }
+}
+async function reconcileIdleInteractiveTasks() {
+  const now2 = Date.now();
+  const tasks = Array.from(getState().activeTasks.values());
+  for (const task of tasks) {
+    if (task.idleReminderSent) continue;
+    if (now2 - task.lastActivityAt < INTERACTIVE_IDLE_REMINDER_MS) continue;
+    await remindIdleInteractiveTask(task);
+  }
+}
 function syncSessionRuntimeState(sessionId) {
   const { store } = getBridgeContext();
   const session = store.getSession(sessionId);
@@ -18517,6 +18574,9 @@ async function start() {
     void syncConfiguredAdapters({ startLoops: true }).catch((err) => {
       console.error("[bridge-manager] Adapter reconcile failed:", err);
     });
+    void reconcileIdleInteractiveTasks().catch((err) => {
+      console.error("[bridge-manager] Interactive idle reminder reconcile failed:", err);
+    });
   }, 5e3);
   state.mirrorPollTimer = setInterval(() => {
     void reconcileMirrorSubscriptions().catch((err) => {
@@ -18550,8 +18610,8 @@ async function stop() {
   }
   state.loopAborts.clear();
   const activeSessionIds = Array.from(state.activeTasks.keys());
-  for (const abort of state.activeTasks.values()) {
-    abort.abort();
+  for (const task of state.activeTasks.values()) {
+    task.abortController.abort();
   }
   state.activeTasks.clear();
   state.mirrorSuppressUntil.clear();
@@ -18759,10 +18819,25 @@ async function handleMessage(adapter, msg) {
   const streamKey = buildInteractiveStreamKey(binding.codepilotSessionId, msg.messageId);
   adapter.onMessageStart?.(msg.address.chatId, streamKey);
   const taskAbort = new AbortController();
+  const taskId = `${Date.now()}-${Math.random().toString(36).slice(2)}`;
   const state = getState();
   resetMirrorSessionForInteractiveRun(binding.codepilotSessionId);
-  state.activeTasks.set(binding.codepilotSessionId, taskAbort);
-  let mirrorSuppressionId = null;
+  const taskState = {
+    id: taskId,
+    abortController: taskAbort,
+    adapter,
+    address: msg.address,
+    requestMessageId: msg.messageId,
+    streamKey,
+    sessionId: binding.codepilotSessionId,
+    hasStreamingCards: false,
+    lastActivityAt: Date.now(),
+    idleReminderSent: false,
+    streamFinalized: false,
+    uiEnded: false,
+    mirrorSuppressionId: null
+  };
+  state.activeTasks.set(binding.codepilotSessionId, taskState);
   syncSessionRuntimeState(binding.codepilotSessionId);
   let previewState = null;
   const caps = adapter.getPreviewCapabilities?.(msg.address.chatId) ?? null;
@@ -18811,8 +18886,10 @@ async function handleMessage(adapter, msg) {
     flushPreview(adapter, ps, cfg);
   } : void 0;
   const hasStreamingCards = typeof adapter.onStreamText === "function";
+  taskState.hasStreamingCards = hasStreamingCards;
   const toolCallTracker = /* @__PURE__ */ new Map();
   const onStreamCardText = hasStreamingCards ? (fullText) => {
+    if (!isCurrentInteractiveTask(binding.codepilotSessionId, taskId)) return;
     const rendered = renderFeedbackTextForChannel(
       adapter.channelType,
       stripOutboundArtifactBlocksForStreaming(fullText)
@@ -18823,6 +18900,8 @@ async function handleMessage(adapter, msg) {
     }
   } : void 0;
   const onToolEvent = hasStreamingCards ? (toolId, toolName, status) => {
+    if (!isCurrentInteractiveTask(binding.codepilotSessionId, taskId)) return;
+    touchInteractiveTask(binding.codepilotSessionId, taskId);
     if (toolName) {
       toolCallTracker.set(toolId, { id: toolId, name: toolName, status });
     } else {
@@ -18835,6 +18914,8 @@ async function handleMessage(adapter, msg) {
     }
   } : void 0;
   const onPartialText = previewOnPartialText || onStreamCardText ? (fullText) => {
+    if (!isCurrentInteractiveTask(binding.codepilotSessionId, taskId)) return;
+    touchInteractiveTask(binding.codepilotSessionId, taskId);
     if (previewOnPartialText) previewOnPartialText(fullText);
     if (onStreamCardText) onStreamCardText(fullText);
   } : void 0;
@@ -18852,10 +18933,13 @@ async function handleMessage(adapter, msg) {
         msg.messageId
       );
     }, taskAbort.signal, hasAttachments ? msg.attachments : void 0, onPartialText, onToolEvent, (preparedPrompt) => {
-      if (!mirrorSuppressionId) {
-        mirrorSuppressionId = beginMirrorSuppression(binding.codepilotSessionId, preparedPrompt);
+      if (!taskState.mirrorSuppressionId) {
+        taskState.mirrorSuppressionId = beginMirrorSuppression(binding.codepilotSessionId, preparedPrompt);
       }
     });
+    if (!isCurrentInteractiveTask(binding.codepilotSessionId, taskId)) {
+      return;
+    }
     let cardFinalized = false;
     if (hasStreamingCards && adapter.onStreamEnd) {
       try {
@@ -18866,6 +18950,7 @@ async function handleMessage(adapter, msg) {
           renderFeedbackTextForChannel(adapter.channelType, result.responseText),
           streamKey
         );
+        taskState.streamFinalized = cardFinalized;
       } catch (err) {
         console.warn("[bridge-manager] Card finalize failed:", err instanceof Error ? err.message : err);
       }
@@ -18890,14 +18975,9 @@ async function handleMessage(adapter, msg) {
         []
       );
     }
-    if (binding.id) {
-      try {
-        const update = computeSdkSessionUpdate(result.sdkSessionId, result.hasError);
-        if (update !== null) {
-          store.updateChannelBinding(binding.id, { sdkSessionId: update });
-        }
-      } catch {
-      }
+    try {
+      persistSdkSessionUpdate(binding.codepilotSessionId, result.sdkSessionId, result.hasError);
+    } catch {
     }
   } finally {
     if (previewState) {
@@ -18907,18 +18987,22 @@ async function handleMessage(adapter, msg) {
       }
       adapter.endPreview?.(msg.address.chatId, previewState.draftId);
     }
-    if (hasStreamingCards && adapter.onStreamEnd && taskAbort.signal.aborted) {
+    if (hasStreamingCards && adapter.onStreamEnd && taskAbort.signal.aborted && !taskState.streamFinalized) {
       try {
         await adapter.onStreamEnd(msg.address.chatId, "interrupted", "", streamKey);
+        taskState.streamFinalized = true;
       } catch {
       }
     }
-    if (mirrorSuppressionId) {
-      settleMirrorSuppression(binding.codepilotSessionId, mirrorSuppressionId);
+    if (taskState.mirrorSuppressionId) {
+      settleMirrorSuppression(binding.codepilotSessionId, taskState.mirrorSuppressionId);
+      taskState.mirrorSuppressionId = null;
+    }
+    releaseInteractiveTask(binding.codepilotSessionId, taskId);
+    if (!taskState.uiEnded) {
+      adapter.onMessageEnd?.(msg.address.chatId, streamKey);
+      taskState.uiEnded = true;
     }
-    state.activeTasks.delete(binding.codepilotSessionId);
-    syncSessionRuntimeState(binding.codepilotSessionId);
-    adapter.onMessageEnd?.(msg.address.chatId, streamKey);
     ack();
   }
 }
@@ -18971,13 +19055,6 @@ async function handleCommand(adapter, msg, text2) {
         response = resolved.message;
         break;
       }
-      if (currentBinding) {
-        const st = getState();
-        const oldTask = st.activeTasks.get(currentBinding.codepilotSessionId);
-        if (oldTask) {
-          oldTask.abort();
-        }
-      }
       const workDir = resolved.workDir;
       ensureWorkingDirectoryExists(workDir);
       const binding = createBinding(msg.address, workDir);
@@ -18991,6 +19068,7 @@ async function handleCommand(adapter, msg, text2) {
         ],
         [
           args.trim() ? "\u63A5\u4E0B\u6765\u76F4\u63A5\u53D1\u9001\u6587\u672C\u5373\u53EF\u7EE7\u7EED\u3002" : "\u5DF2\u5728\u5F53\u524D\u5DE5\u4F5C\u76EE\u5F55\u4E0B\u65B0\u5EFA\u4E00\u4E2A\u7EBF\u7A0B\u3002\u63A5\u4E0B\u6765\u76F4\u63A5\u53D1\u9001\u6587\u672C\u5373\u53EF\u7EE7\u7EED\u3002",
+          "\u5982\u679C\u5F53\u524D\u804A\u5929\u91CC\u5DF2\u6709\u65E7\u4EFB\u52A1\u5728\u8FD0\u884C\uFF0C\u5B83\u4E0D\u4F1A\u88AB\u7EC8\u6B62\uFF0C\u4ECD\u4F1A\u5728\u540E\u53F0\u7EE7\u7EED\u6267\u884C\u5E76\u53EF\u80FD\u7A0D\u540E\u56DE\u6D88\u606F\u3002",
           "\u8FD9\u662F IM \u4FA7\u7EBF\u7A0B\uFF0C\u5F53\u524D\u53EA\u4FDD\u8BC1\u5728 IM \u4E2D\u53EF\u7EE7\u7EED\uFF1B\u4E0D\u4F1A\u81EA\u52A8\u51FA\u73B0\u5728 Codex Desktop \u4F1A\u8BDD\u5217\u8868\u4E2D\u3002"
         ],
         responseParseMode === "Markdown"
@@ -19402,6 +19480,7 @@ ${truncateHistoryContent(formatStoredMessageContent(message.content))}`;
             return {
               heading: `${getSessionDisplayName(session, session.working_directory)}${session.id === currentBinding?.codepilotSessionId ? " [\u5F53\u524D]" : ""}`,
               details: [
+                `\u72B6\u6001\uFF1A${formatRuntimeStatus(session)}`,
                 `\u76EE\u5F55\uFF1A${formatCommandPath(session.working_directory)}`
               ]
             };
@@ -19420,7 +19499,7 @@ ${truncateHistoryContent(formatStoredMessageContent(message.content))}`;
       const st = getState();
       const taskAbort = st.activeTasks.get(binding.codepilotSessionId);
       if (taskAbort) {
-        taskAbort.abort();
+        taskAbort.abortController.abort();
         response = "\u6B63\u5728\u505C\u6B62\u5F53\u524D\u4EFB\u52A1...";
       } else {
         response = "\u5F53\u524D\u6CA1\u6709\u6B63\u5728\u8FD0\u884C\u7684\u4EFB\u52A1\u3002";
@@ -19525,6 +19604,13 @@ function computeSdkSessionUpdate(sdkSessionId, hasError) {
   }
   return null;
 }
+function persistSdkSessionUpdate(sessionId, sdkSessionId, hasError) {
+  const update = computeSdkSessionUpdate(sdkSessionId, hasError);
+  if (update === null) {
+    return;
+  }
+  getBridgeContext().store.updateSdkSessionId(sessionId, update);
+}
 
 // src/store.ts
 import fs9 from "node:fs";

package/package.json

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