cc-viewer 1.6.253 → 1.6.255

package/dist/index.html

@@ -19,7 +19,7 @@
       if (pick) document.documentElement.setAttribute('data-theme', pick);
     } catch {}
   </script>
-  <script type="module" crossorigin src="/assets/index-eTBzi5lA.js"></script>
+  <script type="module" crossorigin src="/assets/index-mBNBJDft.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/lib/terminal-env.js

@@ -0,0 +1,102 @@
+import { mkdirSync, writeFileSync } from 'node:fs';
+import { basename, join } from 'node:path';
+import { homedir } from 'node:os';
+import { getClaudeConfigDir } from '../findcc.js';
+
+export const KEEP_CLAUDE_NO_FLICKER_ENV = 'CCV_KEEP_CLAUDE_CODE_NO_FLICKER';
+
+function shouldKeepClaudeNoFlicker(env = {}, sourceEnv = process.env) {
+  return env[KEEP_CLAUDE_NO_FLICKER_ENV] === '1' || sourceEnv?.[KEEP_CLAUDE_NO_FLICKER_ENV] === '1';
+}
+
+export function stripClaudeNoFlickerUnlessOptedIn(env, sourceEnv = process.env) {
+  if (!shouldKeepClaudeNoFlicker(env, sourceEnv)) {
+    delete env.CLAUDE_CODE_NO_FLICKER;
+  }
+  return env;
+}
+
+function ensureWrapperFile(dir, fileName, content) {
+  mkdirSync(dir, { recursive: true });
+  const file = join(dir, fileName);
+  writeFileSync(file, content, { mode: 0o600 });
+  return file;
+}
+
+function defaultRcDir() {
+  return join(getClaudeConfigDir(), 'cc-viewer', 'shell-rc');
+}
+
+/**
+ * Prepare an interactive shell for cc-viewer's embedded terminals.
+ *
+ * Deleting CLAUDE_CODE_NO_FLICKER from the spawned env is enough for direct
+ * Claude spawns, but not for scratch/fallback shells: users often export the
+ * variable from ~/.zshrc or ~/.bashrc, so the shell would recreate it before
+ * they type `claude`. For those shells we install a tiny rc wrapper that loads
+ * the user's normal rc file and then unsets the variable again.
+ */
+export function prepareEmbeddedShellSpawn(shell, env, options = {}) {
+  const sourceEnv = options.sourceEnv || process.env;
+  const keep = shouldKeepClaudeNoFlicker(env, sourceEnv);
+  stripClaudeNoFlickerUnlessOptedIn(env, sourceEnv);
+  if (keep) return { command: shell, args: [], env };
+
+  const shellBase = basename(shell);
+  const homeDir = options.homeDir || homedir();
+  const rcDir = options.rcDir || defaultRcDir();
+
+  if (shellBase === 'zsh') {
+    const zshEnvWrapper = [
+      '# Generated by cc-viewer. Do not edit.',
+      '__ccv_wrapper_zdotdir="${ZDOTDIR:-$HOME}"',
+      '__ccv_original_zdotdir="${CCV_ORIGINAL_ZDOTDIR:-$HOME}"',
+      'if [[ "$__ccv_original_zdotdir" != "$__ccv_wrapper_zdotdir" && -r "$__ccv_original_zdotdir/.zshenv" ]]; then',
+      '  source "$__ccv_original_zdotdir/.zshenv"',
+      'fi',
+      'export CCV_EFFECTIVE_ZDOTDIR="${ZDOTDIR:-$__ccv_original_zdotdir}"',
+      'export ZDOTDIR="$__ccv_wrapper_zdotdir"',
+      'unset __ccv_original_zdotdir __ccv_wrapper_zdotdir',
+      '',
+    ].join('\n');
+    const zshRcWrapper = [
+      '# Generated by cc-viewer. Do not edit.',
+      '__ccv_wrapper_zdotdir="$ZDOTDIR"',
+      '__ccv_original_zdotdir="${CCV_EFFECTIVE_ZDOTDIR:-${CCV_ORIGINAL_ZDOTDIR:-$HOME}}"',
+      'if [[ "$__ccv_original_zdotdir" != "$__ccv_wrapper_zdotdir" && -r "$__ccv_original_zdotdir/.zshrc" ]]; then',
+      '  ZDOTDIR="$__ccv_original_zdotdir"',
+      '  source "$__ccv_original_zdotdir/.zshrc"',
+      '  export ZDOTDIR="$__ccv_wrapper_zdotdir"',
+      'fi',
+      'unset CLAUDE_CODE_NO_FLICKER',
+      'unset CCV_EFFECTIVE_ZDOTDIR',
+      'unset __ccv_original_zdotdir __ccv_wrapper_zdotdir',
+      '',
+    ].join('\n');
+    ensureWrapperFile(rcDir, '.zshenv', zshEnvWrapper);
+    ensureWrapperFile(rcDir, '.zshrc', zshRcWrapper);
+    env.CCV_ORIGINAL_ZDOTDIR = env.ZDOTDIR || homeDir;
+    env.ZDOTDIR = rcDir;
+    return { command: shell, args: [], env };
+  }
+
+  if (shellBase === 'bash') {
+    const wrapper = [
+      '# Generated by cc-viewer. Do not edit.',
+      'if [ -r "${CCV_ORIGINAL_BASHRC:-$HOME/.bashrc}" ]; then',
+      '  . "${CCV_ORIGINAL_BASHRC:-$HOME/.bashrc}"',
+      'fi',
+      'unset CLAUDE_CODE_NO_FLICKER',
+      '',
+    ].join('\n');
+    const rcFile = ensureWrapperFile(rcDir, 'bashrc', wrapper);
+    env.CCV_ORIGINAL_BASHRC = env.CCV_ORIGINAL_BASHRC || join(homeDir, '.bashrc');
+    return { command: shell, args: ['--rcfile', rcFile, '-i'], env };
+  }
+
+  if (shellBase === 'fish') {
+    return { command: shell, args: ['--init-command', 'set -e CLAUDE_CODE_NO_FLICKER'], env };
+  }
+
+  return { command: shell, args: [], env };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cc-viewer",
-  "version": "1.6.253",
+  "version": "1.6.255",
   "description": "Claude Code Logger visualization management tool",
   "license": "MIT",
   "main": "server.js",
@@ -20,7 +20,8 @@
     "build:sourcemap": "CCV_SOURCEMAP=1 node build.js",
     "start": "node server.js",
     "test": "CCV_LOG_DIR=tmp node --test",
-    "test:coverage": "CCV_LOG_DIR=tmp node --test --experimental-test-coverage --test-coverage-include='lib/*.js' --test-coverage-include='*.js'",
+    "test:coverage": "CCV_LOG_DIR=tmp node --test --experimental-test-coverage --test-coverage-include='lib/*.js' --test-coverage-include='src/utils/*.js' --test-coverage-include='*.js'",
+    "test:coverage:html": "CCV_LOG_DIR=tmp c8 --reporter=text-summary --reporter=html node --test",
     "prepublishOnly": "npm run build",
     "electron:dev": "electron electron/main.js",
     "electron:build": "npm run build && electron-builder",
@@ -88,6 +89,7 @@
     "@xterm/addon-webgl": "^0.19.0",
     "@xterm/xterm": "^6.0.0",
     "antd": "^5.29.2",
+    "c8": "^11.0.0",
     "diff": "^8.0.3",
     "electron": "^35.1.2",
     "electron-builder": "^26.0.12",
@@ -113,5 +115,26 @@
   },
   "optionalDependencies": {
     "@anthropic-ai/claude-agent-sdk": "^0.2.91"
+  },
+  "c8": {
+    "include": [
+      "lib/**/*.js",
+      "src/utils/**/*.js",
+      "*.js"
+    ],
+    "exclude": [
+      "test/**",
+      "dist/**",
+      "node_modules/**",
+      "build.js",
+      "vite.config.js",
+      "electron/**",
+      "scripts/**",
+      "coverage/**"
+    ],
+    "all": true,
+    "report-dir": "coverage",
+    "skip-full": false,
+    "check-coverage": false
   }
 }

