cc-viewer 1.6.348 → 1.7.1

package/server/routes/workspaces.js

@@ -1,11 +1,23 @@
 // Workspace routes (moved verbatim from server.js handleRequest).
 import { existsSync, statSync } from 'node:fs';
 import { basename } from 'node:path';
-import { LOG_FILE, initForWorkspace, resetWorkspace } from '../interceptor.js';
-import { watchLogFile, unwatchAll } from '../lib/log-watcher.js';
+import { initForWorkspace, resetWorkspace, getLiveLogSource, markContinuedLaunch, markForkSession, markResumeSession, isContinuedLaunch } from '../interceptor.js';
+import { LOG_DIR } from '../../findcc.js';
+import { migrationStatus } from '../lib/v2/migrate-prompt.js';
+import { reportSwallowed } from '../lib/error-report.js';
+
+// P2: claude continuation flags — the workspace launcher injects `-c` itself
+// (WorkspaceList's logCount heuristic), so argv scanning in cli.js never sees
+// it; this is detection channel ② of interceptor.isContinuedLaunch().
+const CONTINUE_FLAGS = new Set(['-c', '--continue', '-r', '--resume']);
+// Explicit resume flags — continued for the migrate prompt, but `-c` folder
+// adoption must NOT fire (it targets the latest main session, not the user's
+// chosen one). Mirrors cli.js's CCV_CLAUDE_RESUME channel.
+const RESUME_FLAGS = new Set(['-r', '--resume']);
 import { unwatchAllWorkflows } from '../lib/workflow-watcher.js';
 import { readClaudeProjectModel } from '../lib/context-watcher.js';
 import { countLogEntries, streamRawEntriesAsync } from '../lib/log-stream.js';
