chatccc 0.2.157 → 0.2.158

package/package.json

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

package/src/agent-stop-stuck.ts

@@ -1,7 +1,7 @@
 import type { IncomingMessage, ServerResponse } from "node:http";
 
 import { readUtf8JsonBody } from "./agent-rpc-body.ts";
-import { activePrompts, getChatsForSession, cancelQueuedMessage } from "./session-chat-binding.ts";
+import { activePrompts, getChatsForSession } from "./session-chat-binding.ts";
 import { getPlatformForChat } from "./session.ts";
 import { readStreamState, writeStreamState } from "./stream-state.ts";
 import { ts } from "./config.ts";
@@ -78,8 +78,8 @@ export async function handleAgentStopStuckRequest(
     }
   }
 
-  // 丢弃缓存队列中的消息
-  cancelQueuedMessage(sessionId);
+  // 不丢弃缓存队列中的消息，让 runAgentSession 的 finally 块正常消费，
+  // 确保 stop-stuck-loop 结束后排队的消息仍能被正常处理。
 
   const finalReply = typeof body?.final_reply === "string" ? body.final_reply.trim() : "";
 

package/src/session.ts

@@ -167,15 +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 isCardKitSequenceConflict(err: unknown): boolean {
-  return err instanceof Error && err.message.includes("300317");
-}
-
-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;
@@ -1161,11 +1161,11 @@ export async function runAgentSession(
     // 标记 prompt 结束
     resourceMonitor.off("stuck", onResourceStuck);
     const prompt = activePrompts.get(sessionId);
-    const wasStopped = prompt?.stopped ?? false;
-    const wasAbnormalExit = prompt?.abnormalExit ?? false;
-    const wasResourceStuck = prompt?.resourceStuck ?? false;
-    clearPromptProcessMonitor(sessionId);
-    activePrompts.delete(sessionId);
+    const wasStopped = prompt?.stopped ?? false;
+    const wasAbnormalExit = prompt?.abnormalExit ?? false;
+    const wasResourceStuck = prompt?.resourceStuck ?? false;
+    clearPromptProcessMonitor(sessionId);
+    activePrompts.delete(sessionId);
 
     // 先写最终状态（done/stopped），确保 display loop 在下一轮消费前
     // 读到新状态并终结旧卡片。否则 setImmediate 在 CHECK 阶段先于
@@ -1175,14 +1175,19 @@ export async function runAgentSession(
     const finalReply = pickFinalReply(state).trim();
 
     // stop-stuck-loop 接口可能在 fire-and-forget 中已写入带 final_reply 的
-    // stream state，finally 不应覆盖它。
-    let finalReplyToWrite = finalReply;
-    try {
-      const existing = await readStreamState(sessionId);
-      if (existing && existing.finalReply.length > finalReply.length) {
-        finalReplyToWrite = existing.finalReply;
-      }
-    } catch {}
+    // stream state，finally 不应覆盖它。同时保留 stuckAt 标记，防止
+    // stop-stuck-loop 结束后 session 被错误恢复。
+    let finalReplyToWrite = finalReply;
+    let preserveStuckAt: number | undefined;
+    try {
+      const existing = await readStreamState(sessionId);
+      if (existing) {
+        if (existing.finalReply.length > finalReply.length) {
+          finalReplyToWrite = existing.finalReply;
+        }
+        preserveStuckAt = existing.stuckAt;
+      }
+    } catch {}
 
     await writeStreamState({
       sessionId,
@@ -1191,11 +1196,12 @@ export async function runAgentSession(
       finalReply: finalReplyToWrite,
       chunkCount: state.chunkCount,
       turnCount: nextTurnCount,
-      contextTokens: existingInfo?.lastContextTokens ?? 0,
-      updatedAt: Date.now(),
-      cwd,
-      tool,
-    });
+      contextTokens: existingInfo?.lastContextTokens ?? 0,
+      updatedAt: Date.now(),
+      cwd,
+      tool,
+      ...(preserveStuckAt ? { stuckAt: preserveStuckAt } : {}),
+    });
 
     // 消费队列中的缓存消息（异步，不阻塞后续清理）
     // 用户 /stop 后应丢弃队列消息，避免用户停止后又自动开始新轮
@@ -1360,42 +1366,42 @@ export function startUnifiedDisplayLoop(): void {
               displayCards.delete(chatId);
             } else {
               // 发送最终结果（卡片平台）
-              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;
+              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 });
-              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;
-                }
-              });
+              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 (promptStillActive) {
-                if (terminalCardUpdateAccepted) {
-                  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(() => {});