chatccc 0.2.193 → 0.2.194

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chatccc",
-  "version": "0.2.193",
+  "version": "0.2.194",
   "description": "Feishu bot bridge for Claude Code",
   "license": "Apache-2.0",
   "type": "module",

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

@@ -1,4 +1,4 @@
-import { mkdir, mkdtemp, 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,10 +83,44 @@ function mockAvatarUploadOnlyFetch(uploadedNames: string[]): ReturnType<typeof v
     throw new Error(`unexpected fetch: ${urlText}`);
   });
   vi.stubGlobal("fetch", fetchMock);
-  return fetchMock;
-}
-
-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");

package/src/feishu-api.ts

@@ -319,11 +319,12 @@ const AVATAR_BADGES: Record<string, string> = {
   cursor: resolvePath(AVATAR_BADGE_DIR, "badge_cursor.png"),
   codex: resolvePath(AVATAR_BADGE_DIR, "badge_codex.png"),
 };
-const AVATAR_SIZE = 256;
-const AVATAR_BADGE_SIZE = 92;
-const AVATAR_BADGE_MARGIN = 10;
-const CODEX_AVATAR_USAGE_STYLE_VERSION = "usage-ring-gray-consumed-v13";
-const CURSOR_AVATAR_USAGE_STYLE_VERSION = "usage-battery-v1";
+const AVATAR_SIZE = 256;
+const AVATAR_BADGE_SIZE = 92;
+const AVATAR_BADGE_MARGIN = 10;
+const PLAIN_AVATAR_TOOL = "plain";
+const CODEX_AVATAR_USAGE_STYLE_VERSION = "usage-ring-gray-consumed-v13";
+const CURSOR_AVATAR_USAGE_STYLE_VERSION = "usage-battery-v1";
 
 export interface CodexUsageBalance {
   usedPercent: number;
@@ -354,17 +355,17 @@ export interface CodexResetConsumeResult {
 const avatarKeyCache = new Map<string, string>();
 let avatarKeyCacheLoaded = false;
 
-function normalizeAvatarTool(tool: string): string {
-  return AVATAR_BADGES[tool] ? tool : "claude";
-}
+function normalizeAvatarTool(tool: string): string {
+  return AVATAR_BADGES[tool] ? tool : PLAIN_AVATAR_TOOL;
+}
 
 function normalizeAvatarStatus(status: string): string {
   return AVATAR_SOURCES[status] ? status : "idle";
 }
 
-function avatarCombinationPath(tool: string, status: string): string {
-  return resolvePath(AVATAR_COMBINATIONS_DIR, `avatar_${normalizeAvatarTool(tool)}_${normalizeAvatarStatus(status)}.png`);
-}
+function avatarCombinationPath(tool: string, status: string): string {
+  return resolvePath(AVATAR_COMBINATIONS_DIR, `avatar_${normalizeAvatarTool(tool)}_${normalizeAvatarStatus(status)}.png`);
+}
 
 function avatarCacheKey(
   tool: string,
@@ -757,16 +758,19 @@ async function renderAvatar(
   codexUsage: CodexUsageSummary | null = null,
   cursorBatteryPercent: number | null = null,
 ): Promise<{ buffer: Buffer; contentType: string; filename: string }> {
-  const normalizedTool = normalizeAvatarTool(tool);
-  const normalizedStatus = normalizeAvatarStatus(status);
-  const composites: sharp.OverlayOptions[] = [];
-
-  const codexWeeklyUsage = normalizedTool === "codex" ? codexUsage?.weekly : null;
-  const useDynamicCodexAvatar = codexUsage && codexWeeklyUsage;
-  const useDynamicCursorAvatar = normalizedTool === "cursor" && cursorBatteryPercent !== null;
-  const basePath = useDynamicCodexAvatar || useDynamicCursorAvatar
-    ? AVATAR_SOURCES[normalizedStatus]
-    : avatarCombinationPath(normalizedTool, normalizedStatus);
+  const normalizedTool = normalizeAvatarTool(tool);
+  const normalizedStatus = normalizeAvatarStatus(status);
+  const composites: sharp.OverlayOptions[] = [];
+  const hasAgentBadge = normalizedTool !== PLAIN_AVATAR_TOOL;
+
+  const codexWeeklyUsage = normalizedTool === "codex" ? codexUsage?.weekly : null;
+  const useDynamicCodexAvatar = codexUsage && codexWeeklyUsage;
+  const useDynamicCursorAvatar = normalizedTool === "cursor" && cursorBatteryPercent !== null;
+  const basePath = useDynamicCodexAvatar || useDynamicCursorAvatar
+    ? AVATAR_SOURCES[normalizedStatus]
+    : hasAgentBadge
+      ? avatarCombinationPath(normalizedTool, normalizedStatus)
+      : AVATAR_SOURCES[normalizedStatus];
 
   if (useDynamicCodexAvatar) {
     composites.push(
@@ -793,16 +797,16 @@ async function renderAvatar(
     .jpeg({ quality: 95, progressive: false })
     .toBuffer();
 
-  return {
-    buffer: jpeg,
-    contentType: "image/jpeg",
-    filename: codexUsage?.weekly
-      ? `avatar_${normalizedTool}_${normalizedStatus}_week_${codexUsage.weekly.remainingPercent}_5h_${codexUsage.fiveHour.remainingPercent}.jpg`
-      : cursorBatteryPercent !== null
-        ? `avatar_${normalizedTool}_${normalizedStatus}_battery_${cursorBatteryPercent}.jpg`
-      : `avatar_${normalizedTool}_${normalizedStatus}.jpg`,
-  };
-}
+  return {
+    buffer: jpeg,
+    contentType: "image/jpeg",
+    filename: normalizedTool === "codex" && codexUsage?.weekly
+      ? `avatar_${normalizedTool}_${normalizedStatus}_week_${codexUsage.weekly.remainingPercent}_5h_${codexUsage.fiveHour.remainingPercent}.jpg`
+      : normalizedTool === "cursor" && cursorBatteryPercent !== null
+        ? `avatar_${normalizedTool}_${normalizedStatus}_battery_${cursorBatteryPercent}.jpg`
+      : `avatar_${normalizedTool}_${normalizedStatus}.jpg`,
+  };
+}
 
 async function uploadImage(
   token: string,