@caupulican/pi-adaptative 0.93.17 → 0.93.19

package/dist/core/compaction-controller.d.ts

@@ -94,6 +94,7 @@ export declare class CompactionController {
     private manualAbortController;
     private autoAbortController;
     private autoRunPromise;
+    private activeCompactionLifecycle;
     private overflowRecoveryAttempted;
     private providerRecoveryAttempted;
     private ineffectiveThresholdFrontier;
@@ -101,6 +102,25 @@ export declare class CompactionController {
     constructor(deps: CompactionControllerDeps);
     private buildCompactionInstructions;
     isRunning(): boolean;
+    private buildExecutionOptions;
+    /**
+     * Open the durable compaction transaction only after deterministic preparation has produced its cut.
+     * The caller must invoke this before extension or provider work begins. A failed append deliberately
+     * leaves no active lifecycle, so the caller fails closed before starting summarization.
+     */
+    private beginCompactionLifecycle;
+    private recordAppliedCompaction;
+    /**
+     * Lifecycle records are durable bookkeeping and must not become compaction input or alter the
+     * loop's trailing-compaction guard. They remain in the real branch so recovery can inspect them.
+     */
+    private getCompactionBranch;
+    /**
+     * Close the one transaction for this compaction retry ladder. The marker is attempted at most once;
+     * an append failure is allowed to propagate because success must never be inferred from an unrecorded
+     * terminal. A successful terminal always points at the canonical persisted compaction entry.
+     */
+    private finishCompactionLifecycle;
     resetOverflowRecovery(): void;
     admitProviderRequest(input: ProviderRequestCompactionInput): Promise<ProviderRequestCompactionDecision>;
     abort(): void;
@@ -109,6 +129,8 @@ export declare class CompactionController {
     private runManualCompaction;
     check(assistantMessage: AssistantMessage, skipAbortedCheck?: boolean): Promise<boolean>;
     measureLiveContextTokens(): number;
+    /** Prefer authoritative branch order; timestamps are only a fallback for reconstructed messages. */
+    private isAssistantFromBeforeCompaction;
     get isCompacting(): boolean;
     runAuto(reason: AutoCompactionReason, willRetry: boolean, options?: AutoCompactionRunOptions): Promise<boolean>;
     private runAutoOnce;

package/dist/core/compaction-controller.d.ts.map

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

package/dist/core/compaction-controller.js

@@ -1,10 +1,11 @@
+import { randomUUID } from "node:crypto";
 import { assessCompactionNeed, calculateContextTokens, compact, createDeterministicCompaction, estimateContextTokens, prepareCompaction, shouldCompact, } from "@caupulican/pi-agent-core/compaction/compaction";
 import { runCompactionLoop } from "@caupulican/pi-agent-core/compaction/loop";
-import { createCustomMessage } from "@caupulican/pi-agent-core/messages";
+import { convertToLlm, createCustomMessage } from "@caupulican/pi-agent-core/messages";
 import { estimateProviderRequestTokens } from "@caupulican/pi-agent-core/provider-request-estimator";
 import { projectToolsForProvider } from "@caupulican/pi-agent-core/provider-tool-projection";
 import { classifyFailure, computeRetryDelayMs, DEFAULT_RETRY_POLICY, sleepAbortable, } from "@caupulican/pi-agent-core/reliability";
-import { getLatestCompactionEntry } from "@caupulican/pi-agent-core/session";
+import { getLatestCompactionEntry, isSessionLifecycleEntry, } from "@caupulican/pi-agent-core/session";
 import { isContextOverflow } from "@caupulican/pi-ai/overflow";
 import { materializeProviderRequest } from "@caupulican/pi-ai/stream";
 import { formatNoModelSelectedMessage } from "./auth-guidance.js";
@@ -19,6 +20,16 @@ const COMPACTION_RETRY_PREPARATION_OPTIONS = { allowTrailingCompactionAsPrevious
 const INEFFECTIVE_THRESHOLD_SKIP_REASON = "previous auto-compaction did not restore headroom; waiting for materially new compactable history";
 const PROVIDER_RECOVERY_CONTINUATION_CUSTOM_TYPE = "provider_recovery_continuation";
 const PROVIDER_RECOVERY_CONTINUATION = "Continue the latest owner request from the compacted checkpoint.";
+function boundedCompactionLifecycleError(error) {
+    const message = error instanceof Error ? error.message : typeof error === "string" ? error : "compaction failed";
+    const sanitized = message
+        .replace(/[\u0000-\u001F\u007F]/g, " ")
+        .replace(/\s+/g, " ")
+        .trim();
+    if (!sanitized)
+        return "compaction failed";
+    return sanitized.length > 500 ? `${sanitized.slice(0, 500)}…` : sanitized;
+}
 function formatRequestTokenBreakdown(input) {
     const total = Math.max(0, Math.ceil(input.requestTokens));
     const nonCompactable = Math.max(0, Math.min(total, Math.ceil(input.nonCompactableTokens)));
@@ -72,6 +83,90 @@ export class CompactionController {
             this.autoAbortController !== undefined ||
             this.autoRunPromise !== undefined);
     }
+    buildExecutionOptions(preparation, settings, compactionModel, sessionModel, chunked) {
+        const options = { chunked };
+        const reusesSessionLane = settings.strategy === "session-replacement" &&
+            compactionModel.provider === sessionModel.provider &&
+            compactionModel.id === sessionModel.id &&
+            compactionModel.api === sessionModel.api &&
+            compactionModel.baseUrl === sessionModel.baseUrl;
+        if (!reusesSessionLane)
+            return options;
+        const request = materializeProviderRequest({
+            systemPrompt: this.deps.agent.state.systemPrompt,
+            messages: convertToLlm(preparation.messagesToSummarize),
+            tools: projectToolsForProvider(this.deps.agent.state.tools),
+        }, { textToolCallProtocol: this.deps.agent.textToolCallProtocol });
+        options.structuredRequest = {
+            context: request.context,
+            sessionId: this.deps.sessionManager.getSessionId(),
+            cacheRetention: "short",
+        };
+        return options;
+    }
+    /**
+     * Open the durable compaction transaction only after deterministic preparation has produced its cut.
+     * The caller must invoke this before extension or provider work begins. A failed append deliberately
+     * leaves no active lifecycle, so the caller fails closed before starting summarization.
+     */
+    beginCompactionLifecycle(preparation) {
+        if (this.activeCompactionLifecycle)
+            return;
+        const compactionId = randomUUID();
+        this.deps.sessionManager.appendCompactionStart(compactionId, preparation.firstKeptEntryId, preparation.tokensBefore);
+        this.activeCompactionLifecycle = { compactionId, endAttempted: false };
+    }
+    recordAppliedCompaction(compactionEntryId) {
+        if (this.activeCompactionLifecycle)
+            this.activeCompactionLifecycle.latestCompactionEntryId = compactionEntryId;
+    }
+    /**
+     * Lifecycle records are durable bookkeeping and must not become compaction input or alter the
+     * loop's trailing-compaction guard. They remain in the real branch so recovery can inspect them.
+     */
+    getCompactionBranch() {
+        return this.deps.sessionManager.getBranch().filter((entry) => !isSessionLifecycleEntry(entry));
+    }
+    /**
+     * Close the one transaction for this compaction retry ladder. The marker is attempted at most once;
+     * an append failure is allowed to propagate because success must never be inferred from an unrecorded
+     * terminal. A successful terminal always points at the canonical persisted compaction entry.
+     */
+    finishCompactionLifecycle(outcome, error) {
+        const lifecycle = this.activeCompactionLifecycle;
+        if (!lifecycle || lifecycle.endAttempted)
+            return;
+        lifecycle.endAttempted = true;
+        let terminalOutcome = outcome;
+        let terminalError = error === undefined ? undefined : boundedCompactionLifecycleError(error);
+        let invalidSuccess = false;
+        if (terminalOutcome === "success" && !lifecycle.latestCompactionEntryId) {
+            terminalOutcome = "failure";
+            terminalError = "compaction succeeded without a persisted compaction entry";
+            invalidSuccess = true;
+        }
+        try {
+            if (terminalOutcome === "success") {
+                this.deps.sessionManager.appendCompactionEnd(lifecycle.compactionId, terminalOutcome, {
+                    compactionEntryId: lifecycle.latestCompactionEntryId,
+                });
+            }
+            else if (terminalError) {
+                this.deps.sessionManager.appendCompactionEnd(lifecycle.compactionId, terminalOutcome, {
+                    error: terminalError,
+                });
+            }
+            else {
+                this.deps.sessionManager.appendCompactionEnd(lifecycle.compactionId, terminalOutcome);
+            }
+        }
+        finally {
+            if (this.activeCompactionLifecycle === lifecycle)
+                this.activeCompactionLifecycle = undefined;
+        }
+        if (invalidSuccess)
+            throw new Error(terminalError);
+    }
     resetOverflowRecovery() {
         this.overflowRecoveryAttempted = false;
         this.providerRecoveryAttempted = false;
@@ -176,6 +271,12 @@ export class CompactionController {
             primaryError = error;
             const message = error instanceof Error ? error.message : String(error);
             const aborted = message === "Compaction cancelled" || (error instanceof Error && error.name === "AbortError");
+            try {
+                this.finishCompactionLifecycle(aborted ? "cancelled" : "failure", aborted ? undefined : error);
+            }
+            catch (lifecycleError) {
+                primaryError = new AggregateError([primaryError, lifecycleError], "Compaction failed and its durable lifecycle terminal could not be recorded");
+            }
             this.deps.emit({
                 type: "compaction_end",
                 reason: "manual",
@@ -222,7 +323,7 @@ export class CompactionController {
             await this.deps.getRequestAuth(selectedCompactionModel);
         const selectionReason = this.deps.getSelectionReason() ?? "unknown";
         const settings = this.deps.getAdaptedSettings();
-        const initialBranch = this.deps.sessionManager.getBranch();
+        const initialBranch = this.getCompactionBranch();
         const initialPreparation = prepareCompaction(initialBranch, settings);
         if (!initialPreparation) {
             const lastEntry = initialBranch[initialBranch.length - 1];
@@ -230,6 +331,7 @@ export class CompactionController {
                 throw new Error("Already compacted");
             throw new Error("Nothing to compact (session too small)");
         }
+        this.beginCompactionLifecycle(initialPreparation);
         // Resolve once for the complete retry ladder. Provider hooks can perform durable flushes and
         // must not be repeated for every summarizer/gate retry.
         const effectiveInstructions = await this.buildCompactionInstructions(customInstructions);
@@ -237,7 +339,8 @@ export class CompactionController {
         if (extension.cancelled)
             throw new Error("Compaction cancelled");
         if (extension.result) {
-            await this.applyResult(extension.result, true);
+            this.recordAppliedCompaction(await this.applyResult(extension.result, true));
+            this.finishCompactionLifecycle("success");
             this.deps.emit({
                 type: "compaction_end",
                 reason: "manual",
@@ -252,7 +355,7 @@ export class CompactionController {
             measureLiveTokens: () => Math.max(this.deps.estimateCurrentContextTokens(this.deps.agent.state.messages), 1),
             shouldCompact: () => true,
             getPostApplyMargin: () => 0,
-            getBranch: () => this.deps.sessionManager.getBranch(),
+            getBranch: () => this.getCompactionBranch(),
             getBaseKeepRecentTokens: () => settings.keepRecentTokens,
             resolveModelAndAuth: async (modelTier) => {
                 const model = modelTier === "cheap" ? selectedCompactionModel : sessionModel;
@@ -263,7 +366,7 @@ export class CompactionController {
                 if (!preparation)
                     throw new Error("Nothing to compact (session too small)");
                 const compactionThinkingLevel = this.deps.resolveThinkingLevel(model, sessionModel);
-                const result = await this.deps.compactWithRetry(() => compact(preparation, model, apiKey, headers, effectiveInstructions, signal, compactionThinkingLevel, this.deps.agent.streamFn, this.deps.buildPreDigest(), { chunked: params.chunked }), signal, model.provider);
+                const result = await this.deps.compactWithRetry(() => compact(preparation, model, apiKey, headers, effectiveInstructions, signal, compactionThinkingLevel, this.deps.agent.streamFn, this.deps.buildPreDigest(), this.buildExecutionOptions(preparation, settings, model, sessionModel, params.chunked)), signal, model.provider);
                 return { result };
             },
             buildDeterministicCheckpoint: (params) => {
@@ -275,7 +378,7 @@ export class CompactionController {
             apply: async (result) => {
                 if (signal.aborted)
                     throw new Error("Compaction cancelled");
-                await this.applyResult(result, false);
+                this.recordAppliedCompaction(await this.applyResult(result, false));
                 appliedResult = result;
             },
             verifyPostApplyEffect: () => false,
@@ -295,6 +398,7 @@ export class CompactionController {
         if (outcome.kind === "skip" || !appliedResult) {
             throw new Error(outcome.kind === "skip" ? outcome.reason : "Compaction failed");
         }
+        this.finishCompactionLifecycle("success");
         this.deps.emit({
             type: "compaction_end",
             reason: "manual",
@@ -314,7 +418,7 @@ export class CompactionController {
         const contextWindow = model?.contextWindow ?? 0;
         const sameModel = model && assistantMessage.provider === model.provider && assistantMessage.model === model.id;
         const compactionEntry = getLatestCompactionEntry(this.deps.sessionManager.getBranch());
-        const assistantIsFromBeforeCompaction = compactionEntry !== null && assistantMessage.timestamp <= new Date(compactionEntry.timestamp).getTime();
+        const assistantIsFromBeforeCompaction = this.isAssistantFromBeforeCompaction(assistantMessage, compactionEntry);
         if (assistantIsFromBeforeCompaction)
             return false;
         if (sameModel && isContextOverflow(assistantMessage, contextWindow)) {
@@ -350,9 +454,7 @@ export class CompactionController {
             if (estimate.lastUsageIndex === null)
                 return false;
             const usageMessage = messages[estimate.lastUsageIndex];
-            if (compactionEntry &&
-                usageMessage.role === "assistant" &&
-                usageMessage.timestamp <= new Date(compactionEntry.timestamp).getTime()) {
+            if (usageMessage.role === "assistant" && this.isAssistantFromBeforeCompaction(usageMessage, compactionEntry)) {
                 return false;
             }
             contextTokens = estimate.tokens;
@@ -362,9 +464,7 @@ export class CompactionController {
             const estimate = estimateContextTokens(this.deps.agent.state.messages);
             if (estimate.lastUsageIndex !== null) {
                 const usageMessage = this.deps.agent.state.messages[estimate.lastUsageIndex];
-                const usageIsPostCompaction = !(compactionEntry &&
-                    usageMessage.role === "assistant" &&
-                    usageMessage.timestamp <= new Date(compactionEntry.timestamp).getTime());
+                const usageIsPostCompaction = !(usageMessage.role === "assistant" && this.isAssistantFromBeforeCompaction(usageMessage, compactionEntry));
                 if (usageIsPostCompaction)
                     contextTokens = Math.max(contextTokens, estimate.tokens);
             }
@@ -385,11 +485,27 @@ export class CompactionController {
             return estimatedTokens;
         }
         const compactionEntry = getLatestCompactionEntry(this.deps.sessionManager.getBranch());
-        if (compactionEntry && assistantMessage.timestamp <= new Date(compactionEntry.timestamp).getTime()) {
+        if (this.isAssistantFromBeforeCompaction(assistantMessage, compactionEntry)) {
             return estimatedTokens;
         }
         return Math.max(calculateContextTokens(assistantMessage.usage), estimatedTokens);
     }
+    /** Prefer authoritative branch order; timestamps are only a fallback for reconstructed messages. */
+    isAssistantFromBeforeCompaction(assistantMessage, compactionEntry) {
+        if (!compactionEntry)
+            return false;
+        const branch = this.deps.sessionManager.getBranch();
+        const compactionPosition = branch.findIndex((entry) => entry.id === compactionEntry.id);
+        if (compactionPosition >= 0) {
+            for (let position = branch.length - 1; position >= 0; position--) {
+                const entry = branch[position];
+                if (entry?.type === "message" && entry.message === assistantMessage) {
+                    return position < compactionPosition;
+                }
+            }
+        }
+        return assistantMessage.timestamp <= new Date(compactionEntry.timestamp).getTime();
+    }
     get isCompacting() {
         return this.isRunning();
     }
@@ -421,6 +537,8 @@ export class CompactionController {
         let fromExtension = false;
         let lastCompaction;
         let extensionCancelled = false;
+        let effectiveInstructions;
+        let effectiveInstructionsReady = false;
         try {
             if (!model) {
                 this.deps.emit({
@@ -435,10 +553,20 @@ export class CompactionController {
             }
             const contextWindow = model.contextWindow;
             const margin = Math.max(0, Math.floor(0.01 * contextWindow));
-            // One event-driven handoff per compaction run; every retry reuses this bounded value.
-            const effectiveInstructions = await this.buildCompactionInstructions();
+            // When the caller supplied the exact request total (or recovery makes compaction mandatory),
+            // open the transaction before model/auth resolution. Threshold runs without an admitted total
+            // stay lazy so a changing live measurement cannot create a marker for a later no-op skip.
+            const canPreflight = reason !== "threshold" || options.initialTokens !== undefined;
+            const preflightShouldCompact = reason !== "threshold" ||
+                (options.initialTokens !== undefined &&
+                    shouldCompact(options.initialTokens, contextWindow, settings, model.autoCompactionTriggerTokens));
+            if (canPreflight && preflightShouldCompact) {
+                const preflightPreparation = prepareCompaction(this.getCompactionBranch(), settings, options.allowTrailingCompactionAsPrevious ? COMPACTION_RETRY_PREPARATION_OPTIONS : undefined);
+                if (preflightPreparation)
+                    this.beginCompactionLifecycle(preflightPreparation);
+            }
             const outcome = await runCompactionLoop({
-                getBranch: () => this.deps.sessionManager.getBranch(),
+                getBranch: () => this.getCompactionBranch(),
                 measureLiveTokens: () => options.initialTokens ?? this.deps.measureLiveContextTokens(),
                 shouldCompact: reason === "threshold"
                     ? (tokens) => shouldCompact(tokens, contextWindow, settings, model.autoCompactionTriggerTokens)
@@ -454,6 +582,12 @@ export class CompactionController {
                     }, COMPACTION_RETRY_PREPARATION_OPTIONS);
                     if (!preparation)
                         throw new Error("already compacted");
+                    this.beginCompactionLifecycle(preparation);
+                    // One event-driven handoff per compaction run; every retry reuses this bounded value.
+                    if (!effectiveInstructionsReady) {
+                        effectiveInstructions = await this.buildCompactionInstructions();
+                        effectiveInstructionsReady = true;
+                    }
                     const compactionThinkingLevel = this.deps.resolveThinkingLevel(compactModel, model);
                     const extension = await this.getExtensionCompaction(preparation, branchEntries, effectiveInstructions, signal);
                     if (extension.cancelled) {
@@ -464,19 +598,20 @@ export class CompactionController {
                         fromExtension = true;
                         return { result: extension.result };
                     }
-                    const result = await this.deps.compactWithRetry(() => compact(preparation, compactModel, apiKey, headers, effectiveInstructions, signal, compactionThinkingLevel, this.deps.agent.streamFn, this.deps.buildPreDigest(), { chunked: params.chunked }), signal, compactModel.provider);
+                    const result = await this.deps.compactWithRetry(() => compact(preparation, compactModel, apiKey, headers, effectiveInstructions, signal, compactionThinkingLevel, this.deps.agent.streamFn, this.deps.buildPreDigest(), this.buildExecutionOptions(preparation, settings, compactModel, model, params.chunked)), signal, compactModel.provider);
                     return { result };
                 },
                 buildDeterministicCheckpoint: (params) => {
-                    const preparation = prepareCompaction(this.deps.sessionManager.getBranch(), { ...settings, keepRecentTokens: params.keepRecentTokens }, COMPACTION_RETRY_PREPARATION_OPTIONS);
+                    const preparation = prepareCompaction(this.getCompactionBranch(), { ...settings, keepRecentTokens: params.keepRecentTokens }, COMPACTION_RETRY_PREPARATION_OPTIONS);
                     if (!preparation)
                         throw new Error("already compacted");
+                    this.beginCompactionLifecycle(preparation);
                     fromExtension = false;
                     return { result: createDeterministicCompaction(preparation) };
                 },
                 apply: async (result) => {
                     lastCompaction = result;
-                    await this.applyResult(result, fromExtension);
+                    this.recordAppliedCompaction(await this.applyResult(result, fromExtension));
                 },
                 verifyPostApplyEffect: reason !== "threshold" || options.singlePass ? () => false : undefined,
                 allowTrailingCompactionAsPrevious: options.allowTrailingCompactionAsPrevious,
@@ -490,6 +625,7 @@ export class CompactionController {
                 signal,
             });
             if (outcome.kind === "skip") {
+                this.finishCompactionLifecycle("failure", outcome.reason);
                 this.deps.emit({
                     type: "compaction_end",
                     reason,
@@ -502,12 +638,14 @@ export class CompactionController {
             }
             if (outcome.kind === "failed") {
                 if (outcome.reason === "aborted") {
+                    this.finishCompactionLifecycle("cancelled");
                     this.deps.emit({ type: "compaction_end", reason, result: undefined, aborted: true, willRetry: false });
                     return hadQueuedMessages || this.deps.agent.hasQueuedMessages();
                 }
                 throw new Error(outcome.reason);
             }
             if (extensionCancelled || signal.aborted) {
+                this.finishCompactionLifecycle("cancelled");
                 this.deps.emit({ type: "compaction_end", reason, result: undefined, aborted: true, willRetry: false });
                 return hadQueuedMessages || this.deps.agent.hasQueuedMessages();
             }
@@ -524,24 +662,29 @@ export class CompactionController {
                 if (reason === "provider_recovery")
                     this.appendProviderRecoveryContinuation();
             }
+            this.finishCompactionLifecycle("success");
             this.deps.emit({ type: "compaction_end", reason, result, aborted: false, willRetry });
             if (willRetry)
                 return true;
             return hadQueuedMessages || this.deps.agent.hasQueuedMessages();
         }
         catch (error) {
-            const errorMessage = error instanceof Error ? error.message : "compaction failed";
+            const errorMessage = boundedCompactionLifecycleError(error);
+            const aborted = extensionCancelled || signal.aborted || errorMessage === "Compaction cancelled";
+            this.finishCompactionLifecycle(aborted ? "cancelled" : "failure", aborted ? undefined : error);
             this.deps.emit({
                 type: "compaction_end",
                 reason,
                 result: undefined,
-                aborted: false,
+                aborted,
                 willRetry: false,
-                errorMessage: reason === "overflow"
-                    ? `Context overflow recovery failed: ${errorMessage}`
-                    : reason === "provider_recovery"
-                        ? `Provider failure recovery failed: ${errorMessage}`
-                        : `Auto-compaction failed: ${errorMessage}`,
+                errorMessage: aborted
+                    ? undefined
+                    : reason === "overflow"
+                        ? `Context overflow recovery failed: ${errorMessage}`
+                        : reason === "provider_recovery"
+                            ? `Provider failure recovery failed: ${errorMessage}`
+                            : `Auto-compaction failed: ${errorMessage}`,
             });
             return hadQueuedMessages || this.deps.agent.hasQueuedMessages();
         }
@@ -644,10 +787,27 @@ export class CompactionController {
             customInstructions,
             signal,
         }));
-        return { cancelled: extensionResult?.cancel === true, result: extensionResult?.compaction };
+        const result = extensionResult?.compaction;
+        return {
+            cancelled: extensionResult?.cancel === true,
+            result: result && preparation.retention
+                ? {
+                    ...result,
+                    firstKeptEntryId: preparation.firstKeptEntryId,
+                    retention: preparation.retention,
+                }
+                : result,
+        };
     }
     async applyResult(result, fromExtension) {
-        this.deps.sessionManager.appendCompaction(result.summary, result.firstKeptEntryId, result.tokensBefore, result.details, fromExtension, result.usage);
+        const sessionFile = this.deps.sessionManager.getSessionFile();
+        if (result.retention?.mode === "original-user" && sessionFile) {
+            const transcriptPointer = `Full pre-compaction transcript: ${sessionFile}`;
+            if (!result.summary.includes(transcriptPointer)) {
+                result.summary = `${result.summary.trimEnd()}\n\n${transcriptPointer}`;
+            }
+        }
+        const compactionEntryId = this.deps.sessionManager.appendCompaction(result.summary, result.firstKeptEntryId, result.tokensBefore, result.details, fromExtension, result.usage, result.retention);
         this.deps.refreshAfterCompaction();
         const savedEntry = this.deps.sessionManager
             .getEntries()
@@ -659,6 +819,7 @@ export class CompactionController {
                 fromExtension,
             });
         }
+        return compactionEntryId;
     }
 }
 //# sourceMappingURL=compaction-controller.js.map