chatccc 0.2.50 → 0.2.52

package/src/sim-agent.ts

@@ -71,6 +71,45 @@ export function createSimAgent(userId: string): SimAgent {
   // 确保用户有至少一个会话（bot 私聊自动创建）
   simStore.createP2pChat(userId);
 
+  function onEvent(event: "message", handler: MessageEventCallback): void;
+  function onEvent(event: "invited_to_group", handler: InvitedToGroupCallback): void;
+  function onEvent(
+    event: "message" | "invited_to_group",
+    handler: MessageEventCallback | InvitedToGroupCallback,
+  ): void {
+    if (event === "message") {
+      const messageHandler = handler as MessageEventCallback;
+      const filteredHandler = (payload: { chatId: string; message: SimMessage }) => {
+        // 只推送给该用户所在群的消息
+        const chat = simStore.getChat(payload.chatId);
+        if (chat && chat.memberIds.includes(userId)) {
+          messageHandler(payload.chatId, payload.message);
+        }
+      };
+      // 保存映射以便 off 能移除
+      (handler as any).__filtered = filteredHandler;
+      simStore.on("message", filteredHandler);
+    } else {
+      const invitedHandler = handler as InvitedToGroupCallback;
+      const filteredHandler = (payload: { chatId: string; userId: string }) => {
+        if (payload.userId === userId) {
+          invitedHandler(payload.chatId, payload.userId);
+        }
+      };
+      (handler as any).__filtered = filteredHandler;
+      simStore.on("member_added", filteredHandler);
+    }
+  }
+
+  function offEvent(event: string, handler: (...args: any[]) => void): void {
+    const filtered = (handler as any).__filtered;
+    if (event === "message" && filtered) {
+      simStore.off("message", filtered);
+    } else if (event === "invited_to_group" && filtered) {
+      simStore.off("member_added", filtered);
+    }
+  }
+
   const agent: SimAgent = {
     userId,
     account,
@@ -101,37 +140,9 @@ export function createSimAgent(userId: string): SimAgent {
       }));
     },
 
-    on(event, handler) {
-      if (event === "message") {
-        const filteredHandler = (payload: { chatId: string; message: SimMessage }) => {
-          // 只推送给该用户所在群的消息
-          const chat = simStore.getChat(payload.chatId);
-          if (chat && chat.memberIds.includes(userId)) {
-            handler(payload.chatId, payload.message);
-          }
-        };
-        // 保存映射以便 off 能移除
-        (handler as any).__filtered = filteredHandler;
-        simStore.on("message", filteredHandler);
-      } else if (event === "invited_to_group") {
-        const filteredHandler = (payload: { chatId: string; userId: string }) => {
-          if (payload.userId === userId) {
-            handler(payload.chatId, payload.userId);
-          }
-        };
-        (handler as any).__filtered = filteredHandler;
-        simStore.on("member_added", filteredHandler);
-      }
-    },
+    on: onEvent,
 
