chatccc 0.2.188 → 0.2.189

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/codex-adapter.ts

@@ -72,7 +72,6 @@ function buildCodexPromptText(userText: string): string {
 function detectCodexCommand(): string {
   return config.codex.path || "codex";
 }
-const CODEX_COMMAND = detectCodexCommand();
 
 /** exec 模式共用参数：JSONL 输出、绕过沙盒和确认、跳过 git 仓库检查 */
 const CODEX_BASE_ARGS = [
@@ -184,13 +183,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) {
@@ -198,12 +197,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(CODEX_COMMAND, allArgs, {
+  const proc = spawn(detectCodexCommand(), allArgs, {
     cwd,
     stdio: [stdinText !== undefined ? "pipe" : "ignore", "pipe", "pipe"],
     windowsHide: true,
@@ -259,17 +258,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> {
@@ -299,7 +298,7 @@ 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 });
 
     // 关键：spawn 用了 shell:true，proc.pid 指向的是壳进程（cmd.exe / sh）。
@@ -353,8 +352,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(
@@ -362,7 +361,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";
 
 // ---------------------------------------------------------------------------
 // 特殊注入提示
@@ -348,12 +348,12 @@ function spawnAgent(
   return proc;
 }
 
-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,
+): AsyncGenerator<CursorMessageLine> {
   const tag = debugTag ?? "cursor";
   const rl = createInterface({ input: proc.stdout!, crlfDelay: Infinity });
   // abort 时主动 close readline，避免等待 Windows 管道自然关闭（可能延迟数分钟）
@@ -364,10 +364,10 @@ 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 {
+      const trimmed = line.trim();
+      if (!trimmed) continue;
+      rawLog?.writeLine(trimmed);
+      try {
         yield JSON.parse(trimmed) as CursorMessageLine;
       } catch { /* 非 JSON 行静默跳过 */ }
     }
@@ -432,32 +432,32 @@ class CursorAdapter implements ToolAdapter {
       cmd.mode ?? undefined,
     );
     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;
+
+    try {
+      for await (const raw of readJsonLines(proc, signal, sessionId, rawLog)) {
         if (signal?.aborted) break;
         if (
           raw.type === "system" &&
@@ -473,17 +473,17 @@ 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;
         }
       }
     } 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}`);
     }
@@ -519,4 +519,4 @@ export function createCursorAdapter(
   options: CreateCursorAdapterOptions = {},
 ): ToolAdapter {
   return new CursorAdapter(options.metaStore ?? defaultCursorSessionMetaStore, options.model);
-}
+}