chatccc 0.2.4 → 0.2.6

package/src/config.ts

@@ -62,10 +62,56 @@ export const CLAUDE_MODEL = process.env.CHATCCC_ANTHROPIC_MODEL?.trim() || "defa
 
 export const CLAUDE_EFFORT = process.env.CHATCCC_ANTHROPIC_EFFORT?.trim() || "default";
 
+/** 探测 cursor-agent 安装路径（优先环境变量，其次 LocalAppData，最后默认 agent） */
+function detectCursorAgent(): string {
+  if (process.env.CHATCCC_CURSOR_COMMAND?.trim()) return process.env.CHATCCC_CURSOR_COMMAND.trim();
+  const localAppData = process.env.LOCALAPPDATA;
+  if (localAppData) {
+    const defaultPath = join(localAppData, "cursor-agent", "agent.cmd");
+    if (existsSync(defaultPath)) return defaultPath;
+  }
+  return "agent";
+}
+export const CURSOR_AGENT_COMMAND = detectCursorAgent();
+/** Cursor agent 参数：-p 非交互模式，stream-json 流式 JSONL 输出 */
+export const CURSOR_AGENT_ARGS = (process.env.CHATCCC_CURSOR_ARGS?.trim() || "-p --output-format stream-json --stream-partial-output").split(/\s+/).filter(Boolean);
+
 // 新建会话的默认工作路径（/cd 命令设置，持久化到本地文件）
-// 该路径仅影响通过 /new 新建的 Claude 会话，不影响已有会话的 resume。
+// 该路径仅影响通过 /new 新建的会话，不影响已有会话的 resume。
 export const DEFAULT_CWD_FILE = join(PROJECT_ROOT, ".claude", "working_dir.txt");
 
+/** 会话工具类型持久化文件 */
+export const SESSIONS_FILE = join(PROJECT_ROOT, ".claude", "sessions.json");
+
+/** 最近成功新建会话的工作路径记录（最多 10 条） */
+export const RECENT_DIRS_FILE = join(PROJECT_ROOT, ".claude", "recent_dirs.json");
+export const MAX_RECENT_DIRS = 10;
+
+/** 读取最近使用过的工作路径列表（最新的在前） */
+export async function getRecentDirs(): Promise<string[]> {
+  try {
+    const raw = await readFile(RECENT_DIRS_FILE, "utf-8");
+    const arr = JSON.parse(raw);
+    if (Array.isArray(arr)) return arr.filter((d: unknown) => typeof d === "string");
+  } catch { /* file doesn't exist or corrupted */ }
+  return [];
+}
+
+/** 添加一个路径到最近使用列表（去重、限制数量、最新的在前） */
+export async function addRecentDir(dir: string): Promise<void> {
+  const dirs = await getRecentDirs();
+  const filtered = dirs.filter(d => d !== dir);
+  filtered.unshift(dir);
+  const trimmed = filtered.slice(0, MAX_RECENT_DIRS);
+  try {
+    await mkdir(dirname(RECENT_DIRS_FILE), { recursive: true });
+    await writeFile(RECENT_DIRS_FILE, JSON.stringify(trimmed, null, 2), "utf-8");
+  } catch (err) {
+    console.error(`[${ts()}] Failed to save recent_dirs.json: ${(err as Error).message}`);
+    fileLog.flush();
+  }
+}
+
 /** 读取 /cd 设置的默认工作路径。若文件不存在或路径已失效，回退到用户主目录。 */
 export async function getDefaultCwd(): Promise<string> {
   try {
@@ -224,4 +270,19 @@ export function explainMissingFeishuCredentialsAndExit(): never {
   process.exit(1);
 }
 
-export const SESSION_DESC_PREFIX = "Claude Session:";
+/** 群描述中用于识别 Claude Code 会话的前缀 */
+export const CLAUDE_SESSION_PREFIX = "Claude Code Session:";
+/** 群描述中用于识别 Cursor 会话的前缀 */
+export const CURSOR_SESSION_PREFIX = "Cursor Session:";
+
+/** 根据 tool 名称返回对应的群描述前缀 */
+export function sessionPrefixForTool(tool: string): string {
+  if (tool === "cursor") return CURSOR_SESSION_PREFIX;
+  return CLAUDE_SESSION_PREFIX;
+}
+
+/** 根据 tool 名称返回用于状态展示的标签 */
+export function toolDisplayName(tool: string): string {
+  if (tool === "cursor") return "Cursor";
+  return "Claude Code";
+}

package/src/feishu-api.ts

@@ -7,7 +7,8 @@ import {
   BASE_URL,
   CHAT_LOGS_DIR,
   PROJECT_ROOT,
-  SESSION_DESC_PREFIX,
+  CLAUDE_SESSION_PREFIX,
+  CURSOR_SESSION_PREFIX,
   ts,
 } from "./config.ts";
 import { buildButtons } from "./cards.ts";
@@ -219,12 +220,24 @@ export async function getChatInfo(
   };
 }
 
+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" },
+  ];
+  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);
+    if (match) return { sessionId: match[1], tool };
+  }
+  return null;
+}
+
+/** @deprecated 使用 extractSessionInfo 代替 */
 export function extractSessionId(description: string): string | null {
-  const idx = description.indexOf(SESSION_DESC_PREFIX);
-  if (idx === -1) return null;
-  const after = description.slice(idx + SESSION_DESC_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);
-  return match ? match[1] : null;
+  return extractSessionInfo(description)?.sessionId ?? null;
 }
 
 // ---------------------------------------------------------------------------
