chatccc 0.2.41 → 0.2.42

package/src/session.ts

@@ -168,6 +168,87 @@ export async function getSessionTool(sessionId: string): Promise<string | null>
   return record?.tool ?? null;
 }
 
+// ---------------------------------------------------------------------------
+// Conversation session registry for /sessions
+// ---------------------------------------------------------------------------
+
+export const SESSION_REGISTRY_FILE = join(USER_DATA_DIR, "state", "session-registry.json");
+let sessionRegistryFile = SESSION_REGISTRY_FILE;
+
+export interface SessionRegistryUpdate {
+  chatId: string;
+  sessionId: string;
+  tool: string;
+  chatName?: string;
+  turnCount?: number;
+  lastContextTokens?: number;
+  startTime?: number;
+  updatedAt?: number;
+  running?: boolean;
+}
+
+interface SessionRegistryRecord {
+  chatId: string;
+  sessionId: string;
+  tool: string;
+  chatName: string;
+  turnCount: number;
+  lastContextTokens: number;
+  startTime: number;
+  updatedAt: number;
+  running: boolean;
+}
+
+type SessionRegistryData = Record<string, SessionRegistryRecord>;
+
+async function loadSessionRegistry(): Promise<SessionRegistryData> {
+  try {
+    const raw = await readFile(sessionRegistryFile, "utf-8");
+    const parsed = JSON.parse(raw) as SessionRegistryData;
+    return parsed && typeof parsed === "object" ? parsed : {};
+  } catch {
+    return {};
+  }
+}
+
+async function saveSessionRegistry(data: SessionRegistryData): Promise<void> {
+  try {
+    await mkdir(dirname(sessionRegistryFile), { recursive: true });
+    await writeFile(sessionRegistryFile, JSON.stringify(data, null, 2), "utf-8");
+  } catch (err) {
+    console.error(`[${ts()}] Failed to save session-registry.json: ${(err as Error).message}`);
+    fileLog.flush();
+  }
+}
+
+export async function recordSessionRegistry(update: SessionRegistryUpdate): Promise<void> {
+  const data = await loadSessionRegistry();
+  const existing = data[update.chatId];
+  const now = update.updatedAt ?? Date.now();
+
+  data[update.chatId] = {
+    chatId: update.chatId,
+    sessionId: update.sessionId,
+    tool: update.tool,
+    chatName: update.chatName ?? existing?.chatName ?? "",
+    turnCount: update.turnCount ?? existing?.turnCount ?? 0,
+    lastContextTokens: update.lastContextTokens ?? existing?.lastContextTokens ?? 0,
+    startTime: update.startTime ?? existing?.startTime ?? now,
+    updatedAt: now,
+    running: update.running ?? existing?.running ?? false,
+  };
+
+  await saveSessionRegistry(data);
+}
+
+export function _setSessionRegistryFileForTest(filePath: string): void {
+  sessionRegistryFile = filePath;
+}
+
+export function _resetSessionRegistryFileForTest(): void {
+  sessionRegistryFile = SESSION_REGISTRY_FILE;
+}
+
 // ---------------------------------------------------------------------------
 // accumulateBlockContent — 将 UnifiedBlock 累积到渲染状态（纯函数，可测试）
 // ---------------------------------------------------------------------------
