chatccc 0.2.201 → 0.2.203

package/src/__tests__/session.test.ts

@@ -91,12 +91,12 @@ import {
   stopSession,
   startUnifiedDisplayLoop,
   stopUnifiedDisplayLoop,
-  _setProcessAliveForTest,
-  _resetProcessAliveForTest,
-  _setProcessMonitorIntervalForTest,
-  _resetProcessMonitorIntervalForTest,
-  setSessionEffortOverride,
-} from "../session.ts";
+  _setProcessAliveForTest,
+  _resetProcessAliveForTest,
+  _setProcessMonitorIntervalForTest,
+  _resetProcessMonitorIntervalForTest,
+  setSessionEffortOverride,
+} from "../session.ts";
 import {
   activePrompts,
   bindChatToSession,
@@ -896,17 +896,17 @@ describe("getSessionStatus", () => {
     expect(status!.effort).not.toBeNull();
     // model 必为字符串（留空时显示 '(留空)'，否则为环境变量值）；不应是占位符
     expect(typeof status!.model).toBe("string");
-    expect(status!.model.length).toBeGreaterThan(0);
-  });
-
-  it("Codex session status uses the per-session effort override", async () => {
-    mockSessionInfo("chat-codex", { sessionId: "sid-codex-effort", tool: "codex" });
-    setSessionEffortOverride("sid-codex-effort", "xhigh");
-
-    const status = await getSessionStatus("chat-codex");
-
-    expect(status!.effort).toBe("xhigh");
-  });
+    expect(status!.model.length).toBeGreaterThan(0);
+  });
+
+  it("Codex session status uses the per-session effort override", async () => {
+    mockSessionInfo("chat-codex", { sessionId: "sid-codex-effort", tool: "codex" });
+    setSessionEffortOverride("sid-codex-effort", "xhigh");
+
+    const status = await getSessionStatus("chat-codex");
+
+    expect(status!.effort).toBe("xhigh");
+  });
 
   it("Cursor 会话：effort 恒为 null（卡片渲染时隐藏该行，避免显示无意义的 effort）", async () => {
     mockSessionInfo("chat-cursor", { sessionId: "sid-cur", tool: "cursor" });
@@ -942,29 +942,29 @@ describe("getSessionStatus", () => {
     expect(status!.model).toBe(UNKNOWN_MODEL_PLACEHOLDER);
   });
 
-  it("Cursor 会话：adapter.getSessionInfo 抛错时降级为占位符（不阻塞 /state）", async () => {
-    mockSessionInfo("chat-cursor", { sessionId: "sid-cur", tool: "cursor" });
-    _setAdapterForToolForTest(
-      "cursor",
-      mockAdapter(() => {
-        throw new Error("simulated adapter failure");
-      }),
-    );
-    const status = await getSessionStatus("chat-cursor");
-    expect(status!.model).toBe(UNKNOWN_MODEL_PLACEHOLDER);
-    expect(status!.effort).toBeNull();
-  });
-
-  it("CCC Agent 会话：model 来自 ccc 配置且 effort 恒为 null", async () => {
-    mockSessionInfo("chat-ccc", { sessionId: "session-ccc", tool: "ccc" });
-
-    const status = await getSessionStatus("chat-ccc");
-
-    expect(status!.model).toBeTruthy();
-    expect(status!.model).not.toBe(UNKNOWN_MODEL_PLACEHOLDER);
-    expect(status!.effort).toBeNull();
-  });
-});
+  it("Cursor 会话：adapter.getSessionInfo 抛错时降级为占位符（不阻塞 /state）", async () => {
+    mockSessionInfo("chat-cursor", { sessionId: "sid-cur", tool: "cursor" });
+    _setAdapterForToolForTest(
+      "cursor",
+      mockAdapter(() => {
+        throw new Error("simulated adapter failure");
+      }),
+    );
+    const status = await getSessionStatus("chat-cursor");
+    expect(status!.model).toBe(UNKNOWN_MODEL_PLACEHOLDER);
+    expect(status!.effort).toBeNull();
+  });
+
+  it("CCC Agent 会话：model 来自 ccc 配置且 effort 恒为 null", async () => {
+    mockSessionInfo("chat-ccc", { sessionId: "session-ccc", tool: "ccc" });
+
+    const status = await getSessionStatus("chat-ccc");
+
+    expect(status!.model).toBeTruthy();
+    expect(status!.model).not.toBe(UNKNOWN_MODEL_PLACEHOLDER);
+    expect(status!.effort).toBeNull();
+  });
+});
 
 describe("getAllSessionsStatus", () => {
   let registryFile = "";
@@ -1005,9 +1005,10 @@ describe("getAllSessionsStatus", () => {
 
   it("returns statuses from disk registry", async () => {
     await recordSessionRegistry({
-      chatId: "chat1",
-      sessionId: "s1",
-      tool: "claude",
+      chatId: "chat1",
+      sessionId: "s1",
+      tool: "claude",
+      chatType: "p2p",
       chatName: "test-chat-1",
       turnCount: 2,
       startTime: 1000,
@@ -1027,7 +1028,8 @@ describe("getAllSessionsStatus", () => {
 
     const result = await getAllSessionsStatus();
     expect(result).toHaveLength(2);
-    expect(result[0].chatId).toBe("chat1");
+    expect(result[0].chatId).toBe("chat1");
+    expect(result[0].chatType).toBe("p2p");
     // running=true in registry doesn't make it active — must be in activePrompts
     expect(result[0].active).toBe(false);
     expect(result[0].turnCount).toBe(2);

package/src/__tests__/shared-prefix.test.ts

@@ -1,36 +1,36 @@
-import { describe, expect, it } from "vitest";
-
-import {
-  ABD_APPEND_PROMPT,
-  applySharedPrefix,
-} from "../shared-prefix.ts";
-
-describe("applySharedPrefix", () => {
-  it("leaves normal messages unchanged", () => {
-    expect(applySharedPrefix("帮我分析")).toEqual({
-      matched: false,
-      text: "帮我分析",
-      body: "帮我分析",
-    });
-  });
-
-  it("removes /abd without requiring a space", () => {
-    const result = applySharedPrefix("/abd帮我分析");
-
-    expect(result.matched).toBe(true);
-    expect(result.body).toBe("帮我分析");
-    expect(result.text).toBe(`帮我分析\n\n---\n${ABD_APPEND_PROMPT}`);
-  });
-
-  it("removes whitespace after /abd", () => {
-    const result = applySharedPrefix("/abd   帮我分析");
-
-    expect(result.text).toBe(`帮我分析\n\n---\n${ABD_APPEND_PROMPT}`);
-  });
-
-  it("keeps the appendix when the user body is empty", () => {
-    const result = applySharedPrefix("/abd   ");
-
-    expect(result.text).toBe(`---\n${ABD_APPEND_PROMPT}`);
-  });
-});
+import { describe, expect, it } from "vitest";
+
+import {
+  ABD_APPEND_PROMPT,
+  applySharedPrefix,
+} from "../shared-prefix.ts";
+
+describe("applySharedPrefix", () => {
+  it("leaves normal messages unchanged", () => {
+    expect(applySharedPrefix("帮我分析")).toEqual({
+      matched: false,
+      text: "帮我分析",
+      body: "帮我分析",
+    });
+  });
+
+  it("removes /abd without requiring a space", () => {
+    const result = applySharedPrefix("/abd帮我分析");
+
+    expect(result.matched).toBe(true);
+    expect(result.body).toBe("帮我分析");
+    expect(result.text).toBe(`帮我分析\n\n---\n${ABD_APPEND_PROMPT}`);
+  });
+
+  it("removes whitespace after /abd", () => {
+    const result = applySharedPrefix("/abd   帮我分析");
+
+    expect(result.text).toBe(`帮我分析\n\n---\n${ABD_APPEND_PROMPT}`);
+  });
+
+  it("keeps the appendix when the user body is empty", () => {
+    const result = applySharedPrefix("/abd   ");
+
+    expect(result.text).toBe(`---\n${ABD_APPEND_PROMPT}`);
+  });
+});

package/src/__tests__/sim-platform.test.ts

@@ -62,21 +62,21 @@ describe("SimulatedPlatform", () => {
     await expect(SimulatedPlatform.setChatAvatar("t", "ch1", "claude", "busy")).resolves.toBeUndefined();
   });
 
-  it("纯函数 extractSessionInfo 正常工作", () => {
-    const result = SimulatedPlatform.extractSessionInfo("Claude Code Session: a1b2c3d4-e5f6-7890-abcd-ef1234567890");
-    expect(result).toEqual({ sessionId: "a1b2c3d4-e5f6-7890-abcd-ef1234567890", tool: "claude" });
-  });
-
-  it("pure extractSessionInfo recognizes ccc session ids", () => {
-    const result = SimulatedPlatform.extractSessionInfo("CCC Session: session-20260702-121530-a1b2c3");
-    expect(result).toEqual({ sessionId: "session-20260702-121530-a1b2c3", tool: "ccc" });
-  });
-
-  it("纯函数 formatDelayNotice 正常工作", () => {
+  it("纯函数 extractSessionInfo 正常工作", () => {
+    const result = SimulatedPlatform.extractSessionInfo("Claude Code Session: a1b2c3d4-e5f6-7890-abcd-ef1234567890");
+    expect(result).toEqual({ sessionId: "a1b2c3d4-e5f6-7890-abcd-ef1234567890", tool: "claude" });
+  });
+
+  it("pure extractSessionInfo recognizes ccc session ids", () => {
+    const result = SimulatedPlatform.extractSessionInfo("CCC Session: session-20260702-121530-a1b2c3");
+    expect(result).toEqual({ sessionId: "session-20260702-121530-a1b2c3", tool: "ccc" });
+  });
+
+  it("纯函数 formatDelayNotice 正常工作", () => {
     const notice = SimulatedPlatform.formatDelayNotice(Date.now() - 20 * 60 * 1000, "测试消息");
     expect(notice).toBeDefined();
     expect(notice).toContain("延迟送达");
     // 近期消息不触发
     expect(SimulatedPlatform.formatDelayNotice(Date.now(), "test")).toBeNull();
   });
-});
+});

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

@@ -15,12 +15,12 @@ vi.mock("../config.ts", async () => {
 });
 
 const {
-  writeStreamState,
-  readStreamState,
-  createEmptyStreamState,
-  isFinalReplySentForTurn,
-  markFinalReplySent,
-  STREAMS_DIR,
+  writeStreamState,
+  readStreamState,
+  createEmptyStreamState,
+  isFinalReplySentForTurn,
+  markFinalReplySent,
+  STREAMS_DIR,
   _setRenameForTest,
   _resetRenameForTest,
 } = await import("../stream-state.ts");
@@ -119,36 +119,36 @@ 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", () => {
+  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", () => {
   it("生成的 state 字段正确且 status=running", () => {
     const s = createEmptyStreamState("sid-X", "/cwd", "cursor", 5);
     expect(s.sessionId).toBe("sid-X");
@@ -156,9 +156,9 @@ describe("createEmptyStreamState", () => {
     expect(s.tool).toBe("cursor");
     expect(s.turnCount).toBe(5);
     expect(s.status).toBe("running");
-    expect(s.accumulatedContent).toBe("");
-    expect(s.finalReply).toBe("");
-    expect(s.finalReplySentTurn).toBeUndefined();
-    expect(s.chunkCount).toBe(0);
-  });
-});
+    expect(s.accumulatedContent).toBe("");
+    expect(s.finalReply).toBe("");
+    expect(s.finalReplySentTurn).toBeUndefined();
+    expect(s.chunkCount).toBe(0);
+  });
+});

package/src/__tests__/update-command-guard.test.ts

@@ -0,0 +1,144 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { mkdir, mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+
+import {
+  acquireUpdateCommandGuard,
+  buildUpdateCommandId,
+  extractFeishuEventId,
+} from "../update-command-guard.ts";
+
+describe("Feishu update command IDs", () => {
+  it("extracts and namespaces a card callback event_id", () => {
+    const eventId = extractFeishuEventId({
+      schema: "2.0",
+      header: { event_id: "evt_update_001" },
+      event: { action: { value: { action: "update" } } },
+    });
+
+    expect(buildUpdateCommandId("card", eventId)).toBe("card:evt_update_001");
+    expect(buildUpdateCommandId("message", "om_update_001")).toBe("message:om_update_001");
+  });
+});
+
+describe("acquireUpdateCommandGuard", () => {
+  let tempDir: string;
+  let guardFile: string;
+
+  beforeEach(async () => {
+    tempDir = await mkdtemp(join(tmpdir(), "chatccc-update-guard-"));
+    guardFile = join(tempDir, "state", "update-command-guard.json");
+  });
+
+  afterEach(async () => {
+    await rm(tempDir, { recursive: true, force: true });
+  });
+
+  it("persists an accepted update ID before returning", async () => {
+    const result = acquireUpdateCommandGuard({
+      filePath: guardFile,
+      commandId: "message:om_update_001",
+      now: 1_000,
+    });
+
+    expect(result).toEqual({ allowed: true, reason: "accepted" });
+    const saved = JSON.parse(await readFile(guardFile, "utf8"));
+    expect(saved).toEqual({
+      version: 1,
+      processed: [{ id: "message:om_update_001", recordedAt: 1_000 }],
+    });
+  });
+
+  it("rejects the same ID after a simulated process restart", () => {
+    expect(acquireUpdateCommandGuard({
+      filePath: guardFile,
+      commandId: "message:om_update_001",
+      now: 1_000,
+    }).allowed).toBe(true);
+
+    // 第二次调用不共享任何内存状态，只通过落盘文件模拟新进程重启后的判断。
+    expect(acquireUpdateCommandGuard({
+      filePath: guardFile,
+      commandId: "message:om_update_001",
+      now: 9_999_999,
+    })).toEqual({ allowed: false, reason: "duplicate_id" });
+  });
+
+  it("accepts different IDs immediately without a cooldown", () => {
+    expect(acquireUpdateCommandGuard({
+      filePath: guardFile,
+      commandId: "message:om_update_001",
+      now: 1_000,
+    }).allowed).toBe(true);
+
+    expect(acquireUpdateCommandGuard({
+      filePath: guardFile,
+      commandId: "message:om_update_002",
+      now: 1_001,
+    })).toEqual({ allowed: true, reason: "accepted" });
+  });
+
+  it("repairs a corrupt state file and warns without creating an update loop", async () => {
+    await mkdir(join(tempDir, "state"), { recursive: true });
+    await writeFile(guardFile, "not-json", "utf8");
+    const warn = vi.fn();
+
+    expect(acquireUpdateCommandGuard({
+      filePath: guardFile,
+      commandId: "message:om_update_001",
+      now: 1_000,
+      warn,
+    })).toEqual({ allowed: true, reason: "accepted" });
+    expect(warn).toHaveBeenCalledOnce();
+
+    // 损坏文件已被有效状态覆盖，因此重启后的重复投递仍会被拦截。
+    expect(acquireUpdateCommandGuard({
+      filePath: guardFile,
+      commandId: "message:om_update_001",
+      now: 2_000,
+      warn,
+    })).toEqual({ allowed: false, reason: "duplicate_id" });
+  });
+
+  it("fails closed when the accepted ID cannot be persisted", async () => {
+    const blocker = join(tempDir, "not-a-directory");
+    await writeFile(blocker, "block", "utf8");
+    const warn = vi.fn();
+
+    expect(acquireUpdateCommandGuard({
+      filePath: join(blocker, "update-command-guard.json"),
+      commandId: "message:om_update_001",
+      now: 1_000,
+      warn,
+    })).toEqual({ allowed: false, reason: "state_write_failed" });
+    expect(warn).toHaveBeenCalledOnce();
+  });
+
+  it("allows sources without a stable ID without writing a misleading record", async () => {
+    expect(acquireUpdateCommandGuard({
+      filePath: guardFile,
+      commandId: undefined,
+      now: 1_000,
+    })).toEqual({ allowed: true, reason: "missing_id" });
+    await expect(readFile(guardFile, "utf8")).rejects.toMatchObject({ code: "ENOENT" });
+  });
+
+  it("keeps only the newest configured number of update IDs", async () => {
+    for (let i = 0; i < 4; i++) {
+      expect(acquireUpdateCommandGuard({
+        filePath: guardFile,
+        commandId: `message:om_update_${i}`,
+        now: i,
+        maxEntries: 3,
+      }).allowed).toBe(true);
+    }
+
+    const saved = JSON.parse(await readFile(guardFile, "utf8"));
+    expect(saved.processed.map((entry: { id: string }) => entry.id)).toEqual([
+      "message:om_update_1",
+      "message:om_update_2",
+      "message:om_update_3",
+    ]);
+  });
+});