chatccc 0.2.219 → 0.2.221

package/src/cards.ts

@@ -70,10 +70,29 @@ const TOOL_EMOJI_MAP: Record<string, string> = {
   Agent: "\u{1F916}",         // 🤖
   NotebookEdit: "\u{1F4D3}",  // 📓
   AskUserQuestion: "\u{2753}",// ❓
+  // CCC 内置 Agent 下划线命名（getToolEmoji 会先把下划线转驼峰再查表，这里保留蛇形条目以便直接命中）
+  read_file: "\u{1F4D6}",          // 📖
+  list_dir: "\u{1F4C2}",          // 📂
+  search_code: "\u{1F50E}",       // 🔎
+  run_command: "\u{1F5A5}\u{FE0F}", // 🖥️
+  edit_file: "\u{270F}\u{FE0F}",  // ✏️
+  create_file: "\u{270D}\u{FE0F}", // ✍️
+  delete_file: "\u{1F5D1}\u{FE0F}", // 🗑️
+  move_file: "\u{1F4E6}",         // 📦
+  apply_patch: "\u{1F4CB}",       // 📋
 };
 
 export function getToolEmoji(name: string): string {
-  return TOOL_EMOJI_MAP[name] ?? "\u{1F527}"; // 🔧
+  return TOOL_EMOJI_MAP[name] ?? TOOL_EMOJI_MAP[normalizeToolName(name)] ?? "\u{1F527}"; // 🔧
+}
+
+/** 把下划线命名转成驼峰（read_file → ReadFile），用于兼容两种命名风格 */
+export function normalizeToolName(name: string): string {
+  return name
+    .split("_")
+    .filter((part) => part.length > 0)
+    .map((part) => part.charAt(0).toUpperCase() + part.slice(1))
+    .join("");
 }
 
 // ---------------------------------------------------------------------------
