cx-viewer 1.0.3 → 1.0.4

package/interceptor.js

@@ -10,9 +10,11 @@ import { appendFileSync, mkdirSync, readFileSync, statSync, renameSync, unlinkSy
 import { homedir } from 'node:os';
 import { fileURLToPath } from 'node:url';
 import { dirname, join, basename } from 'node:path';
+import { createHash } from 'node:crypto';
 import { LOG_DIR } from './findcx.js';
-import { assembleStreamMessage, cleanupTempFiles, findRecentLog, isOpenAiApiPath, isMainAgentRequest, rotateLogFile } from './lib/interceptor-core.js';
+import { assembleOpenAiResponseMessage, assembleStreamMessage, cleanupTempFiles, classifyAgentRequest, findRecentLog, isOpenAiApiPath, parseRequestBodyForLog, rotateLogFile } from './lib/interceptor-core.js';
 import { MAX_LOG_SIZE as _MAX_LOG_SIZE, CHECKPOINT_INTERVAL as _CHECKPOINT_INTERVAL } from './lib/constants.js';
+import { getMainAgentSessionKey } from './src/utils/clearCheckpoint.js';
 
 
 
@@ -120,17 +122,51 @@ function resolveResumeChoice(choice) {
 }
 
 // Delta storage: 增量存储开关和状态（默认开启，设置 CXV_DISABLE_DELTA=1 关闭）
-// 注意：delta 计算依赖 mainAgent 请求串行（Codex CLI 保证），不做并发互斥
+// 注意：delta 计算按 Codex thread/upstream lane 分桶。ChatGPT OAuth 与 API-key
+// Responses traffic 可能写进同一个日志文件，但不能共享上一条 mainAgent 的 input 长度。
 const _deltaStorageEnabled = process.env.CXV_DISABLE_DELTA !== '1';
-let _lastMessagesCount = 0;     // 上一次 mainAgent 写入的完整 messages 数量
-let _mainAgentDeltaCount = 0;   // mainAgent 请求计数器（用于触发定期 checkpoint）
+const _deltaStateByConversation = new Map(); // conversationId → { lastInputCount, deltaCount }
 const CHECKPOINT_INTERVAL = _CHECKPOINT_INTERVAL;
 
+function _getDeltaConversationId(entry) {
+  const key = getMainAgentSessionKey(entry);
+  return key ? `mainAgent:${key}` : 'mainAgent';
+}
+
+function _getDeltaState(conversationId) {
+  let state = _deltaStateByConversation.get(conversationId);
+  if (!state) {
+    state = { lastInputCount: 0, lastInputFingerprints: [], deltaCount: 0 };
+    _deltaStateByConversation.set(conversationId, state);
+  }
+  return state;
+}
+
 /** Delta storage: completed 写入成功后更新状态 */
-function _commitDeltaState(originalLength) {
+function _commitDeltaState(conversationId, originalLength, inputFingerprints = []) {
   if (_deltaStorageEnabled && originalLength > 0) {
-    _lastMessagesCount = originalLength;
+    const state = _getDeltaState(conversationId || 'mainAgent');
+    state.lastInputCount = originalLength;
+    state.lastInputFingerprints = inputFingerprints;
+  }
+}
+
+function _fingerprintInputItems(input) {
+  return input.map((item) => {
+    try {
+      return createHash('sha256').update(JSON.stringify(item)).digest('base64url');
+    } catch {
+      return '';
+    }
+  });
+}
+
+function _isFingerprintPrefix(previous, current) {
+  if (!Array.isArray(previous) || previous.length > current.length) return false;
+  for (let i = 0; i < previous.length; i++) {
+    if (!previous[i] || previous[i] !== current[i]) return false;
   }
+  return true;
 }
 
 // Teammate 子进程检测：--parent-session-id（旧模式）或 --agent-name（原生 team 模式）
@@ -235,35 +271,72 @@ export function resetWorkspace() {
 
 const MAX_LOG_SIZE = _MAX_LOG_SIZE;
 
-function checkAndRotateLogFile() {
+function generateRotationLogFilePath() {
+  const now = new Date();
+  const ts = now.getFullYear().toString()
+    + String(now.getMonth() + 1).padStart(2, '0')
+    + String(now.getDate()).padStart(2, '0')
+    + '_'
+    + String(now.getHours()).padStart(2, '0')
+    + String(now.getMinutes()).padStart(2, '0')
+    + String(now.getSeconds()).padStart(2, '0');
+  const dir = LOG_FILE ? dirname(LOG_FILE) : _logDir;
+  const projectName = _projectName || basename(process.cwd()).replace(/[^a-zA-Z0-9_\-\.]/g, '_');
+  let candidate = join(dir, `${projectName}_${ts}.jsonl`);
+  let part = 1;
+  while (candidate === LOG_FILE || existsSync(candidate)) {
+    candidate = join(dir, `${projectName}_${ts}_part${String(part++).padStart(2, '0')}.jsonl`);
+  }
+  return candidate;
+}
+
+export function checkAndRotateLogFile(nextWriteBytes = 0) {
   // Teammate 不做日志轮转，由 leader 负责
-  if (_isTeammate) return;
+  if (_isTeammate || !LOG_FILE) return false;
   try {
-    if (!existsSync(LOG_FILE) || statSync(LOG_FILE).size < MAX_LOG_SIZE) return;
-  } catch { return; }
-  const { filePath } = generateNewLogFilePath();
-  const result = rotateLogFile(LOG_FILE, filePath, MAX_LOG_SIZE);
+    if (!existsSync(LOG_FILE)) return false;
+  } catch { return false; }
+  const filePath = generateRotationLogFilePath();
+  const result = rotateLogFile(LOG_FILE, filePath, MAX_LOG_SIZE, nextWriteBytes);
   if (result.rotated) {
     LOG_FILE = result.newFile;
     // 重置 delta 状态，强制下一条 mainAgent 请求写完整 checkpoint
     if (_deltaStorageEnabled) {
-      _lastMessagesCount = 0;
-      _mainAgentDeltaCount = 0;
+      _deltaStateByConversation.clear();
     }
+    return true;
   }
+  return false;
 }
 
-// 从环境变量 OPENAI_BASE_URL 提取域名用于请求匹配
-function getBaseUrlHost() {
+/** Serialize and append one complete JSONL record through the shared rotator. */
+export function appendLogEntry(entry) {
+  if (!entry || !LOG_FILE) return { written: false, logFile: LOG_FILE };
   try {
+    const line = JSON.stringify(entry) + '\n---\n';
+    const bytes = Buffer.byteLength(line);
+    checkAndRotateLogFile(bytes);
+    appendFileSync(LOG_FILE, line);
+    return { written: true, logFile: LOG_FILE, bytes };
+  } catch (err) {
+    if (process.env.CXV_DEBUG) console.warn('[CX-Viewer] Log write error:', err.message);
+    return { written: false, logFile: LOG_FILE, error: err };
+  }
+}
+
+// 匹配 OpenAI API 主机名（默认 api.openai.com 及 OPENAI_BASE_URL 自定义主机）
+function isOpenAiHost(urlStr) {
+  try {
+    const hostname = new URL(urlStr).hostname;
+    if (hostname === 'api.openai.com') return true;
     const baseUrl = process.env.OPENAI_BASE_URL;
     if (baseUrl) {
-      return new URL(baseUrl).hostname;
+      const customHost = new URL(baseUrl).hostname;
+      if (hostname === customHost) return true;
     }
   } catch { }
-  return null;
+  return false;
 }
-const CUSTOM_API_HOST = getBaseUrlHost();
 
 // 保存 viewer 模块引用
 let viewerModule = null;
@@ -334,22 +407,12 @@ export function setupInterceptor() {
       const isProxyTrace = headers['x-cx-viewer-trace'] === 'true' || headers['x-cx-viewer-trace'] === true;
 
       // 如果是 proxy 转发的，或者符合 URL 规则
-      if (isProxyTrace || urlStr.includes('codex') || (CUSTOM_API_HOST && urlStr.includes(CUSTOM_API_HOST)) || isOpenAiApiPath(urlStr)) {
+      if (isProxyTrace || isOpenAiHost(urlStr) || isOpenAiApiPath(urlStr)) {
         // 如果是 proxy 转发的，需要清理掉标记 header 避免发给上游
         if (isProxyTrace && options?.headers) {
           delete options.headers['x-cx-viewer-trace'];
         }
 
-        const timestamp = new Date().toISOString();
-        let body = null;
-        if (options?.body) {
-          try {
-            body = JSON.parse(options.body);
-          } catch {
-            body = String(options.body).slice(0, 500);
-          }
-        }
-
         // 转换 headers 为普通对象（支持 Request 对象、options.headers、Headers 实例）
         let headers = {};
         const rawHeaders = options?.headers || (url instanceof Request ? url.headers : null);
@@ -361,6 +424,9 @@ export function setupInterceptor() {
           }
         }
 
+        const timestamp = new Date().toISOString();
+        const body = options?.body ? parseRequestBodyForLog(options.body, headers) : null;
+
         // 缓存 API Key / Authorization 供翻译接口使用（缓存原始值）
         if (headers['x-api-key'] && !_cachedApiKey) {
           _cachedApiKey = headers['x-api-key'];
@@ -403,6 +469,8 @@ export function setupInterceptor() {
           }
         }
 
+        const agentClass = classifyAgentRequest(urlStr, body);
+
         requestEntry = {
           timestamp,
           project: (() => { try { return basename(process.cwd()); } catch { return 'unknown'; } })(),
@@ -415,7 +483,9 @@ export function setupInterceptor() {
           isStream: body?.stream === true,
           isHeartbeat: /\/api\/eval\/sdk-/.test(urlStr),
           isCountTokens: /\/messages\/count_tokens/.test(urlStr),
-          mainAgent: isMainAgentRequest(body),
+          mainAgent: agentClass.mainAgent,
+          subAgent: agentClass.subAgent,
+          ...(agentClass.subAgentName ? { subAgentName: agentClass.subAgentName } : {}),
           ...(_isTeammate && { teammate: _teammateName, teamName: _teamName })
         };
       }
@@ -423,9 +493,9 @@ export function setupInterceptor() {
       if (process.env.CXV_DEBUG) console.warn('[CX-Viewer] Request interception error:', err.message);
     }
 
-    // 用户新指令边界：检查日志文件大小，超过 250MB 则切换新文件
+    // MainAgent 元数据缓存；日志轮转由每次 appendLogEntry 统一处理，
+    // app-server / SDK / OTel 等非 HTTP 写入也走同一入口。
     if (requestEntry?.mainAgent) {
-      checkAndRotateLogFile();
       // 仅 mainAgent 请求时缓存模型名，避免 SubAgent 覆盖
       if (requestEntry.body?.model && typeof requestEntry.body.model === 'string') {
         _cachedModel = requestEntry.body.model;
@@ -436,33 +506,38 @@ export function setupInterceptor() {
       }
     }
 
-    // Delta storage：仅 mainAgent 且开关启用时，将 body.messages 转为增量格式
-    let _deltaOriginalMessagesLength = 0; // 缓存本次请求的原始 messages 长度，用于 completed 后更新状态
-    if (_deltaStorageEnabled && requestEntry?.mainAgent && Array.isArray(requestEntry.body?.messages)) {
-      const messages = requestEntry.body.messages;
-      _deltaOriginalMessagesLength = messages.length;
-      _mainAgentDeltaCount++;
+    // Delta storage：仅 mainAgent 且开关启用时，将 body.input 转为增量格式
+    let _deltaOriginalMessagesLength = 0; // 缓存本次请求的原始 input 长度，用于 completed 后更新状态
+    let _deltaOriginalInputFingerprints = [];
+    let _deltaConversationId = 'mainAgent';
+    if (_deltaStorageEnabled && requestEntry?.mainAgent && Array.isArray(requestEntry.body?.input)) {
+      const input = requestEntry.body.input;
+      _deltaConversationId = _getDeltaConversationId(requestEntry);
+      const deltaState = _getDeltaState(_deltaConversationId);
+      _deltaOriginalMessagesLength = input.length;
+      _deltaOriginalInputFingerprints = _fingerprintInputItems(input);
+      deltaState.deltaCount++;
 
       // 判断是否需要写 checkpoint
       const needsCheckpoint =
-        _lastMessagesCount === 0 ||                           // 进程重启 / 首次请求
-        messages.length < _lastMessagesCount ||               // messages 缩短（/clear、context 压缩）
-        (_mainAgentDeltaCount % CHECKPOINT_INTERVAL === 0);   // 定期 checkpoint
+        deltaState.lastInputCount === 0 ||                              // 进程重启 / 首次请求
+        !_isFingerprintPrefix(deltaState.lastInputFingerprints, _deltaOriginalInputFingerprints) || // compact / rewrite / lane mismatch
+        (deltaState.deltaCount % CHECKPOINT_INTERVAL === 0);            // 定期 checkpoint
 
       if (needsCheckpoint) {
-        // checkpoint：保持完整 messages，标记 _isCheckpoint
+        // checkpoint：保持完整 input，标记 _isCheckpoint
         requestEntry._deltaFormat = 1;
-        requestEntry._totalMessageCount = messages.length;
-        requestEntry._conversationId = 'mainAgent';
+        requestEntry._totalMessageCount = input.length;
+        requestEntry._conversationId = _deltaConversationId;
         requestEntry._isCheckpoint = true;
       } else {
-        // delta：只保留新增的 messages
-        const delta = messages.slice(_lastMessagesCount);
+        // delta：只保留新增的 input items
+        const delta = input.slice(deltaState.lastInputCount);
         requestEntry._deltaFormat = 1;
-        requestEntry._totalMessageCount = messages.length;
-        requestEntry._conversationId = 'mainAgent';
+        requestEntry._totalMessageCount = input.length;
+        requestEntry._conversationId = _deltaConversationId;
         requestEntry._isCheckpoint = false;
-        requestEntry.body.messages = delta;
+        requestEntry.body.input = delta;
       }
     }
 
@@ -475,11 +550,7 @@ export function setupInterceptor() {
 
     // 在发起请求前先写入一条未完成的条目，让前端可以检测在途请求
     if (requestEntry) {
-      try {
-        appendFileSync(LOG_FILE, JSON.stringify(requestEntry) + '\n---\n');
-      } catch (err) {
-        if (process.env.CXV_DEBUG) console.warn('[CX-Viewer] Log write error:', err.message);
-      }
+      appendLogEntry(requestEntry);
     }
 
     // 流式请求状态追踪（仅对 Codex API 流式请求）
@@ -498,8 +569,8 @@ export function setupInterceptor() {
     if (_activeProfile && _activeProfile.baseURL && requestEntry) {
       try {
         // 1. URL 重写: 用 baseURL 替换 origin，智能处理路径重叠
-        //    baseURL="https://proxy.com/v1" + pathname="/v1/messages" → "https://proxy.com/v1/messages"（去重 /v1）
-        //    baseURL="https://proxy.com"    + pathname="/v1/messages" → "https://proxy.com/v1/messages"（无重叠）
+        //    baseURL="https://proxy.com/v1" + pathname="/v1/responses" → "https://proxy.com/v1/responses"（去重 /v1）
+        //    baseURL="https://proxy.com"    + pathname="/v1/responses" → "https://proxy.com/v1/responses"（无重叠）
         if (typeof _fetchUrl === 'string') {
           const _origUrl = new URL(_fetchUrl);
           const _baseUrl = new URL(_activeProfile.baseURL);
@@ -595,8 +666,12 @@ export function setupInterceptor() {
                         })
                         .filter(Boolean);
 
-                      // 组装完整的 message 对象（GLM 使用标准格式，但 data: 后无空格）
-                      const assembledMessage = assembleStreamMessage(events);
+                      const hasOpenAiResponsesEvents = events.some(event => event && typeof event === 'object' && typeof event.type === 'string' && event.type.startsWith('response.'));
+
+                      // 组装完整的 message 对象（Codex uses OpenAI Responses events; legacy adapters may still emit Claude-style events）
+                      const assembledMessage = hasOpenAiResponsesEvents
+                        ? assembleOpenAiResponseMessage(events)
+                        : assembleStreamMessage(events);
 
                       // 直接使用组装后的 message 对象作为 response.body
                       // 如果组装失败（例如非标准 SSE），则使用原始流内容
@@ -606,8 +681,8 @@ export function setupInterceptor() {
                       // 移除在途请求标记，保持原始报文
                       delete requestEntry.inProgress;
                       delete requestEntry.requestId;
-                      appendFileSync(LOG_FILE, JSON.stringify(requestEntry) + '\n---\n');
-                      _commitDeltaState(_deltaOriginalMessagesLength);
+                      appendLogEntry(requestEntry);
+                      _commitDeltaState(_deltaConversationId, _deltaOriginalMessagesLength, _deltaOriginalInputFingerprints);
                       // Release memory: clear large objects after disk write
                       streamedContent = '';
                       requestEntry.response = null;
@@ -616,8 +691,8 @@ export function setupInterceptor() {
                       requestEntry.response.body = streamedContent.slice(0, 1000);
                       delete requestEntry.inProgress;
                       delete requestEntry.requestId;
-                      appendFileSync(LOG_FILE, JSON.stringify(requestEntry) + '\n---\n');
-                      _commitDeltaState(_deltaOriginalMessagesLength);
+                      appendLogEntry(requestEntry);
+                      _commitDeltaState(_deltaConversationId, _deltaOriginalMessagesLength, _deltaOriginalInputFingerprints);
                       streamedContent = '';
                       requestEntry.response = null;
                       resetStreamingState();
@@ -653,8 +728,8 @@ export function setupInterceptor() {
           };
           delete requestEntry.inProgress;
           delete requestEntry.requestId;
-          appendFileSync(LOG_FILE, JSON.stringify(requestEntry) + '\n---\n');
-          _commitDeltaState(_deltaOriginalMessagesLength);
+          appendLogEntry(requestEntry);
+          _commitDeltaState(_deltaConversationId, _deltaOriginalMessagesLength, _deltaOriginalInputFingerprints);
           resetStreamingState();
         }
       } else {
@@ -681,13 +756,13 @@ export function setupInterceptor() {
           delete requestEntry.inProgress;
           delete requestEntry.requestId;
 
-          appendFileSync(LOG_FILE, JSON.stringify(requestEntry) + '\n---\n');
-          _commitDeltaState(_deltaOriginalMessagesLength);
+          appendLogEntry(requestEntry);
+          _commitDeltaState(_deltaConversationId, _deltaOriginalMessagesLength, _deltaOriginalInputFingerprints);
         } catch (err) {
           delete requestEntry.inProgress;
           delete requestEntry.requestId;
-          appendFileSync(LOG_FILE, JSON.stringify(requestEntry) + '\n---\n');
-          _commitDeltaState(_deltaOriginalMessagesLength);
+          appendLogEntry(requestEntry);
+          _commitDeltaState(_deltaConversationId, _deltaOriginalMessagesLength, _deltaOriginalInputFingerprints);
         }
       }
     }
@@ -695,4 +770,3 @@ export function setupInterceptor() {
     return response;
   };
 }
-

package/jsconfig.json

@@ -0,0 +1,25 @@
+{
+  "compilerOptions": {
+    "module": "ESNext",
+    "moduleResolution": "Bundler",
+    "target": "ES2022",
+    "jsx": "preserve",
+    "allowJs": true,
+    "checkJs": false,
+    "resolveJsonModule": true,
+    "strictNullChecks": false
+  },
+  "include": [
+    "src/**/*",
+    "server/**/*",
+    "test/**/*",
+    "electron/**/*",
+    "scripts/**/*",
+    "cli.js",
+    "findcx.js",
+    "server.js",
+    "interceptor.js",
+    "vite.config.js"
+  ],
+  "exclude": ["node_modules", "build", "dist"]
+}

package/lib/approval-reviewer.js

@@ -0,0 +1,23 @@
+export const APPROVALS_REVIEWER_USER = 'user';
+export const APPROVALS_REVIEWER_AUTO = 'auto_review';
+
+export const APPROVALS_REVIEWER_OPTIONS = [
+  APPROVALS_REVIEWER_USER,
+  APPROVALS_REVIEWER_AUTO,
+];
+
+export function normalizeApprovalsReviewer(value) {
+  // Codex still parses guardian_subagent for compatibility, but it is not the
+  // same public contract as auto_review. Fail closed when reading that legacy
+  // value instead of silently broadening it to a different reviewer.
+  if (value === 'guardian_subagent') return APPROVALS_REVIEWER_USER;
+  return APPROVALS_REVIEWER_OPTIONS.includes(value) ? value : APPROVALS_REVIEWER_USER;
+}
+
+export function isSupportedApprovalsReviewer(value) {
+  return APPROVALS_REVIEWER_OPTIONS.includes(value) || value === 'guardian_subagent';
+}
+
+export function shouldDeferPermissionHookToCodex(value) {
+  return normalizeApprovalsReviewer(value) === APPROVALS_REVIEWER_AUTO;
+}