chatccc 0.2.4 → 0.2.6

package/README.md

@@ -1,6 +1,6 @@
 # ChatCCC
 
-**飞书聊天控制 Claude Code，未来支持 Cursor、Codex**
+**飞书聊天控制 Claude Code / Cursor，未来支持 Codex**
 
 ---
 
@@ -8,13 +8,13 @@
 
 传统的 Claude Code（尤其是使用第三方 API 的，如 DeepSeek），需要坐在电脑桌前才能用。**离开电脑就没法用了。**
 
-ChatCCC 把 Claude Code 接入了飞书群聊：
+ChatCCC 把 Claude Code 和 Cursor Agent 接入了飞书群聊：
 
-- **手机上也能用 Claude Code** —— 在飞书群里发消息就等于在终端输入指令，Claude 的思考和回复会流式展示在群卡片里
-- **多会话并行** —— 一个群就是一个 Claude 会话，完全隔离、互不干扰，并行工作效率更高
-- **体验丝滑** —— 思考过程完整，响应迅速
+- **手机上也能用 Claude Code / Cursor** —— 在飞书群里发消息就等于在终端输入指令，AI 的思考和回复会流式展示在群卡片里
+- **多会话并行** —— 一个群就是一个 AI 会话，完全隔离、互不干扰，并行工作效率更高
+- **多工具切换** —— `/new claude` 创建 Claude Code 会话，`/new cursor` 创建 Cursor 会话，各取所长
 
-一句话：**在任何设备上打开飞书，就能让 Claude 帮你写代码、排查问题、分析项目。**
+一句话：**在任何设备上打开飞书，就能让 Claude Code 或 Cursor 帮你写代码、排查问题、分析项目。**
 
 <p align="center">
   <img src="images/img_readme_0.jpg" alt="飞书群聊中使用 ChatCCC" width="280" />
@@ -61,6 +61,28 @@ npm run dev
 
 启动后机器人通过 WebSocket 连接飞书服务器，日志会写入 `logs/` 目录。
 
