foliko 1.1.67 → 1.1.69

package/src/core/context-compressor.js

@@ -1,17 +1,40 @@
 /**
  * ContextCompressor - 上下文压缩器
- *
- * 职责：
- * 1. AI 智能压缩（生成摘要）
- * 2. 简单压缩（截断保留最近消息）
- * 3. 消息配对验证（防止 orphaned tool result）
+ * Ported from pi's compaction/compaction.ts with enhanced functionality
  */
 
+const path = require('path');
+const fs = require('fs');
 const { logger } = require('../utils/logger');
-const { TokenCounter } = require('./token-counter');
-const { Subagent } = require('./subagent');
+const {
+  estimateTokens,
+  estimateContextTokens,
+  shouldCompact,
+  getLastAssistantUsage,
+  calculateContextTokens,
+  safeJsonStringify,
+  TokenCounter
+} = require('./token-counter');
+const {
+  validateMessagesPairing,
+} = require('../utils/message-validator');
+const {
+  EntryTypes,
+  createBranchSummaryMessage,
+  createCompactionSummaryMessage,
+  createCustomMessage,
+  convertToLlm,
+  buildSessionContext
+} = require('./session-entry');
+
+// Default compaction settings
+const DEFAULT_COMPACTION_SETTINGS = {
+  enabled: true,
+  reserveTokens: 16384,
+  keepRecentTokens: 20000
+};
 
