chatccc 0.2.197 → 0.2.199

package/src/config.ts

@@ -88,9 +88,9 @@ export interface CursorConfig {
   onDemandMonthlyBudget: number;
 }
 
-export interface CodexConfig {
-  /** 是否启用 Codex Agent；缺省时按"有任意字段非空"自动判定（向后兼容） */
-  enabled: boolean;
+export interface CodexConfig {
+  /** 是否启用 Codex Agent；缺省时按"有任意字段非空"自动判定（向后兼容） */
+  enabled: boolean;
   /** 是否作为 /new 未指定工具时使用的默认 Agent */
   defaultAgent: boolean;
   /** Codex CLI 可执行文件绝对路径；留空时退回到 PATH 中的 `codex` */
@@ -98,22 +98,22 @@ export interface CodexConfig {
   model: string;
   /** /model 可切换的单个备选模型；留空则不加入候选列表 */
   alternativeModel: string;
-  effort: string;
-}
-
-export interface CccConfig {
-  /** DeepSeek API Key for the ChatCCC self-developed agent. */
-  DEEPSEEK_API_KEY: string;
-  /** DeepSeek-compatible API Base URL for the ChatCCC self-developed agent. */
-  DEEPSEEK_BASE_URL: string;
-  /** Model used by the ChatCCC self-developed agent. */
-  model: string;
-}
-
-export interface FeishuConfig {
-  appId: string;
-  appSecret: string;
-}
+  effort: string;
+}
+
+export interface CccConfig {
+  /** DeepSeek API Key for the ChatCCC self-developed agent. */
+  DEEPSEEK_API_KEY: string;
+  /** DeepSeek-compatible API Base URL for the ChatCCC self-developed agent. */
+  DEEPSEEK_BASE_URL: string;
+  /** Model used by the ChatCCC self-developed agent. */
+  model: string;
+}
+
+export interface FeishuConfig {
+  appId: string;
+  appSecret: string;
+}
 
 export interface PlatformConfig {
   enabled: boolean;
@@ -143,12 +143,12 @@ export interface RawStreamAgentLogConfig {
   keepCompleted: boolean;
 }
 
-export interface RawStreamLogsConfig {
-  claude: RawStreamAgentLogConfig;
-  cursor: RawStreamAgentLogConfig;
-  codex: RawStreamAgentLogConfig;
-  ccc: RawStreamAgentLogConfig;
-}
+export interface RawStreamLogsConfig {
+  claude: RawStreamAgentLogConfig;
+  cursor: RawStreamAgentLogConfig;
+  codex: RawStreamAgentLogConfig;
+  ccc: RawStreamAgentLogConfig;
+}
 
 export interface AppConfig {
   feishu: FeishuConfig;
@@ -159,22 +159,22 @@ export interface AppConfig {
   /** 若为 false，AI 生成过程中用户发送消息不会打断，须先点「停止」再发送新消息 */
   allowInterrupt: boolean;
   rawStreamLogs: RawStreamLogsConfig;
-  claude: ClaudeConfig;
-  cursor: CursorConfig;
-  codex: CodexConfig;
-  ccc: CccConfig;
-}
+  claude: ClaudeConfig;
+  cursor: CursorConfig;
+  codex: CodexConfig;
+  ccc: CccConfig;
+}
 
 export type AgentTool = "claude" | "cursor" | "codex";
 export const AGENT_TOOLS: AgentTool[] = ["claude", "cursor", "codex"];
 export type CursorAvatarBatteryMode = "apiPercent" | "onDemandUse";
 
 /** 获取指定 agent 配置中所有模型相关的值（最多 100 个，去重） */
-export function getAllModelsForTool(tool: string, cfg: AppConfig = config): string[] {
-  const seen = new Set<string>();
-  const collect = (v: unknown) => {
-    if (typeof v === "string" && v.trim()) seen.add(v.trim());
-  };
+export function getAllModelsForTool(tool: string, cfg: AppConfig = config): string[] {
+  const seen = new Set<string>();
+  const collect = (v: unknown) => {
+    if (typeof v === "string" && v.trim()) seen.add(v.trim());
+  };
 
   if (tool === "claude") {
     collect(cfg.claude.model);
@@ -182,35 +182,35 @@ export function getAllModelsForTool(tool: string, cfg: AppConfig = config): stri
   } else if (tool === "cursor") {
     collect(cfg.cursor.model);
     collect(cfg.cursor.alternativeModel);
-  } else if (tool === "codex") {
-    collect(cfg.codex.model);
-    collect(cfg.codex.alternativeModel);
-  } else if (tool === "ccc") {
-    collect(cfg.ccc.model);
-  }
-
-  return Array.from(seen).slice(0, 100);
-}
-
-export const CLAUDE_EFFORT_LEVELS = ["low", "medium", "high", "xhigh", "max"] as const;
-export const CODEX_EFFORT_LEVELS = ["minimal", "low", "medium", "high", "xhigh"] as const;
-
-export function getAllEffortsForTool(tool: string): string[] {
-  if (tool === "claude") return [...CLAUDE_EFFORT_LEVELS];
-  if (tool === "codex") return [...CODEX_EFFORT_LEVELS];
-  return [];
-}
-
-export function getDefaultEffortForTool(tool: AgentTool, cfg: AppConfig = config): string {
-  if (tool === "claude") return cfg.claude.effort;
-  if (tool === "codex") return cfg.codex.effort;
-  return "";
-}
-
-const CONFIG_FILE = join(USER_DATA_DIR, "config.json");
-const CONFIG_SAMPLE_FILE = join(PROJECT_ROOT, "config.sample.json");
-export const DEFAULT_CCC_DEEPSEEK_BASE_URL = "https://api.deepseek.com/v1";
-export const DEFAULT_CCC_MODEL = "deepseek-v4-pro";
+  } else if (tool === "codex") {
+    collect(cfg.codex.model);
+    collect(cfg.codex.alternativeModel);
+  } else if (tool === "ccc") {
+    collect(cfg.ccc.model);
+  }
+
+  return Array.from(seen).slice(0, 100);
+}
+
+export const CLAUDE_EFFORT_LEVELS = ["low", "medium", "high", "xhigh", "max"] as const;
+export const CODEX_EFFORT_LEVELS = ["minimal", "low", "medium", "high", "xhigh"] as const;
+
+export function getAllEffortsForTool(tool: string): string[] {
+  if (tool === "claude") return [...CLAUDE_EFFORT_LEVELS];
+  if (tool === "codex") return [...CODEX_EFFORT_LEVELS];
+  return [];
+}
+
+export function getDefaultEffortForTool(tool: AgentTool, cfg: AppConfig = config): string {
+  if (tool === "claude") return cfg.claude.effort;
+  if (tool === "codex") return cfg.codex.effort;
+  return "";
+}
+
+const CONFIG_FILE = join(USER_DATA_DIR, "config.json");
+const CONFIG_SAMPLE_FILE = join(PROJECT_ROOT, "config.sample.json");
+export const DEFAULT_CCC_DEEPSEEK_BASE_URL = "https://api.deepseek.com/v1";
+export const DEFAULT_CCC_MODEL = "deepseek-v4-pro";
 
 /**
  * 将旧位置（PROJECT_ROOT）的持久化数据一次性迁移到 USER_DATA_DIR。
@@ -424,13 +424,13 @@ function loadConfig(): AppConfig {
     port: 18080,
     gitTimeoutSeconds: 180,
     allowInterrupt: false,
-    rawStreamLogs: {
-      claude: { enabled: false, maxBytesPerTurn: 50 * 1024 * 1024, retentionDays: 7, keepCompleted: false },
-      cursor: { enabled: false, maxBytesPerTurn: 50 * 1024 * 1024, retentionDays: 7, keepCompleted: false },
-      codex: { enabled: false, maxBytesPerTurn: 50 * 1024 * 1024, retentionDays: 7, keepCompleted: false },
-      ccc: { enabled: false, maxBytesPerTurn: 50 * 1024 * 1024, retentionDays: 7, keepCompleted: false },
-    },
-    claude: { enabled: false, defaultAgent: true, model: "", subagentModel: "", effort: "", apiKey: "", baseUrl: "", maxTurn: 0 },
+    rawStreamLogs: {
+      claude: { enabled: false, maxBytesPerTurn: 50 * 1024 * 1024, retentionDays: 7, keepCompleted: false },
+      cursor: { enabled: false, maxBytesPerTurn: 50 * 1024 * 1024, retentionDays: 7, keepCompleted: false },
+      codex: { enabled: false, maxBytesPerTurn: 50 * 1024 * 1024, retentionDays: 7, keepCompleted: false },
+      ccc: { enabled: false, maxBytesPerTurn: 50 * 1024 * 1024, retentionDays: 7, keepCompleted: false },
+    },
+    claude: { enabled: false, defaultAgent: true, model: "", subagentModel: "", effort: "", apiKey: "", baseUrl: "", maxTurn: 0 },
     cursor: {
       enabled: false,
       defaultAgent: false,
@@ -439,10 +439,10 @@ function loadConfig(): AppConfig {
       alternativeModel: "",
       avatarBatteryMode: "apiPercent",
       onDemandMonthlyBudget: 1000,
-    },
-    codex: { enabled: false, defaultAgent: false, path: "", model: "", alternativeModel: "", effort: "" },
-    ccc: { DEEPSEEK_API_KEY: "", DEEPSEEK_BASE_URL: DEFAULT_CCC_DEEPSEEK_BASE_URL, model: DEFAULT_CCC_MODEL },
-  };
+    },
+    codex: { enabled: false, defaultAgent: false, path: "", model: "", alternativeModel: "", effort: "" },
+    ccc: { DEEPSEEK_API_KEY: "", DEEPSEEK_BASE_URL: DEFAULT_CCC_DEEPSEEK_BASE_URL, model: DEFAULT_CCC_MODEL },
+  };
 
   if (!IS_TEST_ENV) {
     migrateLegacyData();
@@ -492,12 +492,12 @@ function loadConfig(): AppConfig {
       alternativeModel?: unknown;
       avatarBatteryMode?: unknown;
       onDemandMonthlyBudget?: unknown;
-    };
-    codex?: { enabled?: unknown; defaultAgent?: unknown; path?: unknown; command?: unknown; model?: unknown; alternativeModel?: unknown; effort?: unknown };
-    ccc?: { DEEPSEEK_API_KEY?: unknown; DEEPSEEK_BASE_URL?: unknown; model?: unknown };
-    chromeDevtools?: { enabled?: unknown; port?: unknown; chromePath?: unknown };
-    rawStreamLogs?: unknown;
-  };
+    };
+    codex?: { enabled?: unknown; defaultAgent?: unknown; path?: unknown; command?: unknown; model?: unknown; alternativeModel?: unknown; effort?: unknown };
+    ccc?: { DEEPSEEK_API_KEY?: unknown; DEEPSEEK_BASE_URL?: unknown; model?: unknown };
+    chromeDevtools?: { enabled?: unknown; port?: unknown; chromePath?: unknown };
+    rawStreamLogs?: unknown;
+  };
   try {
     parsed = JSON.parse(raw);
   } catch (err) {
@@ -507,10 +507,10 @@ function loadConfig(): AppConfig {
 
   const feishu = parsed.feishu ?? { appId: "", appSecret: "" };
   const claude = parsed.claude ?? {} as Partial<ClaudeConfig>;
-  const cursorRaw = (parsed.cursor ?? {}) as NonNullable<typeof parsed.cursor>;
-  const codexRaw = (parsed.codex ?? {}) as NonNullable<typeof parsed.codex>;
-  const cccRaw = (parsed.ccc ?? {}) as NonNullable<typeof parsed.ccc>;
-  const chromeDevtoolsRaw = (parsed.chromeDevtools ?? {}) as NonNullable<typeof parsed.chromeDevtools>;
+  const cursorRaw = (parsed.cursor ?? {}) as NonNullable<typeof parsed.cursor>;
+  const codexRaw = (parsed.codex ?? {}) as NonNullable<typeof parsed.codex>;
+  const cccRaw = (parsed.ccc ?? {}) as NonNullable<typeof parsed.ccc>;
+  const chromeDevtoolsRaw = (parsed.chromeDevtools ?? {}) as NonNullable<typeof parsed.chromeDevtools>;
   const rawStreamLogsRaw = typeof parsed.rawStreamLogs === "object" && parsed.rawStreamLogs !== null
     ? parsed.rawStreamLogs as unknown as Record<string, unknown>
     : {};
@@ -607,12 +607,12 @@ function loadConfig(): AppConfig {
     port: typeof parsed.port === "number" ? parsed.port : 18080,
     gitTimeoutSeconds: typeof parsed.gitTimeoutSeconds === "number" ? parsed.gitTimeoutSeconds : 180,
     allowInterrupt: typeof parsed.allowInterrupt === "boolean" ? parsed.allowInterrupt : false,
-    rawStreamLogs: {
-      claude: normalizeRawStreamAgentLogConfig(rawStreamLogsRaw.claude),
-      cursor: normalizeRawStreamAgentLogConfig(rawStreamLogsRaw.cursor),
-      codex: normalizeRawStreamAgentLogConfig(rawStreamLogsRaw.codex),
-      ccc: normalizeRawStreamAgentLogConfig(rawStreamLogsRaw.ccc),
-    },
+    rawStreamLogs: {
+      claude: normalizeRawStreamAgentLogConfig(rawStreamLogsRaw.claude),
+      cursor: normalizeRawStreamAgentLogConfig(rawStreamLogsRaw.cursor),
+      codex: normalizeRawStreamAgentLogConfig(rawStreamLogsRaw.codex),
+      ccc: normalizeRawStreamAgentLogConfig(rawStreamLogsRaw.ccc),
+    },
     claude: {
       enabled: claudeEnabled,
       defaultAgent: defaultTool === "claude",
@@ -634,24 +634,24 @@ function loadConfig(): AppConfig {
       avatarBatteryMode: normalizeCursorAvatarBatteryMode(cursorRaw.avatarBatteryMode),
       onDemandMonthlyBudget: normalizeCursorOnDemandMonthlyBudget(cursorRaw.onDemandMonthlyBudget),
     },
-    codex: {
-      enabled: codexEnabled,
-      defaultAgent: defaultTool === "codex",
-      path: readToolCliPath(codexRaw, { label: "codex", onLegacyField }),
-      model: normalizeOptionalConfigField(codexRaw.model, { label: "codex.model" }),
-      alternativeModel: normalizeOptionalConfigField(codexRaw.alternativeModel, { label: "codex.alternativeModel" }),
-      effort: normalizeOptionalConfigField(codexRaw.effort, { label: "codex.effort" }),
-    },
-    ccc: {
-      DEEPSEEK_API_KEY: normalizeOptionalConfigField(cccRaw.DEEPSEEK_API_KEY, { label: "ccc.DEEPSEEK_API_KEY" }),
-      DEEPSEEK_BASE_URL: normalizeOptionalConfigField(cccRaw.DEEPSEEK_BASE_URL, {
-        label: "ccc.DEEPSEEK_BASE_URL",
-        fallback: DEFAULT_CCC_DEEPSEEK_BASE_URL,
-      }),
-      model: normalizeOptionalConfigField(cccRaw.model, { label: "ccc.model", fallback: DEFAULT_CCC_MODEL }),
-    },
-  };
-}
+    codex: {
+      enabled: codexEnabled,
+      defaultAgent: defaultTool === "codex",
+      path: readToolCliPath(codexRaw, { label: "codex", onLegacyField }),
+      model: normalizeOptionalConfigField(codexRaw.model, { label: "codex.model" }),
+      alternativeModel: normalizeOptionalConfigField(codexRaw.alternativeModel, { label: "codex.alternativeModel" }),
+      effort: normalizeOptionalConfigField(codexRaw.effort, { label: "codex.effort" }),
+    },
+    ccc: {
+      DEEPSEEK_API_KEY: normalizeOptionalConfigField(cccRaw.DEEPSEEK_API_KEY, { label: "ccc.DEEPSEEK_API_KEY" }),
+      DEEPSEEK_BASE_URL: normalizeOptionalConfigField(cccRaw.DEEPSEEK_BASE_URL, {
+        label: "ccc.DEEPSEEK_BASE_URL",
+        fallback: DEFAULT_CCC_DEEPSEEK_BASE_URL,
+      }),
+      model: normalizeOptionalConfigField(cccRaw.model, { label: "ccc.model", fallback: DEFAULT_CCC_MODEL }),
+    },
+  };
+}
 
 /**
  * 全局可变 config 对象。
@@ -967,26 +967,26 @@ export function explainMissingFeishuCredentialsAndExit(): never {
 export const CLAUDE_SESSION_PREFIX = "Claude Code Session:";
 /** 群描述中用于识别 Cursor 会话的前缀 */
 export const CURSOR_SESSION_PREFIX = "Cursor Session:";
-/** 群描述中用于识别 Codex 会话的前缀 */
-export const CODEX_SESSION_PREFIX = "Codex Session:";
-/** 群描述中用于识别 hidden ccc agent 会话的前缀 */
-export const CCC_SESSION_PREFIX = "CCC Session:";
+/** 群描述中用于识别 Codex 会话的前缀 */
+export const CODEX_SESSION_PREFIX = "Codex Session:";
+/** 群描述中用于识别 hidden ccc agent 会话的前缀 */
+export const CCC_SESSION_PREFIX = "CCC Session:";
 
 /** 根据 tool 名称返回对应的群描述前缀 */
-export function sessionPrefixForTool(tool: string): string {
-  if (tool === "cursor") return CURSOR_SESSION_PREFIX;
-  if (tool === "codex") return CODEX_SESSION_PREFIX;
-  if (tool === "ccc") return CCC_SESSION_PREFIX;
-  return CLAUDE_SESSION_PREFIX;
-}
+export function sessionPrefixForTool(tool: string): string {
+  if (tool === "cursor") return CURSOR_SESSION_PREFIX;
+  if (tool === "codex") return CODEX_SESSION_PREFIX;
+  if (tool === "ccc") return CCC_SESSION_PREFIX;
+  return CLAUDE_SESSION_PREFIX;
+}
 
 /** 根据 tool 名称返回用于状态展示的标签 */
-export function toolDisplayName(tool: string): string {
-  if (tool === "cursor") return "Cursor";
-  if (tool === "codex") return "Codex";
-  if (tool === "ccc") return "CCC Agent";
-  return "Claude Code";
-}
+export function toolDisplayName(tool: string): string {
+  if (tool === "cursor") return "Cursor";
+  if (tool === "codex") return "Codex";
+  if (tool === "ccc") return "CCC Agent";
+  return "Claude Code";
+}
 
 /** 解析 /new 未指定工具时使用的默认 Agent。旧配置缺省 defaultAgent 时保持 Claude 优先。 */
 export function resolveDefaultAgentTool(cfg: AppConfig = config): AgentTool {

package/src/feishu-api.ts

@@ -11,10 +11,10 @@ import {
   CHAT_LOGS_DIR,
   PROJECT_ROOT,
   USER_DATA_DIR,
-  CLAUDE_SESSION_PREFIX,
-  CURSOR_SESSION_PREFIX,
-  CODEX_SESSION_PREFIX,
-  CCC_SESSION_PREFIX,
+  CLAUDE_SESSION_PREFIX,
+  CURSOR_SESSION_PREFIX,
+  CODEX_SESSION_PREFIX,
+  CCC_SESSION_PREFIX,
   ts,
   resolveDefaultAgentTool,
   toolDisplayName,
@@ -277,16 +277,16 @@ export async function disbandChat(
 
 export function extractSessionInfo(description: string): { sessionId: string; tool: string } | null {
   const PREFIXES: Array<{ prefix: string; tool: string }> = [
-    { prefix: CLAUDE_SESSION_PREFIX, tool: "claude" },
-    { prefix: CURSOR_SESSION_PREFIX, tool: "cursor" },
-    { prefix: CODEX_SESSION_PREFIX, tool: "codex" },
-    { prefix: CCC_SESSION_PREFIX, tool: "ccc" },
-  ];
-  for (const { prefix, tool } of PREFIXES) {
-    const idx = description.indexOf(prefix);
-    if (idx === -1) continue;
-    const after = description.slice(idx + prefix.length).trim();
-    const match = after.match(/^([a-zA-Z0-9_.-]+)/);
+    { prefix: CLAUDE_SESSION_PREFIX, tool: "claude" },
+    { prefix: CURSOR_SESSION_PREFIX, tool: "cursor" },
+    { prefix: CODEX_SESSION_PREFIX, tool: "codex" },
+    { prefix: CCC_SESSION_PREFIX, tool: "ccc" },
+  ];
+  for (const { prefix, tool } of PREFIXES) {
+    const idx = description.indexOf(prefix);
+    if (idx === -1) continue;
+    const after = description.slice(idx + prefix.length).trim();
+    const match = after.match(/^([a-zA-Z0-9_.-]+)/);
     if (match) return { sessionId: match[1], tool };
   }
   return null;
@@ -319,12 +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 PLAIN_AVATAR_TOOL = "plain";
-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;
@@ -355,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 : PLAIN_AVATAR_TOOL;
-}
+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,
@@ -758,19 +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 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];
+  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(
@@ -797,16 +797,16 @@ async function renderAvatar(
     .jpeg({ quality: 95, progressive: false })
     .toBuffer();
 
-  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`,
-  };
-}
+  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,