cc-viewer 1.6.294 → 1.6.296

package/server/lib/im-bridge-core.js

@@ -30,7 +30,9 @@ const SEEN_MAX = 500;
 const RATE_WINDOW_MS = 60_000;
 const MAX_CHUNKS_PER_TURN = 5;
 const MAX_QUEUE = 50;                    // cap inbound backlog so an authorized sender can't grow it unbounded
-const PENDING_TIMEOUT_MS = 10 * 60_000;  // release a stuck injection so the queue can't wedge forever
+const PENDING_TIMEOUT_MS = process.env.CCV_IM_PLATFORM ? 2 * 60_000 : 10 * 60_000;
+const IDLE_POLL_INTERVAL_MS = 5_000;     // check every 5s if streaming stopped
+const IDLE_POLL_THRESHOLD = 3;           // 3 consecutive idle ticks (15s) → synthetic turn_end
 const CONNECT_TIMEOUT_MS = 15_000;       // bound adapter.connect() so a hung start can't block others
 const STOP_WORDS = new Set(['/stop', 'stop', '停止', 'esc', '/esc']);
 
@@ -38,6 +40,8 @@ const STOP_WORDS = new Set(['/stop', 'stop', '停止', 'esc', '/esc']);
 const instances = new Map();             // platformId → instance
 let activeInjection = null;              // { platformId, since, target } — the one in-flight turn
 let activeInjectionTimer = null;         // self-heal timer if a turn_end never arrives
+let idlePollTimer = null;               // secondary idle detection (IM worker only)
+let idlePollCount = 0;                  // consecutive ticks where isStreaming() is false
 let fetchImpl = null;                    // shared test seam
 
 // ─── test seams ───
@@ -59,6 +63,7 @@ function newInstance(adapter) {
     queue: [],
     sendTimes: [],
     store: {},                           // adapter scratch (token cache, send client)
+    ackCardPromise: null,                 // Promise<handle|null> for the in-flight ack card
   };
 }
 
@@ -143,22 +148,63 @@ function queueCap(inst) {
   return inst.maxQueueOverride ?? MAX_QUEUE;
 }
 
