chatccc 0.2.196 → 0.2.198

package/src/adapters/cursor-adapter.ts

@@ -8,7 +8,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 { fileURLToPath } from "node:url";
 
 import type {
@@ -20,16 +19,17 @@ 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";
+import { readJsonLinesWithBadJsonIdleWatchdog } from "./jsonl-stream.ts";
 
 // ---------------------------------------------------------------------------
 // 特殊注入提示
@@ -105,9 +105,9 @@ interface CursorMessageLine {
   tool_call?: Record<string, unknown>;
 }
 
-interface CursorContentBlock {
-  type?: string;
-  text?: string;
+interface CursorContentBlock {
+  type?: string;
+  text?: string;
   thinking?: string;
   name?: string;
   input?: unknown;
@@ -115,73 +115,73 @@ interface CursorContentBlock {
   content?: unknown;
   is_error?: boolean;
   query?: string;
-  [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
-// ---------------------------------------------------------------------------
+  [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
+// ---------------------------------------------------------------------------
 
 /** Cursor tool_call 内部 key → 统一工具名 */
 function mapToolCallKey(key: string): string {
@@ -359,14 +359,14 @@ export function normalizeCursorMessage(
 // 子进程辅助函数
 // ---------------------------------------------------------------------------
 
-function spawnAgent(
-  extraArgs: string[],
-  cwd?: string,
-  stdinText?: string,
-  modelOverride?: string,
-  mode?: "plan" | "ask",
-  spawnImpl: CursorSpawn = spawn,
-): CursorProcessHandle {
+function spawnAgent(
+  extraArgs: string[],
+  cwd?: string,
+  stdinText?: string,
+  modelOverride?: string,
+  mode?: "plan" | "ask",
+  spawnImpl: CursorSpawn = spawn,
+): CursorProcessHandle {
   let allArgs: string[];
   if (mode) {
     // plan/ask 模式：移除 --force/--yolo，添加 --mode plan/ask
@@ -385,87 +385,80 @@ function spawnAgent(
       allArgs.push("--model", modelOverride);
     }
   }
-  const proc = spawnImpl(CURSOR_AGENT_COMMAND, allArgs, {
-    cwd,
-    stdio: [stdinText !== undefined ? "pipe" : "ignore", "pipe", "pipe"],
-    windowsHide: true,
-    shell: true,
-  });
+  const proc = spawnImpl(CURSOR_AGENT_COMMAND, allArgs, {
+    cwd,
+    stdio: [stdinText !== undefined ? "pipe" : "ignore", "pipe", "pipe"],
+    windowsHide: true,
+    shell: true,
+  });
 
   console.log(`[Cursor debug] spawn: cmd=${CURSOR_AGENT_COMMAND}, args=[${allArgs.join(", ")}], cwd=${cwd ?? "(none)"}, stdinLen=${stdinText?.length ?? 0}, pid=${proc.pid}`);
 
-  // 收集 stderr，子进程异常退出时输出到日志，方便排查静默失败
-  let stderr = "";
-  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,
-    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,
-  stats?: CursorStreamStats,
-): AsyncGenerator<CursorMessageLine> {
-  const tag = debugTag ?? "cursor";
-  const rl = createInterface({ input: proc.stdout!, crlfDelay: Infinity });
-  // abort 时主动 close readline，避免等待 Windows 管道自然关闭（可能延迟数分钟）
-  const onAbort = () => { rl.close(); };
-  signal?.addEventListener("abort", onAbort, { once: true });
-  let lineCount = 0;
-  try {
-    for await (const line of rl) {
-      if (signal?.aborted) break;
-      lineCount++;
-      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 行静默跳过 */ }
+  // 收集 stderr，子进程异常退出时输出到日志，方便排查静默失败
+  let stderr = "";
+  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)}`);
     }
-  } finally {
-    signal?.removeEventListener("abort", onAbort);
-    rl.close();
-    console.log(`[Cursor debug] ${tag} readJsonLines done: ${lineCount} raw lines, signalAborted=${signal?.aborted ?? false}`);
+    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,
+    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,
+  stats?: CursorStreamStats,
+): AsyncGenerator<CursorMessageLine> {
+  const tag = debugTag ?? "cursor";
+  yield* readJsonLinesWithBadJsonIdleWatchdog<CursorMessageLine>({
+    input: proc.stdout!,
+    tool: "cursor",
+    tag,
+    signal,
+    rawLog,
+    parse: (line) => JSON.parse(line) as CursorMessageLine,
+    onRawLine: (line) => {
+      if (stats) {
+        stats.rawLineCount++;
+        stats.stdoutLength += Buffer.byteLength(line, "utf-8") + 1;
+      }
+    },
+    onParsedLine: () => {
+      if (stats) stats.parsedLineCount++;
+    },
+    onDone: (info) => {
+      console.log(`[Cursor debug] ${tag} readJsonLines done: ${info.lineCount} raw lines, signalAborted=${info.signalAborted}`);
+    },
+  });
 }
 
 // ---------------------------------------------------------------------------
@@ -474,28 +467,28 @@ async function* readJsonLines(
 
 class CursorAdapter implements ToolAdapter {
   readonly displayName = "Cursor";
-  readonly sessionDescPrefix = "Cursor Session:";
-  private activeProcs = new Set<ChildProcess>();
-  private metaStore: CursorSessionMetaStore;
-  private modelOverride: string | undefined;
-  private spawnImpl: CursorSpawn;
-
-  constructor(metaStore: CursorSessionMetaStore, modelOverride?: string, spawnImpl: CursorSpawn = spawn) {
-    this.metaStore = metaStore;
-    this.modelOverride = modelOverride;
-    this.spawnImpl = spawnImpl;
-  }
-
-  async createSession(cwd: string): Promise<CreateSessionResult> {
-    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", null, stats)) {
-      if (msg.type === "system" && msg.subtype === "init" && msg.session_id) {
-        const sessionId = msg.session_id;
-        await this.metaStore
+  readonly sessionDescPrefix = "Cursor Session:";
+  private activeProcs = new Set<ChildProcess>();
+  private metaStore: CursorSessionMetaStore;
+  private modelOverride: string | undefined;
+  private spawnImpl: CursorSpawn;
+
+  constructor(metaStore: CursorSessionMetaStore, modelOverride?: string, spawnImpl: CursorSpawn = spawn) {
+    this.metaStore = metaStore;
+    this.modelOverride = modelOverride;
+    this.spawnImpl = spawnImpl;
+  }
+
+  async createSession(cwd: string): Promise<CreateSessionResult> {
+    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", null, stats)) {
+      if (msg.type === "system" && msg.subtype === "init" && msg.session_id) {
+        const sessionId = msg.session_id;
+        await this.metaStore
           .set(sessionId, { cwd: msg.cwd ?? cwd, model: msg.model })
           .catch(() => {});
         this.activeProcs.delete(proc);
@@ -503,18 +496,18 @@ class CursorAdapter implements ToolAdapter {
         return { sessionId };
       }
     }
-
-    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");
-  }
+
+    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");
+  }
 
   async *prompt(
     sessionId: string,
@@ -525,46 +518,46 @@ class CursorAdapter implements ToolAdapter {
   ): AsyncIterable<UnifiedStreamMessage> {
     console.log(`[Cursor debug] prompt start: sessionId=${sessionId}, cwd=${cwd}, userTextLen=${userText.length}`);
     const cmd = parseUserCommand(userText);
-    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}`);
-    }
+    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}`);
+    }
 
     // 见 codex-adapter.ts 同位置注释：spawn 用了 shell:true，必须杀整棵树，
     // 否则 abort 后真正在跑的孙进程 cursor-agent 还会继续输出 & 占用资源。
-    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" &&
+    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" &&
           raw.subtype === "init" &&
           raw.session_id &&
           (raw.cwd || raw.model)
@@ -577,32 +570,32 @@ class CursorAdapter implements ToolAdapter {
         if (normalized) yield normalized;
 
         // result 是流末事件，收到后立即结束进程，防止 CLI 僵死导致 readline 挂起。
-        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);
+        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);
       if (proc.pid !== undefined) options?.onProcessExit?.({ pid: proc.pid });
       console.log(`[Cursor debug] prompt end: sessionId=${sessionId}, signalAborted=${signal?.aborted ?? false}`);
     }
@@ -627,21 +620,21 @@ class CursorAdapter implements ToolAdapter {
 // 工厂函数
 // ---------------------------------------------------------------------------
 
-export interface CreateCursorAdapterOptions {
-  /** 注入自定义 meta 持久化 store（测试用）；未提供时使用全局默认实例。 */
-  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,
-    options.spawn,
-  );
-}
+export interface CreateCursorAdapterOptions {
+  /** 注入自定义 meta 持久化 store（测试用）；未提供时使用全局默认实例。 */
+  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,
+    options.spawn,
+  );
+}