@caupulican/pi-agent-core 0.81.39 → 0.81.41

package/dist/compaction/compaction.js

@@ -4,12 +4,13 @@
  * Pure functions for compaction logic. The session manager handles I/O,
  * and after compaction the session is reloaded.
  */
-import { completeSimple } from "@caupulican/pi-ai";
+import { completeSimple, uuidv7 } from "@caupulican/pi-ai";
 import { convertToLlm, createBranchSummaryMessage, createCompactionSummaryMessage, createCustomMessage, } from "../messages.js";
 import { buildSessionContext } from "../session/session-manager.js";
+import { addUsage, combineUsage, createEmptyUsage } from "../usage.js";
 import { extractCompactionFacts, renderFactsBlock } from "./extraction.js";
 import { computeFileLists, createFileOps, extractFileOpsFromMessage, SUMMARIZATION_SYSTEM_PROMPT, serializeConversation, } from "./utils.js";
-import { buildRetryPrompt, deterministicallyFillSummaryGaps, isCompactionSummaryStructurallyUsable, verifySummary, } from "./verification.js";
+import { buildRetryPrompt, CompactionVerificationError, deterministicallyFillSummaryGaps, isCompactionSummaryStructurallyUsable, verifySummary, } from "./verification.js";
 /**
  * Extract file operations from messages and previous compaction entries.
  */
@@ -65,6 +66,60 @@ function getMessageFromEntryForCompaction(entry) {
     }
     return getMessageFromEntry(entry);
 }
+/**
+ * Carry failed LLM verification attempts into the result that the retry ladder eventually applies.
+ * Only bounded numeric/check identifiers are persisted in details; raw facts stay in the in-memory reports.
+ */
+export function mergeCompactionVerificationReports(result, reports) {
+    if (reports.length === 0)
+        return result;
+    const combinedReports = [
+        ...reports.map(cloneVerificationReport),
+        ...(result.verificationGateFailures ?? []).map(cloneVerificationReport),
+    ];
+    result.verificationGateFailures = combinedReports;
+    if (result.details === undefined || isPlainRecord(result.details)) {
+        const details = result.details ?? {};
+        result.details = {
+            ...details,
+            verificationGateFailures: combinedReports.length,
+            verificationGateChecks: aggregateVerificationChecks(combinedReports),
+        };
+    }
+    return result;
+}
+function cloneVerificationReport(report) {
+    return {
+        ok: report.ok,
+        failures: report.failures.map((failure) => ({ ...failure })),
+    };
+}
+function isPlainRecord(value) {
+    if (!value || typeof value !== "object" || Array.isArray(value))
+        return false;
+    const prototype = Object.getPrototypeOf(value);
+    return prototype === Object.prototype || prototype === null;
+}
+function aggregateVerificationChecks(reports) {
+    const checks = new Map();
+    for (const report of reports) {
+        for (const failure of report.failures) {
+            const current = checks.get(failure.check) ?? { failures: 0 };
+            current.failures++;
+            if (failure.score !== undefined && Number.isFinite(failure.score)) {
+                current.minScore = Math.min(current.minScore ?? failure.score, failure.score);
+                current.maxScore = Math.max(current.maxScore ?? failure.score, failure.score);
+            }
+            if (failure.threshold !== undefined && Number.isFinite(failure.threshold)) {
+                current.threshold = failure.threshold;
+            }
+            if (failure.comparator)
+                current.comparator = failure.comparator;
+            checks.set(failure.check, current);
+        }
+    }
+    return Object.fromEntries(checks);
+}
 export const DEFAULT_COMPACTION_SETTINGS = {
     enabled: true,
     reserveTokens: 16384,
@@ -108,20 +163,33 @@ export function getLastAssistantUsage(entries) {
     }
     return undefined;
 }