+import { sseWrite } from '../lib/wire-compress.js';
 
 function workspacesList(req, res, parsedUrl, isLocal, deps) {
   import('../workspace-registry.js').then(async ({ getWorkspaces }) => {
@@ -49,18 +61,28 @@ function workspacesLaunch(req, res, parsedUrl, isLocal, deps) {
       const result = initForWorkspace(wsPath);
       process.env.CCV_PROJECT_DIR = wsPath;
 
-      // 启动日志监听
-      watchLogFile(deps.logWatcherOpts(LOG_FILE));
+      // 启动日志监听（S6b: v2 live feed when the v2 writer is active）
+      deps.startLogWatch();
 
       // 启动 stats worker（如果尚未启动）
       if (!deps.statsWorker) deps.startStatsWorker();
       deps.startStreamingStatusTimer();
 
+      // P2 检测通道②：workspace 启动器注入的 -c/--continue/-r/--resume（无论
+      // 是否走 PTY 分支都要打标——迁移提示的 continued 语义只取决于参数本身）。
+      const mergedArgs = [...deps.workspaceClaudeArgs, ...(Array.isArray(launchExtraArgs) ? launchExtraArgs : [])];
+      if (mergedArgs.some((a) => CONTINUE_FLAGS.has(a))) markContinuedLaunch();
+      // `--fork-session`: a continuation that mints a NEW session id on purpose —
+      // `-c` folder adoption must NOT fire for it.
+      if (mergedArgs.includes('--fork-session')) markForkSession();
+      // `-r`/`--resume`: user-chosen target session — adoption must not redirect
+      // it to the latest main session.
+      if (mergedArgs.some((a) => RESUME_FLAGS.has(a))) markResumeSession();
+
       // 启动 PTY
       const proxyPort = process.env.CCV_PROXY_PORT;
       if (proxyPort) {
         const { spawnClaude } = await import('../pty-manager.js');
-        const mergedArgs = [...deps.workspaceClaudeArgs, ...(Array.isArray(launchExtraArgs) ? launchExtraArgs : [])];
         await spawnClaude(parseInt(proxyPort), wsPath, mergedArgs, deps.workspaceClaudePath, deps.workspaceIsNpmVersion, deps.actualPort, deps.protocol, deps.INTERNAL_TOKEN);
       }
 
@@ -70,24 +92,38 @@ function workspacesLaunch(req, res, parsedUrl, isLocal, deps) {
       const startedPayload = `event: workspace_started\ndata: ${JSON.stringify({ projectName: result.projectName, path: wsPath, claudeProjectModel: readClaudeProjectModel(wsPath) })}\n\n`;
       deps.clients.forEach(client => {
         try {
-          client.write(startedPayload);
+          sseWrite(client, startedPayload);
         } catch {}
       });
 
       // 流式分段广播以刷新会话区域，避免全量加载 OOM
-      const wsReloadTotal = await countLogEntries(LOG_FILE);
+      // S6b: the live source is the v2 session dir when the v2 writer is
+      // active (a fresh workspace has no session yet → empty stream, the live
+      // feed picks up from the first request).
+      const wsReloadSource = getLiveLogSource();
+      const wsReloadTotal = await countLogEntries(wsReloadSource);
       deps.clients.forEach(client => {
-        try { client.write(`event: load_start\ndata: ${JSON.stringify({ total: wsReloadTotal, incremental: false })}\n\n`); } catch {}
+        try { sseWrite(client, `event: load_start\ndata: ${JSON.stringify({ total: wsReloadTotal, incremental: false })}\n\n`); } catch {}
       });
-      await streamRawEntriesAsync(LOG_FILE, (raw) => {
+      await streamRawEntriesAsync(wsReloadSource, (raw) => {
         deps.clients.forEach(client => {
-          try { client.write('event: load_chunk\ndata: ['); client.write(raw.replace(/\n/g, '')); client.write(']\n\n'); } catch {}
+          try { sseWrite(client, 'event: load_chunk\ndata: ['); sseWrite(client, raw.replace(/\n/g, '')); sseWrite(client, ']\n\n'); } catch {}
         });
       });
       deps.clients.forEach(client => {
-        try { client.write(`event: load_end\ndata: {}\n\n`); } catch {}
+        try { sseWrite(client, `event: load_end\ndata: {}\n\n`); } catch {}
       });
 
+      // 1.7.0 迁移引导（P2）：切进的项目仍有未转换 v1 日志 → 对存量连接广播
+      // migrate_prompt（新连接由 /events 的连接帧覆盖）。
+      try {
+        const mig = migrationStatus(LOG_DIR, result.projectName || '');
+        if (mig.pending) {
+          const frame = `event: migrate_prompt\ndata: ${JSON.stringify({ ...mig, continued: isContinuedLaunch() })}\n\n`;
+          deps.clients.forEach(client => { try { sseWrite(client, frame); } catch {} });
+        }
+      } catch (e) { reportSwallowed('sse.migrate_prompt', e); }
+
       res.writeHead(200, { 'Content-Type': 'application/json' });
       res.end(JSON.stringify({ ok: true, projectName: result.projectName }));
     } catch (err) {
@@ -139,8 +175,8 @@ function workspacesStop(req, res, parsedUrl, isLocal, deps) {
   ]).then(() => {
     // 接续原有清理流程
 
-    // 停止日志监听
-    unwatchAll();
+    // 停止日志监听（v1 tail + v2 live feed）
+    deps.stopLogWatch();
     unwatchAllWorkflows();
 
     // 重置 interceptor 状态
@@ -150,7 +186,7 @@ function workspacesStop(req, res, parsedUrl, isLocal, deps) {
     // 通知所有 SSE 客户端
     deps.clients.forEach(client => {
       try {
-        client.write(`event: workspace_stopped\ndata: {}\n\n`);
+        sseWrite(client, `event: workspace_stopped\ndata: {}\n\n`);
       } catch {}
     });
 

package/server/server.js

@@ -9,6 +9,7 @@ import { execFile, exec, spawn } from 'node:child_process';
 import { promisify } from 'node:util';
 import { Worker } from 'node:worker_threads';
 import { isPathContained } from './lib/file-api.js';
+import { sseWrite, isWireV3Enabled } from './lib/wire-compress.js';
 import { setEntry as askStoreSetEntry, deleteEntry as askStoreDeleteEntry, pruneStale as askStorePruneStale, markAnswered as askStoreMarkAnswered, markCancelled as askStoreMarkCancelled, loadAskStore as askStoreLoad } from './lib/ask-store.js';
 import { ASK_TIMEOUT_MS, ASK_WAITER_REAP_INTERVAL_MS, ASK_WAITER_LIVENESS_MS } from './lib/ask-constants.js';
 import { reapDeadAskWaiters, sweepOrphanedDiskAsks } from './lib/ask-reaper.js';
@@ -33,6 +34,7 @@ import { searchRoutes } from './routes/search.js';
 import { workspacesRoutes } from './routes/workspaces.js';
 import { expertRoutes } from './routes/expert.js';
 import { eventsRoutes } from './routes/events.js';
+import { v2Routes } from './routes/v2.js';
 import { askPermRoutes } from './routes/ask-perm.js';
 import { teamRoutes } from './routes/team.js';
 import { authRoutes } from './routes/auth.js';
@@ -74,18 +76,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 +114,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 +302,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
@@ -317,6 +317,22 @@ const MAX_POST_BODY = 10 * 1024 * 1024;
 // 防止长会话把数十 MB 历史一次性灌进浏览器导致 renderer OOM。
 // 用户显式 ?limit=0 可恢复全量加载（power-user 逃生口）。
 const DEFAULT_EVENTS_LIMIT = 1000;
+// Wire v3 flag (V3.S6: DEFAULT ON) — read ONCE at startup; a read/UI-shape
+// toggle the server and client must agree on per process, not per request
+// (unlike wire-compress's per-connection content negotiation). Broadcast to
+// clients via the server_config SSE frame; tests inject deps.wireV3 directly.
+// CCV_WIRE_V3=0 (or =off) is the escape hatch back to the legacy full-entry
+// wire — kept (not deleted) for one release cycle before the legacy live UI
+// path is removed; v1 legacy FILES always use the legacy pipeline regardless.
+const WIRE_V3 = isWireV3Enabled(process.env.CCV_WIRE_V3);
+// Build stamp broadcast in server_config: a tab that survives a server
+// upgrade reconnects with a STALE JS bundle that lacks the new wire's
+// listeners (silent empty session). The fresh bundle compares this stamp on
+// reconnect and reloads itself on mismatch (review P2-a; heals upgrades from
+// this version onward — older bundles predate the guard).
+const SERVER_BUILD = (() => {
+  try { return JSON.parse(readFileSync(new URL('../package.json', import.meta.url), 'utf-8')).version || ''; } catch { return ''; }
+})();
 // SSE 单客户端 backpressure 容忍上限：连续未排空 > 此时长则视为 dead 客户端剔除。
 // 调高至 30s：大会话首屏/重连重放时，渲染器（尤其 Windows 浏览器，大 DOM layout 更重）
 // 可能短暂忙到来不及排空 socket。过早剔除会触发「断开→EventSource 自动重连→再次重放」
@@ -418,16 +434,35 @@ 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,
+      wireV3: WIRE_V3,
+    });
+  }
+  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 +551,8 @@ const deps = {
   persistAskEntry: _persistAskEntry,
   persistAskDelete: _persistAskDelete,
   notifyParentPending: _notifyParentPending,
-  logWatcherOpts: _logWatcherOpts,
+  startLogWatch,
+  stopLogWatch,
   scheduleTurnEndBroadcast: _scheduleTurnEndBroadcast,
   ensureImWatch: _ensureImWatch,
   maskProfiles: _maskProfiles,
@@ -574,11 +610,12 @@ const deps = {
   WINDOWS_RESERVED_NAMES,
   DEFAULT_EVENTS_LIMIT,
   SSE_BACKPRESSURE_TIMEOUT_MS,
+  wireV3: WIRE_V3,
+  serverBuild: SERVER_BUILD,
   IGNORED_PATTERNS,
   isCliMode,
   isSdkMode,
   isWorkspaceMode,
-  instanceId: INSTANCE_ID,
   defaultProxyProfiles: _defaultProxyProfiles,
 };
 
@@ -607,6 +644,7 @@ const _routes = [
   ...workspacesRoutes,
   ...expertRoutes,
   ...eventsRoutes,
+  ...v2Routes,
   ...askPermRoutes,
   ...teamRoutes,
   ...dingtalkRoutes,
@@ -855,9 +893,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 +1060,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 +2041,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 +2266,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 阻止进程退出
@@ -2385,7 +2397,7 @@ if (!isWorkspaceMode) {
             pendingMajorUpdate = { version: result.remoteVersion, source: result.status };
             const payload = JSON.stringify(pendingMajorUpdate);
             clients.forEach(client => {
-              try { client.write(`event: update_major_available\ndata: ${payload}\n\n`); } catch { }
+              try { sseWrite(client, `event: update_major_available\ndata: ${payload}\n\n`); } catch { }
             });
           } else if (result.status === 'upgrading_in_background') {
             console.error(`[CC Viewer] background upgrade to ${result.remoteVersion} started (active after next launch)`);
@@ -2399,17 +2411,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));
 }

package/src/utils/apiUrl.js

@@ -0,0 +1,26 @@
+// 从 URL 中提取 LAN 访问 token，附加到所有 API 请求 / WebSocket 握手
+const _urlToken = new URLSearchParams(window.location.search).get('token');
+
+// 反向代理子路径部署: 从 <base> 标签或 SSR 注入的全局变量读取 base path，
+// 使 API/WebSocket 等动态请求也能正确路由到代理后端。
+export function getBasePath() {
+  if (typeof window !== 'undefined' && window.__CCV_BASE_PATH__) return window.__CCV_BASE_PATH__;
+  if (typeof document === 'undefined' || !document.querySelector) return '';
+  const base = document.querySelector('base');
+  if (base && base.href) return base.getAttribute('href');
+  return '';
+}
+
+// 把 token 追加到任意 URL（HTTP path 或 ws:// 完整 URL 皆可）。无 token 时原样返回。
+// WS 握手必须也带 token —— 否则启用鉴权后远程「?token=」终端会被 socket.destroy()。
+export function appendToken(url) {
+  if (!_urlToken) return url;
+  const sep = url.includes('?') ? '&' : '?';
+  return `${url}${sep}token=${_urlToken}`;
+}
+
+export function apiUrl(path) {
+  const base = getBasePath();
+  const fullPath = base ? base.replace(/\/$/, '') + path : path;
+  return appendToken(fullPath);
+}

package/src/utils/askFallback.js

@@ -0,0 +1,21 @@
+// Decision helper for ApprovalModal's fallback AskQuestionForm.
+//
+// The Question modal body is normally filled by the transcript tool_use block
+// portaling an AskQuestionForm into the modal's ask slot (see askPortalMatcher.js).
+// When no block portals in — a stale replayed ask whose block is old history, or a
+// fresh ask arriving before transcript ingest — the modal would show an empty body.
+// The fallback renders a form directly from the authoritative pending-ask broadcast.
+//
+// Contract: `slotOccupied` is DOM occupancy of the ask slot (MutationObserver on
+// childList + sync initial read); `graceElapsed` flips true ASK_FALLBACK_GRACE_MS
+// after the ask becomes visible, giving the real portal one commit cycle so fresh
+// asks never flash the fallback before the portaled form mounts.
+
+export const ASK_FALLBACK_GRACE_MS = 120;
+
+export function shouldRenderAskFallback({ isAskActive, slotOccupied, graceElapsed, questions, submitHandler }) {
+  if (!isAskActive || slotOccupied || !graceElapsed) return false;
+  if (!Array.isArray(questions) || questions.length === 0) return false;
+  if (typeof submitHandler !== 'function') return false;
+  return true;
+}

package/src/utils/askOptionDesc.js

@@ -0,0 +1,55 @@
+import { isPlaceholderAskId } from './askPortalMatcher.js';
+
+// AskUserQuestion options[].description is schema-optional; centralize fallback
+// so AskQuestionForm and ChatMessage recap stay aligned.
+
+export function optionAriaLabel(opt) {
+  if (!opt || opt.label == null) return '';
+  return opt.description
+    ? `${opt.label}: ${opt.description}`
+    : String(opt.label);
+}
+
+export function hasOptionDescription(opt) {
+  return Boolean(opt && opt.description);
+}
+
+// Pick the questions the interactive AskUserQuestion card actually renders.
+//
+// The modal body is filled by the inline tool_use block (reconstructed from the log
+// stream) portaling into the modal's askSlot — it does not read pendingAsk.questions
+// (the authoritative copy broadcast over WS ask-hook-pending / sdk-ask-pending, fully
+// parsed server-side before the hook fires) directly. During streaming of a large
+// payload there is a window where the modal is already open but the reconstructed
+// block's input is still partial JSON. Crucially, partial-JSON parsing materializes
+// the outer questions[] array shape before the element content arrives, so the
+// streamed copy can be HOLLOW AT EQUAL LENGTH (e.g. two question objects with empty
+// text/options while big options[].preview strings are still streaming — the
+// 2026-07-04 blank-popup regression; a strictly-longer length heuristic missed it).
+//
+// So: for the currently pending ask (toolId === lastPendingAskId, id-matched), always
+// prefer the authoritative copy. It is complete by construction, and the submit path
+// (handleAskQuestionSubmit in askFlowController) maps answer indices through the same
+// authoritative _askHookQuestions copy — rendering it keeps rendered indices aligned
+// with the mapping array. Historical blocks never match lastPendingAskId and always
+// keep their own streamed questions (history view unchanged).
+//
+// Legacy/no-id servers use placeholder pendingAsk ids ('__ask__', 'ask_<ts>_<rnd>')
+// that can never equal the real tool_use id. There the authoritative copy is only
+// borrowed when the streamed render would otherwise be completely empty — it can fill
+// a blank popup but never override visible content (a stale legacy pendingAsk must
+// not inject a previous ask's questions over a rendered one).
+export function resolveAskQuestions(streamedQuestions, toolId, lastPendingAskId, pendingAsk) {
+  const streamed = Array.isArray(streamedQuestions) ? streamedQuestions : [];
+  if (!pendingAsk || toolId == null || toolId !== lastPendingAskId) {
+    return streamed;
+  }
+  const idMatches = pendingAsk.id === toolId;
+  if (!idMatches && !(isPlaceholderAskId(pendingAsk.id) && streamed.length === 0)) {
+    return streamed;
+  }
+  const authoritative = Array.isArray(pendingAsk.questions) ? pendingAsk.questions : [];
+  if (authoritative.length === 0) return streamed; // defensive: WS handlers guarantee non-empty
+  if (streamed.length > authoritative.length) return streamed; // never shrink (belt-and-braces)
+  return authoritative;
+}

package/src/utils/askPortalMatcher.js

@@ -0,0 +1,54 @@
+/**
+ * Portal 决策：判断 inline AskQuestionForm（在 ChatMessage 里渲染的某条 tool_use）
+ * 是否应该 createPortal 到 ApprovalModal 的 askSlot。
+ *
+ * activeAskId 三种合法形态（与 server 端协议绑定，改一边必须改另一边）：
+ *
+ *   1. `toolu_xxx` — SDK 模式 / 新版 Claude Code 透传的真实 tool_use_id
+ *      → 走 strict 匹配：activeAskId === toolId
+ *
+ *   2. `__ask__` — LEGACY 老 server（pre-Map 协议）的单槽占位
+ *      → 走 owner 通配：仅 owner-idx 锁定的那条 ChatMessage（lastPendingAskId === toolId）命中
+ *
+ *   3. `ask_${ts}_${rnd}` — 老 Claude Code PreToolUse hook payload 不带 tool_use_id 时
+ *      server.js 自生成的 fallback id（修复 modal 标题在但内容空白的根因）
+ *      → 走 owner 通配：与 __ask__ 同语义
+ *
+ * 协议锚点：
+ *   - server 端 fallback id 生成：server.js（搜索 `ask_${Date.now()}` 定位）
+ *   - server 端 LEGACY 占位推送：server.js 推送 ask-hook-pending 事件时 id 为 '__ask__'
+ *   - 前端 setState pendingAsk：src/components/chat/ChatView.jsx
+ *
+ * 改 server 端 fallback id 格式时，必须同步更新此文件的 isFallbackId 检测。
+ */
+
+const FALLBACK_ID_PREFIX = 'ask_';
+const LEGACY_PLACEHOLDER_ID = '__ask__';
+
+/**
+ * True when the given pending-ask id is a placeholder that can never equal a real
+ * tool_use id: the LEGACY single-slot '__ask__' or a server-generated 'ask_<ts>_<rnd>'
+ * fallback id. Consumers (e.g. resolveAskQuestions) use this to apply the same
+ * owner-wildcard semantics as shouldPortalAskForm on the legacy paths.
+ */
+export function isPlaceholderAskId(id) {
+  return id === LEGACY_PLACEHOLDER_ID
+    || (typeof id === 'string' && id.startsWith(FALLBACK_ID_PREFIX));
+}
+
+/**
+ * @param {*} activeAskId   ApprovalPortalContext.Consumer 提供的 activeAskId（modal 当前 active ask 的 id）
+ * @param {*} toolId        当前 ChatMessage 里 tool_use 块的 id（toolu_xxx）
+ * @param {*} lastPendingAskId  ChatMessage 收到的 owner-idx 派生信号；非 owner 永远为 null
+ * @returns {boolean} true 表示当前 ChatMessage 应该 portal 到 askSlot
+ */
+export function shouldPortalAskForm(activeAskId, toolId, lastPendingAskId) {
+  if (activeAskId == null) return false;
+  // strict：SDK / 新 Claude Code 真实 tool_use_id
+  if (String(activeAskId) === String(toolId)) return true;
+  // owner 通配：__ask__（LEGACY 老 server）∪ ask_*（server fallback）
+  // 必须同时满足 owner-idx 锁定（lastPendingAskId === toolId），否则会让历史所有真实 toolId
+  // 都被通配命中，重现旧的双份 portal bug
+  if (isPlaceholderAskId(activeAskId) && lastPendingAskId === toolId) return true;
+  return false;
+}

package/src/utils/autoApproveOptions.js

@@ -0,0 +1,27 @@
+// 自动审批档位唯一事实源 —— 全部消费点共用同一组档位,防止各处字面量发散:
+//   1. TerminalPanel 终端工具栏四芒星快捷菜单（权限/Plan 两行级联档位）
+//   2. ChatInputBar 对话输入框四芒星快捷菜单（隐藏终端时,同款两行）
+//   3. AppHeader 设置抽屉的权限/Plan 两个 Select
+//   4. Mobile 设置面板的权限/Plan 两个 Select
+// 三态语义(持久化于 preferences.autoApproveSeconds / approvalModal.planAutoApproveSeconds):
+//   0   = 关闭(手动审批)
+//   > 0 = 倒计时该秒数后自动批准
+//   -1  = 免审批(AUTO_APPROVE_INSTANT):请求到达即放行,从源头绕过审批面板
+// 本模块不依赖 helpers.js(它带 .svg?raw 等 Vite 专属 import),保持 node --test 可直接引用。
+export const AUTO_APPROVE_INSTANT = -1;
+
+export const PERM_AUTO_APPROVE_OPTIONS = [0, 3, 5, 10, AUTO_APPROVE_INSTANT];
+export const PLAN_AUTO_APPROVE_OPTIONS = [0, 10, 30, 60, AUTO_APPROVE_INSTANT];
+
+// 单个档位值 -> 显示文案;t 由调用方注入,避免本模块依赖前端 i18n。
+// 档位之外的历史值(如 Plan 旧 3/5)同样落在 `${v}s` 分支正常显示。
+export function autoApproveValueLabel(v, t) {
+  if (v === AUTO_APPROVE_INSTANT) return t('ui.permission.autoApprove.instant');
+  if (!v) return t('ui.permission.autoApprove.off');
+  return `${v}s`;
+}
+
+// 档位数组 -> antd Select options
+export function autoApproveSelectOptions(values, t) {
+  return values.map(v => ({ value: v, label: autoApproveValueLabel(v, t) }));
+}