cc-viewer 1.6.248 → 1.6.249

package/dist/index.html

@@ -6,7 +6,7 @@
   <title>Claude Code Viewer</title>
   <link rel="icon" href="/favicon.ico?v=1">
   <link rel="shortcut icon" href="/favicon.ico?v=1">
-  <script type="module" crossorigin src="/assets/index-1OtQ-y7A.js"></script>
+  <script type="module" crossorigin src="/assets/index-etQ0_qi5.js"></script>
   <link rel="modulepreload" crossorigin href="/assets/vendor-antd-BeN8xqGk.js">
   <link rel="modulepreload" crossorigin href="/assets/vendor-codemirror-2nbmPewy.js">
   <link rel="modulepreload" crossorigin href="/assets/vendor-mdxeditor-C7DYEBoH.js">

package/interceptor.js

@@ -13,7 +13,7 @@ import { homedir } from 'node:os';
 import { fileURLToPath, pathToFileURL } from 'node:url';
 import { dirname, join, basename } from 'node:path';
 import { LOG_DIR } from './findcc.js';
-import { assembleStreamMessage, createStreamAssembler, cleanupTempFiles, findRecentLog, isAnthropicApiPath, isMainAgentRequest, rotateLogFile } from './lib/interceptor-core.js';
+import { assembleStreamMessage, createStreamAssembler, cleanupTempFiles, findRecentLog, isAnthropicApiPath, isMainAgentRequest, rotateLogFile, fingerprintMsg } from './lib/interceptor-core.js';
 
 
 