-    off(event, handler) {
-      const filtered = (handler as any).__filtered;
-      if (event === "message" && filtered) {
-        simStore.off("message", filtered);
-      } else if (event === "invited_to_group" && filtered) {
-        simStore.off("member_added", filtered);
-      }
-    },
+    off: offEvent,
 
     waitForReply(chatId, timeoutMs = 30000) {
       return new Promise((resolve) => {
@@ -153,4 +164,4 @@ export function createSimAgent(userId: string): SimAgent {
   };
 
   return agent;
-}
+}

package/src/stream-state.ts

@@ -1,94 +1,141 @@
-import { readFile, writeFile, mkdir } from "node:fs/promises";
-import { dirname, join } from "node:path";
-
-import { USER_DATA_DIR, ts } from "./config.ts";
-
-// ---------------------------------------------------------------------------
-// stream-state.json — 每个 session 的流式输出持久化文件
-// ---------------------------------------------------------------------------
-
-export const STREAMS_DIR = join(USER_DATA_DIR, "state", "streams");
-
-export interface StreamState {
-  sessionId: string;
-  status: "running" | "done" | "stopped" | "error";
-  accumulatedContent: string;
-  finalReply: string;
-  chunkCount: number;
-  turnCount: number;
-  contextTokens: number;
-  updatedAt: number;
-  cwd: string;
-  tool: string;
-}
-
-function getStreamStatePath(sessionId: string): string {
-  return join(STREAMS_DIR, `${sessionId}.json`);
-}
-
-export async function readStreamState(sessionId: string): Promise<StreamState | null> {
-  try {
-    const raw = await readFile(getStreamStatePath(sessionId), "utf-8");
-    const parsed = JSON.parse(raw) as StreamState;
-    if (parsed && typeof parsed.sessionId === "string") return parsed;
-    return null;
-  } catch {
-    return null;
-  }
-}
-
-export async function writeStreamState(state: StreamState): Promise<void> {
-  const filePath = getStreamStatePath(state.sessionId);
-  try {
-    await mkdir(dirname(filePath), { recursive: true });
-    // 先写临时文件再 rename，保证原子性
-    const tmpPath = filePath + ".tmp";
-    await writeFile(tmpPath, JSON.stringify(state, null, 2), "utf-8");
-    await writeFile(filePath, JSON.stringify(state, null, 2), "utf-8");
-  } catch (err) {
-    console.error(`[${ts()}] Failed to write stream-state for ${state.sessionId}: ${(err as Error).message}`);
-  }
-}
-
-export function createEmptyStreamState(sessionId: string, cwd: string, tool: string, turnCount: number): StreamState {
-  return {
-    sessionId,
-    status: "running",
-    accumulatedContent: "",
-    finalReply: "",
-    chunkCount: 0,
-    turnCount,
-    contextTokens: 0,
-    updatedAt: Date.now(),
-    cwd,
-    tool,
-  };
-}
-
-/** 进程重启时修正虚假的 "running" 状态 */
-export async function fixStaleStreamStates(): Promise<void> {
-  // 启动时将残留的 running 标记为 error
-  // 实际 agent 进程已不存在，下次 prompt 时会自然覆盖
-  try {
-    const { readdir } = await import("node:fs/promises");
-    let entries: string[];
-    try {
-      entries = await readdir(STREAMS_DIR);
-    } catch {
-      return;
-    }
-    for (const entry of entries) {
-      if (!entry.endsWith(".json")) continue;
-      const state = await readStreamState(entry.replace(".json", ""));
-      if (state && state.status === "running") {
-        state.status = "error";
-        state.accumulatedContent += "\n\n⚠️ 进程重启，流式输出中断。";
-        state.updatedAt = Date.now();
-        await writeStreamState(state);
-        console.log(`[${ts()}] [STREAM-STATE] marked stale running as error: ${state.sessionId}`);
-      }
-    }
-  } catch (err) {
-    console.error(`[${ts()}] [STREAM-STATE] fixStaleStreamStates failed: ${(err as Error).message}`);
-  }
+import { readFile, writeFile, mkdir, rename, unlink } from "node:fs/promises";
+import { dirname, join } from "node:path";
+
+import { USER_DATA_DIR, ts } from "./config.ts";
+
+// ---------------------------------------------------------------------------
+// stream-state.json — 每个 session 的流式输出持久化文件
+// ---------------------------------------------------------------------------
+
+export const STREAMS_DIR = join(USER_DATA_DIR, "state", "streams");
+
+export interface StreamState {
+  sessionId: string;
+  status: "running" | "done" | "stopped" | "error";
+  accumulatedContent: string;
+  finalReply: string;
+  chunkCount: number;
+  turnCount: number;
+  contextTokens: number;
+  updatedAt: number;
+  cwd: string;
+  tool: string;
+}
+
+function getStreamStatePath(sessionId: string): string {
+  return join(STREAMS_DIR, `${sessionId}.json`);
+}
+
+export async function readStreamState(sessionId: string): Promise<StreamState | null> {
+  try {
+    const raw = await readFile(getStreamStatePath(sessionId), "utf-8");
+    const parsed = JSON.parse(raw) as StreamState;
+    if (parsed && typeof parsed.sessionId === "string") return parsed;
+    return null;
+  } catch {
+    return null;
+  }
+}
+
+// rename 的可注入实现——仅供测试模拟"Windows EPERM 降级"路径。
+// 生产代码使用 node:fs/promises.rename。
+let renameImpl: typeof rename = rename;
+
+/**
+ * 仅供单测：注入自定义 rename 实现以验证降级分支。
+ * 调用方负责测试结束后用 _resetRenameForTest 还原。
+ */
+export function _setRenameForTest(impl: typeof rename): void {
+  renameImpl = impl;
+}
+
+export function _resetRenameForTest(): void {
+  renameImpl = rename;
+}
+
+/**
+ * 把 StreamState 持久化到磁盘——尽量原子地写。
+ *
+ * 为什么需要原子写：display loop 每 3 秒读一次 stream-state.json,而
+ * runAgentSession 每 2 秒写一次。如果用 `writeFile(filePath, ...)` 直接
+ * 覆盖,reader 在写入过程中读会拿到半截 JSON,JSON.parse 报错——虽然
+ * readStreamState 包了 try/catch 返回 null 不会崩,但相当于"丢一帧"。
+ *
+ * 实现：
+ *   1) 先把内容写到 `<filePath>.tmp`（reader 不会读 .tmp）
+ *   2) 再用 `rename` 把 .tmp 替换成正式文件——`rename` 在 POSIX 上是真原子
+ *      操作,reader 任何时刻读到的都是某个完整的旧/新版本
+ *
+ * Windows 兼容性：Windows 上 `rename` 偶尔会因为目标文件正被 reader 打开
+ * 抛 EPERM/EBUSY（实测罕见,但非零概率）。降级方案：直接 writeFile 覆盖
+ * 真文件,这一帧可能被 reader 读到半截,但 readStreamState 的 try/catch 兜底
+ * 会让 loop 跳过这一帧,2 秒后下次 write 大概率成功——比写盘失败丢数据好。
+ */
+export async function writeStreamState(state: StreamState): Promise<void> {
+  const filePath = getStreamStatePath(state.sessionId);
+  const payload = JSON.stringify(state, null, 2);
+  try {
+    await mkdir(dirname(filePath), { recursive: true });
+    const tmpPath = filePath + ".tmp";
+    await writeFile(tmpPath, payload, "utf-8");
+    try {
+      await renameImpl(tmpPath, filePath);
+    } catch (renameErr) {
+      // Windows 偶发 EPERM/EBUSY：rename 失败时降级为直接覆盖写。
+      // 此次写入失去原子性（reader 可能读到半截 JSON,但 readStreamState
+      // 的 try/catch 会兜底返回 null,只是丢一帧 display 更新）。
+      console.warn(
+        `[${ts()}] [STREAM-STATE] rename failed for ${state.sessionId}, ` +
+          `fallback to overwrite: ${(renameErr as Error).message}`,
+      );
+      await writeFile(filePath, payload, "utf-8");
+      // 尽力清理 .tmp,失败也无所谓——下次 write 会覆盖它
+      await unlink(tmpPath).catch(() => {});
+    }
+  } catch (err) {
+    console.error(`[${ts()}] Failed to write stream-state for ${state.sessionId}: ${(err as Error).message}`);
+  }
+}
+
+export function createEmptyStreamState(sessionId: string, cwd: string, tool: string, turnCount: number): StreamState {
+  return {
+    sessionId,
+    status: "running",
+    accumulatedContent: "",
+    finalReply: "",
+    chunkCount: 0,
+    turnCount,
+    contextTokens: 0,
+    updatedAt: Date.now(),
+    cwd,
+    tool,
+  };
+}
+
+/** 进程重启时修正虚假的 "running" 状态 */
+export async function fixStaleStreamStates(): Promise<void> {
+  // 启动时将残留的 running 标记为 error
+  // 实际 agent 进程已不存在，下次 prompt 时会自然覆盖
+  try {
+    const { readdir } = await import("node:fs/promises");
+    let entries: string[];
+    try {
+      entries = await readdir(STREAMS_DIR);
+    } catch {
+      return;
+    }
+    for (const entry of entries) {
+      if (!entry.endsWith(".json")) continue;
+      const state = await readStreamState(entry.replace(".json", ""));
+      if (state && state.status === "running") {
+        state.status = "error";
+        state.accumulatedContent += "\n\n⚠️ 进程重启，流式输出中断。";
+        state.updatedAt = Date.now();
+        await writeStreamState(state);
+        console.log(`[${ts()}] [STREAM-STATE] marked stale running as error: ${state.sessionId}`);
+      }
+    }
+  } catch (err) {
+    console.error(`[${ts()}] [STREAM-STATE] fixStaleStreamStates failed: ${(err as Error).message}`);
+  }
 }