@@ -133,11 +152,12 @@ export function buildHelpCard(
     `发送 **/new** 创建新会话（使用 /cd 设置的目录，默认 ${defaultToolLabel}）`,
     "发送 **/new claude** 创建新 Claude 会话",
     "发送 **/new cursor** 创建新 Cursor 会话",
-    "发送 **/new codex** 创建新 Codex 会话",
+    "发送 **/new codex** 创建新 Codex 会话",
+    "发送 **/new ccc** 创建新 CCC Agent 会话",
     "发送 **/newh** 重置当前会话（沿用当前工作目录，不切换）",
     "发送 **/plan** 以规划模式提问（只读，不执行写操作）",
     "发送 **/ask** 以问答模式提问（只读，不执行写操作）",
-    "发送 **/usage** 查看 Codex 实际存在的 5h/7天用量窗口，以及查询/使用主动重置卡",
+    "发送 **/usage** 查看当前 Agent 的用量或余额",
     "发送 **/restart** 重启 ChatCCC 进程",
     "发送 **/update** 更新并重启（仅 npm 全局安装可用）",
     ABD_HELP_LINE,
@@ -152,7 +172,8 @@ export function buildHelpCard(
         { text: `新建默认会话（/new，${defaultToolLabel}）`, value: JSON.stringify({ cmd: "new" }), type: "primary" },
         { text: "新建 Claude 会话（/new claude）", value: JSON.stringify({ cmd: "new claude" }), type: "primary" },
         { text: "新建 Cursor 会话（/new cursor）", value: JSON.stringify({ cmd: "new cursor" }), type: "primary" },
-        { text: "新建 Codex 会话（/new codex）", value: JSON.stringify({ cmd: "new codex" }), type: "primary" },
+        { text: "新建 Codex 会话（/new codex）", value: JSON.stringify({ cmd: "new codex" }), type: "primary" },
+        { text: "新建 CCC Agent 会话（/new ccc）", value: JSON.stringify({ cmd: "new ccc" }), type: "primary" },
         { text: "重启 ChatCCC（/restart）", value: JSON.stringify({ cmd: "restart" }), type: "danger" },
         { text: "更新并重启（/update）", value: JSON.stringify({ cmd: "update" }), type: "danger" },
         { text: "切换工作路径（/cd）", value: JSON.stringify({ cmd: "cd" }), type: "default" },
@@ -344,8 +365,8 @@ export function buildSessionsCard(sessions: Array<{
       header: { template: "blue", title: { content: "所有会话", tag: "plain_text" } },
       elements: [
         { tag: "div", text: { tag: "lark_md", content: fixedPrivateSession
-          ? `当前没有会话记录。\n\n直接发送普通消息即可创建飞书私聊专属 ${defaultToolLabel} 会话；默认 Agent 变化后，下一条普通消息会创建对应 Agent 的新空会话。发送 **/new**、**/new claude**、**/new cursor** 或 **/new codex** 会另外创建会话群。`
-          : `当前没有会话记录。\n\n使用 **/new**（默认 ${defaultToolLabel}）、**/new claude**、**/new cursor** 或 **/new codex** 创建新会话。\n创建后可在任意会话群内发送 **/sessions** 查看列表，用 **/session 数字** 切换会话。` } },
+          ? `当前没有会话记录。\n\n直接发送普通消息即可创建飞书私聊专属 ${defaultToolLabel} 会话；默认 Agent 变化后，下一条普通消息会创建对应 Agent 的新空会话。发送 **/new**、**/new claude**、**/new cursor**、**/new codex** 或 **/new ccc** 会另外创建会话群。`
+          : `当前没有会话记录。\n\n使用 **/new**（默认 ${defaultToolLabel}）、**/new claude**、**/new cursor**、**/new codex** 或 **/new ccc** 创建新会话。\n创建后可在任意会话群内发送 **/sessions** 查看列表，用 **/session 数字** 切换会话。` } },
         { tag: "hr" },
         { tag: "action", actions: [{ tag: "button", text: { tag: "plain_text", content: "收起" }, type: "default", value: { action: "close" } }] },
       ],

package/src/config.ts

@@ -104,12 +104,18 @@ export interface CodexConfig {
 }
 
 export interface CccConfig {
+  /** Whether the built-in CCC Agent is available for new sessions. */
+  enabled: boolean;
+  /** Whether /new without an explicit tool should use CCC Agent. */
+  defaultAgent: boolean;
   /** 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;
+  /** Optional model exposed through /model for manual per-session switching. */
+  alternativeModel: string;
 }
 
 export interface FeishuConfig {
@@ -168,8 +174,8 @@ export interface AppConfig {
   ccc: CccConfig;
 }
 
-export type AgentTool = "claude" | "cursor" | "codex";
-export const AGENT_TOOLS: AgentTool[] = ["claude", "cursor", "codex"];
+export type AgentTool = "claude" | "cursor" | "codex" | "ccc";
+export const AGENT_TOOLS: AgentTool[] = ["claude", "cursor", "codex", "ccc"];
 export type CursorAvatarBatteryMode = "apiPercent" | "onDemandUse";
 
 /** 获取指定 agent 配置中所有模型相关的值（最多 100 个，去重） */
@@ -190,6 +196,7 @@ export function getAllModelsForTool(tool: string, cfg: AppConfig = config): stri
     collect(cfg.codex.alternativeModel);
   } else if (tool === "ccc") {
     collect(cfg.ccc.model);
+    collect(cfg.ccc.alternativeModel);
   }
 
   return Array.from(seen).slice(0, 100);
@@ -445,7 +452,14 @@ function loadConfig(): AppConfig {
       onDemandMonthlyBudget: 1000,
     },
     codex: { enabled: false, defaultAgent: false, path: "", model: "", alternativeModel: "", effort: "", fastMode: false },
-    ccc: { DEEPSEEK_API_KEY: "", DEEPSEEK_BASE_URL: DEFAULT_CCC_DEEPSEEK_BASE_URL, model: DEFAULT_CCC_MODEL },
+    ccc: {
+      enabled: false,
+      defaultAgent: false,
+      DEEPSEEK_API_KEY: "",
+      DEEPSEEK_BASE_URL: DEFAULT_CCC_DEEPSEEK_BASE_URL,
+      model: DEFAULT_CCC_MODEL,
+      alternativeModel: "",
+    },
   };
 
   if (!IS_TEST_ENV) {
@@ -498,7 +512,14 @@ function loadConfig(): AppConfig {
       onDemandMonthlyBudget?: unknown;
     };
     codex?: { enabled?: unknown; defaultAgent?: unknown; path?: unknown; command?: unknown; model?: unknown; alternativeModel?: unknown; effort?: unknown; fastMode?: unknown };
-    ccc?: { DEEPSEEK_API_KEY?: unknown; DEEPSEEK_BASE_URL?: unknown; model?: unknown };
+    ccc?: {
+      enabled?: unknown;
+      defaultAgent?: unknown;
+      DEEPSEEK_API_KEY?: unknown;
+      DEEPSEEK_BASE_URL?: unknown;
+      model?: unknown;
+      alternativeModel?: unknown;
+    };
     webUi?: { openOnStart?: unknown };
     chromeDevtools?: { enabled?: unknown; port?: unknown; chromePath?: unknown };
     rawStreamLogs?: unknown;
@@ -553,7 +574,7 @@ function loadConfig(): AppConfig {
       (typeof cursorRaw.model === "string" && (cursorRaw.model as string).trim()) ||
       (typeof cursorRaw.alternativeModel === "string" && (cursorRaw.alternativeModel as string).trim()),
     );
-  const codexNonEmpty = (): boolean =>
+  const codexNonEmpty = (): boolean =>
     Boolean(
       (typeof codexRaw.path === "string" && codexRaw.path.trim()) ||
       (typeof codexRaw.command === "string" && (codexRaw.command as string).trim()) ||
@@ -561,21 +582,28 @@ function loadConfig(): AppConfig {
       (typeof codexRaw.alternativeModel === "string" && (codexRaw.alternativeModel as string).trim()) ||
       (typeof codexRaw.effort === "string" && (codexRaw.effort as string).trim()) ||
       codexRaw.fastMode === true,
-    );
+    );
+  // 旧版 ccc 配置没有 enabled。只用 API Key 推断启用，避免 sample 中自带的
+  // 默认 Base URL / model 让升级用户在未配置凭证时意外启用 CCC Agent。
+  const cccNonEmpty = (): boolean =>
+    Boolean(typeof cccRaw.DEEPSEEK_API_KEY === "string" && cccRaw.DEEPSEEK_API_KEY.trim());
 
   const claudeEnabled = resolveEnabled(claude.enabled, claudeNonEmpty);
   const cursorEnabled = resolveEnabled(cursorRaw.enabled, cursorNonEmpty);
-  const codexEnabled = resolveEnabled(codexRaw.enabled, codexNonEmpty);
+  const codexEnabled = resolveEnabled(codexRaw.enabled, codexNonEmpty);
+  const cccEnabled = resolveEnabled(cccRaw.enabled, cccNonEmpty);
   const chromeDevtoolsPort = Number(chromeDevtoolsRaw.port);
   const explicitDefaultTool: AgentTool | null =
     typeof claude.defaultAgent === "boolean" && claude.defaultAgent && claudeEnabled ? "claude" :
     typeof cursorRaw.defaultAgent === "boolean" && cursorRaw.defaultAgent && cursorEnabled ? "cursor" :
-    typeof codexRaw.defaultAgent === "boolean" && codexRaw.defaultAgent && codexEnabled ? "codex" :
+    typeof codexRaw.defaultAgent === "boolean" && codexRaw.defaultAgent && codexEnabled ? "codex" :
+    typeof cccRaw.defaultAgent === "boolean" && cccRaw.defaultAgent && cccEnabled ? "ccc" :
     null;
   const fallbackDefaultTool: AgentTool =
     claudeEnabled ? "claude" :
     cursorEnabled ? "cursor" :
-    codexEnabled ? "codex" :
+    codexEnabled ? "codex" :
+    cccEnabled ? "ccc" :
     "claude";
   const defaultTool = explicitDefaultTool ?? fallbackDefaultTool;
 
@@ -655,12 +683,15 @@ function loadConfig(): AppConfig {
       fastMode: codexRaw.fastMode === true,
     },
     ccc: {
+      enabled: cccEnabled,
+      defaultAgent: defaultTool === "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 }),
+      alternativeModel: normalizeOptionalConfigField(cccRaw.alternativeModel, { label: "ccc.alternativeModel" }),
     },
   };
 }