@@ -239,14 +239,21 @@ function resolveResumeChoice(choice) {
 // Delta storage: 增量存储开关和状态（默认开启，设置 CCV_DISABLE_DELTA=1 关闭）
 // 注意：delta 计算依赖 mainAgent 请求串行（Claude CLI 保证），不做并发互斥
 const _deltaStorageEnabled = process.env.CCV_DISABLE_DELTA !== '1';
+// In-place last-msg replace 检测开关（默认开启，设置 CCV_DISABLE_TAIL_FP_CHECKPOINT=1 关闭）。
+// 关闭后回退到旧行为（仅按长度算 delta，遇到末位原地替换会丢失"末位换内容"信息）。
+const _tailFpCheckEnabled = process.env.CCV_DISABLE_TAIL_FP_CHECKPOINT !== '1';
 let _lastMessagesCount = 0;     // 上一次 mainAgent 写入的完整 messages 数量
+let _lastTailFp = '';           // 上一次 mainAgent 末位 message 的指纹（用于 in-place replace 检测）
 let _mainAgentDeltaCount = 0;   // mainAgent 请求计数器（用于触发定期 checkpoint）
 const CHECKPOINT_INTERVAL = 10; // 每 N 条 mainAgent 请求写一个 checkpoint
 
 /** Delta storage: completed 写入成功后更新状态 */
-function _commitDeltaState(originalLength) {
+function _commitDeltaState(originalLength, originalTailFp) {
   if (_deltaStorageEnabled && originalLength > 0) {
     _lastMessagesCount = originalLength;
+    if (typeof originalTailFp === 'string') {
+      _lastTailFp = originalTailFp;
+    }
   }
 }
 
@@ -374,6 +381,7 @@ function checkAndRotateLogFile() {
     // 重置 delta 状态，强制下一条 mainAgent 请求写完整 checkpoint
     if (_deltaStorageEnabled) {
       _lastMessagesCount = 0;
+      _lastTailFp = '';
       _mainAgentDeltaCount = 0;
     }
   }
@@ -599,16 +607,33 @@ export function setupInterceptor() {
 
     // Delta storage：仅 mainAgent 且开关启用时，将 body.messages 转为增量格式
     let _deltaOriginalMessagesLength = 0; // 缓存本次请求的原始 messages 长度，用于 completed 后更新状态
+    let _deltaOriginalTailFp = '';        // 缓存本次请求末位 message 的指纹，用于 completed 后更新 _lastTailFp
     if (_deltaStorageEnabled && requestEntry?.mainAgent && Array.isArray(requestEntry.body?.messages)) {
       const messages = requestEntry.body.messages;
       _deltaOriginalMessagesLength = messages.length;
+      // 立即把末位 fp 算成字符串保存（不存对象引用），避免后续 mutation 风险
+      _deltaOriginalTailFp = messages.length > 0 ? fingerprintMsg(messages[messages.length - 1]) : '';
       _mainAgentDeltaCount++;
 
+      // In-place last-msg replace 检测：messages.length 不变但末位 fp 不同。
+      // 触发场景：CLI 在 mainAgent 末位"原地替换"user msg（SUGGESTION MODE → 用户真实输入；
+      // synthetic recap 通道注入；等），wire 上长度未变内容变了。旧逻辑 messages.slice(_lastMessagesCount)
+      // 算出 delta=[]，丢失了"末位换内容"信息 → 客户端重建拿到错误的"前态末位"。
+      // 检测命中即强制写 checkpoint，让客户端拿到完整 wire 真实内容。
+      const _sameLenInPlaceReplace =
+        _tailFpCheckEnabled &&
+        messages.length === _lastMessagesCount &&
+        _lastMessagesCount > 0 &&
+        _lastTailFp !== '' &&
+        _deltaOriginalTailFp !== '' &&
+        _deltaOriginalTailFp !== _lastTailFp;
+
       // 判断是否需要写 checkpoint
       const needsCheckpoint =
         _lastMessagesCount === 0 ||                           // 进程重启 / 首次请求
         messages.length < _lastMessagesCount ||               // messages 缩短（/clear、context 压缩）
-        (_mainAgentDeltaCount % CHECKPOINT_INTERVAL === 0);   // 定期 checkpoint
+        (_mainAgentDeltaCount % CHECKPOINT_INTERVAL === 0) || // 定期 checkpoint
+        _sameLenInPlaceReplace;                                // in-place last-msg replace 检测
 
       if (needsCheckpoint) {
         // checkpoint：保持完整 messages，标记 _isCheckpoint
@@ -616,6 +641,11 @@ export function setupInterceptor() {
         requestEntry._totalMessageCount = messages.length;
         requestEntry._conversationId = 'mainAgent';
         requestEntry._isCheckpoint = true;
+        if (_sameLenInPlaceReplace) {
+          // 诊断字段：标记此 checkpoint 是被 in-place replace 检测触发的（频率约 1-2%，
+          // 用于在生产 jsonl 里事后核对触发率，不影响重建逻辑）
+          requestEntry._inPlaceReplaceDetected = true;
+        }
       } else {
         // delta：只保留新增的 messages
         const delta = messages.slice(_lastMessagesCount);
@@ -844,7 +874,7 @@ export function setupInterceptor() {
                       delete requestEntry.inProgress;
                       delete requestEntry.requestId;
                       appendFileSync(LOG_FILE, JSON.stringify(requestEntry) + '\n---\n');
-                      _commitDeltaState(_deltaOriginalMessagesLength);
+                      _commitDeltaState(_deltaOriginalMessagesLength, _deltaOriginalTailFp);
                       // Release memory: clear large objects after disk write
                       streamedChunks = [];
                       streamedContentLen = 0;
@@ -855,7 +885,7 @@ export function setupInterceptor() {
                       delete requestEntry.inProgress;
                       delete requestEntry.requestId;
                       appendFileSync(LOG_FILE, JSON.stringify(requestEntry) + '\n---\n');
-                      _commitDeltaState(_deltaOriginalMessagesLength);
+                      _commitDeltaState(_deltaOriginalMessagesLength, _deltaOriginalTailFp);
                       streamedChunks = [];
                       streamedContentLen = 0;
                       requestEntry.response = null;
@@ -925,7 +955,7 @@ export function setupInterceptor() {
           delete requestEntry.inProgress;
           delete requestEntry.requestId;
           appendFileSync(LOG_FILE, JSON.stringify(requestEntry) + '\n---\n');
-          _commitDeltaState(_deltaOriginalMessagesLength);
+          _commitDeltaState(_deltaOriginalMessagesLength, _deltaOriginalTailFp);
           resetStreamingState();
         }
       } else {
@@ -953,12 +983,12 @@ export function setupInterceptor() {
           delete requestEntry.requestId;
 
           appendFileSync(LOG_FILE, JSON.stringify(requestEntry) + '\n---\n');
-          _commitDeltaState(_deltaOriginalMessagesLength);
+          _commitDeltaState(_deltaOriginalMessagesLength, _deltaOriginalTailFp);
         } catch (err) {
           delete requestEntry.inProgress;
           delete requestEntry.requestId;
           appendFileSync(LOG_FILE, JSON.stringify(requestEntry) + '\n---\n');
-          _commitDeltaState(_deltaOriginalMessagesLength);
+          _commitDeltaState(_deltaOriginalMessagesLength, _deltaOriginalTailFp);
         }
       }
     }

package/lib/interceptor-core.js

@@ -336,6 +336,44 @@ export function migrateConversationContext(oldFile, newFile) {
   } catch { }
 }
 
+/**
+ * 计算单条 message 的轻量身份指纹，用于 delta storage 的 in-place last-msg replace 检测。
+ * 仅服务端 interceptor 使用 —— 触发 Plan C checkpoint 让客户端拿到 wire 真实内容。
+ * 历史上客户端 sessionManager.js 也复用过此算法做 isInPlaceLastMsgReplace 短路，
+ * 后被拆除（因 short-circuit 导致 same-ts 多记录被合并）；现单层防御仅靠服务端。
+ *
+ * 80 字符前缀 + tool_use_id 后 8 字符 + tool_result body 下钻取真实文本（避开 String(array)
+ * 塌陷成 "[object Object]" 的 collision 坑）。
+ */
+export function fingerprintMsg(m) {
+  if (!m) return '';
+  const c = m.content;
+  let snip = '';
+  if (Array.isArray(c) && c.length > 0) {
+    const f = c[0];
+    if (f && typeof f === 'object') {
+      if (f.type === 'text') {
+        snip = String(f.text || '').slice(0, 80);
+      } else if (f.type === 'tool_use') {
+        snip = '<tool_use:' + (f.name || '?') + ':' + (f.id || '').slice(-8) + '>';
+      } else if (f.type === 'tool_result') {
+        let body = '';
+        if (typeof f.content === 'string') body = f.content;
+        else if (Array.isArray(f.content) && f.content[0]) {
+          const cf = f.content[0];
+          body = (typeof cf === 'string') ? cf : (cf.text || cf.type || '');
+        }
+        snip = '<tool_result:' + (f.tool_use_id || '').slice(-8) + ':' + String(body).slice(0, 40) + '>';
+      } else {
+        snip = '<' + (f.type || '?') + '>';
+      }
+    }
+  } else if (typeof c === 'string') {
+    snip = c.slice(0, 80);
+  }
+  return (m.role || '?') + ':' + snip.replace(/\s+/g, ' ').slice(0, 80);
+}
+
 /**
  * Rotate log file when it exceeds maxSize.
  * Creates an empty new file (no content migration) and appends '\n' to old file

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cc-viewer",
-  "version": "1.6.248",
+  "version": "1.6.249",
   "description": "Claude Code Logger visualization management tool",
   "license": "MIT",
   "main": "server.js",