chatccc 0.2.195 → 0.2.197

package/src/adapters/codex-adapter.ts

@@ -28,7 +28,11 @@ 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";
 
 // ---------------------------------------------------------------------------
 // 特殊注入提示
@@ -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,6 +235,7 @@ 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 管道自然关闭（可能延迟数分钟）
@@ -241,6 +246,7 @@ async function* readJsonLines(
       if (signal?.aborted) break;
       const trimmed = line.trim();
       if (!trimmed) continue;
+      rawLog?.writeLine(trimmed);
       try {
         yield JSON.parse(trimmed) as CodexEvent;
       } catch {
@@ -258,17 +264,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 +304,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 +352,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 +377,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 +386,7 @@ export function createCodexAdapter(
 ): ToolAdapter {
   return new CodexAdapter(
     options.metaStore ?? defaultCodexSessionMetaStore,
-    options.model,
-    options.effort,
-  );
-}
+    options.model,
+    options.effort,
+  );
+}

package/src/adapters/cursor-adapter.ts

@@ -20,16 +20,16 @@ import type {
   SessionInfo,
 } from "./adapter-interface.ts";
 import { parseUserCommand } from "./adapter-interface.ts";
-import { config, CURSOR_AGENT_COMMAND, CURSOR_AGENT_ARGS, RAW_STREAM_LOGS_DIR } from "../config.ts";
+import { config, CURSOR_AGENT_COMMAND, CURSOR_AGENT_ARGS, RAW_STREAM_LOGS_DIR } from "../config.ts";
 import {
   defaultCursorSessionMetaStore,
   type CursorSessionMetaStore,
 } from "./cursor-session-meta-store.ts";
-import { killProcessTree } from "./proc-tree-kill.ts";
-import {
-  createRawStreamLog,
-  type RawStreamLogHandle,
-} from "./raw-stream-log.ts";
+import { killProcessTree } from "./proc-tree-kill.ts";
+import {
+  createRawStreamLog,
+  type RawStreamLogHandle,
+} from "./raw-stream-log.ts";
 
 // ---------------------------------------------------------------------------
 // 特殊注入提示
@@ -118,6 +118,67 @@ interface CursorContentBlock {
   [key: string]: unknown;
 }
 
+interface CursorProcessCloseInfo {
+  code: number | null;
+  signal: NodeJS.Signals | null;
+  stderr: string;
+}
+
+interface CursorProcessHandle {
+  proc: ChildProcess;
+  getStderr(): string;
+  waitForClose(): Promise<CursorProcessCloseInfo>;
+}
+
+interface CursorStreamStats {
+  stdoutLength: number;
+  rawLineCount: number;
+  parsedLineCount: number;
+}
+
+type CursorSpawn = typeof spawn;
+
+function createCursorStreamStats(): CursorStreamStats {
+  return { stdoutLength: 0, rawLineCount: 0, parsedLineCount: 0 };
+}
+
+function isCursorAuthRelatedError(stderr: string): boolean {
+  const text = stderr.toLowerCase();
+  return (
+    text.includes("authentication required") ||
+    text.includes("not logged in") ||
+    text.includes("login") ||
+    text.includes("sign in") ||
+    text.includes("unauthorized") ||
+    text.includes("401") ||
+    text.includes("cursor_api_key") ||
+    text.includes("api key")
+  );
+}
+
+export function formatCursorAgentEmptyOutputMessage(args: {
+  exitCode: number | null;
+  stdoutLength: number;
+  stderr: string;
+}): string | null {
+  if (args.exitCode === 0) return null;
+  if (args.stdoutLength !== 0) return null;
+  if (args.stderr.trim().length === 0) return null;
+
+  if (isCursorAuthRelatedError(args.stderr)) {
+    return "Cursor Agent 没有返回内容。检测到认证相关错误，可能需要重新登录 Cursor Agent，或配置 CURSOR_API_KEY。请在本机运行 agent status 检查状态；如未登录，请运行 agent login 后重试。";
+  }
+
+  return "Cursor Agent 没有返回内容。底层命令异常退出，请检查本机 Cursor Agent 状态后重试。";
+}
+
+function createCursorAgentFailureError(info: CursorProcessCloseInfo): Error {
+  const stderr = info.stderr.trim().slice(0, 500);
+  return new Error(
+    `Cursor Agent exited without stream-json output (exit=${info.code ?? "unknown"}, stderr=${stderr})`,
+  );
+}
+
 // ---------------------------------------------------------------------------
 // normalizeCursorMessage — Cursor 消息 → UnifiedStreamMessage | null
 // ---------------------------------------------------------------------------
