chatccc 0.2.201 → 0.2.203

package/src/__tests__/codex-reset-actions.test.ts

@@ -1,146 +1,146 @@
-import { beforeEach, describe, expect, it, vi } from "vitest";
-
-import {
-  _resetCodexResetRequestsForTest,
-  handleCodexResetCardAction,
-  type CodexResetActionDeps,
-} from "../codex-reset-actions.ts";
-
-function deps(): CodexResetActionDeps & {
-  getTenantAccessToken: ReturnType<typeof vi.fn>;
-  sendRawCard: ReturnType<typeof vi.fn>;
-  sendTextReply: ReturnType<typeof vi.fn>;
-  sendCardReply: ReturnType<typeof vi.fn>;
-  updateCardMessage: ReturnType<typeof vi.fn>;
-  recallMessage: ReturnType<typeof vi.fn>;
-  consumeCodexRateLimitResetCredit: ReturnType<typeof vi.fn>;
-  createRequestId: ReturnType<typeof vi.fn>;
-} {
-  return {
-    getTenantAccessToken: vi.fn(async () => "tenant-token"),
-    sendRawCard: vi.fn(async () => true),
-    sendTextReply: vi.fn(async () => true),
-    sendCardReply: vi.fn(async () => true),
-    updateCardMessage: vi.fn(async () => true),
-    recallMessage: vi.fn(async () => true),
-    consumeCodexRateLimitResetCredit: vi.fn(async () => ({ code: "reset" as const, windowsReset: 2 })),
-    createRequestId: vi.fn(() => "request-1"),
-  };
-}
-
-function event(value: Record<string, unknown>, messageId: string) {
-  return {
-    event: {
-      open_message_id: messageId,
-      open_chat_id: "chat-1",
-      operator: { open_id: "ou-user" },
-      action: { value },
-    },
-  };
-}
-
-describe("Codex reset card actions", () => {
-  beforeEach(() => {
-    _resetCodexResetRequestsForTest();
-  });
-
-  it("sends a confirmation card tied to the clicked usage card", async () => {
-    const d = deps();
-
-    await expect(handleCodexResetCardAction(
-      event({ action: "codex_reset_request" }, "usage-message"),
-      d,
-    )).resolves.toBe(true);
-
-    expect(d.sendRawCard).toHaveBeenCalledTimes(1);
-    expect(d.sendRawCard.mock.calls[0][1]).toBe("chat-1");
-    const confirmCard = JSON.parse(d.sendRawCard.mock.calls[0][2]);
-    const action = confirmCard.elements.find((element: any) => element.tag === "action");
-    expect(action.actions[0].value).toEqual({
-      action: "codex_reset_confirm",
-      decision: "yes",
-      parentMessageId: "usage-message",
-      requestId: "request-1",
-    });
-  });
-
-  it("consumes a reset credit, sends the result, and collapses the confirmation card when user confirms", async () => {
-    const d = deps();
-    await handleCodexResetCardAction(event({ action: "codex_reset_request" }, "usage-message"), d);
-
-    await expect(handleCodexResetCardAction(
-      event({
-        action: "codex_reset_confirm",
-        decision: "yes",
-        parentMessageId: "usage-message",
-        requestId: "request-1",
-      }, "confirm-message"),
-      d,
-    )).resolves.toBe(true);
-
-    expect(d.consumeCodexRateLimitResetCredit).toHaveBeenCalledWith("request-1");
-    expect(d.updateCardMessage).toHaveBeenCalledTimes(1);
-    expect(d.updateCardMessage.mock.calls[0][1]).toBe("confirm-message");
-    expect(JSON.parse(d.updateCardMessage.mock.calls[0][2]).elements).toEqual([
-      { tag: "markdown", content: " " },
-    ]);
-    expect(d.recallMessage).toHaveBeenCalledWith("tenant-token", "confirm-message");
-    expect(d.sendTextReply).toHaveBeenCalledWith(
-      "tenant-token",
-      "chat-1",
-      expect.stringContaining("重置成功"),
-    );
-    expect(d.sendCardReply).not.toHaveBeenCalled();
-  });
-
-  it("does not consume a reset credit and sends a cancellation message when user declines", async () => {
-    const d = deps();
-    await handleCodexResetCardAction(event({ action: "codex_reset_request" }, "usage-message"), d);
-
-    await expect(handleCodexResetCardAction(
-      event({
-        action: "codex_reset_confirm",
-        decision: "no",
-        parentMessageId: "usage-message",
-        requestId: "request-1",
-      }, "confirm-message"),
-      d,
-    )).resolves.toBe(true);
-
-    expect(d.consumeCodexRateLimitResetCredit).not.toHaveBeenCalled();
-    expect(d.updateCardMessage).toHaveBeenCalledTimes(1);
-    expect(d.recallMessage).toHaveBeenCalledWith("tenant-token", "confirm-message");
-    expect(d.sendTextReply).toHaveBeenCalledWith(
-      "tenant-token",
-      "chat-1",
-      "Codex 主动重置：用户取消了重置。",
-    );
-    expect(d.sendCardReply).not.toHaveBeenCalled();
-  });
-
-  it("can collapse a confirmation card using context.message_id fallback", async () => {
-    const d = deps();
-    await handleCodexResetCardAction(event({ action: "codex_reset_request" }, "usage-message"), d);
-
-    await expect(handleCodexResetCardAction({
-      event: {
-        context: {
-          message_id: "confirm-message-from-context",
-          open_chat_id: "chat-1",
-        },
-        action: {
-          value: {
-            action: "codex_reset_confirm",
-            decision: "no",
-            parentMessageId: "usage-message",
-            requestId: "request-1",
-          },
-        },
-      },
-    }, d)).resolves.toBe(true);
-
-    expect(d.updateCardMessage).toHaveBeenCalledTimes(1);
-    expect(d.updateCardMessage.mock.calls[0][1]).toBe("confirm-message-from-context");
-    expect(d.recallMessage).toHaveBeenCalledWith("tenant-token", "confirm-message-from-context");
-  });
-});
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+import {
+  _resetCodexResetRequestsForTest,
+  handleCodexResetCardAction,
+  type CodexResetActionDeps,
+} from "../codex-reset-actions.ts";
+
+function deps(): CodexResetActionDeps & {
+  getTenantAccessToken: ReturnType<typeof vi.fn>;
+  sendRawCard: ReturnType<typeof vi.fn>;
+  sendTextReply: ReturnType<typeof vi.fn>;
+  sendCardReply: ReturnType<typeof vi.fn>;
+  updateCardMessage: ReturnType<typeof vi.fn>;
+  recallMessage: ReturnType<typeof vi.fn>;
+  consumeCodexRateLimitResetCredit: ReturnType<typeof vi.fn>;
+  createRequestId: ReturnType<typeof vi.fn>;
+} {
+  return {
+    getTenantAccessToken: vi.fn(async () => "tenant-token"),
+    sendRawCard: vi.fn(async () => true),
+    sendTextReply: vi.fn(async () => true),
+    sendCardReply: vi.fn(async () => true),
+    updateCardMessage: vi.fn(async () => true),
+    recallMessage: vi.fn(async () => true),
+    consumeCodexRateLimitResetCredit: vi.fn(async () => ({ code: "reset" as const, windowsReset: 2 })),
+    createRequestId: vi.fn(() => "request-1"),
+  };
+}
+
+function event(value: Record<string, unknown>, messageId: string) {
+  return {
+    event: {
+      open_message_id: messageId,
+      open_chat_id: "chat-1",
+      operator: { open_id: "ou-user" },
+      action: { value },
+    },
+  };
+}
+
+describe("Codex reset card actions", () => {
+  beforeEach(() => {
+    _resetCodexResetRequestsForTest();
+  });
+
+  it("sends a confirmation card tied to the clicked usage card", async () => {
+    const d = deps();
+
+    await expect(handleCodexResetCardAction(
+      event({ action: "codex_reset_request" }, "usage-message"),
+      d,
+    )).resolves.toBe(true);
+
+    expect(d.sendRawCard).toHaveBeenCalledTimes(1);
+    expect(d.sendRawCard.mock.calls[0][1]).toBe("chat-1");
+    const confirmCard = JSON.parse(d.sendRawCard.mock.calls[0][2]);
+    const action = confirmCard.elements.find((element: any) => element.tag === "action");
+    expect(action.actions[0].value).toEqual({
+      action: "codex_reset_confirm",
+      decision: "yes",
+      parentMessageId: "usage-message",
+      requestId: "request-1",
+    });
+  });
+
+  it("consumes a reset credit, sends the result, and collapses the confirmation card when user confirms", async () => {
+    const d = deps();
+    await handleCodexResetCardAction(event({ action: "codex_reset_request" }, "usage-message"), d);
+
+    await expect(handleCodexResetCardAction(
+      event({
+        action: "codex_reset_confirm",
+        decision: "yes",
+        parentMessageId: "usage-message",
+        requestId: "request-1",
+      }, "confirm-message"),
+      d,
+    )).resolves.toBe(true);
+
+    expect(d.consumeCodexRateLimitResetCredit).toHaveBeenCalledWith("request-1");
+    expect(d.updateCardMessage).toHaveBeenCalledTimes(1);
+    expect(d.updateCardMessage.mock.calls[0][1]).toBe("confirm-message");
+    expect(JSON.parse(d.updateCardMessage.mock.calls[0][2]).elements).toEqual([
+      { tag: "markdown", content: " " },
+    ]);
+    expect(d.recallMessage).toHaveBeenCalledWith("tenant-token", "confirm-message");
+    expect(d.sendTextReply).toHaveBeenCalledWith(
+      "tenant-token",
+      "chat-1",
+      expect.stringContaining("重置成功"),
+    );
+    expect(d.sendCardReply).not.toHaveBeenCalled();
+  });
+
+  it("does not consume a reset credit and sends a cancellation message when user declines", async () => {
+    const d = deps();
+    await handleCodexResetCardAction(event({ action: "codex_reset_request" }, "usage-message"), d);
+
+    await expect(handleCodexResetCardAction(
+      event({
+        action: "codex_reset_confirm",
+        decision: "no",
+        parentMessageId: "usage-message",
+        requestId: "request-1",
+      }, "confirm-message"),
+      d,
+    )).resolves.toBe(true);
+
+    expect(d.consumeCodexRateLimitResetCredit).not.toHaveBeenCalled();
+    expect(d.updateCardMessage).toHaveBeenCalledTimes(1);
+    expect(d.recallMessage).toHaveBeenCalledWith("tenant-token", "confirm-message");
+    expect(d.sendTextReply).toHaveBeenCalledWith(
+      "tenant-token",
+      "chat-1",
+      "Codex 主动重置：用户取消了重置。",
+    );
+    expect(d.sendCardReply).not.toHaveBeenCalled();
+  });
+
+  it("can collapse a confirmation card using context.message_id fallback", async () => {
+    const d = deps();
+    await handleCodexResetCardAction(event({ action: "codex_reset_request" }, "usage-message"), d);
+
+    await expect(handleCodexResetCardAction({
+      event: {
+        context: {
+          message_id: "confirm-message-from-context",
+          open_chat_id: "chat-1",
+        },
+        action: {
+          value: {
+            action: "codex_reset_confirm",
+            decision: "no",
+            parentMessageId: "usage-message",
+            requestId: "request-1",
+          },
+        },
+      },
+    }, d)).resolves.toBe(true);
+
+    expect(d.updateCardMessage).toHaveBeenCalledTimes(1);
+    expect(d.updateCardMessage.mock.calls[0][1]).toBe("confirm-message-from-context");
+    expect(d.recallMessage).toHaveBeenCalledWith("tenant-token", "confirm-message-from-context");
+  });
+});

