cc-viewer 1.6.345 → 1.7.0

package/server/routes/events.js

@@ -1,10 +1,11 @@
 // SSE event stream + log-registration / resume / turn-end routes (moved verbatim from server.js).
 import { existsSync, readFileSync } from 'node:fs';
 import { join } from 'node:path';
-import { LOG_FILE, _resumeState, resolveResumeChoice, _projectName } from '../interceptor.js';
+import { _projectName, getLiveLogSource, isContinuedLaunch } from '../interceptor.js';
 import { LOG_DIR } from '../../findcc.js';
-import { watchLogFile } from '../lib/log-watcher.js';
-import { countLogEntries, streamRawEntriesAsync, readPagedEntries } from '../lib/log-stream.js';
+import { streamRawEntriesAsync } from '../lib/log-stream.js';
+import { migrationStatus } from '../lib/v2/migrate-prompt.js';
+import { reportSwallowed } from '../lib/error-report.js';
 import { awaitDrainOrClose } from '../lib/sse-backpressure.js';
 import { enrichRawIfNeeded } from '../lib/enrich-plan-input.js';
 import { validateLogPath } from '../lib/log-management.js';
@@ -49,77 +50,6 @@ function turnEndNotify(req, res, parsedUrl, isLocal, deps) {
   });
 }
 
-// 注册新的日志文件进行 watch（供新进程复用旧服务时调用）
-function registerLog(req, res, parsedUrl, isLocal, deps) {
-  let body = '';
-  req.on('data', chunk => { body += chunk; if (body.length > deps.MAX_POST_BODY) req.destroy(); });
-  req.on('end', () => {
-    try {
-      const { logFile } = JSON.parse(body);
-      if (logFile && typeof logFile === 'string' && logFile.startsWith(LOG_DIR) && existsSync(logFile)) {
-        watchLogFile(deps.logWatcherOpts(logFile));
-        res.writeHead(200, { 'Content-Type': 'application/json' });
-        res.end(JSON.stringify({ ok: true }));
-      } else {
-        res.writeHead(400, { 'Content-Type': 'application/json' });
-        res.end(JSON.stringify({ error: 'Invalid log file path' }));
-      }
-    } catch {
-      res.writeHead(400, { 'Content-Type': 'application/json' });
-      res.end(JSON.stringify({ error: 'Invalid request body' }));
-    }
-  });
-}
-
-// 用户选择继续/新开日志
-function resumeChoice(req, res, parsedUrl, isLocal, deps) {
-  let body = '';
-  req.on('data', chunk => { body += chunk; if (body.length > deps.MAX_POST_BODY) req.destroy(); });
-  req.on('end', async () => {
-    try {
-      const { choice } = JSON.parse(body);
-      if (choice !== 'continue' && choice !== 'new') {
-        res.writeHead(400, { 'Content-Type': 'application/json' });
-        res.end(JSON.stringify({ error: 'Invalid choice' }));
-        return;
-      }
-      const result = resolveResumeChoice(choice);
-      if (!result) {
-        res.writeHead(409, { 'Content-Type': 'application/json' });
-        res.end(JSON.stringify({ error: 'Already resolved' }));
-        return;
-      }
-      // 重新 watch 最终的日志文件
-      watchLogFile(deps.logWatcherOpts(result.logFile));
-      // 广播 resume_resolved + full_reload
-      const resolvedData = JSON.stringify({ logFile: result.logFile });
-      deps.clients.forEach(client => {
-        try {
-          client.write(`event: resume_resolved\ndata: ${resolvedData}\n\n`);
-        } catch { }
-      });
-      // 流式分段广播 full_reload，避免全量加载 OOM
-      const reloadTotal = await countLogEntries(LOG_FILE);
-      deps.clients.forEach(client => {
-        try { client.write(`event: load_start\ndata: ${JSON.stringify({ total: reloadTotal, incremental: false })}\n\n`); } catch { }
-      });
-      await streamRawEntriesAsync(LOG_FILE, (raw) => {
-        deps.clients.forEach(client => {
-          try { client.write('event: load_chunk\ndata: ['); client.write(raw.replace(/\n/g, '')); client.write(']\n\n'); } catch { }
-        });
-      });
-      deps.clients.forEach(client => {
-        try { client.write(`event: load_end\ndata: {}\n\n`); } catch { }
-      });
-      res.writeHead(200, { 'Content-Type': 'application/json' });
-      res.end(JSON.stringify({ ok: true, logFile: result.logFile }));
-    } catch {
-      res.writeHead(400, { 'Content-Type': 'application/json' });
-      res.end(JSON.stringify({ error: 'Invalid request body' }));
-    }
-  });
-}
-
 // SSE endpoint
 // 构造「有新版」徽标的 SSE 帧（pending = {version, source}）。pending 为空返回 null。
 // 抽成纯函数便于单测帧格式；events() 在新连接上调用它补推，使版本徽标跨刷新持续显示。
