chatccc 0.2.79 → 0.2.81

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chatccc",
-  "version": "0.2.79",
+  "version": "0.2.81",
   "description": "Feishu bot bridge for Claude Code",
   "license": "Apache-2.0",
   "type": "module",

package/src/session-chat-binding.ts

@@ -137,6 +137,8 @@ export interface DisplayCardState {
   lastSentAccLen?: number;
   /** WeChat delta: 上次发送时的 finalReply */
   lastSentFinalReply?: string;
+  /** 上次 loop 读取到的 turnCount，用于检测轮次切换 */
+  lastTurnCount?: number;
 }
 
 export const displayCards = new Map<string, DisplayCardState>();

package/src/session.ts

@@ -861,6 +861,25 @@ export async function runAgentSession(
     const wasStopped = prompt?.stopped ?? false;
     activePrompts.delete(sessionId);
 
+    // 先写最终状态（done/stopped），确保 display loop 在下一轮消费前
+    // 读到新状态并终结旧卡片。否则 setImmediate 在 CHECK 阶段先于
+    // writeFile I/O（POLL 阶段）执行，display loop 会误以为旧轮仍在
+    // 运行中并更新旧卡片，而不是新建卡片。
+    const finalStatus = wasStopped ? "stopped" : "done";
+    const finalReply = pickFinalReply(state).trim();
+    await writeStreamState({
+      sessionId,
+      status: finalStatus,
+      accumulatedContent: state.accumulatedContent,
+      finalReply,
+      chunkCount: state.chunkCount,
+      turnCount: nextTurnCount,
+      contextTokens: existingInfo?.lastContextTokens ?? 0,
+      updatedAt: Date.now(),
+      cwd,
+      tool,
+    });
+
     // 消费队列中的缓存消息（异步，不阻塞后续清理）
     // 用户 /stop 后应丢弃队列消息，避免用户停止后又自动开始新轮
     if (wasStopped) {
@@ -879,28 +898,16 @@ export async function runAgentSession(
           setQueuePreservedChat(sessionId, preservedChat);
         }
         console.log(`[${ts()}] [QUEUE] Consuming queued message for session ${sessionId}: "${queued.text.slice(0, 50)}"`);
-        setImmediate(() => {
+        // setTimeout 而非 setImmediate：给 display loop 的 setInterval
+        // 足够时间读到 "done" 状态并终结旧卡片，避免新轮更新旧卡片的 bug。
+        // setImmediate 在 check 阶段触发早于下一个 timers 阶段，
+        // display loop (setInterval) 还没机会读到 "done" 就被新 "running" 覆盖。
+        setTimeout(() => {
           consumeQueuedMessage(platform, queued);
-        });
+        }, 200);
       }
     }
 
-    // 写最终状态
-    const finalStatus = wasStopped ? "stopped" : "done";
-    const finalReply = pickFinalReply(state).trim();
-    await writeStreamState({
-      sessionId,
-      status: finalStatus,
-      accumulatedContent: state.accumulatedContent,
-      finalReply,
-      chunkCount: state.chunkCount,
-      turnCount: nextTurnCount,
-      contextTokens: existingInfo?.lastContextTokens ?? 0,
-      updatedAt: Date.now(),
-      cwd,
-      tool,
-    });
-
     // display loop 下一轮会读到最终状态并发送消息
 
     if (wasStopped) {
@@ -1100,11 +1107,44 @@ export function ensureDisplayLoop(sessionId: string): void {
                   cardCreatedAt: Date.now(),
                   lastSentContent: "",
                   streamErrorNotified: false,
+                  lastTurnCount: state.turnCount,
                 });
               }
             } else {
               if (display.cardBusy) return;
 
+              // 检测轮次切换：turnCount 变化说明上一轮已完成、本 tick 是新轮，
+              // 但上一轮的 display 卡片因 setImmediate/setTimeout 时序问题
+              // 还没被终结分支清除。此处主动终结旧卡、创建新卡。
+              if (display.lastTurnCount !== undefined && display.lastTurnCount !== state.turnCount) {
+                display.cardBusy = true;
+                try {
+                  const doneSeq = display.sequence + 1;
+                  const doneCard = buildProgressCard("", { showStop: false, headerTitle: "完成" });
+                  await p.cardUpdate(display.cardId, doneCard, doneSeq).catch(() => {});
+                  displayCards.delete(chatId);
+                } catch (_) { /* ignore */ }
+                display.cardBusy = false;
+                // 新建卡片
+                const cardId = await p.cardCreate(buildProgressCard("", { showStop: true, headerTitle: "生成中..." })).catch(() => null);
+                if (cardId) {
+                  await p.cardSend(chatId, cardId).catch(() => null);
+                  displayCards.set(chatId, {
+                    cardId,
+                    sequence: 1,
+                    cardBusy: false,
+                    cardCreatedAt: Date.now(),
+                    lastSentContent: "",
+                    streamErrorNotified: false,
+                    lastTurnCount: state.turnCount,
+                  });
+                }
+                return;
+              }
+
+              // 更新当前 turn 的 lastTurnCount
+              display.lastTurnCount = state.turnCount;
+
               // 卡片轮转
               if (Date.now() - display.cardCreatedAt > CARD_ROTATE_MS) {
                 display.cardBusy = true;