chatccc 0.2.94 → 0.2.96

package/scripts/postinstall-sharp-check.mjs

@@ -1,59 +1,59 @@
-// postinstall 检测 sharp 原生模块是否可用（常见于 Linux 缺少 libvips）
-import { createRequire } from "node:module";
-
-const require = createRequire(import.meta.url);
-let ok = false;
-
-try {
-  require("sharp");
-  ok = true;
-} catch (err) {
-  const msg = err.message;
-  const platform = process.platform;
-
-  console.warn("");
-  console.warn("============================================================");
-  console.warn("  ChatCCC: sharp 图像处理模块检测失败");
-  console.warn("============================================================");
-
-  if (platform === "linux") {
-    if (msg.includes("libvips") || msg.includes("vips") || msg.includes("libglib")) {
-      console.warn("  原因：系统缺少 libvips 图像处理库。");
-      console.warn("");
-      console.warn("  请先安装 libvips 然后重建 sharp：");
-      console.warn("");
-      console.warn("  Debian / Ubuntu:");
-      console.warn("    sudo apt install libvips-dev");
-      console.warn("");
-      console.warn("  CentOS / RHEL / Fedora:");
-      console.warn("    sudo yum install vips-devel");
-      console.warn("");
-      console.warn("  Alpine:");
-      console.warn("    sudo apk add vips-dev");
-      console.warn("");
-      console.warn("  安装 libvips 后重建 sharp：");
-      console.warn("    npm install -g chatccc --force");
-    } else if (msg.includes("Cannot find module")) {
-      console.warn("  原因：sharp 模块未成功安装。");
-      console.warn("");
-      console.warn("  请尝试重建（可能需要先安装 libvips）：");
-      console.warn("    npm install -g chatccc --force");
-    } else {
-      console.warn("  错误详情：", msg);
-    }
-  } else {
-    console.warn("  错误详情：", msg);
-    console.warn("  平台：", platform);
-    console.warn("  请尝试：npm install -g chatccc --force");
-  }
-
-  console.warn("");
-  console.warn("  缺少 sharp 不影响消息收发，但群聊头像状态指示");
-  console.warn("  （运行中/空闲/新建）将不会更新。");
-  console.warn("============================================================");
-  console.warn("");
-}
-
-if (!ok && process.env.npm_config_verbose) {
-  process.exitCode = 0; // 永远不阻塞安装
+// postinstall 检测 sharp 原生模块是否可用（常见于 Linux 缺少 libvips）
+import { createRequire } from "node:module";
+
+const require = createRequire(import.meta.url);
+let ok = false;
+
+try {
+  require("sharp");
+  ok = true;
+} catch (err) {
+  const msg = err.message;
+  const platform = process.platform;
+
+  console.warn("");
+  console.warn("============================================================");
+  console.warn("  ChatCCC: sharp 图像处理模块检测失败");
+  console.warn("============================================================");
+
+  if (platform === "linux") {
+    if (msg.includes("libvips") || msg.includes("vips") || msg.includes("libglib")) {
+      console.warn("  原因：系统缺少 libvips 图像处理库。");
+      console.warn("");
+      console.warn("  请先安装 libvips 然后重建 sharp：");
+      console.warn("");
+      console.warn("  Debian / Ubuntu:");
+      console.warn("    sudo apt install libvips-dev");
+      console.warn("");
+      console.warn("  CentOS / RHEL / Fedora:");
+      console.warn("    sudo yum install vips-devel");
+      console.warn("");
+      console.warn("  Alpine:");
+      console.warn("    sudo apk add vips-dev");
+      console.warn("");
+      console.warn("  安装 libvips 后重建 sharp：");
+      console.warn("    npm install -g chatccc --force");
+    } else if (msg.includes("Cannot find module")) {
+      console.warn("  原因：sharp 模块未成功安装。");
+      console.warn("");
+      console.warn("  请尝试重建（可能需要先安装 libvips）：");
+      console.warn("    npm install -g chatccc --force");
+    } else {
+      console.warn("  错误详情：", msg);
+    }
+  } else {
+    console.warn("  错误详情：", msg);
+    console.warn("  平台：", platform);
+    console.warn("  请尝试：npm install -g chatccc --force");
+  }
+
+  console.warn("");
+  console.warn("  缺少 sharp 不影响消息收发，但群聊头像状态指示");
+  console.warn("  （运行中/空闲/新建）将不会更新。");
+  console.warn("============================================================");
+  console.warn("");
+}
+
+if (!ok && process.env.npm_config_verbose) {
+  process.exitCode = 0; // 永远不阻塞安装
 }

package/src/__tests__/session.test.ts

@@ -90,6 +90,10 @@ import {
   runAgentSession,
   startUnifiedDisplayLoop,
   stopUnifiedDisplayLoop,
+  _setProcessAliveForTest,
+  _resetProcessAliveForTest,
+  _setProcessMonitorIntervalForTest,
+  _resetProcessMonitorIntervalForTest,
 } from "../session.ts";
 import {
   activePrompts,
@@ -103,7 +107,7 @@ import {
   displayCards,
 } from "../session-chat-binding.ts";
 import type { AccumulatorState } from "../session.ts";
-import type { ToolAdapter, UnifiedBlock, SessionInfo } from "../adapters/adapter-interface.ts";
+import type { ToolAdapter, ToolPromptOptions, UnifiedBlock, SessionInfo } from "../adapters/adapter-interface.ts";
 import type { PlatformAdapter } from "../platform-adapter.ts";
 
 // Helper to create a mock active session entry
@@ -308,6 +312,92 @@ describe("runAgentSession previous final delivery guard", () => {
   });
 });
 
