cc-viewer 1.5.21 → 1.5.23

package/lib/interceptor-core.js

@@ -0,0 +1,230 @@
+import { appendFileSync, existsSync, readdirSync, readFileSync, renameSync, unlinkSync, writeFileSync } from 'node:fs';
+import { join } from 'node:path';
+
+const SUBAGENT_SYSTEM_RE = /(?:command execution|file search|planning) specialist|general-purpose agent/i;
+
+export function getSystemText(body) {
+  const system = body?.system;
+  if (typeof system === 'string') return system;
+  if (Array.isArray(system)) {
+    return system.map(s => (s && s.text) || '').join('');
+  }
+  return '';
+}
+
+export function isMainAgentRequest(body) {
+  if (!body?.system || !Array.isArray(body?.tools)) return false;
+
+  const sysText = getSystemText(body);
+  if (!sysText.includes('You are Claude Code')) return false;
+  if (SUBAGENT_SYSTEM_RE.test(sysText)) return false;
+
+  const isSystemArray = Array.isArray(body.system);
+  const hasToolSearch = body.tools.some(t => t.name === 'ToolSearch');
+
+  if (isSystemArray && hasToolSearch) {
+    const messages = body.messages || [];
+    const firstMsgContent = messages.length > 0 ?
+      (typeof messages[0].content === 'string' ? messages[0].content :
+        Array.isArray(messages[0].content) ? messages[0].content.map(c => c.text || '').join('') : '') : '';
+    if (firstMsgContent.includes('<available-deferred-tools>')) {
+      return true;
+    }
+  }
+
+  if (body.tools.length > 10) {
+    const hasEdit = body.tools.some(t => t.name === 'Edit');
+    const hasBash = body.tools.some(t => t.name === 'Bash');
+    const hasTaskOrAgent = body.tools.some(t => t.name === 'Task' || t.name === 'Agent');
+    if (hasEdit && hasBash && hasTaskOrAgent) {
+      return true;
+    }
+  }
+
+  return false;
+}
+
+export function isPreflightEntry(entry) {
+  if (entry.mainAgent || entry.isHeartbeat || entry.isCountTokens) return false;
+  const body = entry.body || {};
+  if (Array.isArray(body.tools) && body.tools.length > 0) return false;
+  const msgs = body.messages || [];
+  if (msgs.length !== 1 || msgs[0].role !== 'user') return false;
+  const sysText = typeof body.system === 'string' ? body.system :
+    Array.isArray(body.system) ? body.system.map(s => s?.text || '').join('') : '';
+  return sysText.includes('Claude Code');
+}
+
+export function isAnthropicApiPath(urlStr) {
+  try {
+    const pathname = new URL(urlStr).pathname;
+    return /^\/v1\/messages(\/count_tokens|\/batches(\/.*)?)?$/.test(pathname)
+      || /^\/api\/eval\/sdk-/.test(pathname);
+  } catch {
+    return /\/v1\/messages/.test(urlStr);
+  }
+}
+
+export function assembleStreamMessage(events) {
+  let message = null;
+  const contentBlocks = [];
+  let currentBlockIndex = -1;
+
+  for (const event of events) {
+    if (!event || typeof event !== 'object' || !event.type) continue;
+
+    switch (event.type) {
+      case 'message_start':
+        message = { ...event.message };
+        message.content = [];
+        break;
+
+      case 'content_block_start':
+        currentBlockIndex = event.index;
+        contentBlocks[currentBlockIndex] = { ...event.content_block };
+        if (contentBlocks[currentBlockIndex].type === 'text') {
+          contentBlocks[currentBlockIndex].text = '';
+        } else if (contentBlocks[currentBlockIndex].type === 'thinking') {
+          contentBlocks[currentBlockIndex].thinking = '';
+        }
+        break;
+
+      case 'content_block_delta':
+        if (event.index >= 0 && contentBlocks[event.index] && event.delta) {
+          if (event.delta.type === 'text_delta' && event.delta.text) {
+            contentBlocks[event.index].text += event.delta.text;
+          } else if (event.delta.type === 'input_json_delta' && event.delta.partial_json) {
+            if (typeof contentBlocks[event.index]._inputJson !== 'string') {
+              contentBlocks[event.index]._inputJson = '';
+            }
+            contentBlocks[event.index]._inputJson += event.delta.partial_json;
+          } else if (event.delta.type === 'thinking_delta' && event.delta.thinking) {
+            contentBlocks[event.index].thinking += event.delta.thinking;
+          } else if (event.delta.type === 'signature_delta' && event.delta.signature) {
+            contentBlocks[event.index].signature = event.delta.signature;
+          }
+        }
+        break;
+
+      case 'content_block_stop':
+        if (event.index >= 0 && contentBlocks[event.index]) {
+          if (contentBlocks[event.index].type === 'tool_use' && typeof contentBlocks[event.index]._inputJson === 'string') {
+            try {
+              contentBlocks[event.index].input = JSON.parse(contentBlocks[event.index]._inputJson);
+            } catch {
+              contentBlocks[event.index].input = contentBlocks[event.index]._inputJson;
+            }
+            delete contentBlocks[event.index]._inputJson;
+          }
+        }
+        break;
+
+      case 'message_delta':
+        if (message && event.delta) {
+          if (event.delta.stop_reason) {
+            message.stop_reason = event.delta.stop_reason;
+          }
+          if (event.delta.stop_sequence !== undefined) {
+            message.stop_sequence = event.delta.stop_sequence;
+          }
+        }
+        if (message && event.usage) {
+          message.usage = { ...message.usage, ...event.usage };
+        }
+        break;
+
+      case 'message_stop':
+        break;
+    }
+  }
+
+  if (message) {
+    message.content = contentBlocks.filter(block => block !== undefined);
+  }
+
+  return message;
+}
+
+export function findRecentLog(dir, projectName) {
+  try {
+    const files = readdirSync(dir)
+      .filter(f => f.startsWith(projectName + '_') && f.endsWith('.jsonl'))
+      .sort()
+      .reverse();
+    if (files.length === 0) return null;
+    return join(dir, files[0]);
+  } catch { }
+  return null;
+}
+
+export function cleanupTempFiles(dir, projectName) {
+  try {
+    const tempFiles = readdirSync(dir)
+      .filter(f => f.startsWith(projectName + '_') && f.endsWith('_temp.jsonl'));
+    for (const f of tempFiles) {
+      try {
+        const tempPath = join(dir, f);
+        const newPath = tempPath.replace('_temp.jsonl', '.jsonl');
+        if (existsSync(newPath)) {
+          const tempContent = readFileSync(tempPath, 'utf-8');
+          if (tempContent.trim()) {
+            appendFileSync(newPath, tempContent);
+          }
+          unlinkSync(tempPath);
+        } else {
+          renameSync(tempPath, newPath);
+        }
+      } catch { }
+    }
+  } catch { }
+}
+
+export function migrateConversationContext(oldFile, newFile) {
+  try {
+    const content = readFileSync(oldFile, 'utf-8');
+    if (!content.trim()) return;
+
+    const parts = content.split('\n---\n').filter(p => p.trim());
+    if (parts.length === 0) return;
+
+    let originIndex = -1;
+    for (let i = parts.length - 1; i >= 0; i--) {
+      if (!/"mainAgent"\s*:\s*true/.test(parts[i])) continue;
+      try {
+        const entry = JSON.parse(parts[i]);
+        if (entry.mainAgent) {
+          const msgs = entry.body?.messages;
+          if (Array.isArray(msgs) && msgs.length === 1) {
+            originIndex = i;
+            break;
+          }
+        }
+      } catch { }
+    }
+
+    if (originIndex < 0) return;
+
+    let migrationStart = originIndex;
+    if (originIndex > 0) {
+      try {
+        const prevContent = parts[originIndex - 1];
+        if (prevContent.trim().startsWith('{')) {
+          const prev = JSON.parse(prevContent);
+          if (isPreflightEntry(prev)) {
+            migrationStart = originIndex - 1;
+          }
+        }
+      } catch { }
+    }
+
+    const migratedParts = parts.slice(migrationStart);
+    writeFileSync(newFile, migratedParts.join('\n---\n') + '\n---\n');
+
+    const remainingParts = parts.slice(0, migrationStart);
+    if (remainingParts.length > 0) {
+      writeFileSync(oldFile, remainingParts.join('\n---\n') + '\n---\n');
+    } else {
+      writeFileSync(oldFile, '');
+    }
+  } catch { }
+}