-function getLastAssistantUsageInfo(messages) {
-    for (let i = messages.length - 1; i >= 0; i--) {
-        const usage = getAssistantUsage(messages[i]);
-        if (usage)
-            return { usage, index: i };
+/**
+ * Find the newest assistant usage that still describes the current message prefix.
+ *
+ * Compaction can insert a newer summary before retained older messages. Usage recorded by an
+ * assistant before that inserted message describes the pre-compaction prefix and must not anchor
+ * the rebuilt context estimate. Walking forward lets the newest timestamp in the prefix invalidate
+ * those stale usage blocks while still accepting the first response produced after compaction.
+ */
+export function getApplicableAssistantUsageInfo(messages) {
+    let latestPrefixTimestamp = Number.NEGATIVE_INFINITY;
+    let usageInfo;
+    for (let i = 0; i < messages.length; i++) {
+        const message = messages[i];
+        const usage = getAssistantUsage(message);
+        if (usage && message.timestamp >= latestPrefixTimestamp) {
+            usageInfo = { usage, index: i };
+        }
+        latestPrefixTimestamp = Math.max(latestPrefixTimestamp, message.timestamp);
     }
-    return undefined;
+    return usageInfo;
 }
 /**
  * Estimate context tokens from messages, using the last assistant usage when available.
  * If there are messages after the last usage, estimate their tokens with estimateTokens.
  */
 export function estimateContextTokens(messages) {
-    const usageInfo = getLastAssistantUsageInfo(messages);
+    const usageInfo = getApplicableAssistantUsageInfo(messages);
     if (!usageInfo) {
         let estimated = 0;
         for (const message of messages) {
@@ -418,11 +486,16 @@ Same section order. Verification checklist (the verifier checks exactly these ch
 
 Budget: ~{BUDGET} tokens.`;
 function createSummarizationOptions(model, maxTokens, apiKey, headers, signal, thinkingLevel) {
-    // SUMMARIZATION_SYSTEM_PROMPT is static and the compaction retry ladder can resend a
-    // near-identical prefix (same conversation/facts block) within one attempt — let the provider
-    // cache it so a retry only pays for the variable tail. Matches the repo's default ("short")
-    // exactly; set explicitly so the intent isn't silently dependent on the provider default.
-    const options = { maxTokens, signal, apiKey, headers, cacheRetention: "short" };
+    // Summaries are one-shot prompts. A fresh affinity identity prevents them from contaminating the
+    // foreground continuation cache, while "none" prevents cache writes that cannot be reused.
+    const options = {
+        maxTokens,
+        signal,
+        apiKey,
+        headers,
+        cacheRetention: "none",
+        sessionId: uuidv7(),
+    };
     if (model.reasoning && thinkingLevel && thinkingLevel !== "off") {
         options.reasoning = thinkingLevel;
     }
@@ -467,7 +540,11 @@ async function prepareSummarizationConversationText(currentMessages, preDigest,
  *   the same message span across multiple attempts (a verification-gate retry), compute this once
  *   via {@link prepareSummarizationConversationText} and pass it to every attempt.
  */
-export async function generateSummary(currentMessages, model, reserveTokens, apiKey, headers, signal, customInstructions, previousSummary, thinkingLevel, streamFn, preDigest, factsBlock = "verification demands:\nfiles-modified-recall (must appear in ## Files):\nfiles-read-recall (must appear in ## Files, containment threshold applies):\nworking-set-recall (must appear in ## Working Set):\nopen-errors-recall (must appear in ## Open Problems):\nactions-recall (must appear in ## Done):\nmandatory-rules-recall (must appear in ### Mandatory Rules):\nactive-task-containment (must appear in ## Active Task):\ncancelled-work-dropped (must NOT appear outside ### Mandatory Rules):", chunked = false, precomputedConversationText) {
+export async function generateSummary(currentMessages, model, reserveTokens, apiKey, headers, signal, customInstructions, previousSummary, thinkingLevel, streamFn, preDigest, factsBlock = "verification demands:\nfiles-modified-recall (must appear in ## Files):\nfiles-read-recall (must appear as exact paths in ## Files, path recall threshold applies):\nworking-set-recall (must appear in ## Working Set):\nopen-errors-recall (must appear in ## Open Problems):\nactions-recall (must appear in ## Done):\nmandatory-rules-recall (must appear in ### Mandatory Rules):\nactive-task-containment (must appear in ## Active Task):\ncancelled-work-dropped (must NOT appear outside ### Mandatory Rules):", chunked = false, precomputedConversationText) {
+    return (await generateSummaryWithUsage(currentMessages, model, reserveTokens, apiKey, headers, signal, customInstructions, previousSummary, thinkingLevel, streamFn, preDigest, factsBlock, chunked, precomputedConversationText)).text;
+}
+export async function generateSummaryWithUsage(currentMessages, model, reserveTokens, apiKey, headers, signal, customInstructions, previousSummary, thinkingLevel, streamFn, preDigest, factsBlock = "verification demands:\nfiles-modified-recall (must appear in ## Files):\nfiles-read-recall (must appear as exact paths in ## Files, path recall threshold applies):\nworking-set-recall (must appear in ## Working Set):\nopen-errors-recall (must appear in ## Open Problems):\nactions-recall (must appear in ## Done):\nmandatory-rules-recall (must appear in ### Mandatory Rules):\nactive-task-containment (must appear in ## Active Task):\ncancelled-work-dropped (must NOT appear outside ### Mandatory Rules):", chunked = false, precomputedConversationText) {
+    const usage = createEmptyUsage();
     const summaryBudget = getSummaryBudget(reserveTokens, model, factsBlock);
     const maxTokens = summaryBudget;
     let promptSuffix = fillPromptTemplate(previousSummary ? UPDATE_SUMMARIZATION_PROMPT : SUMMARIZATION_PROMPT, factsBlock, summaryBudget);
@@ -483,7 +560,7 @@ export async function generateSummary(currentMessages, model, reserveTokens, api
         if (!chunked) {
             throw new Error("input-overflow: summarization request exceeds summarizer window");
         }
-        conversationText = await summarizeChunks(conversationText, model, maxTokens, apiKey, headers, signal, thinkingLevel, streamFn, inputBound, previousSummary, promptSuffix);
+        conversationText = await summarizeChunks(conversationText, model, maxTokens, apiKey, headers, signal, thinkingLevel, streamFn, inputBound, previousSummary, promptSuffix, usage);
     }
     const promptText = buildSummarizationPrompt(conversationText, previousSummary, promptSuffix);
     if (estimateStringTokens(promptText) > inputBound) {
@@ -499,6 +576,7 @@ export async function generateSummary(currentMessages, model, reserveTokens, api
             },
         ],
     }, createSummarizationOptions(model, maxTokens, apiKey, headers, signal, thinkingLevel), streamFn);
+    addUsage(usage, response.usage);
     if (response.stopReason === "error") {
         throw new Error(`Summarization failed: ${response.errorMessage || "Unknown error"}`);
     }
@@ -507,7 +585,7 @@ export async function generateSummary(currentMessages, model, reserveTokens, api
     if (response.stopReason === "length") {
         throw new Error("summary-length-stop: summarizer hit its output cap before completing the checkpoint");
     }
-    return truncateSummaryToBudget(extractTextContent(response), summaryBudget);
+    return { text: truncateSummaryToBudget(extractTextContent(response), summaryBudget), usage };
 }
 function fillPromptTemplate(template, factsBlock, budget) {
     return template.replaceAll("{FACTS_BLOCK}", factsBlock).replaceAll("{BUDGET}", String(budget));
@@ -569,10 +647,10 @@ export function getChunkSummarizationTokenBudget(inputBound) {
 export function buildChunkSummarizationPrompt(chunk, index, total) {
     return `<conversation-chunk index="${index}" total="${total}">\n${chunk}\n</conversation-chunk>\n\nSummarize this chunk for a later checkpoint merge. Preserve exact file paths, commands, errors, user prohibitions, and active work. Output concise notes only.`;
 }
-async function summarizeChunks(conversationText, model, maxTokens, apiKey, headers, signal, thinkingLevel, streamFn, inputBound, previousSummary, promptSuffix) {
+async function summarizeChunks(conversationText, model, maxTokens, apiKey, headers, signal, thinkingLevel, streamFn, inputBound, previousSummary, promptSuffix, usage) {
     let reducedText = conversationText;
     for (let pass = 0; pass < 3; pass++) {
-        const summary = await summarizeChunkPass(reducedText, model, maxTokens, apiKey, headers, signal, thinkingLevel, streamFn, inputBound);
+        const summary = await summarizeChunkPass(reducedText, model, maxTokens, apiKey, headers, signal, thinkingLevel, streamFn, inputBound, usage);
         if (estimateStringTokens(buildSummarizationPrompt(summary, previousSummary, promptSuffix)) <= inputBound) {
             return summary;
         }
@@ -580,7 +658,7 @@ async function summarizeChunks(conversationText, model, maxTokens, apiKey, heade
     }
     throw new Error("input-overflow: chunked summarization merge still exceeds summarizer window");
 }
-async function summarizeChunkPass(conversationText, model, maxTokens, apiKey, headers, signal, thinkingLevel, streamFn, inputBound) {
+async function summarizeChunkPass(conversationText, model, maxTokens, apiKey, headers, signal, thinkingLevel, streamFn, inputBound, usage) {
     const maxChunkTokens = getChunkSummarizationTokenBudget(inputBound);
     const maxChunkChars = Math.max(1, maxChunkTokens * 4);
     const chunks = splitText(conversationText, maxChunkChars);
@@ -597,6 +675,7 @@ async function summarizeChunkPass(conversationText, model, maxTokens, apiKey, he
                 },
             ],
         }, createSummarizationOptions(model, maxTokens, apiKey, headers, signal, thinkingLevel), streamFn);
+        addUsage(usage, response.usage);
         if (response.stopReason === "error") {
             throw new Error(`Summarization failed: ${response.errorMessage || "Unknown error"}`);
         }
@@ -744,6 +823,40 @@ Summarize the prefix to provide context for the retained suffix:
 - [Information needed to understand the retained recent work]
 
 Be concise. Focus on what's needed to understand the kept suffix.`;
+async function generateVerifiedSummary(options) {
+    let retryInstructions = options.customInstructions;
+    const usage = createEmptyUsage();
+    const verificationGateFailures = [];
+    const precomputedConversationText = await prepareSummarizationConversationText(options.messages, options.preDigest, options.signal);
+    for (let attempt = 0; attempt < 2; attempt++) {
+        const generated = await generateSummaryWithUsage(options.messages, options.model, options.reserveTokens, options.apiKey, options.headers, options.signal, retryInstructions, options.previousSummary, options.thinkingLevel, options.streamFn, options.preDigest, options.factsBlock, options.chunked, precomputedConversationText);
+        addUsage(usage, generated.usage);
+        const summary = generated.text;
+        const verification = verifySummary(summary, options.facts);
+        if (verification.ok) {
+            return { summary, usage, verification, verificationGateFailures, deterministicGapFills: 0 };
+        }
+        verificationGateFailures.push(verification);
+        if (!isCompactionSummaryStructurallyUsable(summary)) {
+            if (attempt >= 1)
+                throw new CompactionVerificationError(verificationGateFailures);
+            retryInstructions = buildRetryPrompt(verification, summary);
+            continue;
+        }
+        const filled = deterministicallyFillSummaryGaps(summary, options.facts);
+        if (filled.verification.ok) {
+            return {
+                summary: filled.summary,
+                usage,
+                verification: filled.verification,
+                verificationGateFailures,
+                deterministicGapFills: filled.changed ? 1 : 0,
+            };
+        }
+        throw new CompactionVerificationError(verificationGateFailures);
+    }
+    throw new CompactionVerificationError(verificationGateFailures);
+}
 /**
  * Generate summaries for compaction using prepared data.
  * Returns CompactionResult - SessionManager adds uuid/parentUuid when saving.
@@ -764,95 +877,50 @@ export async function compact(preparation, model, apiKey, headers, customInstruc
         delegatedWorkerFacts: [],
     };
     const factsBlock = renderFactsBlock(facts);
-    let verification;
-    const verificationGateFailures = [];
-    let deterministicGapFills = 0;
-    let summary = "";
-    if (isSplitTurn && messagesToSummarize.length > 0) {
-        let historySummary = "No prior history.";
-        let historyInstructions = customInstructions;
-        // Computed once and reused across retry attempts below: `messagesToSummarize` and `preDigest`
-        // are identical on every attempt (only the retry instructions change), and `preDigest` makes
-        // real model calls — re-running serialize+preDigest per attempt would resend/re-summarize the
-        // unchanged span for no benefit.
-        const precomputedConversationText = await prepareSummarizationConversationText(messagesToSummarize, preDigest, signal);
-        for (let attempt = 0; attempt < 2; attempt++) {
-            historySummary = await generateSummary(messagesToSummarize, model, settings.reserveTokens, apiKey, headers, signal, historyInstructions, previousSummary, thinkingLevel, streamFn, preDigest, factsBlock, executionOptions?.chunked ?? false, precomputedConversationText);
-            verification = verifySummary(historySummary, facts);
-            if (verification.ok) {
-                break;
-            }
-            if (!isCompactionSummaryStructurallyUsable(historySummary)) {
-                if (attempt >= 1) {
-                    throw new Error(`gate-failed: ${formatVerificationFailures(verification)}`);
-                }
-                historyInstructions = buildRetryPrompt(verification, historySummary);
-                continue;
-            }
-            verificationGateFailures.push(verification);
-            const filled = deterministicallyFillSummaryGaps(historySummary, facts);
-            if (filled.verification.ok) {
-                historySummary = filled.summary;
-                verification = filled.verification;
-                if (filled.changed)
-                    deterministicGapFills++;
-                break;
-            }
-            throw new Error(`gate-failed: ${formatVerificationFailures(filled.verification)}`);
-        }
-        const turnPrefixSummary = await generateTurnPrefixSummary(turnPrefixMessages, model, settings.reserveTokens, apiKey, headers, signal, thinkingLevel, streamFn);
-        summary = `${historySummary}\n\n---\n\n**Turn Context (split turn):**\n\n${turnPrefixSummary}`;
-    }
-    else {
-        let customSummaryInstructions = customInstructions;
-        // See the isSplitTurn branch above: same span/preDigest across attempts, computed once.
-        const precomputedConversationText = await prepareSummarizationConversationText(messagesToSummarize, preDigest, signal);
-        for (let attempt = 0; attempt < 2; attempt++) {
-            summary = await generateSummary(messagesToSummarize, model, settings.reserveTokens, apiKey, headers, signal, customSummaryInstructions, previousSummary, thinkingLevel, streamFn, preDigest, factsBlock, executionOptions?.chunked ?? false, precomputedConversationText);
-            verification = verifySummary(summary, facts);
-            if (verification.ok) {
-                break;
-            }
-            if (!isCompactionSummaryStructurallyUsable(summary)) {
-                if (attempt >= 1) {
-                    throw new Error(`gate-failed: ${formatVerificationFailures(verification)}`);
-                }
-                customSummaryInstructions = buildRetryPrompt(verification, summary);
-                continue;
-            }
-            verificationGateFailures.push(verification);
-            const filled = deterministicallyFillSummaryGaps(summary, facts);
-            if (filled.verification.ok) {
-                summary = filled.summary;
-                verification = filled.verification;
-                if (filled.changed)
-                    deterministicGapFills++;
-                break;
-            }
-            throw new Error(`gate-failed: ${formatVerificationFailures(filled.verification)}`);
-        }
+    const verified = isSplitTurn && messagesToSummarize.length === 0
+        ? undefined
+        : await generateVerifiedSummary({
+            messages: messagesToSummarize,
+            model,
+            reserveTokens: settings.reserveTokens,
+            apiKey,
+            headers,
+            signal,
+            customInstructions,
+            previousSummary,
+            thinkingLevel,
+            streamFn,
+            preDigest,
+            facts,
+            factsBlock,
+            chunked: executionOptions?.chunked ?? false,
+        });
+    let summary = verified?.summary ?? "No prior history.";
+    let summaryUsage = verified?.usage;
+    if (isSplitTurn) {
+        const turnPrefix = await generateTurnPrefixSummary(turnPrefixMessages, model, settings.reserveTokens, apiKey, headers, signal, thinkingLevel, streamFn);
+        summary = `${summary}\n\n---\n\n**Turn Context (split turn):**\n\n${turnPrefix.text}`;
+        summaryUsage = combineUsage(summaryUsage, turnPrefix.usage);
     }
     const { readFiles, modifiedFiles } = computeFileLists(fileOps);
     if (!firstKeptEntryId) {
         throw new Error("First kept entry has no UUID - session may need migration");
     }
-    return {
+    return mergeCompactionVerificationReports({
         summary,
         firstKeptEntryId,
         tokensBefore,
+        usage: summaryUsage,
         details: {
             readFiles,
             modifiedFiles,
-            verificationGateFailures: verificationGateFailures.length,
-            deterministicGapFills,
+            verificationGateFailures: 0,
+            deterministicGapFills: verified?.deterministicGapFills ?? 0,
         },
-        verification,
-        verificationGateFailures,
-        deterministicGapFills,
-    };
-}
-function formatVerificationFailures(verification) {
-    return verification.failures.map((failure) => `${failure.check}: ${failure.detail}`).join(", ");
+        verification: verified?.verification,
+        verificationGateFailures: [],
+        deterministicGapFills: verified?.deterministicGapFills ?? 0,
+    }, verified?.verificationGateFailures ?? []);
 }
 export function createDeterministicCompaction(preparation) {
     const { firstKeptEntryId, tokensBefore, fileOps, facts } = preparation;
@@ -945,9 +1013,12 @@ async function generateTurnPrefixSummary(messages, model, reserveTokens, apiKey,
     if (response.stopReason === "error") {
         throw new Error(`Turn prefix summarization failed: ${response.errorMessage || "Unknown error"}`);
     }
-    return response.content
-        .filter((c) => c.type === "text")
-        .map((c) => c.text)
-        .join("\n");
+    return {
+        text: response.content
+            .filter((c) => c.type === "text")
+            .map((c) => c.text)
+            .join("\n"),
+        usage: response.usage,
+    };
 }
 //# sourceMappingURL=compaction.js.map