+/**
+ * Await the in-flight ack card promise, update it with terminal text/status, and null
+ * the promise on `inst`. Returns true if the card was successfully updated. Best-effort:
+ * never throws, never blocks the slot release.
+ */
+async function finalizeAckCard(inst, target, text, status) {
+  try {
+    const handle = await inst.ackCardPromise?.catch(() => null);
+    inst.ackCardPromise = null;
+    if (handle && typeof inst.adapter.updateAckCard === 'function') {
+      const cfg = inst.bridgeDeps?.getConfig();
+      if (cfg) return !!(await inst.adapter.updateAckCard(cfg, target, handle, text, status, ctxFor(inst)).catch(() => false));
+    }
+  } catch { /* best-effort */ }
+  inst.ackCardPromise = null;
+  return false;
+}
+
 // ─── activeInjection lifecycle ───
 function clearActiveInjection() {
   activeInjection = null;
   if (activeInjectionTimer) { clearTimeout(activeInjectionTimer); activeInjectionTimer = null; }
+  if (idlePollTimer) { clearInterval(idlePollTimer); idlePollTimer = null; }
+  idlePollCount = 0;
 }
 function armActiveInjection(inst, target, since) {
-  activeInjection = { platformId: inst.adapter.id, since, target };
+  activeInjection = { platformId: inst.adapter.id, since, target, transcriptPath: null };
   if (activeInjectionTimer) clearTimeout(activeInjectionTimer);
-  activeInjectionTimer = setTimeout(() => {
+  activeInjectionTimer = setTimeout(async () => {
     // Only fire if THIS injection still owns the slot (symmetry with the inject-failure guard).
     if (!activeInjection || activeInjection.since !== since) return;
     audit(inst, 'reply-timeout', { conversationId: target?.conversationId });
-    clearActiveInjection();              // turn_end never came → release the slot globally…
+    const cardUpdated = await finalizeAckCard(inst, target, tr(inst, 'ackTimeout'), 'error');
+    if (!activeInjection || activeInjection.since !== since) return;
+    clearActiveInjection();
+    if (!cardUpdated) void sendReply(inst, target, tr(inst, 'ackTimeout'));
     drainAll();                          // …and let any platform's queue proceed
   }, PENDING_TIMEOUT_MS);
   if (typeof activeInjectionTimer.unref === 'function') activeInjectionTimer.unref();
+  // Secondary idle detection: poll isStreaming() to catch missed Stop hook events.
+  if (idlePollTimer) clearInterval(idlePollTimer);
+  idlePollCount = 0;
+  let sawStreaming = false;
+  idlePollTimer = setInterval(() => {
+    if (!activeInjection || activeInjection.since !== since) { clearInterval(idlePollTimer); idlePollTimer = null; return; }
+    const d = inst.bridgeDeps;
+    if (!d) return;
+    if (d.isStreaming()) { sawStreaming = true; idlePollCount = 0; return; }
+    if (!sawStreaming) return; // haven't seen streaming start yet — don't count idle
+    idlePollCount++;
+    if (idlePollCount >= IDLE_POLL_THRESHOLD) {
+      clearInterval(idlePollTimer); idlePollTimer = null;
+      audit(inst, 'idle-turn-end', { conversationId: target?.conversationId, idleSeconds: idlePollCount * IDLE_POLL_INTERVAL_MS / 1000 });
+      notifyTurnEnd(null, since, activeInjection?.transcriptPath || null);
+    }
+  }, IDLE_POLL_INTERVAL_MS);
+  if (typeof idlePollTimer.unref === 'function') idlePollTimer.unref();
 }
 
 // ─── small helpers ───
@@ -212,8 +258,8 @@ function isStopCommand(text) {
   return STOP_WORDS.has(text.trim().toLowerCase());
 }
 
-function tr(inst, key) {
-  return t(`${inst.adapter.i18nNs}.${key}`);
+function tr(inst, key, params) {
+  return t(`${inst.adapter.i18nNs}.${key}`, params);
 }
 
 // ─── transcript extraction (the safe outbound text source) ───
@@ -369,6 +415,11 @@ function handleInboundInner(inst, normalized) {
   if (isStopCommand(text)) {
     inst.bridgeDeps.writeToPty('\x1b'); // ESC interrupts the current turn (NOT killPty)
     audit(inst, 'stop', { conversationId });
+    const stoppedInst = activeInjection ? instances.get(activeInjection.platformId) : null;
+    const stoppedTarget = activeInjection?.target;
+    if (stoppedInst && stoppedTarget) {
+      void finalizeAckCard(stoppedInst, stoppedTarget, tr(stoppedInst, 'interrupted'), 'interrupted');
+    }
     // ESC interrupts whatever turn is live on the shared PTY (possibly another platform's), which
     // may mean its turn_end never fires. Release the global slot and resume all queues so /stop
     // can never wedge the bridge.
@@ -380,12 +431,13 @@ function handleInboundInner(inst, normalized) {
 
   if (inst.queue.length >= queueCap(inst)) {
     audit(inst, 'queue-full', { conversationId, queued: inst.queue.length });
-    void sendReply(inst, target, tr(inst, 'queueFull'));
+    void sendReply(inst, target, tr(inst, 'queueFull', { max: String(queueCap(inst)) }));
     return;
   }
   inst.queue.push({ ...target, senderId, content: text });
   if (activeInjection || inst.bridgeDeps.isStreaming()) {
-    void sendReply(inst, target, tr(inst, 'busyQueued'));
+    const ahead = inst.queue.length - 1;
+    void sendReply(inst, target, tr(inst, 'busyQueued', { ahead: String(ahead), max: String(queueCap(inst)) }));
   }
   drainQueue(inst);
 }
@@ -419,7 +471,19 @@ function drainQueue(inst) {
     }
     const since = Date.now();
     armActiveInjection(inst, item, since);
-    if (!isImWorker && skipPerm) {
+    // Instant ack: fire-and-forget so writeToPtySequential is never delayed.
+    if (cfg.ackCard !== false && typeof inst.adapter.sendAckCard === 'function') {
+      const ackTarget = item;
+      inst.ackCardPromise = inst.adapter.sendAckCard(cfg, item, tr(inst, 'ackProcessing'), ctxFor(inst))
+        .then((handle) => { if (!handle) void sendReply(inst, ackTarget, tr(inst, 'ackProcessing')); return handle; })
+        .catch((e) => { audit(inst, 'ack-card-error', { error: String(e?.message || e) }); void sendReply(inst, ackTarget, tr(inst, 'ackProcessing')); return null; });
+    } else if (cfg.ackCard !== false) {
+      void sendReply(inst, item, tr(inst, 'ackProcessing'));
+      inst.ackCardPromise = null;
+    } else {
+      inst.ackCardPromise = null;
+    }
+    if (!isImWorker && skipPerm && cfg.ackCard === false) {
       audit(inst, 'skip-perm-warning', { conversationId: item.conversationId });
       void sendReply(inst, item, tr(inst, 'skipPermWarning'));
     }
@@ -430,9 +494,13 @@ function drainQueue(inst) {
       if (ok) return;
       if (!activeInjection || activeInjection.platformId !== inst.adapter.id || activeInjection.since !== since) return;
       audit(inst, 'inject-failed', { conversationId: item.conversationId });
-      clearActiveInjection();
-      void sendReply(inst, item, tr(inst, 'injectFailed'));
-      drainAll();
+      void (async () => {
+        const cardUpdated = await finalizeAckCard(inst, item, tr(inst, 'injectFailed'), 'error');
+        if (!activeInjection || activeInjection.platformId !== inst.adapter.id || activeInjection.since !== since) return;
+        clearActiveInjection();
+        if (!cardUpdated) void sendReply(inst, item, tr(inst, 'injectFailed'));
+        drainAll();
+      })().catch(() => {});
     }, { settleMs: 250 });
     return; // one at a time; resume on the next turn_end
   }
@@ -447,6 +515,7 @@ function drainAll() {
 
 // ─── outbound trigger (called from server.js _emitTurnEnd) ───
 export async function notifyTurnEnd(sessionId, ts, transcriptPath) {
+  if (transcriptPath && activeInjection) activeInjection.transcriptPath = transcriptPath;
   if (!activeInjection) { drainAll(); return; } // only reply to turns a bridge initiated
   const inst = instances.get(activeInjection.platformId);
   if (!inst) { clearActiveInjection(); drainAll(); return; }
@@ -455,6 +524,9 @@ export async function notifyTurnEnd(sessionId, ts, transcriptPath) {
   // correlation is a v2 item.)
   if (ts && activeInjection.since && ts < activeInjection.since) { drainAll(); return; }
   const target = activeInjection.target;
+  // Grab the ack card promise before clearing state.
+  const ackP = inst.ackCardPromise;
+  inst.ackCardPromise = null;
   clearActiveInjection();
   // Idempotency for a doubled turn_end of the SAME turn (a re-broadcast carries the same ts).
   // Keyed on ts, NOT reply text.
@@ -466,8 +538,36 @@ export async function notifyTurnEnd(sessionId, ts, transcriptPath) {
   drainAll();
   let text = extractLastAssistantText(transcriptPath);
   if (!text) text = tr(inst, 'noTextReply');
-  try { await sendReply(inst, target, text); }
-  catch (e) { inst.lastError = String(e?.message || e); audit(inst, 'send-error', { error: inst.lastError }); }
+
+  // Try to update the ack card in-place with the reply. Fall back to sendReply on failure.
+  const handle = await ackP?.catch(() => null);
+  if (handle && typeof inst.adapter.updateAckCard === 'function') {
+    const cfg = inst.bridgeDeps.getConfig();
+    let chunks = chunkText(text, cfg.maxChunkChars);
+    if (chunks.length > MAX_CHUNKS_PER_TURN) {
+      chunks = chunks.slice(0, MAX_CHUNKS_PER_TURN);
+      chunks[MAX_CHUNKS_PER_TURN - 1] += '\n\n' + tr(inst, 'truncated');
+    }
+    try {
+      const updated = await inst.adapter.updateAckCard(cfg, target, handle, chunks[0] || text, 'done', ctxFor(inst));
+      if (updated && chunks.length > 1) {
+        for (let i = 1; i < chunks.length; i++) {
+          try { await rateLimitGate(inst); await inst.adapter.sendOne(cfg, target, chunks[i], ctxFor(inst)); }
+          catch (e) { inst.lastError = String(e?.message || e); audit(inst, 'send-error', { error: inst.lastError }); break; }
+        }
+      } else if (!updated) {
+        await sendReply(inst, target, text);
+      }
+      audit(inst, 'out', { conversationId: target.conversationId, chunks: chunks.length, cardUpdated: !!updated });
+    } catch (e) {
+      inst.lastError = String(e?.message || e);
+      audit(inst, 'card-update-error', { error: inst.lastError });
+      try { await sendReply(inst, target, text); } catch { /* already logged in sendReply */ }
+    }
+  } else {
+    try { await sendReply(inst, target, text); }
+    catch (e) { inst.lastError = String(e?.message || e); audit(inst, 'send-error', { error: inst.lastError }); }
+  }
 }
 
 // ─── per-platform lifecycle ───
@@ -504,6 +604,11 @@ export async function startBridge(id, deps) {
 export async function stopBridge(id) {
   const inst = instances.get(id);
   if (!inst) return;
+  if (inst.ackCardPromise && activeInjection?.platformId === id) {
+    await finalizeAckCard(inst, activeInjection.target, tr(inst, 'noSession'), 'error');
+  } else {
+    inst.ackCardPromise = null;
+  }
   try { await inst.adapter.disconnect?.(inst.client, ctxFor(inst)); } catch { /* best-effort */ }
   inst.client = null;
   inst.running = false;

package/server/lib/im-config.js

@@ -34,7 +34,7 @@ const DESCRIPTORS = {
     allowListField: 'allowStaffIds',
     defaults: {
       enabled: false, appKey: '', appSecret: '', allowStaffIds: [],
-      maxChunkChars: 3800, blockOnSkipPermissions: false,
+      maxChunkChars: 3800, blockOnSkipPermissions: false, ackCard: true, cardTemplateId: '',
     },
     fields: [
       { key: 'enabled', type: 'bool' },
@@ -43,6 +43,8 @@ const DESCRIPTORS = {
       { key: 'allowStaffIds', type: 'idlist' },
       { key: 'maxChunkChars', type: 'chunk' },
       { key: 'blockOnSkipPermissions', type: 'bool' },
+      { key: 'ackCard', type: 'bool', default: true },
+      { key: 'cardTemplateId', type: 'string' },
     ],
   },
   feishu: {
@@ -50,7 +52,7 @@ const DESCRIPTORS = {
     allowListField: 'allowUserIds',
     defaults: {
       enabled: false, appId: '', appSecret: '', region: 'feishu', allowUserIds: [],
-      maxChunkChars: 3800, blockOnSkipPermissions: false,
+      maxChunkChars: 3800, blockOnSkipPermissions: false, ackCard: true,
     },
     fields: [
       { key: 'enabled', type: 'bool' },
@@ -60,6 +62,7 @@ const DESCRIPTORS = {
       { key: 'allowUserIds', type: 'idlist' },
       { key: 'maxChunkChars', type: 'chunk' },
       { key: 'blockOnSkipPermissions', type: 'bool' },
+      { key: 'ackCard', type: 'bool', default: true },
     ],
   },
   wecom: {
@@ -67,7 +70,7 @@ const DESCRIPTORS = {
     allowListField: 'allowUserIds',
     defaults: {
       enabled: false, botId: '', secret: '', allowUserIds: [],
-      maxChunkChars: 3800, blockOnSkipPermissions: false,
+      maxChunkChars: 3800, blockOnSkipPermissions: false, ackCard: true,
     },
     fields: [
       { key: 'enabled', type: 'bool' },
@@ -76,6 +79,7 @@ const DESCRIPTORS = {
       { key: 'allowUserIds', type: 'idlist' },
       { key: 'maxChunkChars', type: 'chunk' },
       { key: 'blockOnSkipPermissions', type: 'bool' },
+      { key: 'ackCard', type: 'bool', default: true },
     ],
   },
   discord: {
@@ -84,7 +88,7 @@ const DESCRIPTORS = {
     defaults: {
       // 1900 < Discord's hard 2000-char/message limit (the adapter also hard-splits as defense).
       enabled: false, botToken: '', allowUserIds: [],
-      maxChunkChars: 1900, blockOnSkipPermissions: false,
+      maxChunkChars: 1900, blockOnSkipPermissions: false, ackCard: true,
     },
     fields: [
       { key: 'enabled', type: 'bool' },
@@ -92,6 +96,7 @@ const DESCRIPTORS = {
       { key: 'allowUserIds', type: 'idlist' },
       { key: 'maxChunkChars', type: 'chunk', default: 1900 }, // < Discord's 2000-char limit
       { key: 'blockOnSkipPermissions', type: 'bool' },
+      { key: 'ackCard', type: 'bool', default: true },
     ],
   },
 };
@@ -155,7 +160,7 @@ function normalizeIdList(v) {
 
 function normField(type, v, dflt) {
   switch (type) {
-    case 'bool': return !!v;
+    case 'bool': return v !== undefined && v !== null ? !!v : (dflt !== undefined ? !!dflt : false);
     case 'cred':
     case 'secret': return typeof v === 'string' ? v.trim() : '';
     case 'idlist': return normalizeIdList(v);
@@ -169,7 +174,7 @@ function decodeField(type, v, dflt) {
   switch (type) {
     case 'cred':
     case 'secret': return decodeSecret(v);
-    case 'bool': return !!v;
+    case 'bool': return v !== undefined && v !== null ? !!v : (dflt !== undefined ? !!dflt : false);
     case 'idlist': return normalizeIdList(v);
     case 'chunk': return clampChunk(v, dflt);
     case 'region': return v === 'lark' ? 'lark' : 'feishu';

package/server/lib/im-process-manager.js

@@ -22,7 +22,7 @@ const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
 export function resolveNodeBinary() {
   if (!process.versions.electron) return process.execPath;
   try {
-    const out = execSync(process.platform === 'win32' ? 'where node' : 'which node', { encoding: 'utf-8' });
+    const out = execSync(process.platform === 'win32' ? 'where node' : 'which node', { encoding: 'utf-8', windowsHide: true });
     const p = process.platform === 'win32' ? out.split('\n')[0].trim() : out.trim();
     if (p) return p;
   } catch { /* fall through */ }

package/server/lib/jsonl-archive.js

@@ -20,7 +20,6 @@ const CACHE_TTL_MS = 7 * 24 * 3600 * 1000;
 const ARCHIVE_MAX_BYTES = 400 * 1024 * 1024;
 
 function syncSleep(ms) {
-  // Atomics.wait 在主线程上真睡眠（不像 busy-wait 占满 CPU 或阻塞 event-loop heuristics）
   Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms);
 }
 

package/server/lib/log-management.js

@@ -1,17 +1,12 @@
-import { readFileSync, writeFileSync, existsSync, statSync, readdirSync, unlinkSync, realpathSync, appendFileSync } from 'node:fs';
+import { existsSync, realpathSync, unlinkSync, readdirSync, readFileSync, writeFileSync, statSync } from 'node:fs';
+import { readFile, writeFile, appendFile, stat, readdir } from 'node:fs/promises';
+import { randomBytes } from 'node:crypto';
 import { renameSyncWithRetry } from './file-api.js';
 import { join } from 'node:path';
 import { reconstructEntries } from './delta-reconstructor.js';
-import { streamReconstructedEntries } from './log-stream.js';
+import { streamReconstructedEntriesAsync } from './log-stream.js';
 import { archiveJsonl, resolveJsonlPath } from './jsonl-archive.js';
 
-/**
- * Validate that a resolved file path is contained within logDir.
- * Throws on invalid path (not found or path traversal).
- * @param {string} logDir - base log directory
- * @param {string} file - relative file path (e.g. "project/file.jsonl")
- * @returns {string} the real (resolved) path
- */
 export function validateLogPath(logDir, file) {
   const filePath = join(logDir, file);
   if (!existsSync(filePath)) {
@@ -33,65 +28,51 @@ function isLogFileName(name) {
   return name.endsWith('.jsonl') || name.endsWith('.jsonl.zip');
 }
 
-/**
- * List local log files grouped by project.
- * @param {string} logDir - base log directory
- * @param {string} currentProjectName - current project name (may be empty)
- * @returns {{ [project: string]: Array, _currentProject: string }}
- */
-export function listLocalLogs(logDir, currentProjectName) {
+export async function listLocalLogs(logDir, currentProjectName) {
   const grouped = {};
-  if (existsSync(logDir)) {
-    const entries = readdirSync(logDir, { withFileTypes: true });
-    for (const entry of entries) {
-      if (!entry.isDirectory()) continue;
-      const project = entry.name;
-      const projectDir = join(logDir, project);
-      const files = readdirSync(projectDir)
-        .filter(isLogFileName)
-        .sort()
-        .reverse();
-      // 从项目统计缓存中读取 per-file 数据，避免逐文件扫描
-      let statsFiles = null;
-      try {
-        const statsFile = join(projectDir, `${project}.json`);
-        if (existsSync(statsFile)) {
-          statsFiles = JSON.parse(readFileSync(statsFile, 'utf-8')).files;
-        }
-      } catch { }
-      for (const f of files) {
-        const match = f.match(/^(.+?)_(\d{8}_\d{6})\.jsonl(\.zip)?$/);
-        if (!match) continue;
-        const ts = match[2];
-        const archived = !!match[3];
-        const filePath = join(projectDir, f);
-        const size = statSync(filePath).size;
-        if (size === 0) continue; // 跳过空文件
-        // 归档前的统计缓存 key 是 `.jsonl`；归档后切到 `.jsonl.zip`；两种都尝试
-        const stats = statsFiles?.[f] || (archived ? statsFiles?.[f.slice(0, -4)] : null);
-        const turns = stats?.summary?.sessionCount || 0;
-        if (!grouped[project]) grouped[project] = [];
-        grouped[project].push({ file: `${project}/${f}`, timestamp: ts, size, turns, preview: stats?.preview || [], archived });
+  if (!existsSync(logDir)) return { ...grouped, _currentProject: currentProjectName || '' };
+
+  const entries = await readdir(logDir, { withFileTypes: true });
+  for (const entry of entries) {
+    if (!entry.isDirectory()) continue;
+    const project = entry.name;
+    const projectDir = join(logDir, project);
+    const files = (await readdir(projectDir))
+      .filter(isLogFileName)
+      .sort()
+      .reverse();
+    let statsFiles = null;
+    try {
+      const statsFile = join(projectDir, `${project}.json`);
+      if (existsSync(statsFile)) {
+        statsFiles = JSON.parse(await readFile(statsFile, 'utf-8')).files;
       }
+    } catch { }
+    for (const f of files) {
+      const match = f.match(/^(.+?)_(\d{8}_\d{6})\.jsonl(\.zip)?$/);
+      if (!match) continue;
+      const ts = match[2];
+      const archived = !!match[3];
+      const filePath = join(projectDir, f);
+      let size;
+      try { size = (await stat(filePath)).size; } catch { continue; }
+      if (size === 0) continue;
+      const stats = statsFiles?.[f] || (archived ? statsFiles?.[f.slice(0, -4)] : null);
+      const turns = stats?.summary?.sessionCount || 0;
+      if (!grouped[project]) grouped[project] = [];
+      grouped[project].push({ file: `${project}/${f}`, timestamp: ts, size, turns, preview: stats?.preview || [], archived });
     }
   }
   return { ...grouped, _currentProject: currentProjectName || '' };
 }
 
-/**
- * Read and parse a local log file.
- * @param {string} logDir - base log directory
- * @param {string} file - relative file path (e.g. "project/file.jsonl")
- * @returns {Array<Object>} parsed entries
- */
-export function readLocalLog(logDir, file) {
+export async function readLocalLog(logDir, file) {
   validateLogPath(logDir, file);
   const filePath = resolveJsonlPath(join(logDir, file));
-  const content = readFileSync(filePath, 'utf-8');
+  const content = await readFile(filePath, 'utf-8');
   const parsed = content.split('\n---\n').filter(line => line.trim()).map(entry => {
     try { return JSON.parse(entry); } catch { return null; }
   }).filter(Boolean);
-  // Delta storage: 先去重（timestamp|url），再重建 delta 条目
   const map = new Map();
   for (const entry of parsed) {
     const key = `${entry.timestamp}|${entry.url}`;
@@ -100,12 +81,6 @@ export function readLocalLog(logDir, file) {
   return reconstructEntries(Array.from(map.values()));
 }
 
-/**
- * Delete log files. Returns per-file results.
- * @param {string} logDir - base log directory
- * @param {string[]} files - array of relative file paths
- * @returns {Array<{ file: string, ok?: boolean, error?: string }>}
- */
 export function deleteLogFiles(logDir, files) {
   const results = [];
   for (const file of files) {
@@ -134,21 +109,12 @@ export function deleteLogFiles(logDir, files) {
   return results;
 }
 
-/**
- * Merge multiple log files into the first one, deleting the rest.
- * @param {string} logDir - base log directory
- * @param {string[]} files - array of relative file paths (at least 2, same project, chronological order)
- * @returns {string} the merged target file path (relative)
- */
-export function mergeLogFiles(logDir, files) {
+export async function mergeLogFiles(logDir, files) {
   if (!Array.isArray(files) || files.length < 2) {
     const err = new Error('At least 2 files required');
     err.code = 'INVALID_INPUT';
     throw err;
   }
-  // 拒绝归档文件参与合并：mergeLogFiles 会以 files[0] 路径写入 plain jsonl 内容，若该路径
-  // 是 .jsonl.zip 会把 zip 文件覆写成裸文本破坏归档；且合并产物语义上应该是可继续追加的
-  // 活动文件，与"归档=只读快照"语义冲突。前端 UI 已 disabled，此处后端兜底。
   for (const f of files) {
     if (typeof f === 'string' && f.endsWith('.jsonl.zip')) {
       const err = new Error('Cannot merge archived (.jsonl.zip) files');
@@ -156,15 +122,12 @@ export function mergeLogFiles(logDir, files) {
       throw err;
     }
   }
-  // 校验所有文件属于同一 project
-  // 兼容 Win backslash：files 内部可能是 `project\log.json`，按两种 sep 都切才能拿 project 段。
   const projects = new Set(files.map(f => f.split(/[\\/]/)[0]));
   if (projects.size !== 1) {
     const err = new Error('All files must belong to the same project');
     err.code = 'INVALID_INPUT';
     throw err;
   }
-  // 校验文件存在且无路径穿越
   for (const f of files) {
     if (f.includes('..')) {
       const err = new Error('Invalid file path');
@@ -177,26 +140,23 @@ export function mergeLogFiles(logDir, files) {
       throw err;
     }
   }
-  // 校验合并后总大小不超过 400MB
   const MAX_MERGE_SIZE = 400 * 1024 * 1024;
   let totalSize = 0;
   for (const f of files) {
-    totalSize += statSync(join(logDir, f)).size;
+    totalSize += (await stat(join(logDir, f))).size;
   }
   if (totalSize > MAX_MERGE_SIZE) {
     const err = new Error(`Merged size (${(totalSize / 1024 / 1024).toFixed(1)}MB) exceeds ${MAX_MERGE_SIZE / 1024 / 1024}MB limit`);
     err.code = 'INVALID_INPUT';
     throw err;
   }
-  // Delta storage: 流式合并 — 逐文件分段重建并直接写入目标文件，避免全量加载 OOM
   const targetFile = files[0];
   const targetPath = join(logDir, targetFile);
-  // 先写到临时文件，成功后再覆盖目标
-  const tmpPath = targetPath + '.merge-tmp';
-  writeFileSync(tmpPath, ''); // 创建空临时文件
+  const tmpPath = `${targetPath}.merge-tmp-${process.pid}-${randomBytes(4).toString('hex')}`;
+  await writeFile(tmpPath, '');
   for (const f of files) {
     const filePath = join(logDir, f);
-    streamReconstructedEntries(filePath, (segment) => {
+    await streamReconstructedEntriesAsync(filePath, async (segment) => {
       let chunk = '';
       for (const entry of segment) {
         delete entry._deltaFormat;
@@ -205,12 +165,10 @@ export function mergeLogFiles(logDir, files) {
         delete entry._isCheckpoint;
         chunk += JSON.stringify(entry) + '\n---\n';
       }
-      appendFileSync(tmpPath, chunk);
+      await appendFile(tmpPath, chunk);
     });
   }
-  // 临时文件写入成功后原子覆盖目标（POSIX renameSync 自动替换；Windows reader 持锁时 retry）
   renameSyncWithRetry(tmpPath, targetPath);
-  // 删除其余文件
   for (let i = 1; i < files.length; i++) {
     unlinkSync(join(logDir, files[i]));
   }
@@ -224,33 +182,23 @@ function migrateStatsCacheKey(projectDir, projectName, oldFileName, newFileName)
     const stats = JSON.parse(readFileSync(statsFile, 'utf-8'));
     if (stats?.files?.[oldFileName]) {
       const entry = stats.files[oldFileName];
-      // 同步用归档后 .zip 的 size / mtime 覆写 entry，避免 stats-worker 下次扫描时
-      // 因 size/mtime 不匹配判定 cache stale 触发整文件重解析（大 jsonl 数秒 CPU）。
       try {
         const zipStat = statSync(join(projectDir, newFileName));
         entry.size = zipStat.size;
         entry.lastModified = zipStat.mtime.toISOString();
-      } catch { /* zip 不可 stat 时不更新，让 stats 自然重建 */ }
+      } catch {}
       stats.files[newFileName] = entry;
       delete stats.files[oldFileName];
       writeFileSync(statsFile, JSON.stringify(stats, null, 2));
     }
-  } catch { /* tolerant */ }
+  } catch {}
 }
 
-/**
- * 压缩归档多个 .jsonl 文件。每个 project 的最新文件（按文件名 desc 排序后的 logs[0]）
- * 被拒绝，复用 mergeLogFiles 的"最新不允许"语义。
- * @param {string} logDir
- * @param {string[]} files - 形如 "project/<name>.jsonl"
- * @returns {{ archived: string[], skipped: Array<{file:string,reason:string}>, failed: Array<{file:string,reason:string}> }}
- */
 export function archiveLogFiles(logDir, files) {
   const archived = [];
   const skipped = [];
   const failed = [];
 
-  // 按 project 分组以判定最新文件
   const byProject = new Map();
   for (const f of files) {
     if (!f || typeof f !== 'string' || f.includes('..') || !f.endsWith('.jsonl')) {
@@ -280,7 +228,7 @@ export function archiveLogFiles(logDir, files) {
         .sort()
         .reverse();
       latest = projectEntries[0] || null;
-    } catch { /* directory missing => downstream calls will fail */ }
+    } catch {}
 
     for (const f of projectFiles) {
       const fileName = f.split(/[\\/]/).slice(1).join('/');
@@ -309,7 +257,6 @@ export function archiveLogFiles(logDir, files) {
       } else if (result.skipped) {
         skipped.push({ file: f, reason: result.skipped });
       } else {
-        // archiveJsonl 内部已在 unlink 失败时回滚 zip，此处 fail 即原状态完整保留，用户可重试
         failed.push({ file: f, reason: result.error || 'archive failed' });
       }
     }