@bastani/atomic 0.8.27 → 0.8.28-alpha.2

package/dist/core/compaction/context-compaction.js

@@ -4,7 +4,7 @@ import { mkdtempSync, rmSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { Type } from "typebox";
-import { createBranchSummaryMessage, createCompactionSummaryMessage, createCustomMessage, } from "../messages.js";
+import { createBranchSummaryMessage, createCustomMessage } from "../messages.js";
 import { buildContextDeletionFilteredPath, buildContextDeletionFilters, } from "../session-manager.js";
 import { estimateTokens } from "./compaction.js";
 export const CONTEXT_COMPACTION_PROMPT_VERSION = 1;
@@ -216,19 +216,6 @@ function getToolResultCallId(message) {
     return typeof callId === "string" ? callId : undefined;
 }
 function contentBlocksForEntry(entryId, message, protectedEntry, existingDeletedBlocks) {
-    if (message.role === "compactionSummary") {
-        const text = message.summary;
-        return [
-            {
-                entryId,
-                blockIndex: 0,
-                type: "summary",
-                text,
-                tokenEstimate: estimateTextTokens(text),
-                protected: protectedEntry,
-            },
-        ];
-    }
     const content = message.content;
     if (!Array.isArray(content))
         return [];
@@ -256,7 +243,6 @@ function messageText(message) {
         case "bashExecution":
             return `Ran ${message.command}\n${message.output}`;
         case "branchSummary":
-        case "compactionSummary":
             return message.summary;
         case "custom":
         case "toolResult":
@@ -264,6 +250,17 @@ function messageText(message) {
             return textFromUnknownContent(message.content);
         case "assistant":
             return textFromUnknownContent(message.content);
+        case "compactionSummary":
+            // Legacy summary-compaction message type retained in the upstream AgentMessage union
+            // after summary compaction was removed; surface its archival summary text.
+            return message.summary;
+        default: {
+            // Exhaustiveness guard: adding a new AgentMessage role must fail the build here instead
+            // of silently degrading to an empty string.
+            const _exhaustiveCheck = message;
+            void _exhaustiveCheck;
+            return "";
+        }
     }
 }
 function hasAssistantError(message) {
@@ -275,35 +272,6 @@ function hasToolResultError(message) {
 function hasFailedBashExecution(message) {
     return message.role === "bashExecution" && typeof message.exitCode === "number" && message.exitCode !== 0;
 }
-function collectLatestSummaryCompactionIndex(pathEntries) {
-    for (let i = pathEntries.length - 1; i >= 0; i--) {
-        if (pathEntries[i].type === "compaction")
-            return i;
-    }
-    return -1;
-}
-function collectActiveEntryIndices(pathEntries, latestCompactionIndex) {
-    if (latestCompactionIndex < 0) {
-        return pathEntries.map((_, index) => index);
-    }
-    const latestCompaction = pathEntries[latestCompactionIndex];
-    if (latestCompaction.type !== "compaction")
-        return pathEntries.map((_, index) => index);
-    const indices = [];
-    let foundFirstKept = false;
-    for (let i = 0; i < latestCompactionIndex; i++) {
-        const entry = pathEntries[i];
-        if (entry.id === latestCompaction.firstKeptEntryId) {
-            foundFirstKept = true;
-        }
-        if (foundFirstKept)
-            indices.push(i);
-    }
-    for (let i = latestCompactionIndex + 1; i < pathEntries.length; i++) {
-        indices.push(i);
-    }
-    return indices;
-}
 function isProtectedEntry(entry, message, recentEntryIds) {
     if (recentEntryIds.has(entry.id))
         return true;
@@ -311,7 +279,7 @@ function isProtectedEntry(entry, message, recentEntryIds) {
         return true;
     if (message.role === "custom")
         return true;
-    if (message.role === "branchSummary" || message.role === "compactionSummary")
+    if (message.role === "branchSummary")
         return true;
     if (hasAssistantError(message) || hasToolResultError(message))
         return true;
@@ -324,46 +292,22 @@ function isProtectedEntry(entry, message, recentEntryIds) {
 export function prepareContextCompaction(pathEntries, settings, options = {}) {
     if (pathEntries.length === 0)
         return undefined;
-    const latestCompactionIndex = collectLatestSummaryCompactionIndex(pathEntries);
     const deletionFilters = buildContextDeletionFilters(pathEntries);
     const filteredPathEntries = buildContextDeletionFilteredPath(pathEntries, deletionFilters);
-    const filteredEntryById = new Map(filteredPathEntries.map((entry) => [entry.id, entry]));
-    const activeEntryIndices = collectActiveEntryIndices(pathEntries, latestCompactionIndex);
-    const messageEntryIds = activeEntryIndices
-        .map((index) => filteredEntryById.get(pathEntries[index].id))
-        .filter((entry) => entry !== undefined && getContextEligibleMessageFromEntry(entry) !== undefined)
+    const rawEntryById = new Map(pathEntries.map((entry) => [entry.id, entry]));
+    const messageEntryIds = filteredPathEntries
+        .filter((entry) => entry.type !== "context_compaction" && getContextEligibleMessageFromEntry(entry) !== undefined)
         .map((entry) => entry.id);
     const recentEntryIds = new Set(messageEntryIds.slice(-CONTEXT_CRITICAL_OVERFLOW_RECENT_ENTRY_COUNT));
     const protectedEntryIds = new Set();
     const entries = [];
-    if (latestCompactionIndex >= 0) {
-        const latestCompaction = pathEntries[latestCompactionIndex];
-        if (latestCompaction.type === "compaction") {
-            const message = createCompactionSummaryMessage(latestCompaction.summary, latestCompaction.tokensBefore, latestCompaction.timestamp);
-            const contentBlocks = contentBlocksForEntry(latestCompaction.id, message, true, undefined);
-            protectedEntryIds.add(latestCompaction.id);
-            entries.push({
-                entryId: latestCompaction.id,
-                entryType: latestCompaction.type,
-                role: message.role,
-                text: messageText(message),
-                tokenEstimate: estimateTokens(message),
-                protected: true,
-                contentBlocks,
-                message,
-                toolCallIds: [],
-                toolResultFor: undefined,
-            });
-        }
-    }
-    for (const index of activeEntryIndices) {
-        const rawEntry = pathEntries[index];
-        const entry = filteredEntryById.get(rawEntry.id);
-        if (!entry || entry.type === "context_compaction")
+    for (const entry of filteredPathEntries) {
+        if (entry.type === "context_compaction")
             continue;
         const message = getContextEligibleMessageFromEntry(entry);
         if (!message)
             continue;
+        const rawEntry = rawEntryById.get(entry.id) ?? entry;
         const protectedEntry = isProtectedEntry(entry, message, recentEntryIds);
         if (protectedEntry)
             protectedEntryIds.add(entry.id);
@@ -653,6 +597,23 @@ function computeContextCompactionStats(transcript, targets) {
         percentReduction,
     };
 }
+/**
+ * An entry "bears task context" when it carries the user's intent for the session: a real `user`
+ * message, an extension-injected `custom` message, or a branch summary (`branchSummary` role /
+ * `branch_summary` entry type) that recaps an earlier branch's task.
+ *
+ * Verbatim compaction must always leave at least one task-bearing entry in context. The same set
+ * also defines which protected entries `critical_overflow` may delete, because the intent each one
+ * carries is recoverable from any other surviving task-bearing entry. As a deliberate consequence,
+ * `critical_overflow` MAY delete every literal `user` message as long as a branch summary or custom
+ * entry survives — branch summaries intentionally carry the task forward.
+ */
+function isTaskBearingEntry(entry) {
+    return (entry.role === "user" ||
+        entry.role === "custom" ||
+        entry.role === "branchSummary" ||
+        entry.entryType === "branch_summary");
+}
 function isCriticalOverflowProtectedEntryDeletable(entry, transcript) {
     if (!entry.protected)
         return true;
@@ -665,11 +626,7 @@ function isCriticalOverflowProtectedEntryDeletable(entry, transcript) {
     if (hasAssistantError(entry.message) || hasToolResultError(entry.message) || hasFailedBashExecution(entry.message)) {
         return false;
     }
-    return (entry.role === "user" ||
-        entry.role === "custom" ||
-        entry.role === "branchSummary" ||
-        entry.role === "compactionSummary" ||
-        entry.entryType === "branch_summary");
+    return isTaskBearingEntry(entry);
 }
 function canDeleteProtectedTargetInMode(transcript, target, mode) {
     if (mode !== "critical_overflow")
@@ -749,7 +706,7 @@ export function validateContextDeletionRequest(request, transcript, options = {}
     if (remainingEntries.length === 0) {
         throw new Error("Deletion request would remove all context entries");
     }
-    const hasTaskBearingContext = remainingEntries.some((entry) => entry.role === "user" || (entry.role === "compactionSummary" && entry.protected));
+    const hasTaskBearingContext = remainingEntries.some(isTaskBearingEntry);
     if (!hasTaskBearingContext) {
         throw new Error("Deletion request would leave no user task in context");
     }
@@ -1465,7 +1422,7 @@ function contextCompactionTranscriptManifest(transcript, transcriptFilePath) {
 }
 function contextCompactionModePrompt(mode) {
     if (mode === "critical_overflow") {
-        return `\n<critical-overflow-mode>\nThe previous model request overflowed its context window. This is a critical LRU-style compaction pass. First delete stale unprotected context. If that is not enough, you may also delete the earliest protected entries or protected content shown in the manifest, especially old user/custom/summary context, while preserving recent entries, unresolved errors, failed commands, and enough task-bearing context for the assistant to continue.\n</critical-overflow-mode>`;
+        return `\n<critical-overflow-mode>\nThe previous model request overflowed its context window. This is a critical LRU-style compaction pass. First delete stale unprotected context. If that is not enough, you may also delete the earliest protected entries or protected content shown in the manifest. Evict in priority order: remove old reasoning traces first, then old user/custom/summary context, while preserving recent entries, unresolved errors, failed commands, and enough task-bearing context for the assistant to continue.\n</critical-overflow-mode>`;
     }
     return `\n<standard-mode>\nDo not delete entries or content blocks marked protected. Protected context is only eligible during critical overflow recovery, not during standard compaction.\n</standard-mode>`;
 }