@evalops/maestro 0.10.30 → 0.10.31

package/dist/agent/compaction.d.ts

@@ -33,31 +33,12 @@
  * @module agent/compaction
  */
 import type { PromptProjectDocManifest } from "../config/index.js";
-import type { SessionEntry } from "../session/types.js";
 import { readTool } from "../tools/read.js";
 import { type CompactionHookContext, type CompactionHookService } from "./compaction-hooks.js";
-import type { Api, AppMessage, AssistantMessage, Usage } from "./types.js";
-/**
- * Configuration for compaction behavior.
- */
-export interface CompactionSettings {
-    /** Whether auto-compaction is enabled */
-    enabled: boolean;
-    /**
-     * Tokens to reserve for summary generation and safety margin.
-     * Default: 16384 (~13k for summary + ~3k safety margin)
-     */
-    reserveTokens: number;
-    /**
-     * Approximate number of recent tokens to preserve verbatim.
-     * Default: 20000 (recent context preserved without summarization)
-     */
-    keepRecentTokens: number;
-}
-/**
- * Default compaction settings based on research into Claude Code, Codex, and OpenCode.
- */
-export declare const DEFAULT_COMPACTION_SETTINGS: CompactionSettings;
+import type { CompactionSettings } from "./compaction/cut-points.js";
+export { DEFAULT_COMPACTION_SETTINGS, adjustBoundaryForToolResults, calculateContextTokens, calculateUsagePercent, findCutPoint, findCutPointWithSplitInfo, findTurnStartIndex, getLastAssistantUsage, getLastAssistantUsageFromEntries, shouldCompact, } from "./compaction/cut-points.js";
+export type { CompactionSettings, CutPointResult, } from "./compaction/cut-points.js";
+import type { Api, AppMessage, AssistantMessage } from "./types.js";
 /**
  * Internal user prompt appended after compaction so the model resumes from the
  * summarized context on the next turn.
@@ -78,127 +59,7 @@ export interface CompactionResult {
     /** Messages to keep verbatim */
     keptMessages: AppMessage[];
 }
-/**
- * Calculate total context tokens from usage metadata.
- *
- * This includes all token types that contribute to context window consumption:
- * - input: Tokens from user/system messages
- * - output: Tokens generated by the model
- * - cacheRead: Tokens read from prompt cache
- * - cacheWrite: Tokens written to prompt cache
- *
- * @param usage - Usage metadata from an assistant message
- * @returns Total context token count
- */
-export declare function calculateContextTokens(usage: Usage): number;
 type ReadRestoreExecutor = typeof readTool.execute;
