cx-viewer 1.0.3 → 1.0.4

package/lib/ask-bridge.js

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 /**
- * ask-bridge.js — PreToolUse hook bridge for AskUserQuestion.
+ * ask-bridge.js — PreToolUse hook bridge for request_user_input.
  *
- * Called by Codex when AskUserQuestion tool is about to execute.
+ * Called by Codex when request_user_input is about to execute.
  * Reads hook payload from stdin, forwards questions to cx-viewer server
  * via long-poll HTTP, waits for user answers, then outputs updatedInput
  * with answers to bypass the terminal UI.
@@ -10,11 +10,11 @@
  * Exit 0 = success (stdout contains hookSpecificOutput with updatedInput)
  * Exit 1 = fallback (Codex proceeds with normal terminal UI)
  *
- * Hook config in ~/.codex/settings.json:
+ * Hook config in ~/.codex/hooks.json:
  * {
  *   "hooks": {
  *     "PreToolUse": [{
- *       "matcher": "AskUserQuestion",
+ *       "matcher": "request_user_input",
  *       "hooks": [{ "type": "command", "command": "node /path/to/ask-bridge.js" }]
  *     }]
  *   }
@@ -27,7 +27,7 @@ import http from 'node:http';
 const port = process.env.CXVIEWER_PORT;
 if (!port) {
   // cx-viewer not running — fall back to terminal UI silently (exit 0)
-  // exit(1) causes Codex to log "hook error" on every AskUserQuestion call
+  // exit(1) causes Codex to log "hook error" on every request_user_input call
   process.stdout.write(JSON.stringify({ continue: true, suppressOutput: true }) + '\n');
   process.exit(0);
 }

package/lib/cli-args.js

@@ -1,6 +1,7 @@
 export const CODEX_BYPASS_FLAG = '--dangerously-bypass-approvals-and-sandbox';
 
 const LEGACY_BYPASS_FLAGS = new Set([
+  '-d',
   '--d',
   '--dangerously-skip-permissions',
 ]);

package/lib/codex-config.js

@@ -10,16 +10,133 @@ import { homedir } from 'node:os';
 
 const BACKUP_SUFFIX = '.cxv-backup';
 
+export function getCodexConfigDir(env = process.env) {
+  return env.CODEX_HOME || env.CODEX_CONFIG_DIR || join(homedir(), '.codex');
+}
+
+export function getCodexConfigPath(env = process.env) {
+  return join(getCodexConfigDir(env), 'config.toml');
+}
+
+function parseTomlScalar(raw) {
+  const value = String(raw || '').trim();
+  if (!value) return '';
+  if ((value.startsWith('"') && value.endsWith('"')) || (value.startsWith("'") && value.endsWith("'"))) {
+    try {
+      return value[0] === '"' ? JSON.parse(value) : value.slice(1, -1);
+    } catch {
+      return value.slice(1, -1);
+    }
+  }
+  if (value === 'true') return true;
+  if (value === 'false') return false;
+  if (/^-?\d+$/.test(value)) return Number(value);
+  if (/^-?\d+\.\d+$/.test(value)) return Number(value);
+  return value;
+}
+
+function tomlScalar(value) {
+  if (typeof value === 'boolean') return value ? 'true' : 'false';
+  if (typeof value === 'number' && Number.isFinite(value)) return String(value);
+  return JSON.stringify(String(value));
+}
+
+function stripTomlComment(line) {
+  let quote = null;
+  let escaped = false;
+  for (let i = 0; i < line.length; i++) {
+    const ch = line[i];
+    if (quote) {
+      if (escaped) escaped = false;
+      else if (ch === '\\') escaped = true;
+      else if (ch === quote) quote = null;
+      continue;
+    }
+    if (ch === '"' || ch === "'") {
+      quote = ch;
+      continue;
+    }
+    if (ch === '#') return line.slice(0, i);
+  }
+  return line;
+}
+
+export function parseCodexConfigToml(content) {
+  const values = {};
+  const lines = String(content || '').split(/\r?\n/);
+  for (const line of lines) {
+    if (/^\s*\[/.test(line)) break;
+    const match = stripTomlComment(line).match(/^\s*([A-Za-z0-9_.-]+)\s*=\s*(.*?)\s*$/);
+    if (!match) continue;
+    values[match[1]] = parseTomlScalar(match[2]);
+  }
+  return values;
+}
+
+export function readCodexGlobalConfig(env = process.env) {
+  const configDir = getCodexConfigDir(env);
+  const configPath = getCodexConfigPath(env);
+  let values = {};
+  try {
+    if (existsSync(configPath)) values = parseCodexConfigToml(readFileSync(configPath, 'utf-8'));
+  } catch { }
+  return { ...values, configDir, configPath };
+}
+
+function updateTopLevelTomlValues(content, patch) {
+  const lines = String(content || '').split(/\r?\n/);
+  const firstSection = lines.findIndex(line => /^\s*\[/.test(line));
+  const topEnd = firstSection >= 0 ? firstSection : lines.length;
+  const pending = new Map(Object.entries(patch));
+
+  for (let i = 0; i < topEnd; i++) {
+    const match = lines[i].match(/^(\s*)([A-Za-z0-9_.-]+)(\s*=\s*)(.*)$/);
+    if (!match || !pending.has(match[2])) continue;
+    lines[i] = `${match[1]}${match[2]}${match[3]}${tomlScalar(pending.get(match[2]))}`;
+    pending.delete(match[2]);
+  }
+
+  if (pending.size > 0) {
+    const additions = Array.from(pending, ([key, value]) => `${key} = ${tomlScalar(value)}`);
+    if (firstSection >= 0) {
+      const insertAt = firstSection > 0 && lines[firstSection - 1].trim() === '' ? firstSection - 1 : firstSection;
+      lines.splice(insertAt, 0, ...additions, '');
+    } else {
+      while (lines.length > 0 && lines[lines.length - 1].trim() === '') lines.pop();
+      lines.push(...additions);
+    }
+  }
+
+  return lines.join('\n').replace(/\n*$/, '\n');
+}
+
+export function updateCodexGlobalConfig(incoming = {}, env = process.env) {
+  const patch = {};
+  if (typeof incoming.model === 'string') patch.model = incoming.model;
+  if (typeof incoming.showThinkingSummaries === 'boolean') patch.show_raw_agent_reasoning = incoming.showThinkingSummaries;
+  if (typeof incoming.show_raw_agent_reasoning === 'boolean') patch.show_raw_agent_reasoning = incoming.show_raw_agent_reasoning;
+
+  const configDir = getCodexConfigDir(env);
+  const configPath = getCodexConfigPath(env);
+  if (Object.keys(patch).length > 0) {
+    let content = '';
+    try { if (existsSync(configPath)) content = readFileSync(configPath, 'utf-8'); } catch { }
+    mkdirSync(configDir, { recursive: true });
+    writeFileSync(configPath, updateTopLevelTomlValues(content, patch));
+  }
+  return readCodexGlobalConfig(env);
+}
+
 /**
  * Older CX-Viewer versions could leave a loopback proxy URL in Codex's global
- * config.toml. Treat that as stale and fall back to settings.json / env instead.
- * Legit local overrides should be configured in settings.json or OPENAI_BASE_URL.
+ * config.toml. Treat that as stale and fall back to env/default routing instead.
+ * Legit local overrides should be configured in config.toml or OPENAI_BASE_URL.
  */
 export function isStaleLocalCodexBaseUrl(url) {
   if (!url || typeof url !== 'string') return false;
   try {
     const parsed = new URL(url);
-    const host = parsed.hostname;
+    const host = parsed.hostname.replace(/^\[|\]$/g, '');
     const isLoopback = host === '127.0.0.1'
       || host === 'localhost'
       || host === '::1'
@@ -32,31 +149,53 @@ export function isStaleLocalCodexBaseUrl(url) {
 }
 
 /**
- * Read a simple key = "value" from a TOML file
+ * Return true when a base URL points at the local loopback interface. Unlike
+ * isStaleLocalCodexBaseUrl (which only flags loopback + empty path), this flags
+ * ANY loopback host regardless of path — used to make sure a best-effort read of
+ * the user's "real" upstream never picks up a cx-viewer-injected proxy URL.
  */
-function readTomlValue(filePath, key) {
+export function isLoopbackBaseUrl(url) {
+  if (!url || typeof url !== 'string') return false;
   try {
-    if (!existsSync(filePath)) return null;
-    const content = readFileSync(filePath, 'utf-8');
-    const match = content.match(new RegExp(`^${key}\\s*=\\s*"([^"]*)"`, 'm'));
-    return match ? match[1] : null;
+    const host = new URL(url).hostname.replace(/^\[|\]$/g, '');
+    return host === '127.0.0.1'
+      || host === 'localhost'
+      || host === '::1'
+      || host === '::ffff:127.0.0.1';
   } catch {
-    return null;
+    return false;
+  }
+}
+
+/**
+ * Best-effort read of the user's genuine openai_base_url from user/system
+ * config.toml, IGNORING any loopback value (which would be a cx-viewer proxy
+ * redirect, not a real upstream). Returns null when only a loopback / no value
+ * is present. Strips a CX-Viewer managed block before parsing so a leftover
+ * injected value is never mistaken for the real upstream.
+ */
+export function readOriginalOpenAiBaseUrl(env = process.env) {
+  for (const p of [getCodexConfigPath(env), '/etc/codex/config.toml']) {
+    try {
+      if (!existsSync(p)) continue;
+      const raw = readFileSync(p, 'utf-8');
+      const cleaned = raw.replace(/# >>> CX-Viewer [^\n]*>>>[\s\S]*?# <<< CX-Viewer [^\n]*<<<\n?/g, '');
+      const m = cleaned.match(/^openai_base_url\s*=\s*"([^"]*)"/m);
+      const val = m ? m[1] : null;
+      if (val && !isLoopbackBaseUrl(val)) return val;
+    } catch {
+      // ignore and try next path
+    }
   }
+  return null;
 }
 
 /**
  * Get the original Codex base URL from user-level or system-level config.toml
  * (Skips project-level to avoid reading our own proxy URL)
  */
-export function getOriginalCodexBaseUrl() {
-  // User config
-  const userUrl = readTomlValue(join(homedir(), '.codex', 'config.toml'), 'openai_base_url');
-  if (userUrl && !isStaleLocalCodexBaseUrl(userUrl)) return userUrl;
-
-  // System config
-  const systemUrl = readTomlValue('/etc/codex/config.toml', 'openai_base_url');
-  return isStaleLocalCodexBaseUrl(systemUrl) ? null : systemUrl;
+export function getOriginalCodexBaseUrl(env = process.env) {
+  return readOriginalOpenAiBaseUrl(env);
 }
 
 /**

package/lib/context-watcher.js

@@ -1,83 +1,24 @@
-import { readFileSync, existsSync } from 'node:fs';
 import { join } from 'node:path';
 import { homedir } from 'node:os';
+import { CODEX_CONTEXT_WINDOW_TOKENS, sumUsageInputTokens, sumUsageContextTokens } from '../server/lib/context-rules.js';
 
 export const CONTEXT_WINDOW_FILE = join(homedir(), '.codex', 'context-window.json');
-export const CLAUDE_SETTINGS_FILE = join(homedir(), '.codex', 'settings.json');
-
-// Startup cache: read once, never re-read unless model changes
-let _startupModelBase = null;   // e.g. 'opus-4-6'
-let _startupContextSize = null; // e.g. 1000000
-
-/**
- * Read context-window.json once at startup and cache model→size mapping.
- * Extracts model base name (e.g. 'opus-4-6') and context size from model.id (e.g. 'codex-opus-4-6[1m]').
- * @returns {{ modelId: string|null, contextSize: number }}
- */
-export function readModelContextSize() {
-  try {
-    if (!existsSync(CONTEXT_WINDOW_FILE)) return { modelId: null, contextSize: 200000 };
-    const raw = readFileSync(CONTEXT_WINDOW_FILE, 'utf-8');
-    const data = JSON.parse(raw);
-    const modelId = data?.model?.id || null;
-    let contextSize = 200000;
-    if (modelId) {
-      const lower = modelId.toLowerCase();
-      const sizeMatch = lower.match(/\[(\d+)([km])\]/);
-      if (sizeMatch) {
-        const num = parseInt(sizeMatch[1], 10);
-        contextSize = sizeMatch[2] === 'm' ? num * 1000000 : num * 1000;
-      } else if (/opus/i.test(lower)) {
-        // Opus models default to 1M context
-        contextSize = 1000000;
-      }
-      // Cache the base name → size mapping
-      const base = lower.replace(/^codex-/i, '').replace(/\[.*\]/, '').trim();
-      _startupModelBase = base;
-      _startupContextSize = contextSize;
-    }
-    return { modelId, contextSize };
-  } catch {
-    return { modelId: null, contextSize: 200000 };
-  }
-}
-
-/**
- * Get context size for a given API model name (e.g. 'codex-opus-4-6-20250514').
- * Uses startup cache to avoid re-reading the file.
- * @param {string} apiModelName - model name from req.body.model
- * @returns {number} context window size in tokens
- */
-export function getContextSizeForModel(apiModelName) {
-  if (!apiModelName) return _startupContextSize || 200000;
-  const lower = apiModelName.toLowerCase();
-  // Extract base: 'codex-opus-4-6-20250514' → 'opus-4-6'
-  const base = lower.replace(/^codex-/i, '').replace(/-\d{8}$/, '').trim();
-  // Match against startup cache
-  if (_startupModelBase && base === _startupModelBase) {
-    return _startupContextSize;
-  }
-  // Opus always has 1M context; other unknown models default to 200K
-  if (/opus/i.test(lower)) return 1000000;
-  return 200000;
-}
 
 /**
  * Build a context_window SSE event payload from API usage data.
  * @param {object} usage - API response usage object
- * @param {number} contextSize - total context window size in tokens
  * @returns {object|null} context_window event data, or null if usage missing
  */
-export function buildContextWindowEvent(usage, contextSize) {
+export function buildContextWindowEvent(usage) {
   if (!usage) return null;
-  const inputTokens = (usage.input_tokens || 0) + (usage.cache_creation_input_tokens || 0) + (usage.cache_read_input_tokens || 0);
+  const inputTokens = sumUsageInputTokens(usage);
   const outputTokens = usage.output_tokens || 0;
-  const totalTokens = inputTokens + outputTokens;
-  const usedPct = Math.round((totalTokens / contextSize) * 100);
+  const totalTokens = sumUsageContextTokens(usage);
+  const usedPct = Math.round((totalTokens / CODEX_CONTEXT_WINDOW_TOKENS) * 100);
   return {
     total_input_tokens: inputTokens,
     total_output_tokens: outputTokens,
-    context_window_size: contextSize,
+    context_window_size: CODEX_CONTEXT_WINDOW_TOKENS,
     current_usage: usage,
     used_percentage: usedPct,
     remaining_percentage: 100 - usedPct,

package/lib/delta-reconstructor.js

@@ -1,8 +1,8 @@
 /**
  * Delta Reconstructor — 增量日志重建模块
  *
- * 将 delta 格式的日志条目重建为完整的 messages 数组。
- * 仅处理 mainAgent 条目，teammate/旧格式条目直接跳过。
+ * 将 delta 格式的日志条目重建为完整的 input 数组。
+ * 仅处理 mainAgent 条目，teammate/全量条目直接跳过。
  *
  * 提供三种 API：
  * - reconstructEntries(entries): 批量重建，用于 readLogFile() 和 readLocalLog()
@@ -13,17 +13,17 @@
 /**
  * 判断一个条目是否为 checkpoint（应重置累积状态）。
  * 三种情况视为 checkpoint：
- * 1. 无 _deltaFormat 字段 → 旧格式全量条目
+ * 1. 无 _deltaFormat 字段 → 全量条目
  * 2. _isCheckpoint === true → 显式 checkpoint
- * 3. _totalMessageCount === body.messages.length → 隐式 checkpoint（delta 长度 === 总长度）
+ * 3. _totalMessageCount === body.input.length → 隐式 checkpoint（delta 长度 === 总长度）
  */
 export function isCheckpointEntry(entry) {
-  // 无 _deltaFormat：旧格式全量条目
+  // 无 _deltaFormat：全量条目
   if (!entry._deltaFormat) return true;
   // 显式 checkpoint
   if (entry._isCheckpoint) return true;
   // 隐式 checkpoint：delta 长度等于总长度
-  const msgs = entry.body?.messages;
+  const msgs = entry.body?.input;
   if (Array.isArray(msgs) && entry._totalMessageCount === msgs.length) return true;
   return false;
 }
@@ -35,9 +35,21 @@ export function isDeltaEntry(entry) {
   return entry._deltaFormat && entry.mainAgent;
 }
 
+function getDeltaConversationId(entry) {
+  return entry?._conversationId || 'mainAgent';
+}
+
+function getAccumulated(map, entry) {
+  return map.get(getDeltaConversationId(entry)) || [];
+}
+
+function setAccumulated(map, entry, messages) {
+  map.set(getDeltaConversationId(entry), Array.isArray(messages) ? [...messages] : []);
+}
+
 /**
  * 批量重建 — 用于 readLogFile() 和 readLocalLog()。
- * 输入已去重的条目数组，输出重建后的条目数组（原地修改 body.messages）。
+ * 输入已去重的条目数组，输出重建后的条目数组（原地修改 body.input）。
  * 非 mainAgent delta 条目不受影响。
  *
  * @param {Array} entries - 已去重、按时间顺序排列的条目数组
@@ -45,7 +57,7 @@ export function isDeltaEntry(entry) {
  */
 export function reconstructEntries(entries) {
   // 第一遍：正向重建
-  let accumulated = []; // mainAgent 累积 messages
+  const accumulatedByConversation = new Map(); // conversationId → mainAgent input items
   const broken = [];    // 记录重建失败的条目索引（用于第二遍补偿）
 
   for (let i = 0; i < entries.length; i++) {
@@ -55,25 +67,27 @@ export function reconstructEntries(entries) {
     // （与 createIncrementalReconstructor line 209 保持一致）
     if (entry.inProgress) continue;
     if (!isDeltaEntry(entry)) {
-      // 非 delta 条目（旧格式 / teammate）：如果是 mainAgent 旧格式，重置累积状态
-      if (entry.mainAgent && Array.isArray(entry.body?.messages)) {
-        accumulated = [...entry.body.messages];
+      // 非 delta 条目（全量 / teammate）：如果是 mainAgent 全量条目，重置累积状态
+      if (entry.mainAgent && Array.isArray(entry.body?.input)) {
+        setAccumulated(accumulatedByConversation, entry, entry.body.input);
       }
       continue;
     }
 
     // delta 条目处理
-    const msgs = entry.body?.messages;
+    const msgs = entry.body?.input;
     if (!Array.isArray(msgs)) continue;
 
     if (isCheckpointEntry(entry)) {
-      // checkpoint：用当前 messages 重置累积状态
-      accumulated = [...msgs];
+      // checkpoint：用当前 input 重置累积状态
+      setAccumulated(accumulatedByConversation, entry, msgs);
     } else {
       // delta：拼接到累积数组
+      let accumulated = getAccumulated(accumulatedByConversation, entry);
       accumulated = [...accumulated, ...msgs];
-      // 挂载重建后的完整 messages（checkpoint/旧格式条目保持不变）
-      entry.body.messages = accumulated;
+      // 挂载重建后的完整 input（checkpoint/全量条目保持不变）
+      entry.body.input = accumulated;
+      setAccumulated(accumulatedByConversation, entry, accumulated);
       if (entry._totalMessageCount && accumulated.length !== entry._totalMessageCount) {
         broken.push(i);
       }
@@ -89,28 +103,30 @@ export function reconstructEntries(entries) {
 }
 
 /**
- * 补偿修复：对断裂的 delta 条目，从后续最近的 checkpoint 中提取完整 messages 回填。
- * checkpoint 包含截至该点的完整历史，可以据此反推之前条目的 messages。
+ * 补偿修复：对断裂的 delta 条目，从后续最近的 checkpoint 中提取完整 input 回填。
+ * checkpoint 包含截至该点的完整历史，可以据此反推之前条目的 input。
  */
 function _compensateBrokenEntries(entries, brokenIndices) {
   for (const brokenIdx of brokenIndices) {
     const brokenEntry = entries[brokenIdx];
+    const brokenConversationId = getDeltaConversationId(brokenEntry);
     const expectedCount = brokenEntry._totalMessageCount;
     if (!expectedCount) continue;
 
-    // 向后查找最近的 checkpoint 或旧格式全量条目
+    // 向后查找最近的 checkpoint 或全量条目
     for (let j = brokenIdx + 1; j < entries.length; j++) {
       const candidate = entries[j];
-      if (!candidate.mainAgent || !Array.isArray(candidate.body?.messages)) continue;
+      if (!candidate.mainAgent || !Array.isArray(candidate.body?.input)) continue;
+      if (getDeltaConversationId(candidate) !== brokenConversationId) continue;
 
-      const candidateMsgs = candidate.body.messages;
+      const candidateMsgs = candidate.body.input;
       const candidateTotal = candidate._totalMessageCount || candidateMsgs.length;
 
-      // 候选条目必须是 checkpoint/旧格式且包含足够的 messages
+      // 候选条目必须是 checkpoint/全量格式且包含足够的 input
       const isFullEntry = !candidate._deltaFormat || isCheckpointEntry(candidate);
       if (isFullEntry && candidateTotal >= expectedCount) {
-        // 从完整 messages 中截取前 expectedCount 条作为补偿
-        brokenEntry.body.messages = candidateMsgs.slice(0, expectedCount);
+        // 从完整 input 中截取前 expectedCount 条作为补偿
+        brokenEntry.body.input = candidateMsgs.slice(0, expectedCount);
         break;
       }
     }
@@ -122,32 +138,34 @@ function _compensateBrokenEntries(entries, brokenIndices) {
  * 对一个 checkpoint 边界内的段进行正向重建，如有 broken 条目则用 nextCheckpoint 反向修复。
  * 段内条目数通常 ≤ CHECKPOINT_INTERVAL(10)，内存开销可控。
  *
- * @param {Array} segment - 段内条目数组（段首应为 checkpoint/旧格式条目）
+ * @param {Array} segment - 段内条目数组（段首应为 checkpoint/全量条目）
  * @param {object|null} nextCheckpoint - 下一个 checkpoint 条目（用于反向修复），最后一段可为 null
  * @returns {Array} 重建后的段条目数组（原地修改）
  */
 export function reconstructSegment(segment, nextCheckpoint) {
-  let accumulated = [];
+  const accumulatedByConversation = new Map();
   const broken = [];
 
   for (let i = 0; i < segment.length; i++) {
     const entry = segment[i];
     if (entry.inProgress) continue;
     if (!isDeltaEntry(entry)) {
-      if (entry.mainAgent && Array.isArray(entry.body?.messages)) {
-        accumulated = [...entry.body.messages];
+      if (entry.mainAgent && Array.isArray(entry.body?.input)) {
+        setAccumulated(accumulatedByConversation, entry, entry.body.input);
       }
       continue;
     }
 
-    const msgs = entry.body?.messages;
+    const msgs = entry.body?.input;
     if (!Array.isArray(msgs)) continue;
 
     if (isCheckpointEntry(entry)) {
-      accumulated = [...msgs];
+      setAccumulated(accumulatedByConversation, entry, msgs);
     } else {
+      let accumulated = getAccumulated(accumulatedByConversation, entry);
       accumulated = [...accumulated, ...msgs];
-      entry.body.messages = accumulated;
+      entry.body.input = accumulated;
+      setAccumulated(accumulatedByConversation, entry, accumulated);
       if (entry._totalMessageCount && accumulated.length !== entry._totalMessageCount) {
         broken.push(i);
       }
@@ -158,6 +176,7 @@ export function reconstructSegment(segment, nextCheckpoint) {
   if (broken.length > 0) {
     for (const brokenIdx of broken) {
       const brokenEntry = segment[brokenIdx];
+      const brokenConversationId = getDeltaConversationId(brokenEntry);
       const expectedCount = brokenEntry._totalMessageCount;
       if (!expectedCount) continue;
 
@@ -165,22 +184,23 @@ export function reconstructSegment(segment, nextCheckpoint) {
       // 段内向后查找
       for (let j = brokenIdx + 1; j < segment.length; j++) {
         const candidate = segment[j];
-        if (!candidate.mainAgent || !Array.isArray(candidate.body?.messages)) continue;
-        const candidateMsgs = candidate.body.messages;
+        if (!candidate.mainAgent || !Array.isArray(candidate.body?.input)) continue;
+        if (getDeltaConversationId(candidate) !== brokenConversationId) continue;
+        const candidateMsgs = candidate.body.input;
         const candidateTotal = candidate._totalMessageCount || candidateMsgs.length;
         const isFullEntry = !candidate._deltaFormat || isCheckpointEntry(candidate);
         if (isFullEntry && candidateTotal >= expectedCount) {
-          brokenEntry.body.messages = candidateMsgs.slice(0, expectedCount);
+          brokenEntry.body.input = candidateMsgs.slice(0, expectedCount);
           repaired = true;
           break;
         }
       }
       // 段内未找到，用 nextCheckpoint 修复
-      if (!repaired && nextCheckpoint) {
-        const cpMsgs = nextCheckpoint.body?.messages;
+      if (!repaired && nextCheckpoint && getDeltaConversationId(nextCheckpoint) === brokenConversationId) {
+        const cpMsgs = nextCheckpoint.body?.input;
         const cpTotal = nextCheckpoint._totalMessageCount || cpMsgs?.length || 0;
         if (Array.isArray(cpMsgs) && cpTotal >= expectedCount) {
-          brokenEntry.body.messages = cpMsgs.slice(0, expectedCount);
+          brokenEntry.body.input = cpMsgs.slice(0, expectedCount);
         }
       }
     }
@@ -196,50 +216,53 @@ export function reconstructSegment(segment, nextCheckpoint) {
  * @returns {{ reconstruct: (entry: object) => object }}
  */
 export function createIncrementalReconstructor() {
-  let accumulated = []; // mainAgent 累积 messages
+  const accumulatedByConversation = new Map(); // conversationId → mainAgent input items
 
   return {
     /**
      * 重建单条条目。
-     * - 非 delta 条目：如果是 mainAgent 旧格式，更新累积状态，原样返回
+     * - 非 delta 条目：如果是 mainAgent 全量格式，更新累积状态，原样返回
      * - checkpoint：重置累积状态，原样返回
-     * - delta：拼接重建，修改 body.messages 后返回
+     * - delta：拼接重建，修改 body.input 后返回
      *
      * @param {object} entry - 单条日志条目
      * @returns {object} 重建后的条目（同一引用）
      */
     reconstruct(entry) {
-      // inProgress 条目：用 accumulated 副本重建 messages，但不更新 accumulated 本身。
-      // 这样客户端收到完整 messages（避免 delta 闪烁），
+      // inProgress 条目：用 accumulated 副本重建 input，但不更新 accumulated 本身。
+      // 这样客户端收到完整 input（避免 delta 闪烁），
       // 而后续 completed 条目仍能基于正确的 accumulated 重建。
       if (entry.inProgress) {
         if (isDeltaEntry(entry) && !isCheckpointEntry(entry)) {
-          const msgs = entry.body?.messages;
+          const msgs = entry.body?.input;
           if (Array.isArray(msgs)) {
-            entry.body.messages = [...accumulated, ...msgs];
+            const accumulated = getAccumulated(accumulatedByConversation, entry);
+            entry.body.input = [...accumulated, ...msgs];
           }
         }
         return entry;
       }
 
       if (!isDeltaEntry(entry)) {
-        // 非 delta 条目：如果是 mainAgent 旧格式，更新累积状态
-        if (entry.mainAgent && Array.isArray(entry.body?.messages)) {
-          accumulated = [...entry.body.messages];
+        // 非 delta 条目：如果是 mainAgent 全量格式，更新累积状态
+        if (entry.mainAgent && Array.isArray(entry.body?.input)) {
+          setAccumulated(accumulatedByConversation, entry, entry.body.input);
         }
         return entry;
       }
 
-      const msgs = entry.body?.messages;
+      const msgs = entry.body?.input;
       if (!Array.isArray(msgs)) return entry;
 
       if (isCheckpointEntry(entry)) {
         // checkpoint：重置累积状态
-        accumulated = [...msgs];
+        setAccumulated(accumulatedByConversation, entry, msgs);
       } else {
         // delta：拼接
+        let accumulated = getAccumulated(accumulatedByConversation, entry);
         accumulated = [...accumulated, ...msgs];
-        entry.body.messages = accumulated;
+        entry.body.input = accumulated;
+        setAccumulated(accumulatedByConversation, entry, accumulated);
       }
 
       return entry;
@@ -249,8 +272,7 @@ export function createIncrementalReconstructor() {
      * 重置累积状态（用于 full_reload 等场景）。
      */
     reset() {
-      accumulated = [];
+      accumulatedByConversation.clear();
     }
   };
 }
-