chatccc 0.2.5 → 0.2.6

package/src/adapters/cursor-adapter.ts

@@ -0,0 +1,229 @@
+// =============================================================================
+// cursor-adapter.ts — Cursor Agent CLI 适配器
+// =============================================================================
+// 通过 agent -p --output-format stream-json 与 Cursor agent 交互。
+// 命令行可通过 CHATCCC_CURSOR_COMMAND / CHATCCC_CURSOR_ARGS 环境变量自定义。
+// =============================================================================
+
+import { spawn, type ChildProcess } from "node:child_process";
+import { createInterface } from "node:readline";
+
+import type {
+  ToolAdapter,
+  UnifiedBlock,
+  UnifiedStreamMessage,
+  CreateSessionResult,
+  SessionInfo,
+} from "./adapter-interface.ts";
+import { CURSOR_AGENT_COMMAND, CURSOR_AGENT_ARGS } from "../config.ts";
+
+// ---------------------------------------------------------------------------
+// 类型：Cursor JSONL 消息行
+// ---------------------------------------------------------------------------
+
+interface CursorMessageLine {
+  type?: string;
+  subtype?: string;
+  session_id?: string;
+  cwd?: string;
+  model?: string;
+  message?: {
+    role?: string;
+    content?: CursorContentBlock[];
+  };
+  result?: string;
+  duration_ms?: number;
+  usage?: {
+    inputTokens?: number;
+    outputTokens?: number;
+  };
+}
+
+interface CursorContentBlock {
+  type?: string;
+  text?: string;
+  thinking?: string;
+  name?: string;
+  input?: unknown;
+  tool_use_id?: string;
+  content?: unknown;
+  is_error?: boolean;
+  query?: string;
+  [key: string]: unknown;
+}
+
+// ---------------------------------------------------------------------------
+// normalizeCursorMessage — Cursor 消息 → UnifiedStreamMessage | null
+// ---------------------------------------------------------------------------
+
+export function normalizeCursorMessage(
+  msg: CursorMessageLine,
+): UnifiedStreamMessage | null {
+  if (msg.type === "assistant" && msg.message?.content) {
+    const blocks: UnifiedBlock[] = [];
+    for (const block of msg.message.content) {
+      if (block.type === "thinking" && block.thinking) {
+        blocks.push({ type: "thinking", thinking: block.thinking });
+      } else if (block.type === "tool_use") {
+        blocks.push({
+          type: "tool_use",
+          name: block.name ?? "unknown",
+          input: block.input,
+        });
+      } else if (block.type === "tool_result") {
+        blocks.push({
+          type: "tool_result",
+          tool_use_id: block.tool_use_id ?? "",
+          content: block.content,
+          is_error: block.is_error,
+        });
+      } else if (block.type === "redacted_thinking") {
+        blocks.push({ type: "redacted_thinking" });
+      } else if (block.type === "search_result") {
+        blocks.push({
+          type: "search_result",
+          query: block.query ?? "",
+        });
+      } else if (block.type === "text" && block.text) {
+        blocks.push({ type: "text", text: block.text });
+      }
+    }
+    return { type: "assistant", blocks };
+  }
+
+  if (msg.type === "user" && msg.message?.content) {
+    const blocks: UnifiedBlock[] = [];
+    for (const block of msg.message.content) {
+      if (block.type === "tool_result") {
+        blocks.push({
+          type: "tool_result",
+          tool_use_id: block.tool_use_id ?? "",
+          content: block.content,
+          is_error: block.is_error,
+        });
+      } else if (block.type === "text" && block.text) {
+        blocks.push({ type: "text", text: block.text });
+      }
+    }
+    return { type: "user", blocks };
+  }
+
+  if (msg.type === "system" && msg.subtype === "compact_boundary") {
+    const meta = (msg as Record<string, unknown>).compact_metadata as
+      | { trigger?: "manual" | "auto"; pre_tokens?: number; post_tokens?: number }
+      | undefined;
+    if (!meta) return null;
+    return {
+      type: "system",
+      blocks: [
+        {
+          type: "compact_boundary",
+          trigger: meta.trigger ?? "auto",
+          pre_tokens: meta.pre_tokens ?? 0,
+          post_tokens: meta.post_tokens,
+        },
+      ],
+    };
+  }
+
+  return null;
+}
+
+// ---------------------------------------------------------------------------
+// 子进程辅助函数
+// ---------------------------------------------------------------------------
+
+function spawnAgent(
+  extraArgs: string[],
+  cwd?: string,
+): ChildProcess {
+  const allArgs = [...CURSOR_AGENT_ARGS, ...extraArgs];
+  return spawn(CURSOR_AGENT_COMMAND, allArgs, {
+    cwd,
+    stdio: ["ignore", "pipe", "pipe"],
+    windowsHide: true,
+    shell: true,
+  });
+}
+
+async function* readJsonLines(
+  proc: ChildProcess,
+  signal?: AbortSignal,
+): AsyncGenerator<CursorMessageLine> {
+  const rl = createInterface({ input: proc.stdout!, crlfDelay: Infinity });
+  for await (const line of rl) {
+    if (signal?.aborted) break;
+    const trimmed = line.trim();
+    if (!trimmed) continue;
+    try {
+      yield JSON.parse(trimmed) as CursorMessageLine;
+    } catch { /* 非 JSON 行静默跳过 */ }
+  }
+}
+
+// ---------------------------------------------------------------------------
+// 适配器实现
+// ---------------------------------------------------------------------------
+
+class CursorAdapter implements ToolAdapter {
+  readonly displayName = "Cursor";
+  readonly sessionDescPrefix = "Cursor Session:";
+  private activeProcs = new Set<ChildProcess>();
+
+  async createSession(cwd: string): Promise<CreateSessionResult> {
+    const proc = spawnAgent(["ok"], cwd);
+    this.activeProcs.add(proc);
+
+    for await (const msg of readJsonLines(proc)) {
+      if (msg.type === "system" && msg.subtype === "init" && msg.session_id) {
+        const sessionId = msg.session_id;
+        this.activeProcs.delete(proc);
+        proc.kill();
+        return { sessionId };
+      }
+    }
+
+    proc.kill();
+    this.activeProcs.delete(proc);
+    throw new Error("No session ID in Cursor init event");
+  }
+
+  async *prompt(
+    sessionId: string,
+    userText: string,
+    cwd: string,
+    signal?: AbortSignal,
+  ): AsyncIterable<UnifiedStreamMessage> {
+    const proc = spawnAgent(["--resume", sessionId, userText], cwd);
+    this.activeProcs.add(proc);
+
+    try {
+      for await (const raw of readJsonLines(proc, signal)) {
+        if (signal?.aborted) break;
+        const normalized = normalizeCursorMessage(raw);
+        if (normalized) yield normalized;
+      }
+    } finally {
+      proc.kill();
+      this.activeProcs.delete(proc);
+    }
+  }
+
+  async getSessionInfo(
+    _sessionId: string,
+  ): Promise<SessionInfo | undefined> {
+    return { sessionId: _sessionId };
+  }
+
+  async closeSession(_sessionId: string): Promise<void> {
+    // 子进程由 prompt 的 finally 自动 kill
+  }
+}
+
+// ---------------------------------------------------------------------------
+// 工厂函数
+// ---------------------------------------------------------------------------
+
+export function createCursorAdapter(): ToolAdapter {
+  return new CursorAdapter();
+}