package/pty-manager.js

@@ -3,6 +3,7 @@ import { fileURLToPath } from 'node:url';
 import { join, dirname } from 'node:path';
 import { chmodSync, statSync } from 'node:fs';
 import { platform, arch } from 'node:os';
+import { prepareEmbeddedShellSpawn, stripClaudeNoFlickerUnlessOptedIn } from './lib/terminal-env.js';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
@@ -147,6 +148,9 @@ export async function spawnClaude(proxyPort, cwd, extraArgs = [], claudePath = n
   env.CCV_LOG_DIR = LOG_DIR; // 让 fork 出的 Claude Code 进程找到同一份 profile.json 等资源
   // 剥离 cc-viewer 的内部短路开关，避免泄漏给 claude 子进程
   delete env.CCV_SKIP_THINKING_DISPLAY;
+  // Claude Code NO_FLICKER 会让嵌入式 xterm 走 alt-screen 并丢失 scrollback。
+  // cc-viewer 默认剥离继承值；确实需要时可显式设 CCV_KEEP_CLAUDE_CODE_NO_FLICKER=1。
+  stripClaudeNoFlickerUnlessOptedIn(env);
 
   // Resolve real Node.js path (Electron's process.execPath is the Electron binary)
   let nodePath = process.execPath;
@@ -173,8 +177,6 @@ export async function spawnClaude(proxyPort, cwd, extraArgs = [], claudePath = n
   // 禁用 Claude Code CLI 的鼠标事件捕获，保住 xterm 面板原生文本选中（复制粘贴）。
   // 不设时 Claude 会启 SGR mouse tracking (DECSET ?1000/1006)，抢走 xterm 的鼠标事件。
   // ??= 尊重用户显式 export（比如调试时想看 mouse event）。
-  // 注意：NO_FLICKER 此处**故意**不注入——它会强制 alt-screen 销毁 xterm scrollback；
-  // 需要闪烁优化的用户自行 `export CLAUDE_CODE_NO_FLICKER=1`。
   env.CLAUDE_CODE_DISABLE_MOUSE ??= '1';
 
   // 通过 --settings 注入 ANTHROPIC_BASE_URL，确保覆盖 settings.json 中的配置。
@@ -353,15 +355,16 @@ export async function spawnShell() {
   delete shellEnv.CCVIEWER_PORT;
   delete shellEnv.CCV_EDITOR_PORT;
   delete shellEnv.CCVIEWER_PROTOCOL;
-  // 交互 shell 里手动敲 claude 时也禁鼠标，理由同 spawnClaude；NO_FLICKER 仍不注入
+  // 交互 shell 里手动敲 claude 时也禁鼠标，理由同 spawnClaude。
   shellEnv.CLAUDE_CODE_DISABLE_MOUSE ??= '1';
+  const shellSpawn = prepareEmbeddedShellSpawn(shell, shellEnv);
 
-  ptyProcess = pty.spawn(shell, [], {
+  ptyProcess = pty.spawn(shellSpawn.command, shellSpawn.args, {
     name: 'xterm-256color',
     cols: lastPtyCols,
     rows: lastPtyRows,
     cwd,
-    env: shellEnv,
+    env: shellSpawn.env,
   });
 
   ptyProcess.onData((data) => {

package/scratch-pty-manager.js

@@ -2,6 +2,7 @@ import { fileURLToPath } from 'node:url';
 import { dirname, join, basename } from 'node:path';
 import { chmodSync, statSync } from 'node:fs';
 import { platform, arch, homedir } from 'node:os';
+import { prepareEmbeddedShellSpawn } from './lib/terminal-env.js';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
@@ -134,16 +135,17 @@ export async function spawnScratch(id) {
     }
     delete env.ANTHROPIC_BASE_URL;
     env.CLAUDE_CODE_DISABLE_MOUSE ??= '1';
+    const shellSpawn = prepareEmbeddedShellSpawn(shell, env);
 
     s.lastExitCode = null;
     s.outputBuffer = '';
 
-    s.ptyProcess = pty.spawn(shell, [], {
+    s.ptyProcess = pty.spawn(shellSpawn.command, shellSpawn.args, {
       name: 'xterm-256color',
       cols: s.lastCols,
       rows: s.lastRows,
       cwd: STARTUP_CWD,
-      env,
+      env: shellSpawn.env,
     });
 
     s.ptyProcess.onData((data) => {

package/server.js

@@ -59,6 +59,8 @@ function getPrefsFile() { return join(LOG_DIR, 'preferences.json'); }
 
 // 启动时一次性读取 ~/.claude/settings.json（不 watch）
 let claudeSettings = {};
+// SSR theme 注入自检状态：模板缺 data-theme 时仅首次 warn（避免高 QPS 刷屏）
+let _ssrThemeAttrWarned = false;
 try {
   const settingsPath = join(getClaudeConfigDir(), 'settings.json');
   if (existsSync(settingsPath)) {
@@ -2382,6 +2384,10 @@ async function handleRequest(req, res) {
             return;
           }
         } else {
+          // Fallback id：当 hook caller 没传 toolUseId（如老 Claude Code PreToolUse hook
+          // payload 不含 tool_use_id），生成 ask_${ts}_${rnd} 占位。这个 id 与 jsonl 里
+          // tool_use.id（toolu_xxx）不同名，前端 portal 决策必须按 ask_* 前缀通配命中。
+          // 协议锚点：src/utils/askPortalMatcher.js — 改此处前缀格式必须同步改 matcher。
           do { id = `ask_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`; } while (pendingAskHooks.has(id));
         }
 
@@ -3618,6 +3624,13 @@ async function handleRequest(req, res) {
     // 等 React 拿到 prefs 才切回 dark，肉眼可见一次"白闪"。
     // 这里把当前 prefs 里的 themeColor 直接写进 HTML，inline boot script 仍负责
     // 处理 URL ?theme= 优先级与 localStorage 缓存。
+    //
+    // 主题来源优先级（首屏 → React 接管后）：
+    //   1. URL ?theme=  （inline boot script 读取，最高优先）
+    //   2. localStorage ccv_themeColor  （inline boot script 读取，跨刷新缓存）
+    //   3. preferences.json 的 themeColor  （此处 SSR 注入到 <html data-theme="...">，老用户兜底）
+    //   4. dist/index.html 模板里的硬编码 default ("light")
+    // React 接管后 AppBase._applyTheme() 会基于 1/2/3 重新统一 state + DOM + localStorage 三向同步。
     const serveIndexHtml = () => {
       try {
         const indexPath = join(__dirname, 'dist', 'index.html');
@@ -3629,6 +3642,12 @@ async function handleRequest(req, res) {
             if (prefs.themeColor === 'dark' || prefs.themeColor === 'light') themeColor = prefs.themeColor;
           }
         } catch { /* 读 prefs 失败就走默认 light */ }
+        // 自检：模板里没有 <html ... data-theme="..."> 时 replace 静默 no-op，SSR 优化失效但不报错。
+        // 仅首次 warn 避免高 QPS 刷屏（_ssrThemeAttrWarned 单进程一次性）。
+        if (!_ssrThemeAttrWarned && !/<html[^>]*data-theme="[^"]*"/.test(html)) {
+          _ssrThemeAttrWarned = true;
+          console.warn('[serveIndexHtml] dist/index.html 没有 <html data-theme="..."> 属性，SSR theme 注入将不生效。检查 index.html 模板。');
+        }
         html = html.replace(/<html([^>]*?)data-theme="[^"]*"/, `<html$1data-theme="${themeColor}"`);
         res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8', 'Cache-Control': 'no-cache' });
         res.end(html);