+describe("runAgentSession process monitor", () => {
+  let registryFile = "";
+  let toolsFile = "";
+
+  beforeEach(async () => {
+    vi.useFakeTimers();
+    resetState();
+    resetBindingState();
+    mockStreamStates.clear();
+    const dir = await mkdtemp(join(tmpdir(), "chatccc-process-monitor-"));
+    registryFile = join(dir, "session-registry.json");
+    toolsFile = join(dir, "session-tools.json");
+    _setSessionRegistryFileForTest(registryFile);
+    _setSessionToolsFileForTest(toolsFile);
+    _setProcessMonitorIntervalForTest(50);
+  });
+
+  afterEach(() => {
+    _resetSessionRegistryFileForTest();
+    _resetSessionToolsFileForTest();
+    _clearAdapterCacheForTest();
+    _resetProcessAliveForTest();
+    _resetProcessMonitorIntervalForTest();
+    resetBindingState();
+    vi.useRealTimers();
+  });
+
+  it("marks the turn as error and sends a separate notice when the CLI process disappears", async () => {
+    const platform = mockPlatform("feishu");
+    setSessionPlatform(platform);
+    bindChatToSession("sid-process", "chat-process");
+    recordLastActiveChat("sid-process", "chat-process");
+    _setProcessAliveForTest(() => false);
+
+    const adapter: ToolAdapter = {
+      displayName: "Cursor",
+      sessionDescPrefix: "Cursor Session:",
+      createSession: async () => ({ sessionId: "sid-process" }),
+      getSessionInfo: async (sid) => ({ sessionId: sid, cwd: "/tmp" }),
+      closeSession: async () => {},
+      prompt: async function* (
+        _sid: string,
+        _text: string,
+        _cwd: string,
+        signal?: AbortSignal,
+        options?: ToolPromptOptions,
+      ) {
+        options?.onProcessStart?.({ pid: 12345 });
+        yield { type: "assistant", blocks: [{ type: "text", text: "partial answer" }] };
+        await new Promise<void>((resolve) => {
+          if (signal?.aborted) {
+            resolve();
+            return;
+          }
+          signal?.addEventListener("abort", () => resolve(), { once: true });
+        });
+      },
+    };
+    _setAdapterForToolForTest("cursor", adapter);
+
+    const runPromise = runAgentSession(
+      "sid-process",
+      "prompt",
+      platform,
+      "chat-process",
+      Date.now(),
+      "cursor",
+    );
+
+    await vi.waitFor(() => {
+      expect(activePrompts.get("sid-process")?.processPid).toBe(12345);
+    });
+    await vi.advanceTimersByTimeAsync(60);
+    await runPromise;
+
+    const state = mockStreamStates.get("sid-process");
+    expect(state?.status).toBe("error");
+    expect(state?.finalReply).toContain("partial answer");
+    expect(activePrompts.has("sid-process")).toBe(false);
+    expect(platform.sendText).toHaveBeenCalledWith(
+      "chat-process",
+      expect.stringContaining("进程异常结束"),
+    );
+  });
+});
+
 describe("unified display loop WeChat delta", () => {
   beforeEach(() => {
     vi.useFakeTimers();

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

@@ -113,6 +113,18 @@ export interface SessionInfo {
   model?: string;
 }
 
+export interface ToolProcessInfo {
+  /** Root PID returned by child_process.spawn. With shell:true this is the shell wrapper PID. */
+  pid: number;
+}
+
+export interface ToolPromptOptions {
+  /** Called once a CLI-backed prompt process has been spawned. */
+  onProcessStart?: (info: ToolProcessInfo) => void;
+  /** Called when the adapter leaves the prompt process scope normally or by abort. */
+  onProcessExit?: (info: ToolProcessInfo) => void;
+}
+
 // ---------------------------------------------------------------------------
 // ToolAdapter — 统一的 AI 工具适配器接口
 // ---------------------------------------------------------------------------
@@ -139,6 +151,7 @@ export interface ToolAdapter {
     userText: string,
     cwd: string,
     signal?: AbortSignal,
+    options?: ToolPromptOptions,
   ): AsyncIterable<UnifiedStreamMessage>;
 
   /**

package/src/adapters/codex-adapter.ts

@@ -13,6 +13,7 @@ import { randomUUID } from "node:crypto";
 
 import type {
   ToolAdapter,
+  ToolPromptOptions,
   UnifiedBlock,
   UnifiedStreamMessage,
   CreateSessionResult,
@@ -238,6 +239,7 @@ class CodexAdapter implements ToolAdapter {
     userText: string,
     cwd: string,
     signal?: AbortSignal,
+    options?: ToolPromptOptions,
   ): AsyncIterable<UnifiedStreamMessage> {
     let meta = await this.metaStore.get(sessionId);
     const threadId = meta?.threadId;
@@ -250,6 +252,7 @@ class CodexAdapter implements ToolAdapter {
       : [...CODEX_BASE_ARGS, "resume", threadId, "-"];
 
     const proc = spawnCodex(args, cwd, userText);
+    if (proc.pid !== undefined) options?.onProcessStart?.({ pid: proc.pid });
 
     // 关键：spawn 用了 shell:true，proc.pid 指向的是壳进程（cmd.exe / sh）。
     // 真正干活的是壳的孙子 codex.exe。普通 proc.kill() 在 Windows 上只杀第一层，
@@ -278,6 +281,7 @@ class CodexAdapter implements ToolAdapter {
     } finally {
       signal?.removeEventListener("abort", onAbort);
       await killProcessTree(proc.pid);
+      if (proc.pid !== undefined) options?.onProcessExit?.({ pid: proc.pid });
     }
   }
 

package/src/adapters/cursor-adapter.ts

@@ -10,6 +10,7 @@ import { createInterface } from "node:readline";
 
 import type {
   ToolAdapter,
+  ToolPromptOptions,
   UnifiedBlock,
   UnifiedStreamMessage,
   CreateSessionResult,
@@ -354,10 +355,12 @@ class CursorAdapter implements ToolAdapter {
     userText: string,
     cwd: string,
     signal?: AbortSignal,
+    options?: ToolPromptOptions,
   ): AsyncIterable<UnifiedStreamMessage> {
     console.log(`[Cursor debug] prompt start: sessionId=${sessionId}, cwd=${cwd}, userTextLen=${userText.length}`);
     const proc = spawnAgent(["--resume", sessionId], cwd, userText);
     this.activeProcs.add(proc);
+    if (proc.pid !== undefined) options?.onProcessStart?.({ pid: proc.pid });
 
     // 见 codex-adapter.ts 同位置注释：spawn 用了 shell:true，必须杀整棵树，
     // 否则 abort 后真正在跑的孙进程 cursor-agent 还会继续输出 & 占用资源。
@@ -384,6 +387,7 @@ class CursorAdapter implements ToolAdapter {
       signal?.removeEventListener("abort", onAbort);
       await killProcessTree(proc.pid);
       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}`);
     }
   }