@@ -157,16 +87,22 @@ async function events(req, res, parsedUrl, isLocal, deps) {
     console.warn(`[server_config] SSE write failed (turnEndDebounceMs=${deps.turnEndDebounceMs}):`, err && err.message);
   }
 
-  // 如果有待决的 resume 选择，发送 resume_prompt 事件
-  if (_resumeState) {
-    res.write(`event: resume_prompt\ndata: ${JSON.stringify({ recentFileName: _resumeState.recentFileName })}\n\n`);
-  }
-
   // 补推「有新版」徽标：复用启动检查缓存的结果，让刷新/新标签页连上即恢复徽标。
   // 置于 deps.clients.push(res) 之前 → 新客户端仅得一份，不与一次性广播竞态。
   const updFrame = sseUpdateBadgeFrame(deps.pendingMajorUpdate);
   if (updFrame) res.write(updFrame);
 
+  // 1.7.0 迁移引导（P2）：当前项目仍有未转换的 v1 日志 → 连接即推 migrate_prompt。
+  // 是否弹窗由客户端决定（「不再提醒」偏好在客户端；continued=true 时无视 dismissed
+  // 再提醒一次——`-c` 续接的对话前半段在旧格式里，不迁移就看不到）。工作区切换后的
+  // 提示由 workspaces launch 路由对存量连接广播（本帧只覆盖新连接）。
+  try {
+    const mig = migrationStatus(LOG_DIR, _projectName || '');
+    if (mig.pending) {
+      res.write(`event: migrate_prompt\ndata: ${JSON.stringify({ ...mig, continued: isContinuedLaunch() })}\n\n`);
+    }
+  } catch (e) { reportSwallowed('sse.migrate_prompt', e); }
+
   // 增量加载参数：移动端带 since/cc/project 请求增量数据
   const sinceParam = parsedUrl.searchParams.get('since');
   const ccParam = parseInt(parsedUrl.searchParams.get('cc'), 10) || 0;