@@ -304,7 +365,8 @@ function spawnAgent(
   stdinText?: string,
   modelOverride?: string,
   mode?: "plan" | "ask",
-): ChildProcess {
+  spawnImpl: CursorSpawn = spawn,
+): CursorProcessHandle {
   let allArgs: string[];
   if (mode) {
     // plan/ask 模式：移除 --force/--yolo，添加 --mode plan/ask
@@ -323,7 +385,7 @@ function spawnAgent(
       allArgs.push("--model", modelOverride);
     }
   }
-  const proc = spawn(CURSOR_AGENT_COMMAND, allArgs, {
+  const proc = spawnImpl(CURSOR_AGENT_COMMAND, allArgs, {
     cwd,
     stdio: [stdinText !== undefined ? "pipe" : "ignore", "pipe", "pipe"],
     windowsHide: true,
@@ -334,26 +396,48 @@ function spawnAgent(
 
   // 收集 stderr，子进程异常退出时输出到日志，方便排查静默失败
   let stderr = "";
-  proc.stderr!.on("data", (chunk: Buffer) => { stderr += chunk.toString(); });
-  proc.on("close", (code) => {
+  let closeInfo: CursorProcessCloseInfo | null = null;
+  let resolveClose: (info: CursorProcessCloseInfo) => void = () => {};
+  const closePromise = new Promise<CursorProcessCloseInfo>((resolve) => {
+    resolveClose = resolve;
+  });
+  const settleClose = (code: number | null, signal: NodeJS.Signals | null) => {
+    if (closeInfo) return;
+    closeInfo = { code, signal, stderr };
     if (stderr.trim()) {
       console.error(`[Cursor stderr] exit=${code}: ${stderr.trim().slice(0, 2000)}`);
     }
+    resolveClose(closeInfo);
+  };
+  proc.stderr!.on("data", (chunk: Buffer) => { stderr += chunk.toString(); });
+  proc.once("error", (err) => {
+    stderr += `${stderr ? "\n" : ""}${(err as Error).message}`;
+    settleClose(null, null);
   });
+  proc.once("close", (code, signal) => { settleClose(code, signal); });
 
   if (stdinText !== undefined) {
     proc.stdin!.write(stdinText);
     proc.stdin!.end();
   }
-  return proc;
+  return {
+    proc,
+    getStderr: () => stderr,
+    waitForClose: async () => {
+      if (closeInfo) return { ...closeInfo, stderr };
+      const info = await closePromise;
+      return { ...info, stderr };
+    },
+  };
 }
 
-async function* readJsonLines(
-  proc: ChildProcess,
-  signal?: AbortSignal,
-  debugTag?: string,
-  rawLog?: RawStreamLogHandle | null,
-): AsyncGenerator<CursorMessageLine> {
+async function* readJsonLines(
+  proc: ChildProcess,
+  signal?: AbortSignal,
+  debugTag?: string,
+  rawLog?: RawStreamLogHandle | null,
+  stats?: CursorStreamStats,
+): AsyncGenerator<CursorMessageLine> {
   const tag = debugTag ?? "cursor";
   const rl = createInterface({ input: proc.stdout!, crlfDelay: Infinity });
   // abort 时主动 close readline，避免等待 Windows 管道自然关闭（可能延迟数分钟）
@@ -364,11 +448,17 @@ async function* readJsonLines(
     for await (const line of rl) {
       if (signal?.aborted) break;
       lineCount++;
-      const trimmed = line.trim();
-      if (!trimmed) continue;
-      rawLog?.writeLine(trimmed);
-      try {
-        yield JSON.parse(trimmed) as CursorMessageLine;
+      if (stats) {
+        stats.rawLineCount++;
+        stats.stdoutLength += Buffer.byteLength(line, "utf-8") + 1;
+      }
+      const trimmed = line.trim();
+      if (!trimmed) continue;
+      rawLog?.writeLine(trimmed);
+      try {
+        const parsed = JSON.parse(trimmed) as CursorMessageLine;
+        if (stats) stats.parsedLineCount++;
+        yield parsed;
       } catch { /* 非 JSON 行静默跳过 */ }
     }
   } finally {
@@ -388,17 +478,21 @@ class CursorAdapter implements ToolAdapter {
   private activeProcs = new Set<ChildProcess>();
   private metaStore: CursorSessionMetaStore;
   private modelOverride: string | undefined;
+  private spawnImpl: CursorSpawn;
 
-  constructor(metaStore: CursorSessionMetaStore, modelOverride?: string) {
+  constructor(metaStore: CursorSessionMetaStore, modelOverride?: string, spawnImpl: CursorSpawn = spawn) {
     this.metaStore = metaStore;
     this.modelOverride = modelOverride;
+    this.spawnImpl = spawnImpl;
   }
 
   async createSession(cwd: string): Promise<CreateSessionResult> {
-    const proc = spawnAgent(["ok"], cwd, undefined, this.modelOverride);
+    const handle = spawnAgent(["ok"], cwd, undefined, this.modelOverride, undefined, this.spawnImpl);
+    const proc = handle.proc;
+    const stats = createCursorStreamStats();
     this.activeProcs.add(proc);
 
-    for await (const msg of readJsonLines(proc, undefined, "createSession")) {
+    for await (const msg of readJsonLines(proc, undefined, "createSession", null, stats)) {
       if (msg.type === "system" && msg.subtype === "init" && msg.session_id) {
         const sessionId = msg.session_id;
         await this.metaStore
@@ -412,6 +506,13 @@ class CursorAdapter implements ToolAdapter {
 
     await killProcessTree(proc.pid);
     this.activeProcs.delete(proc);
+    const closeInfo = await handle.waitForClose();
+    const visibleMessage = formatCursorAgentEmptyOutputMessage({
+      exitCode: closeInfo.code,
+      stdoutLength: stats.stdoutLength,
+      stderr: closeInfo.stderr,
+    });
+    if (visibleMessage) throw new Error(visibleMessage);
     throw new Error("No session ID in Cursor init event");
   }
 
@@ -424,40 +525,43 @@ class CursorAdapter implements ToolAdapter {
   ): AsyncIterable<UnifiedStreamMessage> {
     console.log(`[Cursor debug] prompt start: sessionId=${sessionId}, cwd=${cwd}, userTextLen=${userText.length}`);
     const cmd = parseUserCommand(userText);
-    const proc = spawnAgent(
+    const handle = spawnAgent(
       ["--resume", sessionId],
       cwd,
       buildCursorPromptText(userText),
       this.modelOverride,
       cmd.mode ?? undefined,
+      this.spawnImpl,
     );
+    const proc = handle.proc;
     this.activeProcs.add(proc);
-    if (proc.pid !== undefined) options?.onProcessStart?.({ pid: proc.pid });
-
-    const rawLogConfig = config.rawStreamLogs.cursor;
-    let rawLog: RawStreamLogHandle | null = null;
-    try {
-      rawLog = await createRawStreamLog({
-        enabled: rawLogConfig.enabled,
-        rootDir: RAW_STREAM_LOGS_DIR,
-        tool: "cursor",
-        sessionId,
-        label: "prompt",
-        maxBytesPerTurn: rawLogConfig.maxBytesPerTurn,
-        retentionDays: rawLogConfig.retentionDays,
-      });
-    } catch (err) {
-      console.error(`[Cursor raw stream log] create failed: ${(err as Error).message}`);
-    }
+    if (proc.pid !== undefined) options?.onProcessStart?.({ pid: proc.pid });
+
+    const rawLogConfig = config.rawStreamLogs.cursor;
+    let rawLog: RawStreamLogHandle | null = null;
+    try {
+      rawLog = await createRawStreamLog({
+        enabled: rawLogConfig.enabled,
+        rootDir: RAW_STREAM_LOGS_DIR,
+        tool: "cursor",
+        sessionId,
+        label: "prompt",
+        maxBytesPerTurn: rawLogConfig.maxBytesPerTurn,
+        retentionDays: rawLogConfig.retentionDays,
+      });
+    } catch (err) {
+      console.error(`[Cursor raw stream log] create failed: ${(err as Error).message}`);
+    }
 
     // 见 codex-adapter.ts 同位置注释：spawn 用了 shell:true，必须杀整棵树，
     // 否则 abort 后真正在跑的孙进程 cursor-agent 还会继续输出 & 占用资源。
-    const onAbort = () => { void killProcessTree(proc.pid); };
-    signal?.addEventListener("abort", onAbort, { once: true });
-    let sawResult = false;
-
-    try {
-      for await (const raw of readJsonLines(proc, signal, sessionId, rawLog)) {
+    const onAbort = () => { void killProcessTree(proc.pid); };
+    signal?.addEventListener("abort", onAbort, { once: true });
+    let sawResult = false;
+    const stats = createCursorStreamStats();
+
+    try {
+      for await (const raw of readJsonLines(proc, signal, sessionId, rawLog, stats)) {
         if (signal?.aborted) break;
         if (
           raw.type === "system" &&
@@ -473,17 +577,32 @@ class CursorAdapter implements ToolAdapter {
         if (normalized) yield normalized;
 
         // result 是流末事件，收到后立即结束进程，防止 CLI 僵死导致 readline 挂起。
-        if (raw.type === "result") {
-          sawResult = true;
-          void killProcessTree(proc.pid);
+        if (raw.type === "result") {
+          sawResult = true;
+          void killProcessTree(proc.pid);
           break;
         }
       }
+      if (!signal?.aborted && !sawResult) {
+        const closeInfo = await handle.waitForClose();
+        const visibleMessage = formatCursorAgentEmptyOutputMessage({
+          exitCode: closeInfo.code,
+          stdoutLength: stats.stdoutLength,
+          stderr: closeInfo.stderr,
+        });
+        if (visibleMessage) {
+          yield {
+            type: "assistant",
+            blocks: [{ type: "text_final", text: visibleMessage }],
+          };
+          throw createCursorAgentFailureError(closeInfo);
+        }
+      }
     } finally {
       signal?.removeEventListener("abort", onAbort);
-      await killProcessTree(proc.pid);
-      await rawLog?.close({ keep: rawLogConfig.keepCompleted || signal?.aborted === true || !sawResult });
-      this.activeProcs.delete(proc);
+      await killProcessTree(proc.pid);
+      await rawLog?.close({ keep: rawLogConfig.keepCompleted || signal?.aborted === true || !sawResult });
+      this.activeProcs.delete(proc);
       if (proc.pid !== undefined) options?.onProcessExit?.({ pid: proc.pid });
       console.log(`[Cursor debug] prompt end: sessionId=${sessionId}, signalAborted=${signal?.aborted ?? false}`);
     }
@@ -513,10 +632,16 @@ export interface CreateCursorAdapterOptions {
   metaStore?: CursorSessionMetaStore;
   /** per-session 模型覆盖（/model 命令）；传了就用，不传走全局 cursor.model */
   model?: string;
+  /** 注入自定义 spawn 实现（测试用）。 */
+  spawn?: CursorSpawn;
 }
 
 export function createCursorAdapter(
   options: CreateCursorAdapterOptions = {},
 ): ToolAdapter {
-  return new CursorAdapter(options.metaStore ?? defaultCursorSessionMetaStore, options.model);
-}
+  return new CursorAdapter(
+    options.metaStore ?? defaultCursorSessionMetaStore,
+    options.model,
+    options.spawn,
+  );
+}