chatccc 0.2.194 → 0.2.196

package/src/adapters/cursor-adapter.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,12 +115,73 @@ interface CursorContentBlock {
   content?: unknown;
   is_error?: boolean;
   query?: string;
-  [key: string]: unknown;
-}
-
-// ---------------------------------------------------------------------------
-// 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 {
@@ -298,13 +359,14 @@ export function normalizeCursorMessage(
 // 子进程辅助函数
 // ---------------------------------------------------------------------------
 
-function spawnAgent(
-  extraArgs: string[],
-  cwd?: string,
-  stdinText?: string,
-  modelOverride?: string,
-  mode?: "plan" | "ask",
-): ChildProcess {
+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
@@ -323,36 +385,58 @@ function spawnAgent(
       allArgs.push("--model", modelOverride);
     }
   }
-  const proc = spawn(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 = "";
-  proc.stderr!.on("data", (chunk: Buffer) => { stderr += chunk.toString(); });
-  proc.on("close", (code) => {
-    if (stderr.trim()) {
-      console.error(`[Cursor stderr] exit=${code}: ${stderr.trim().slice(0, 2000)}`);
-    }
-  });
-
-  if (stdinText !== undefined) {
-    proc.stdin!.write(stdinText);
-    proc.stdin!.end();
-  }
-  return proc;
-}
-
+  // 收集 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 });
@@ -361,15 +445,21 @@ async function* readJsonLines(
   signal?.addEventListener("abort", onAbort, { once: true });
   let lineCount = 0;
   try {
-    for await (const line of rl) {
-      if (signal?.aborted) break;
-      lineCount++;
+    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 {
-        yield JSON.parse(trimmed) as CursorMessageLine;
-      } catch { /* 非 JSON 行静默跳过 */ }
+        const parsed = JSON.parse(trimmed) as CursorMessageLine;
+        if (stats) stats.parsedLineCount++;
+        yield parsed;
+      } catch { /* 非 JSON 行静默跳过 */ }
     }
   } finally {
     signal?.removeEventListener("abort", onAbort);
@@ -384,24 +474,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;
-
-  constructor(metaStore: CursorSessionMetaStore, modelOverride?: string) {
-    this.metaStore = metaStore;
-    this.modelOverride = modelOverride;
-  }
-
-  async createSession(cwd: string): Promise<CreateSessionResult> {
-    const proc = spawnAgent(["ok"], cwd, undefined, this.modelOverride);
-    this.activeProcs.add(proc);
-
-    for await (const msg of readJsonLines(proc, undefined, "createSession")) {
-      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);
@@ -409,11 +503,18 @@ class CursorAdapter implements ToolAdapter {
         return { sessionId };
       }
     }
-
-    await killProcessTree(proc.pid);
-    this.activeProcs.delete(proc);
-    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,
@@ -424,14 +525,16 @@ 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(
-      ["--resume", sessionId],
-      cwd,
-      buildCursorPromptText(userText),
-      this.modelOverride,
-      cmd.mode ?? undefined,
-    );
-    this.activeProcs.add(proc);
+    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;
@@ -455,12 +558,13 @@ class CursorAdapter implements ToolAdapter {
     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)) {
-        if (signal?.aborted) break;
-        if (
-          raw.type === "system" &&
+      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)
@@ -476,11 +580,26 @@ class CursorAdapter implements ToolAdapter {
         if (raw.type === "result") {
           sawResult = true;
           void killProcessTree(proc.pid);
-          break;
-        }
-      }
-    } finally {
-      signal?.removeEventListener("abort", onAbort);
+          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);
@@ -508,15 +627,21 @@ class CursorAdapter implements ToolAdapter {
 // 工厂函数
 // ---------------------------------------------------------------------------
 
-export interface CreateCursorAdapterOptions {
-  /** 注入自定义 meta 持久化 store（测试用）；未提供时使用全局默认实例。 */
-  metaStore?: CursorSessionMetaStore;
-  /** per-session 模型覆盖（/model 命令）；传了就用，不传走全局 cursor.model */
-  model?: string;
-}
-
-export function createCursorAdapter(
-  options: CreateCursorAdapterOptions = {},
-): ToolAdapter {
-  return new CursorAdapter(options.metaStore ?? defaultCursorSessionMetaStore, options.model);
+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,
+  );
 }

package/src/builtin/cli.ts

@@ -182,6 +182,21 @@ function streamJsonEvent(event: ChatEvent): void {
       type: "compact",
       compacted_messages: event.compactedMessages,
     });
+  } else if (event.type === "tool_use") {
+    writeJsonLine({
+      type: "tool_call",
+      id: event.id,
+      name: event.name,
+      input: event.input,
+    });
+  } else if (event.type === "tool_result") {
+    writeJsonLine({
+      type: "tool_result",
+      tool_call_id: event.tool_use_id,
+      name: event.name,
+      content: event.content,
+      is_error: event.is_error,
+    });
   } else if (event.type === "done") {
     writeJsonLine({
       type: "done",
@@ -358,6 +373,11 @@ async function runRepl(args: ParsedArgs): Promise<void> {
           console.log(`${C.dim}[done]${C.reset}`);
         } else if (event.type === "compact") {
           console.log(`${C.dim}[context compacted: ${event.compactedMessages} old messages]${C.reset}`);
+        } else if (event.type === "tool_use") {
+          console.log(`\n${C.dim}[tool] ${event.name} ${stringifyConsoleArg(event.input)}${C.reset}`);
+        } else if (event.type === "tool_result") {
+          const status = event.is_error ? "error" : "ok";
+          console.log(`${C.dim}[tool result] ${event.name ?? event.tool_use_id} ${status}${C.reset}`);
         } else if (event.type === "error") {
           console.log(`\n${C.yellow}[error] ${event.message}${C.reset}`);
         }