@@ -202,10 +138,15 @@ async function events(req, res, parsedUrl, isLocal, deps) {
   // ring=3 的容错意义：团队会话末尾常有连续 teammate 伪 mainAgent 条目，单记忆位会被
   // 挤掉真实 mainAgent；子串预过滤的理论误伤（键/值恰为 "teammate" 的真实条目）也由
   // 环内更早候选兜底。
+  // KEEP IN SYNC: server/lib/v2/adapter.js MAINAGENT_RING_DEPTH — on the v2 path
+  // the adapter's mainAgentRing (that depth) wholesale REPLACES this ring, so a
+  // mismatch would silently give v1 and v2 sessions different candidate depths.
   const MAINAGENT_SCAN_RING = 3;
   const mainAgentRawRing = [];
 
-  await streamRawEntriesAsync(LOG_FILE, async (raw) => {
+  // S6b: the cold-load source is the current v2 session dir when the v2
+  // writer is active (adapter stream), else the v1 file.
+  const coldLoadResult = await streamRawEntriesAsync(getLiveLogSource(), async (raw) => {
     // 直接发送原始 JSON 字符串，不做 parse/reconstruct/stringify
     // ExitPlanMode V2 空 input 的条目按需补全 plan / planFilePath，其它原样透传
     if (res.destroyed || !res.writable) return;
@@ -255,6 +196,14 @@ async function events(req, res, parsedUrl, isLocal, deps) {
 
   res.write(`event: load_end\ndata: {}\n\n`);
 
+  // S10a: v2 sources no longer invoke onScan (the two-pass window never
+  // stringifies out-of-window entries) — the adapter returns the newest-main
+  // raws as `mainAgentRing` instead. v1 sources still fill the ring via onScan.
+  if (Array.isArray(coldLoadResult?.mainAgentRing) && coldLoadResult.mainAgentRing.length > 0) {
+    mainAgentRawRing.length = 0;
+    mainAgentRawRing.push(...coldLoadResult.mainAgentRing);
+  }
+
   // Pass 1 入环的候选 newest-first 校验 + parse（≤K 次）。kv_cache 与 context_window
   // 各自取"最新一条能提供该值的真实 mainAgent"—— 与旧版逐条覆盖语义等价（环深度内）。
   for (let ri = mainAgentRawRing.length - 1; ri >= 0 && (!latestKvCache || !latestContextWindow); ri--) {
@@ -328,7 +277,7 @@ async function requests(req, res) {
   res.writeHead(200, { 'Content-Type': 'application/json' });
   res.write('[');
   let first = true;
-  await streamRawEntriesAsync(LOG_FILE, (raw) => {
+  await streamRawEntriesAsync(getLiveLogSource(), (raw) => {
     if (!first) res.write(',');
     res.write(enrichRawIfNeeded(raw));
     first = false;
@@ -337,57 +286,8 @@ async function requests(req, res) {
   res.end();
 }
 
-// 分页历史条目端点：移动端"加载更多"按需拉取
-// 支持可选 ?file= 参数指定目标文件（用于本地日志分页），默认使用活跃会话文件
-async function entriesPage(req, res, parsedUrl) {
-  const before = parsedUrl.searchParams.get('before');
-  const limitVal = Math.min(parseInt(parsedUrl.searchParams.get('limit'), 10) || 100, 500);
-  if (!before || isNaN(new Date(before).getTime())) {
-    res.writeHead(400, { 'Content-Type': 'application/json' });
-    res.end(JSON.stringify({ error: 'missing or invalid "before" parameter' }));
-    return;
-  }
-  const file = parsedUrl.searchParams.get('file');
-  let targetFile = LOG_FILE;
-  if (file) {
-    if (file.includes('..') || (!file.endsWith('.jsonl') && !file.endsWith('.jsonl.zip'))) {
-      res.writeHead(400, { 'Content-Type': 'application/json' });
-      res.end(JSON.stringify({ error: 'Invalid file name' }));
-      return;
-    }
-    try { validateLogPath(LOG_DIR, file); } catch (e) {
-      const status = e.code === 'NOT_FOUND' ? 404 : e.code === 'ACCESS_DENIED' ? 403 : 400;
-      res.writeHead(status, { 'Content-Type': 'application/json' });
-      res.end(JSON.stringify({ error: e.message }));
-      return;
-    }
-    targetFile = join(LOG_DIR, file);
-  }
-  try {
-    const result = await readPagedEntries(targetFile, { before, limit: limitVal });
-    // entries 是原始 JSON 字符串数组，parse 后返回给客户端
-    // ExitPlanMode V2 空 input 的条目用 enrichRawIfNeeded 在 raw 阶段补全
-    const entries = result.entries.map(raw => {
-      try { return JSON.parse(enrichRawIfNeeded(raw)); } catch { return null; }
-    }).filter(Boolean);
-    res.writeHead(200, { 'Content-Type': 'application/json' });
-    res.end(JSON.stringify({
-      entries,
-      hasMore: result.hasMore,
-      oldestTimestamp: result.oldestTimestamp,
-      count: entries.length,
-    }));
-  } catch (err) {
-    res.writeHead(500, { 'Content-Type': 'application/json' });
-    res.end(JSON.stringify({ error: err.message }));
-  }
-}
-
 export const eventsRoutes = [
   { method: 'POST', match: 'exact', path: '/api/turn-end-notify', handler: turnEndNotify },
-  { method: 'POST', match: 'exact', path: '/api/register-log', handler: registerLog },
-  { method: 'POST', match: 'exact', path: '/api/resume-choice', handler: resumeChoice },
   { method: 'GET', match: 'exact', path: '/events', handler: events },
   { method: 'GET', match: 'exact', path: '/api/requests', handler: requests },
-  { method: 'GET', match: 'exact', path: '/api/entries/page', handler: entriesPage },
 ];

package/server/routes/files-fs.js

@@ -8,7 +8,7 @@ import { homedir, tmpdir } from 'node:os';
 import { execFile, spawn } from 'node:child_process';
 import { bumpWorkspacesVersion } from '../lib/file-access-policy.js';
 import { validateImportDir } from '../lib/file-api.js';
-import { LOG_FILE, PROFILE_PATH, _projectName } from '../interceptor.js';
+import { PROFILE_PATH, _projectName, _logDir } from '../interceptor.js';
 import { LOG_DIR, getClaudeConfigDir } from '../../findcc.js';
 
 function upload(req, res, parsedUrl, isLocal, deps) {
@@ -844,7 +844,9 @@ function createDir(req, res, parsedUrl, isLocal, deps) {
 }
 
 function openLogDir(req, res) {
-  const dir = LOG_FILE ? dirname(LOG_FILE) : LOG_DIR;
+  // Project dir works for both formats (legacy v1 files and the v2 sessions/
+  // tree are siblings under it); LOG_DIR is the pre-workspace fallback.
+  const dir = _logDir || LOG_DIR;
   const cmd = process.platform === 'darwin' ? 'open' : process.platform === 'win32' ? 'explorer' : 'xdg-open';
   execFile(cmd, [dir], { windowsHide: true }, () => {});
   res.writeHead(200, { 'Content-Type': 'application/json' });

package/server/routes/im.js

@@ -8,6 +8,11 @@
 //                                    runs with --dangerously-skip-permissions.
 //   POST /api/im/:platform/test    — loopback-only; validate creds (fetch an access token).
 //   POST /api/im/:platform/process — loopback-only; {action:start|stop|restart} the detached worker.
+//                                    'start' requires stored creds (400 `missing …` otherwise) and
+//                                    also persists enabled:true (merged into the stored config):
+//                                    a worker spawned while the config says disabled no-ops in
+//                                    im-bridge-core and would not survive a restart reconcile,
+//                                    so "start" must mean "enable + spawn".
 //   GET  /api/im/:platform/logs    — resolve the worker's latest .jsonl (for the records popup).
 //
 // Architecture: IM adapters no longer run in the main ccv. Each enabled IM runs as an independent
@@ -16,6 +21,7 @@
 // reports its own in-process adapter (deps.im.getBridgeStatus) — that's what the manager probes.
 import { getDescriptor, loadConfig, loadState, saveConfig } from '../lib/im-config.js';
 import { findRecentLog } from '../lib/interceptor-core.js';
+import { listV2Sessions } from '../lib/v2/adapter.js';
 import { readSenders } from '../lib/im-senders.js';
 import { readImAppendSystem, writeImAppendSystem, buildImAppendSystemPreset, MAX_IM_APPEND_SYSTEM_CHARS } from '../lib/im-append-system.js';
 import { imDir } from '../lib/im-lock.js';
@@ -56,6 +62,27 @@ function secretKeys(id) {
   return getDescriptor(id).fields.filter((f) => f.type === 'secret').map((f) => f.key);
 }
 
+/** Required cred/secret field keys that are empty in `cfg` (same gate as the /test route). */
+function missingCreds(id, cfg) {
+  return getDescriptor(id).fields
+    .filter((f) => (f.type === 'cred' || f.type === 'secret') && !cfg[f.key])
+    .map((f) => f.key);
+}
+
+// Audit every path that flips a platform on with an empty sender allowlist (bind-first-conversation
+// under --dangerously-skip-permissions). Shared by config POST and process 'start' so no enabling
+// path can bypass the server-side warning — headless callers never see the frontend toast.
+function warnIfEmptyAllowlist(id, cfg) {
+  const allowField = getDescriptor(id).allowListField;
+  // 过滤空白项后再判空：saveConfig 会 normalize（trim+丢空），若只看原始长度，[" "] 这类全空白
+  // 白名单会被当成"已配置"而漏掉审计告警，但实际保存的是空名单（与 dingtalk 路由保持一致）。
+  const raw = Array.isArray(cfg[allowField]) ? cfg[allowField] : [];
+  const list = raw.filter((s) => typeof s === 'string' && s.trim());
+  if (list.length === 0) {
+    console.warn(`[CC Viewer] IM ${id} enabled with EMPTY allowlist — bind-first-conversation; the first conversation to message can drive this --dangerously-skip-permissions session`);
+  }
+}
+
 function readBody(req, deps, cb) {
   let body = '';
   req.on('data', (chunk) => {
@@ -79,16 +106,22 @@ async function imStatus(req, res, parsedUrl, isLocal, deps) {
   } else {
     // MAIN: the adapter runs in a detached worker, not here. Resolve process+connection via manager.
     processInfo = await deps.im.getProcessStatus(id);
-    connection = { running: processInfo.running, connected: processInfo.connected };
+    connection = {
+      running: processInfo.running,
+      connected: processInfo.connected,
+      connectionState: processInfo.connectionState,
+      lastError: processInfo.lastError ?? null,
+    };
   }
 
   res.writeHead(200, JSON_HEADERS);
   if (!isLocal) {
     // Loopback gate: a token-authorized LAN client sees only what the header chip needs.
+    // connectionState is passed through as-is (no defaulting); lastError stays loopback-only.
     res.end(JSON.stringify({
       enabled: state.enabled,
       hasSecret: state.hasSecret,
-      connection: { running: connection.running, connected: connection.connected },
+      connection: { running: connection.running, connected: connection.connected, connectionState: connection.connectionState },
     }));
     return;
   }
@@ -124,16 +157,7 @@ function imConfigPost(req, res, parsedUrl, isLocal, deps) {
     // bind-first-conversation（im-bridge-core.js）——首个向机器人发消息的会话被绑定，该会话内任何人
     // 都可无审批驱动本地会话。这里打一条服务端审计（curl/headless 启用走不到前端 toast），
     // PreToolUse permissions.deny 硬拦截（perm-bridge/im-deny，独立于白名单）仍然生效。
-    if (incoming.enabled) {
-      const allowField = getDescriptor(id).allowListField;
-      // 过滤空白项后再判空：saveConfig 会 normalize（trim+丢空），若只看原始长度，[" "] 这类全空白
-      // 白名单会被当成"已配置"而漏掉审计告警，但实际保存的是空名单（与 dingtalk 路由保持一致）。
-      const raw = Array.isArray(incoming[allowField]) ? incoming[allowField] : [];
-      const list = raw.filter((s) => typeof s === 'string' && s.trim());
-      if (list.length === 0) {
-        console.warn(`[CC Viewer] IM ${id} enabled with EMPTY allowlist — bind-first-conversation; the first conversation to message can drive this --dangerously-skip-permissions session`);
-      }
-    }
+    if (incoming.enabled) warnIfEmptyAllowlist(id, incoming);
     const saved = saveConfig(id, incoming);
     // applyProcess（默认 true，保持旧调用方语义）：前端 onBlur 自动保存传 false → 仅存盘、不驱动进程，
     // 否则每次输入框失焦都会重启 worker。显式「启动/停止」按钮则不传（=true），沿用下述驱动逻辑。
@@ -151,7 +175,7 @@ function imConfigPost(req, res, parsedUrl, isLocal, deps) {
     }
     res.writeHead(200, JSON_HEADERS);
     // 乐观返回：worker 刚 spawn 尚未就绪，避免回包瞬间显示"已停止"；chip 轮询会很快收敛到真实态。
-    res.end(JSON.stringify({ ...loadState(id), connection: { running: !!saved.enabled, connected: false } }));
+    res.end(JSON.stringify({ ...loadState(id), connection: { running: !!saved.enabled, connected: false, connectionState: 'disconnected' } }));
   });
 }
 
@@ -165,9 +189,7 @@ function imTestPost(req, res, parsedUrl, isLocal, deps) {
     const stored = loadConfig(id);
     const cfg = {};
     for (const f of getDescriptor(id).fields) cfg[f.key] = incoming[f.key] || stored[f.key];
-    const missing = getDescriptor(id).fields
-      .filter((f) => (f.type === 'cred' || f.type === 'secret') && !cfg[f.key])
-      .map((f) => f.key);
+    const missing = missingCreds(id, cfg);
     if (missing.length) {
       res.writeHead(200, JSON_HEADERS);
       res.end(JSON.stringify({ ok: false, detail: `missing ${missing.join('/')}` }));
@@ -195,8 +217,25 @@ function imProcessPost(req, res, parsedUrl, isLocal, deps) {
     try {
       if (action === 'stop') await deps.im.stopProcess(id);
       else if (action === 'restart') await deps.im.restartProcess(id);
-      else if (action === 'start') await deps.im.startProcess(id);
-      else {
+      else if (action === 'start') {
+        const cfg = loadConfig(id);
+        // Credential gate (same as /test): without creds the spawned worker's bridge no-ops
+        // forever, and persisting enabled:true would make reconcile respawn that zombie on
+        // every server restart. Reject up front — nothing is persisted, nothing is spawned.
+        const missing = missingCreds(id, cfg);
+        if (missing.length) {
+          res.writeHead(400, JSON_HEADERS);
+          res.end(JSON.stringify({ ok: false, error: `missing ${missing.join('/')}`, detail: `missing ${missing.join('/')}` }));
+          return;
+        }
+        // Persist enabled:true first (read-merge-write keeps creds/allowlist intact): a worker
+        // spawned with enabled:false no-ops its bridge, and reconcile would not respawn it.
+        if (!cfg.enabled) {
+          warnIfEmptyAllowlist(id, cfg);
+          saveConfig(id, { ...cfg, enabled: true });
+        }
+        await deps.im.startProcess(id);
+      } else {
         res.writeHead(400, JSON_HEADERS);
         res.end(JSON.stringify({ error: 'action must be start|stop|restart' }));
         return;
@@ -218,8 +257,16 @@ function imLogs(req, res, parsedUrl, isLocal, deps) {
   const project = `IM_${id}`;
   let latest = null;
   try {
-    const abs = findRecentLog(join(LOG_DIR, project), project); // 已排除 *_temp.jsonl
-    if (abs) latest = `${project}/${basename(abs)}`; // 相对 LOG_DIR，直接喂给 /api/local-log?file=
+    // wire-v2: prefer the newest v2 session (by meta.startTs, journal mtime as
+    // tie-break); fall back to legacy v1 files until they are migrated.
+    const sessions = listV2Sessions(join(LOG_DIR, project)).filter((s) => !s.leader);
+    if (sessions.length > 0) {
+      sessions.sort((a, b) => (a.startTs < b.startTs ? 1 : a.startTs > b.startTs ? -1 : 0));
+      latest = `v2:${project}/${sessions[0].sid}`; // 直接喂给 /api/local-log?file=
+    } else {
+      const abs = findRecentLog(join(LOG_DIR, project), project); // 已排除 *_temp.jsonl
+      if (abs) latest = `${project}/${basename(abs)}`; // 相对 LOG_DIR
+    }
   } catch { /* 无目录/无日志 → latest=null */ }
   res.writeHead(200, JSON_HEADERS);
   res.end(JSON.stringify({ project, latest }));