chatccc 0.2.17 → 0.2.19

package/package.json

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

package/src/feishu-api.ts

@@ -1,6 +1,6 @@
-import { readdir, stat, readFile } from "node:fs/promises";
-import { resolve as resolvePath } from "node:path";
-import { join } from "node:path";
+import { readdir, stat, readFile, mkdir, writeFile } from "node:fs/promises";
+import { resolve as resolvePath } from "node:path";
+import { dirname, join } from "node:path";
 import sharp from "sharp";
 
 import {
@@ -260,34 +260,94 @@ export function extractSessionId(description: string): string | null {
 // Avatar
 // ---------------------------------------------------------------------------
 
-const AVATAR_DIR = resolvePath(PROJECT_ROOT, "images", "avatars");
-const AVATAR_SOURCES: Record<string, string> = {
-  new: resolvePath(AVATAR_DIR, "status_new.png"),
-  busy: resolvePath(AVATAR_DIR, "status_busy.png"),
-  idle: resolvePath(AVATAR_DIR, "status_idle.png"),
-};
-
-const avatarKeyCache = new Map<string, string>();
-
-async function loadAvatarSource(source: string): Promise<{ buffer: Buffer; contentType: string; filename: string }> {
-  const input = await readFile(source);
-
-  const jpeg = await sharp(input)
-    .resize(256, 256, { fit: "cover", position: "center" })
-    .flatten({ background: "#ffffff" })
-    .removeAlpha()
-    .jpeg({ quality: 95, progressive: false })
+const AVATAR_DIR = resolvePath(PROJECT_ROOT, "images", "avatars");
+const AVATAR_BADGE_DIR = resolvePath(AVATAR_DIR, "badges");
+const AVATAR_KEY_CACHE_FILE = resolvePath(PROJECT_ROOT, "state", "avatar-image-keys.json");
+const AVATAR_SOURCES: Record<string, string> = {
+  new: resolvePath(AVATAR_DIR, "status_new.png"),
+  busy: resolvePath(AVATAR_DIR, "status_busy.png"),
+  idle: resolvePath(AVATAR_DIR, "status_idle.png"),
+};
+const AVATAR_BADGES: Record<string, string> = {
+  claude: resolvePath(AVATAR_BADGE_DIR, "badge_claude.png"),
+  cursor: resolvePath(AVATAR_BADGE_DIR, "badge_cursor.png"),
+  codex: resolvePath(AVATAR_BADGE_DIR, "badge_codex.png"),
+};
+const AVATAR_SIZE = 256;
+const BADGE_SIZE = 92;
+const BADGE_MARGIN = 10;
+
+const avatarKeyCache = new Map<string, string>();
+let avatarKeyCacheLoaded = false;
+
+function normalizeAvatarTool(tool: string): string {
+  return AVATAR_BADGES[tool] ? tool : "claude";
+}
+
+function normalizeAvatarStatus(status: string): string {
+  return AVATAR_SOURCES[status] ? status : "idle";
+}
+
+function avatarCacheKey(tool: string, status: string): string {
+  return `${normalizeAvatarTool(tool)}:${normalizeAvatarStatus(status)}`;
+}
+
+async function loadAvatarKeyCache(): Promise<void> {
+  if (avatarKeyCacheLoaded) return;
+  avatarKeyCacheLoaded = true;
+  try {
+    const raw = await readFile(AVATAR_KEY_CACHE_FILE, "utf-8");
+    const parsed = JSON.parse(raw) as Record<string, unknown>;
+    for (const [key, value] of Object.entries(parsed)) {
+      if (typeof value === "string" && value.trim()) avatarKeyCache.set(key, value);
+    }
+  } catch {
+    // Missing or malformed cache should not block avatar updates.
+  }
+}
+
+async function persistAvatarKeyCache(): Promise<void> {
+  await mkdir(dirname(AVATAR_KEY_CACHE_FILE), { recursive: true });
+  await writeFile(
+    AVATAR_KEY_CACHE_FILE,
+    JSON.stringify(Object.fromEntries(avatarKeyCache.entries()), null, 2),
+    "utf-8",
+  );
+}
+
+async function renderAvatar(tool: string, status: string): Promise<{ buffer: Buffer; contentType: string; filename: string }> {
+  const normalizedTool = normalizeAvatarTool(tool);
+  const normalizedStatus = normalizeAvatarStatus(status);
+  const badge = await sharp(await readFile(AVATAR_BADGES[normalizedTool]))
+    .resize(BADGE_SIZE, BADGE_SIZE, {
+      fit: "contain",
+      kernel: sharp.kernel.lanczos3,
+      background: { r: 0, g: 0, b: 0, alpha: 0 },
+    })
+    .png()
+    .toBuffer();
+
+  const jpeg = await sharp(await readFile(AVATAR_SOURCES[normalizedStatus]))
+    .resize(AVATAR_SIZE, AVATAR_SIZE, { fit: "cover", position: "center" })
+    .composite([{
+      input: badge,
+      left: AVATAR_SIZE - BADGE_SIZE - BADGE_MARGIN,
+      top: AVATAR_SIZE - BADGE_SIZE - BADGE_MARGIN,
+    }])
+    .flatten({ background: "#ffffff" })
+    .removeAlpha()
+    .jpeg({ quality: 95, progressive: false })
     .toBuffer();
 
-  return {
-    buffer: jpeg,
-    contentType: "image/jpeg",
-    filename: "avatar.jpg",
-  };
-}
-
-async function uploadImage(token: string, source: string): Promise<string> {
-  const image = await loadAvatarSource(source);
+  return {
+    buffer: jpeg,
+    contentType: "image/jpeg",
+    filename: `avatar_${normalizedTool}_${normalizedStatus}.jpg`,
+  };
+}
+
+async function uploadImage(token: string, tool: string, status: string): Promise<string> {
+  const image = await renderAvatar(tool, status);
   const blob = new Blob([new Uint8Array(image.buffer)], { type: image.contentType });
   const form = new FormData();
   form.append("image_type", "avatar");
@@ -308,18 +368,23 @@ async function uploadImage(token: string, source: string): Promise<string> {
   return data.data!.image_key!;
 }
 
-async function getOrUploadAvatarKey(token: string, status: string): Promise<string> {
-  const cached = avatarKeyCache.get(status);
+async function getOrUploadAvatarKey(token: string, tool: string, status: string): Promise<string> {
+  await loadAvatarKeyCache();
+  const keyName = avatarCacheKey(tool, status);
+  const cached = avatarKeyCache.get(keyName);
   if (cached) return cached;
-  const key = await uploadImage(token, AVATAR_SOURCES[status]);
-  avatarKeyCache.set(status, key);
+  const key = await uploadImage(token, tool, status);
+  avatarKeyCache.set(keyName, key);
+  await persistAvatarKeyCache().catch((err) => {
+    console.error(`[${ts()}] [AVATAR] persist cache FAIL: ${(err as Error).message}`);
+  });
   console.log(`[${ts()}] [AVATAR] Uploaded "${status}" → image_key=${key}`);
   return key;
 }
 
-export async function setChatAvatar(token: string, chatId: string, status: string): Promise<void> {
-  try {
-    const avatarKey = await getOrUploadAvatarKey(token, status);
+export async function setChatAvatar(token: string, chatId: string, tool: string, status: string): Promise<void> {
+  try {
+    const avatarKey = await getOrUploadAvatarKey(token, tool, status);
     const resp = await fetch(`${BASE_URL}/im/v1/chats/${chatId}`, {
       method: "PUT",
       headers: {
@@ -336,9 +401,9 @@ export async function setChatAvatar(token: string, chatId: string, status: strin
     }
     if (data.code !== 0) throw new Error(`[${data.code}] ${data.msg}`);
   } catch (err) {
-    console.error(`[${ts()}] [AVATAR] setChatAvatar FAIL: chatId=${chatId} status=${status} ${(err as Error).message}`);
-  }
-}
+    console.error(`[${ts()}] [AVATAR] setChatAvatar FAIL: chatId=${chatId} tool=${tool} status=${status} ${(err as Error).message}`);
+  }
+}
 
 // ---------------------------------------------------------------------------
 // Messaging

package/src/index.ts

@@ -405,7 +405,7 @@ async function handleCommand(text: string, chatId: string, openId: string, msgTi
     );
 
     console.log(`[${ts()}] [STEP 4/4] Replied to new group → OK`);
-    setChatAvatar(freshToken, newChatId, "new").catch(() => {});
+    setChatAvatar(freshToken, newChatId, tool, "new").catch(() => {});
     console.log(`${"=".repeat(60)}`);
     return;
   }
@@ -558,7 +558,7 @@ async function handleCommand(text: string, chatId: string, openId: string, msgTi
           tool: descriptionTool,
         });
 
-        setChatAvatar(freshToken, chatId, "new").catch(() => {});
+        setChatAvatar(freshToken, chatId, descriptionTool, "new").catch(() => {});
 
         await sendCardReply(
           freshToken, chatId, `${toolLabel} Session Reset`,

package/src/session.ts

@@ -324,7 +324,7 @@ export async function resumeAndPrompt(
   });
   const myGen = sessionGen;
 
-  setChatAvatar(token, chatId, "busy").catch(() => {});
+  setChatAvatar(token, chatId, tool, "busy").catch(() => {});
 
   const now = Date.now();
   const existingInfo = sessionInfoMap.get(chatId);
@@ -466,7 +466,7 @@ export async function resumeAndPrompt(
   if (!cEntry || cEntry.gen !== myGen) return;
   const wasStopped = cEntry.stopped;
   chatSessionMap.delete(chatId);
-  setChatAvatar(token, chatId, "idle").catch(() => {});
+  setChatAvatar(token, chatId, tool, "idle").catch(() => {});
 
   const finalCardContent = state.accumulatedContent || " ";
   if (cardId) {