chatccc 0.2.153 → 0.2.155

package/package.json

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

package/src/__tests__/session.test.ts

@@ -398,10 +398,10 @@ describe("runAgentSession process monitor", () => {
   });
 });
 
-describe("unified display loop WeChat delta", () => {
-  beforeEach(() => {
-    vi.useFakeTimers();
-    resetState();
+describe("unified display loop WeChat delta", () => {
+  beforeEach(() => {
+    vi.useFakeTimers();
+    resetState();
     resetBindingState();
     mockStreamStates.clear();
   });
@@ -464,12 +464,79 @@ describe("unified display loop WeChat delta", () => {
       2,
       "chat-wechat",
       "tool output",
-    );
-  });
-});
-
-describe("rebuildBindingsFromRegistry", () => {
-  let registryFile = "";
+    );
+  });
+});
+
+describe("unified display loop terminal card update", () => {
+  beforeEach(() => {
+    vi.useFakeTimers();
+    resetState();
+    resetBindingState();
+    mockStreamStates.clear();
+  });
+
+  afterEach(() => {
+    stopUnifiedDisplayLoop();
+    resetBindingState();
+    vi.useRealTimers();
+  });
+
+  it("does not repeat the same terminal CardKit sequence while the prompt is still active", async () => {
+    const platform = mockPlatform("feishu");
+    platform.cardUpdate = vi.fn(async () => {
+      throw new Error("CardKit update: [300317] ErrMsg: sequence number compare failed; ");
+    });
+    setSessionPlatform(platform);
+
+    bindChatToSession("sid-terminal", "chat-terminal");
+    recordLastActiveChat("sid-terminal", "chat-terminal");
+    sessionInfoMap.set("chat-terminal", {
+      sessionId: "sid-terminal",
+      turnCount: 1,
+      lastContextTokens: 0,
+      startTime: 0,
+      tool: "claude",
+    });
+    activePrompts.set("sid-terminal", {
+      controller: new AbortController(),
+      stopped: false,
+      startTime: Date.now(),
+    });
+    displayCards.set("chat-terminal", {
+      cardId: "card-terminal",
+      sequence: 109,
+      cardBusy: false,
+      cardCreatedAt: Date.now(),
+      lastSentContent: "",
+      streamErrorNotified: false,
+      sessionId: "sid-terminal",
+      turnCount: 1,
+      dotCount: 0,
+    });
+    mockStreamStates.set("sid-terminal", {
+      accumulatedContent: "partial tool output",
+      finalReply: "",
+      status: "stopped",
+      turnCount: 1,
+    });
+
+    startUnifiedDisplayLoop();
+    await vi.advanceTimersByTimeAsync(3000);
+    await vi.advanceTimersByTimeAsync(3000);
+
+    expect(platform.cardUpdate).toHaveBeenCalledTimes(1);
+    expect(platform.cardUpdate).toHaveBeenCalledWith(
+      "card-terminal",
+      expect.any(String),
+      110,
+    );
+    expect(displayCards.get("chat-terminal")?.sequence).toBe(110);
+  });
+});
+
+describe("rebuildBindingsFromRegistry", () => {
+  let registryFile = "";
 
   beforeEach(async () => {
     chatSessionMap.clear();

package/src/agent-stop-stuck.ts

@@ -10,9 +10,6 @@ export const AGENT_STOP_STUCK_PATH = "/api/agent/stop-stuck-loop";
 
 const MAX_REQUEST_BYTES = 8 * 1024;
 
-/** 已处理过 stop-stuck-loop 的 session，防止 agent 循环中反复调用 */
-const processedSessions = new Set<string>();
-
 function jsonReply(res: ServerResponse, status: number, data: unknown): void {
   res.writeHead(status, { "Content-Type": "application/json; charset=utf-8" });
   res.end(JSON.stringify(data));
@@ -68,19 +65,10 @@ export async function handleAgentStopStuckRequest(
 
   const prompt = activePrompts.get(sessionId);
   if (!prompt) {
-    // session 可能已被清理，清理去重记录
-    processedSessions.delete(sessionId);
     jsonReply(res, 404, { error: "Session not found or not running" });
     return true;
   }
 
-  // 去重：同一 session 只处理一次，防止 agent 循环中反复调用
-  if (processedSessions.has(sessionId)) {
-    jsonReply(res, 200, { ok: true, deduplicated: true });
-    return true;
-  }
-  processedSessions.add(sessionId);
-
   // 先发"卡住"提示消息给所有绑定的群聊
   const chats = getChatsForSession(sessionId);
   for (const chatId of chats) {
@@ -106,6 +94,7 @@ export async function handleAgentStopStuckRequest(
       await writeStreamState({
         ...current,
         status: "done",
+        stuckAt: Date.now(),
         finalReply: finalReply ? current.finalReply + "\n\n" + finalReply : current.finalReply,
         updatedAt: Date.now(),
       });

package/src/orchestrator.ts

@@ -78,6 +78,7 @@ import {
   cancelQueuedMessage,
 } from "./session-chat-binding.ts";
 import { getTenantAccessToken, sendPostMessage } from "./feishu-platform.ts";
+import { readStreamState } from "./stream-state.ts";
 export { type PlatformAdapter } from "./platform-adapter.ts";
 import type { PlatformAdapter } from "./platform-adapter.ts";
 
@@ -593,10 +594,12 @@ export async function handleCommand(
 
   if (sessionId && descriptionTool && toolLabel) {
     // 有会话上下文 — 路由到命令处理或 prompt
-    logTrace(tid, "BRANCH", { sessionId, tool: descriptionTool });
-    console.log(
-      `[${ts()}] [RESUME] ${toolLabel} session group detected, session=${sessionId} tool=${descriptionTool}`,
-    );
+    logTrace(tid, "BRANCH", { sessionId, tool: descriptionTool });
+    const routeKind = textLower.startsWith("/") ? "command" : "prompt";
+    const chatKind = chatType === "p2p" ? "p2p chat" : "session group";
+    console.log(
+      `[${ts()}] [ROUTE] ${toolLabel} ${chatKind} ${routeKind} detected, session=${sessionId} tool=${descriptionTool}`,
+    );
 
     if (
       chatType !== "p2p" &&
@@ -1228,6 +1231,27 @@ export async function handleCommand(
       await platform.sendText(chatId, "生成中...").catch(() => {});
     }
 
+    // 检查 session 是否被 stop-stuck-loop 标记为卡住，是则创建新 session
+    const stuckState = await readStreamState(sessionId);
+    if (stuckState?.stuckAt) {
+      try {
+        const init = await initClaudeSession(descriptionTool, undefined, chatId);
+        const newSessionId = init.sessionId;
+        unbindChatFromSession(sessionId, chatId);
+        bindChatToSession(newSessionId, chatId);
+        await recordSessionRegistry({
+          chatId,
+          sessionId: newSessionId,
+          tool: descriptionTool,
+          chatName: sessionChatName(text.slice(0, 10), init.cwd),
+        }).catch(() => {});
+        console.log(`[${ts()}] [STUCK-REDIRECT] Session ${sessionId} was stuck, created new session ${newSessionId}`);
+        sessionId = newSessionId;
+      } catch (err) {
+        console.warn(`[${ts()}] [STUCK-REDIRECT] Failed to create new session: ${(err as Error).message}`);
+      }
+    }
+
     try {
       logTrace(tid, "RESUME", { sessionId, tool: descriptionTool });
       await resumeAndPrompt(
@@ -1235,10 +1259,10 @@ export async function handleCommand(
         text,
         platform,
         chatId,
-        msgTimestamp,
-        descriptionTool,
-        tid,
-      );
+        msgTimestamp,
+        descriptionTool,
+        tid,
+      );
       logTrace(tid, "DONE", { outcome: "resume_done", sessionId });
       console.log(`[${ts()}] [RESUME] Session ${sessionId} done`);
     } catch (err) {
@@ -1434,10 +1458,10 @@ export async function handleCommand(
         text,
         platform,
         newChatId,
-        msgTimestamp,
-        tool,
-        tid,
-      );
+        msgTimestamp,
+        tool,
+        tid,
+      );
       console.log(`[${ts()}] [AUTO-P2P 5/5] First prompt sent → OK`);
       logTrace(tid, "DONE", { outcome: "auto_new_p2p_prompt_done", newChatId, sessionId, tool });
     } catch (err) {

package/src/session.ts

@@ -167,11 +167,15 @@ function formatTerminalHeader(status: "running" | "done" | "stopped" | "error"):
   return { title: "完成" };
 }
 
-function turnFinalStatus(status: "running" | "done" | "stopped" | "error"): "done" | "stopped" {
-  return status === "stopped" || status === "error" ? "stopped" : "done";
-}
-
-function startPromptProcessMonitor(sessionId: string, info: ToolProcessInfo): void {
+function turnFinalStatus(status: "running" | "done" | "stopped" | "error"): "done" | "stopped" {
+  return status === "stopped" || status === "error" ? "stopped" : "done";
+}
+
+function isCardKitSequenceConflict(err: unknown): boolean {
+  return err instanceof Error && err.message.includes("300317");
+}
+
+function startPromptProcessMonitor(sessionId: string, info: ToolProcessInfo): void {
   const prompt = activePrompts.get(sessionId);
   if (!prompt) return;
   prompt.processPid = info.pid;
@@ -1356,24 +1360,42 @@ export function startUnifiedDisplayLoop(): void {
               displayCards.delete(chatId);
             } else {
               // 发送最终结果（卡片平台）
-              while (display.cardBusy) await new Promise(r => setTimeout(r, 20));
-              const nextSeq = display.sequence + 1;
+              while (display.cardBusy) await new Promise(r => setTimeout(r, 20));
+              const promptStillActive = activePrompts.has(sessionId);
+              if (
+                promptStillActive &&
+                display.lastSentAccLen === state.accumulatedContent.length &&
+                display.lastSentFinalReply === state.finalReply
+              ) {
+                continue;
+              }
+              const nextSeq = display.sequence + 1;
               const { title: headerTitle, template: headerTemplate } = formatTerminalHeader(state.status);
               const cardContent = truncateContent(state.accumulatedContent + state.finalReply) || " ";
               const doneCard = buildProgressCard(cardContent, { showStop: false, headerTitle, headerTemplate });
-              await p.cardUpdate(display.cardId, doneCard, nextSeq).catch(err => {
-                console.error(`[${ts()}] [DISPLAY] terminal cardUpdate failed: ${(err as Error).message}`);
-              });
+              let terminalCardUpdateAccepted = false;
+              await p.cardUpdate(display.cardId, doneCard, nextSeq).then(() => {
+                display.sequence = nextSeq;
+                terminalCardUpdateAccepted = true;
+              }).catch(err => {
+                console.error(`[${ts()}] [DISPLAY] terminal cardUpdate failed: ${(err as Error).message}`);
+                if (isCardKitSequenceConflict(err)) {
+                  display.sequence = nextSeq;
+                  terminalCardUpdateAccepted = true;
+                }
+              });
 
               // 若 session 仍在 activePrompts 中，说明 runAgentSession 的 finally
               // 还没执行，当前 stream state 可能是 stopSession fire-and-forget
               // 写入的，finalReply 滞后于内存态。卡片已更新为终态外观，但不发送
               // 文本、不删除 display 条目，留给 finally 落盘后的下一次 tick 处理。
-              if (activePrompts.has(sessionId)) {
-                display.lastSentAccLen = state.accumulatedContent.length;
-                display.lastSentFinalReply = state.finalReply;
-                continue;
-              }
+              if (promptStillActive) {
+                if (terminalCardUpdateAccepted) {
+                  display.lastSentAccLen = state.accumulatedContent.length;
+                  display.lastSentFinalReply = state.finalReply;
+                }
+                continue;
+              }
 
               const finalSt = turnFinalStatus(state.status);
               finalizeTurnCards(sessionId, state.turnCount, finalSt).catch(() => {});

package/src/stream-state.ts

@@ -26,6 +26,9 @@ export interface StreamState {
   updatedAt: number;
   cwd: string;
   tool: string;
+  /** Set by stop-stuck-loop to prevent the session from being resumed.
+   *  The orchestrator checks this before resuming and creates a new session instead. */
+  stuckAt?: number;
 }
 
 function getStreamStatePath(sessionId: string): string {