chatccc 0.2.154 → 0.2.156

package/config.sample.json

@@ -4,7 +4,7 @@
     "appSecret": ""
   },
   "platforms": {
-    "feishu": { "enabled": true },
+    "feishu": { "enabled": true, "platformType": "feishu" },
     "ilink": { "enabled": true, "reuseTokenOnStart": true }
   },
   "port": 18080,
@@ -18,7 +18,7 @@
     "effort": "",
     "apiKey": "",
     "baseUrl": "",
-    "maxTurn": 0
+    "maxTurn": 0
   },
   "cursor": {
     "enabled": false,

package/package.json

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

package/src/__tests__/claude-adapter.test.ts

@@ -459,6 +459,29 @@ describe("buildClaudePromptText", () => {
     expect(result.endsWith("[User message]\nhello\n[/User message]")).toBe(true);
   });
 
+  it("prepends the Claude-specific injection prompt on every resumed prompt", () => {
+    const first = buildClaudePromptText(
+      "[ChatCCC IM skill: feishu-skill]\ncapabilities\n[/ChatCCC IM skill: feishu-skill]\n\n[User message]\nfirst\n[/User message]",
+      "Never repeat successful commands for {{session_id}}.",
+      "sid-resume",
+    );
+    const second = buildClaudePromptText(
+      "[ChatCCC IM skill: feishu-skill]\ncapabilities\n[/ChatCCC IM skill: feishu-skill]\n\n[User message]\nsecond\n[/User message]",
+      "Never repeat successful commands for {{session_id}}.",
+      "sid-resume",
+    );
+
+    for (const result of [first, second]) {
+      expect(result).toContain("[ChatCCC Claude-specific injection prompt]");
+      expect(result).toContain("Never repeat successful commands for sid-resume.");
+      expect(result).toContain("[/ChatCCC Claude-specific injection prompt]");
+      expect(result).toContain("[ChatCCC IM skill: feishu-skill]");
+      expect(result).toContain("[/ChatCCC IM skill: feishu-skill]");
+    }
+    expect(first).toContain("[User message]\nfirst\n[/User message]");
+    expect(second).toContain("[User message]\nsecond\n[/User message]");
+  });
+
   it("leaves user text unchanged when the injection prompt is empty", () => {
     expect(buildClaudePromptText("hello", "   ")).toBe("hello");
     expect(buildClaudePromptText("hello", null)).toBe("hello");

package/src/__tests__/session.test.ts

@@ -9,9 +9,9 @@ const mockStreamStates = new Map<string, {
   finalReply: string;
   status?: "running" | "done" | "stopped" | "error";
   turnCount?: number;
-  finalReplySentTurn?: number;
-  finalReplySentAt?: number;
-}>();
+  finalReplySentTurn?: number;
+  finalReplySentAt?: number;
+}>();
 vi.mock("../stream-state.ts", () => ({
   readStreamState: async (sid: string) => {
     const state = mockStreamStates.get(sid);
@@ -20,9 +20,9 @@ vi.mock("../stream-state.ts", () => ({
       sessionId: sid,
       accumulatedContent: state.accumulatedContent,
       finalReply: state.finalReply,
-      finalReplySentTurn: state.finalReplySentTurn,
-      finalReplySentAt: state.finalReplySentAt,
-      status: state.status ?? "running",
+      finalReplySentTurn: state.finalReplySentTurn,
+      finalReplySentAt: state.finalReplySentAt,
+      status: state.status ?? "running",
       chunkCount: 0,
       turnCount: state.turnCount ?? 0,
       contextTokens: 0,
@@ -37,18 +37,18 @@ vi.mock("../stream-state.ts", () => ({
     finalReply: string;
     status?: "running" | "done" | "stopped" | "error";
     turnCount?: number;
-    finalReplySentTurn?: number;
-    finalReplySentAt?: number;
-  }) => {
+    finalReplySentTurn?: number;
+    finalReplySentAt?: number;
+  }) => {
     mockStreamStates.set(state.sessionId, {
       accumulatedContent: state.accumulatedContent,
       finalReply: state.finalReply,
       status: state.status,
       turnCount: state.turnCount,
-      finalReplySentTurn: state.finalReplySentTurn,
-      finalReplySentAt: state.finalReplySentAt,
-    });
-  },
+      finalReplySentTurn: state.finalReplySentTurn,
+      finalReplySentAt: state.finalReplySentAt,
+    });
+  },
   createEmptyStreamState: (sid: string, cwd: string, tool: string, turnCount: number) => ({
     sessionId: sid, status: "running" as const, accumulatedContent: "", finalReply: "", chunkCount: 0, turnCount, contextTokens: 0, updatedAt: Date.now(), cwd, tool,
   }),
@@ -396,12 +396,48 @@ describe("runAgentSession process monitor", () => {
       expect.stringContaining("进程异常结束"),
     );
   });
-});
-
-describe("unified display loop WeChat delta", () => {
-  beforeEach(() => {
-    vi.useFakeTimers();
-    resetState();
+  it("re-injects IM skill capabilities for each resumed Claude prompt", async () => {
+    const platform = mockPlatform("feishu");
+    setSessionPlatform(platform);
+    bindChatToSession("sid-resume", "chat-resume");
+    recordLastActiveChat("sid-resume", "chat-resume");
+
+    const sentTexts: string[] = [];
+    const adapter: ToolAdapter = {
+      displayName: "Claude Code",
+      sessionDescPrefix: "Claude Code Session:",
+      createSession: async () => ({ sessionId: "sid-resume" }),
+      getSessionInfo: async (sid) => ({ sessionId: sid, cwd: "F:\\repo" }),
+      closeSession: async () => {},
+      prompt: async function* (_sid: string, text: string) {
+        sentTexts.push(text);
+        yield { type: "assistant", blocks: [{ type: "text", text: "done" }] };
+      },
+    };
+    _setAdapterForToolForTest("claude", adapter);
+
+    await runAgentSession("sid-resume", "first prompt", platform, "chat-resume", Date.now(), "claude");
+    await runAgentSession("sid-resume", "second prompt", platform, "chat-resume", Date.now(), "claude");
+
+    expect(sentTexts).toHaveLength(2);
+    for (const text of sentTexts) {
+      expect(text).toContain("[ChatCCC IM skill: feishu-skill]");
+      expect(text).toContain("[/ChatCCC IM skill: feishu-skill]");
+      expect(text).toContain('"session_id":"sid-resume"');
+      expect(text).toContain("http://127.0.0.1:");
+      expect(text).toContain("/api/agent/send-image");
+      expect(text).toContain("[User message]");
+      expect(text).toContain("[/User message]");
+    }
+    expect(sentTexts[0]).toContain("first prompt");
+    expect(sentTexts[1]).toContain("second prompt");
+  });
+});
+
+describe("unified display loop WeChat delta", () => {
+  beforeEach(() => {
+    vi.useFakeTimers();
+    resetState();
     resetBindingState();
     mockStreamStates.clear();
   });
@@ -464,12 +500,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

@@ -94,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(),
       });
@@ -113,4 +114,4 @@ export async function handleAgentStopStuckRequest(
 
   jsonReply(res, 200, { ok: true });
   return true;
-}
+}

package/src/config.ts

@@ -102,6 +102,8 @@ export interface FeishuConfig {
 export interface PlatformConfig {
   enabled: boolean;
   reuseTokenOnStart?: boolean;
+  /** 飞书平台类型：feishu（国内飞书）或 lark（国际版）；缺省按 feishu */
+  platformType?: "feishu" | "lark";
 }
 
 export interface PlatformsConfig {
@@ -319,6 +321,11 @@ function autofillToolPathsAfterSampleCopy(configFile: string): void {
   }
 }
 
+function normalizePlatformType(raw: string): "feishu" | "lark" {
+  if (raw === "lark") return "lark";
+  return "feishu";
+}
+
 function loadConfig(): AppConfig {
   const defaults: AppConfig = {
     feishu: { appId: "", appSecret: "" },
@@ -449,6 +456,11 @@ function loadConfig(): AppConfig {
         enabled: typeof (parsed.platforms as unknown as Record<string, unknown> | undefined)?.feishu === "object"
           ? Boolean(((parsed.platforms as unknown as Record<string, unknown>).feishu as Record<string, unknown>).enabled ?? true)
           : true,
+        platformType: normalizePlatformType(
+          typeof (parsed.platforms as unknown as Record<string, unknown> | undefined)?.feishu === "object"
+            ? String(((parsed.platforms as unknown as Record<string, unknown>).feishu as Record<string, unknown>).platformType ?? "feishu")
+            : "feishu",
+        ),
       },
       ilink: {
         enabled: typeof (parsed.platforms as unknown as Record<string, unknown> | undefined)?.ilink === "object"
@@ -517,7 +529,14 @@ export let APP_SECRET = config.feishu.appSecret;
 export let FEISHU_ENABLED = config.platforms.feishu.enabled;
 export let ILINK_ENABLED = config.platforms.ilink.enabled;
 export let ILINK_REUSE_TOKEN_ON_START = config.platforms.ilink.reuseTokenOnStart ?? true;
-export const BASE_URL = "https://open.feishu.cn/open-apis";
+
+function computeBaseUrl(platformType?: string): string {
+  if (platformType === "lark") return "https://open.larksuite.com/open-apis";
+  return "https://open.feishu.cn/open-apis";
+}
+
+export let BASE_URL = computeBaseUrl(config.platforms.feishu.platformType);
+export let FEISHU_PLATFORM_TYPE: "feishu" | "lark" = config.platforms.feishu.platformType === "lark" ? "lark" : "feishu";
 export const CHATCCC_PORT = config.port;
 
 /** 与 CHATCCC_PORT 一致，供 --local 连接本机中继 */
@@ -603,11 +622,13 @@ export function applyLoadedConfig(next: AppConfig): void {
   FEISHU_ENABLED = next.platforms.feishu.enabled;
   ILINK_ENABLED = next.platforms.ilink.enabled;
   ILINK_REUSE_TOKEN_ON_START = next.platforms.ilink.reuseTokenOnStart ?? true;
+  FEISHU_PLATFORM_TYPE = next.platforms.feishu.platformType === "lark" ? "lark" : "feishu";
+  BASE_URL = computeBaseUrl(FEISHU_PLATFORM_TYPE);
   CLAUDE_MODEL = next.claude.model;
   CLAUDE_SUBAGENT_MODEL = next.claude.subagentModel;
-  CLAUDE_EFFORT = next.claude.effort;
-  CLAUDE_MAX_TURN = next.claude.maxTurn;
-  CLAUDE_API_KEY = next.claude.apiKey;
+  CLAUDE_EFFORT = next.claude.effort;
+  CLAUDE_MAX_TURN = next.claude.maxTurn;
+  CLAUDE_API_KEY = next.claude.apiKey;
   CLAUDE_BASE_URL = next.claude.baseUrl;
   GIT_TIMEOUT_SECONDS = next.gitTimeoutSeconds;
   GIT_TIMEOUT_MS = GIT_TIMEOUT_SECONDS * 1000;
@@ -738,6 +759,9 @@ export function reportEnvironmentVariableReadout(): void {
     APP_SECRET.trim() ? "已读入（内容不在日志中显示）" : "未读入或为空"
   );
 
+  console.log(`  [默认] [可选] platforms.feishu.platformType`);
+  console.log(`         平台类型: ${FEISHU_PLATFORM_TYPE === "lark" ? "Lark (open.larksuite.com)" : "飞书 (open.feishu.cn)"}`);
+
   console.log(`  [默认] [可选] port`);
   console.log(`         监听端口: ${CHATCCC_PORT}`);
 

package/src/index.ts

@@ -24,7 +24,7 @@
 
 import { createServer, type IncomingMessage, type Server, type ServerResponse } from "node:http";
 
-import { WSClient, EventDispatcher } from "@larksuiteoapi/node-sdk";
+import { WSClient, EventDispatcher, Domain } from "@larksuiteoapi/node-sdk";
 import WebSocket from "ws";
 
 import { appendStartupTrace, attachRelayWebSocket, ensureSingleInstance, freeRelayListenPort, installCrashLogging, waitForPortFree } from "./shared.ts";
@@ -36,6 +36,7 @@ import {
   APP_ID,
   APP_SECRET,
   FEISHU_ENABLED,
+  FEISHU_PLATFORM_TYPE,
   ILINK_ENABLED,
   ILINK_REUSE_TOKEN_ON_START,
   BASE_URL,
@@ -212,7 +213,7 @@ function parseCardAction(data: unknown): CardActionResult | null {
   }
   if (!cmd) return null;
 
-  const CMD_MAP: Record<string, string> = { stop: "/stop", cancel: "/cancel", new: "/new", "new claude": "/new claude", "new cursor": "/new cursor", "new codex": "/new codex", restart: "/restart", state: "/state", cd: "/cd", sessions: "/sessions", newh: "/newh" };
+  const CMD_MAP: Record<string, string> = { stop: "/stop", cancel: "/cancel", new: "/new", "new claude": "/new claude", "new cursor": "/new cursor", "new codex": "/new codex", restart: "/restart", state: "/state", cd: "/cd", sessions: "/sessions", newh: "/newh" };
   let text = CMD_MAP[cmd] ?? "";
   if (cmd === "cd" && typeof action.value === "object" && action.value !== null) {
     const path = (action.value as Record<string, string>).path;
@@ -348,9 +349,10 @@ async function startBotServiceCore(): Promise<void> {
     const msg = err instanceof Error ? err.message : String(err);
     console.error("  失败：无法获取 tenant_access_token。");
     console.error(`  接口: POST ${BASE_URL}/auth/v3/tenant_access_token/internal`);
+    const apiHost = BASE_URL.replace("https://", "").replace("/open-apis", "");
     console.error("  常见原因:");
     console.error(
-      "    - 本机网络无法访问 open.feishu.cn（可尝试：关闭系统/终端代理、检查防火墙；Windows 可管理员运行 netsh winsock reset 后重启）",
+      `    - 本机网络无法访问 ${apiHost}（可尝试：关闭系统/终端代理、检查防火墙；Windows 可管理员运行 netsh winsock reset 后重启）`,
     );
     console.error("    - App ID / App Secret 与开放平台「凭证与基础信息」不一致");
     console.error("    - 自建应用尚未创建/发布可用版本");
@@ -542,6 +544,7 @@ async function startBotServiceCore(): Promise<void> {
     const wsClient = new WSClient({
       appId: APP_ID,
       appSecret: APP_SECRET,
+      domain: FEISHU_PLATFORM_TYPE === "lark" ? Domain.Lark : Domain.Feishu,
       onReady: async () => {
         await rebuildBindingsFromRegistry().catch((err) =>
           console.error(`[${ts()}] [SDK READY] rebuild bindings failed: ${(err as Error).message}`)

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-chat-binding.ts

@@ -71,11 +71,11 @@ export interface ActivePrompt {
   /** Set when the watchdog detects that the CLI process disappeared before stream finalization. */
   abnormalExit?: boolean;
   abnormalExitNotified?: boolean;
-  /** Set when the resource monitor detects CPU + memory unchanged for 3 minutes. */
-  resourceStuck?: boolean;
-  /** Adapter-provided callback to close the underlying SDK session / subprocess.
-   *  Called by stop-stuck-loop before controller.abort() to terminate the CLI
-   *  process immediately, rather than waiting for the async generator to unblock. */
+  /** Set when the resource monitor detects CPU + memory unchanged for 3 minutes. */
+  resourceStuck?: boolean;
+  /** Adapter-provided callback to close the underlying SDK session / subprocess.
+   *  Called by stop-stuck-loop before controller.abort() to terminate the CLI
+   *  process immediately, rather than waiting for the async generator to unblock. */
   closeSession?: () => void;
 }
 
@@ -228,4 +228,4 @@ export function resetBindingState(): void {
     clearInterval(unifiedDisplayLoopHandle);
     unifiedDisplayLoopHandle = null;
   }
-}
+}

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;
@@ -1157,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 阶段先于
@@ -1172,13 +1176,13 @@ export async function runAgentSession(
 
     // 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 {}
+    let finalReplyToWrite = finalReply;
+    try {
+      const existing = await readStreamState(sessionId);
+      if (existing && existing.finalReply.length > finalReply.length) {
+        finalReplyToWrite = existing.finalReply;
+      }
+    } catch {}
 
     await writeStreamState({
       sessionId,
@@ -1187,11 +1191,11 @@ 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,
+    });
 
     // 消费队列中的缓存消息（异步，不阻塞后续清理）
     // 用户 /stop 后应丢弃队列消息，避免用户停止后又自动开始新轮
@@ -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 {

package/src/web-ui.ts

@@ -296,6 +296,10 @@ export function unflattenConfig(flat: Record<string, unknown>): Record<string, u
       result.platforms = result.platforms || {};
       (result.platforms as Record<string, unknown>).feishu = (result.platforms as Record<string, unknown>).feishu || {};
       ((result.platforms as Record<string, unknown>).feishu as Record<string, unknown>).enabled = val === true || val === "true";
+    } else if (key === "CHATCCC_FEISHU_PLATFORM_TYPE") {
+      result.platforms = result.platforms || {};
+      (result.platforms as Record<string, unknown>).feishu = (result.platforms as Record<string, unknown>).feishu || {};
+      ((result.platforms as Record<string, unknown>).feishu as Record<string, unknown>).platformType = val;
     } else if (key === "CHATCCC_ILINK_ENABLED") {
       result.platforms = result.platforms || {};
       (result.platforms as Record<string, unknown>).ilink = (result.platforms as Record<string, unknown>).ilink || {};
@@ -582,6 +586,14 @@ header .badge{font-size:13px;padding:4px 12px;border-radius:12px;font-weight:500
           <input type="checkbox" class="agent-toggle" id="platform-enable-feishu" checked onchange="onWizardPlatformToggle('feishu', this.checked)">
         </div>
         <div id="feishu-cred-fields" style="margin-top:12px;padding-top:12px;border-top:1px solid #e2e8f0">
+          <div class="form-group" style="margin-bottom:10px">
+            <label>平台类型</label>
+            <select id="field-CHATCCC_FEISHU_PLATFORM_TYPE" style="width:100%;padding:8px 12px;border:1px solid #cbd5e1;border-radius:8px;font-size:14px;outline:none">
+              <option value="feishu">飞书 (open.feishu.cn)</option>
+              <option value="lark">Lark (open.larksuite.com)</option>
+            </select>
+            <div class="hint">飞书或 Lark 国际版，决定 API 服务器地址</div>
+          </div>
           <div class="form-group" style="margin-bottom:10px">
             <label>CHATCCC_APP_ID *</label>
             <input type="text" id="field-CHATCCC_APP_ID" placeholder="cli_xxxxxxxxxxxx">
@@ -759,6 +771,7 @@ header .badge{font-size:13px;padding:4px 12px;border-radius:12px;font-weight:500
         </div>
         <div class="config-row"><span class="key">App ID</span><span class="val" id="cfg-APP_ID">-</span></div>
         <div class="config-row"><span class="key">App Secret</span><span class="val" id="cfg-APP_SECRET">-</span></div>
+        <div class="config-row"><span class="key">平台类型</span><span class="val" id="cfg-FEISHU_PLATFORM_TYPE">-</span></div>
         <button class="btn btn-outline" style="margin-top:8px" onclick="editSection('feishu')">编辑</button>
       </div>
     </details>
@@ -1058,6 +1071,8 @@ function renderStep1() {
   var f = c.feishu || {};
   prefillNested('field-CHATCCC_APP_ID', f.appId);
   prefillNested('field-CHATCCC_APP_SECRET', f.appSecret);
+  var pf = (c.platforms && c.platforms.feishu) || {};
+  prefillNested('field-CHATCCC_FEISHU_PLATFORM_TYPE', pf.platformType || 'feishu');
   // 平台开关：按已有 config 回填；首次配置（无飞书凭证）时默认关闭飞书、开启微信
   var hasExistingCreds = Boolean(c.feishu?.appId?.trim() && c.feishu?.appSecret?.trim());
   var feishuEnabled = hasExistingCreds
@@ -1156,6 +1171,9 @@ function collectAllFields() {
     var el = document.getElementById('field-' + key);
     if (el && el.value.trim()) vars[key] = el.value.trim();
   });
+  // 平台类型（下拉选择框，始终发送以保持与服务端同步）
+  var ptEl = document.getElementById('field-CHATCCC_FEISHU_PLATFORM_TYPE');
+  if (ptEl && ptEl.value.trim()) vars['CHATCCC_FEISHU_PLATFORM_TYPE'] = ptEl.value.trim();
   vars.CHATCCC_FEISHU_ENABLED = !!state.platformsEnabled.feishu;
   vars.CHATCCC_ILINK_ENABLED = !!state.platformsEnabled.ilink;
   vars.CHATCCC_CLAUDE_ENABLED = !!state.agentsEnabled.claude;
@@ -1197,6 +1215,8 @@ function renderStep3() {
   if (state.platformsEnabled.feishu) {
     lines.push('<div class="config-row"><span class="key">CHATCCC_APP_ID</span><span class="val">' + (vars.CHATCCC_APP_ID || '<span style="color:#ef4444">未填写</span>') + '</span></div>');
     lines.push('<div class="config-row"><span class="key">CHATCCC_APP_SECRET</span><span class="val">' + (vars.CHATCCC_APP_SECRET ? '***已设置***' : '<span style="color:#ef4444">未填写</span>') + '</span></div>');
+    var ptLabel = vars.CHATCCC_FEISHU_PLATFORM_TYPE === 'lark' ? 'Lark (open.larksuite.com)' : '飞书 (open.feishu.cn)';
+    lines.push('<div class="config-row"><span class="key">平台类型</span><span class="val">' + ptLabel + '</span></div>');
   }
 
   lines.push('<h3 style="margin:16px 0 8px">微信 iLink</h3>');
@@ -1368,6 +1388,8 @@ function updateDashboardUI() {
   state.platformsEnabled.feishu = feishuEnabled;
   document.getElementById('cfg-APP_ID').textContent = c.feishu && c.feishu.appId ? c.feishu.appId.slice(0,8) + '...' + c.feishu.appId.slice(-4) : '-';
   document.getElementById('cfg-APP_SECRET').textContent = c.feishu && c.feishu.appSecret ? '***已设置***' : '-';
+  var pt = (c.platforms && c.platforms.feishu && c.platforms.feishu.platformType === 'lark') ? 'Lark (open.larksuite.com)' : '飞书 (open.feishu.cn)';
+  document.getElementById('cfg-FEISHU_PLATFORM_TYPE').textContent = pt;
 
   // 只显示已启用的 Agent 卡片（按 enabled 字段；缺省时退回到"任一字段非空"兼容旧 config）
   var claudeOn = isAgentEnabled(c.claude, CLAUDE_FALLBACK_KEYS);
@@ -1497,6 +1519,16 @@ function editSection(section) {
     html += '<input type="' + (isSecret ? 'password' : 'text') + '" id="edit-' + key + '" value="' + String(val).replace(/"/g,'&quot;') + '">';
     html += '</div>';
   });
+  // 平台类型：feishu 编辑时额外渲染下拉选择框
+  if (section === 'feishu') {
+    var ptVal = (state.config.platforms && state.config.platforms.feishu && state.config.platforms.feishu.platformType) || 'feishu';
+    html += '<div class="form-group"><label>平台类型</label>';
+    html += '<select id="edit-CHATCCC_FEISHU_PLATFORM_TYPE" style="width:100%;padding:8px 12px;border:1px solid #cbd5e1;border-radius:8px;font-size:14px;outline:none">';
+    html += '<option value="feishu"' + (ptVal === 'feishu' ? ' selected' : '') + '>飞书 (open.feishu.cn)</option>';
+    html += '<option value="lark"' + (ptVal === 'lark' ? ' selected' : '') + '>Lark (open.larksuite.com)</option>';
+    html += '</select></div>';
+  }
+  document.getElementById('edit-modal-fields').innerHTML = html;
 }
 
 function closeEditModal() {
@@ -1515,6 +1547,11 @@ async function saveEdit() {
     var el = document.getElementById('edit-' + key);
     if (el) vars[key] = el.value.trim();
   });
+  // 平台类型：feishu 编辑时额外采集下拉选择框的值
+  if (editSectionType === 'feishu') {
+    var ptEl = document.getElementById('edit-CHATCCC_FEISHU_PLATFORM_TYPE');
+    if (ptEl && ptEl.value.trim()) vars['CHATCCC_FEISHU_PLATFORM_TYPE'] = ptEl.value.trim();
+  }
   await saveConfig(vars);
   closeEditModal();
   updateDashboardUI();