@@ -981,7 +1012,7 @@ export const CLAUDE_SESSION_PREFIX = "Claude Code Session:";
 export const CURSOR_SESSION_PREFIX = "Cursor Session:";
 /** 群描述中用于识别 Codex 会话的前缀 */
 export const CODEX_SESSION_PREFIX = "Codex Session:";
-/** 群描述中用于识别 hidden ccc agent 会话的前缀 */
+/** 群描述中用于识别 CCC Agent 会话的前缀 */
 export const CCC_SESSION_PREFIX = "CCC Session:";
 
 /** 根据 tool 名称返回对应的群描述前缀 */

package/src/index.ts

@@ -333,6 +333,19 @@ async function processFeishuMessageEvent(data: Evt): Promise<void> {
     if (delayNotice) {
       const delayToken = await getTenantAccessToken();
       await sendCardReply(delayToken, chatId, "延迟送达", delayNotice, "yellow").catch(() => {});
+      // 延迟送达的旧消息只发提醒、不转发给 agent 执行：
+      // 断线重连或补推时，早已过期的消息不应未经确认就触发新任务。
+      // 用户如需执行可自行重发。
+      logTrace(traceId, "DONE", {
+        outcome: "skip_delayed_feishu_message",
+        chatId,
+        msgTimestamp,
+        delayMinutes: Math.floor((Date.now() - msgTimestamp) / 60000),
+      });
+      console.log(
+        `[${ts()}] [SKIP] Delayed Feishu message not forwarded to agent: messageId=${messageId ?? "(missing id)"} chatId=${chatId} createTime=${msgTimestamp}`,
+      );
+      return;
     }
 
     await handleCommand(