@@ -385,13 +466,24 @@ export async function resumeAndPrompt(
 
   const now = Date.now();
   const existingInfo = sessionInfoMap.get(chatId);
+  const nextTurnCount = (existingInfo?.turnCount ?? 0) + 1;
+  const nextContextTokens = existingInfo?.lastContextTokens ?? 0;
   sessionInfoMap.set(chatId, {
     sessionId,
-    turnCount: (existingInfo?.turnCount ?? 0) + 1,
-    lastContextTokens: existingInfo?.lastContextTokens ?? 0,
+    turnCount: nextTurnCount,
+    lastContextTokens: nextContextTokens,
     startTime: now,
     tool,
   });
+  await recordSessionRegistry({
+    chatId,
+    sessionId,
+    tool,
+    turnCount: nextTurnCount,
+    lastContextTokens: nextContextTokens,
+    startTime: now,
+    running: true,
+  });
 
   let cardId: string | null = null;
   cardId = await createCardKitCard(token, buildProgressCard("", { showStop: true, headerTitle: "生成中..." })).catch((err) => {
@@ -512,6 +604,13 @@ export async function resumeAndPrompt(
         if (block.type === "compact_boundary" && block.post_tokens) {
           const info = sessionInfoMap.get(chatId);
           if (info) { info.lastContextTokens = block.post_tokens; }
+          await recordSessionRegistry({
+            chatId,
+            sessionId,
+            tool,
+            lastContextTokens: block.post_tokens,
+            running: true,
+          });
         }
       }
     }
@@ -561,6 +660,16 @@ export async function resumeAndPrompt(
   const finalReply = pickFinalReply(state).trim();
 
   if (wasStopped) {
+    const finalInfo = sessionInfoMap.get(chatId);
+    await recordSessionRegistry({
+      chatId,
+      sessionId,
+      tool,
+      turnCount: finalInfo?.turnCount ?? nextTurnCount,
+      lastContextTokens: finalInfo?.lastContextTokens ?? nextContextTokens,
+      startTime: finalInfo?.startTime ?? now,
+      running: false,
+    });
     if (finalReply) {
       await sendTextReply(token, chatId, finalReply).catch((err) =>
         console.error(`[${ts()}] Failed to send partial text: ${(err as Error).message}`)
@@ -597,6 +706,16 @@ export async function resumeAndPrompt(
   }
 
   console.log(`[${ts()}] Session ${sessionId} stream complete (content chunks: ${state.chunkCount})`);
+  const finalInfo = sessionInfoMap.get(chatId);
+  await recordSessionRegistry({
+    chatId,
+    sessionId,
+    tool,
+    turnCount: finalInfo?.turnCount ?? nextTurnCount,
+    lastContextTokens: finalInfo?.lastContextTokens ?? nextContextTokens,
+    startTime: finalInfo?.startTime ?? now,
+    running: false,
+  });
   if (tid) logTrace(tid, "SESSION_END", { sessionId, chunks: state.chunkCount, finalTextLen: finalReply.length });
 }
 
@@ -681,6 +800,7 @@ export async function getSessionStatus(chatId: string): Promise<SessionStatus |
 export interface SessionsListEntry {
   chatId: string;
   sessionId: string;
+  chatName: string;
   active: boolean;
   turnCount: number;
   startTime: number;
@@ -691,16 +811,20 @@ export interface SessionsListEntry {
 }
 
 export async function getAllSessionsStatus(): Promise<SessionsListEntry[]> {
-  const entries = Array.from(sessionInfoMap.entries());
+  const registry = await loadSessionRegistry();
+  const entries = Object.values(registry)
+    .filter((record) => record.chatId && record.sessionId && record.tool)
+    .sort((a, b) => b.updatedAt - a.updatedAt)
+    .slice(0, 20);
   // 并行解析每个 session 的 model/effort（cursor 涉及异步 store IO）
   return Promise.all(
-    entries.map(async ([chatId, info]) => {
-      const active = chatSessionMap.get(chatId);
+    entries.map(async (info) => {
       const { model, effort } = await resolveModelEffort(info.tool, info.sessionId);
       return {
-        chatId,
+        chatId: info.chatId,
         sessionId: info.sessionId,
-        active: active !== undefined && !active.stopped,
+        chatName: info.chatName || "",
+        active: info.running === true,
         turnCount: info.turnCount,
         startTime: info.startTime,
         model,

package/src/shared.ts

@@ -1,17 +1,17 @@
 import { execSync } from "node:child_process";
-import {
-  appendFileSync,
-  existsSync,
-  mkdirSync,
-  readFileSync,
-  unlinkSync,
-  writeFileSync,
-} from "node:fs";
-import { createServer } from "node:http";
-import { homedir } from "node:os";
-import { join } from "node:path";
-import { inspect } from "node:util";
-import { WebSocketServer, WebSocket } from "ws";
+import {
+  appendFileSync,
+  existsSync,
+  mkdirSync,
+  readFileSync,
+  unlinkSync,
+  writeFileSync,
+} from "node:fs";
+import { createServer } from "node:http";
+import { homedir } from "node:os";
+import { join } from "node:path";
+import { inspect } from "node:util";
+import { WebSocketServer, WebSocket } from "ws";
 
 import { printServiceDidNotStart } from "./exit-banner.ts";
 
@@ -355,56 +355,56 @@ export function installCrashLogging(opts: CrashHandlersOptions = {}): InstallCra
 // 文件日志：同时输出到控制台和日志文件
 // ---------------------------------------------------------------------------
 
-export function setupFileLogging(logDir: string, prefix: string): { logPath: string; flush: () => void } {
-  mkdirSync(logDir, { recursive: true });
-  const ts = new Date().toISOString().replace(/[:.]/g, "-").slice(0, 19);
-  const logPath = join(logDir, `${prefix}-${ts}.log`);
-  writeFileSync(logPath, "", { flag: "a", encoding: "utf8" });
-  const origConsoleLog = console.log.bind(console);
-  const origConsoleError = console.error.bind(console);
-  const formatArg = (arg: unknown): string => {
-    if (typeof arg === "string") return arg;
-    if (arg instanceof Error) return arg.stack ?? arg.message;
-    return inspect(arg, { depth: 6, breakLength: Infinity, maxArrayLength: 200 });
-  };
-  const writeLine = (level: string, args: unknown[]) => {
-    try {
-      const line = args.map(formatArg).join(" ");
-      appendFileSync(logPath, `[${new Date().toISOString()}] [${level}] ${line}\n`, "utf8");
-    } catch (err) {
-      try {
-        appendStartupTrace("fileLog write failed", { level, error: err instanceof Error ? err.message : String(err) });
-      } catch {
-        // 日志系统自身不能影响主流程
-      }
-    }
-  };
-  console.log = (...args: unknown[]) => {
-    writeLine("LOG", args);
-    try {
-      origConsoleLog(...args);
-    } catch {
-      // 控制台输出失败也不能拖垮服务
-    }
-  };
-  console.error = (...args: unknown[]) => {
-    writeLine("ERR", args);
-    try {
-      origConsoleError(...args);
-    } catch {
-      // 控制台输出失败也不能拖垮服务
-    }
-  };
-  const flush = () => {
-    try {
-      appendFileSync(logPath, "", "utf8");
-    } catch (err) {
-      appendStartupTrace("fileLog flush failed", { error: err instanceof Error ? err.message : String(err) });
-    }
-  };
-  origConsoleLog(`Log file: ${logPath}`);
-  return { logPath, flush };
-}
+export function setupFileLogging(logDir: string, prefix: string): { logPath: string; flush: () => void } {
+  mkdirSync(logDir, { recursive: true });
+  const ts = new Date().toISOString().replace(/[:.]/g, "-").slice(0, 19);
+  const logPath = join(logDir, `${prefix}-${ts}.log`);
+  writeFileSync(logPath, "", { flag: "a", encoding: "utf8" });
+  const origConsoleLog = console.log.bind(console);
+  const origConsoleError = console.error.bind(console);
+  const formatArg = (arg: unknown): string => {
+    if (typeof arg === "string") return arg;
+    if (arg instanceof Error) return arg.stack ?? arg.message;
+    return inspect(arg, { depth: 6, breakLength: Infinity, maxArrayLength: 200 });
+  };
+  const writeLine = (level: string, args: unknown[]) => {
+    try {
+      const line = args.map(formatArg).join(" ");
+      appendFileSync(logPath, `[${new Date().toISOString()}] [${level}] ${line}\n`, "utf8");
+    } catch (err) {
+      try {
+        appendStartupTrace("fileLog write failed", { level, error: err instanceof Error ? err.message : String(err) });
+      } catch {
+        // 日志系统自身不能影响主流程
+      }
+    }
+  };
+  console.log = (...args: unknown[]) => {
+    writeLine("LOG", args);
+    try {
+      origConsoleLog(...args);
+    } catch {
+      // 控制台输出失败也不能拖垮服务
+    }
+  };
+  console.error = (...args: unknown[]) => {
+    writeLine("ERR", args);
+    try {
+      origConsoleError(...args);
+    } catch {
+      // 控制台输出失败也不能拖垮服务
+    }
+  };
+  const flush = () => {
+    try {
+      appendFileSync(logPath, "", "utf8");
+    } catch (err) {
+      appendStartupTrace("fileLog flush failed", { error: err instanceof Error ? err.message : String(err) });
+    }
+  };
+  origConsoleLog(`Log file: ${logPath}`);
+  return { logPath, flush };
+}
 
 // ---------------------------------------------------------------------------
 // 本地 WebSocket 中继服务器（同一端口、多客户端广播）