chatccc 0.2.199 → 0.2.200

package/src/__tests__/feishu-avatar.test.ts

@@ -1,4 +1,4 @@
-import { mkdir, mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
+import { mkdir, mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 
@@ -68,7 +68,7 @@ function mockAvatarFetch(uploadedNames: string[], usageResponse: Response): void
   }));
 }
 
-function mockAvatarUploadOnlyFetch(uploadedNames: string[]): ReturnType<typeof vi.fn> {
+function mockAvatarUploadOnlyFetch(uploadedNames: string[]): ReturnType<typeof vi.fn> {
   const fetchMock = vi.fn(async (url: string | URL | Request, init?: RequestInit) => {
     const urlText = String(url);
     if (urlText === "https://open.feishu.test/im/v1/images") {
@@ -83,44 +83,44 @@ function mockAvatarUploadOnlyFetch(uploadedNames: string[]): ReturnType<typeof v
     throw new Error(`unexpected fetch: ${urlText}`);
   });
   vi.stubGlobal("fetch", fetchMock);
-  return fetchMock;
-}
-
-describe("Plain avatar fallback", () => {
-  afterEach(() => {
-    vi.unstubAllGlobals();
-    vi.doUnmock("node:os");
-    vi.doUnmock("../config.ts");
-    vi.doUnmock("../cursor-usage.ts");
-    vi.restoreAllMocks();
-    getCursorUsageSummaryMock.mockReset();
-    mockConfig.cursor.avatarBatteryMode = "apiPercent";
-    mockConfig.cursor.onDemandMonthlyBudget = 1000;
-  });
-
-  it("uses a status-only avatar for unknown tools instead of falling back to Claude", async () => {
-    const homeDir = await mkdtemp(join(tmpdir(), "chatccc-avatar-home-"));
-    const userDataDir = await mkdtemp(join(tmpdir(), "chatccc-avatar-data-"));
-    const uploadedNames: string[] = [];
-    mockAvatarUploadOnlyFetch(uploadedNames);
-
-    try {
-      const { setChatAvatar } = await loadFeishuApiWithHome(homeDir, userDataDir);
-      await setChatAvatar("tenant-token", "chat_1", "ccc", "new");
-
-      expect(uploadedNames).toEqual(["avatar_plain_new.jpg"]);
-      const cacheRaw = await readFile(join(userDataDir, "state", "avatar-image-keys.json"), "utf-8");
-      const cache = JSON.parse(cacheRaw) as Record<string, string>;
-      expect(cache["plain:new"]).toBe("img_test");
-      expect(cache["claude:new"]).toBeUndefined();
-    } finally {
-      await rm(homeDir, { recursive: true, force: true });
-      await rm(userDataDir, { recursive: true, force: true });
-    }
-  });
-});
-
-describe("Codex avatar usage battery", () => {
+  return fetchMock;
+}
+
+describe("Plain avatar fallback", () => {
+  afterEach(() => {
+    vi.unstubAllGlobals();
+    vi.doUnmock("node:os");
+    vi.doUnmock("../config.ts");
+    vi.doUnmock("../cursor-usage.ts");
+    vi.restoreAllMocks();
+    getCursorUsageSummaryMock.mockReset();
+    mockConfig.cursor.avatarBatteryMode = "apiPercent";
+    mockConfig.cursor.onDemandMonthlyBudget = 1000;
+  });
+
+  it("uses a status-only avatar for unknown tools instead of falling back to Claude", async () => {
+    const homeDir = await mkdtemp(join(tmpdir(), "chatccc-avatar-home-"));
+    const userDataDir = await mkdtemp(join(tmpdir(), "chatccc-avatar-data-"));
+    const uploadedNames: string[] = [];
+    mockAvatarUploadOnlyFetch(uploadedNames);
+
+    try {
+      const { setChatAvatar } = await loadFeishuApiWithHome(homeDir, userDataDir);
+      await setChatAvatar("tenant-token", "chat_1", "ccc", "new");
+
+      expect(uploadedNames).toEqual(["avatar_plain_new.jpg"]);
+      const cacheRaw = await readFile(join(userDataDir, "state", "avatar-image-keys.json"), "utf-8");
+      const cache = JSON.parse(cacheRaw) as Record<string, string>;
+      expect(cache["plain:new"]).toBe("img_test");
+      expect(cache["claude:new"]).toBeUndefined();
+    } finally {
+      await rm(homeDir, { recursive: true, force: true });
+      await rm(userDataDir, { recursive: true, force: true });
+    }
+  });
+});
+
+describe("Codex avatar usage battery", () => {
   afterEach(() => {
     vi.unstubAllGlobals();
     vi.doUnmock("node:os");
@@ -132,15 +132,15 @@ describe("Codex avatar usage battery", () => {
     mockConfig.cursor.onDemandMonthlyBudget = 1000;
   });
 
-  it("adds weekly battery and 5h ring percentages to Codex avatar uploads when usage lookup succeeds", async () => {
+  it("adds 7-day battery and 5h ring percentages to Codex avatar uploads when both windows exist", async () => {
     const homeDir = await mkdtemp(join(tmpdir(), "chatccc-avatar-home-"));
     const userDataDir = await mkdtemp(join(tmpdir(), "chatccc-avatar-data-"));
     const uploadedNames: string[] = [];
     await writeCodexAuth(homeDir);
     mockAvatarFetch(uploadedNames, new Response(JSON.stringify({
       rate_limit: {
-        primary_window: { used_percent: 37 },
-        secondary_window: { used_percent: 12 },
+        primary_window: { used_percent: 37, limit_window_seconds: 18000 },
+        secondary_window: { used_percent: 12, limit_window_seconds: 604800 },
       },
     }), { status: 200 }));
 
@@ -148,7 +148,49 @@ describe("Codex avatar usage battery", () => {
       const { setChatAvatar } = await loadFeishuApiWithHome(homeDir, userDataDir);
       await setChatAvatar("tenant-token", "chat_1", "codex", "busy");
 
-      expect(uploadedNames).toEqual(["avatar_codex_busy_week_88_5h_63.jpg"]);
+      expect(uploadedNames).toEqual(["avatar_codex_busy_7d_88_5h_63.jpg"]);
+    } finally {
+      await rm(homeDir, { recursive: true, force: true });
+      await rm(userDataDir, { recursive: true, force: true });
+    }
+  });
+
+  it("uses a 7-day battery without a 5h ring when the API only returns a 7-day window", async () => {
+    const homeDir = await mkdtemp(join(tmpdir(), "chatccc-avatar-home-"));
+    const userDataDir = await mkdtemp(join(tmpdir(), "chatccc-avatar-data-"));
+    const uploadedNames: string[] = [];
+    await writeCodexAuth(homeDir);
+    mockAvatarFetch(uploadedNames, new Response(JSON.stringify({
+      rate_limit: {
+        primary_window: {
+          used_percent: 23,
+          limit_window_seconds: 604800,
+          reset_after_seconds: 500000,
+          reset_at: 1784510226,
+        },
+        secondary_window: null,
+      },
+    }), { status: 200 }));
+
+    try {
+      const { getCodexUsageSummary, setChatAvatar } = await loadFeishuApiWithHome(homeDir, userDataDir);
+
+      await expect(getCodexUsageSummary()).resolves.toEqual({
+        fiveHour: null,
+        weekly: {
+          usedPercent: 23,
+          remainingPercent: 77,
+          resetAfterSeconds: 500000,
+          resetAtEpochSeconds: 1784510226,
+          limitWindowSeconds: 604800,
+        },
+        rateLimitResetCreditsAvailable: null,
+        rateLimitResetCredits: [],
+      });
+
+      await setChatAvatar("tenant-token", "chat_1", "codex", "busy");
+
+      expect(uploadedNames).toEqual(["avatar_codex_busy_7d_77.jpg"]);
     } finally {
       await rm(homeDir, { recursive: true, force: true });
       await rm(userDataDir, { recursive: true, force: true });
@@ -172,7 +214,7 @@ describe("Codex avatar usage battery", () => {
         },
       });
 
-      expect(uploadedNames).toEqual(["avatar_codex_busy_week_88_5h_63.jpg"]);
+      expect(uploadedNames).toEqual(["avatar_codex_busy_7d_88_5h_63.jpg"]);
       expect(fetchMock).not.toHaveBeenCalledWith("https://chatgpt.com/backend-api/wham/usage", expect.anything());
     } finally {
       await rm(homeDir, { recursive: true, force: true });

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

@@ -1,5 +1,5 @@
 import { describe, it, expect, beforeAll, afterAll } from "vitest";
-import { getPlatform, setPlatform, getTenantAccessToken, getChatInfo, createGroupChat, updateChatInfo, sendTextReply, sendCardReply, sendRawCard, sendPostMessage, extractSessionInfo, formatDelayNotice, reportPermissionResults, verifyAllPermissions, addReaction, recallMessage, updateCardMessage, setChatAvatar, getCodexUsageSummary, consumeCodexRateLimitResetCredit, disbandChat, sendRestartCard, getMergeForwardMessages } from "../feishu-platform.ts";
+import { getPlatform, setPlatform, getTenantAccessToken, getChatInfo, createGroupChat, updateChatInfo, sendTextReply, sendCardReply, sendRawCard, sendPostMessage, extractSessionInfo, formatDelayNotice, reportPermissionResults, verifyAllPermissions, addReaction, recallMessage, updateCardMessage, setChatAvatar, getCodexUsageSummary, consumeCodexRateLimitResetCredit, disbandChat, sendRestartCard, getMergeForwardMessages } from "../feishu-platform.ts";
 import type { FeishuPlatform } from "../feishu-platform.ts";
 
 const realPlatform = getPlatform();
@@ -26,16 +26,16 @@ describe("feishu-platform", () => {
       createGroupChat: async () => "mock_chat",
       updateChatInfo: async () => {},
       getChatInfo: async () => ({ name: "x", description: "y" }),
-      disbandChat: async () => {},
-      setChatAvatar: async () => {},
-      getCodexUsageSummary: async () => ({
-        fiveHour: { usedPercent: 10, remainingPercent: 90, resetAtEpochSeconds: 1781528212, resetAfterSeconds: 10349 },
-        weekly: { usedPercent: 20, remainingPercent: 80, resetAtEpochSeconds: 1781842926, resetAfterSeconds: 325063 },
-        rateLimitResetCreditsAvailable: 1,
-        rateLimitResetCredits: [{ grantedAt: null, expiresAt: "2026-07-12T04:01:47.770016Z" }],
-      }),
-      consumeCodexRateLimitResetCredit: async () => ({ code: "reset", windowsReset: 2 }),
-      getOrDownloadImage: async () => "/tmp/img.png",
+      disbandChat: async () => {},
+      setChatAvatar: async () => {},
+      getCodexUsageSummary: async () => ({
+        fiveHour: { usedPercent: 10, remainingPercent: 90, resetAtEpochSeconds: 1781528212, resetAfterSeconds: 10349 },
+        weekly: { usedPercent: 20, remainingPercent: 80, resetAtEpochSeconds: 1781842926, resetAfterSeconds: 325063 },
+        rateLimitResetCreditsAvailable: 1,
+        rateLimitResetCredits: [{ grantedAt: null, expiresAt: "2026-07-12T04:01:47.770016Z" }],
+      }),
+      consumeCodexRateLimitResetCredit: async () => ({ code: "reset", windowsReset: 2 }),
+      getOrDownloadImage: async () => "/tmp/img.png",
       verifyAllPermissions: async () => [],
       reportPermissionResults: realPlatform.reportPermissionResults,
       extractSessionInfo: realPlatform.extractSessionInfo,
@@ -53,16 +53,16 @@ describe("feishu-platform", () => {
       expect(await getChatInfo("t", "mock_chat")).toEqual({ name: "x", description: "y" });
       const perms = await verifyAllPermissions("t");
       expect(perms).toEqual([]);
-      const mergeMsgs = await getMergeForwardMessages("t", "om_test");
-      expect(mergeMsgs).toEqual([]);
-      expect(await getCodexUsageSummary()).toEqual({
-        fiveHour: { usedPercent: 10, remainingPercent: 90, resetAtEpochSeconds: 1781528212, resetAfterSeconds: 10349 },
-        weekly: { usedPercent: 20, remainingPercent: 80, resetAtEpochSeconds: 1781842926, resetAfterSeconds: 325063 },
-        rateLimitResetCreditsAvailable: 1,
-        rateLimitResetCredits: [{ grantedAt: null, expiresAt: "2026-07-12T04:01:47.770016Z" }],
-      });
-      expect(await consumeCodexRateLimitResetCredit("request-1")).toEqual({ code: "reset", windowsReset: 2 });
-    } finally {
+      const mergeMsgs = await getMergeForwardMessages("t", "om_test");
+      expect(mergeMsgs).toEqual([]);
+      expect(await getCodexUsageSummary()).toEqual({
+        fiveHour: { usedPercent: 10, remainingPercent: 90, resetAtEpochSeconds: 1781528212, resetAfterSeconds: 10349 },
+        weekly: { usedPercent: 20, remainingPercent: 80, resetAtEpochSeconds: 1781842926, resetAfterSeconds: 325063 },
+        rateLimitResetCreditsAvailable: 1,
+        rateLimitResetCredits: [{ grantedAt: null, expiresAt: "2026-07-12T04:01:47.770016Z" }],
+      });
+      expect(await consumeCodexRateLimitResetCredit("request-1")).toEqual({ code: "reset", windowsReset: 2 });
+    } finally {
       // 恢复到真实实现，避免影响后续测试
       setPlatform(realPlatform);
     }
@@ -72,4 +72,4 @@ describe("feishu-platform", () => {
     setPlatform(realPlatform);
     expect(getPlatform()).toBe(realPlatform);
   });
-});
+});

package/src/__tests__/format-message.test.ts

@@ -11,52 +11,52 @@ vi.mock("../feishu-platform.ts", () => ({
   getMergeForwardMessages: (...args: unknown[]) => mockGetMergeForwardMessages(...args),
 }));
 
-import { formatMessageContent, formatPostContent, formatMergeForward } from "../format-message.ts";
-
-describe("formatMessageContent mixed post images", () => {
-  beforeEach(() => {
-    vi.clearAllMocks();
-    mockGetTenantAccessToken.mockResolvedValue("mock_token");
-  });
-
-  it("includes downloaded images from mixed post messages", async () => {
-    mockGetOrDownloadImage.mockResolvedValue("C:\\tmp\\img_001.png");
-
-    const result = await formatMessageContent({
-      message_id: "om_post",
-      message_type: "post",
-      content: JSON.stringify({
-        content: [[
-          { tag: "text", text: "use this image" },
-          { tag: "img", image_key: "img_001" },
-        ]],
-      }),
-    });
-
-    expect(result).toBe("use this image\n[图片] C:\\tmp\\img_001.png");
-    expect(mockGetTenantAccessToken).toHaveBeenCalled();
-    expect(mockGetOrDownloadImage).toHaveBeenCalledWith("mock_token", "om_post", "img_001");
-  });
-
-  it("keeps post image key when mixed post image download fails", async () => {
-    mockGetOrDownloadImage.mockRejectedValue(new Error("download failed"));
-
-    const result = await formatMessageContent({
-      message_id: "om_post",
-      message_type: "post",
-      content: JSON.stringify({
-        content: [[
-          { tag: "text", text: "caption" },
-          { tag: "img", image_key: "img_002" },
-        ]],
-      }),
-    });
-
-    expect(result).toBe("caption\n[图片: img_002]");
-  });
-});
-
-describe("formatMessageContent", () => {
+import { formatMessageContent, formatPostContent, formatMergeForward } from "../format-message.ts";
+
+describe("formatMessageContent mixed post images", () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    mockGetTenantAccessToken.mockResolvedValue("mock_token");
+  });
+
+  it("includes downloaded images from mixed post messages", async () => {
+    mockGetOrDownloadImage.mockResolvedValue("C:\\tmp\\img_001.png");
+
+    const result = await formatMessageContent({
+      message_id: "om_post",
+      message_type: "post",
+      content: JSON.stringify({
+        content: [[
+          { tag: "text", text: "use this image" },
+          { tag: "img", image_key: "img_001" },
+        ]],
+      }),
+    });
+
+    expect(result).toBe("use this image\n[图片] C:\\tmp\\img_001.png");
+    expect(mockGetTenantAccessToken).toHaveBeenCalled();
+    expect(mockGetOrDownloadImage).toHaveBeenCalledWith("mock_token", "om_post", "img_001");
+  });
+
+  it("keeps post image key when mixed post image download fails", async () => {
+    mockGetOrDownloadImage.mockRejectedValue(new Error("download failed"));
+
+    const result = await formatMessageContent({
+      message_id: "om_post",
+      message_type: "post",
+      content: JSON.stringify({
+        content: [[
+          { tag: "text", text: "caption" },
+          { tag: "img", image_key: "img_002" },
+        ]],
+      }),
+    });
+
+    expect(result).toBe("caption\n[图片: img_002]");
+  });
+});
+
+describe("formatMessageContent", () => {
   beforeEach(() => {
     vi.clearAllMocks();
     mockGetTenantAccessToken.mockResolvedValue("mock_token");
@@ -313,4 +313,4 @@ describe("formatPostContent", () => {
     const result = formatPostContent({ content: [null, undefined, "string"] });
     expect(result).toBe("");
   });
-});
+});

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

@@ -1,79 +1,79 @@
-import { PassThrough } from "node:stream";
-
-import { afterEach, describe, expect, it, vi } from "vitest";
-
-import {
-  BadJsonIdleTimeoutError,
-  readJsonLinesWithBadJsonIdleWatchdog,
-} from "../adapters/jsonl-stream.ts";
-
-function createReader(input: PassThrough, idleTimeoutMs = 100): AsyncIterator<unknown> {
-  return readJsonLinesWithBadJsonIdleWatchdog({
-    input,
-    tool: "test-agent",
-    tag: "sid-test",
-    idleTimeoutMs,
-    parse: (line) => JSON.parse(line) as unknown,
-  })[Symbol.asyncIterator]();
-}
-
-afterEach(() => {
-  vi.useRealTimers();
-});
-
-describe("readJsonLinesWithBadJsonIdleWatchdog", () => {
-  it("throws when a JSON-like bad line remains the last stdout past the idle timeout", async () => {
-    vi.useFakeTimers();
-    const input = new PassThrough();
-    const iterator = createReader(input);
-
-    const pending = iterator.next().catch((error: unknown) => error);
-    input.write("{\"type\":\"tool_call\",\"subtype\":\"started\"\n");
-
-    await vi.advanceTimersByTimeAsync(100);
-
-    const error = await pending;
-    expect(error).toBeInstanceOf(BadJsonIdleTimeoutError);
-    expect(error).toMatchObject({
-      code: "BAD_JSON_IDLE_TIMEOUT",
-      tool: "test-agent",
-      tag: "sid-test",
-    });
-  });
-
-  it("does not throw when a valid JSON line arrives after the bad line before timeout", async () => {
-    vi.useFakeTimers();
-    const input = new PassThrough();
-    const iterator = createReader(input);
-
-    const pending = iterator.next();
-    input.write("{\"type\":\"tool_call\"\n");
-    await vi.advanceTimersByTimeAsync(50);
-    input.write("{\"type\":\"ok\"}\n");
-
-    await expect(pending).resolves.toEqual({
-      done: false,
-      value: { type: "ok" },
-    });
-
-    const done = iterator.next();
-    input.end();
-    await expect(done).resolves.toEqual({ done: true, value: undefined });
-  });
-
-  it("ignores non-JSON banner lines for the bad JSON idle watchdog", async () => {
-    vi.useFakeTimers();
-    const input = new PassThrough();
-    const iterator = createReader(input);
-
-    const pending = iterator.next();
-    input.write("Reading prompt from stdin...\n");
-    await vi.advanceTimersByTimeAsync(200);
-    input.write("{\"type\":\"ok\"}\n");
-
-    await expect(pending).resolves.toEqual({
-      done: false,
-      value: { type: "ok" },
-    });
-  });
-});
+import { PassThrough } from "node:stream";
+
+import { afterEach, describe, expect, it, vi } from "vitest";
+
+import {
+  BadJsonIdleTimeoutError,
+  readJsonLinesWithBadJsonIdleWatchdog,
+} from "../adapters/jsonl-stream.ts";
+
+function createReader(input: PassThrough, idleTimeoutMs = 100): AsyncIterator<unknown> {
+  return readJsonLinesWithBadJsonIdleWatchdog({
+    input,
+    tool: "test-agent",
+    tag: "sid-test",
+    idleTimeoutMs,
+    parse: (line) => JSON.parse(line) as unknown,
+  })[Symbol.asyncIterator]();
+}
+
+afterEach(() => {
+  vi.useRealTimers();
+});
+
+describe("readJsonLinesWithBadJsonIdleWatchdog", () => {
+  it("throws when a JSON-like bad line remains the last stdout past the idle timeout", async () => {
+    vi.useFakeTimers();
+    const input = new PassThrough();
+    const iterator = createReader(input);
+
+    const pending = iterator.next().catch((error: unknown) => error);
+    input.write("{\"type\":\"tool_call\",\"subtype\":\"started\"\n");
+
+    await vi.advanceTimersByTimeAsync(100);
+
+    const error = await pending;
+    expect(error).toBeInstanceOf(BadJsonIdleTimeoutError);
+    expect(error).toMatchObject({
+      code: "BAD_JSON_IDLE_TIMEOUT",
+      tool: "test-agent",
+      tag: "sid-test",
+    });
+  });
+
+  it("does not throw when a valid JSON line arrives after the bad line before timeout", async () => {
+    vi.useFakeTimers();
+    const input = new PassThrough();
+    const iterator = createReader(input);
+
+    const pending = iterator.next();
+    input.write("{\"type\":\"tool_call\"\n");
+    await vi.advanceTimersByTimeAsync(50);
+    input.write("{\"type\":\"ok\"}\n");
+
+    await expect(pending).resolves.toEqual({
+      done: false,
+      value: { type: "ok" },
+    });
+
+    const done = iterator.next();
+    input.end();
+    await expect(done).resolves.toEqual({ done: true, value: undefined });
+  });
+
+  it("ignores non-JSON banner lines for the bad JSON idle watchdog", async () => {
+    vi.useFakeTimers();
+    const input = new PassThrough();
+    const iterator = createReader(input);
+
+    const pending = iterator.next();
+    input.write("Reading prompt from stdin...\n");
+    await vi.advanceTimersByTimeAsync(200);
+    input.write("{\"type\":\"ok\"}\n");
+
+    await expect(pending).resolves.toEqual({
+      done: false,
+      value: { type: "ok" },
+    });
+  });
+});