package/lib/plugin-loader.js

@@ -4,6 +4,7 @@ import { LOG_DIR } from '../findcc.js';
 
 export const PLUGINS_DIR = join(LOG_DIR, 'plugins');
 const PREFS_FILE = join(LOG_DIR, 'preferences.json');
+const SHOULD_LOG = process.env.CCV_DEBUG_PLUGINS === '1';
 
 // Hook 类型定义
 const HOOK_TYPES = {
@@ -33,7 +34,7 @@ export async function loadPlugins() {
         disabledPlugins = prefs.disabledPlugins;
       }
     }
-  } catch {}
+  } catch { }
 
   let files;
   try {
@@ -52,16 +53,16 @@ export async function loadPlugins() {
       const name = plugin.name || file;
 
       if (disabledPlugins.includes(name)) {
-        console.error(`[CC Viewer] Plugin "${name}" is disabled, skipping.`);
+        if (SHOULD_LOG) console.error(`[CC Viewer] Plugin "${name}" is disabled, skipping.`);
         continue;
       }
 
       if (plugin.hooks && typeof plugin.hooks === 'object') {
         _plugins.push({ name, hooks: plugin.hooks, file });
-        console.error(`[CC Viewer] Plugin loaded: ${name} (${file})`);
+        if (SHOULD_LOG) console.error(`[CC Viewer] Plugin loaded: ${name} (${file})`);
       }
     } catch (err) {
-      console.error(`[CC Viewer] Failed to load plugin "${file}":`, err.message);
+      if (SHOULD_LOG) console.error(`[CC Viewer] Failed to load plugin "${file}":`, err.message);
     }
   }
 }