-// 模型上下文限制表
+// Model context limits
 const MODEL_CONTEXT_LIMITS = {
   'deepseek-chat': 100000,
   'deepseek-coder': 100000,
@@ -26,56 +49,641 @@ const MODEL_CONTEXT_LIMITS = {
   'claude-3-5-sonnet': 110000,
   'claude-3-opus': 110000,
   'claude-3-sonnet': 110000,
-  'glm-5.1': 110000,
+  'claude-3-haiku': 110000,
+  'claude-4-sonnet': 110000,
+  'claude-4-opus': 110000,
+  'glm-5.1': 110000
 };
 
-// 压缩超时
-const COMPRESSION_TIMEOUT = 1200000;
+// Compression timeout
+const COMPRESSION_TIMEOUT_MS = 120000;
+
+/**
+ * CompactionDetails - File operation details stored on generated compaction entries
+ */
+class CompactionDetails {
+  constructor(readFiles = [], modifiedFiles = []) {
+    this.readFiles = readFiles;
+    this.modifiedFiles = modifiedFiles;
+  }
+}
+
+/**
+ * Result - Result of a fallible operation
+ */
+class Result {
+  constructor(ok, value, error) {
+    this.ok = ok;
+    this.value = value;
+    this.error = error;
+  }
+
+  static success(value) {
+    return new Result(true, value, null);
+  }
+
+  static failure(error) {
+    return new Result(false, null, error);
+  }
+}
+
+/**
+ * CompactionError
+ */
+class CompactionError extends Error {
+  constructor(code, message, cause) {
+    super(message, cause === undefined ? undefined : { cause });
+    this.name = 'CompactionError';
+    this.code = code;
+  }
+}
+
+/**
+ * BranchSummaryError
+ */
+class BranchSummaryError extends Error {
+  constructor(code, message, cause) {
+    super(message, cause === undefined ? undefined : { cause });
+    this.name = 'BranchSummaryError';
+    this.code = code;
+  }
+}
+
+// File operations utilities
+function createFileOps() {
+  return {
+    read: new Set(),
+    written: new Set(),
+    edited: new Set()
+  };
+}
+
+function extractFileOpsFromMessage(message, fileOps) {
+  if (message.role !== 'assistant') return;
+  if (!message.content || !Array.isArray(message.content)) return;
+
+  for (const block of message.content) {
+    if (!block || block.type !== 'toolCall') continue;
+
+    const args = block.arguments;
+    if (!args) continue;
+
+    const filePath = typeof args.path === 'string' ? args.path : undefined;
+    if (!filePath) continue;
+
+    switch (block.name) {
+      case 'read':
+        fileOps.read.add(filePath);
+        break;
+      case 'write':
+        fileOps.written.add(filePath);
+        break;
+      case 'edit':
+        fileOps.edited.add(filePath);
+        break;
+    }
+  }
+}
+
+function computeFileLists(fileOps) {
+  const modified = new Set([...fileOps.edited, ...fileOps.written]);
+  const readOnly = [...fileOps.read].filter(f => !modified.has(f)).sort();
+  const modifiedFiles = [...modified].sort();
+  return { readFiles: readOnly, modifiedFiles };
+}
+
+function formatFileOperations(readFiles, modifiedFiles) {
+  const sections = [];
+  if (readFiles.length > 0) {
+    sections.push(`<read-files>\n${readFiles.join('\n')}\n</read-files>`);
+  }
+  if (modifiedFiles.length > 0) {
+    sections.push(`<modified-files>\n${modifiedFiles.join('\n')}\n</modified-files>`);
+  }
+  if (sections.length === 0) return '';
+  return `\n\n${sections.join('\n\n')}`;
+}
+
+const TOOL_RESULT_MAX_CHARS = 2000;
+
+function truncateForSummary(text, maxChars) {
+  if (text.length <= maxChars) return text;
+  const truncatedChars = text.length - maxChars;
+  return `${text.slice(0, maxChars)}\n\n[... ${truncatedChars} more characters truncated]`;
+}
+
+function serializeConversation(messages) {
+  const parts = [];
+
+  for (const msg of messages) {
+    if (msg.role === 'user') {
+      const content = Array.isArray(msg.content)
+        ? msg.content.filter(c => c.type === 'text').map(c => c.text).join('')
+        : msg.content;
+      if (content) parts.push(`[User]: ${content}`);
+    } else if (msg.role === 'assistant') {
+      const textParts = [];
+      const thinkingParts = [];
+      const toolCalls = [];
+
+      for (const block of msg.content || []) {
+        if (block.type === 'text') {
+          textParts.push(block.text);
+        } else if (block.type === 'thinking') {
+          thinkingParts.push(block.thinking);
+        } else if (block.type === 'toolCall') {
+          const argsStr = Object.entries(block.arguments || {})
+            .map(([k, v]) => `${k}=${safeJsonStringify(v)}`)
+            .join(', ');
+          toolCalls.push(`${block.name}(${argsStr})`);
+        }
+      }
+
+      if (thinkingParts.length > 0) {
+        parts.push(`[Assistant thinking]: ${thinkingParts.join('\n')}`);
+      }
+      if (textParts.length > 0) {
+        parts.push(`[Assistant]: ${textParts.join('\n')}`);
+      }
+      if (toolCalls.length > 0) {
+        parts.push(`[Assistant tool calls]: ${toolCalls.join('; ')}`);
+      }
+    } else if (msg.role === 'toolResult') {
+      const content = Array.isArray(msg.content)
+        ? msg.content.filter(c => c.type === 'text').map(c => c.text).join('')
+        : msg.content;
+      if (content) {
+        parts.push(`[Tool result]: ${truncateForSummary(content, TOOL_RESULT_MAX_CHARS)}`);
+      }
+    }
+  }
+
+  return parts.join('\n\n');
+}
+
+function getMessageFromEntry(entry) {
+  switch (entry.type) {
+    case EntryTypes.MESSAGE:
+      if (entry.message.role === 'toolResult') return undefined;
+      return entry.message;
+    case EntryTypes.CUSTOM_MESSAGE:
+      return createCustomMessage(entry.customType, entry.content, entry.display, entry.details, entry.timestamp);
+    case EntryTypes.BRANCH_SUMMARY:
+      return createBranchSummaryMessage(entry.summary, entry.fromId, entry.timestamp);
+    case EntryTypes.COMPACTION:
+      return createCompactionSummaryMessage(entry.summary, entry.tokensBefore, entry.timestamp);
+    default:
+      return undefined;
+  }
+}
+
+function getMessageFromEntryForCompaction(entry) {
+  if (entry.type === EntryTypes.COMPACTION) {
+    return undefined;
+  }
+  return getMessageFromEntry(entry);
+}
+
+function findValidCutPoints(entries, startIndex, endIndex) {
+  const cutPoints = [];
+  for (let i = startIndex; i < endIndex; i++) {
+    const entry = entries[i];
+    if (entry.type === EntryTypes.MESSAGE) {
+      const role = entry.message.role;
+      switch (role) {
+        case 'bashExecution':
+        case 'custom':
+        case 'branchSummary':
+        case 'compactionSummary':
+        case 'user':
+        case 'assistant':
+          cutPoints.push(i);
+          break;
+        case 'toolResult':
+          break;
+      }
+    }
+    if (entry.type === EntryTypes.BRANCH_SUMMARY || entry.type === EntryTypes.CUSTOM_MESSAGE) {
+      cutPoints.push(i);
+    }
+  }
+  return cutPoints;
+}
+
+function findTurnStartIndex(entries, entryIndex, startIndex) {
+  for (let i = entryIndex; i >= startIndex; i--) {
+    const entry = entries[i];
+    if (entry.type === EntryTypes.BRANCH_SUMMARY || entry.type === EntryTypes.CUSTOM_MESSAGE) {
+      return i;
+    }
+    if (entry.type === EntryTypes.MESSAGE) {
+      const role = entry.message.role;
+      if (role === 'user' || role === 'bashExecution') {
+        return i;
+      }
+    }
+  }
+  return -1;
+}
+
+/**
+ * Find the compaction cut point that keeps approximately the requested recent-token budget
+ */
+function findCutPoint(entries, startIndex, endIndex, keepRecentTokens) {
+  const cutPoints = findValidCutPoints(entries, startIndex, endIndex);
+
+  if (cutPoints.length === 0) {
+    return { firstKeptEntryIndex: startIndex, turnStartIndex: -1, isSplitTurn: false };
+  }
+  let accumulatedTokens = 0;
+  let cutIndex = cutPoints[0];
+
+  for (let i = endIndex - 1; i >= startIndex; i--) {
+    const entry = entries[i];
+    if (entry.type !== EntryTypes.MESSAGE) continue;
+    const messageTokens = estimateTokens(entry.message);
+    accumulatedTokens += messageTokens;
+    if (accumulatedTokens >= keepRecentTokens) {
+      for (let c = 0; c < cutPoints.length; c++) {
+        if (cutPoints[c] >= i) {
+          cutIndex = cutPoints[c];
+          break;
+        }
+      }
+      break;
+    }
+  }
+  while (cutIndex > startIndex) {
+    const prevEntry = entries[cutIndex - 1];
+    if (prevEntry.type === EntryTypes.COMPACTION) break;
+    if (prevEntry.type === EntryTypes.MESSAGE) break;
+    cutIndex--;
+  }
+  const cutEntry = entries[cutIndex];
+  const isUserMessage = cutEntry.type === EntryTypes.MESSAGE && cutEntry.message.role === 'user';
+  const turnStartIndex = isUserMessage ? -1 : findTurnStartIndex(entries, cutIndex, startIndex);
+
+  return {
+    firstKeptEntryIndex: cutIndex,
+    turnStartIndex,
+    isSplitTurn: !isUserMessage && turnStartIndex !== -1
+  };
+}
+
+const SUMMARIZATION_SYSTEM_PROMPT = `You are a context summarization assistant. Your task is to read a conversation between a user and an AI coding assistant, then produce a structured summary following the exact format specified.
+
+Do NOT continue the conversation. Do NOT respond to any questions in the conversation. ONLY output the structured summary.`;
+
+const SUMMARIZATION_PROMPT = `The messages above are a conversation to summarize. Create a structured context checkpoint summary that another LLM will use to continue the work.
+
+Use this EXACT format:
+
+## Goal
+[What is the user trying to accomplish? Can be multiple items if the session covers different tasks.]
+
+## Constraints & Preferences
+- [Any constraints, preferences, or requirements mentioned by user]
+- [Or "(none)" if none were mentioned]
+
+## Progress
+### Done
+- [x] [Completed tasks/changes]
+
+### In Progress
+- [ ] [Current work]
+
+### Blocked
+- [Issues preventing progress, if any]
+
+## Key Decisions
+- **[Decision]**: [Brief rationale]
+
+## Next Steps
+1. [Ordered list of what should happen next]
+
+## Critical Context
+- [Any data, examples, or references needed to continue]
+- [Or "(none)" if not applicable]
+
+Keep each section concise. Preserve exact file paths, function names, and error messages.`;
+
+const UPDATE_SUMMARIZATION_PROMPT = `The messages above are NEW conversation messages to incorporate into the existing summary provided in <previous-summary> tags.
+
+Update the existing structured summary with new information. RULES:
+- PRESERVE all existing information from the previous summary
+- ADD new progress, decisions, and context from the new messages
+- UPDATE the Progress section: move items from "In Progress" to "Done" when completed
+- UPDATE "Next Steps" based on what was accomplished
+- PRESERVE exact file paths, function names, and error messages
+- If something is no longer relevant, you may remove it
+
+Use this EXACT format:
+
+## Goal
+[Preserve existing goals, add new ones if the task expanded]
+
+## Constraints & Preferences
+- [Preserve existing, add new ones discovered]
+
+## Progress
+### Done
+- [x] [Include previously done items AND newly completed items]
+
+### In Progress
+- [ ] [Current work - update based on progress]
+
+### Blocked
+- [Current blockers - remove if resolved]
+
+## Key Decisions
+- **[Decision]**: [Brief rationale] (preserve all previous, add new)
+
+## Next Steps
+1. [Update based on current state]
+
+## Critical Context
+- [Preserve important context, add new if needed]
+
+Keep each section concise. Preserve exact file paths, function names, and error messages.`;
+
+const TURN_PREFIX_SUMMARIZATION_PROMPT = `This is the PREFIX of a turn that was too large to keep. The SUFFIX (recent work) is retained.
+
+Summarize the prefix to provide context for the retained suffix:
+
+## Original Request
+[What did the user ask for in this turn?]
+
+## Early Progress
+- [Key decisions and work done in the prefix]
+
+## Context for Suffix
+- [Information needed to understand the retained recent work]
+
+Be concise. Focus on what's needed to understand the kept suffix.`;
+
+/**
+ * Extract file operations from messages and previous compaction
+ */
+function extractFileOperations(messages, entries, prevCompactionIndex) {
+  const fileOps = createFileOps();
+  if (prevCompactionIndex >= 0) {
+    const prevCompaction = entries[prevCompactionIndex];
+    if (!prevCompaction.fromHook && prevCompaction.details) {
+      const details = prevCompaction.details;
+      if (Array.isArray(details.readFiles)) {
+        for (const f of details.readFiles) fileOps.read.add(f);
+      }
+      if (Array.isArray(details.modifiedFiles)) {
+        for (const f of details.modifiedFiles) {
+          fileOps.edited.add(f);
+        }
+      }
+    }
+  }
+  for (const msg of messages) {
+    extractFileOpsFromMessage(msg, fileOps);
+  }
+  return fileOps;
+}
+
+/**
+ * CompactionResult - Prepared compaction data ready to be persisted
+ */
+class CompactionResult {
+  constructor(summary, firstKeptEntryId, tokensBefore, details) {
+    this.summary = summary;
+    this.firstKeptEntryId = firstKeptEntryId;
+    this.tokensBefore = tokensBefore;
+    this.details = details;
+  }
+}
+
+/**
+ * Prepare session entries for compaction
+ */
+function prepareCompaction(pathEntries, settings) {
+  if (pathEntries.length === 0 || pathEntries[pathEntries.length - 1].type === EntryTypes.COMPACTION) {
+    return Result.success(undefined);
+  }
+
+  let prevCompactionIndex = -1;
+  for (let i = pathEntries.length - 1; i >= 0; i--) {
+    if (pathEntries[i].type === EntryTypes.COMPACTION) {
+      prevCompactionIndex = i;
+      break;
+    }
+  }
+
+  let previousSummary;
+  let boundaryStart = 0;
+  if (prevCompactionIndex >= 0) {
+    const prevCompaction = pathEntries[prevCompactionIndex];
+    previousSummary = prevCompaction.summary;
+    const firstKeptEntryIndex = pathEntries.findIndex(entry => entry.id === prevCompaction.firstKeptEntryId);
+    boundaryStart = firstKeptEntryIndex >= 0 ? firstKeptEntryIndex : prevCompactionIndex + 1;
+  }
+  const boundaryEnd = pathEntries.length;
 
+  const tokensBefore = estimateContextTokens(buildSessionContext(pathEntries).messages).tokens;
+
+  const cutPoint = findCutPoint(pathEntries, boundaryStart, boundaryEnd, settings.keepRecentTokens);
+  const firstKeptEntry = pathEntries[cutPoint.firstKeptEntryIndex];
+  if (!firstKeptEntry?.id) {
+    return Result.failure(new CompactionError('invalid_session', 'First kept entry has no UUID'));
+  }
+  const firstKeptEntryId = firstKeptEntry.id;
+
+  const historyEnd = cutPoint.isSplitTurn ? cutPoint.turnStartIndex : cutPoint.firstKeptEntryIndex;
+  const messagesToSummarize = [];
+  for (let i = boundaryStart; i < historyEnd; i++) {
+    const msg = getMessageFromEntryForCompaction(pathEntries[i]);
+    if (msg) messagesToSummarize.push(msg);
+  }
+  const turnPrefixMessages = [];
+  if (cutPoint.isSplitTurn) {
+    for (let i = cutPoint.turnStartIndex; i < cutPoint.firstKeptEntryIndex; i++) {
+      const msg = getMessageFromEntryForCompaction(pathEntries[i]);
+      if (msg) turnPrefixMessages.push(msg);
+    }
+  }
+  const fileOps = extractFileOperations(messagesToSummarize, pathEntries, prevCompactionIndex);
+  if (cutPoint.isSplitTurn) {
+    for (const msg of turnPrefixMessages) {
+      extractFileOpsFromMessage(msg, fileOps);
+    }
+  }
+
+  return Result.success({
+    firstKeptEntryId,
+    messagesToSummarize,
+    turnPrefixMessages,
+    isSplitTurn: cutPoint.isSplitTurn,
+    tokensBefore,
+    previousSummary,
+    fileOps,
+    settings
+  });
+}
+
+// Branch summarization utilities
+const BRANCH_SUMMARY_PREAMBLE = `The user explored a different conversation branch before returning here.
+Summary of that exploration:
+
+`;
+
+const BRANCH_SUMMARY_PROMPT = `Create a structured summary of this conversation branch for context when returning later.
+
+Use this EXACT format:
+
+## Goal
+[What was the user trying to accomplish in this branch?]
+
+## Constraints & Preferences
+- [Any constraints, preferences, or requirements mentioned]
+- [Or "(none)" if none were mentioned]
+
+## Progress
+### Done
+- [x] [Completed tasks/changes]
+
+### In Progress
+- [ ] [Work that was started but not finished]
+
+### Blocked
+- [Issues preventing progress, if any]
+
+## Key Decisions
+- **[Decision]**: [Brief rationale]
+
+## Next Steps
+1. [What should happen next to continue this work]
+
+Keep each section concise. Preserve exact file paths, function names, and error messages.`;
+
+/**
+ * BranchPreparation - Prepared branch content for summarization
+ */
+class BranchPreparation {
+  constructor(messages, fileOps, totalTokens) {
+    this.messages = messages;
+    this.fileOps = fileOps;
+    this.totalTokens = totalTokens;
+  }
+}
+
+/**
+ * Prepare branch entries for summarization within an optional token budget
+ */
+function prepareBranchEntries(entries, tokenBudget = 0) {
+  const messages = [];
+  const fileOps = createFileOps();
+  let totalTokens = 0;
+
+  for (const entry of entries) {
+    if (entry.type === EntryTypes.BRANCH_SUMMARY && !entry.fromHook && entry.details) {
+      const details = entry.details;
+      if (Array.isArray(details.readFiles)) {
+        for (const f of details.readFiles) fileOps.read.add(f);
+      }
+      if (Array.isArray(details.modifiedFiles)) {
+        for (const f of details.modifiedFiles) {
+          fileOps.edited.add(f);
+        }
+      }
+    }
+  }
+
+  for (let i = entries.length - 1; i >= 0; i--) {
+    const entry = entries[i];
+    const message = getMessageFromEntry(entry);
+    if (!message) continue;
+    extractFileOpsFromMessage(message, fileOps);
+
+    const tokens = estimateTokens(message);
+    if (tokenBudget > 0 && totalTokens + tokens > tokenBudget) {
+      if (entry.type === EntryTypes.COMPACTION || entry.type === EntryTypes.BRANCH_SUMMARY) {
+        if (totalTokens < tokenBudget * 0.9) {
+          messages.unshift(message);
+          totalTokens += tokens;
+        }
+      }
+      break;
+    }
+
+    messages.unshift(message);
+    totalTokens += tokens;
+  }
+
+  return new BranchPreparation(messages, fileOps, totalTokens);
+}
+
+/**
+ * Collect entries that should be summarized before navigating to a different session tree entry
+ */
+function collectEntriesForBranchSummary(session, oldLeafId, targetId) {
+  if (!oldLeafId) {
+    return { entries: [], commonAncestorId: null };
+  }
+  const oldPath = new Set(session.getBranch(oldLeafId).map(e => e.id));
+  const targetPath = session.getBranch(targetId);
+  let commonAncestorId = null;
+  for (let i = targetPath.length - 1; i >= 0; i--) {
+    if (oldPath.has(targetPath[i].id)) {
+      commonAncestorId = targetPath[i].id;
+      break;
+    }
+  }
+  const entries = [];
+  let current = oldLeafId;
+
+  while (current && current !== commonAncestorId) {
+    const entry = session.getEntry(current);
+    if (!entry) break;
+    entries.push(entry);
+    current = entry.parentId;
+  }
+  entries.reverse();
+
+  return { entries, commonAncestorId };
+}
+
+/**
+ * ContextCompressor - Main compression class
+ */
 class ContextCompressor {
-  /**
-   * @param {Object} config - 配置
-   */
   constructor(config = {}) {
     this.config = config;
     this.agent = config.agent;
     this.framework = config.framework;
 
-    // 模型相关配置
     this.model = config.model || 'deepseek-chat';
     this._maxContextTokens = config.maxContextTokens || this._getDefaultContextLimit();
     this._keepRecentMessages = config.keepRecentMessages || 20;
     this._enableSmartCompress = config.enableSmartCompress !== false;
+    this._compactionSettings = config.compactionSettings || DEFAULT_COMPACTION_SETTINGS;
 
-    // 压缩状态
     this._compressionCount = 0;
     this._compressionInProgress = false;
     this._compressionPromise = null;
-    this._compressionTimeoutId = null; // 保存超时 ID 用于取消
-
-    // 工具结果压缩配置
+    this._compressionTimeoutId = null;
     this._maxToolResultSize = config.maxToolResultSize || 4000;
+    this._tokenCounter = new TokenCounter();
   }
 
-  /**
-   * 获取默认上下文限制
-   * @returns {number}
-   * @private
-   */
   _getDefaultContextLimit() {
-    const modelKey = Object.keys(MODEL_CONTEXT_LIMITS).find((k) =>
+    const modelKey = Object.keys(MODEL_CONTEXT_LIMITS).find(k =>
       this.model.toLowerCase().includes(k.toLowerCase())
     );
     return modelKey ? MODEL_CONTEXT_LIMITS[modelKey] : 40000;
   }
 
   /**
-   * 压缩上下文
-   * @param {string} sessionId - Session ID
-   * @param {Array} messages - 消息数组引用
-   * @param {Object} messageStore - 消息存储
-   * @returns {Promise}
+   * Validate message pairing (delegate to message-validator)
    */
+  validateMessagesPairing(messages) {
+    return validateMessagesPairing(messages);
+  }
+
   async compress(sessionId, messages, messageStore) {
     if (this._compressionInProgress && this._compressionPromise) {
       logger.debug('Compression already in progress, waiting...');
@@ -88,30 +696,23 @@ class ContextCompressor {
 
     this._compressionInProgress = true;
 
-    this._compressionPromise = this._executeWithTimeout(sessionId, messages, messageStore).finally(
-      () => {
-        this._compressionInProgress = false;
-        this._compressionPromise = null;
-        // 清理超时 timer
-        if (this._compressionTimeoutId) {
-          clearTimeout(this._compressionTimeoutId);
-          this._compressionTimeoutId = null;
-        }
+    this._compressionPromise = this._executeWithTimeout(sessionId, messages, messageStore).finally(() => {
+      this._compressionInProgress = false;
+      this._compressionPromise = null;
+      if (this._compressionTimeoutId) {
+        clearTimeout(this._compressionTimeoutId);
+        this._compressionTimeoutId = null;
       }
-    );
+    });
 
     return this._compressionPromise;
   }
 
-  /**
-   * 带超时的压缩执行
-   * @private
-   */
   async _executeWithTimeout(sessionId, messages, messageStore) {
     try {
       return await Promise.race([
         this._doCompress(sessionId, messages, messageStore),
-        this._createTimeoutPromise(),
+        this._createTimeoutPromise()
       ]);
     } catch (err) {
       logger.warn('Compression failed:', err.message);
@@ -119,23 +720,15 @@ class ContextCompressor {
     }
   }
 
-  /**
-   * 创建超时 Promise
-   * @returns {Promise}
-   * @private
-   */
   _createTimeoutPromise() {
     return new Promise((_, reject) => {
       this._compressionTimeoutId = setTimeout(() => {
         this._compressionTimeoutId = null;
-        reject(new Error(`Compression timeout (${COMPRESSION_TIMEOUT}ms)`));
-      }, COMPRESSION_TIMEOUT);
+        reject(new Error(`Compression timeout (${COMPRESSION_TIMEOUT_MS}ms)`));
+      }, COMPRESSION_TIMEOUT_MS);
     });
   }
 
-  /**
-   * 取消正在进行的压缩
-   */
   cancelCompression() {
     if (this._compressionTimeoutId) {
       clearTimeout(this._compressionTimeoutId);
@@ -145,372 +738,155 @@ class ContextCompressor {
     this._compressionPromise = null;
   }
 
-  /**
-   * 执行智能压缩（使用 AI 生成摘要）
-   * @private
-   */
   async _doCompress(sessionId, messages, messageStore) {
-    const systemMessages = messages.filter((m) => m.role === 'system');
-    const otherMessages = messages.filter((m) => m.role !== 'system');
-
-    // 保留最近的 N 条非系统消息
+    const systemMessages = messages.filter(m => m.role === 'system');
+    const otherMessages = messages.filter(m => m.role !== 'system');
     const recentMessages = otherMessages.slice(-this._keepRecentMessages);
     const messagesToSummarize = otherMessages.slice(0, -this._keepRecentMessages);
 
     const compressedCount = messagesToSummarize.length;
-
     let summaryContent = '';
 
-    // 使用 AI 生成摘要
     if (this._enableSmartCompress && this.agent?._chatHandler?._aiClient) {
       try {
         const summaryText = await this._summarizeMessages(messagesToSummarize);
-        summaryContent = `[早期对话摘要]: ${summaryText || '（无内容）'}`;
+        summaryContent = `[Early conversation summary]: ${summaryText || '(no content)'}`;
       } catch (err) {
         logger.warn('AI summary failed, using simple compression:', err.message);
-        summaryContent = `[上下文已压缩: 省略了 ${compressedCount} 条早期消息。保留了最近 ${this._keepRecentMessages} 条对话记录。]`;
+        summaryContent = `[Context compressed: ${compressedCount} early messages omitted. Kept recent ${this._keepRecentMessages} messages.]`;
       }
     } else {
-      summaryContent = `[上下文已压缩: 省略了 ${compressedCount} 条早期消息。保留了最近 ${this._keepRecentMessages} 条对话记录。]`;
+      summaryContent = `[Context compressed: ${compressedCount} early messages omitted. Kept recent ${this._keepRecentMessages} messages.]`;
     }
 
     const summary = {
       role: 'assistant',
-      content: summaryContent,
+      content: summaryContent
     };
 
-    // 构建保留的消息（确保 tool call 和 tool result 配对）
-    const filteredRecentMessages = this._filterPairedMessages(recentMessages);
-
-    // 替换消息数组
     messages.length = 0;
-    messages.push(...systemMessages, summary, ...filteredRecentMessages);
+    messages.push(...systemMessages, summary, ...recentMessages);
 
-    // 更新压缩状态
     this._compressionCount++;
-    const tokenCount = this._countMessagesTokens(messages);
+    const tokenCount = this._tokenCounter.countMessages(messages);
     if (messageStore.compressionState) {
       messageStore.compressionState.count++;
       messageStore.compressionState.lastCompressedAt = Date.now();
       messageStore.compressionState.lastTokenCount = tokenCount;
     }
-    // 同步更新 SessionContext.metadata.compressionCount（如果可用）
     if (typeof messageStore.recordCompression === 'function') {
       messageStore.recordCompression(tokenCount);
     }
 
-    logger.info(
-      `Context compressed (${this._compressionCount} times). Messages: ${messages.length}`
-    );
+    logger.info(`Context compressed (${this._compressionCount} times). Messages: ${messages.length}`);
   }
 
-  /**
-   * 简单压缩（截断保留最近消息）
-   * @private
-   */
   _simpleCompress(sessionId, messages, messageStore) {
-    const systemMessages = messages.filter((m) => m.role === 'system');
-    const otherMessages = messages.filter((m) => m.role !== 'system');
+    const systemMessages = messages.filter(m => m.role === 'system');
+    const otherMessages = messages.filter(m => m.role !== 'system');
     const recentMessages = otherMessages.slice(-this._keepRecentMessages);
     const compressedCount = otherMessages.length - this._keepRecentMessages;
 
-    const summaryContent = `[上下文已压缩: 省略了 ${compressedCount} 条早期消息。保留了最近 ${this._keepRecentMessages} 条对话记录。]`;
+    const summaryContent = `[Context compressed: ${compressedCount} early messages omitted. Kept recent ${this._keepRecentMessages} messages.]`;
 
     const summary = {
       role: 'assistant',
-      content: summaryContent,
+      content: summaryContent
     };
 
-    // 确保 tool call 和 tool result 配对
-    const filteredRecentMessages = this._filterPairedMessages(recentMessages);
-
     messages.length = 0;
-    messages.push(...systemMessages, summary, ...filteredRecentMessages);
+    messages.push(...systemMessages, summary, ...recentMessages);
 
     this._compressionCount++;
     if (messageStore.compressionState) {
       messageStore.compressionState.count++;
       messageStore.compressionState.lastCompressedAt = Date.now();
-      messageStore.compressionState.lastTokenCount = this._countMessagesTokens(messages);
+      messageStore.compressionState.lastTokenCount = this._tokenCounter.countMessages(messages);
     }
 
     logger.info(`Context simple compressed. Messages: ${messages.length}`);
   }
 
-  /**
-   * 过滤消息，保留配对的 tool call 和 tool result
-   * @private
-   */
-  _filterPairedMessages(messages) {
-    // 工具类型检查
-    const isToolCall = (item) =>
-      item && (item.type === 'tool-call' || item.type === 'tool-use') && item.toolCallId;
-    const isToolResult = (item) =>
-      item && (item.type === 'tool-result' || item.type === 'tool_result') && item.toolCallId;
-
-    // 第一遍：找出所有 tool call 和它们的 results
-    const assistantToolCalls = new Map(); // toolCallId -> assistant message index
-    const toolResults = new Map(); // toolCallId -> tool result indices
-
-    for (let i = 0; i < messages.length; i++) {
-      const msg = messages[i];
-      if (msg.role === 'assistant') {
-        // 格式1: msg.content 中的 tool-call 块
-        if (msg.content) {
-          const content = Array.isArray(msg.content) ? msg.content : [msg.content];
-          for (const item of content) {
-            if (isToolCall(item)) {
-              assistantToolCalls.set(item.toolCallId, i);
-            }
-          }
-        }
-        // 格式2: msg.tool_calls 数组 (OpenAI 格式)
-        if (Array.isArray(msg.tool_calls)) {
-          for (const tc of msg.tool_calls) {
-            if (tc.id) {
-              assistantToolCalls.set(tc.id, i);
-            }
-          }
-        }
-      }
-      if (msg.role === 'tool' && Array.isArray(msg.content)) {
-        for (const item of msg.content) {
-          if (isToolResult(item)) {
-            if (!toolResults.has(item.toolCallId)) {
-              toolResults.set(item.toolCallId, []);
-            }
-            toolResults.get(item.toolCallId).push(i);
-          }
-        }
-      }
-    }
-
-    // 第二遍：找出哪些 assistant 消息需要保留
-    const assistantIndicesToKeep = new Set();
-    for (let i = 0; i < messages.length; i++) {
-      const msg = messages[i];
-      if (msg.role === 'assistant') {
-        let hasToolCall = false;
-        // 检查 msg.content 格式
-        if (msg.content) {
-          const content = Array.isArray(msg.content) ? msg.content : [msg.content];
-          for (const item of content) {
-            if (isToolCall(item)) {
-              hasToolCall = true;
-              break;
-            }
-          }
-        }
-        // 检查 msg.tool_calls 格式 (OpenAI)
-        if (!hasToolCall && Array.isArray(msg.tool_calls)) {
-          for (const tc of msg.tool_calls) {
-            if (tc.id) {
-              hasToolCall = true;
-              break;
-            }
-          }
-        }
-        if (hasToolCall) {
-          assistantIndicesToKeep.add(i);
-        } else if (i >= messages.length - 3) {
-          // 保留最近几条 assistant 消息
-          assistantIndicesToKeep.add(i);
-        }
-      }
-    }
-
-    // 如果有孤儿的 tool call（没有 result），保留该 assistant 消息
-    for (const [toolCallId, assistantIdx] of assistantToolCalls) {
-      if (!toolResults.has(toolCallId)) {
-        assistantIndicesToKeep.add(assistantIdx);
-      }
-    }
-
-    // 第三遍：确定哪些 tool result 要保留
-    const indicesToKeep = new Set();
-    for (let i = 0; i < messages.length; i++) {
-      const msg = messages[i];
-      if (msg.role === 'tool') {
-        let hasPairedAssistant = false;
-        const content = Array.isArray(msg.content) ? msg.content : [msg.content];
-        for (const item of content) {
-          if (isToolResult(item)) {
-            const assistantIdx = assistantToolCalls.get(item.toolCallId);
-            if (assistantIdx !== undefined && assistantIndicesToKeep.has(assistantIdx)) {
-              hasPairedAssistant = true;
-              break;
-            }
-          }
-        }
-        if (hasPairedAssistant) {
-          indicesToKeep.add(i);
-        }
-      } else if (msg.role === 'assistant') {
-        if (assistantIndicesToKeep.has(i)) {
-          indicesToKeep.add(i);
-        }
-      } else {
-        // user, system 等角色默认保留
-        indicesToKeep.add(i);
-      }
-    }
-
-    // 按索引排序并返回
-    const sortedIndices = Array.from(indicesToKeep).sort((a, b) => a - b);
-    return sortedIndices.map((i) => messages[i]);
-  }
-
-  /**
-   * 验证消息配对（防止 orphaned tool result）
-   * @param {Array} messages - 消息数组
-   * @returns {Array} 验证后的消息
-   */
-  validateMessagesPairing(messages) {
-    // 收集所有 assistant 的 tool-call IDs（兼容多种类型名）
-    const assistantToolCallIds = new Set();
-    for (const msg of messages) {
-      if (msg.role === 'assistant') {
-        // 格式1: msg.content 中的 tool-call 块
-        if (Array.isArray(msg.content)) {
-          for (const item of msg.content) {
-            if ((item.type === 'tool-call' || item.type === 'tool-use') && item.toolCallId) {
-              assistantToolCallIds.add(item.toolCallId);
-            }
-          }
-        }
-        // 格式2: msg.tool_calls 数组 (OpenAI 格式)
-        if (Array.isArray(msg.tool_calls)) {
-          for (const tc of msg.tool_calls) {
-            if (tc.id) {
-              assistantToolCallIds.add(tc.id);
-            }
-          }
-        }
-      }
-    }
-
-    // 检查并删除没有配对的 tool result
-    let removedCount = 0;
-    for (const msg of messages) {
-      if (msg.role === 'tool' && Array.isArray(msg.content)) {
-        const originalLength = msg.content.length;
-        msg.content = msg.content.filter((item) => {
-          // 兼容 tool-result 和 tool_result 两种类型
-          if (
-            item &&
-            (item.type === 'tool-result' || item.type === 'tool_result') &&
-            item.toolCallId
-          ) {
-            if (!assistantToolCallIds.has(item.toolCallId)) {
-              removedCount++;
-              return false; // 删除没有配对的 tool result
-            }
-          }
-          return true;
-        });
-
-        // 如果所有 content 都被删除了，标记整个消息待删除
-        if (msg.content.length === 0 && originalLength > 0) {
-          msg._orphaned = true;
-        }
-      }
-    }
-
-    // 移除被标记为 orphaned 的 tool 消息
-    const originalLength = messages.length;
-    const filtered = messages.filter((msg) => !(msg.role === 'tool' && msg._orphaned));
-
-    if (removedCount > 0 || filtered.length !== originalLength) {
-      logger.debug(
-        `Removed ${removedCount} orphaned tool-results, ${originalLength - filtered.length} orphaned tool messages`
-      );
-    }
-
-    return filtered;
-  }
-
-  /**
-   * 使用 AI 生成消息摘要
-   * @param {Array} messages - 消息数组
-   * @returns {Promise<string>}
-   * @private
-   */
   async _summarizeMessages(messages) {
     if (!this.framework) {
       throw new Error('Framework not available');
     }
 
-    // 提取消息文本内容，忽略工具调用等
     const msg_str = messages
-      .map((m) => {
+      .map(m => {
         let text = '';
         if (typeof m.content === 'string') {
           text = m.content;
         } else if (Array.isArray(m.content)) {
-          // 只提取 text 类型，忽略 tool-call、tool-result 等
           text = m.content
-            .filter((c) => c.type === 'text')
-            .map((c) => c.text)
+            .filter(c => c.type === 'text')
+            .map(c => c.text)
             .join(' ');
         }
-        // 跳过 tool 角色的结果（太长且无意义）
         if (m.role === 'tool') {
           return '';
         }
         return `${m.role}: ${text}`;
       })
-      .filter((line) => line.length > 0)
+      .filter(line => line.length > 0)
       .join('\n');
 
-    const task = `请总结以下对话，只保留有意义的信息（如任务需求、决策结论、重要上下文），忽略无意义的闲聊和重复内容。用1000字以内描述：\n
-
-      ${msg_str}`;
+    const task = `Summarize the following conversation, keeping only meaningful information (task requirements, decisions, important context). Ignore meaningless chatter and repetitive content. Describe in 1000 characters or less:\n\n${msg_str}`;
 
     try {
-      // 使用 framework.createSubAgent 创建 Subagent 进行摘要
-      // maxRetries: 0 禁用重试，避免长时间等待
       const subagent = this.framework.createSubAgent({
         name: 'context-compressor',
-        role: '信息提取专家',
-        systemPrompt:
-          '你是一个对话摘要助手。只提取和保留有意义的信息（如任务需求、决策结论、重要上下文），忽略无意义的闲聊、重复内容和中间过程。输出要简洁。',
+        role: 'Information extraction expert',
+        systemPrompt: 'You are a conversation summarization assistant. Extract and preserve only meaningful information (task requirements, decisions, important context). Ignore meaningless chatter, repetitive content, and intermediate processes. Keep output concise.',
         maxRetries: 0,
-        disableTools: true,
+        disableTools: true
       });
 
       const result = await subagent.chat(task);
       if (result.success) {
         return result.message;
       }
-      throw new Error(result.error || '摘要生成失败');
+      throw new Error(result.error || 'Summary generation failed');
     } catch (err) {
       logger.warn('Summarize failed:', err.message);
       throw err;
     }
   }
 
-  /** TokenCounter 实例 */
-  _tokenCounter = new TokenCounter();
-
-  /**
-   * 计算消息数组的 token 数（委托给 TokenCounter）
-   * @param {Array} messages - 消息数组
-   * @returns {number}
-   */
-  _countMessagesTokens(messages) {
-    return this._tokenCounter.countMessages(messages);
-  }
-
-  /**
-   * 获取压缩统计
-   * @returns {Object}
-   */
   getStats() {
     return {
       compressionCount: this._compressionCount,
-      inProgress: this._compressionInProgress,
+      inProgress: this._compressionInProgress
     };
   }
 }
 
-module.exports = { ContextCompressor };
+module.exports = {
+  ContextCompressor,
+  CompactionDetails,
+  CompactionResult,
+  CompactionError,
+  BranchSummaryError,
+  Result,
+  DEFAULT_COMPACTION_SETTINGS,
+  createFileOps,
+  extractFileOpsFromMessage,
+  computeFileLists,
+  formatFileOperations,
+  serializeConversation,
+  findCutPoint,
+  findTurnStartIndex,
+  SUMMARIZATION_SYSTEM_PROMPT,
+  SUMMARIZATION_PROMPT,
+  UPDATE_SUMMARIZATION_PROMPT,
+  TURN_PREFIX_SUMMARIZATION_PROMPT,
+  BRANCH_SUMMARY_PREAMBLE,
+  BRANCH_SUMMARY_PROMPT,
+  extractFileOperations,
+  prepareCompaction,
+  prepareBranchEntries,
+  collectEntriesForBranchSummary,
+  getMessageFromEntry,
+  getMessageFromEntryForCompaction,
+  EntryTypes
+};