chatccc 0.2.192 → 0.2.194

package/src/builtin/context.ts

@@ -1,5 +1,5 @@
-import { createHash } from "node:crypto";
-import { existsSync, mkdirSync, readFileSync, renameSync, writeFileSync } from "node:fs";
+import { createHash, randomBytes } from "node:crypto";
+import { existsSync, mkdirSync, readdirSync, readFileSync, renameSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { join } from "node:path";
 
@@ -12,14 +12,27 @@ export interface BuiltinContextMessage {
 
 export interface BuiltinContextState {
   version: 1;
+  createdAt: number;
   updatedAt: number;
   sessionId: string;
+  cwd?: string;
   summary: string;
   messages: BuiltinContextMessage[];
   totalMessages: number;
   compactedMessages: number;
 }
 
+export interface BuiltinContextSessionInfo {
+  sessionId: string;
+  createdAt: number;
+  updatedAt: number;
+  cwd?: string;
+  totalMessages: number;
+  compactedMessages: number;
+  hasSummary: boolean;
+  contextFilePath: string;
+}
+
 export interface BuiltinCompactionPlan {
   previousSummary: string;
   oldMessages: BuiltinContextMessage[];
@@ -30,6 +43,7 @@ export interface BuiltinContextOptions {
   persist?: boolean;
   contextDir?: string;
   sessionId?: string;
+  cwd?: string;
   compactAtTokens?: number;
   keepRecentMessages?: number;
 }
@@ -38,7 +52,7 @@ export const DEFAULT_BUILTIN_CONTEXT_DIR = join(homedir(), ".chatccc", "builtin"
 export const DEFAULT_COMPACT_AT_TOKENS = 48_000;
 export const DEFAULT_KEEP_RECENT_MESSAGES = 16;
 
-function sanitizeSessionId(value: string): string {
+export function normalizeBuiltinSessionId(value: string): string {
   return value.replace(/[^a-zA-Z0-9_.-]+/g, "_").replace(/^_+|_+$/g, "") || "default";
 }
 
@@ -47,6 +61,23 @@ export function defaultBuiltinSessionId(cwd: string = process.cwd()): string {
   return `cwd-${hash}`;
 }
 
+function pad(value: number): string {
+  return String(value).padStart(2, "0");
+}
+
+export function newBuiltinSessionId(now: Date = new Date(), suffix: string = randomBytes(3).toString("hex")): string {
+  const timestamp = [
+    now.getFullYear(),
+    pad(now.getMonth() + 1),
+    pad(now.getDate()),
+    "-",
+    pad(now.getHours()),
+    pad(now.getMinutes()),
+    pad(now.getSeconds()),
+  ].join("");
+  return normalizeBuiltinSessionId(`session-${timestamp}-${suffix}`);
+}
+
 function normalizeMessage(value: unknown): BuiltinContextMessage | null {
   if (!value || typeof value !== "object") return null;
   const raw = value as { role?: unknown; content?: unknown };
@@ -55,11 +86,14 @@ function normalizeMessage(value: unknown): BuiltinContextMessage | null {
   return { role: raw.role, content: raw.content };
 }
 
-function emptyState(sessionId: string): BuiltinContextState {
+function emptyState(sessionId: string, cwd?: string): BuiltinContextState {
+  const now = Date.now();
   return {
     version: 1,
-    updatedAt: Date.now(),
+    createdAt: now,
+    updatedAt: now,
     sessionId,
+    ...(cwd ? { cwd } : {}),
     summary: "",
     messages: [],
     totalMessages: 0,
@@ -67,17 +101,20 @@ function emptyState(sessionId: string): BuiltinContextState {
   };
 }
 
-function normalizeState(value: unknown, sessionId: string): BuiltinContextState {
-  if (!value || typeof value !== "object") return emptyState(sessionId);
+function normalizeState(value: unknown, sessionId: string, cwd?: string): BuiltinContextState {
+  if (!value || typeof value !== "object") return emptyState(sessionId, cwd);
   const raw = value as Partial<BuiltinContextState>;
   const messages = Array.isArray(raw.messages)
     ? raw.messages.map(normalizeMessage).filter((m): m is BuiltinContextMessage => !!m)
     : [];
+  const updatedAt = typeof raw.updatedAt === "number" ? raw.updatedAt : Date.now();
 
   return {
     version: 1,
-    updatedAt: typeof raw.updatedAt === "number" ? raw.updatedAt : Date.now(),
+    createdAt: typeof raw.createdAt === "number" ? raw.createdAt : updatedAt,
+    updatedAt,
     sessionId,
+    ...(typeof raw.cwd === "string" ? { cwd: raw.cwd } : cwd ? { cwd } : {}),
     summary: typeof raw.summary === "string" ? raw.summary : "",
     messages,
     totalMessages: typeof raw.totalMessages === "number" ? raw.totalMessages : messages.length,
@@ -85,6 +122,65 @@ function normalizeState(value: unknown, sessionId: string): BuiltinContextState
   };
 }
 
+function contextFilePath(contextDir: string, sessionId: string): string {
+  return join(contextDir, sessionId, "context.json");
+}
+
+function readSessionInfo(contextDir: string, sessionId: string): BuiltinContextSessionInfo | null {
+  const normalizedSessionId = normalizeBuiltinSessionId(sessionId);
+  const filePath = contextFilePath(contextDir, normalizedSessionId);
+  if (!existsSync(filePath)) return null;
+  try {
+    const raw = readFileSync(filePath, "utf8");
+    const state = normalizeState(JSON.parse(raw), normalizedSessionId);
+    return {
+      sessionId: normalizedSessionId,
+      createdAt: state.createdAt,
+      updatedAt: state.updatedAt,
+      ...(state.cwd ? { cwd: state.cwd } : {}),
+      totalMessages: state.totalMessages,
+      compactedMessages: state.compactedMessages,
+      hasSummary: state.summary.trim().length > 0,
+      contextFilePath: filePath,
+    };
+  } catch {
+    return null;
+  }
+}
+
+export function getBuiltinContextSession(
+  sessionId: string,
+  contextDir: string = DEFAULT_BUILTIN_CONTEXT_DIR,
+): BuiltinContextSessionInfo | null {
+  return readSessionInfo(contextDir, sessionId);
+}
+
+export function listBuiltinContextSessions(
+  contextDir: string = DEFAULT_BUILTIN_CONTEXT_DIR,
+): BuiltinContextSessionInfo[] {
+  if (!existsSync(contextDir)) return [];
+  const sessions: BuiltinContextSessionInfo[] = [];
+  for (const entry of readdirSync(contextDir, { withFileTypes: true })) {
+    if (!entry.isDirectory()) continue;
+    const info = readSessionInfo(contextDir, entry.name);
+    if (info) sessions.push(info);
+  }
+  return sessions.sort((a, b) => {
+    if (b.updatedAt !== a.updatedAt) return b.updatedAt - a.updatedAt;
+    return a.sessionId.localeCompare(b.sessionId);
+  });
+}
+
+export function latestBuiltinSessionForCwd(
+  cwd: string,
+  contextDir: string = DEFAULT_BUILTIN_CONTEXT_DIR,
+): BuiltinContextSessionInfo | null {
+  const legacySessionId = defaultBuiltinSessionId(cwd);
+  return listBuiltinContextSessions(contextDir).find((session) =>
+    session.cwd === cwd || session.sessionId === legacySessionId
+  ) ?? null;
+}
+
 export function estimateBuiltinContextTokens(summary: string, messages: readonly BuiltinContextMessage[]): number {
   const chars = summary.length + messages.reduce((sum, m) => sum + m.role.length + m.content.length, 0);
   return Math.ceil(chars / 3);
@@ -123,12 +219,14 @@ export class BuiltinContextManager {
   readonly compactAtTokens: number;
   readonly keepRecentMessages: number;
 
+  private readonly cwd?: string;
   private state: BuiltinContextState;
 
   constructor(options: BuiltinContextOptions = {}) {
     this.persist = options.persist ?? false;
     this.contextDir = options.contextDir ?? DEFAULT_BUILTIN_CONTEXT_DIR;
-    this.sessionId = sanitizeSessionId(options.sessionId ?? defaultBuiltinSessionId());
+    this.sessionId = normalizeBuiltinSessionId(options.sessionId ?? defaultBuiltinSessionId());
+    this.cwd = options.cwd;
     this.compactAtTokens = options.compactAtTokens ?? DEFAULT_COMPACT_AT_TOKENS;
     this.keepRecentMessages = Math.max(1, options.keepRecentMessages ?? DEFAULT_KEEP_RECENT_MESSAGES);
     this.state = this.load();
@@ -147,7 +245,7 @@ export class BuiltinContextManager {
   }
 
   get contextFilePath(): string {
-    return join(this.contextDir, this.sessionId, "context.json");
+    return contextFilePath(this.contextDir, this.sessionId);
   }
 
   appendMessage(message: BuiltinContextMessage): void {
@@ -199,7 +297,7 @@ export class BuiltinContextManager {
   }
 
   reset(): void {
-    this.state = emptyState(this.sessionId);
+    this.state = emptyState(this.sessionId, this.cwd);
     this.save();
   }
 
@@ -214,12 +312,12 @@ export class BuiltinContextManager {
   }
 
   private load(): BuiltinContextState {
-    if (!this.persist || !existsSync(this.contextFilePath)) return emptyState(this.sessionId);
+    if (!this.persist || !existsSync(this.contextFilePath)) return emptyState(this.sessionId, this.cwd);
     try {
       const raw = readFileSync(this.contextFilePath, "utf8");
-      return normalizeState(JSON.parse(raw), this.sessionId);
+      return normalizeState(JSON.parse(raw), this.sessionId, this.cwd);
     } catch {
-      return emptyState(this.sessionId);
+      return emptyState(this.sessionId, this.cwd);
     }
   }
 }

package/src/builtin/index.ts

@@ -126,6 +126,7 @@ export class ChatSession {
       persist: options.persist ?? false,
       contextDir: options.contextDir,
       sessionId: options.sessionId ?? defaultBuiltinSessionId(options.cwd ?? process.cwd()),
+      cwd: options.cwd ?? process.cwd(),
       compactAtTokens: options.compactAtTokens,
       keepRecentMessages: options.keepRecentMessages,
     });

package/src/builtin/session-select.ts

@@ -0,0 +1,48 @@
+import {
+  DEFAULT_BUILTIN_CONTEXT_DIR,
+  getBuiltinContextSession,
+  latestBuiltinSessionForCwd,
+  newBuiltinSessionId,
+  normalizeBuiltinSessionId,
+} from "./context.js";
+
+export type BuiltinResumeRequest = true | string | undefined;
+
+export interface ResolveBuiltinSessionOptions {
+  cwd: string;
+  contextDir?: string;
+  resume?: BuiltinResumeRequest;
+  now?: Date;
+  randomSuffix?: string;
+}
+
+export interface ResolvedBuiltinSession {
+  mode: "new" | "resumed";
+  sessionId: string;
+}
+
+export function resolveBuiltinSession(options: ResolveBuiltinSessionOptions): ResolvedBuiltinSession {
+  const contextDir = options.contextDir ?? DEFAULT_BUILTIN_CONTEXT_DIR;
+
+  if (options.resume === true) {
+    const latest = latestBuiltinSessionForCwd(options.cwd, contextDir);
+    if (!latest) {
+      throw new Error(`未找到当前目录可恢复的 ccc 会话: ${options.cwd}`);
+    }
+    return { mode: "resumed", sessionId: latest.sessionId };
+  }
+
+  if (typeof options.resume === "string") {
+    const sessionId = normalizeBuiltinSessionId(options.resume);
+    const existing = getBuiltinContextSession(sessionId, contextDir);
+    if (!existing) {
+      throw new Error(`未找到 ccc 会话: ${sessionId}`);
+    }
+    return { mode: "resumed", sessionId };
+  }
+
+  return {
+    mode: "new",
+    sessionId: newBuiltinSessionId(options.now, options.randomSuffix),
+  };
+}

package/src/cards.ts

@@ -274,8 +274,48 @@ export function buildCdCard(
   });
 }
 
-// 所有会话列表卡片（Claude Code 优先，然后 Cursor）
-export function buildSessionsCard(sessions: Array<{
+function sessionToolLabel(tool: string): string {
+  if (tool === "cursor") return "Cursor";
+  if (tool === "codex") return "Codex";
+  if (tool === "ccc") return "CCC Agent";
+  return "Claude Code";
+}
+
+function pushSessionGroup(
+  lines: string[],
+  title: string,
+  sessions: Array<{
+    sessionId: string;
+    chatName: string;
+    chatId: string;
+    active: boolean;
+    turnCount: number;
+    elapsedSeconds: number | null;
+    model: string;
+    tool: string;
+  }>,
+  formatSession: (session: {
+    sessionId: string;
+    chatName: string;
+    chatId: string;
+    active: boolean;
+    turnCount: number;
+    elapsedSeconds: number | null;
+    model: string;
+    tool: string;
+  }, index: number) => string,
+  index: { value: number },
+): void {
+  if (sessions.length === 0) return;
+  if (index.value > 0) lines.push("", `**${title}:**`, "");
+  else lines.push(`**${title}:**`, "");
+  for (const session of sessions) {
+    lines.push(formatSession(session, index.value++));
+  }
+}
+
+// 所有会话列表卡片（Claude Code 优先，然后 Cursor）
+export function buildSessionsCard(sessions: Array<{
   sessionId: string;
   chatName: string;
   chatId: string;
@@ -285,14 +325,16 @@ export function buildSessionsCard(sessions: Array<{
   model: string;
   tool: string;
 }>, opts: { defaultToolLabel?: string } = {}): string {
-  const defaultToolLabel = opts.defaultToolLabel ?? "Claude Code";
-  // 按 tool 分组排序：Claude Code 在前，Cursor 其次，Codex 最后
-  const claudeCodeSessions = sessions.filter(s => s.tool !== "cursor" && s.tool !== "codex");
-  const cursorSessions = sessions.filter(s => s.tool === "cursor");
-  const codexSessions = sessions.filter(s => s.tool === "codex");
-  const hasClaudeCode = claudeCodeSessions.length > 0;
-  const hasCursor = cursorSessions.length > 0;
-  const hasCodex = codexSessions.length > 0;
+  const defaultToolLabel = opts.defaultToolLabel ?? "Claude Code";
+  // 按 tool 分组排序：Claude Code 在前，Cursor 其次，Codex 最后
+  const claudeCodeSessions = sessions.filter(s => s.tool !== "cursor" && s.tool !== "codex" && s.tool !== "ccc");
+  const cursorSessions = sessions.filter(s => s.tool === "cursor");
+  const codexSessions = sessions.filter(s => s.tool === "codex");
+  const cccSessions = sessions.filter(s => s.tool === "ccc");
+  const hasClaudeCode = claudeCodeSessions.length > 0;
+  const hasCursor = cursorSessions.length > 0;
+  const hasCodex = codexSessions.length > 0;
+  const hasCcc = cccSessions.length > 0;
 
   if (sessions.length === 0) {
     return JSON.stringify({
@@ -315,37 +357,18 @@ export function buildSessionsCard(sessions: Array<{
       const secs = s.elapsedSeconds % 60;
       extra = ` | 本轮: ${mins}分${secs}秒`;
     }
-    const toolLabel = s.tool === "cursor" ? "Cursor" : s.tool === "codex" ? "Codex" : "Claude Code";
+    const toolLabel = sessionToolLabel(s.tool);
     const namePart = s.chatName ? `**${s.chatName}** ` : "";
     const chatTag = !s.chatId ? " (chat id缺失)" : s.chatId.startsWith("oc_") ? " (群聊)" : "";
     return `**${i + 1}.** ${namePart}${chatTag} \`${shortId}\` ${status} | 工具: ${toolLabel} | 轮数: ${s.turnCount} | ${s.model}${extra}`;
   };
 
   const lines: string[] = [`共 **${sessions.length}** 个会话:`, ""];
-  let idx = 0;
-
-  if (hasClaudeCode) {
-    lines.push("**Claude Code 会话:**", "");
-    for (const s of claudeCodeSessions) {
-      lines.push(formatSession(s, idx++));
-    }
-  }
-
-  if (hasCursor) {
-    if (hasClaudeCode) lines.push("", "**Cursor 会话:**", "");
-    else lines.push("**Cursor 会话:**", "");
-    for (const s of cursorSessions) {
-      lines.push(formatSession(s, idx++));
-    }
-  }
-
-  if (hasCodex) {
-    if (hasClaudeCode || hasCursor) lines.push("", "**Codex 会话:**", "");
-    else lines.push("**Codex 会话:**", "");
-    for (const s of codexSessions) {
-      lines.push(formatSession(s, idx++));
-    }
-  }
+  const idx = { value: 0 };
+  if (hasClaudeCode) pushSessionGroup(lines, "Claude Code 会话", claudeCodeSessions, formatSession, idx);
+  if (hasCursor) pushSessionGroup(lines, "Cursor 会话", cursorSessions, formatSession, idx);
+  if (hasCodex) pushSessionGroup(lines, "Codex 会话", codexSessions, formatSession, idx);
+  if (hasCcc) pushSessionGroup(lines, "CCC Agent 会话", cccSessions, formatSession, idx);
 
   return JSON.stringify({
     config: { wide_screen_mode: true },

package/src/config.ts

@@ -169,7 +169,7 @@ export const AGENT_TOOLS: AgentTool[] = ["claude", "cursor", "codex"];
 export type CursorAvatarBatteryMode = "apiPercent" | "onDemandUse";
 
 /** 获取指定 agent 配置中所有模型相关的值（最多 100 个，去重） */
-export function getAllModelsForTool(tool: AgentTool, cfg: AppConfig = config): string[] {
+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());
@@ -181,10 +181,12 @@ export function getAllModelsForTool(tool: AgentTool, cfg: AppConfig = config): s
   } 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 === "codex") {
+    collect(cfg.codex.model);
+    collect(cfg.codex.alternativeModel);
+  } else if (tool === "ccc") {
+    collect(cfg.ccc.model);
+  }
 
   return Array.from(seen).slice(0, 100);
 }
@@ -192,7 +194,7 @@ export function getAllModelsForTool(tool: AgentTool, cfg: AppConfig = config): s
 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: AgentTool): string[] {
+export function getAllEffortsForTool(tool: string): string[] {
   if (tool === "claude") return [...CLAUDE_EFFORT_LEVELS];
   if (tool === "codex") return [...CODEX_EFFORT_LEVELS];
   return [];
@@ -962,22 +964,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:";
+/** 群描述中用于识别 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;
-  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";
-  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,9 +11,10 @@ import {
   CHAT_LOGS_DIR,
   PROJECT_ROOT,
   USER_DATA_DIR,
-  CLAUDE_SESSION_PREFIX,
-  CURSOR_SESSION_PREFIX,
-  CODEX_SESSION_PREFIX,
+  CLAUDE_SESSION_PREFIX,
+  CURSOR_SESSION_PREFIX,
+  CODEX_SESSION_PREFIX,
+  CCC_SESSION_PREFIX,
   ts,
   resolveDefaultAgentTool,
   toolDisplayName,
@@ -276,15 +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" },
-  ];
-  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(/^([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})/i);
+    { 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;
@@ -317,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;
@@ -352,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,
@@ -755,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(
@@ -791,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,

package/src/orchestrator.ts

@@ -742,7 +742,7 @@ export async function handleCommand(
     const toolArg = text.slice(5).trim().toLowerCase();
     const tool = toolArg || resolveDefaultAgentTool();
     logTrace(tid, "BRANCH", { cmd: "/new", tool });
-    const validTools = ["claude", "cursor", "codex"];
+    const validTools = ["claude", "cursor", "codex", "ccc"];
     if (!validTools.includes(tool)) {
       logTrace(tid, "DONE", { outcome: "new_invalid_tool", tool });
       await platform.sendCard(