chatccc 0.2.196 → 0.2.198

package/src/adapters/codex-adapter.ts

@@ -10,7 +10,6 @@
 import { spawn, type ChildProcess } from "node:child_process";
 import { existsSync, readFileSync } from "node:fs";
 import { dirname, join } from "node:path";
-import { createInterface } from "node:readline";
 import { randomUUID } from "node:crypto";
 import { fileURLToPath } from "node:url";
 
@@ -28,7 +27,12 @@ import {
   type CodexSessionMetaStore,
 } from "./codex-session-meta-store.ts";
 import { killProcessTree } from "./proc-tree-kill.ts";
-import { config } from "../config.ts";
+import { config, RAW_STREAM_LOGS_DIR } from "../config.ts";
+import {
+  createRawStreamLog,
+  type RawStreamLogHandle,
+} from "./raw-stream-log.ts";
+import { readJsonLinesWithBadJsonIdleWatchdog } from "./jsonl-stream.ts";
 
 // ---------------------------------------------------------------------------
 // 特殊注入提示
@@ -69,9 +73,9 @@ function buildCodexPromptText(userText: string): string {
 // ---------------------------------------------------------------------------
 
 /** 可通过 config.json codex.path 自定义 Codex 可执行文件路径 */
-function detectCodexCommand(): string {
-  return config.codex.path || "codex";
-}
+function detectCodexCommand(): string {
+  return config.codex.path || "codex";
+}
 
 /** exec 模式共用参数：JSONL 输出、绕过沙盒和确认、跳过 git 仓库检查 */
 const CODEX_BASE_ARGS = [
@@ -183,13 +187,13 @@ export function normalizeCodexMessage(
 // 子进程辅助函数
 // ---------------------------------------------------------------------------
 
-function spawnCodex(
-  args: string[],
-  cwd?: string,
-  stdinText?: string,
-  modelOverride?: string,
-  effortOverride?: string,
-): ChildProcess {
+function spawnCodex(
+  args: string[],
+  cwd?: string,
+  stdinText?: string,
+  modelOverride?: string,
+  effortOverride?: string,
+): ChildProcess {
   const allArgs = [...args];
   const model = modelOverride ?? resolveCodexModel();
   if (model) {
@@ -197,12 +201,12 @@ function spawnCodex(
     const execIdx = allArgs.indexOf("exec");
     allArgs.splice(execIdx + 1, 0, "-m", model);
   }
-  const effort = effortOverride ?? resolveCodexEffort();
+  const effort = effortOverride ?? resolveCodexEffort();
   if (effort) {
     allArgs.push("-c", `model_reasoning_effort="${effort}"`);
   }
 
-  const proc = spawn(detectCodexCommand(), allArgs, {
+  const proc = spawn(detectCodexCommand(), allArgs, {
     cwd,
     stdio: [stdinText !== undefined ? "pipe" : "ignore", "pipe", "pipe"],
     windowsHide: true,
@@ -231,26 +235,16 @@ function spawnCodex(
 async function* readJsonLines(
   proc: ChildProcess,
   signal?: AbortSignal,
+  rawLog?: RawStreamLogHandle | null,
 ): AsyncGenerator<CodexEvent> {
-  const rl = createInterface({ input: proc.stdout!, crlfDelay: Infinity });
-  // abort 时主动 close readline，避免等待 Windows 管道自然关闭（可能延迟数分钟）
-  const onAbort = () => { rl.close(); };
-  signal?.addEventListener("abort", onAbort, { once: true });
-  try {
-    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..."）
-      }
-    }
-  } finally {
-    signal?.removeEventListener("abort", onAbort);
-    rl.close();
-  }
+  yield* readJsonLinesWithBadJsonIdleWatchdog<CodexEvent>({
+    input: proc.stdout!,
+    tool: "codex",
+    tag: "codex",
+    signal,
+    rawLog,
+    parse: (line) => JSON.parse(line) as CodexEvent,
+  });
 }
 
 // ---------------------------------------------------------------------------
@@ -258,17 +252,17 @@ async function* readJsonLines(
 // ---------------------------------------------------------------------------
 
 class CodexAdapter implements ToolAdapter {
-  readonly displayName = "Codex";
-  readonly sessionDescPrefix = "Codex Session:";
-  private metaStore: CodexSessionMetaStore;
-  private modelOverride: string | undefined;
-  private effortOverride: string | undefined;
-
-  constructor(metaStore: CodexSessionMetaStore, modelOverride?: string, effortOverride?: string) {
-    this.metaStore = metaStore;
-    this.modelOverride = modelOverride;
-    this.effortOverride = effortOverride;
-  }
+  readonly displayName = "Codex";
+  readonly sessionDescPrefix = "Codex Session:";
+  private metaStore: CodexSessionMetaStore;
+  private modelOverride: string | undefined;
+  private effortOverride: string | undefined;
+
+  constructor(metaStore: CodexSessionMetaStore, modelOverride?: string, effortOverride?: string) {
+    this.metaStore = metaStore;
+    this.modelOverride = modelOverride;
+    this.effortOverride = effortOverride;
+  }
 
   // createSession: 生成 sessionId，记录 cwd，不创建 Codex 线程（延迟到首次 prompt）
   async createSession(cwd: string): Promise<CreateSessionResult> {
@@ -298,19 +292,37 @@ class CodexAdapter implements ToolAdapter {
       ? [...baseArgs, "-C", cwd, "-"]
       : [...baseArgs, "resume", threadId, "-"];
 
-    const proc = spawnCodex(args, cwd, buildCodexPromptText(userText), this.modelOverride, this.effortOverride);
+    const proc = spawnCodex(args, cwd, buildCodexPromptText(userText), this.modelOverride, this.effortOverride);
     if (proc.pid !== undefined) options?.onProcessStart?.({ pid: proc.pid });
 
+    const rawLogConfig = config.rawStreamLogs.codex;
+    let rawLog: RawStreamLogHandle | null = null;
+    try {
+      rawLog = await createRawStreamLog({
+        enabled: rawLogConfig.enabled,
+        rootDir: RAW_STREAM_LOGS_DIR,
+        tool: "codex",
+        sessionId,
+        label: "prompt",
+        maxBytesPerTurn: rawLogConfig.maxBytesPerTurn,
+        retentionDays: rawLogConfig.retentionDays,
+      });
+    } catch (err) {
+      console.error(`[Codex raw stream log] create failed: ${(err as Error).message}`);
+    }
+
     // 关键：spawn 用了 shell:true，proc.pid 指向的是壳进程（cmd.exe / sh）。
     // 真正干活的是壳的孙子 codex.exe。普通 proc.kill() 在 Windows 上只杀第一层，
     // 会留下幽灵 node + codex.exe 继续烧 token、stream-state 永远停在 running。
     // 因此 abort 与 finally 都必须用 killProcessTree 整棵进程树一起收尸。
     const onAbort = () => { void killProcessTree(proc.pid); };
     signal?.addEventListener("abort", onAbort, { once: true });
+    let completed = false;
 
     try {
-      for await (const raw of readJsonLines(proc, signal)) {
+      for await (const raw of readJsonLines(proc, signal, rawLog)) {
         if (signal?.aborted) break;
+        if (raw.type === "turn.completed") completed = true;
 
         if (
           isFirstPrompt &&
@@ -328,6 +340,7 @@ class CodexAdapter implements ToolAdapter {
     } finally {
       signal?.removeEventListener("abort", onAbort);
       await killProcessTree(proc.pid);
+      await rawLog?.close({ keep: rawLogConfig.keepCompleted || signal?.aborted === true || !completed });
       if (proc.pid !== undefined) options?.onProcessExit?.({ pid: proc.pid });
     }
   }
@@ -352,8 +365,8 @@ class CodexAdapter implements ToolAdapter {
 export interface CreateCodexAdapterOptions {
   metaStore?: CodexSessionMetaStore;
   /** per-session 模型覆盖（/model 命令）；传了就用，不传走全局 codex.model */
-  model?: string;
-  effort?: string;
+  model?: string;
+  effort?: string;
 }
 
 export function createCodexAdapter(
@@ -361,7 +374,7 @@ export function createCodexAdapter(
 ): ToolAdapter {
   return new CodexAdapter(
     options.metaStore ?? defaultCodexSessionMetaStore,
-    options.model,
-    options.effort,
-  );
-}
+    options.model,
+    options.effort,
+  );
+}