cc-viewer 1.6.26 → 1.6.27

package/lib/log-management.js

@@ -1,5 +1,6 @@
 import { readFileSync, writeFileSync, existsSync, statSync, readdirSync, unlinkSync, realpathSync } from 'node:fs';
 import { join } from 'node:path';
+import { reconstructEntries } from './delta-reconstructor.js';
 
 /**
  * Validate that a resolved file path is contained within logDir.
@@ -77,10 +78,16 @@ export function readLocalLog(logDir, file) {
   validateLogPath(logDir, file);
   const filePath = join(logDir, file);
   const content = readFileSync(filePath, 'utf-8');
-  const entries = content.split('\n---\n').filter(line => line.trim()).map(entry => {
+  const parsed = content.split('\n---\n').filter(line => line.trim()).map(entry => {
     try { return JSON.parse(entry); } catch { return null; }
   }).filter(Boolean);
-  return entries;
+  // Delta storage: 先去重（timestamp|url），再重建 delta 条目
+  const map = new Map();
+  for (const entry of parsed) {
+    const key = `${entry.timestamp}|${entry.url}`;
+    map.set(key, entry);
+  }
+  return reconstructEntries(Array.from(map.values()));
 }
 
 /**
@@ -160,11 +167,33 @@ export function mergeLogFiles(logDir, files) {
     err.code = 'INVALID_INPUT';
     throw err;
   }
-  // 合并内容写入第一个文件
+  // Delta storage: 合并时先重建为全量格式再拼接（输出全部为旧格式全量条目，无 _deltaFormat）
   const targetFile = files[0];
   const targetPath = join(logDir, targetFile);
-  const contents = files.map(f => readFileSync(join(logDir, f), 'utf-8').trimEnd());
-  writeFileSync(targetPath, contents.join('\n---\n') + '\n');
+  const allEntries = [];
+  for (const f of files) {
+    const content = readFileSync(join(logDir, f), 'utf-8');
+    const parsed = content.split('\n---\n').filter(line => line.trim()).map(entry => {
+      try { return JSON.parse(entry); } catch { return null; }
+    }).filter(Boolean);
+    // 去重
+    const map = new Map();
+    for (const entry of parsed) {
+      const key = `${entry.timestamp}|${entry.url}`;
+      map.set(key, entry);
+    }
+    // 重建 delta 为全量
+    const reconstructed = reconstructEntries(Array.from(map.values()));
+    // 清除 delta 元字段，输出为旧格式全量条目
+    for (const entry of reconstructed) {
+      delete entry._deltaFormat;
+      delete entry._totalMessageCount;
+      delete entry._conversationId;
+      delete entry._isCheckpoint;
+    }
+    allEntries.push(...reconstructed);
+  }
+  writeFileSync(targetPath, allEntries.map(e => JSON.stringify(e)).join('\n---\n') + '\n---\n');
   // 删除其余文件
   for (let i = 1; i < files.length; i++) {
     unlinkSync(join(logDir, files[i]));

package/lib/log-watcher.js

@@ -1,6 +1,7 @@
 import { readFileSync, existsSync, watchFile, unwatchFile, openSync, readSync, closeSync, statSync } from 'node:fs';
 import { isMainAgentEntry, extractCachedContent } from './kv-cache-analyzer.js';
 import { buildContextWindowEvent, getContextSizeForModel } from './context-watcher.js';
+import { reconstructEntries, createIncrementalReconstructor } from './delta-reconstructor.js';
 
 // 跟踪所有被 watch 的日志文件
 const watchedFiles = new Map();
@@ -31,7 +32,7 @@ export function readLogFile(logFile) {
       const key = `${entry.timestamp}|${entry.url}`;
       map.set(key, entry);
     }
-    return Array.from(map.values());
+    return reconstructEntries(Array.from(map.values()));
   } catch (err) {
     console.error('Error reading log file:', err);
     return [];
@@ -84,6 +85,8 @@ export function watchLogFile(opts) {
   // Track byte offset instead of string length — avoids full-file re-read on every poll
   let lastByteOffset = 0;
   let pendingTail = ''; // incomplete entry carried across polls
+  // Delta storage: 增量重建器，用于逐条重建 mainAgent delta 条目
+  const _reconstructor = createIncrementalReconstructor();
   try {
     if (existsSync(logFile)) {
       lastByteOffset = statSync(logFile).size;
@@ -99,6 +102,7 @@ export function watchLogFile(opts) {
       if (currentSize < lastByteOffset) {
         lastByteOffset = 0;
         pendingTail = '';
+        _reconstructor.reset();
 
         // 文件被清空可能是轮转信号，立即检查是否已切换到新文件
         const currentLogFile = getLogFile();
@@ -157,6 +161,8 @@ export function watchLogFile(opts) {
             if (!parsed.pid) {
               parsed.pid = getClaudePid();
             }
+            // Delta storage: reconstruct before push — 确保前端收到完整 messages
+            _reconstructor.reconstruct(parsed);
             sendToClients(clients, parsed);
             runParallelHook('onNewEntry', parsed).catch(() => {});
             if (isMainAgentEntry(parsed)) {

package/lib/stats-worker.js

@@ -108,7 +108,8 @@ function parseJsonlFile(filePath) {
         // 会话轮次统计（仅 MainAgent，排除 SUGGESTION MODE）
         if (entry.mainAgent && Array.isArray(entry.body?.messages)) {
           const msgs = entry.body.messages;
-          const len = msgs.length;
+          // Delta storage: 使用 _totalMessageCount（delta 条目）或 msgs.length（旧格式）
+          const len = entry._totalMessageCount || msgs.length;
           if (!isSuggestionMode(msgs)) {
             // messages 数量大幅缩减：新会话（/clear 等），重置追踪
             if (len < maxMsgLen * 0.5 && (maxMsgLen - len) > 4) {
@@ -129,12 +130,14 @@ function parseJsonlFile(filePath) {
                 maxMsgLen = len;
               }
               const texts = extractUserTexts(msgs);
+              // Delta storage: delta 条目的 msgs 只有新增部分，prevTextCount 不适用，从 0 开始收集
+              const textStart = entry._deltaFormat ? 0 : prevTextCount;
               // 生成本次 prompt 签名，用于跳过同轮重复请求
               const sig = texts.join('\x00');
               if (sig === lastCollectedSig && !isNewTurn) {
                 // 同一轮的重复请求（内容完全相同），跳过
               } else {
-                for (let ti = prevTextCount; ti < texts.length; ti++) {
+                for (let ti = textStart; ti < texts.length; ti++) {
                   const flat = texts[ti].replace(/[\r\n]+/g, ' ').trim();
                   if (flat) preview.push(flat.slice(0, 100));
                 }

package/package.json

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

package/server.js

@@ -1313,14 +1313,37 @@ async function handleRequest(req, res) {
         return;
       }
       const fileName = file.split('/').pop();
-      const stat = statSync(realPath);
-      res.writeHead(200, {
-        'Content-Type': 'application/octet-stream',
-        'Content-Disposition': `attachment; filename="${encodeURIComponent(fileName)}"`,
-        'Content-Length': stat.size,
-      });
-      const stream = createReadStream(realPath);
-      stream.pipe(res);
+      const format = parsedUrl.searchParams.get('format');
+      // Delta storage: format=raw 下载原始文件；默认下载重建后的全量格式
+      if (format === 'raw') {
+        const stat = statSync(realPath);
+        res.writeHead(200, {
+          'Content-Type': 'application/octet-stream',
+          'Content-Disposition': `attachment; filename="${encodeURIComponent(fileName)}"`,
+          'Content-Length': stat.size,
+        });
+        const stream = createReadStream(realPath);
+        stream.pipe(res);
+      } else {
+        // 重建为全量格式下载
+        const { readLocalLog } = await import('./lib/log-management.js');
+        const entries = readLocalLog(LOG_DIR, file);
+        // 清除 delta 元字段
+        for (const entry of entries) {
+          delete entry._deltaFormat;
+          delete entry._totalMessageCount;
+          delete entry._conversationId;
+          delete entry._isCheckpoint;
+        }
+        const content = entries.map(e => JSON.stringify(e)).join('\n---\n') + '\n---\n';
+        const buf = Buffer.from(content, 'utf-8');
+        res.writeHead(200, {
+          'Content-Type': 'application/octet-stream',
+          'Content-Disposition': `attachment; filename="${encodeURIComponent(fileName)}"`,
+          'Content-Length': buf.length,
+        });
+        res.end(buf);
+      }
     } catch (err) {
       res.writeHead(500, { 'Content-Type': 'application/json' });
       res.end(JSON.stringify({ error: err.message }));