+#### Cursor Agent CLI（使用 Cursor 会话时需要）
+
+ChatCCC **不捆绑** Cursor Agent CLI，需要用户自行安装。Cursor Agent CLI 目前主要有两种来源：
+
+1. **Cursor IDE 自带**：安装 [Cursor IDE](https://cursor.com) 后，部分版本会自带 `agent` 或 `cursor-agent` 命令
+2. **独立安装**：Cursor 正在逐步提供独立的 CLI 安装方式，安装后 `agent` 命令会出现在系统 PATH 中
+
+验证是否已安装：
+
+```bash
+agent --version
+```
+
+若 `agent` 不在 PATH 中，可通过环境变量指定自定义命令：
+
+```env
+CHATCCC_CURSOR_COMMAND=/path/to/agent
+CHATCCC_CURSOR_ARGS=-p --output-format stream-json --stream-partial-output
+```
+
+> **说明**：只使用 Claude Code（`/new claude` 或 `/new`）的用户无需安装 Cursor CLI。
+
 ### 2. 创建飞书应用
 
 打开 [飞书开放平台](https://open.feishu.cn)，创建一个**企业自建应用**。
@@ -168,18 +190,21 @@ CHATCCC_PORT=18081
 
 ### 5. 开始使用
 
-在飞书中找到你的机器人，发送 `/new`，机器人会自动创建一个群聊并把你的 Claude 会话绑定到该群。之后直接在群里发消息就能和 Claude 对话。
+在飞书中找到你的机器人，发送 `/new`（默认 Claude Code）或 `/new claude` / `/new cursor`，机器人会自动创建一个群聊并把 AI 会话绑定到该群。之后直接在群里发消息就能对话。
 
 ### 可用指令
 
 
-| 指令         | 作用                           |
-| ---------- | ---------------------------- |
-| `/new`     | 创建新的 Claude 会话（绑定一个新群聊）      |
-| `/stop`    | 停止当前正在生成的回复                  |
-| `/status`  | 查看当前会话的状态（轮数、模型、上下文 token 等） |
-| `/cd`      | 查看/切换工作目录                    |
-| `/restart` | 重启机器人进程                      |
+| 指令            | 作用                           |
+| --------------- | ---------------------------- |
+| `/new`          | 创建新的 Claude Code 会话（默认）    |
+| `/new claude`   | 创建新的 Claude Code 会话          |
+| `/new cursor`   | 创建新的 Cursor 会话               |
+| `/stop`         | 停止当前正在生成的回复                  |
+| `/status`       | 查看当前会话的状态（轮数、模型、上下文 token 等） |
+| `/cd`           | 查看/切换工作目录                    |
+| `/sessions`     | 查看所有会话状态                    |
+| `/restart`      | 重启机器人进程                      |
 
 
 ---

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chatccc",
-  "version": "0.2.4",
+  "version": "0.2.6",
   "description": "Feishu bot bridge for Claude Code",
   "license": "Apache-2.0",
   "type": "module",

package/src/__tests__/adapter-interface.test.ts

@@ -0,0 +1,152 @@
+import { describe, it, expect } from "vitest";
+import type {
+  UnifiedBlock,
+  UnifiedStreamMessage,
+  UnifiedThinkingBlock,
+  UnifiedTextBlock,
+  UnifiedToolUseBlock,
+  UnifiedToolResultBlock,
+  UnifiedRedactedThinkingBlock,
+  UnifiedSearchResultBlock,
+  UnifiedCompactBoundaryBlock,
+  CreateSessionResult,
+  SessionInfo,
+  ToolAdapter,
+} from "../adapters/adapter-interface.ts";
+
+// ---------------------------------------------------------------------------
+// 编译期类型验证：确保 UnifiedBlock 联合类型覆盖了所有预期的 block 形状
+// ---------------------------------------------------------------------------
+
+describe("UnifiedBlock union type coverage", () => {
+  it("accepts thinking block", () => {
+    const b: UnifiedBlock = { type: "thinking", thinking: "Let me think..." };
+    expect(b.type).toBe("thinking");
+  });
+
+  it("accepts text block", () => {
+    const b: UnifiedBlock = { type: "text", text: "Hello" };
+    expect(b.type).toBe("text");
+  });
+
+  it("accepts tool_use block", () => {
+    const b: UnifiedBlock = { type: "tool_use", name: "Read", input: { file_path: "/tmp" } };
+    expect(b.type).toBe("tool_use");
+  });
+
+  it("accepts tool_result block with string content", () => {
+    const b: UnifiedBlock = { type: "tool_result", tool_use_id: "abc123", content: "result" };
+    expect(b.type).toBe("tool_result");
+  });
+
+  it("accepts tool_result block with error flag", () => {
+    const b: UnifiedBlock = { type: "tool_result", tool_use_id: "abc123", content: "error", is_error: true };
+    expect(b.is_error).toBe(true);
+  });
+
+  it("accepts redacted_thinking block", () => {
+    const b: UnifiedBlock = { type: "redacted_thinking" };
+    expect(b.type).toBe("redacted_thinking");
+  });
+
+  it("accepts search_result block", () => {
+    const b: UnifiedBlock = { type: "search_result", query: "what is TypeScript" };
+    expect(b.type).toBe("search_result");
+  });
+
+  it("accepts compact_boundary block", () => {
+    const b: UnifiedBlock = { type: "compact_boundary", trigger: "auto", pre_tokens: 10000, post_tokens: 5000 };
+    expect(b.type).toBe("compact_boundary");
+  });
+
+  it("accepts compact_boundary block without post_tokens", () => {
+    const b: UnifiedBlock = { type: "compact_boundary", trigger: "manual", pre_tokens: 20000 };
+    expect(b.type).toBe("compact_boundary");
+  });
+});
+
+// ---------------------------------------------------------------------------
+// UnifiedStreamMessage
+// ---------------------------------------------------------------------------
+
+describe("UnifiedStreamMessage", () => {
+  it("accepts assistant message with blocks", () => {
+    const m: UnifiedStreamMessage = {
+      type: "assistant",
+      blocks: [
+        { type: "thinking", thinking: "..." },
+        { type: "text", text: "answer" },
+      ],
+    };
+    expect(m.type).toBe("assistant");
+    expect(m.blocks).toHaveLength(2);
+  });
+
+  it("accepts user message with tool_result blocks", () => {
+    const m: UnifiedStreamMessage = {
+      type: "user",
+      blocks: [{ type: "tool_result", tool_use_id: "abc", content: "ok" }],
+    };
+    expect(m.type).toBe("user");
+  });
+
+  it("accepts system message", () => {
+    const m: UnifiedStreamMessage = {
+      type: "system",
+      blocks: [{ type: "compact_boundary", trigger: "auto", pre_tokens: 100 }],
+    };
+    expect(m.type).toBe("system");
+  });
+});
+
+// ---------------------------------------------------------------------------
+// CreateSessionResult
+// ---------------------------------------------------------------------------
+
+describe("CreateSessionResult", () => {
+  it("accepts valid result", () => {
+    const r: CreateSessionResult = { sessionId: "uuid-12345" };
+    expect(r.sessionId).toBe("uuid-12345");
+  });
+});
+
+// ---------------------------------------------------------------------------
+// SessionInfo
+// ---------------------------------------------------------------------------
+
+describe("SessionInfo", () => {
+  it("accepts full info", () => {
+    const info: SessionInfo = {
+      sessionId: "abc",
+      cwd: "/home/user",
+      summary: "A session",
+      lastModified: 1234567890,
+    };
+    expect(info.sessionId).toBe("abc");
+  });
+
+  it("accepts minimal info (only sessionId)", () => {
+    const info: SessionInfo = { sessionId: "minimal" };
+    expect(info.cwd).toBeUndefined();
+  });
+});
+
+// ---------------------------------------------------------------------------
+// ToolAdapter interface 结构断言
+// ---------------------------------------------------------------------------
+
+describe("ToolAdapter interface structure", () => {
+  it("has correct property names via mock object", () => {
+    // 如果 ToolAdapter 接口的字段名或函数签名变更，该对象字面量将无法编译
+    const mock: ToolAdapter = {
+      displayName: "Test",
+      sessionDescPrefix: "Test Session:",
+      createSession: async () => ({ sessionId: "s" }),
+      prompt: async function* () {},
+      getSessionInfo: async () => undefined,
+      closeSession: async () => {},
+    };
+    expect(mock.displayName).toBe("Test");
+    expect(mock.sessionDescPrefix).toBe("Test Session:");
+  });
+});

package/src/__tests__/cards.test.ts

@@ -3,6 +3,7 @@ import {
   buildProgressCard,
   buildHelpCard,
   buildCdContent,
+  buildCdCard,
   buildSessionsCard,
   buildStatusCard,
   buildButtons,
@@ -148,9 +149,9 @@ describe("buildHelpCard", () => {
   it("includes action buttons", () => {
     const card = buildHelpCard("test");
     const parsed = JSON.parse(card);
-    const action = parsed.elements[1];
+    const action = parsed.elements[2];
     expect(action.tag).toBe("action");
-    expect(action.actions).toHaveLength(3);
+    expect(action.actions).toHaveLength(4);
   });
 });
 
@@ -199,6 +200,99 @@ describe("buildCdContent", () => {
   });
 });
 
+// ---------------------------------------------------------------------------
+// buildCdCard
+// ---------------------------------------------------------------------------
+
+describe("buildCdCard", () => {
+  const entries = [
+    { name: "src", isDir: true },
+    { name: "README.md", isDir: false },
+  ];
+
+  it("returns valid JSON with correct schema", () => {
+    const card = buildCdCard("/home/project", entries, []);
+    const parsed = JSON.parse(card);
+    expect(parsed.schema).toBe("2.0");
+    expect(parsed.header.title.content).toBe("工作路径");
+    expect(parsed.header.template).toBe("blue");
+    expect(parsed.config.wide_screen_mode).toBe(true);
+  });
+
+  it("shows current working directory in markdown", () => {
+    const card = buildCdCard("/home/project", entries, []);
+    const parsed = JSON.parse(card);
+    const mdElements: any[] = parsed.body.elements.filter((e: any) => e.tag === "markdown");
+    const cwdMd = mdElements.find((e: any) => e.content.includes("新会话默认工作路径"));
+    expect(cwdMd).toBeDefined();
+    expect(cwdMd.content).toContain("/home/project");
+  });
+
+  it("shows sessionCwd when provided", () => {
+    const card = buildCdCard("/default", entries, [], "/session/path");
+    const parsed = JSON.parse(card);
+    const mdElements: any[] = parsed.body.elements.filter((e: any) => e.tag === "markdown");
+    const sessionMd = mdElements.find((e: any) => e.content.includes("当前会话工作路径"));
+    expect(sessionMd).toBeDefined();
+    expect(sessionMd.content).toContain("/session/path");
+  });
+
+  it("does not show sessionCwd when not provided", () => {
+    const card = buildCdCard("/default", entries, []);
+    const parsed = JSON.parse(card);
+    const mdElements: any[] = parsed.body.elements.filter((e: any) => e.tag === "markdown");
+    const sessionMd = mdElements.find((e: any) => e.content.includes("当前会话工作路径"));
+    expect(sessionMd).toBeUndefined();
+  });
+
+  it("shows recent dirs section with buttons", () => {
+    const recentDirs = ["/home/user/project1", "/home/user/project2"];
+    const card = buildCdCard("/current", entries, recentDirs);
+    const parsed = JSON.parse(card);
+    const mdElements: any[] = parsed.body.elements.filter((e: any) => e.tag === "markdown");
+    const recentMd = mdElements.find((e: any) => e.content.includes("最近使用过的路径"));
+    expect(recentMd).toBeDefined();
+
+    const actionElements: any[] = parsed.body.elements.filter((e: any) => e.tag === "action");
+    expect(actionElements.length).toBeGreaterThanOrEqual(1);
+    const recentAction = actionElements.find((e: any) =>
+      e.actions.some((a: any) => a.value?.action === "cd")
+    );
+    expect(recentAction).toBeDefined();
+    expect(recentAction.actions).toHaveLength(2);
+    expect(recentAction.actions[0].value.action).toBe("cd");
+    expect(recentAction.actions[0].value.path).toBe("/home/user/project1");
+    expect(recentAction.actions[1].value.path).toBe("/home/user/project2");
+  });
+
+  it("does not show recent dirs section when empty", () => {
+    const card = buildCdCard("/current", entries, []);
+    const parsed = JSON.parse(card);
+    const mdElements: any[] = parsed.body.elements.filter((e: any) => e.tag === "markdown");
+    const recentMd = mdElements.find((e: any) => e.content.includes("最近使用过的路径"));
+    expect(recentMd).toBeUndefined();
+  });
+
+  it("truncates long paths in button text", () => {
+    const longPath = "/home/user/very/long/path/that/exceeds/thirty/six/chars";
+    const card = buildCdCard("/current", entries, [longPath]);
+    const parsed = JSON.parse(card);
+    const action: any = parsed.body.elements.find((e: any) => e.tag === "action");
+    const btnText = action.actions[0].text.content;
+    expect(btnText.startsWith("...")).toBe(true);
+    expect(btnText.length).toBeLessThanOrEqual(36);
+  });
+
+  it("shows directory listing", () => {
+    const card = buildCdCard("/current", entries, []);
+    const parsed = JSON.parse(card);
+    const mdElements: any[] = parsed.body.elements.filter((e: any) => e.tag === "markdown");
+    const listingMd = mdElements.find((e: any) => e.content.includes("📁 src/"));
+    expect(listingMd).toBeDefined();
+    expect(listingMd.content).toContain("📄 README.md");
+  });
+});
+
 // ---------------------------------------------------------------------------
 // buildSessionsCard
 // ---------------------------------------------------------------------------
@@ -208,21 +302,23 @@ describe("buildSessionsCard", () => {
     const card = buildSessionsCard([]);
     const parsed = JSON.parse(card);
     expect(parsed.elements[0].text.content).toContain("没有会话记录");
+    expect(parsed.elements[0].text.content).toContain("/new");
   });
 
   it("returns valid JSON with session listing", () => {
     const card = buildSessionsCard([
-      { sessionId: "abc123", active: true, turnCount: 5, elapsedSeconds: 120, model: "Claude Opus 4.7" },
+      { sessionId: "abc123", active: true, turnCount: 5, elapsedSeconds: 120, model: "Claude Opus 4.7", tool: "claude" },
     ]);
     const parsed = JSON.parse(card);
     expect(parsed.elements[0].text.content).toContain("共 **1** 个会话");
     expect(parsed.elements[0].text.content).toContain("abc123");
     expect(parsed.elements[0].text.content).toContain("🟢 活跃");
+    expect(parsed.elements[0].text.content).toContain("Claude Code");
   });
 
   it("shows idle status for inactive sessions", () => {
     const card = buildSessionsCard([
-      { sessionId: "xyz", active: false, turnCount: 0, elapsedSeconds: null, model: "Claude Sonnet 4.6" },
+      { sessionId: "xyz", active: false, turnCount: 0, elapsedSeconds: null, model: "Claude Sonnet 4.6", tool: "claude" },
     ]);
     const parsed = JSON.parse(card);
     expect(parsed.elements[0].text.content).toContain("⚪ 空闲");
@@ -230,12 +326,33 @@ describe("buildSessionsCard", () => {
 
   it("shows elapsed time for active sessions", () => {
     const card = buildSessionsCard([
-      { sessionId: "active123", active: true, turnCount: 3, elapsedSeconds: 95, model: "Claude Opus 4.7" },
+      { sessionId: "active123", active: true, turnCount: 3, elapsedSeconds: 95, model: "Claude Opus 4.7", tool: "claude" },
     ]);
     const parsed = JSON.parse(card);
     expect(parsed.elements[0].text.content).toContain("1分35秒");
   });
 
+  it("separates Claude Code and Cursor sessions", () => {
+    const card = buildSessionsCard([
+      { sessionId: "c1", active: false, turnCount: 1, elapsedSeconds: null, model: "default", tool: "claude" },
+      { sessionId: "c2", active: false, turnCount: 2, elapsedSeconds: null, model: "default", tool: "cursor" },
+    ]);
+    const parsed = JSON.parse(card);
+    const content: string = parsed.elements[0].text.content;
+    expect(content).toContain("Claude Code 会话");
+    expect(content).toContain("Cursor 会话");
+  });
+
+  it("omits Cursor section when no Cursor sessions", () => {
+    const card = buildSessionsCard([
+      { sessionId: "c1", active: false, turnCount: 1, elapsedSeconds: null, model: "default", tool: "claude" },
+    ]);
+    const parsed = JSON.parse(card);
+    const content: string = parsed.elements[0].text.content;
+    expect(content).toContain("Claude Code 会话");
+    expect(content).not.toContain("Cursor 会话");
+  });
+
   it("includes close button", () => {
     const card = buildSessionsCard([]);
     const parsed = JSON.parse(card);