chatccc 0.2.18 → 0.2.20

package/src/adapters/codex-adapter.ts

@@ -1,295 +1,295 @@
-// =============================================================================
-// codex-adapter.ts — OpenAI Codex CLI 适配器
-// =============================================================================
-// 通过 codex exec --json 与 Codex CLI 交互。
-// - createSession: 生成 UUID sessionId，记录 cwd，不创建 Codex 线程（延迟到首次 prompt）
-// - prompt: 首次调用用 codex exec 创建线程，后续用 codex exec resume 恢复
-// - getSessionInfo: 从持久化映射读取 cwd / threadId
-// =============================================================================
-
-import { spawn, type ChildProcess } from "node:child_process";
-import { createInterface } from "node:readline";
-import { randomUUID } from "node:crypto";
-
-import type {
-  ToolAdapter,
-  UnifiedBlock,
-  UnifiedStreamMessage,
-  CreateSessionResult,
-  SessionInfo,
-} from "./adapter-interface.ts";
-import {
-  defaultCodexSessionMetaStore,
-  type CodexSessionMetaStore,
-} from "./codex-session-meta-store.ts";
-import { config } from "../config.ts";
-
-// ---------------------------------------------------------------------------
-// 命令与参数
-// ---------------------------------------------------------------------------
-
-/** 可通过 config.json codex.path 自定义 Codex 可执行文件路径 */
-function detectCodexCommand(): string {
-  return config.codex.path || "codex";
-}
-const CODEX_COMMAND = detectCodexCommand();
-
-/** exec 模式共用参数：JSONL 输出、绕过沙盒和确认、跳过 git 仓库检查 */
-const CODEX_BASE_ARGS = [
-  "exec",
-  "--json",
-  "--dangerously-bypass-approvals-and-sandbox",
-  "--skip-git-repo-check",
-];
-
-/** codex 模型；留空（""）表示不传 --model，由 codex config.toml 决定 */
-function resolveCodexModel(): string | null {
-  const m = config.codex.model;
-  return m.trim() !== "" ? m : null;
-}
-
-/** codex 努力程度（映射为 -c model_reasoning_effort=<value>）；留空表示不传 */
-function resolveCodexEffort(): string | null {
-  const e = config.codex.effort;
-  return e.trim() !== "" ? e : null;
-}
-
-// ---------------------------------------------------------------------------
-// 类型：Codex JSONL 消息行
-// ---------------------------------------------------------------------------
-
-interface CodexItem {
-  id?: string;
-  type?: string;
-  text?: string;
-  command?: string;
-  aggregated_output?: string;
-  exit_code?: number | null;
-  status?: string;
-}
-
-interface CodexEvent {
-  type: string;
-  thread_id?: string;
-  item?: CodexItem;
-  usage?: {
-    input_tokens?: number;
-    cached_input_tokens?: number;
-    output_tokens?: number;
-    reasoning_output_tokens?: number;
-  };
-}
-
-// ---------------------------------------------------------------------------
-// normalizeCodexMessage — Codex 事件 → UnifiedStreamMessage | null
-// ---------------------------------------------------------------------------
-
-export function normalizeCodexMessage(
-  msg: CodexEvent,
-): UnifiedStreamMessage | null {
-  // agent_message 文本回复
-  if (
-    msg.type === "item.completed" &&
-    msg.item?.type === "agent_message" &&
-    msg.item.text
-  ) {
-    return {
-      type: "assistant",
-      blocks: [{ type: "text", text: msg.item.text }],
-    };
-  }
-
-  // command_execution 工具调用开始
-  if (
-    msg.type === "item.started" &&
-    msg.item?.type === "command_execution" &&
-    msg.item.command
-  ) {
-    return {
-      type: "assistant",
-      blocks: [
-        {
-          type: "tool_use",
-          name: "Bash",
-          input: { command: msg.item.command },
-        },
-      ],
-    };
-  }
-
-  // command_execution 工具调用完成
-  if (
-    msg.type === "item.completed" &&
-    msg.item?.type === "command_execution"
-  ) {
-    const exitCode = msg.item.exit_code;
-    return {
-      type: "assistant",
-      blocks: [
-        {
-          type: "tool_result",
-          tool_use_id: msg.item.id ?? "",
-          content: msg.item.aggregated_output ?? "",
-          is_error: exitCode != null && exitCode !== 0 ? true : undefined,
-        },
-      ],
-    };
-  }
-
-  // thread.started / turn.started / turn.completed → 不映射为用户可见消息
-  return null;
-}
-
-// ---------------------------------------------------------------------------
-// 子进程辅助函数
-// ---------------------------------------------------------------------------
-
-function spawnCodex(
-  args: string[],
-  cwd?: string,
-  stdinText?: string,
-): ChildProcess {
-  const allArgs = [...args];
-  const model = resolveCodexModel();
-  if (model) {
-    // 把 -m 插在 exec 后面、其他参数前面
-    const execIdx = allArgs.indexOf("exec");
-    allArgs.splice(execIdx + 1, 0, "-m", model);
-  }
-  const effort = resolveCodexEffort();
-  if (effort) {
-    allArgs.push("-c", `model_reasoning_effort="${effort}"`);
-  }
-
-  const proc = spawn(CODEX_COMMAND, allArgs, {
-    cwd,
-    stdio: [stdinText !== undefined ? "pipe" : "ignore", "pipe", "pipe"],
-    windowsHide: true,
-    shell: true,
-  });
-
-  let stderr = "";
-  proc.stderr!.on("data", (chunk: Buffer) => {
-    stderr += chunk.toString();
-  });
-  proc.on("close", (code) => {
-    if (code !== 0 && stderr.trim()) {
-      console.error(
-        `[Codex stderr] exit=${code}: ${stderr.trim().slice(0, 2000)}`,
-      );
-    }
-  });
-
-  if (stdinText !== undefined) {
-    proc.stdin!.write(stdinText);
-    proc.stdin!.end();
-  }
-  return proc;
-}
-
-async function* readJsonLines(
-  proc: ChildProcess,
-  signal?: AbortSignal,
-): AsyncGenerator<CodexEvent> {
-  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 CodexEvent;
-    } catch {
-      // 非 JSON 行静默跳过（如 "Reading prompt from stdin..."）
-    }
-  }
-}
-
-// ---------------------------------------------------------------------------
-// 适配器实现
-// ---------------------------------------------------------------------------
-
-class CodexAdapter implements ToolAdapter {
-  readonly displayName = "Codex";
-  readonly sessionDescPrefix = "Codex Session:";
-  private metaStore: CodexSessionMetaStore;
-
-  constructor(metaStore: CodexSessionMetaStore) {
-    this.metaStore = metaStore;
-  }
-
-  // createSession: 生成 sessionId，记录 cwd，不创建 Codex 线程（延迟到首次 prompt）
-  async createSession(cwd: string): Promise<CreateSessionResult> {
-    const sessionId = randomUUID();
-    await this.metaStore.set(sessionId, { cwd });
-    return { sessionId };
-  }
-
-  async *prompt(
-    sessionId: string,
-    userText: string,
-    cwd: string,
-    signal?: AbortSignal,
-  ): AsyncIterable<UnifiedStreamMessage> {
-    let meta = await this.metaStore.get(sessionId);
-    const threadId = meta?.threadId;
-    const isFirstPrompt = !threadId;
-
-    // 首次 prompt: codex exec 创建新线程
-    // 后续 prompt: codex exec resume 恢复已有线程（resume 不接受 -C，cwd 继承自原线程）
-    const args = isFirstPrompt
-      ? [...CODEX_BASE_ARGS, "-C", cwd, "-"]
-      : [...CODEX_BASE_ARGS, "resume", threadId, "-"];
-
-    const proc = spawnCodex(args, cwd, userText);
-
-    try {
-      for await (const raw of readJsonLines(proc, signal)) {
-        if (signal?.aborted) break;
-
-        // 首次 prompt 时从 thread.started 事件学习 threadId
-        if (
-          isFirstPrompt &&
-          raw.type === "thread.started" &&
-          raw.thread_id
-        ) {
-          void this.metaStore
-            .setThreadId(sessionId, raw.thread_id)
-            .catch(() => {});
-        }
-
-        const normalized = normalizeCodexMessage(raw);
-        if (normalized) yield normalized;
-      }
-    } finally {
-      proc.kill();
-    }
-  }
-
-  async getSessionInfo(
-    sessionId: string,
-  ): Promise<SessionInfo | undefined> {
-    const meta = await this.metaStore.get(sessionId);
-    if (!meta) return undefined;
-    return { sessionId, cwd: meta.cwd };
-  }
-
-  async closeSession(_sessionId: string): Promise<void> {
-    // no-op：子进程由 prompt 的 finally 自动 kill
-  }
-}
-
-// ---------------------------------------------------------------------------
-// 工厂函数
-// ---------------------------------------------------------------------------
-
-export interface CreateCodexAdapterOptions {
-  metaStore?: CodexSessionMetaStore;
-}
-
-export function createCodexAdapter(
-  options: CreateCodexAdapterOptions = {},
-): ToolAdapter {
-  return new CodexAdapter(
-    options.metaStore ?? defaultCodexSessionMetaStore,
-  );
+// =============================================================================
+// codex-adapter.ts — OpenAI Codex CLI 适配器
+// =============================================================================
+// 通过 codex exec --json 与 Codex CLI 交互。
+// - createSession: 生成 UUID sessionId，记录 cwd，不创建 Codex 线程（延迟到首次 prompt）
+// - prompt: 首次调用用 codex exec 创建线程，后续用 codex exec resume 恢复
+// - getSessionInfo: 从持久化映射读取 cwd / threadId
+// =============================================================================
+
+import { spawn, type ChildProcess } from "node:child_process";
+import { createInterface } from "node:readline";
+import { randomUUID } from "node:crypto";
+
+import type {
+  ToolAdapter,
+  UnifiedBlock,
+  UnifiedStreamMessage,
+  CreateSessionResult,
+  SessionInfo,
+} from "./adapter-interface.ts";
+import {
+  defaultCodexSessionMetaStore,
+  type CodexSessionMetaStore,
+} from "./codex-session-meta-store.ts";
+import { config } from "../config.ts";
+
+// ---------------------------------------------------------------------------
+// 命令与参数
+// ---------------------------------------------------------------------------
+
+/** 可通过 config.json codex.path 自定义 Codex 可执行文件路径 */
+function detectCodexCommand(): string {
+  return config.codex.path || "codex";
+}
+const CODEX_COMMAND = detectCodexCommand();
+
+/** exec 模式共用参数：JSONL 输出、绕过沙盒和确认、跳过 git 仓库检查 */
+const CODEX_BASE_ARGS = [
+  "exec",
+  "--json",
+  "--dangerously-bypass-approvals-and-sandbox",
+  "--skip-git-repo-check",
+];
+
+/** codex 模型；留空（""）表示不传 --model，由 codex config.toml 决定 */
+function resolveCodexModel(): string | null {
+  const m = config.codex.model;
+  return m.trim() !== "" ? m : null;
+}
+
+/** codex 努力程度（映射为 -c model_reasoning_effort=<value>）；留空表示不传 */
+function resolveCodexEffort(): string | null {
+  const e = config.codex.effort;
+  return e.trim() !== "" ? e : null;
+}
+
+// ---------------------------------------------------------------------------
+// 类型：Codex JSONL 消息行
+// ---------------------------------------------------------------------------
+
+interface CodexItem {
+  id?: string;
+  type?: string;
+  text?: string;
+  command?: string;
+  aggregated_output?: string;
+  exit_code?: number | null;
+  status?: string;
+}
+
+interface CodexEvent {
+  type: string;
+  thread_id?: string;
+  item?: CodexItem;
+  usage?: {
+    input_tokens?: number;
+    cached_input_tokens?: number;
+    output_tokens?: number;
+    reasoning_output_tokens?: number;
+  };
+}
+
+// ---------------------------------------------------------------------------
+// normalizeCodexMessage — Codex 事件 → UnifiedStreamMessage | null
+// ---------------------------------------------------------------------------
+
+export function normalizeCodexMessage(
+  msg: CodexEvent,
+): UnifiedStreamMessage | null {
+  // agent_message 文本回复
+  if (
+    msg.type === "item.completed" &&
+    msg.item?.type === "agent_message" &&
+    msg.item.text
+  ) {
+    return {
+      type: "assistant",
+      blocks: [{ type: "text", text: msg.item.text }],
+    };
+  }
+
+  // command_execution 工具调用开始
+  if (
+    msg.type === "item.started" &&
+    msg.item?.type === "command_execution" &&
+    msg.item.command
+  ) {
+    return {
+      type: "assistant",
+      blocks: [
+        {
+          type: "tool_use",
+          name: "Bash",
+          input: { command: msg.item.command },
+        },
+      ],
+    };
+  }
+
+  // command_execution 工具调用完成
+  if (
+    msg.type === "item.completed" &&
+    msg.item?.type === "command_execution"
+  ) {
+    const exitCode = msg.item.exit_code;
+    return {
+      type: "assistant",
+      blocks: [
+        {
+          type: "tool_result",
+          tool_use_id: msg.item.id ?? "",
+          content: msg.item.aggregated_output ?? "",
+          is_error: exitCode != null && exitCode !== 0 ? true : undefined,
+        },
+      ],
+    };
+  }
+
+  // thread.started / turn.started / turn.completed → 不映射为用户可见消息
+  return null;
+}
+
+// ---------------------------------------------------------------------------
+// 子进程辅助函数
+// ---------------------------------------------------------------------------
+
+function spawnCodex(
+  args: string[],
+  cwd?: string,
+  stdinText?: string,
+): ChildProcess {
+  const allArgs = [...args];
+  const model = resolveCodexModel();
+  if (model) {
+    // 把 -m 插在 exec 后面、其他参数前面
+    const execIdx = allArgs.indexOf("exec");
+    allArgs.splice(execIdx + 1, 0, "-m", model);
+  }
+  const effort = resolveCodexEffort();
+  if (effort) {
+    allArgs.push("-c", `model_reasoning_effort="${effort}"`);
+  }
+
+  const proc = spawn(CODEX_COMMAND, allArgs, {
+    cwd,
+    stdio: [stdinText !== undefined ? "pipe" : "ignore", "pipe", "pipe"],
+    windowsHide: true,
+    shell: true,
+  });
+
+  let stderr = "";
+  proc.stderr!.on("data", (chunk: Buffer) => {
+    stderr += chunk.toString();
+  });
+  proc.on("close", (code) => {
+    if (code !== 0 && stderr.trim()) {
+      console.error(
+        `[Codex stderr] exit=${code}: ${stderr.trim().slice(0, 2000)}`,
+      );
+    }
+  });
+
+  if (stdinText !== undefined) {
+    proc.stdin!.write(stdinText);
+    proc.stdin!.end();
+  }
+  return proc;
+}
+
+async function* readJsonLines(
+  proc: ChildProcess,
+  signal?: AbortSignal,
+): AsyncGenerator<CodexEvent> {
+  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 CodexEvent;
+    } catch {
+      // 非 JSON 行静默跳过（如 "Reading prompt from stdin..."）
+    }
+  }
+}
+
+// ---------------------------------------------------------------------------
+// 适配器实现
+// ---------------------------------------------------------------------------
+
+class CodexAdapter implements ToolAdapter {
+  readonly displayName = "Codex";
+  readonly sessionDescPrefix = "Codex Session:";
+  private metaStore: CodexSessionMetaStore;
+
+  constructor(metaStore: CodexSessionMetaStore) {
+    this.metaStore = metaStore;
+  }
+
+  // createSession: 生成 sessionId，记录 cwd，不创建 Codex 线程（延迟到首次 prompt）
+  async createSession(cwd: string): Promise<CreateSessionResult> {
+    const sessionId = randomUUID();
+    await this.metaStore.set(sessionId, { cwd });
+    return { sessionId };
+  }
+
+  async *prompt(
+    sessionId: string,
+    userText: string,
+    cwd: string,
+    signal?: AbortSignal,
+  ): AsyncIterable<UnifiedStreamMessage> {
+    let meta = await this.metaStore.get(sessionId);
+    const threadId = meta?.threadId;
+    const isFirstPrompt = !threadId;
+
+    // 首次 prompt: codex exec 创建新线程
+    // 后续 prompt: codex exec resume 恢复已有线程（resume 不接受 -C，cwd 继承自原线程）
+    const args = isFirstPrompt
+      ? [...CODEX_BASE_ARGS, "-C", cwd, "-"]
+      : [...CODEX_BASE_ARGS, "resume", threadId, "-"];
+
+    const proc = spawnCodex(args, cwd, userText);
+
+    try {
+      for await (const raw of readJsonLines(proc, signal)) {
+        if (signal?.aborted) break;
+
+        // 首次 prompt 时从 thread.started 事件学习 threadId
+        if (
+          isFirstPrompt &&
+          raw.type === "thread.started" &&
+          raw.thread_id
+        ) {
+          void this.metaStore
+            .setThreadId(sessionId, raw.thread_id)
+            .catch(() => {});
+        }
+
+        const normalized = normalizeCodexMessage(raw);
+        if (normalized) yield normalized;
+      }
+    } finally {
+      proc.kill();
+    }
+  }
+
+  async getSessionInfo(
+    sessionId: string,
+  ): Promise<SessionInfo | undefined> {
+    const meta = await this.metaStore.get(sessionId);
+    if (!meta) return undefined;
+    return { sessionId, cwd: meta.cwd };
+  }
+
+  async closeSession(_sessionId: string): Promise<void> {
+    // no-op：子进程由 prompt 的 finally 自动 kill
+  }
+}
+
+// ---------------------------------------------------------------------------
+// 工厂函数
+// ---------------------------------------------------------------------------
+
+export interface CreateCodexAdapterOptions {
+  metaStore?: CodexSessionMetaStore;
+}
+
+export function createCodexAdapter(
+  options: CreateCodexAdapterOptions = {},
+): ToolAdapter {
+  return new CodexAdapter(
+    options.metaStore ?? defaultCodexSessionMetaStore,
+  );
 }