@@ -325,9 +338,10 @@ export async function sendRestartCard(token: string): Promise<void> {
       config: { wide_screen_mode: true },
       header: { template: "green", title: { content: "ChatCCC Started", tag: "plain_text" } },
       elements: [
-        { tag: "div", text: { tag: "lark_md", content: "Bot 已启动完成，可以继续使用。\n\n发送 **/new** 创建新会话，或直接在已有会话群中发消息。" } },
+        { tag: "div", text: { tag: "lark_md", content: "Bot 已启动完成，可以继续使用。\n\n使用 **/new**（默认 Claude Code）或 **/new claude** / **/new cursor** 创建新会话" } },
         buildButtons([
-          { text: "新建会话（/new）", value: JSON.stringify({ cmd: "new" }), type: "primary" },
+          { text: "新建 Claude Code 会话（/new claude）", value: JSON.stringify({ cmd: "new" }), type: "primary" },
+          { text: "新建 Cursor 会话（/new cursor）", value: JSON.stringify({ cmd: "new cursor" }), type: "primary" },
           { text: "重启Chat CCC（/restart）", value: JSON.stringify({ cmd: "restart" }), type: "danger" },
           { text: "查看/切换工作路径（/cd）", value: JSON.stringify({ cmd: "cd" }), type: "default" },
         ]),

package/src/index.ts

@@ -22,7 +22,6 @@
  */
 
 import { spawn } from "node:child_process";
-import { getSessionInfo } from "@anthropic-ai/claude-agent-sdk";
 import { readdir, stat } from "node:fs/promises";
 import { resolve, dirname, basename } from "node:path";
 
@@ -49,13 +48,17 @@ import {
   getDefaultCwd,
   maskAppId,
   setDefaultCwd,
+  getRecentDirs,
+  addRecentDir,
+  sessionPrefixForTool,
+  toolDisplayName,
   ts,
 } from "./config.ts";
 import { printServiceDidNotStart, printServiceRunningHint } from "./exit-banner.ts";
 import {
   addReaction,
   createGroupChat,
-  extractSessionId,
+  extractSessionInfo,
   getChatInfo,
   getTenantAccessToken,
   recallMessage,
@@ -67,7 +70,7 @@ import {
   verifyAllPermissions,
   reportPermissionResults,
 } from "./feishu-api.ts";
-import { buildHelpCard, buildStatusCard, buildProgressCard, buildCdContent, buildSessionsCard } from "./cards.ts";
+import { buildHelpCard, buildStatusCard, buildProgressCard, buildCdContent, buildCdCard, buildSessionsCard } from "./cards.ts";
 import { updateCardKitCard } from "./cardkit.ts";
 import {
   MAX_PROCESSED,
@@ -79,6 +82,7 @@ import {
   resetState,
   resumeAndPrompt,
   sessionInfoMap,
+  getAdapterForTool,
 } from "./session.ts";
 
 // ---------------------------------------------------------------------------
@@ -96,7 +100,11 @@ function getInnerEvent(data: Evt): InnerEvent {
   return (data.event ?? data) as InnerEvent;
 }
 
-function extractText(message: { message_type?: string; content?: string }): string {
+/**
+ * 将飞书消息的原始 content JSON 结构转成可读文本，保留代码块等结构信息。
+ * 未知类型直接返回 JSON 原文，让 AI 自行理解。
+ */
+function formatMessageContent(message: { message_type?: string; content?: string }): string {
   const contentStr = message.content ?? "{}";
   let content: Record<string, unknown>;
   try { content = JSON.parse(contentStr); } catch { return ""; }
@@ -108,7 +116,36 @@ function extractText(message: { message_type?: string; content?: string }): stri
     text = text.replace(/&nbsp;/gi, " ");
     return text.trim();
   }
-  return "";
+
+  if (message.message_type === "post") {
+    return formatPostContent(content);
+  }
+
+  // 其他类型（image, file, audio, media, sticker）直接给原始 JSON
+  return contentStr;
+}
+
+function formatPostContent(content: Record<string, unknown>): string {
+  const paragraphs = content.content as unknown[][];
+  if (!Array.isArray(paragraphs)) return "";
+
+  const parts: string[] = [];
+  for (const line of paragraphs) {
+    if (!Array.isArray(line)) continue;
+    for (const elem of line) {
+      const el = elem as Record<string, unknown>;
+      if (!el || typeof el !== "object") continue;
+      const t = typeof el.text === "string" ? el.text : "";
+
+      if (el.tag === "code_block") {
+        const lang = typeof el.language === "string" ? el.language : "";
+        parts.push("```" + lang + "\n" + t + "\n```");
+      } else if (el.tag === "p" || el.tag === "text") {
+        if (t) parts.push(t);
+      }
+    }
+  }
+  return parts.join("\n").trim();
 }
 
 // ---------------------------------------------------------------------------
@@ -138,8 +175,12 @@ function parseCardAction(data: unknown): CardActionResult | null {
   }
   if (!cmd) return null;
 
-  const CMD_MAP: Record<string, string> = { stop: "/stop", new: "/new", restart: "/restart", status: "/status", cd: "/cd", sessions: "/sessions" };
-  const text = CMD_MAP[cmd] ?? "";
+  const CMD_MAP: Record<string, string> = { stop: "/stop", new: "/new", "new cursor": "/new cursor", restart: "/restart", status: "/status", cd: "/cd", sessions: "/sessions" };
+  let text = CMD_MAP[cmd] ?? "";
+  if (cmd === "cd" && typeof action.value === "object" && action.value !== null) {
+    const path = (action.value as Record<string, string>).path;
+    if (path) text = `/cd ${path}`;
+  }
   if (!text) return null;
 
   const chatId =
@@ -188,9 +229,10 @@ async function handleCommand(text: string, chatId: string, openId: string, msgTi
     let sessionCwd: string | undefined;
     try {
       const chatInfo = await getChatInfo(cdToken, chatId);
-      const sid = extractSessionId(chatInfo.description);
-      if (sid) {
-        const info = await getSessionInfo(sid);
+      const sessionInfoResult = extractSessionInfo(chatInfo.description);
+      if (sessionInfoResult) {
+        const adapter = getAdapterForTool(sessionInfoResult.tool);
+        const info = await adapter.getSessionInfo(sessionInfoResult.sessionId);
         sessionCwd = info?.cwd;
       }
     } catch { /* 非会话群或获取失败，不显示 */ }
@@ -223,6 +265,7 @@ async function handleCommand(text: string, chatId: string, openId: string, msgTi
     const isUpdate = !!arg && targetDir !== currentDir;
     if (isUpdate) {
       await setDefaultCwd(targetDir);
+      await addRecentDir(targetDir);
     }
 
     // Read directory entries
@@ -247,12 +290,39 @@ async function handleCommand(text: string, chatId: string, openId: string, msgTi
       return a.name.localeCompare(b.name);
     });
 
-    const content = buildCdContent(targetDir, withStats, isUpdate, sessionCwd);
-    await sendCardReply(cdToken, chatId, "新会话工作路径", content, "blue");
+    if (!arg) {
+      // /cd 无参数：展示卡片（含最近使用路径按钮）
+      const recentDirs = await getRecentDirs();
+      const card = buildCdCard(targetDir, withStats, recentDirs, sessionCwd);
+      const resp = await fetch(`${BASE_URL}/im/v1/messages?receive_id_type=chat_id`, {
+        method: "POST",
+        headers: {
+          Authorization: `Bearer ${cdToken}`,
+          "Content-Type": "application/json",
+        },
+        body: JSON.stringify({ receive_id: chatId, msg_type: "interactive", content: card }),
+      });
+      const respData: Record<string, any> = await resp.json().catch(() => ({}));
+      console.log(`[${ts()}] [CD] card sent, code=${respData.code}, msgId=${respData.data?.message_id ?? "N/A"}, recentDirs=${recentDirs.length}`);
+    } else {
+      // /cd <path>：切换目录，发送文本卡片
+      const content = buildCdContent(targetDir, withStats, isUpdate, sessionCwd);
+      await sendCardReply(cdToken, chatId, "新会话工作路径", content, "blue");
+    }
     return;
   }
 
-  if (text === "/new") {
+  if (text === "/new" || text.startsWith("/new ")) {
+    const toolArg = text.slice(5).trim();
+    const tool = toolArg || "claude";
+    const validTools = ["claude", "cursor"];
+    if (!validTools.includes(tool)) {
+      const warnToken = await getTenantAccessToken();
+      await sendCardReply(warnToken, chatId, "Error", `未知的工具类型: "${toolArg}"。支持: claude (Claude Code), cursor (Cursor)。`, "red");
+      return;
+    }
+    const toolLabel = toolDisplayName(tool);
+
     if (!openId) {
       console.log(`[${ts()}] [WARN] Cannot get sender open_id`);
       const warnToken = await getTenantAccessToken();
@@ -264,13 +334,13 @@ async function handleCommand(text: string, chatId: string, openId: string, msgTi
 
     let sessionId: string;
     try {
-      sessionId = await initClaudeSession();
-      console.log(`[${ts()}] [STEP 1/4] Claude SDK session created: ${sessionId} → OK`);
+      sessionId = await initClaudeSession(tool);
+      console.log(`[${ts()}] [STEP 1/4] ${toolLabel} session created: ${sessionId} → OK`);
     } catch (err) {
       console.error(`[${ts()}] [STEP 1/4] FAIL: ${(err as Error).message}`);
       await sendCardReply(
         freshToken, chatId, "Error",
-        `Failed to initialize Claude session:\n${(err as Error).message}`,
+        `Failed to initialize ${toolLabel} session:\n${(err as Error).message}`,
         "red"
       );
       return;
@@ -288,8 +358,9 @@ async function handleCommand(text: string, chatId: string, openId: string, msgTi
 
     try {
       const initialName = `新会话-${sessionId}`;
-      await updateChatInfo(freshToken, newChatId, initialName, `Claude Session: ${sessionId}`);
-      console.log(`[${ts()}] [STEP 3/4] Renamed group → name="${initialName}"  → OK`);
+      const descPrefix = sessionPrefixForTool(tool);
+      await updateChatInfo(freshToken, newChatId, initialName, `${descPrefix} ${sessionId}`);
+      console.log(`[${ts()}] [STEP 3/4] Renamed group → name="${initialName}" (${toolLabel}) → OK`);
     } catch (err) {
       console.error(`[${ts()}] [STEP 3/4] FAIL: ${(err as Error).message}`);
       await sendCardReply(freshToken, chatId, "Error", `Group created but rename failed:\n${(err as Error).message}`, "yellow");
@@ -297,9 +368,10 @@ async function handleCommand(text: string, chatId: string, openId: string, msgTi
     }
 
     const cwd = await getDefaultCwd();
+    const adapter = getAdapterForTool(tool);
     await sendCardReply(
-      freshToken, newChatId, "Claude Session Ready",
-      `群聊已创建，这是你的 Claude 会话群。\n\n**Session ID:** ${sessionId}\n**工作目录:** \`${cwd}\`\n\n直接在这里发消息即可与 Claude 对话。\n\n发送 **/sessions** 查看所有会话状态。`,
+      freshToken, newChatId, `${toolLabel} Session Ready`,
+      `群聊已创建，这是你的 **${toolLabel}** 会话群。\n\n**Session ID:** ${sessionId}\n**工作目录:** \`${cwd}\`\n\n直接在这里发消息即可与 ${toolLabel} 对话。\n\n发送 **/sessions** 查看所有会话状态。`,
       "green"
     );
 
@@ -312,10 +384,13 @@ async function handleCommand(text: string, chatId: string, openId: string, msgTi
     const token = await getTenantAccessToken();
     const chatInfo = await getChatInfo(token, chatId);
     const description = chatInfo.description;
-    const sessionId = extractSessionId(description);
+    const sessionInfo = extractSessionInfo(description);
 
-    if (sessionId) {
-      console.log(`[${ts()}] [RESUME] 克劳德会话群 detected, session=${sessionId}`);
+    if (sessionInfo) {
+      const sessionId = sessionInfo.sessionId;
+      const descriptionTool = sessionInfo.tool;
+      const toolLabel = toolDisplayName(descriptionTool);
+      console.log(`[${ts()}] [RESUME] ${toolLabel} session group detected, session=${sessionId} tool=${descriptionTool}`);
 
       const freshToken = await getTenantAccessToken();
 
@@ -351,6 +426,7 @@ async function handleCommand(text: string, chatId: string, openId: string, msgTi
         const isActive = running && !running.stopped;
         const statusText = [
           `**Session ID:** \`${status?.sessionId ?? sessionId}\``,
+          `**工具:** ${toolLabel}`,
           `**状态:** ${isActive ? "🟢 运行中" : "⚪ 空闲"}`,
           `**已对话轮数:** ${status?.turnCount ?? 0}`,
           `**模型:** ${status?.model ?? anthropicConfigDisplay(CLAUDE_MODEL)}`,
@@ -389,6 +465,7 @@ async function handleCommand(text: string, chatId: string, openId: string, msgTi
           turnCount: s.turnCount,
           elapsedSeconds: s.active ? Math.floor((now - s.startTime) / 1000) : null,
           model: s.model,
+          tool: s.tool,
         }));
         const card = buildSessionsCard(cardData);
         const sessionsResp = await fetch(`${BASE_URL}/im/v1/messages?receive_id_type=chat_id`, {
@@ -433,13 +510,14 @@ async function handleCommand(text: string, chatId: string, openId: string, msgTi
       }
 
       try {
-        await resumeAndPrompt(sessionId, text, freshToken, chatId, msgTimestamp);
+        await resumeAndPrompt(sessionId, text, freshToken, chatId, msgTimestamp, descriptionTool);
         console.log(`[${ts()}] [RESUME] Session ${sessionId} done`);
       } catch (err) {
         console.error(`[${ts()}] [RESUME] FAIL: ${(err as Error).message}`);
+        fileLog.flush();
         await sendCardReply(
           freshToken, chatId, "Error",
-          `Failed to resume Claude session:\n${(err as Error).message}`,
+          `Failed to resume ${toolLabel} session:\n${(err as Error).message}`,
           "red"
         );
       }
@@ -579,7 +657,7 @@ async function main(): Promise<void> {
         }
       }
 
-      const text = extractText(message);
+      const text = formatMessageContent(message);
       const sender = event.sender;
       const openId = sender?.sender_id?.open_id ?? "";
       const chatId = message.chat_id ?? "";
@@ -671,7 +749,7 @@ async function main(): Promise<void> {
         const event = getInnerEvent(data);
         const message = event.message;
         if (!message) return;
-        const text = extractText(message);
+        const text = formatMessageContent(message);
         const openId = event.sender?.sender_id?.open_id ?? "";
         const chatId = message.chat_id ?? "";
         appendChatLog(chatId, openId, text);
@@ -697,8 +775,8 @@ async function main(): Promise<void> {
     const wsClient = new WSClient({
       appId: APP_ID,
       appSecret: APP_SECRET,
-      onReady: () => resetState(),
-      onReconnected: () => resetState(),
+      onReady: () => { resetState(); },
+      onReconnected: () => { resetState(); },
     });
 
     console.log(`\n[启动 6/7] 飞书长连接：正在通过 SDK 建立 WebSocket …`);