chatccc 0.2.198 → 0.2.200

package/src/__tests__/stream-state.test.ts

@@ -15,12 +15,12 @@ vi.mock("../config.ts", async () => {
 });
 
 const {
-  writeStreamState,
-  readStreamState,
-  createEmptyStreamState,
-  isFinalReplySentForTurn,
-  markFinalReplySent,
-  STREAMS_DIR,
+  writeStreamState,
+  readStreamState,
+  createEmptyStreamState,
+  isFinalReplySentForTurn,
+  markFinalReplySent,
+  STREAMS_DIR,
   _setRenameForTest,
   _resetRenameForTest,
 } = await import("../stream-state.ts");
@@ -119,36 +119,36 @@ describe("writeStreamState — atomic rename", () => {
     const got = await readStreamState("never-existed");
     expect(got).toBeNull();
   });
-  it("marks final reply delivery for the matching terminal turn only", async () => {
-    const state = createEmptyStreamState("sid-delivered", "/tmp", "claude", 2);
-    state.status = "done";
-    state.finalReply = "done";
-    await writeStreamState(state);
-
-    await markFinalReplySent("sid-delivered", 2, 12345);
-
-    const got = await readStreamState("sid-delivered");
-    expect(got).not.toBeNull();
-    expect(got!.finalReplySentTurn).toBe(2);
-    expect(got!.finalReplySentAt).toBe(12345);
-    expect(isFinalReplySentForTurn(got!)).toBe(true);
-  });
-
-  it("does not mark a running state or a different turn as delivered", async () => {
-    const state = createEmptyStreamState("sid-running", "/tmp", "claude", 3);
-    await writeStreamState(state);
-
-    await markFinalReplySent("sid-running", 2, 12345);
-    await markFinalReplySent("sid-running", 3, 12345);
-
-    const got = await readStreamState("sid-running");
-    expect(got).not.toBeNull();
-    expect(got!.finalReplySentTurn).toBeUndefined();
-    expect(isFinalReplySentForTurn(got!)).toBe(false);
-  });
-});
-
-describe("createEmptyStreamState", () => {
+  it("marks final reply delivery for the matching terminal turn only", async () => {
+    const state = createEmptyStreamState("sid-delivered", "/tmp", "claude", 2);
+    state.status = "done";
+    state.finalReply = "done";
+    await writeStreamState(state);
+
+    await markFinalReplySent("sid-delivered", 2, 12345);
+
+    const got = await readStreamState("sid-delivered");
+    expect(got).not.toBeNull();
+    expect(got!.finalReplySentTurn).toBe(2);
+    expect(got!.finalReplySentAt).toBe(12345);
+    expect(isFinalReplySentForTurn(got!)).toBe(true);
+  });
+
+  it("does not mark a running state or a different turn as delivered", async () => {
+    const state = createEmptyStreamState("sid-running", "/tmp", "claude", 3);
+    await writeStreamState(state);
+
+    await markFinalReplySent("sid-running", 2, 12345);
+    await markFinalReplySent("sid-running", 3, 12345);
+
+    const got = await readStreamState("sid-running");
+    expect(got).not.toBeNull();
+    expect(got!.finalReplySentTurn).toBeUndefined();
+    expect(isFinalReplySentForTurn(got!)).toBe(false);
+  });
+});
+
+describe("createEmptyStreamState", () => {
   it("生成的 state 字段正确且 status=running", () => {
     const s = createEmptyStreamState("sid-X", "/cwd", "cursor", 5);
     expect(s.sessionId).toBe("sid-X");
@@ -156,9 +156,9 @@ describe("createEmptyStreamState", () => {
     expect(s.tool).toBe("cursor");
     expect(s.turnCount).toBe(5);
     expect(s.status).toBe("running");
-    expect(s.accumulatedContent).toBe("");
-    expect(s.finalReply).toBe("");
-    expect(s.finalReplySentTurn).toBeUndefined();
-    expect(s.chunkCount).toBe(0);
-  });
-});
+    expect(s.accumulatedContent).toBe("");
+    expect(s.finalReply).toBe("");
+    expect(s.finalReplySentTurn).toBeUndefined();
+    expect(s.chunkCount).toBe(0);
+  });
+});

package/src/adapters/claude-session-meta-store.ts

