chatccc 0.2.92 → 0.2.94

package/scripts/postinstall-sharp-check.mjs

@@ -1,59 +1,59 @@
-// postinstall 检测 sharp 原生模块是否可用（常见于 Linux 缺少 libvips）
-import { createRequire } from "node:module";
-
-const require = createRequire(import.meta.url);
-let ok = false;
-
-try {
-  require("sharp");
-  ok = true;
-} catch (err) {
-  const msg = err.message;
-  const platform = process.platform;
-
-  console.warn("");
-  console.warn("============================================================");
-  console.warn("  ChatCCC: sharp 图像处理模块检测失败");
-  console.warn("============================================================");
-
-  if (platform === "linux") {
-    if (msg.includes("libvips") || msg.includes("vips") || msg.includes("libglib")) {
-      console.warn("  原因：系统缺少 libvips 图像处理库。");
-      console.warn("");
-      console.warn("  请先安装 libvips 然后重建 sharp：");
-      console.warn("");
-      console.warn("  Debian / Ubuntu:");
-      console.warn("    sudo apt install libvips-dev");
-      console.warn("");
-      console.warn("  CentOS / RHEL / Fedora:");
-      console.warn("    sudo yum install vips-devel");
-      console.warn("");
-      console.warn("  Alpine:");
-      console.warn("    sudo apk add vips-dev");
-      console.warn("");
-      console.warn("  安装 libvips 后重建 sharp：");
-      console.warn("    npm install -g chatccc --force");
-    } else if (msg.includes("Cannot find module")) {
-      console.warn("  原因：sharp 模块未成功安装。");
-      console.warn("");
-      console.warn("  请尝试重建（可能需要先安装 libvips）：");
-      console.warn("    npm install -g chatccc --force");
-    } else {
-      console.warn("  错误详情：", msg);
-    }
-  } else {
-    console.warn("  错误详情：", msg);
-    console.warn("  平台：", platform);
-    console.warn("  请尝试：npm install -g chatccc --force");
-  }
-
-  console.warn("");
-  console.warn("  缺少 sharp 不影响消息收发，但群聊头像状态指示");
-  console.warn("  （运行中/空闲/新建）将不会更新。");
-  console.warn("============================================================");
-  console.warn("");
-}
-
-if (!ok && process.env.npm_config_verbose) {
-  process.exitCode = 0; // 永远不阻塞安装
+// postinstall 检测 sharp 原生模块是否可用（常见于 Linux 缺少 libvips）
+import { createRequire } from "node:module";
+
+const require = createRequire(import.meta.url);
+let ok = false;
+
+try {
+  require("sharp");
+  ok = true;
+} catch (err) {
+  const msg = err.message;
+  const platform = process.platform;
+
+  console.warn("");
+  console.warn("============================================================");
+  console.warn("  ChatCCC: sharp 图像处理模块检测失败");
+  console.warn("============================================================");
+
+  if (platform === "linux") {
+    if (msg.includes("libvips") || msg.includes("vips") || msg.includes("libglib")) {
+      console.warn("  原因：系统缺少 libvips 图像处理库。");
+      console.warn("");
+      console.warn("  请先安装 libvips 然后重建 sharp：");
+      console.warn("");
+      console.warn("  Debian / Ubuntu:");
+      console.warn("    sudo apt install libvips-dev");
+      console.warn("");
+      console.warn("  CentOS / RHEL / Fedora:");
+      console.warn("    sudo yum install vips-devel");
+      console.warn("");
+      console.warn("  Alpine:");
+      console.warn("    sudo apk add vips-dev");
+      console.warn("");
+      console.warn("  安装 libvips 后重建 sharp：");
+      console.warn("    npm install -g chatccc --force");
+    } else if (msg.includes("Cannot find module")) {
+      console.warn("  原因：sharp 模块未成功安装。");
+      console.warn("");
+      console.warn("  请尝试重建（可能需要先安装 libvips）：");
+      console.warn("    npm install -g chatccc --force");
+    } else {
+      console.warn("  错误详情：", msg);
+    }
+  } else {
+    console.warn("  错误详情：", msg);
+    console.warn("  平台：", platform);
+    console.warn("  请尝试：npm install -g chatccc --force");
+  }
+
+  console.warn("");
+  console.warn("  缺少 sharp 不影响消息收发，但群聊头像状态指示");
+  console.warn("  （运行中/空闲/新建）将不会更新。");
+  console.warn("============================================================");
+  console.warn("");
+}
+
+if (!ok && process.env.npm_config_verbose) {
+  process.exitCode = 0; // 永远不阻塞安装
 }

package/src/__tests__/session.test.ts

@@ -4,17 +4,63 @@ import { tmpdir } from "node:os";
 import { dirname, join } from "node:path";
 
 // mock stream-state 以支持在测试中控制累积长度
-const mockStreamStates = new Map<string, { accumulatedContent: string; finalReply: string; status?: "running" | "done" | "stopped" }>();
+const mockStreamStates = new Map<string, {
+  accumulatedContent: string;
+  finalReply: string;
+  status?: "running" | "done" | "stopped" | "error";
+  turnCount?: number;
+  finalReplySentTurn?: number;
+  finalReplySentAt?: number;
+}>();
 vi.mock("../stream-state.ts", () => ({
   readStreamState: async (sid: string) => {
     const state = mockStreamStates.get(sid);
     if (!state) return null;
-    return { sessionId: sid, accumulatedContent: state.accumulatedContent, finalReply: state.finalReply, status: state.status ?? "running", chunkCount: 0, turnCount: 0, contextTokens: 0, updatedAt: Date.now(), cwd: "", tool: "claude" };
+    return {
+      sessionId: sid,
+      accumulatedContent: state.accumulatedContent,
+      finalReply: state.finalReply,
+      finalReplySentTurn: state.finalReplySentTurn,
+      finalReplySentAt: state.finalReplySentAt,
+      status: state.status ?? "running",
+      chunkCount: 0,
+      turnCount: state.turnCount ?? 0,
+      contextTokens: 0,
+      updatedAt: Date.now(),
+      cwd: "",
+      tool: "claude",
+    };
+  },
+  writeStreamState: async (state: {
+    sessionId: string;
+    accumulatedContent: string;
+    finalReply: string;
+    status?: "running" | "done" | "stopped" | "error";
+    turnCount?: 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,
+    });
   },
-  writeStreamState: async () => {},
   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,
   }),
+  isFinalReplySentForTurn: (state: { turnCount: number; finalReplySentTurn?: number }) => state.finalReplySentTurn === state.turnCount,
+  markFinalReplySent: async (sid: string, turnCount: number, sentAt = Date.now()) => {
+    const state = mockStreamStates.get(sid);
+    if (!state) return;
+    if ((state.turnCount ?? 0) !== turnCount) return;
+    if ((state.status ?? "running") === "running") return;
+    state.finalReplySentTurn = turnCount;
+    state.finalReplySentAt = sentAt;
+  },
   fixStaleStreamStates: async () => {},
 }));
 import {
@@ -41,7 +87,9 @@ import {
   setSessionPlatform,
   recordChatPlatform,
   _getPlatformForChatForTest,
-  ensureDisplayLoop,
+  runAgentSession,
+  startUnifiedDisplayLoop,
+  stopUnifiedDisplayLoop,
 } from "../session.ts";
 import {
   activePrompts,
@@ -184,7 +232,83 @@ describe("chat platform routing", () => {
 // processedMessages 全部保留——SDK 重连不应当影响后台 prompt 的执行。
 // ---------------------------------------------------------------------------
 
-describe("ensureDisplayLoop WeChat delta", () => {
+describe("runAgentSession previous final delivery guard", () => {
+  let registryFile = "";
+  let toolsFile = "";
+
+  beforeEach(async () => {
+    resetState();
+    resetBindingState();
+    mockStreamStates.clear();
+    const dir = await mkdtemp(join(tmpdir(), "chatccc-final-guard-"));
+    registryFile = join(dir, "session-registry.json");
+    toolsFile = join(dir, "session-tools.json");
+    _setSessionRegistryFileForTest(registryFile);
+    _setSessionToolsFileForTest(toolsFile);
+    _setAdapterForToolForTest(
+      "claude",
+      mockAdapter((sid) => ({ sessionId: sid, cwd: "/tmp" })),
+    );
+  });
+
+  afterEach(() => {
+    _resetSessionRegistryFileForTest();
+    _resetSessionToolsFileForTest();
+    _clearAdapterCacheForTest();
+    resetBindingState();
+  });
+
+  it("does not resend the previous terminal final when the same turn is already marked sent", async () => {
+    const platform = mockPlatform("feishu");
+    setSessionPlatform(platform);
+    bindChatToSession("sid-final", "chat-final");
+    recordLastActiveChat("sid-final", "chat-final");
+    sessionInfoMap.set("chat-final", {
+      sessionId: "sid-final",
+      turnCount: 1,
+      lastContextTokens: 0,
+      startTime: 0,
+      tool: "claude",
+    });
+    mockStreamStates.set("sid-final", {
+      accumulatedContent: "",
+      finalReply: "old final",
+      status: "done",
+      turnCount: 1,
+      finalReplySentTurn: 1,
+    });
+
+    await runAgentSession("sid-final", "next prompt", platform, "chat-final", Date.now(), "claude");
+
+    expect(platform.sendText).not.toHaveBeenCalledWith("chat-final", "old final");
+  });
+
+  it("resends the previous terminal final when there is no delivery marker", async () => {
+    const platform = mockPlatform("feishu");
+    setSessionPlatform(platform);
+    bindChatToSession("sid-unsent", "chat-unsent");
+    recordLastActiveChat("sid-unsent", "chat-unsent");
+    sessionInfoMap.set("chat-unsent", {
+      sessionId: "sid-unsent",
+      turnCount: 1,
+      lastContextTokens: 0,
+      startTime: 0,
+      tool: "claude",
+    });
+    mockStreamStates.set("sid-unsent", {
+      accumulatedContent: "",
+      finalReply: "old final",
+      status: "done",
+      turnCount: 1,
+    });
+
+    await runAgentSession("sid-unsent", "next prompt", platform, "chat-unsent", Date.now(), "claude");
+
+    expect(platform.sendText).toHaveBeenCalledWith("chat-unsent", "old final");
+  });
+});
+
+describe("unified display loop WeChat delta", () => {
   beforeEach(() => {
     vi.useFakeTimers();
     resetState();
@@ -193,6 +317,7 @@ describe("ensureDisplayLoop WeChat delta", () => {
   });
 
   afterEach(() => {
+    stopUnifiedDisplayLoop();
     resetBindingState();
     vi.useRealTimers();
   });
@@ -212,16 +337,31 @@ describe("ensureDisplayLoop WeChat delta", () => {
       tool: "claude",
     });
 
+    // 模拟 runAgentSession 创建的 WeChat display 条目
+    displayCards.set("chat-wechat", {
+      cardId: "",
+      sequence: 0,
+      cardBusy: false,
+      cardCreatedAt: Date.now(),
+      lastSentContent: "",
+      streamErrorNotified: false,
+      sessionId: "sid-wechat",
+      turnCount: 1,
+      dotCount: 0,
+    });
+
     mockStreamStates.set("sid-wechat", {
       accumulatedContent: "",
       finalReply: "partial reply",
+      status: "running",
     });
-    ensureDisplayLoop("sid-wechat");
+    startUnifiedDisplayLoop();
     await vi.advanceTimersByTimeAsync(3000);
 
     mockStreamStates.set("sid-wechat", {
       accumulatedContent: "tool output\n",
       finalReply: "partial reply",
+      status: "running",
     });
     await vi.advanceTimersByTimeAsync(3000);
 
@@ -987,6 +1127,7 @@ describe("switchChatBinding", () => {
     displayCards.set("chat-1", {
       cardId: "c1", sequence: 1, cardBusy: false,
       cardCreatedAt: 0, lastSentContent: "", streamErrorNotified: false,
+      sessionId: "old-sid", turnCount: 5, dotCount: 0,
     });
 
     const result = await switchChatBinding({
@@ -1051,6 +1192,7 @@ describe("switchChatBinding", () => {
     const oldDisplay = {
       cardId: "c1", sequence: 1, cardBusy: false,
       cardCreatedAt: 0, lastSentContent: "", streamErrorNotified: false,
+      sessionId: "old-sid", turnCount: 5, dotCount: 0,
     };
     displayCards.set("chat-1", oldDisplay);
 

package/src/__tests__/stream-state.test.ts

@@ -18,6 +18,8 @@ const {
   writeStreamState,
   readStreamState,
   createEmptyStreamState,
+  isFinalReplySentForTurn,
+  markFinalReplySent,
   STREAMS_DIR,
   _setRenameForTest,
   _resetRenameForTest,
@@ -117,6 +119,33 @@ describe("writeStreamState — atomic rename", () => {
     const got = await readStreamState("never-existed");
     expect(got).toBeNull();
   });
+  it("marks final reply delivery for the matching terminal turn only", async () => {
+    const state = createEmptyStreamState("sid-delivered", "/tmp", "claude", 2);
+    state.status = "done";
+    state.finalReply = "done";
+    await writeStreamState(state);
+
+    await markFinalReplySent("sid-delivered", 2, 12345);
+
+    const got = await readStreamState("sid-delivered");
+    expect(got).not.toBeNull();
+    expect(got!.finalReplySentTurn).toBe(2);
+    expect(got!.finalReplySentAt).toBe(12345);
+    expect(isFinalReplySentForTurn(got!)).toBe(true);
+  });
+
+  it("does not mark a running state or a different turn as delivered", async () => {
+    const state = createEmptyStreamState("sid-running", "/tmp", "claude", 3);
+    await writeStreamState(state);
+
+    await markFinalReplySent("sid-running", 2, 12345);
+    await markFinalReplySent("sid-running", 3, 12345);
+
+    const got = await readStreamState("sid-running");
+    expect(got).not.toBeNull();
+    expect(got!.finalReplySentTurn).toBeUndefined();
+    expect(isFinalReplySentForTurn(got!)).toBe(false);
+  });
 });
 
 describe("createEmptyStreamState", () => {
@@ -129,6 +158,7 @@ describe("createEmptyStreamState", () => {
     expect(s.status).toBe("running");
     expect(s.accumulatedContent).toBe("");
     expect(s.finalReply).toBe("");
+    expect(s.finalReplySentTurn).toBeUndefined();
     expect(s.chunkCount).toBe(0);
   });
 });