@caupulican/pi-agent-core 0.93.17 → 0.93.18

package/dist/session/session-manager.js

@@ -201,11 +201,9 @@ export function buildSessionContext(entries, leafId, byId) {
             compaction = entry;
         }
     }
-    // Build messages and collect corresponding entries
-    // When there's a compaction, we need to:
-    // 1. Emit summary first (entry = compaction)
-    // 2. Emit kept messages (from firstKeptEntryId up to compaction)
-    // 3. Emit messages after compaction
+    // Build messages and collect corresponding entries. Standard compaction emits the summary followed
+    // by a contiguous recent tail. Session replacement instead retains one sparse original-user anchor
+    // before the summary, matching providers whose compactor atomically replaces the live transcript.
     const messages = [];
     const appendMessage = (entry) => {
         if (entry.type === "message") {
@@ -219,19 +217,28 @@ export function buildSessionContext(entries, leafId, byId) {
         }
     };
     if (compaction) {
-        // Emit summary first
-        messages.push(retainSynthesizedSessionContextMessage(createCompactionSummaryMessage(compaction.summary, compaction.tokensBefore, compaction.timestamp)));
         // Find compaction index in path
         const compactionIdx = path.findIndex((e) => e.type === "compaction" && e.id === compaction.id);
-        // Emit kept messages (before compaction, starting from firstKeptEntryId)
-        let foundFirstKept = false;
-        for (let i = 0; i < compactionIdx; i++) {
-            const entry = path[i];
-            if (entry.id === compaction.firstKeptEntryId) {
-                foundFirstKept = true;
-            }
-            if (foundFirstKept) {
-                appendMessage(entry);
+        const originalUserEntry = compaction.retention?.mode === "original-user"
+            ? path
+                .slice(0, compactionIdx)
+                .find((entry) => entry.id === compaction.retention?.userEntryId &&
+                entry.type === "message" &&
+                entry.message.role === "user")
+            : undefined;
+        if (originalUserEntry)
+            appendMessage(originalUserEntry);
+        messages.push(retainSynthesizedSessionContextMessage(createCompactionSummaryMessage(compaction.summary, compaction.tokensBefore, compaction.timestamp)));
+        if (!compaction.retention) {
+            // Emit the standard contiguous tail before compaction, starting from firstKeptEntryId.
+            let foundFirstKept = false;
+            for (let i = 0; i < compactionIdx; i++) {
+                const entry = path[i];
+                if (entry.id === compaction.firstKeptEntryId) {
+                    foundFirstKept = true;
+                }
+                if (foundFirstKept)
+                    appendMessage(entry);
             }
         }
         // Emit messages after compaction
@@ -1120,24 +1127,42 @@ export class SessionManager {
         const leaf = this.leafId ? this.byId.get(this.leafId) : undefined;
         visitSessionAncestry(leaf, this.byId, (current) => {
             if (current.type === "compaction") {
-                this._releaseCompactedMessagePayloads(current.firstKeptEntryId, current.parentId);
+                this._releaseCompactedMessagePayloads(current.firstKeptEntryId, current.parentId, current.retention, current.id);
                 return false;
             }
         });
     }
-    _releaseCompactedMessagePayloads(firstKeptEntryId, compactionParentId) {
+    _releaseCompactedMessagePayloads(firstKeptEntryId, compactionParentId, retention, compactionEntryId) {
         if (!this.persist || !this.flushed || !this.sessionFile)
             return;
         const keptEntryIds = new Set();
         let foundFirstKept = false;
         const compactionParent = compactionParentId ? this.byId.get(compactionParentId) : undefined;
-        visitSessionAncestry(compactionParent, this.byId, (current) => {
-            keptEntryIds.add(current.id);
-            if (current.id === firstKeptEntryId) {
-                foundFirstKept = true;
-                return false;
-            }
-        });
+        if (retention?.mode === "original-user") {
+            visitSessionAncestry(compactionParent, this.byId, (current) => {
+                if (current.id === retention.userEntryId && current.type === "message" && current.message.role === "user") {
+                    keptEntryIds.add(current.id);
+                    foundFirstKept = true;
+                    return false;
+                }
+            });
+            const leaf = this.leafId ? this.byId.get(this.leafId) : undefined;
+            visitSessionAncestry(leaf, this.byId, (current) => {
+                if (current.id === compactionEntryId)
+                    return false;
+                if (current.type === "message")
+                    keptEntryIds.add(current.id);
+            });
+        }
+        else {
+            visitSessionAncestry(compactionParent, this.byId, (current) => {
+                keptEntryIds.add(current.id);
+                if (current.id === firstKeptEntryId) {
+                    foundFirstKept = true;
+                    return false;
+                }
+            });
+        }
         if (!foundFirstKept)
             return;
         const retainedIds = new Set();
@@ -1288,7 +1313,7 @@ export class SessionManager {
         return entry.id;
     }
     /** Append a compaction summary as child of current leaf, then advance leaf. Returns entry id. */
-    appendCompaction(summary, firstKeptEntryId, tokensBefore, details, fromHook, usage) {
+    appendCompaction(summary, firstKeptEntryId, tokensBefore, details, fromHook, usage, retention) {
         const compactionParentId = this.leafId;
         const entry = {
             type: "compaction",
@@ -1298,12 +1323,13 @@ export class SessionManager {
             summary,
             firstKeptEntryId,
             tokensBefore,
+            retention,
             details,
             usage,
             fromHook,
         };
         this._appendEntry(entry);
-        this._releaseCompactedMessagePayloads(firstKeptEntryId, compactionParentId);
+        this._releaseCompactedMessagePayloads(firstKeptEntryId, compactionParentId, retention, entry.id);
         return entry.id;
     }
     /** Append a custom entry (for extensions) as child of current leaf, then advance leaf. Returns entry id. */