cc-viewer 1.6.348 → 1.7.0

package/server/server.js

@@ -74,18 +74,19 @@ function execWithStdin(cmd, args, input, options) {
     child.stdin.end();
   });
 }
-import { LOG_FILE, _initPromise, _resumeState, _projectName, _logDir, streamingState, resetStreamingState, PROFILE_PATH, setLivePort, getImLiveText, resetImLiveText } from './interceptor.js';
-import { recordInstance, listInstances } from './lib/instance-registry.js';
+import { _initPromise, _projectName, _logDir, _v2Writer, streamingState, resetStreamingState, PROFILE_PATH, setLivePort, getImLiveText, resetImLiveText } from './interceptor.js';
+import { V2LiveFeed } from './lib/v2/live-feed.js';
+import { sanitizePathComponent } from './lib/v2/layout.js';
+import { maybeResumeConvert } from './lib/v2/convert-manager.js';
 import { LOG_DIR, setLogDir, getClaudeConfigDir, isBrowserOpenSuppressed } from '../findcc.js';
 import { t, getLang, setLang } from './i18n.js';
 import { loadAuthConfig, loadAuthState, saveAuthConfig, clearProjectOverride, generatePassword, decideAuth, parseCookies, renderLoginPage, localeFromAcceptLanguage } from './lib/auth.js';
 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 { 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';
 import { normalizeBasePath, validateBasePath, stripBasePath } from './lib/base-path.js';
 import { createHardenedCleanup } from './lib/term-signals.js';
@@ -111,12 +112,6 @@ try {
 const isCliMode = process.env.CCV_CLI_MODE === '1';
 const isSdkMode = process.env.CCV_SDK_MODE === '1';
 const isWorkspaceMode = process.env.CCV_WORKSPACE_MODE === '1';
-// Instance id from `ccv --pid <name>` (sanitized in cli.js). null = default mode (no
-// per-instance isolation): the session-pin file falls back to the project-shared key.
-const INSTANCE_ID = process.env.CCV_INSTANCE_ID || null;
-// Remember this id under the project so the CLI banner can list past ids next run (memory
-// aid only). Fire-and-forget; no-ops when there's no active project (e.g. workspace mode).
-if (INSTANCE_ID && _logDir) recordInstance(_logDir, INSTANCE_ID).catch(() => {});
 const _defaultProxyProfiles = { active: 'max', profiles: [{ id: 'max', name: 'Default' }] };
 const _maskApiKey = (k) => k && typeof k === 'string' && k.length > 4 ? '****' + k.slice(-4) : k ? '****' : '';
 const _maskProfiles = (data) => {
@@ -305,9 +300,12 @@ let _launchCallback = null;
 export function setLaunchCallback(fn) { _launchCallback = fn; }
 export function setWorkspaceLaunched(v) { _workspaceLaunched = v; }
 export function initPostLaunch() {
-  watchLogFile(_logWatcherOpts(LOG_FILE));
+  startLogWatch();
   if (!statsWorker) startStatsWorker();
   startStreamingStatusTimer();
+  // wire-v2 S8: a migration the previous process left unfinished resumes here
+  // (resident-until-done, user decision; file-level checkpoints make it cheap).
+  try { if (_projectName) maybeResumeConvert(LOG_DIR, _projectName); } catch (err) { console.error('[CC Viewer] wire-v2 convert resume failed:', err.message); }
 }
 
 // Global POST body size limit (10MB) to prevent OOM from malicious/buggy clients
@@ -418,16 +416,34 @@ const MIME_TYPES = {
   '.woff2': 'font/woff2',
 };
 
-// Helper to build log-watcher options object
-function _logWatcherOpts(logFile) {
-  return {
-    logFile: logFile || LOG_FILE,
-    clients,
-    getClaudePid,
-    runParallelHook,
-    notifyStatsWorker,
-    getLogFile: () => LOG_FILE,
-  };
+// S6b: v2 live feed — the live channel when the v2 writer is active. Lazy
+// singleton so worker/test paths that never watch anything pay nothing.
+let _v2LiveFeed = null;
+function _ensureV2LiveFeed() {
+  if (!_v2LiveFeed) {
+    _v2LiveFeed = new V2LiveFeed({
+      clients,
+      getClaudePid,
+      runParallelHook,
+      // The stats worker's v2 units are session dirs (stats-worker.js v9).
+      notifyStatsWorker,
+    });
+  }
+  return _v2LiveFeed;
+}
+
+/** Start the live channel for the current project (v2 live feed). No-op until
+ *  a project is bound (workspace mode defers to the launch route). */
+function startLogWatch() {
+  if (!_projectName) return;
+  const feed = _ensureV2LiveFeed();
+  feed.start(join(LOG_DIR, sanitizePathComponent(_projectName)));
+  _v2Writer.setOnActivity((dir) => feed.tick(dir));
+}
+
+function stopLogWatch() {
+  if (_v2LiveFeed) _v2LiveFeed.stop();
+  _v2Writer.setOnActivity(null);
 }
 
 function getLocalIp() {
@@ -516,7 +532,8 @@ const deps = {
   persistAskEntry: _persistAskEntry,
   persistAskDelete: _persistAskDelete,
   notifyParentPending: _notifyParentPending,
-  logWatcherOpts: _logWatcherOpts,
+  startLogWatch,
+  stopLogWatch,
   scheduleTurnEndBroadcast: _scheduleTurnEndBroadcast,
   ensureImWatch: _ensureImWatch,
   maskProfiles: _maskProfiles,
@@ -578,7 +595,6 @@ const deps = {
   isCliMode,
   isSdkMode,
   isWorkspaceMode,
-  instanceId: INSTANCE_ID,
   defaultProxyProfiles: _defaultProxyProfiles,
 };
 
@@ -855,9 +871,6 @@ export async function startViewer() {
   // 加载插件（需要在创建服务器之前，以便通过 hook 获取 HTTPS 证书）
   await loadPlugins();
 
-  // 清理过期解压缓存（fire-and-forget；任何错误吞掉）
-  setImmediate(() => { try { cleanupExtractCache(); } catch { /* ignore */ } });
-
   // 启动期配置备份:preferences/profile/workspaces → LOG_DIR 外的 cc-viewer-config-backups/
   // (滚动留 10 份)。2026-06-06 事故:配置随 LOG_DIR 整树丢失后无处可恢复。fire-and-forget。
   setImmediate(() => { try { backupConfigs(); } catch { /* ignore */ } });
@@ -1025,9 +1038,11 @@ export async function startViewer() {
           // 工作区模式下延迟到选择工作区后再启动监听
           if (!isWorkspaceMode) {
             readModelContextSize(); // Cache model→size mapping at startup
-            startWatching(_logWatcherOpts(LOG_FILE));
+            startLogWatch();
             startStatsWorker();
             startStreamingStatusTimer();
+            // wire-v2 S8: resume an unfinished migration (see initPostLaunch)
+            try { if (_projectName) maybeResumeConvert(LOG_DIR, _projectName); } catch (err) { console.error('[CC Viewer] wire-v2 convert resume failed:', err.message); }
           }
           // CLI 模式下启动 WebSocket 服务 (必须 await，否则插件 hook 拿不到 upgrade listeners)
           if (isCliMode) {
@@ -2004,15 +2019,6 @@ export function getAuthConfig() {
   return authConfig;
 }
 
-// Instance id (`--pid`) + the project's previously-used ids — printed by cli.js in the
-// CLI-mode startup banner so the user can recall which id to reuse with `-c` next time.
-export function getInstanceId() {
-  return INSTANCE_ID;
-}
-export function getKnownInstances() {
-  try { return listInstances(_logDir); } catch { return []; }
-}
-
 // In-process broadcast helper for the `turn_end` SSE event. Two callers:
 //   1. /api/turn-end-notify POST handler (PTY/CLI mode via Stop hook bridge)
 //   2. cli.js runSdkMode → sdkManager.initSdkSession({ onTurnEnd }) (SDK mode —
@@ -2238,28 +2244,12 @@ async function _doStop() {
       new Promise(r => setTimeout(r, 3000)),
     ]);
   } catch { }
-  // 如果用户未做选择，将临时文件转为正式文件
-  if (_resumeState && _resumeState.tempFile) {
-    try {
-      const { tempFile } = _resumeState;
-      if (existsSync(tempFile)) {
-        // 只有非空 temp 文件才 rename 为正式文件，空文件直接删除
-        const sz = statSync(tempFile).size;
-        if (sz > 0) {
-          const newPath = tempFile.replace('_temp.jsonl', '.jsonl');
-          renameSync(tempFile, newPath);
-        } else {
-          unlinkSync(tempFile);
-        }
-      }
-    } catch { }
-  }
-  unwatchAll();
+  stopLogWatch();
   unwatchAllWorkflows();
   unwatchFile(CONTEXT_WINDOW_FILE);
   clients.forEach(client => client.end());
   // Truncate in place (not `clients = []`) so the array reference stays stable across
-  // stop/start cycles — deps.clients and _logWatcherOpts() hold this same reference.
+  // stop/start cycles — deps.clients holds this same reference.
   clients.length = 0;
   if (server) {
     // 销毁所有活跃连接，防止 keep-alive 阻止进程退出
@@ -2399,17 +2389,9 @@ if (!isWorkspaceMode) {
   });
 }
 
-// 进程退出时，将未决的临时文件转为正式文件
-function handleExit() {
-  if (_resumeState && _resumeState.tempFile) {
-    try {
-      if (existsSync(_resumeState.tempFile)) {
-        const newPath = _resumeState.tempFile.replace('_temp.jsonl', '.jsonl');
-        renameSync(_resumeState.tempFile, newPath);
-      }
-    } catch { }
-  }
-}
+// 进程退出钩子（v1 时代负责临时文件转正；v2 无暂存文件，保留空挂点防
+// 未来清理动作无处可挂）
+function handleExit() {}
 // 防御性单次注册：ESM cache 已保证模块顶层只执行一次，但若未来重构把这段
 // 移入函数（cleanupViewer 等）或用 dev hot-reload，缺守卫会导致 handler 堆积
 // → 进程退出时多次调用 stopViewer。globalThis flag 兼容所有 import 路径。

package/server/workspace-registry.js

@@ -3,6 +3,7 @@ import { readFileSync, writeFileSync, existsSync, mkdirSync, unlinkSync } from '
 import { readdir, stat } from 'node:fs/promises';
 import { renameSyncWithRetry } from './lib/file-api.js';
 import { withFileLockAsync } from './lib/async-file-lock.js';
+import { dirSizeSync } from './lib/v2/layout.js';
 import { join, basename, resolve } from 'node:path';
 import { randomBytes } from 'node:crypto';
 import { LOG_DIR } from '../findcc.js';
@@ -92,19 +93,38 @@ export async function removeWorkspace(id) {
 export async function getWorkspaces() {
   const list = loadWorkspaces();
   const enriched = await Promise.all(list.map(async (w) => {
-    let logCount = 0;
+    // wire-v2 (1.7.0): logs live in per-session dirs under sessions/. The v1
+    // *.jsonl glob is kept as unmigratedV1Count — the combined logCount must
+    // stay non-zero for a declined-migration workspace, because the launcher's
+    // `logCount > 0 → auto -c` heuristic hangs off it (WorkspaceList.jsx).
+    let sessionCount = 0;
+    let unmigratedV1Count = 0;
     let totalSize = 0;
     const logDir = join(LOG_DIR, w.projectName);
     try {
       const files = await readdir(logDir);
       for (const f of files) {
-        if (f.endsWith('.jsonl')) {
-          logCount++;
+        if (f.endsWith('.jsonl') && !f.endsWith('_temp.jsonl')) {
+          unmigratedV1Count++;
           try { totalSize += (await stat(join(logDir, f))).size; } catch { }
         }
       }
     } catch { }
-    return { ...w, logCount, totalSize };
+    try {
+      const sids = await readdir(join(logDir, 'sessions'), { withFileTypes: true });
+      for (const e of sids) {
+        if (!e.isDirectory()) continue;
+        const sessionDir = join(logDir, 'sessions', e.name);
+        try {
+          await stat(join(sessionDir, 'journal.jsonl'));
+          // Folder size, not journal size — conv/blob/response files carry
+          // most of a session's bytes (journal alone undercounts ~12x).
+          totalSize += dirSizeSync(sessionDir);
+          sessionCount++;
+        } catch { /* dir without a journal is not a session yet */ }
+      }
+    } catch { }
+    return { ...w, logCount: sessionCount + unmigratedV1Count, sessionCount, unmigratedV1Count, totalSize };
   }));
   return enriched.sort((a, b) => new Date(b.lastUsed) - new Date(a.lastUsed));
 }