chatccc 0.2.191 → 0.2.193

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;

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(

package/src/session.ts

@@ -27,9 +27,10 @@ import { logTrace } from "./trace.ts";
 import type { UnifiedBlock } from "./adapters/adapter-interface.ts";
 import type { ToolAdapter } from "./adapters/adapter-interface.ts";
 import type { ToolProcessInfo } from "./adapters/adapter-interface.ts";
-import { createClaudeAdapter } from "./adapters/claude-adapter.ts";
-import { createCursorAdapter } from "./adapters/cursor-adapter.ts";
-import { createCodexAdapter } from "./adapters/codex-adapter.ts";
+import { createClaudeAdapter } from "./adapters/claude-adapter.ts";
+import { createCursorAdapter } from "./adapters/cursor-adapter.ts";
+import { createCodexAdapter } from "./adapters/codex-adapter.ts";
+import { createCccAdapter } from "./adapters/ccc-adapter.ts";
 import { resourceMonitor, registerProcess, unregisterProcess } from "./adapters/resource-monitor.ts";
 import { buildImSkillsPromptCached, exportSkillSubDocs, clearImSkillsPromptCache } from "./im-skills.ts";
 import type { PlatformAdapter } from "./platform-adapter.ts";
@@ -370,8 +371,9 @@ export function getEffectiveModelForTool(tool: string, sessionId?: string): stri
     const override = sessionModelOverrides.get(sessionId);
     if (override) return override;
   }
-  if (tool === "cursor") return config.cursor.model;
-  if (tool === "codex") return config.codex.model;
+  if (tool === "cursor") return config.cursor.model;
+  if (tool === "codex") return config.codex.model;
+  if (tool === "ccc") return config.ccc.model;
   return CLAUDE_MODEL;
 }
 
@@ -420,6 +422,8 @@ export function getAdapterForTool(tool: string, sessionId?: string): ToolAdapter
     adapter = createCursorAdapter({ model: effectiveModel || undefined });
   } else if (tool === "codex") {
     adapter = createCodexAdapter({ model: effectiveModel || undefined, effort: effectiveEffort || undefined });
+  } else if (tool === "ccc") {
+    adapter = createCccAdapter({ model: effectiveModel || undefined });
   } else {
     adapter = createClaudeAdapter({
       model: effectiveModel,
@@ -859,12 +863,17 @@ function formatToolConfigForLog(tool: string, sessionModel?: string, sessionId?:
   if (tool === "codex") {
     const m = getEffectiveModelForTool(tool, sessionId);
     const e = getEffectiveEffortForTool(tool, sessionId);
-    const modelStr = m.trim() !== "" ? m : "(由 codex config.toml 决定)";
-    const effortStr = e.trim() !== ""
-      ? `effort=${e}`
-      : "effort=(由 codex config.toml 决定)";
-    return `model=${modelStr}, ${effortStr}`;
-  }
+    const modelStr = m.trim() !== "" ? m : "(由 codex config.toml 决定)";
+    const effortStr = e.trim() !== ""
+      ? `effort=${e}`
+      : "effort=(由 codex config.toml 决定)";
+    return `model=${modelStr}, ${effortStr}`;
+  }
+  if (tool === "ccc") {
+    const m = getEffectiveModelForTool(tool, sessionId);
+    const modelStr = m.trim() !== "" ? m : "(not configured)";
+    return `model=${modelStr}, baseURL=${config.ccc.DEEPSEEK_BASE_URL}`;
+  }
   return `model=${anthropicConfigDisplay(getModelForSession(sessionId))}, subagentModel=${anthropicConfigDisplay(CLAUDE_SUBAGENT_MODEL)}, effort=${anthropicConfigDisplay(getEffectiveEffortForTool(tool, sessionId))}`;
 }
 
@@ -1784,10 +1793,17 @@ async function resolveModelEffort(
   if (tool === "codex") {
     const m = getEffectiveModelForTool(tool, sessionId);
     const e = getEffectiveEffortForTool(tool, sessionId);
-    return {
-      model: m.trim() !== "" ? m : UNKNOWN_MODEL_PLACEHOLDER,
-      effort: e.trim() !== "" ? e : UNKNOWN_MODEL_PLACEHOLDER,
-    };
+    return {
+      model: m.trim() !== "" ? m : UNKNOWN_MODEL_PLACEHOLDER,
+      effort: e.trim() !== "" ? e : UNKNOWN_MODEL_PLACEHOLDER,
+    };
+  }
+  if (tool === "ccc") {
+    const m = getEffectiveModelForTool(tool, sessionId);
+    return {
+      model: m.trim() !== "" ? m : UNKNOWN_MODEL_PLACEHOLDER,
+      effort: null,
+    };
   }
   return {
     model: anthropicConfigDisplay(getModelForSession(sessionId)),