package/src/cards.ts

@@ -114,10 +114,12 @@ export function buildHelpCard(userText: string): string {
     header: { template: "blue", title: { content: "ChatCCC", tag: "plain_text" } },
     elements: [
       { tag: "div", text: { tag: "lark_md", content: `你发送了: ${userText}` } },
+      { tag: "div", text: { tag: "lark_md", content: "使用 **/new**（默认 Claude Code）或 **/new claude** / **/new cursor** 创建新会话" } },
       buildButtons([
-        { text: "新建会话（/new）", value: JSON.stringify({ cmd: "new" }), type: "primary" },
-        { text: "重启Chat CCC（/restart）", value: JSON.stringify({ cmd: "restart" }), type: "danger" },
-        { text: "查看/切换工作路径（/cd）", value: JSON.stringify({ cmd: "cd" }), type: "default" },
+        { 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: "重启 ChatCCC（/restart）", value: JSON.stringify({ cmd: "restart" }), type: "danger" },
+        { text: "查看/切换工作路径及最近使用（/cd）", value: JSON.stringify({ cmd: "cd" }), type: "default" },
       ]),
     ],
   });
@@ -159,37 +161,134 @@ export function buildCdContent(
   return lines.join("\n");
 }
 
-// 所有会话列表卡片
+// 工作路径卡片（/cd 无参数时使用，含最近使用路径按钮）
+export function buildCdCard(
+  dirPath: string,
+  entries: { name: string; isDir: boolean }[],
+  recentDirs: string[],
+  sessionCwd?: string,
+  maxFiles = 100,
+): string {
+  const display = entries.slice(0, maxFiles);
+  const overflow = entries.length > maxFiles ? `\n...（共 ${entries.length} 个条目，仅显示前 ${maxFiles} 个）` : "";
+  const listing = display.map(e => e.isDir ? `📁 ${e.name}/` : `📄 ${e.name}`).join("\n");
+
+  const currentLine = sessionCwd
+    ? `**当前会话工作路径:** \`${sessionCwd}\``
+    : "";
+
+  const elements: object[] = [];
+
+  if (currentLine) {
+    elements.push({ tag: "markdown", content: currentLine });
+  }
+  elements.push({ tag: "markdown", content: `**新会话默认工作路径:** \`${dirPath}\`` });
+
+  if (recentDirs.length > 0) {
+    elements.push({ tag: "hr" });
+    elements.push({ tag: "markdown", content: "**最近使用过的路径（点击切换）:**" });
+    elements.push({
+      tag: "action",
+      actions: recentDirs.map(d => {
+        const name = d.split(/[\\/]/).filter(Boolean).pop() ?? d;
+        const label = d.length > 36 ? `...${d.slice(-33)}` : d;
+        return {
+          tag: "button",
+          text: { tag: "plain_text", content: label },
+          type: "default",
+          value: { action: "cd", path: d },
+        };
+      }),
+    });
+  }
+
+  elements.push({ tag: "hr" });
+  elements.push({
+    tag: "markdown",
+    content: [
+      `**目录内容** (最多 ${maxFiles} 个):`,
+      listing,
+      overflow,
+    ].join("\n"),
+  });
+
+  return JSON.stringify({
+    schema: "2.0",
+    config: { wide_screen_mode: true },
+    header: {
+      template: "blue",
+      title: { tag: "plain_text", content: "工作路径" },
+    },
+    body: {
+      direction: "vertical",
+      elements,
+    },
+  });
+}
+
+// 所有会话列表卡片（Claude Code 优先，然后 Cursor）
 export function buildSessionsCard(sessions: Array<{
   sessionId: string;
   active: boolean;
   turnCount: number;
   elapsedSeconds: number | null;
   model: string;
+  tool: string;
 }>): string {
-  const text = sessions.length === 0
-    ? "当前没有会话记录。"
-    : [
-        `共 **${sessions.length}** 个会话:`,
-        ``,
-        ...sessions.map((s, i) => {
-          const status = s.active ? "🟢 活跃" : "⚪ 空闲";
-          const shortId = s.sessionId.length > 16 ? s.sessionId.slice(0, 16) + "..." : s.sessionId;
-          let extra = "";
-          if (s.active && s.elapsedSeconds !== null) {
-            const mins = Math.floor(s.elapsedSeconds / 60);
-            const secs = s.elapsedSeconds % 60;
-            extra = ` | 本轮: ${mins}分${secs}秒`;
-          }
-          return `**${i + 1}.** \`${shortId}\` ${status} | 轮数: ${s.turnCount} | ${s.model}${extra}`;
-        }),
-      ].join("\n");
+  // 按 tool 分组排序：Claude Code 在前，Cursor 在后
+  const claudeCodeSessions = sessions.filter(s => s.tool !== "cursor");
+  const cursorSessions = sessions.filter(s => s.tool === "cursor");
+  const hasClaudeCode = claudeCodeSessions.length > 0;
+  const hasCursor = cursorSessions.length > 0;
+
+  if (sessions.length === 0) {
+    return JSON.stringify({
+      config: { wide_screen_mode: true },
+      header: { template: "blue", title: { content: "所有会话", tag: "plain_text" } },
+      elements: [
+        { tag: "div", text: { tag: "lark_md", content: "当前没有会话记录。\n\n使用 **/new**（默认 Claude Code）、**/new claude** 或 **/new cursor** 创建新会话。" } },
+        { tag: "hr" },
+        { tag: "action", actions: [{ tag: "button", text: { tag: "plain_text", content: "收起" }, type: "default", value: { action: "close" } }] },
+      ],
+    });
+  }
+
+  const formatSession = (s: typeof sessions[0], i: number) => {
+    const status = s.active ? "🟢 活跃" : "⚪ 空闲";
+    const shortId = s.sessionId.length > 16 ? s.sessionId.slice(0, 16) + "..." : s.sessionId;
+    let extra = "";
+    if (s.active && s.elapsedSeconds !== null) {
+      const mins = Math.floor(s.elapsedSeconds / 60);
+      const secs = s.elapsedSeconds % 60;
+      extra = ` | 本轮: ${mins}分${secs}秒`;
+    }
+    const toolLabel = s.tool === "cursor" ? "Cursor" : "Claude Code";
+    return `**${i + 1}.** \`${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++));
+    }
+  }
 
   return JSON.stringify({
     config: { wide_screen_mode: true },
     header: { template: "blue", title: { content: "所有会话", tag: "plain_text" } },
     elements: [
-      { tag: "div", text: { tag: "lark_md", content: text } },
+      { tag: "div", text: { tag: "lark_md", content: lines.join("\n") } },
       { tag: "hr" },
       {
         tag: "action",

package/src/config.ts

@@ -62,13 +62,56 @@ export const CLAUDE_MODEL = process.env.CHATCCC_ANTHROPIC_MODEL?.trim() || "defa
 
 export const CLAUDE_EFFORT = process.env.CHATCCC_ANTHROPIC_EFFORT?.trim() || "default";
 
-/** AI 工具选择：claude | cursor | codex（未设置时默认 claude） */
-export const AI_TOOL = process.env.CHATCCC_AI_TOOL?.trim().toLowerCase() || "claude";
+/** 探测 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 {
@@ -227,4 +270,19 @@ export function explainMissingFeishuCredentialsAndExit(): never {
   process.exit(1);
 }
 
-export let SESSION_DESC_PREFIX: string = "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" },
         ]),