package/src/__tests__/config-reload.test.ts

@@ -45,12 +45,12 @@ const baseAppConfig: AppConfig = {
   port: 18080,
   gitTimeoutSeconds: 180,
   allowInterrupt: false,
-  rawStreamLogs: {
-    claude: { enabled: false, maxBytesPerTurn: 52_428_800, retentionDays: 7, keepCompleted: false },
-    cursor: { enabled: false, maxBytesPerTurn: 52_428_800, retentionDays: 7, keepCompleted: false },
-    codex: { enabled: false, maxBytesPerTurn: 52_428_800, retentionDays: 7, keepCompleted: false },
-    ccc: { enabled: false, maxBytesPerTurn: 52_428_800, retentionDays: 7, keepCompleted: false },
-  },
+  rawStreamLogs: {
+    claude: { enabled: false, maxBytesPerTurn: 52_428_800, retentionDays: 7, keepCompleted: false },
+    cursor: { enabled: false, maxBytesPerTurn: 52_428_800, retentionDays: 7, keepCompleted: false },
+    codex: { enabled: false, maxBytesPerTurn: 52_428_800, retentionDays: 7, keepCompleted: false },
+    ccc: { enabled: false, maxBytesPerTurn: 52_428_800, retentionDays: 7, keepCompleted: false },
+  },
   claude: {
     enabled: true,
     defaultAgent: true,
@@ -69,10 +69,10 @@ const baseAppConfig: AppConfig = {
     alternativeModel: "initial-cursor-alt-model",
     avatarBatteryMode: "apiPercent",
     onDemandMonthlyBudget: 1000,
-  },
-  codex: { enabled: true, defaultAgent: false, path: "/initial/codex", model: "initial-codex-model", alternativeModel: "initial-codex-alt-model", effort: "initial-codex-effort" },
-  ccc: { DEEPSEEK_API_KEY: "initial-ccc-key", DEEPSEEK_BASE_URL: "https://initial.deepseek.test/v1", model: "initial-ccc-model" },
-};
+  },
+  codex: { enabled: true, defaultAgent: false, path: "/initial/codex", model: "initial-codex-model", alternativeModel: "initial-codex-alt-model", effort: "initial-codex-effort" },
+  ccc: { DEEPSEEK_API_KEY: "initial-ccc-key", DEEPSEEK_BASE_URL: "https://initial.deepseek.test/v1", model: "initial-ccc-model" },
+};
 
 // 把 module 状态抢救快照：每个 it 跑前重置回这个状态，避免污染相邻测试。
 // 不直接用启动时的 config 引用做 snapshot——它可能已经被前一个 it 改写。

