cc-viewer 1.6.306 → 1.6.308

package/server/lib/log-stream.js

@@ -162,11 +162,13 @@ export function streamReconstructedEntries(filePath, onSegment, opts = {}) {
   let currentSegment = [];
   let dedup = new Map();
   let sentCount = 0;
+  // 跨段共享 seq 守卫状态：stale checkpoint 自成段边界，必须文件级跟踪才能识破乱序
+  const seqState = { lastSeq: 0, lastEpoch: null };
 
   function flushSegment(nextCp) {
     if (currentSegment.length === 0) return;
     const dedupedSegment = Array.from(dedup.values());
-    reconstructSegment(dedupedSegment, nextCp);
+    reconstructSegment(dedupedSegment, nextCp, seqState);
 
     let toSend = dedupedSegment;
     if (sinceMs) {
@@ -217,11 +219,13 @@ export async function streamReconstructedEntriesAsync(filePath, onSegment, opts
   let currentSegment = [];
   let dedup = new Map();
   let sentCount = 0;
+  // 跨段共享 seq 守卫状态：stale checkpoint 自成段边界，必须文件级跟踪才能识破乱序
+  const seqState = { lastSeq: 0, lastEpoch: null };
 
   async function flushSegment(nextCp) {
     if (currentSegment.length === 0) return;
     const dedupedSegment = Array.from(dedup.values());
-    reconstructSegment(dedupedSegment, nextCp);
+    reconstructSegment(dedupedSegment, nextCp, seqState);
 
     let toSend = dedupedSegment;
     if (sinceMs) {

package/server/pty-manager.js

@@ -26,6 +26,14 @@ let currentWorkspacePath = null;
 let lastWorkspacePath = null; // 进程退出后保留，用于 respawn shell
 let lastPtyCols = 120;
 let lastPtyRows = 30;
+// 主 PTY spawn 的在途闸：guard 在 await getPty 之前、ptyProcess 赋值在 await 之后，
+// 两条同步到达的 input 消息会越过 guard 双开（首个 pty 失引用泄漏 + 输出串扰）。
+// 同步占位一个 promise，并发调用复用它，绝不二次 spawn（仿 scratch-pty-manager._spawnInflight）。
+let _spawnInflight = null;
+// resize 入口的 cols/rows 钳制范围：上界足够宽（4K 显示器超宽终端），下界 ≥2 列/1 行
+// 防 FitAddon 在 0 尺寸容器算出的 2×1 或畸形客户端的 NaN/负数毒化 lastPtyCols/Rows。
+const PTY_COLS_MIN = 2, PTY_COLS_MAX = 1000;
+const PTY_ROWS_MIN = 1, PTY_ROWS_MAX = 1000;
 const MAX_BUFFER = 200000;
 let batchBuffer = '';
 let batchScheduled = false;
@@ -157,10 +165,19 @@ export function _markThinkingDisplayRejected(claudePath) {
 }
 
 export async function spawnClaude(proxyPort, cwd, extraArgs = [], claudePath = null, isNpmVersion = false, serverPort = null, serverProtocol = 'http', internalToken = null) {
+  // 等待任何在途 spawn 完成再 kill+spawn，避免与 spawnShell 双开/串台（自身串行化）。
+  // while 而非 if：≥3 个并发 spawn 时，A 完成后 B 会设新的 inflight=pB，单次 if 的 C
+  // 不会复查 pB 就 kill+spawn 致 implB/implC 并发双开——循环到真正无在途为止才放行。
+  while (_spawnInflight) { try { await _spawnInflight; } catch { } }
   if (ptyProcess) {
     killPty();
   }
+  const p = _spawnClaudeImpl(proxyPort, cwd, extraArgs, claudePath, isNpmVersion, serverPort, serverProtocol, internalToken);
+  _spawnInflight = p;
+  try { return await p; } finally { if (_spawnInflight === p) _spawnInflight = null; }
+}
 
+async function _spawnClaudeImpl(proxyPort, cwd, extraArgs = [], claudePath = null, isNpmVersion = false, serverPort = null, serverProtocol = 'http', internalToken = null) {
   const pty = await getPty();
 
   fixSpawnHelperPermissions();
@@ -383,7 +400,21 @@ export function writeToPtySequential(chunks, onComplete, opts = {}) {
     const chunk = chunks[idx];
     idx++;
 
-    ptyProcess.write(chunk);
+    // 防御性纵深（server.js 入口已 every(string) 校验，这里是第二道）：非字符串 chunk 的
+    // pty.write 抛 ERR_INVALID_ARG_TYPE、下方 chunk.endsWith 也抛——在 setTimeout 上下文中
+    // 脱离任何 try/catch 会变成 uncaughtException 打挂整个进程。统一拦成失败上报。
+    if (typeof chunk !== 'string') {
+      cleanup();
+      if (onComplete) onComplete(false);
+      return;
+    }
+    try {
+      ptyProcess.write(chunk);
+    } catch (e) {
+      cleanup();
+      if (onComplete) onComplete(false);
+      return;
+    }
 
     // Space, Enter, arrows need more time for inquirer to re-render
     const isToggleOrSubmit = chunk === ' ' || chunk === '\r'
@@ -403,6 +434,13 @@ export function writeToPtySequential(chunks, onComplete, opts = {}) {
  */
 export async function spawnShell() {
   if (ptyProcess) return false; // 已有进程在运行
+  if (_spawnInflight) return _spawnInflight; // 复用在途 spawn，防双开
+  const p = _spawnShellImpl();
+  _spawnInflight = p;
+  try { return await p; } finally { if (_spawnInflight === p) _spawnInflight = null; }
+}
+
+async function _spawnShellImpl() {
   const cwd = lastWorkspacePath || process.cwd();
 
   const pty = await getPty();
@@ -465,11 +503,20 @@ export async function spawnShell() {
   return true;
 }
 
+// cols/rows 钳制为有限正整数：FitAddon 在 0 尺寸容器会算出 2×1，畸形客户端可能发
+// NaN/0/负数——未校验直接存进 lastPtyCols/Rows 会毒化后续 pty.spawn（cols:NaN 抛错，
+// spawnShell 的异常被吞 → 终端永远拉不起且无日志）。非有限值回退到上一个有效值。
+function _clampDim(v, min, max, fallback) {
+  const n = Math.floor(Number(v));
+  if (!Number.isFinite(n)) return fallback;
+  return Math.max(min, Math.min(max, n));
+}
+
 export function resizePty(cols, rows) {
-  lastPtyCols = cols;
-  lastPtyRows = rows;
+  lastPtyCols = _clampDim(cols, PTY_COLS_MIN, PTY_COLS_MAX, lastPtyCols);
+  lastPtyRows = _clampDim(rows, PTY_ROWS_MIN, PTY_ROWS_MAX, lastPtyRows);
   if (ptyProcess) {
-    try { ptyProcess.resize(cols, rows); } catch { }
+    try { ptyProcess.resize(lastPtyCols, lastPtyRows); } catch { }
   }
 }
 

package/server/routes/im.js

@@ -212,6 +212,8 @@ function imProcessPost(req, res, parsedUrl, isLocal, deps) {
 function imLogs(req, res, parsedUrl, isLocal, deps) {
   const id = platformOf(parsedUrl.pathname);
   if (!id) { notFound(res); return; }
+  // 弹窗打开即请求本接口 → 惰性登记该平台日志目录监听，后续写入经 im_log_update SSE 零滞后推送。
+  deps.ensureImWatch?.(id);
   const project = `IM_${id}`;
   let latest = null;
   try {

package/server/scratch-pty-manager.js

@@ -203,13 +203,21 @@ export function writeScratch(id, data) {
   return false;
 }
 
+// cols/rows 钳制为有限正整数（同 pty-manager.resizePty 的理由：防 NaN/2×1 毒化 lastCols
+// 后毒化 respawn）。非有限值回退到上一个有效值。
+function _clampScratchDim(v, min, max, fallback) {
+  const n = Math.floor(Number(v));
+  if (!Number.isFinite(n)) return fallback;
+  return Math.max(min, Math.min(max, n));
+}
+
 export function resizeScratch(id, cols, rows) {
   const s = ptys.get(id);
   if (!s) return;
-  s.lastCols = cols;
-  s.lastRows = rows;
+  s.lastCols = _clampScratchDim(cols, 2, 1000, s.lastCols);
+  s.lastRows = _clampScratchDim(rows, 1, 1000, s.lastRows);
   if (s.ptyProcess) {
-    try { s.ptyProcess.resize(cols, rows); } catch { }
+    try { s.ptyProcess.resize(s.lastCols, s.lastRows); } catch { }
   }
 }
 

package/server/server.js

@@ -77,6 +77,7 @@ import { checkAndUpdate } from './lib/updater.js';
 import { loadPlugins, runWaterfallHook, runParallelHook } from './lib/plugin-loader.js';
 import { CONTEXT_WINDOW_FILE, readModelContextSize } from './lib/context-watcher.js';
 import { watchLogFile, startWatching, unwatchAll, sendEventToClients, sendToClients } from './lib/log-watcher.js';
+import { createImLogWatcher } from './lib/im-log-watcher.js';
 import { unwatchAllWorkflows } from './lib/workflow-watcher.js';
 import { cleanupExtractCache } from './lib/jsonl-archive.js';
 import { backupConfigs } from './lib/config-backup.js';
@@ -440,6 +441,25 @@ function getAllLocalIps() {
 // exposed via GETTERS (read fresh at request time — never captured at import), while
 // never-reassigned Maps/arrays are shared by reference. Helpers/constants that live in
 // server.js (not importable elsewhere) are funneled through here too.
+
+// IM 日志目录监听器：仅主 web 服务启用（IM worker 无浏览器 SSE 客户端，广播无意义）。
+// 惰性 ensure：「对话记录」弹窗请求 /api/im/:platform/logs 时才开始 watch 该平台目录；
+// 写入即广播 im_log_update SSE → 前端零滞后重拉（详见 im-log-watcher.js / AppBase im_log_update 监听）。
+const _imLogWatcher = process.env.CCV_IM_PLATFORM ? null : createImLogWatcher({
+  getLogDir: () => LOG_DIR,
+  onChange: (platform) => {
+    if (clients.length > 0 && sendEventToClients) {
+      sendEventToClients(clients, 'im_log_update', { platform, ts: Date.now() });
+    }
+  },
+});
+
+// 惰性登记 IM 日志目录监听（主服务）；worker 上 _imLogWatcher 为 null → no-op。
+function _ensureImWatch(id) {
+  try { _imLogWatcher?.ensure(id); }
+  catch (e) { console.warn(`[im-log-watcher] ensure(${id}) failed:`, e?.message || e); }
+}
+
 const deps = {
   // Reassignable runtime state — must stay getters.
   get protocol() { return serverProtocol; },
@@ -479,6 +499,7 @@ const deps = {
   notifyParentPending: _notifyParentPending,
   logWatcherOpts: _logWatcherOpts,
   scheduleTurnEndBroadcast: _scheduleTurnEndBroadcast,
+  ensureImWatch: _ensureImWatch,
   maskProfiles: _maskProfiles,
   maskApiKey: _maskApiKey,
   isMasked: _isMasked,
@@ -1154,6 +1175,8 @@ async function setupTerminalWebSocket(httpServer) {
       let lastLogAt = 0;
       return (event, bytes) => {
         if (event === 'start') floodCount++;
+        // 该日志为 Windows 实机排洪泛卡死的观测点，macOS 下纯噪声，静默（限流逻辑本身不受影响）。
+        if (process.platform === 'darwin') return;
         const now = Date.now();
         if (now - lastLogAt < 5000) return;
         lastLogAt = now;
@@ -1447,16 +1470,23 @@ async function setupTerminalWebSocket(httpServer) {
             // 把 client 提供的 seq 透传回去 — 合并 ws 后多个发送方共享一条 ws,
             // 只能靠 client 端按 seq 匹配自己发的请求(client 没传时也兼容,旧客户端不带 seq)。
             const seq = msg.seq;
-            if (Array.isArray(chunks) && chunks.length > 0) {
-              writeToPtySequential(chunks, (ok) => {
-                try {
-                  const reply = { type: 'input-sequential-done', ok };
-                  if (seq !== undefined) reply.seq = seq;
-                  ws.send(JSON.stringify(reply));
-                } catch (e) {
-                  console.warn('[server] input-sequential-done send failed:', e?.message || e);
-                }
-              }, { settleMs: msg.settleMs || 150 });
+            // 元素必须全是字符串：非字符串 chunk 的 pty.write 在 setTimeout 上下文抛
+            // ERR_INVALID_ARG_TYPE（脱离本 handler 的 try/catch）→ 进程崩溃。入口先拒绝。
+            // 统一回 done（含拒绝路径 ok:false）：带 seq 的客户端在等这条，静默丢弃会让它
+            // 挂到自身超时。复用同一发送逻辑，无效输入立即回 ok:false。
+            const replyDone = (ok) => {
+              try {
+                const reply = { type: 'input-sequential-done', ok };
+                if (seq !== undefined) reply.seq = seq;
+                ws.send(JSON.stringify(reply));
+              } catch (e) {
+                console.warn('[server] input-sequential-done send failed:', e?.message || e);
+              }
+            };
+            if (Array.isArray(chunks) && chunks.length > 0 && chunks.every(c => typeof c === 'string')) {
+              writeToPtySequential(chunks, replyDone, { settleMs: msg.settleMs || 150 });
+            } else {
+              replyDone(false);
             }
           } else if (msg.type === 'ask-hook-answer') {
             // Client answered AskUserQuestion via hook bridge.