chatccc 0.2.192 → 0.2.193

package/bin/cccagent.mjs

@@ -0,0 +1,17 @@
+#!/usr/bin/env node
+import { spawnSync } from "node:child_process";
+import { createRequire } from "node:module";
+import { dirname, join } from "node:path";
+
+const require = createRequire(import.meta.url);
+const pkgRoot = dirname(require.resolve("../package.json"));
+const cliTs = join(pkgRoot, "src", "builtin", "cli.ts");
+const tsxCli = require.resolve("tsx/cli");
+
+const result = spawnSync(process.execPath, [tsxCli, cliTs, ...process.argv.slice(2)], {
+  stdio: "inherit",
+  cwd: process.cwd(),
+  env: process.env,
+});
+
+process.exit(result.status === null ? 1 : result.status);

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "chatccc",
-  "version": "0.2.192",
+  "version": "0.2.193",
   "description": "Feishu bot bridge for Claude Code",
   "license": "Apache-2.0",
   "type": "module",
   "main": "./src/index.ts",
   "bin": {
-    "chatccc": "bin/chatccc.mjs"
+    "chatccc": "bin/chatccc.mjs",
+    "cccagent": "bin/cccagent.mjs"
   },
   "files": [
     "src/",

package/src/__tests__/builtin-cli-json.test.ts

@@ -0,0 +1,39 @@
+import { execFile } from "node:child_process";
+import { promisify } from "node:util";
+
+import { describe, expect, it } from "vitest";
+
+const execFileAsync = promisify(execFile);
+
+describe("builtin cli --stream-json", () => {
+  it("writes only JSON lines to stdout when startup fails", async () => {
+    let caught: unknown;
+    try {
+      await execFileAsync(process.execPath, [
+        "bin/cccagent.mjs",
+        "--stream-json",
+        "--prompt",
+        "hello",
+        "--api-key",
+        "",
+      ], {
+        cwd: process.cwd(),
+        timeout: 10_000,
+        windowsHide: true,
+      });
+    } catch (err) {
+      caught = err;
+    }
+
+    expect(caught).toMatchObject({ code: 1 });
+    const stdout = (caught as { stdout?: string }).stdout ?? "";
+    const lines = stdout.trim().split(/\r?\n/).filter(Boolean);
+    expect(lines.length).toBeGreaterThan(0);
+    for (const line of lines) {
+      expect(() => JSON.parse(line)).not.toThrow();
+    }
+    expect(JSON.parse(lines.at(-1)!)).toEqual(expect.objectContaining({
+      type: "error",
+    }));
+  });
+});

package/src/__tests__/builtin-context.test.ts

@@ -7,6 +7,8 @@ import { describe, expect, it } from "vitest";
 import {
   BuiltinContextManager,
   estimateBuiltinContextTokens,
+  listBuiltinContextSessions,
+  newBuiltinSessionId,
   serializeMessagesForSummary,
 } from "../builtin/context.ts";
 
@@ -109,9 +111,44 @@ describe("BuiltinContextManager", () => {
     expect(persisted.messages).toEqual([]);
     expect(persisted.totalMessages).toBe(0);
   });
+
+  it("persists cwd metadata and lists saved sessions newest first", async () => {
+    const dir = await mkdtemp(join(tmpdir(), "chatccc-builtin-context-list-"));
+
+    const first = new BuiltinContextManager({
+      persist: true,
+      contextDir: dir,
+      sessionId: "older",
+      cwd: "C:\\repo-a",
+    });
+    first.appendMessage({ role: "user", content: "old" });
+
+    const second = new BuiltinContextManager({
+      persist: true,
+      contextDir: dir,
+      sessionId: "newer",
+      cwd: "C:\\repo-b",
+    });
+    second.appendMessage({ role: "user", content: "new" });
+
+    const sessions = listBuiltinContextSessions(dir);
+
+    expect(sessions.map((s) => s.sessionId)).toEqual(["newer", "older"]);
+    expect(sessions[0]).toEqual(expect.objectContaining({
+      cwd: "C:\\repo-b",
+      totalMessages: 1,
+      hasSummary: false,
+    }));
+  });
 });
 
 describe("builtin context helpers", () => {
+  it("creates readable timestamp-based session ids", () => {
+    const id = newBuiltinSessionId(new Date(2026, 6, 2, 12, 15, 30), "a1b2c3");
+
+    expect(id).toBe("session-20260702-121530-a1b2c3");
+  });
+
   it("estimates tokens from summary and messages", () => {
     expect(estimateBuiltinContextTokens("abc", [{ role: "user", content: "abcdef" }]))
       .toBeGreaterThanOrEqual(3);

package/src/__tests__/builtin-session-select.test.ts

@@ -0,0 +1,116 @@
+import { mkdir, mkdtemp, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+
+import { describe, expect, it } from "vitest";
+
+import { defaultBuiltinSessionId } from "../builtin/context.ts";
+import { resolveBuiltinSession } from "../builtin/session-select.ts";
+
+async function writeSession(
+  contextDir: string,
+  sessionId: string,
+  options: { cwd?: string; updatedAt: number; totalMessages?: number },
+): Promise<void> {
+  const dir = join(contextDir, sessionId);
+  await mkdir(dir, { recursive: true });
+  await writeFile(
+    join(dir, "context.json"),
+    JSON.stringify({
+      version: 1,
+      createdAt: options.updatedAt,
+      updatedAt: options.updatedAt,
+      sessionId,
+      ...(options.cwd ? { cwd: options.cwd } : {}),
+      summary: "",
+      messages: [],
+      totalMessages: options.totalMessages ?? 0,
+      compactedMessages: 0,
+    }),
+    "utf8",
+  );
+}
+
+describe("resolveBuiltinSession", () => {
+  it("creates a fresh timestamp session by default", async () => {
+    const contextDir = await mkdtemp(join(tmpdir(), "chatccc-session-select-new-"));
+
+    const result = resolveBuiltinSession({
+      cwd: "C:\\repo",
+      contextDir,
+      now: new Date(2026, 6, 2, 12, 15, 30),
+      randomSuffix: "a1b2c3",
+    });
+
+    expect(result).toEqual({
+      mode: "new",
+      sessionId: "session-20260702-121530-a1b2c3",
+    });
+  });
+
+  it("resumes an explicit existing session id", async () => {
+    const contextDir = join(tmpdir(), `chatccc-session-select-explicit-${Date.now()}`);
+    await writeSession(contextDir, "manual-session", { updatedAt: 1 });
+
+    expect(resolveBuiltinSession({
+      cwd: "C:\\repo",
+      contextDir,
+      resume: "manual-session",
+    })).toEqual({
+      mode: "resumed",
+      sessionId: "manual-session",
+    });
+  });
+
+  it("fails when an explicit session id does not exist", async () => {
+    const contextDir = join(tmpdir(), `chatccc-session-select-missing-${Date.now()}`);
+
+    expect(() => resolveBuiltinSession({
+      cwd: "C:\\repo",
+      contextDir,
+      resume: "missing",
+    })).toThrow("未找到 ccc 会话: missing");
+  });
+
+  it("resumes the newest session for cwd when resume has no id", async () => {
+    const contextDir = join(tmpdir(), `chatccc-session-select-cwd-${Date.now()}`);
+    await writeSession(contextDir, "old-match", { cwd: "C:\\repo", updatedAt: 1_000 });
+    await writeSession(contextDir, "new-match", { cwd: "C:\\repo", updatedAt: 2_000 });
+    await writeSession(contextDir, "other-cwd", { cwd: "C:\\other", updatedAt: 3_000 });
+
+    expect(resolveBuiltinSession({
+      cwd: "C:\\repo",
+      contextDir,
+      resume: true,
+    })).toEqual({
+      mode: "resumed",
+      sessionId: "new-match",
+    });
+  });
+
+  it("resumes legacy cwd-hash sessions when resume has no id", async () => {
+    const contextDir = join(tmpdir(), `chatccc-session-select-legacy-${Date.now()}`);
+    const cwd = "C:\\repo";
+    const legacySessionId = defaultBuiltinSessionId(cwd);
+    await writeSession(contextDir, legacySessionId, { updatedAt: 1_000 });
+
+    expect(resolveBuiltinSession({
+      cwd,
+      contextDir,
+      resume: true,
+    })).toEqual({
+      mode: "resumed",
+      sessionId: legacySessionId,
+    });
+  });
+
+  it("fails when there is no cwd session to resume", async () => {
+    const contextDir = join(tmpdir(), `chatccc-session-select-empty-${Date.now()}`);
+
+    expect(() => resolveBuiltinSession({
+      cwd: "C:\\repo",
+      contextDir,
+      resume: true,
+    })).toThrow("未找到当前目录可恢复的 ccc 会话");
+  });
+});

package/src/__tests__/cards.test.ts

@@ -170,6 +170,15 @@ describe("buildHelpCard", () => {
     expect(lines).toContain("发送 **/usage** 查看 Codex 5h/周用量，以及查询/使用主动重置卡");
     expect(lines.at(-1)).toBe(ABD_HELP_LINE);
   });
+
+  it("does not advertise the hidden ccc agent", () => {
+    const card = buildHelpCard("test");
+    const parsed = JSON.parse(card);
+    const text = JSON.stringify(parsed);
+
+    expect(text).not.toContain("/new ccc");
+    expect(text).not.toContain("CCC Agent");
+  });
 });
 
 // ---------------------------------------------------------------------------
@@ -364,17 +373,29 @@ describe("buildSessionsCard", () => {
     expect(content).toContain("Cursor 会话");
   });
 
-  it("omits Cursor section when no Cursor sessions", () => {
-    const card = buildSessionsCard([
-      { sessionId: "c1", chatName: "", chatId: "oc_c1", active: false, turnCount: 1, elapsedSeconds: null, model: "(留空)", 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("displays chatName when provided", () => {
+  it("omits Cursor section when no Cursor sessions", () => {
+    const card = buildSessionsCard([
+      { sessionId: "c1", chatName: "", chatId: "oc_c1", active: false, turnCount: 1, elapsedSeconds: null, model: "(留空)", 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("labels hidden ccc sessions without grouping them as Claude Code", () => {
+    const card = buildSessionsCard([
+      { sessionId: "session-20260702-121530-a1b2c3", chatName: "", chatId: "oc_ccc", active: false, turnCount: 1, elapsedSeconds: null, model: "deepseek-v4-pro", tool: "ccc" },
+    ]);
+    const parsed = JSON.parse(card);
+    const content: string = parsed.elements[0].text.content;
+
+    expect(content).toContain("CCC Agent 会话");
+    expect(content).toContain("工具: CCC Agent");
+    expect(content).not.toContain("Claude Code 会话");
+  });
+
+  it("displays chatName when provided", () => {
     const card = buildSessionsCard([
       { sessionId: "abc123", chatName: "帮我写代码-src", chatId: "oc_abc123", active: false, turnCount: 2, elapsedSeconds: null, model: "Claude Opus 4.7", tool: "claude" },
     ]);

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

@@ -0,0 +1,73 @@
+import { mkdtemp } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+
+import { afterEach, describe, expect, it, vi } from "vitest";
+
+const streamTextMock = vi.fn();
+const generateTextMock = vi.fn();
+
+vi.mock("@ai-sdk/openai-compatible", () => ({
+  createOpenAICompatible: vi.fn(() => (modelId: string) => ({ modelId })),
+}));
+
+vi.mock("ai", () => ({
+  streamText: streamTextMock,
+  generateText: generateTextMock,
+}));
+
+async function* textStream(...chunks: string[]): AsyncIterable<string> {
+  for (const chunk of chunks) yield chunk;
+}
+
+afterEach(() => {
+  streamTextMock.mockReset();
+  generateTextMock.mockReset();
+});
+
+describe("createCccAdapter", () => {
+  it("creates a persisted ccc session and exposes model/cwd metadata", async () => {
+    const { createCccAdapter } = await import("../adapters/ccc-adapter.ts");
+    const contextDir = await mkdtemp(join(tmpdir(), "chatccc-ccc-adapter-meta-"));
+    const adapter = createCccAdapter({
+      apiKey: "sk-test",
+      contextDir,
+      model: "deepseek-v4-pro",
+    });
+
+    const created = await adapter.createSession("F:\\repo");
+    const info = await adapter.getSessionInfo(created.sessionId);
+
+    expect(created.sessionId).toMatch(/^session-\d{8}-\d{6}-[a-f0-9]{6}$/);
+    expect(info).toEqual(expect.objectContaining({
+      sessionId: created.sessionId,
+      cwd: "F:\\repo",
+      model: "deepseek-v4-pro",
+    }));
+  });
+
+  it("maps ChatSession text chunks to unified assistant text blocks", async () => {
+    const { createCccAdapter } = await import("../adapters/ccc-adapter.ts");
+    const contextDir = await mkdtemp(join(tmpdir(), "chatccc-ccc-adapter-stream-"));
+    const adapter = createCccAdapter({
+      apiKey: "sk-test",
+      contextDir,
+      model: "deepseek-v4-flash",
+    });
+    const { sessionId } = await adapter.createSession("F:\\repo");
+    streamTextMock.mockReturnValueOnce({ textStream: textStream("hello", " world") });
+
+    const messages = [];
+    for await (const message of adapter.prompt(sessionId, "hi", "F:\\repo")) {
+      messages.push(message);
+    }
+
+    expect(messages).toEqual([
+      { type: "assistant", blocks: [{ type: "text", text: "hello" }] },
+      { type: "assistant", blocks: [{ type: "text", text: " world" }] },
+    ]);
+    expect(streamTextMock).toHaveBeenCalledWith(expect.objectContaining({
+      model: { modelId: "deepseek-v4-flash" },
+    }));
+  });
+});

package/src/__tests__/orchestrator.test.ts

@@ -626,9 +626,9 @@ describe("handleCommand WeChat processing ack", () => {
     );
   });
 
-  it("advertises /usage in new Codex and Cursor session ready messages", async () => {
-    const codexPlatform = mockPlatform("feishu");
-    _setAdapterForToolForTest("codex", mockAdapter("sid-codex"));
+  it("advertises /usage in new Codex and Cursor session ready messages", async () => {
+    const codexPlatform = mockPlatform("feishu");
+    _setAdapterForToolForTest("codex", mockAdapter("sid-codex"));
 
     await handleCommand(codexPlatform, "/new codex", "feishu-p2p", "ou-user", Date.now(), "p2p");
 
@@ -652,9 +652,34 @@ describe("handleCommand WeChat processing ack", () => {
     const claudePlatform = mockPlatform("feishu");
     await handleCommand(claudePlatform, "/new claude", "feishu-p2p-2", "ou-user", Date.now(), "p2p");
 
-    const claudeReadyCall = vi.mocked(claudePlatform.sendCard).mock.calls.find(
-      ([chatId, title]) => chatId === "feishu-group" && title === "Claude Code Session Ready",
-    );
-    expect(claudeReadyCall?.[2]).not.toContain("/usage");
-  });
-});
+    const claudeReadyCall = vi.mocked(claudePlatform.sendCard).mock.calls.find(
+      ([chatId, title]) => chatId === "feishu-group" && title === "Claude Code Session Ready",
+    );
+    expect(claudeReadyCall?.[2]).not.toContain("/usage");
+  });
+
+  it("allows the hidden /new ccc entry without advertising it in normal help", async () => {
+    const platform = mockPlatform("feishu");
+    _setAdapterForToolForTest("ccc", mockAdapter("session-20260702-121530-a1b2c3"));
+
+    await handleCommand(platform, "/new ccc", "feishu-p2p-ccc", "ou-user", Date.now(), "p2p");
+
+    expect(platform.updateChatInfo).toHaveBeenCalledWith(
+      "feishu-group",
+      expect.any(String),
+      "CCC Session: session-20260702-121530-a1b2c3",
+    );
+    expect(platform.sendCard).toHaveBeenCalledWith(
+      "feishu-group",
+      "CCC Agent Session Ready",
+      expect.stringContaining("CCC Agent"),
+      "green",
+    );
+
+    const helpPlatform = mockPlatform("feishu");
+    await handleCommand(helpPlatform, "hello", "feishu-group-help", "ou-user", Date.now(), "group");
+    const helpCard = vi.mocked(helpPlatform.sendRawCard).mock.calls.at(-1)?.[1] as string;
+    expect(helpCard).not.toContain("/new ccc");
+    expect(helpCard).not.toContain("CCC Agent");
+  });
+});

package/src/__tests__/session.test.ts

@@ -942,19 +942,29 @@ describe("getSessionStatus", () => {
     expect(status!.model).toBe(UNKNOWN_MODEL_PLACEHOLDER);
   });
 
-  it("Cursor 会话：adapter.getSessionInfo 抛错时降级为占位符（不阻塞 /state）", async () => {
-    mockSessionInfo("chat-cursor", { sessionId: "sid-cur", tool: "cursor" });
-    _setAdapterForToolForTest(
-      "cursor",
-      mockAdapter(() => {
-        throw new Error("simulated adapter failure");
-      }),
-    );
-    const status = await getSessionStatus("chat-cursor");
-    expect(status!.model).toBe(UNKNOWN_MODEL_PLACEHOLDER);
-    expect(status!.effort).toBeNull();
-  });
-});
+  it("Cursor 会话：adapter.getSessionInfo 抛错时降级为占位符（不阻塞 /state）", async () => {
+    mockSessionInfo("chat-cursor", { sessionId: "sid-cur", tool: "cursor" });
+    _setAdapterForToolForTest(
+      "cursor",
+      mockAdapter(() => {
+        throw new Error("simulated adapter failure");
+      }),
+    );
+    const status = await getSessionStatus("chat-cursor");
+    expect(status!.model).toBe(UNKNOWN_MODEL_PLACEHOLDER);
+    expect(status!.effort).toBeNull();
+  });
+
+  it("CCC Agent 会话：model 来自 ccc 配置且 effort 恒为 null", async () => {
+    mockSessionInfo("chat-ccc", { sessionId: "session-ccc", tool: "ccc" });
+
+    const status = await getSessionStatus("chat-ccc");
+
+    expect(status!.model).toBeTruthy();
+    expect(status!.model).not.toBe(UNKNOWN_MODEL_PLACEHOLDER);
+    expect(status!.effort).toBeNull();
+  });
+});
 
 describe("getAllSessionsStatus", () => {
   let registryFile = "";

package/src/__tests__/sim-platform.test.ts

@@ -62,16 +62,21 @@ describe("SimulatedPlatform", () => {
     await expect(SimulatedPlatform.setChatAvatar("t", "ch1", "claude", "busy")).resolves.toBeUndefined();
   });
 
-  it("纯函数 extractSessionInfo 正常工作", () => {
-    const result = SimulatedPlatform.extractSessionInfo("Claude Code Session: a1b2c3d4-e5f6-7890-abcd-ef1234567890");
-    expect(result).toEqual({ sessionId: "a1b2c3d4-e5f6-7890-abcd-ef1234567890", tool: "claude" });
-  });
-
-  it("纯函数 formatDelayNotice 正常工作", () => {
+  it("纯函数 extractSessionInfo 正常工作", () => {
+    const result = SimulatedPlatform.extractSessionInfo("Claude Code Session: a1b2c3d4-e5f6-7890-abcd-ef1234567890");
+    expect(result).toEqual({ sessionId: "a1b2c3d4-e5f6-7890-abcd-ef1234567890", tool: "claude" });
+  });
+
+  it("pure extractSessionInfo recognizes ccc session ids", () => {
+    const result = SimulatedPlatform.extractSessionInfo("CCC Session: session-20260702-121530-a1b2c3");
+    expect(result).toEqual({ sessionId: "session-20260702-121530-a1b2c3", tool: "ccc" });
+  });
+
+  it("纯函数 formatDelayNotice 正常工作", () => {
     const notice = SimulatedPlatform.formatDelayNotice(Date.now() - 20 * 60 * 1000, "测试消息");
     expect(notice).toBeDefined();
     expect(notice).toContain("延迟送达");
     // 近期消息不触发
     expect(SimulatedPlatform.formatDelayNotice(Date.now(), "test")).toBeNull();
   });
-});
+});

package/src/adapters/ccc-adapter.ts

@@ -0,0 +1,99 @@
+import { ChatSession, type ChatSessionConfig, type ChatSessionOptions } from "../builtin/index.ts";
+import {
+  getBuiltinContextSession,
+  newBuiltinSessionId,
+  normalizeBuiltinSessionId,
+} from "../builtin/context.ts";
+import { config, CCC_SESSION_PREFIX } from "../config.ts";
+import type {
+  CreateSessionResult,
+  SessionInfo,
+  ToolAdapter,
+  ToolPromptOptions,
+  UnifiedStreamMessage,
+} from "./adapter-interface.ts";
+
+export interface CccAdapterOptions extends ChatSessionConfig {
+  contextDir?: string;
+  compactAtTokens?: number;
+  keepRecentMessages?: number;
+}
+
+function toChatSessionOptions(
+  sessionId: string,
+  cwd: string,
+  options: CccAdapterOptions,
+): ChatSessionOptions {
+  return {
+    cwd,
+    persist: true,
+    sessionId,
+    contextDir: options.contextDir,
+    compactAtTokens: options.compactAtTokens,
+    keepRecentMessages: options.keepRecentMessages,
+  };
+}
+
+export function createCccAdapter(options: CccAdapterOptions = {}): ToolAdapter {
+  const chatConfig: ChatSessionConfig = {
+    ...(options.apiKey !== undefined ? { apiKey: options.apiKey } : {}),
+    ...(options.baseURL !== undefined ? { baseURL: options.baseURL } : {}),
+    ...(options.model !== undefined ? { model: options.model } : {}),
+  };
+
+  return {
+    displayName: "CCC Agent",
+    sessionDescPrefix: CCC_SESSION_PREFIX,
+
+    async createSession(cwd: string): Promise<CreateSessionResult> {
+      const sessionId = newBuiltinSessionId();
+      const session = new ChatSession(
+        chatConfig,
+        toChatSessionOptions(sessionId, cwd, options),
+      );
+      session.reset();
+      return { sessionId };
+    },
+
+    async *prompt(
+      sessionId: string,
+      userText: string,
+      cwd: string,
+      signal?: AbortSignal,
+      _promptOptions?: ToolPromptOptions,
+    ): AsyncIterable<UnifiedStreamMessage> {
+      const normalizedSessionId = normalizeBuiltinSessionId(sessionId);
+      const session = new ChatSession(
+        chatConfig,
+        toChatSessionOptions(normalizedSessionId, cwd, options),
+      );
+
+      for await (const event of session.chat(userText, signal)) {
+        if (event.type === "text") {
+          yield {
+            type: "assistant",
+            blocks: [{ type: "text", text: event.text }],
+          };
+        } else if (event.type === "error") {
+          throw new Error(event.message);
+        }
+      }
+    },
+
+    async getSessionInfo(sessionId: string): Promise<SessionInfo | undefined> {
+      const normalizedSessionId = normalizeBuiltinSessionId(sessionId);
+      const info = getBuiltinContextSession(normalizedSessionId, options.contextDir);
+      if (!info) return undefined;
+      return {
+        sessionId: info.sessionId,
+        cwd: info.cwd,
+        lastModified: info.updatedAt,
+        model: options.model ?? config.ccc.model,
+      };
+    },
+
+    async closeSession(_sessionId: string): Promise<void> {
+      // ChatSession uses one request-scoped stream per prompt. AbortSignal handles cancellation.
+    },
+  };
+}