chatccc 0.2.187 → 0.2.189

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

@@ -39,23 +39,23 @@ async function loadFeishuApiWithHome(homeDir: string, userDataDir: string) {
 async function writeCodexAuth(homeDir: string): Promise<void> {
   const codexDir = join(homeDir, ".codex");
   await mkdir(codexDir, { recursive: true });
-  await writeFile(
-    join(codexDir, "auth.json"),
-    JSON.stringify({ tokens: { access_token: "codex-access-token", account_id: "codex-account-id" } }),
-    "utf-8",
-  );
-}
+  await writeFile(
+    join(codexDir, "auth.json"),
+    JSON.stringify({ tokens: { access_token: "codex-access-token", account_id: "codex-account-id" } }),
+    "utf-8",
+  );
+}
 
 function mockAvatarFetch(uploadedNames: string[], usageResponse: Response): void {
   vi.stubGlobal("fetch", vi.fn(async (url: string | URL | Request, init?: RequestInit) => {
     const urlText = String(url);
-    if (urlText === "https://chatgpt.com/backend-api/wham/usage") {
-      return usageResponse.clone();
-    }
-    if (urlText === "https://chatgpt.com/backend-api/wham/rate-limit-reset-credits") {
-      return new Response(JSON.stringify({ credits: [] }), { status: 200 });
-    }
-    if (urlText === "https://open.feishu.test/im/v1/images") {
+    if (urlText === "https://chatgpt.com/backend-api/wham/usage") {
+      return usageResponse.clone();
+    }
+    if (urlText === "https://chatgpt.com/backend-api/wham/rate-limit-reset-credits") {
+      return new Response(JSON.stringify({ credits: [] }), { status: 200 });
+    }
+    if (urlText === "https://open.feishu.test/im/v1/images") {
       const form = init?.body as FormData;
       const image = form.get("image") as File;
       uploadedNames.push(image.name);
@@ -68,6 +68,24 @@ function mockAvatarFetch(uploadedNames: string[], usageResponse: Response): void
   }));
 }
 
+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") {
+      const form = init?.body as FormData;
+      const image = form.get("image") as File;
+      uploadedNames.push(image.name);
+      return new Response(JSON.stringify({ code: 0, data: { image_key: "img_test" } }), { status: 200 });
+    }
+    if (urlText === "https://open.feishu.test/im/v1/chats/chat_1") {
+      return new Response(JSON.stringify({ code: 0 }), { status: 200 });
+    }
+    throw new Error(`unexpected fetch: ${urlText}`);
+  });
+  vi.stubGlobal("fetch", fetchMock);
+  return fetchMock;
+}
+
 describe("Codex avatar usage battery", () => {
   afterEach(() => {
     vi.unstubAllGlobals();
@@ -103,109 +121,134 @@ describe("Codex avatar usage battery", () => {
     }
   });
 
-  it("returns both usage windows and available reset credit expiries", async () => {
-    const homeDir = await mkdtemp(join(tmpdir(), "chatccc-avatar-home-"));
-    const userDataDir = await mkdtemp(join(tmpdir(), "chatccc-avatar-data-"));
-    await writeCodexAuth(homeDir);
-    const fetchMock = vi.fn(async (url: string | URL | Request) => {
-      const urlText = String(url);
-      if (urlText === "https://chatgpt.com/backend-api/wham/usage") {
-        return new Response(JSON.stringify({
-          rate_limit: {
-            primary_window: { used_percent: 37, reset_after_seconds: 10349, reset_at: 1781528212 },
-            secondary_window: { used_percent: 12, reset_after_seconds: 325063, reset_at: 1781842926 },
-          },
-          rate_limit_reset_credits: { available_count: 1 },
-        }), { status: 200 });
-      }
-      if (urlText === "https://chatgpt.com/backend-api/wham/rate-limit-reset-credits") {
-        return new Response(JSON.stringify({
-          available_count: 2,
-          credits: [
-            {
-              status: "available",
-              granted_at: "2026-06-12T04:01:47.770016Z",
-              expires_at: "2026-07-12T04:01:47.770016Z",
-            },
-            {
-              status: "redeemed",
-              granted_at: "2026-06-13T04:01:47.770016Z",
-              expires_at: "2026-07-13T04:01:47.770016Z",
-            },
-            {
-              status: "available",
-              granted_at: "2026-06-18T00:44:23.904386Z",
-              expires_at: "2026-07-18T00:44:23.904386Z",
-            },
-          ],
-        }), { status: 200 });
-      }
-      throw new Error(`unexpected fetch: ${urlText}`);
-    });
-    vi.stubGlobal("fetch", fetchMock);
-
-    try {
-      const { getCodexUsageSummary } = await loadFeishuApiWithHome(homeDir, userDataDir);
-      await expect(getCodexUsageSummary()).resolves.toEqual({
-        fiveHour: { usedPercent: 37, remainingPercent: 63, resetAfterSeconds: 10349, resetAtEpochSeconds: 1781528212 },
-        weekly: { usedPercent: 12, remainingPercent: 88, resetAfterSeconds: 325063, resetAtEpochSeconds: 1781842926 },
-        rateLimitResetCreditsAvailable: 2,
-        rateLimitResetCredits: [
-          { grantedAt: "2026-06-12T04:01:47.770016Z", expiresAt: "2026-07-12T04:01:47.770016Z" },
-          { grantedAt: "2026-06-18T00:44:23.904386Z", expiresAt: "2026-07-18T00:44:23.904386Z" },
-        ],
-      });
-      expect(fetchMock).toHaveBeenCalledWith(
-        "https://chatgpt.com/backend-api/wham/rate-limit-reset-credits",
-        expect.objectContaining({
-          headers: expect.objectContaining({
-            Authorization: "Bearer codex-access-token",
-            "ChatGPT-Account-ID": "codex-account-id",
-            "OpenAI-Beta": "codex-1",
-            originator: "Codex Desktop",
-          }),
-        }),
-      );
-    } finally {
-      await rm(homeDir, { recursive: true, force: true });
-      await rm(userDataDir, { recursive: true, force: true });
+  it("uses provided Codex usage without fetching usage again", async () => {
+    const homeDir = await mkdtemp(join(tmpdir(), "chatccc-avatar-home-"));
+    const userDataDir = await mkdtemp(join(tmpdir(), "chatccc-avatar-data-"));
+    const uploadedNames: string[] = [];
+    const fetchMock = mockAvatarUploadOnlyFetch(uploadedNames);
+
+    try {
+      const { setChatAvatar } = await loadFeishuApiWithHome(homeDir, userDataDir);
+      await setChatAvatar("tenant-token", "chat_1", "codex", "busy", {
+        codexUsage: {
+          fiveHour: { usedPercent: 37, remainingPercent: 63, resetAtEpochSeconds: null, resetAfterSeconds: null },
+          weekly: { usedPercent: 12, remainingPercent: 88, resetAtEpochSeconds: null, resetAfterSeconds: null },
+          rateLimitResetCreditsAvailable: null,
+          rateLimitResetCredits: null,
+        },
+      });
+
+      expect(uploadedNames).toEqual(["avatar_codex_busy_week_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 });
+      await rm(userDataDir, { recursive: true, force: true });
+    }
+  });
+
+  it("returns both usage windows and available reset credit expiries", async () => {
+    const homeDir = await mkdtemp(join(tmpdir(), "chatccc-avatar-home-"));
+    const userDataDir = await mkdtemp(join(tmpdir(), "chatccc-avatar-data-"));
+    await writeCodexAuth(homeDir);
+    const fetchMock = vi.fn(async (url: string | URL | Request) => {
+      const urlText = String(url);
+      if (urlText === "https://chatgpt.com/backend-api/wham/usage") {
+        return new Response(JSON.stringify({
+          rate_limit: {
+            primary_window: { used_percent: 37, reset_after_seconds: 10349, reset_at: 1781528212 },
+            secondary_window: { used_percent: 12, reset_after_seconds: 325063, reset_at: 1781842926 },
+          },
+          rate_limit_reset_credits: { available_count: 1 },
+        }), { status: 200 });
+      }
+      if (urlText === "https://chatgpt.com/backend-api/wham/rate-limit-reset-credits") {
+        return new Response(JSON.stringify({
+          available_count: 2,
+          credits: [
+            {
+              status: "available",
+              granted_at: "2026-06-12T04:01:47.770016Z",
+              expires_at: "2026-07-12T04:01:47.770016Z",
+            },
+            {
+              status: "redeemed",
+              granted_at: "2026-06-13T04:01:47.770016Z",
+              expires_at: "2026-07-13T04:01:47.770016Z",
+            },
+            {
+              status: "available",
+              granted_at: "2026-06-18T00:44:23.904386Z",
+              expires_at: "2026-07-18T00:44:23.904386Z",
+            },
+          ],
+        }), { status: 200 });
+      }
+      throw new Error(`unexpected fetch: ${urlText}`);
+    });
+    vi.stubGlobal("fetch", fetchMock);
+
+    try {
+      const { getCodexUsageSummary } = await loadFeishuApiWithHome(homeDir, userDataDir);
+      await expect(getCodexUsageSummary()).resolves.toEqual({
+        fiveHour: { usedPercent: 37, remainingPercent: 63, resetAfterSeconds: 10349, resetAtEpochSeconds: 1781528212 },
+        weekly: { usedPercent: 12, remainingPercent: 88, resetAfterSeconds: 325063, resetAtEpochSeconds: 1781842926 },
+        rateLimitResetCreditsAvailable: 2,
+        rateLimitResetCredits: [
+          { grantedAt: "2026-06-12T04:01:47.770016Z", expiresAt: "2026-07-12T04:01:47.770016Z" },
+          { grantedAt: "2026-06-18T00:44:23.904386Z", expiresAt: "2026-07-18T00:44:23.904386Z" },
+        ],
+      });
+      expect(fetchMock).toHaveBeenCalledWith(
+        "https://chatgpt.com/backend-api/wham/rate-limit-reset-credits",
+        expect.objectContaining({
+          headers: expect.objectContaining({
+            Authorization: "Bearer codex-access-token",
+            "ChatGPT-Account-ID": "codex-account-id",
+            "OpenAI-Beta": "codex-1",
+            originator: "Codex Desktop",
+          }),
+        }),
+      );
+    } finally {
+      await rm(homeDir, { recursive: true, force: true });
+      await rm(userDataDir, { recursive: true, force: true });
+    }
+  });
+
+  it("consumes a Codex rate-limit reset credit through the WHAM endpoint", async () => {
+    const homeDir = await mkdtemp(join(tmpdir(), "chatccc-avatar-home-"));
+    const userDataDir = await mkdtemp(join(tmpdir(), "chatccc-avatar-data-"));
+    await writeCodexAuth(homeDir);
+    const fetchMock = vi.fn(async () => new Response(JSON.stringify({
+      code: "reset",
+      windows_reset: 2,
+    }), { status: 200 }));
+    vi.stubGlobal("fetch", fetchMock);
+
+    try {
+      const { consumeCodexRateLimitResetCredit } = await loadFeishuApiWithHome(homeDir, userDataDir);
+      await expect(consumeCodexRateLimitResetCredit("request-1")).resolves.toEqual({
+        code: "reset",
+        windowsReset: 2,
+      });
+      expect(fetchMock).toHaveBeenCalledWith(
+        "https://chatgpt.com/backend-api/wham/rate-limit-reset-credits/consume",
+        expect.objectContaining({
+          method: "POST",
+          headers: expect.objectContaining({
+            Authorization: "Bearer codex-access-token",
+            "Content-Type": "application/json",
+          }),
+          body: JSON.stringify({ redeem_request_id: "request-1" }),
+        }),
+      );
+    } finally {
+      await rm(homeDir, { recursive: true, force: true });
+      await rm(userDataDir, { recursive: true, force: true });
     }
-  });
-
-  it("consumes a Codex rate-limit reset credit through the WHAM endpoint", async () => {
-    const homeDir = await mkdtemp(join(tmpdir(), "chatccc-avatar-home-"));
-    const userDataDir = await mkdtemp(join(tmpdir(), "chatccc-avatar-data-"));
-    await writeCodexAuth(homeDir);
-    const fetchMock = vi.fn(async () => new Response(JSON.stringify({
-      code: "reset",
-      windows_reset: 2,
-    }), { status: 200 }));
-    vi.stubGlobal("fetch", fetchMock);
-
-    try {
-      const { consumeCodexRateLimitResetCredit } = await loadFeishuApiWithHome(homeDir, userDataDir);
-      await expect(consumeCodexRateLimitResetCredit("request-1")).resolves.toEqual({
-        code: "reset",
-        windowsReset: 2,
-      });
-      expect(fetchMock).toHaveBeenCalledWith(
-        "https://chatgpt.com/backend-api/wham/rate-limit-reset-credits/consume",
-        expect.objectContaining({
-          method: "POST",
-          headers: expect.objectContaining({
-            Authorization: "Bearer codex-access-token",
-            "Content-Type": "application/json",
-          }),
-          body: JSON.stringify({ redeem_request_id: "request-1" }),
-        }),
-      );
-    } finally {
-      await rm(homeDir, { recursive: true, force: true });
-      await rm(userDataDir, { recursive: true, force: true });
-    }
-  });
-
-  it("falls back to the pre-combined Codex avatar when usage lookup fails", async () => {
+  });
+
+  it("falls back to the pre-combined Codex avatar when usage lookup fails", async () => {
     const homeDir = await mkdtemp(join(tmpdir(), "chatccc-avatar-home-"));
     const userDataDir = await mkdtemp(join(tmpdir(), "chatccc-avatar-data-"));
     const uploadedNames: string[] = [];
@@ -257,6 +300,28 @@ describe("Cursor avatar usage battery", () => {
     }
   });
 
+  it("uses provided Cursor usage without fetching usage again", 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", "cursor", "idle", {
+        cursorUsage: {
+          planUsage: { apiPercentUsed: 30 },
+        },
+      });
+
+      expect(uploadedNames).toEqual(["avatar_cursor_idle_battery_70.jpg"]);
+      expect(getCursorUsageSummaryMock).not.toHaveBeenCalled();
+    } finally {
+      await rm(homeDir, { recursive: true, force: true });
+      await rm(userDataDir, { recursive: true, force: true });
+    }
+  });
+
   it("uses On-Demand budget for Cursor avatar battery when configured", async () => {
     const homeDir = await mkdtemp(join(tmpdir(), "chatccc-avatar-home-"));
     const userDataDir = await mkdtemp(join(tmpdir(), "chatccc-avatar-data-"));

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("");
   });
-});
+});