@@ -1,120 +1,120 @@
-// =============================================================================
-// claude-session-meta-store.ts — Claude 会话 sessionId → meta 持久化映射
-// =============================================================================
-// 背景：Claude Agent SDK 的 getSessionInfo 可能因 cwd / 本地记录缺失而查不到。
-// ChatCCC 额外维护 sessionId → { cwd, model } 映射作为展示与恢复兜底。
-//
-// 存储：
-//   文件 state/claude-session-meta.json，结构：
-//     { "<sessionId>": { "cwd": "...", "model": "..." } }
-//
-// API 设计：
-//   set(sid, partial) → 部分合并写入；只更新非空字段，不会清空其他字段
-// =============================================================================
-
-import { mkdir, readFile, writeFile } from "node:fs/promises";
-import { dirname, join } from "node:path";
-
-import { USER_DATA_DIR } from "../config.ts";
-
-export const CLAUDE_SESSION_META_FILE = join(
-  USER_DATA_DIR,
-  "state",
-  "claude-session-meta.json",
-);
-
-export interface ClaudeSessionMeta {
-  cwd: string;
-  model?: string;
-}
-
-export interface ClaudeSessionMetaStore {
-  get(sessionId: string): Promise<ClaudeSessionMeta | undefined>;
-  set(sessionId: string, partial: Partial<ClaudeSessionMeta>): Promise<void>;
-}
-
-interface RawEntry {
-  cwd?: string;
-  model?: string;
-}
-
-function isNonEmptyString(v: unknown): v is string {
-  return typeof v === "string" && v.length > 0;
-}
-
-function parseEntry(raw: unknown): RawEntry | null {
-  if (typeof raw === "string" && raw.length > 0) {
-    return { cwd: raw };
-  }
-  if (raw && typeof raw === "object" && !Array.isArray(raw)) {
-    const obj = raw as Record<string, unknown>;
-    const out: RawEntry = {};
-    if (isNonEmptyString(obj.cwd)) out.cwd = obj.cwd;
-    if (isNonEmptyString(obj.model)) out.model = obj.model;
-    return out;
-  }
-  return null;
-}
-
-export function createClaudeSessionMetaStore(
-  filePath: string = CLAUDE_SESSION_META_FILE,
-): ClaudeSessionMetaStore {
-  let cache: Record<string, RawEntry> | null = null;
-
-  async function load(): Promise<Record<string, RawEntry>> {
-    if (cache) return cache;
-    try {
-      const raw = await readFile(filePath, "utf-8");
-      const parsed = JSON.parse(raw);
-      if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
-        const out: Record<string, RawEntry> = {};
-        for (const [k, v] of Object.entries(parsed as Record<string, unknown>)) {
-          const entry = parseEntry(v);
-          if (entry) out[k] = entry;
-        }
-        cache = out;
-        return out;
-      }
-    } catch {
-      // 文件不存在 / JSON 损坏 → 视为空映射
-    }
-    cache = {};
-    return cache;
-  }
-
-  return {
-    async get(sessionId: string): Promise<ClaudeSessionMeta | undefined> {
-      const map = await load();
-      const entry = map[sessionId];
-      if (!entry || !isNonEmptyString(entry.cwd)) return undefined;
-      return entry.model
-        ? { cwd: entry.cwd, model: entry.model }
-        : { cwd: entry.cwd };
-    },
-
-    async set(
-      sessionId: string,
-      partial: Partial<ClaudeSessionMeta>,
-    ): Promise<void> {
-      const map = await load();
-      const existing = map[sessionId] ?? {};
-      const merged: RawEntry = { ...existing };
-      if (isNonEmptyString(partial.cwd)) merged.cwd = partial.cwd;
-      if (isNonEmptyString(partial.model)) merged.model = partial.model;
-
-      if (existing.cwd === merged.cwd && existing.model === merged.model) return;
-
-      map[sessionId] = merged;
-      try {
-        await mkdir(dirname(filePath), { recursive: true });
-        await writeFile(filePath, JSON.stringify(map, null, 2), "utf-8");
-      } catch (err) {
-        console.error(
-          `[claude-session-meta] failed to persist ${filePath}: ${(err as Error).message}`,
-        );
-      }
-    },
-  };
-}
-
-export const defaultClaudeSessionMetaStore = createClaudeSessionMetaStore();
+// =============================================================================
+// claude-session-meta-store.ts — Claude 会话 sessionId → meta 持久化映射
+// =============================================================================
+// 背景：Claude Agent SDK 的 getSessionInfo 可能因 cwd / 本地记录缺失而查不到。
+// ChatCCC 额外维护 sessionId → { cwd, model } 映射作为展示与恢复兜底。
+//
+// 存储：
+//   文件 state/claude-session-meta.json，结构：
+//     { "<sessionId>": { "cwd": "...", "model": "..." } }
+//
+// API 设计：
+//   set(sid, partial) → 部分合并写入；只更新非空字段，不会清空其他字段
+// =============================================================================
+
+import { mkdir, readFile, writeFile } from "node:fs/promises";
+import { dirname, join } from "node:path";
+
+import { USER_DATA_DIR } from "../config.ts";
+
+export const CLAUDE_SESSION_META_FILE = join(
+  USER_DATA_DIR,
+  "state",
+  "claude-session-meta.json",
+);
+
+export interface ClaudeSessionMeta {
+  cwd: string;
+  model?: string;
+}
+
+export interface ClaudeSessionMetaStore {
+  get(sessionId: string): Promise<ClaudeSessionMeta | undefined>;
+  set(sessionId: string, partial: Partial<ClaudeSessionMeta>): Promise<void>;
+}
+
+interface RawEntry {
+  cwd?: string;
+  model?: string;
+}
+
+function isNonEmptyString(v: unknown): v is string {
+  return typeof v === "string" && v.length > 0;
+}
+
+function parseEntry(raw: unknown): RawEntry | null {
+  if (typeof raw === "string" && raw.length > 0) {
+    return { cwd: raw };
+  }
+  if (raw && typeof raw === "object" && !Array.isArray(raw)) {
+    const obj = raw as Record<string, unknown>;
+    const out: RawEntry = {};
+    if (isNonEmptyString(obj.cwd)) out.cwd = obj.cwd;
+    if (isNonEmptyString(obj.model)) out.model = obj.model;
+    return out;
+  }
+  return null;
+}
+
+export function createClaudeSessionMetaStore(
+  filePath: string = CLAUDE_SESSION_META_FILE,
+): ClaudeSessionMetaStore {
+  let cache: Record<string, RawEntry> | null = null;
+
+  async function load(): Promise<Record<string, RawEntry>> {
+    if (cache) return cache;
+    try {
+      const raw = await readFile(filePath, "utf-8");
+      const parsed = JSON.parse(raw);
+      if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
+        const out: Record<string, RawEntry> = {};
+        for (const [k, v] of Object.entries(parsed as Record<string, unknown>)) {
+          const entry = parseEntry(v);
+          if (entry) out[k] = entry;
+        }
+        cache = out;
+        return out;
+      }
+    } catch {
+      // 文件不存在 / JSON 损坏 → 视为空映射
+    }
+    cache = {};
+    return cache;
+  }
+
+  return {
+    async get(sessionId: string): Promise<ClaudeSessionMeta | undefined> {
+      const map = await load();
+      const entry = map[sessionId];
+      if (!entry || !isNonEmptyString(entry.cwd)) return undefined;
+      return entry.model
+        ? { cwd: entry.cwd, model: entry.model }
+        : { cwd: entry.cwd };
+    },
+
+    async set(
+      sessionId: string,
+      partial: Partial<ClaudeSessionMeta>,
+    ): Promise<void> {
+      const map = await load();
+      const existing = map[sessionId] ?? {};
+      const merged: RawEntry = { ...existing };
+      if (isNonEmptyString(partial.cwd)) merged.cwd = partial.cwd;
+      if (isNonEmptyString(partial.model)) merged.model = partial.model;
+
+      if (existing.cwd === merged.cwd && existing.model === merged.model) return;
+
+      map[sessionId] = merged;
+      try {
+        await mkdir(dirname(filePath), { recursive: true });
+        await writeFile(filePath, JSON.stringify(map, null, 2), "utf-8");
+      } catch (err) {
+        console.error(
+          `[claude-session-meta] failed to persist ${filePath}: ${(err as Error).message}`,
+        );
+      }
+    },
+  };
+}
+
+export const defaultClaudeSessionMetaStore = createClaudeSessionMetaStore();