-/**
- * Find the last non-aborted assistant message usage from a message array.
- *
- * Used to determine current context window consumption. Walks backwards
- * to find the most recent valid usage metadata.
- *
- * @param messages - Array of application messages
- * @returns Usage metadata from the last assistant message, or null
- */
-export declare function getLastAssistantUsage(messages: AppMessage[]): Usage | null;
-/**
- * Find the last non-aborted assistant message usage from session entries.
- *
- * @param entries - Array of session entries
- * @returns Usage metadata from the last assistant message, or null
- */
-export declare function getLastAssistantUsageFromEntries(entries: SessionEntry[]): Usage | null;
-/**
- * Determine if compaction should trigger based on current context usage.
- *
- * Compaction triggers when context usage exceeds `contextWindow - reserveTokens`,
- * leaving enough room for summary generation plus a safety margin.
- *
- * @param contextTokens - Current context window usage in tokens
- * @param contextWindow - Model's total context window size
- * @param settings - Compaction configuration
- * @returns true if compaction should trigger
- */
-export declare function shouldCompact(contextTokens: number, contextWindow: number, settings: CompactionSettings): boolean;
-/**
- * Calculate context usage percentage.
- *
- * @param contextTokens - Current context window usage in tokens
- * @param contextWindow - Model's total context window size
- * @returns Percentage of context window used (0-100)
- */
-export declare function calculateUsagePercent(contextTokens: number, contextWindow: number): number;
-/**
- * Result of finding a cut point, including split turn information.
- */
-export interface CutPointResult {
-    /** Index of first message to keep (messages before this are summarized) */
-    firstKeptIndex: number;
-    /** Index of user message that starts the turn being split, or -1 if not splitting */
-    turnStartIndex: number;
-    /** Whether this cut splits a turn (cut point is not a user message) */
-    isSplitTurn: boolean;
-}
-/**
- * Find the user message that starts the turn containing the given index.
- *
- * @param messages - Array of messages
- * @param entryIndex - Index of the message to find the turn start for
- * @param startIndex - First index to consider (inclusive)
- * @returns Index of the user message that starts this turn, or -1 if not found
- */
-export declare function findTurnStartIndex(messages: AppMessage[], entryIndex: number, startIndex: number): number;
-/**
- * Find the optimal cut point in messages that preserves `keepRecentTokens`.
- *
- * The algorithm:
- * 1. Find all turn boundaries (user message indices)
- * 2. Walk backwards collecting assistant token usage
- * 3. Find where cumulative token difference exceeds keepRecentTokens
- * 4. Return the nearest turn boundary at or before that point
- *
- * This ensures:
- * - Recent context is preserved based on actual token usage, not message count
- * - Turn integrity is maintained (user/assistant/toolResult groups stay together)
- * - More context is kept when messages are small, less when large
- *
- * @param messages - Array of messages to analyze
- * @param startIndex - First index to consider for cutting
- * @param endIndex - Last index to consider (exclusive)
- * @param keepRecentTokens - Approximate tokens to preserve
- * @returns Index of first message to keep (messages before this are summarized)
- */
-export declare function findCutPoint(messages: AppMessage[], startIndex: number, endIndex: number, keepRecentTokens: number): number;
-/**
- * Find the optimal cut point with split turn information.
- *
- * Similar to findCutPoint but:
- * - Can cut at assistant messages (not just user messages)
- * - Returns information about whether we're splitting a turn
- *
- * This allows for more aggressive compaction when turns are very large,
- * while providing the context needed to summarize the split turn prefix.
- *
- * @param messages - Array of messages to analyze
- * @param startIndex - First index to consider for cutting
- * @param endIndex - Last index to consider (exclusive)
- * @param keepRecentTokens - Approximate tokens to preserve
- * @returns CutPointResult with index and split turn information
- */
-export declare function findCutPointWithSplitInfo(messages: AppMessage[], startIndex: number, endIndex: number, keepRecentTokens: number): CutPointResult;
-/**
- * Adjust a cut boundary to preserve tool call/result integrity.
- *
- * Tool results must stay paired with their originating assistant message.
- * If a toolResult would be kept but its toolCall would be cut, this
- * moves the boundary back to include the toolCall.
- *
- * @param messages - Array of messages
- * @param boundary - Initial cut point
- * @returns Adjusted boundary that preserves tool integrity
- */
-export declare function adjustBoundaryForToolResults(messages: AppMessage[], boundary: number): number;
 /**
  * Default prompt for generating compaction summaries.
  *
@@ -383,5 +244,4 @@ export declare function performCompaction(params: {
     renderSummaryText?: (message: AssistantMessage) => string;
     readRestoreExecute?: ReadRestoreExecutor;
 }): Promise<PerformCompactionResult>;
-export {};
 //# sourceMappingURL=compaction.d.ts.map

package/dist/agent/compaction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compaction.d.ts","sourceRoot":"","sources":["../../src/agent/compaction.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"compaction.d.ts","sourceRoot":"","sources":["../../src/agent/compaction.ts"],"names":[],"mappings":"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"}

package/dist/agent/compaction.js

@@ -41,20 +41,17 @@ import { createLogger } from "../utils/logger.js";
 import { expandUserPath } from "../utils/path-validation.js";
 import { runPostCompactionCleanup } from "./compaction-cleanup.js";
 import { createCompactionHookService, } from "./compaction-hooks.js";
+import { DEFAULT_COMPACTION_SETTINGS, adjustBoundaryForToolResults, calculateContextTokens, findCutPoint, findTurnBoundaries, getLastAssistantUsage, } from "./compaction/cut-points.js";
+export { DEFAULT_COMPACTION_SETTINGS, adjustBoundaryForToolResults, calculateContextTokens, calculateUsagePercent, findCutPoint, findCutPointWithSplitInfo, findTurnStartIndex, getLastAssistantUsage, getLastAssistantUsageFromEntries, shouldCompact, } from "./compaction/cut-points.js";
 import { BACKGROUND_TASKS_COMPACTION_CUSTOM_TYPE, HEADLESS_CLIENT_REQUESTS_COMPACTION_CUSTOM_TYPE, MCP_SERVERS_COMPACTION_CUSTOM_TYPE, PLAN_FILE_COMPACTION_CUSTOM_TYPE, PLAN_MODE_COMPACTION_CUSTOM_TYPE, } from "./compaction-restoration.js";
 import { isContextOverflow as isCompactionOverflowMessage, isOverflowErrorMessage, parseOverflowDetails, } from "./context-overflow.js";
 import { convertAppMessageToLlm, createHookMessage, } from "./custom-messages.js";
 import { getPlanFilePathForCompactionRestore } from "./plan-mode.js";
 import { SESSION_START_INITIAL_USER_METADATA_KIND } from "./session-start-metadata.js";
 const logger = createLogger("agent:compaction");
-/**
- * Default compaction settings based on research into Claude Code, Codex, and OpenCode.
- */
-export const DEFAULT_COMPACTION_SETTINGS = {
-    enabled: true,
-    reserveTokens: 16384,
-    keepRecentTokens: 20000,
-};
+// ============================================================================
+// Types
+// ============================================================================
 /**
  * Internal user prompt appended after compaction so the model resumes from the
  * summarized context on the next turn.
@@ -74,38 +71,6 @@ const SKILL_RESTORE_TRUNCATION_MARKER = "\n\n[... restored skill truncated for c
 // ============================================================================
 // Token Calculation
 // ============================================================================
-/**
- * Calculate total context tokens from usage metadata.
- *
- * This includes all token types that contribute to context window consumption:
- * - input: Tokens from user/system messages
- * - output: Tokens generated by the model
- * - cacheRead: Tokens read from prompt cache
- * - cacheWrite: Tokens written to prompt cache
- *
- * @param usage - Usage metadata from an assistant message
- * @returns Total context token count
- */
-export function calculateContextTokens(usage) {
-    return usage.input + usage.output + usage.cacheRead + usage.cacheWrite;
-}
-/**
- * Extract usage metadata from a message if it's a non-aborted assistant message.
- *
- * @param msg - Any application message
- * @returns Usage metadata or null if not available/applicable
- */
-function getAssistantUsage(msg) {
-    if (msg.role === "assistant") {
-        const assistantMsg = msg;
-        if (assistantMsg.stopReason !== "aborted" &&
-            assistantMsg.stopReason !== "error" &&
-            assistantMsg.usage) {
-            return assistantMsg.usage;
-        }
-    }
-    return null;
-}
 function shouldSkipAssistantCompactionMessage(message) {
     return (message.role === "assistant" &&
         (message.stopReason === "aborted" || message.stopReason === "error"));
@@ -952,306 +917,6 @@ function truncateSummaryInputForOverflowRetry(messages, overflowErrorMessage) {
         ? [preamble, markerMessage, ...truncatedBody]
         : [markerMessage, ...truncatedBody];
 }
-/**
- * Find the last non-aborted assistant message usage from a message array.
- *
- * Used to determine current context window consumption. Walks backwards
- * to find the most recent valid usage metadata.
- *
- * @param messages - Array of application messages
- * @returns Usage metadata from the last assistant message, or null
- */
-export function getLastAssistantUsage(messages) {
-    for (let i = messages.length - 1; i >= 0; i--) {
-        const usage = getAssistantUsage(messages[i]);
-        if (usage)
-            return usage;
-    }
-    return null;
-}
-/**
- * Find the last non-aborted assistant message usage from session entries.
- *
- * @param entries - Array of session entries
- * @returns Usage metadata from the last assistant message, or null
- */
-export function getLastAssistantUsageFromEntries(entries) {
-    for (let i = entries.length - 1; i >= 0; i--) {
-        const entry = entries[i];
-        if (!entry)
-            continue;
-        if (entry.type === "message") {
-            const usage = getAssistantUsage(entry.message);
-            if (usage)
-                return usage;
-        }
-    }
-    return null;
-}
-// ============================================================================
-// Compaction Trigger Detection
-// ============================================================================
-/**
- * Determine if compaction should trigger based on current context usage.
- *
- * Compaction triggers when context usage exceeds `contextWindow - reserveTokens`,
- * leaving enough room for summary generation plus a safety margin.
- *
- * @param contextTokens - Current context window usage in tokens
- * @param contextWindow - Model's total context window size
- * @param settings - Compaction configuration
- * @returns true if compaction should trigger
- */
-export function shouldCompact(contextTokens, contextWindow, settings) {
-    if (!settings.enabled)
-        return false;
-    return contextTokens > contextWindow - settings.reserveTokens;
-}
-/**
- * Calculate context usage percentage.
- *
- * @param contextTokens - Current context window usage in tokens
- * @param contextWindow - Model's total context window size
- * @returns Percentage of context window used (0-100)
- */
-export function calculateUsagePercent(contextTokens, contextWindow) {
-    if (contextWindow <= 0)
-        return 0;
-    return (contextTokens / contextWindow) * 100;
-}
-/**
- * Find indices of user messages (turn boundaries) in a message array.
- *
- * Turn boundaries are important because we never want to split a turn
- * (user message + assistant response + tool results). Cutting at a user
- * message ensures turn integrity.
- *
- * @param messages - Array of messages to scan
- * @param startIndex - First index to consider (inclusive)
- * @param endIndex - Last index to consider (exclusive)
- * @returns Array of indices where user messages appear
- */
-function findTurnBoundaries(messages, startIndex, endIndex) {
-    const boundaries = [];
-    for (let i = startIndex; i < endIndex; i++) {
-        if (messages[i].role === "user") {
-            boundaries.push(i);
-        }
-    }
-    return boundaries;
-}
-/**
- * Find the user message that starts the turn containing the given index.
- *
- * @param messages - Array of messages
- * @param entryIndex - Index of the message to find the turn start for
- * @param startIndex - First index to consider (inclusive)
- * @returns Index of the user message that starts this turn, or -1 if not found
- */
-export function findTurnStartIndex(messages, entryIndex, startIndex) {
-    for (let i = entryIndex; i >= startIndex; i--) {
-        if (messages[i].role === "user") {
-            return i;
-        }
-    }
-    return -1;
-}
-/**
- * Find the optimal cut point in messages that preserves `keepRecentTokens`.
- *
- * The algorithm:
- * 1. Find all turn boundaries (user message indices)
- * 2. Walk backwards collecting assistant token usage
- * 3. Find where cumulative token difference exceeds keepRecentTokens
- * 4. Return the nearest turn boundary at or before that point
- *
- * This ensures:
- * - Recent context is preserved based on actual token usage, not message count
- * - Turn integrity is maintained (user/assistant/toolResult groups stay together)
- * - More context is kept when messages are small, less when large
- *
- * @param messages - Array of messages to analyze
- * @param startIndex - First index to consider for cutting
- * @param endIndex - Last index to consider (exclusive)
- * @param keepRecentTokens - Approximate tokens to preserve
- * @returns Index of first message to keep (messages before this are summarized)
- */
-export function findCutPoint(messages, startIndex, endIndex, keepRecentTokens) {
-    const boundaries = findTurnBoundaries(messages, startIndex, endIndex);
-    if (boundaries.length === 0) {
-        return startIndex; // No user messages, keep everything in range
-    }
-    // Collect assistant usages walking backwards from endIndex
-    const assistantUsages = [];
-    for (let i = endIndex - 1; i >= startIndex; i--) {
-        const usage = getAssistantUsage(messages[i]);
-        if (usage) {
-            assistantUsages.push({
-                index: i,
-                tokens: calculateContextTokens(usage),
-            });
-        }
-    }
-    if (assistantUsages.length === 0) {
-        // No usage info, keep last turn only
-        return boundaries[boundaries.length - 1];
-    }
-    // Walk through and find where cumulative token difference exceeds keepRecentTokens
-    const newestTokens = assistantUsages[0].tokens;
-    let cutIndex = startIndex; // Default: keep everything in range
-    for (let i = 1; i < assistantUsages.length; i++) {
-        const tokenDiff = newestTokens - assistantUsages[i].tokens;
-        if (tokenDiff >= keepRecentTokens) {
-            // Find the turn boundary at or before the assistant we want to keep
-            const lastKeptAssistantIndex = assistantUsages[i - 1].index;
-            for (let b = boundaries.length - 1; b >= 0; b--) {
-                const boundary = boundaries[b];
-                if (boundary !== undefined && boundary <= lastKeptAssistantIndex) {
-                    cutIndex = boundary;
-                    break;
-                }
-            }
-            break;
-        }
-    }
-    return cutIndex;
-}
-/**
- * Find valid cut points (user or assistant messages, not tool results).
- * Tool results must stay with their preceding tool call.
- *
- * @param messages - Array of messages to scan
- * @param startIndex - First index to consider (inclusive)
- * @param endIndex - Last index to consider (exclusive)
- * @returns Array of indices where valid cut points exist
- */
-function findValidCutPoints(messages, startIndex, endIndex) {
-    const cutPoints = [];
-    for (let i = startIndex; i < endIndex; i++) {
-        const role = messages[i].role;
-        // user and assistant are valid cut points
-        // toolResult must stay with its preceding tool call
-        if (role === "user" || role === "assistant") {
-            cutPoints.push(i);
-        }
-    }
-    return cutPoints;
-}
-/**
- * Find the optimal cut point with split turn information.
- *
- * Similar to findCutPoint but:
- * - Can cut at assistant messages (not just user messages)
- * - Returns information about whether we're splitting a turn
- *
- * This allows for more aggressive compaction when turns are very large,
- * while providing the context needed to summarize the split turn prefix.
- *
- * @param messages - Array of messages to analyze
- * @param startIndex - First index to consider for cutting
- * @param endIndex - Last index to consider (exclusive)
- * @param keepRecentTokens - Approximate tokens to preserve
- * @returns CutPointResult with index and split turn information
- */
-export function findCutPointWithSplitInfo(messages, startIndex, endIndex, keepRecentTokens) {
-    const cutPoints = findValidCutPoints(messages, startIndex, endIndex);
-    if (cutPoints.length === 0) {
-        return {
-            firstKeptIndex: startIndex,
-            turnStartIndex: -1,
-            isSplitTurn: false,
-        };
-    }
-    // Estimate message sizes for token-based cutting
-    let accumulatedTokens = 0;
-    let cutIndex = startIndex;
-    for (let i = endIndex - 1; i >= startIndex; i--) {
-        const usage = getAssistantUsage(messages[i]);
-        if (usage) {
-            accumulatedTokens = calculateContextTokens(usage);
-            // Using cumulative tokens from the last assistant message
-            if (accumulatedTokens >= keepRecentTokens) {
-                // Find the closest valid cut point at or after this index
-                for (const cp of cutPoints) {
-                    if (cp >= i) {
-                        cutIndex = cp;
-                        break;
-                    }
-                }
-                break;
-            }
-        }
-    }
-    // If no cut point found via tokens, use last assistant's token-based cut
-    if (cutIndex === startIndex) {
-        // Fall back to original algorithm
-        cutIndex = findCutPoint(messages, startIndex, endIndex, keepRecentTokens);
-    }
-    // Determine if this is a split turn
-    const isUserMessage = messages[cutIndex]?.role === "user";
-    const turnStartIndex = isUserMessage
-        ? -1
-        : findTurnStartIndex(messages, cutIndex, startIndex);
-    return {
-        firstKeptIndex: cutIndex,
-        turnStartIndex,
-        isSplitTurn: !isUserMessage && turnStartIndex !== -1,
-    };
-}
-/**
- * Adjust a cut boundary to preserve tool call/result integrity.
- *
- * Tool results must stay paired with their originating assistant message.
- * If a toolResult would be kept but its toolCall would be cut, this
- * moves the boundary back to include the toolCall.
- *
- * @param messages - Array of messages
- * @param boundary - Initial cut point
- * @returns Adjusted boundary that preserves tool integrity
- */
-export function adjustBoundaryForToolResults(messages, boundary) {
-    let adjusted = boundary;
-    const seenToolCalls = new Set();
-    const missingToolCalls = new Set();
-    // Process assistant message to collect tool calls
-    const processAssistantMessage = (message) => {
-        if (message.role !== "assistant")
-            return;
-        const content = message.content;
-        if (!content)
-            return;
-        for (const part of content) {
-            if (part?.type === "toolCall") {
-                seenToolCalls.add(part.id);
-                if (missingToolCalls.has(part.id)) {
-                    missingToolCalls.delete(part.id);
-                }
-            }
-        }
-    };
-    // Process tool result to check for missing tool calls
-    const processToolResultMessage = (message) => {
-        if (message.role !== "toolResult")
-            return;
-        const toolCallId = message.toolCallId;
-        if (!seenToolCalls.has(toolCallId)) {
-            missingToolCalls.add(toolCallId);
-        }
-    };
-    // First pass: process messages we're keeping
-    for (const message of messages.slice(adjusted)) {
-        processAssistantMessage(message);
-        processToolResultMessage(message);
-    }
-    // Walk backwards to find missing tool calls
-    while (missingToolCalls.size > 0 && adjusted > 0) {
-        adjusted -= 1;
-        const candidate = messages[adjusted];
-        processAssistantMessage(candidate);
-        processToolResultMessage(candidate);
-    }
-    return adjusted;
-}
 // ============================================================================
 // Summarization
 // ============================================================================