package/src/cards.ts

@@ -108,13 +108,17 @@ export function buildProgressCard(
   });
 }
 
-export function buildHelpCard(userText: string, opts: { greeting?: string } = {}): string {
-  const greeting = opts.greeting ?? `你发送了: ${userText}`;
-  const lines = [
-    "发送 **/new** 创建新会话（默认 Claude Code）",
-    "发送 **/new claude** 创建新 Claude 对话",
-    "发送 **/new cursor** 创建新 Cursor 会话",
-    "发送 **/new codex** 创建新 Codex 会话",
+export function buildHelpCard(
+  userText: string,
+  opts: { greeting?: string; defaultToolLabel?: string } = {},
+): string {
+  const greeting = opts.greeting ?? `你发送了: ${userText}`;
+  const defaultToolLabel = opts.defaultToolLabel ?? "Claude Code";
+  const lines = [
+    `发送 **/new** 创建新会话（默认 ${defaultToolLabel}）`,
+    "发送 **/new claude** 创建新 Claude 对话",
+    "发送 **/new cursor** 创建新 Cursor 会话",
+    "发送 **/new codex** 创建新 Codex 会话",
     "发送 **/forget** 重置当前会话（保留工作目录，同一群内继续）",
   ].join("\n");
   return JSON.stringify({
@@ -124,7 +128,7 @@ export function buildHelpCard(userText: string, opts: { greeting?: string } = {}
       { tag: "div", text: { tag: "lark_md", content: greeting } },
       { tag: "div", text: { tag: "lark_md", content: lines } },
       buildButtons([
-        { text: "新建 Claude Code 会话（/new claude）", value: JSON.stringify({ cmd: "new" }), type: "primary" },
+        { text: `新建默认会话（/new，${defaultToolLabel}）`, value: JSON.stringify({ cmd: "new" }), type: "primary" },
         { text: "新建 Cursor 会话（/new cursor）", value: JSON.stringify({ cmd: "new cursor" }), type: "primary" },
         { text: "新建 Codex 会话（/new codex）", value: JSON.stringify({ cmd: "new codex" }), type: "primary" },
         { text: "重启 ChatCCC（/restart）", value: JSON.stringify({ cmd: "restart" }), type: "danger" },
@@ -248,14 +252,15 @@ export function buildCdCard(
 }
 
 // 所有会话列表卡片（Claude Code 优先，然后 Cursor）
-export function buildSessionsCard(sessions: Array<{
-  sessionId: string;
-  active: boolean;
-  turnCount: number;
-  elapsedSeconds: number | null;
-  model: string;
-  tool: string;
-}>): string {
+export function buildSessionsCard(sessions: Array<{
+  sessionId: string;
+  active: boolean;
+  turnCount: number;
+  elapsedSeconds: number | null;
+  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");
@@ -269,7 +274,7 @@ export function buildSessionsCard(sessions: Array<{
       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** 或 **/new codex** 创建新会话。" } },
+        { tag: "div", text: { tag: "lark_md", content: `当前没有会话记录。\n\n使用 **/new**（默认 ${defaultToolLabel}）、**/new claude**、**/new cursor** 或 **/new codex** 创建新会话。` } },
         { tag: "hr" },
         { tag: "action", actions: [{ tag: "button", text: { tag: "plain_text", content: "收起" }, type: "default", value: { action: "close" } }] },
       ],
@@ -355,4 +360,4 @@ export function buildStatusCard(statusText: string, template = "blue"): string {
       },
     ],
   });
-}
+}