@ponythewhite/base-context 1.0.7 → 1.0.9

package/dist/core/session-manager.js

@@ -15,7 +15,7 @@ import { captureEpochCopyEntry, readCopiedEpochSource, rebuildCopiedContextEpoch
 import { GOAL_STATE_CUSTOM_TYPE } from "./goals.js";
 import { HistoryIndex, HistoryIndexUnsupportedError } from "./history-index.js";
 import { decodeJournalFrame, encodeJournalFrame, INITIAL_JOURNAL_CURSOR, } from "./journal-frame.js";
-import { createCompactionSummaryMessage } from "./messages.js";
+import { COMPACTION_OUTCOME_CUSTOM_TYPE, createCompactionSummaryMessage, } from "./messages.js";
 import { SELECTED_SKILL_CUSTOM_TYPE, SELECTED_SKILL_DETAIL, selectedSkillBlock, selectedSkillCapture, } from "./selected-skills.js";
 import { DEFAULT_NATIVE_RECOVERY_LIMITS } from "./selective-recovery.js";
 import { orderContextToolResults, sessionEntryMessage } from "./session-context-messages.js";
@@ -30,6 +30,17 @@ import { taskStateReadLimits } from "./task-state-reducer.js";
 import { addAssistantUsage, cloneUsage, emptyUsage, sessionUsageSummaryFrom, subtractAssistantUsage, } from "./usage.js";
 export const CURRENT_SESSION_VERSION = 3;
 const SESSION_ASYNC_PARSE_YIELD_BYTES = 4 * 1024 * 1024;
+// These records advance the journal leaf without changing the captured compaction input.
+const COMPACTION_BOOKKEEPING_ENTRY_TYPES = new Set([
+    "session_state",
+    "agent_status",
+    "git_state",
+    "child_usage_attributed",
+]);
+function isCompactionBookkeeping(entry) {
+    return (COMPACTION_BOOKKEEPING_ENTRY_TYPES.has(entry.type) ||
+        (entry.type === "custom_message" && entry.customType === COMPACTION_OUTCOME_CUSTOM_TYPE));
+}
 // Entry types that can represent user intent (vs. daemon bookkeeping like
 // session_state/agent_status/git_state/child_usage_attributed). Used by
 // hasUserContent to decide whether a message-less draft is safe to discard.
@@ -971,6 +982,7 @@ function newSessionWriteState() {
         reservedLeaf: null,
         leafId: null,
         branchSelectionRevision: 0,
+        compactionRevision: 0,
         pins: 0,
         retired: false,
         closed: false,
@@ -1745,8 +1757,11 @@ export class SessionManager {
                 }
                 Object.assign(state, metadata);
                 state.metadataRefs = undefined;
-                if (advanceLeaf)
+                if (advanceLeaf) {
                     state.leafId = snapshot.id;
+                    if (!isCompactionBookkeeping(snapshot))
+                        state.compactionRevision++;
+                }
                 state.reservedLeaf = state.leafId;
                 if (this.writeState === state)
                     this.leafId = state.leafId;
@@ -1838,6 +1853,8 @@ export class SessionManager {
                         target.message.usage = cloneUsage(snapshot.aggregateUsage);
                 }
                 state.leafId = snapshot.id;
+                if (!isCompactionBookkeeping(snapshot))
+                    state.compactionRevision++;
                 if (this.writeState === state) {
                     this.leafId = snapshot.id;
                     this._notifyPersistListeners();
@@ -1911,8 +1928,21 @@ export class SessionManager {
         let capturedSource;
         let captureFailure;
         let selectionRevision;
+        let compactionRevision;
+        let currentRevision;
+        const isCurrent = (revision) => capturedSource !== undefined &&
+            this.writeState === state &&
+            state.owner === owner &&
+            !state.retired &&
+            !state.closed &&
+            this.sessionId === sessionId &&
+            this.sessionFile === sessionFile &&
+            state.branchSelectionRevision === selectionRevision &&
+            state.compactionRevision === revision;
         const sink = this._bindHistorySource((index, source, query) => createSessionHistoryReadScope(index, source, query, "source"), (source) => {
             selectionRevision = state.branchSelectionRevision;
+            compactionRevision = state.compactionRevision;
+            currentRevision = compactionRevision;
             if (!indexed)
                 residentBranch = this._readResidentBranches([source.leafId], capturedLimits, byId).branches[0];
             capturedSource = source;
@@ -1941,15 +1971,7 @@ export class SessionManager {
                     if (JSON.stringify(epoch.source) !== JSON.stringify(capturedSource))
                         throw new Error("Context epoch does not match the bound source capture");
                 }
-                if (!capturedSource ||
-                    this.writeState !== state ||
-                    state.owner !== owner ||
-                    state.retired ||
-                    state.closed ||
-                    this.sessionId !== sessionId ||
-                    this.sessionFile !== sessionFile ||
-                    state.branchSelectionRevision !== selectionRevision ||
-                    state.leafId !== capturedSource.leafId)
+                if (!isCurrent(compactionRevision))
                     throw new Error("Compaction source or branch changed");
             };
             // Admission is synchronous; this append queues behind the capture before release can drain it.
@@ -1963,12 +1985,15 @@ export class SessionManager {
                 snapshot.usage,
                 assertCurrent,
             ];
-            return qualification || snapshot.requestOutputs
+            const entryId = await (qualification || snapshot.requestOutputs
                 ? this._appendCompaction(...args, qualification, snapshot.requestOutputs)
-                : this.appendCompaction(...args);
+                : this.appendCompaction(...args));
+            currentRevision = compactionRevision + 1;
+            return entryId;
         };
         const bound = {
             ...sink,
+            isCurrent: () => isCurrent(currentRevision),
             readHistory: (read) => sink.readHistory((history) => read(history.branchContext)),
             [readCopiedEpochSource]: (read) => sink.readHistory(read),
             readBranch: async () => {