@@ -80,7 +81,7 @@ export async function runWaterfallHook(name, initialValue) {
         value = { ...value, ...result };
       }
     } catch (err) {
-      console.error(`[CC Viewer] Plugin "${plugin.name}" hook "${name}" error:`, err.message);
+      if (SHOULD_LOG) console.error(`[CC Viewer] Plugin "${plugin.name}" hook "${name}" error:`, err.message);
     }
   }
   return value;
@@ -98,7 +99,7 @@ export async function runParallelHook(name, context = {}) {
       Promise.resolve()
         .then(() => hookFn(context))
         .catch(err => {
-          console.error(`[CC Viewer] Plugin "${plugin.name}" hook "${name}" error:`, err.message);
+          if (SHOULD_LOG) console.error(`[CC Viewer] Plugin "${plugin.name}" hook "${name}" error:`, err.message);
         })
     );
   }
@@ -119,7 +120,7 @@ export function getPluginsInfo() {
         disabledPlugins = prefs.disabledPlugins;
       }
     }
-  } catch {}
+  } catch { }
 
   let files;
   try {

package/lib/updater.js

@@ -64,7 +64,10 @@ function saveCheckTime() {
   } catch { }
 }
 
-export async function checkAndUpdate() {
+export async function checkAndUpdate(options = {}) {
+  const fetchImpl = options.fetchImpl || fetch;
+  const execImpl = options.execImpl || execSync;
+  const dryRun = options.dryRun === true;
   const currentVersion = getCurrentVersion();
 
   // 跟随 Claude Code 全局配置
@@ -77,7 +80,7 @@ export async function checkAndUpdate() {
   }
 
   try {
-    const res = await fetch('https://registry.npmjs.org/cc-viewer');
+    const res = await fetchImpl('https://registry.npmjs.org/cc-viewer');
     if (!res.ok) throw new Error(`HTTP ${res.status}`);
     const data = await res.json();
     const remoteVersion = data['dist-tags']?.latest;
@@ -104,7 +107,9 @@ export async function checkAndUpdate() {
     // 同大版本：自动更新
     console.error(`[CC Viewer] ${t('update.updating', { version: remoteVersion })}`);
     try {
-      execSync(`npm install -g cc-viewer@${remoteVersion}`, { stdio: 'pipe', timeout: 60000 });
+      if (!dryRun) {
+        execImpl(`npm install -g cc-viewer@${remoteVersion}`, { stdio: 'pipe', timeout: 60000 });
+      }
       console.error(`[CC Viewer] ${t('update.completed', { version: remoteVersion })}`);
       return { status: 'updated', currentVersion, remoteVersion };
     } catch (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cc-viewer",
-  "version": "1.5.21",
+  "version": "1.5.23",
   "description": "Claude Code Logger visualization management tool",
   "license": "MIT",
   "main": "server.js",
@@ -18,7 +18,7 @@
     "dev": "vite",
     "build": "node build.js",
     "start": "node server.js",
-    "test": "node --test",
+    "test": "CCV_LOG_DIR=tmp node --test",
     "prepublishOnly": "npm run build"
   },
   "keywords": [

package/pty-manager.js

@@ -19,6 +19,19 @@ let lastPtyRows = 30;
 const MAX_BUFFER = 200000;
 let batchBuffer = '';
 let batchScheduled = false;
+let _ptyImportForTests = null;
+
+export function _setPtyImportForTests(fn) {
+  _ptyImportForTests = fn;
+}
+
+async function getPty() {
+  if (typeof _ptyImportForTests === 'function') {
+    return _ptyImportForTests();
+  }
+  const ptyMod = await import('node-pty');
+  return ptyMod.default || ptyMod;
+}
 
 /**
  * 在 outputBuffer 截断时，找到安全的截断位置，
@@ -65,7 +78,7 @@ function flushBatch() {
   const chunk = batchBuffer;
   batchBuffer = '';
   for (const cb of dataListeners) {
-    try { cb(chunk); } catch {}
+    try { cb(chunk); } catch { }
   }
 }
 
@@ -78,7 +91,7 @@ function fixSpawnHelperPermissions() {
     if (!(stat.mode & 0o111)) {
       chmodSync(helperPath, stat.mode | 0o755);
     }
-  } catch {}
+  } catch { }
 }
 
 export async function spawnClaude(proxyPort, cwd, extraArgs = [], claudePath = null, isNpmVersion = false, serverPort = null) {
@@ -86,8 +99,7 @@ export async function spawnClaude(proxyPort, cwd, extraArgs = [], claudePath = n
     killPty();
   }
 
-  const ptyMod = await import('node-pty');
-  const pty = ptyMod.default || ptyMod;
+  const pty = await getPty();
 
   fixSpawnHelperPermissions();
 
@@ -162,7 +174,7 @@ export async function spawnClaude(proxyPort, cwd, extraArgs = [], claudePath = n
     // 保留 lastWorkspacePath，不清除，用于 respawn
     currentWorkspacePath = null;
     for (const cb of exitListeners) {
-      try { cb(exitCode); } catch {}
+      try { cb(exitCode); } catch { }
     }
   });
 
@@ -183,8 +195,7 @@ export async function spawnShell() {
   if (ptyProcess) return false; // 已有进程在运行
   const cwd = lastWorkspacePath || process.cwd();
 
-  const ptyMod = await import('node-pty');
-  const pty = ptyMod.default || ptyMod;
+  const pty = await getPty();
 
   fixSpawnHelperPermissions();
 
@@ -221,7 +232,7 @@ export async function spawnShell() {
     ptyProcess = null;
     currentWorkspacePath = null;
     for (const cb of exitListeners) {
-      try { cb(exitCode); } catch {}
+      try { cb(exitCode); } catch { }
     }
   });
 
@@ -232,7 +243,7 @@ export function resizePty(cols, rows) {
   lastPtyCols = cols;
   lastPtyRows = rows;
   if (ptyProcess) {
-    try { ptyProcess.resize(cols, rows); } catch {}
+    try { ptyProcess.resize(cols, rows); } catch { }
   }
 }
 
@@ -241,7 +252,7 @@ export function killPty() {
     flushBatch();
     batchBuffer = '';
     batchScheduled = false;
-    try { ptyProcess.kill(); } catch {}
+    try { ptyProcess.kill(); } catch { }
     ptyProcess = null;
   }
 }

package/workspace-registry.js

@@ -1,10 +1,56 @@
 // Workspace Registry - 工作区持久化管理
-import { readFileSync, writeFileSync, existsSync, mkdirSync, statSync, readdirSync } from 'node:fs';
+import { readFileSync, writeFileSync, existsSync, mkdirSync, statSync, readdirSync, openSync, closeSync, renameSync, unlinkSync } from 'node:fs';
 import { join, basename, resolve } from 'node:path';
 import { randomBytes } from 'node:crypto';
 import { LOG_DIR } from './findcc.js';
 
 const WORKSPACES_FILE = join(LOG_DIR, 'workspaces.json');
+const LOCK_FILE = join(LOG_DIR, 'workspaces.lock');
+
+function sleep(ms) {
+  Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms);
+}
+
+function withLock(fn) {
+  mkdirSync(LOG_DIR, { recursive: true });
+  const deadline = Date.now() + 2000;
+  // 如果锁文件超过 5 秒未更新，认为它是死锁（前一个进程崩溃）
+  const STALE_THRESHOLD = 5000;
+
+  while (true) {
+    try {
+      const fd = openSync(LOCK_FILE, 'wx');
+      closeSync(fd);
+      break;
+    } catch (err) {
+      if (err?.code === 'EEXIST') {
+        if (Date.now() < deadline) {
+          // 检查是否为陈旧锁
+          try {
+            const stats = statSync(LOCK_FILE);
+            if (Date.now() - stats.mtimeMs > STALE_THRESHOLD) {
+              // 尝试强制移除锁
+              try { unlinkSync(LOCK_FILE); } catch { }
+              // 立即重试获取
+              continue;
+            }
+          } catch {
+            // stat 失败可能意味着锁刚被释放，继续循环尝试获取
+          }
+          sleep(25);
+          continue;
+        }
+      }
+      throw err;
+    }
+  }
+
+  try {
+    return fn();
+  } finally {
+    try { unlinkSync(LOCK_FILE); } catch { }
+  }
+}
 
 export function loadWorkspaces() {
   try {
@@ -17,45 +63,67 @@ export function loadWorkspaces() {
 }
 
 export function saveWorkspaces(list) {
+  const tmpFile = `${WORKSPACES_FILE}.tmp-${process.pid}-${randomBytes(4).toString('hex')}`;
   try {
     mkdirSync(LOG_DIR, { recursive: true });
-    writeFileSync(WORKSPACES_FILE, JSON.stringify({ workspaces: list }, null, 2));
+    writeFileSync(tmpFile, JSON.stringify({ workspaces: list }, null, 2));
+    
+    // Windows 上 renameSync 可能会因为目标文件存在或被占用而失败
+    // 简单的重试机制
+    let retries = 3;
+    while (retries > 0) {
+      try {
+        renameSync(tmpFile, WORKSPACES_FILE);
+        break;
+      } catch (err) {
+        if (retries === 1) throw err;
+        retries--;
+        sleep(20);
+      }
+    }
   } catch (err) {
     console.error('[CC Viewer] Failed to save workspaces:', err.message);
+    // 尝试清理临时文件
+    try { unlinkSync(tmpFile); } catch { }
   }
 }
 
 export function registerWorkspace(absolutePath) {
-  const resolvedPath = resolve(absolutePath);
-  const projectName = basename(resolvedPath).replace(/[^a-zA-Z0-9_\-\.]/g, '_');
-  const list = loadWorkspaces();
-  const existing = list.find(w => w.path === resolvedPath);
-  if (existing) {
-    existing.lastUsed = new Date().toISOString();
-    existing.projectName = projectName;
+  return withLock(() => {
+    const resolvedPath = resolve(absolutePath);
+    const projectName = basename(resolvedPath).replace(/[^a-zA-Z0-9_\-\.]/g, '_');
+    const list = loadWorkspaces();
+    const existing = list.find(w => w.path === resolvedPath);
+    if (existing) {
+      existing.lastUsed = new Date().toISOString();
+      existing.projectName = projectName;
+      saveWorkspaces(list);
+      return existing;
+    }
+    const now = new Date().toISOString();
+    const entry = {
+      id: randomBytes(6).toString('hex'),
+      path: resolvedPath,
+      projectName,
+      lastUsed: now,
+      createdAt: now,
+    };
+    list.push(entry);
     saveWorkspaces(list);
-    return existing;
-  }
-  const entry = {
-    id: randomBytes(6).toString('hex'),
-    path: resolvedPath,
-    projectName,
-    lastUsed: new Date().toISOString(),
-    createdAt: new Date().toISOString(),
-  };
-  list.push(entry);
-  saveWorkspaces(list);
-  return entry;
+    return entry;
+  });
 }
 
 export function removeWorkspace(id) {
-  const list = loadWorkspaces();
-  const filtered = list.filter(w => w.id !== id);
-  if (filtered.length !== list.length) {
-    saveWorkspaces(filtered);
-    return true;
-  }
-  return false;
+  return withLock(() => {
+    const list = loadWorkspaces();
+    const filtered = list.filter(w => w.id !== id);
+    if (filtered.length !== list.length) {
+      saveWorkspaces(filtered);
+      return true;
+    }
+    return false;
+  });
 }
 
 export function getWorkspaces() {
@@ -71,11 +139,11 @@ export function getWorkspaces() {
           for (const f of files) {
             if (f.endsWith('.jsonl')) {
               logCount++;
-              try { totalSize += statSync(join(logDir, f)).size; } catch {}
+              try { totalSize += statSync(join(logDir, f)).size; } catch { }
             }
           }
         }
-      } catch {}
+      } catch { }
       return { ...w, logCount, totalSize };
     })
     .sort((a, b) => new Date(b.lastUsed) - new Date(a.lastUsed));