package/src/adapters/cursor-adapter.ts

@@ -156,6 +156,26 @@ function isCursorAuthRelatedError(stderr: string): boolean {
   );
 }
 
+const CURSOR_VISIBLE_STDERR_MAX_CHARS = 1200;
+
+function sanitizeCursorStderr(stderr: string): string {
+  return stderr
+    .replace(/\x1B\[[0-?]*[ -/]*[@-~]/g, "")
+    .replace(/\bBearer\s+[A-Za-z0-9._~+/=-]{12,}\b/gi, "Bearer <redacted>")
+    .replace(/\bsk-[A-Za-z0-9_-]{12,}\b/g, "<redacted-api-key>")
+    .replace(
+      /\b(api[_-]?key|token|authorization|password)\s*[:=]\s*["']?[^\s"']+/gi,
+      "$1=<redacted>",
+    )
+    .trim();
+}
+
+function formatCursorVisibleStderr(stderr: string): string {
+  const sanitized = sanitizeCursorStderr(stderr);
+  if (sanitized.length <= CURSOR_VISIBLE_STDERR_MAX_CHARS) return sanitized;
+  return `${sanitized.slice(0, CURSOR_VISIBLE_STDERR_MAX_CHARS)}\n...(stderr truncated)`;
+}
+
 export function formatCursorAgentEmptyOutputMessage(args: {
   exitCode: number | null;
   stdoutLength: number;
@@ -165,11 +185,12 @@ export function formatCursorAgentEmptyOutputMessage(args: {
   if (args.stdoutLength !== 0) return null;
   if (args.stderr.trim().length === 0) return null;
 
+  const stderrBlock = `[Cursor stderr] exit=${args.exitCode ?? "unknown"}:\n${formatCursorVisibleStderr(args.stderr)}`;
   if (isCursorAuthRelatedError(args.stderr)) {
-    return "Cursor Agent 没有返回内容。检测到认证相关错误，可能需要重新登录 Cursor Agent，或配置 CURSOR_API_KEY。请在本机运行 agent status 检查状态；如未登录，请运行 agent login 后重试。";
+    return `Cursor Agent 没有返回内容。检测到认证相关错误，可能需要重新登录 Cursor Agent，或配置 CURSOR_API_KEY。请在本机运行 agent status 检查状态；如未登录，请运行 agent login 后重试。\n\n${stderrBlock}`;
   }
 
-  return "Cursor Agent 没有返回内容。底层命令异常退出，请检查本机 Cursor Agent 状态后重试。";
+  return `Cursor Agent 没有返回内容。底层命令异常退出，错误信息如下：\n\n${stderrBlock}`;
 }
 
 function createCursorAgentFailureError(info: CursorProcessCloseInfo): Error {
@@ -437,6 +458,7 @@ async function* readJsonLines(
   debugTag?: string,
   rawLog?: RawStreamLogHandle | null,
   stats?: CursorStreamStats,
+  idleTimeoutMs?: number,
 ): AsyncGenerator<CursorMessageLine> {
   const tag = debugTag ?? "cursor";
   yield* readJsonLinesWithBadJsonIdleWatchdog<CursorMessageLine>({
@@ -445,6 +467,7 @@ async function* readJsonLines(
     tag,
     signal,
     rawLog,
+    idleTimeoutMs,
     parse: (line) => JSON.parse(line) as CursorMessageLine,
     onRawLine: (line) => {
       if (stats) {
@@ -472,11 +495,18 @@ class CursorAdapter implements ToolAdapter {
   private metaStore: CursorSessionMetaStore;
   private modelOverride: string | undefined;
   private spawnImpl: CursorSpawn;
-
-  constructor(metaStore: CursorSessionMetaStore, modelOverride?: string, spawnImpl: CursorSpawn = spawn) {
+  private badJsonIdleTimeoutMs: number | undefined;
+
+  constructor(
+    metaStore: CursorSessionMetaStore,
+    modelOverride?: string,
+    spawnImpl: CursorSpawn = spawn,
+    badJsonIdleTimeoutMs?: number,
+  ) {
     this.metaStore = metaStore;
     this.modelOverride = modelOverride;
     this.spawnImpl = spawnImpl;
+    this.badJsonIdleTimeoutMs = badJsonIdleTimeoutMs;
   }
 
   async createSession(cwd: string): Promise<CreateSessionResult> {
@@ -485,7 +515,7 @@ class CursorAdapter implements ToolAdapter {
     const stats = createCursorStreamStats();
     this.activeProcs.add(proc);
 
-    for await (const msg of readJsonLines(proc, undefined, "createSession", null, stats)) {
+    for await (const msg of readJsonLines(proc, undefined, "createSession", null, stats, this.badJsonIdleTimeoutMs)) {
       if (msg.type === "system" && msg.subtype === "init" && msg.session_id) {
         const sessionId = msg.session_id;
         await this.metaStore
@@ -554,7 +584,7 @@ class CursorAdapter implements ToolAdapter {
     const stats = createCursorStreamStats();
 
     try {
-      for await (const raw of readJsonLines(proc, signal, sessionId, rawLog, stats)) {
+      for await (const raw of readJsonLines(proc, signal, sessionId, rawLog, stats, this.badJsonIdleTimeoutMs)) {
         if (signal?.aborted) break;
         if (
           raw.type === "system" &&
@@ -627,6 +657,8 @@ export interface CreateCursorAdapterOptions {
   model?: string;
   /** 注入自定义 spawn 实现（测试用）。 */
   spawn?: CursorSpawn;
+  /** Test-only override for the bad JSON idle watchdog threshold. */
+  badJsonIdleTimeoutMs?: number;
 }
 
 export function createCursorAdapter(
@@ -636,5 +668,6 @@ export function createCursorAdapter(
     options.metaStore ?? defaultCursorSessionMetaStore,
     options.model,
     options.spawn,
+    options.badJsonIdleTimeoutMs,
   );
 }