package/src/__tests__/config-sample.test.ts

@@ -28,29 +28,29 @@ describe("config.sample.json", () => {
     expect(sample.claude?.subagentModel).toBe("");
   });
 
-  it("leaves Cursor and Codex alternative models empty by default", () => {
+  it("leaves Cursor and Codex alternative models empty by default", () => {
     const configSamplePath = join(process.cwd(), "config.sample.json");
     const sample = JSON.parse(readFileSync(configSamplePath, "utf8")) as {
       cursor?: { alternativeModel?: unknown };
       codex?: { alternativeModel?: unknown };
     };
 
-    expect(sample.cursor?.alternativeModel).toBe("");
-    expect(sample.codex?.alternativeModel).toBe("");
-  });
-
-  it("sets ccc agent DeepSeek defaults in the sample config", () => {
-    const configSamplePath = join(process.cwd(), "config.sample.json");
-    const sample = JSON.parse(readFileSync(configSamplePath, "utf8")) as {
-      ccc?: { DEEPSEEK_API_KEY?: unknown; DEEPSEEK_BASE_URL?: unknown; model?: unknown };
-    };
-
-    expect(sample.ccc?.DEEPSEEK_API_KEY).toBe("");
-    expect(sample.ccc?.DEEPSEEK_BASE_URL).toBe("https://api.deepseek.com/v1");
-    expect(sample.ccc?.model).toBe("deepseek-v4-pro");
-  });
-
-  it("keeps Chrome CDP guard disabled by default with port 15166", () => {
+    expect(sample.cursor?.alternativeModel).toBe("");
+    expect(sample.codex?.alternativeModel).toBe("");
+  });
+
+  it("sets ccc agent DeepSeek defaults in the sample config", () => {
+    const configSamplePath = join(process.cwd(), "config.sample.json");
+    const sample = JSON.parse(readFileSync(configSamplePath, "utf8")) as {
+      ccc?: { DEEPSEEK_API_KEY?: unknown; DEEPSEEK_BASE_URL?: unknown; model?: unknown };
+    };
+
+    expect(sample.ccc?.DEEPSEEK_API_KEY).toBe("");
+    expect(sample.ccc?.DEEPSEEK_BASE_URL).toBe("https://api.deepseek.com/v1");
+    expect(sample.ccc?.model).toBe("deepseek-v4-pro");
+  });
+
+  it("keeps Chrome CDP guard disabled by default with port 15166", () => {
     const configSamplePath = join(process.cwd(), "config.sample.json");
     const sample = JSON.parse(readFileSync(configSamplePath, "utf8")) as {
       chromeDevtools?: { enabled?: unknown; port?: unknown; chromePath?: unknown };
@@ -72,7 +72,7 @@ describe("config.sample.json", () => {
       }>;
     };
 
-    for (const tool of ["claude", "cursor", "codex", "ccc"]) {
+    for (const tool of ["claude", "cursor", "codex", "ccc"]) {
       expect(sample.rawStreamLogs?.[tool]?.enabled).toBe(false);
       expect(sample.rawStreamLogs?.[tool]?.maxBytesPerTurn).toBe(52_428_800);
       expect(sample.rawStreamLogs?.[tool]?.retentionDays).toBe(7);