@ponythewhite/base-context 1.0.8 → 1.0.9

package/dist/core/agent-session.js

@@ -282,6 +282,7 @@ export class AgentSession {
     runtimeServices;
     _contextCompiler = new CanonicalContextCompiler();
     _failedAutomaticCompaction;
+    _failedThresholdCompaction;
     _contextEpochsEnabled;
     _initialContextMode;
     _contextMode;
@@ -714,7 +715,7 @@ export class AgentSession {
                         acknowledged = { entryId, result };
                         try {
                             assertResourceCurrent(resource);
-                            if (this.sessionManager !== epochManager || epochManager.getLeafId() !== entryId)
+                            if (this.sessionManager !== epochManager || !compaction.isCurrent())
                                 throw new Error("Context epoch source changed before adoption");
                             this.agent.state.messages = prepared.messages;
                             committed = prepared.checkpoint;
@@ -805,7 +806,7 @@ export class AgentSession {
                                     committedEntry = { sessionId: epochContext.source.sessionId, entryId };
                                     requestContract = nextContract;
                                     assertResourceCurrent(resource);
-                                    if (this.sessionManager !== epochManager || epochManager.getLeafId() !== entryId)
+                                    if (this.sessionManager !== epochManager || !compaction.isCurrent())
                                         throw new Error("Context contract source changed before acceptance");
                                 }
                                 if (!sameSelectedSkills(committed?.selectedSkills, epochContext.selectedSkills))
@@ -822,7 +823,7 @@ export class AgentSession {
                                 throw commitFailure(cause);
                             }
                         }
-                        : undefined);
+                        : undefined, compaction.isCurrent);
                 }
                 this._compactionSetupFailure = undefined;
                 return { messages, adoptMessages: true, streamContext: captured, release: () => captured.dispose() };
@@ -850,7 +851,7 @@ export class AgentSession {
                 !error.source.persistent ||
                 error.source.sessionId !== owner.sessionId ||
                 error.source.sessionFile !== owner.sessionFile ||
-                error.source.leafId !== owner.manager.getLeafId())
+                !(error.isSourceCurrent?.() ?? error.source.leafId === owner.manager.getLeafId()))
                 return false;
             // Rebase this captured frame before paying for a summary. The replacement still
             // needs the normal full provider projection and epoch ACK before MAIN can send.
@@ -1178,7 +1179,7 @@ export class AgentSession {
                 };
                 // ACK is authoritative even if later setup or release fails.
                 this._contextMode = mode;
-                if (this.sessionManager !== manager || manager.getLeafId() !== entryId)
+                if (this.sessionManager !== manager || !compaction.isCurrent())
                     throw new Error("Context mode source changed before adoption");
                 assertResourceCurrent(resource);
                 this.agent.state.messages = prepared.messages;
@@ -2880,6 +2881,25 @@ export class AgentSession {
             return timestamp;
         });
     }
+    _thresholdCompactionConfiguration() {
+        return JSON.stringify({
+            model: this.model,
+            thinkingLevel: this.thinkingLevel,
+            settings: this.settingsManager.getCompactionSettings(),
+        });
+    }
+    _hasFailedThresholdCompaction() {
+        const failed = this._failedThresholdCompaction;
+        if (!failed)
+            return false;
+        if (failed.isCurrent() &&
+            failed.configuration === this._thresholdCompactionConfiguration() &&
+            failed.systemPrompt === this.agent.state.systemPrompt &&
+            failed.tools === this.agent.state.tools)
+            return true;
+        this._failedThresholdCompaction = undefined;
+        return false;
+    }
     async _thresholdCompactionNeeded(context, owner = this._captureCompactionOwner(), goalOwner = {
         ...this._captureGoalContinuationOwner(owner.signal),
         checkpointOwner: owner,
@@ -2898,6 +2918,8 @@ export class AgentSession {
         const contextTokens = this._getThresholdContextTokens(context.message, compactionTimestamp);
         if (contextTokens === undefined || !shouldCompact(contextTokens, contextWindow, settings))
             return false;
+        if (this._hasFailedThresholdCompaction())
+            return false;
         // Keep the existing threshold-specific goal winner; do not import W74's natural wait policy here.
         if (!this._isGoalContinuationOwnerCurrent(goalOwner))
             return true;
@@ -4148,6 +4170,7 @@ export class AgentSession {
      */
     async disposeAsync(options) {
         this._failedAutomaticCompaction = undefined;
+        this._failedThresholdCompaction = undefined;
         this._contextCompiler.clear();
         this._nativeRecoveryCursors.clear();
         for (const admission of this._rlmChildAdmissions)
@@ -4384,6 +4407,7 @@ export class AgentSession {
     }
     dispose() {
         this._failedAutomaticCompaction = undefined;
+        this._failedThresholdCompaction = undefined;
         this._contextCompiler.clear();
         this._nativeRecoveryCursors.clear();
         if (this._disposed) {
@@ -9029,6 +9053,8 @@ export class AgentSession {
         if (contextTokens === undefined)
             return false;
         if (shouldCompact(contextTokens, contextWindow, settings)) {
+            if (this._hasFailedThresholdCompaction())
+                return false;
             if (!this._pendingCheckpoint && queueAutonomousContinuation) {
                 if (!(await this._queueGoalContinuationForThresholdCompaction(assistantMessage, goalOwner)) &&
                     this._isGoalContinuationOwnerCurrent(goalOwner)) {
@@ -9128,6 +9154,21 @@ export class AgentSession {
         let compaction;
         let committed;
         let failure;
+        const thresholdConfiguration = reason === "threshold" && !resumeInPlace
+            ? {
+                configuration: this._thresholdCompactionConfiguration(),
+                systemPrompt: this.agent.state.systemPrompt,
+                tools: this.agent.state.tools,
+            }
+            : undefined;
+        const rememberThresholdFailure = () => {
+            if (thresholdConfiguration &&
+                !abort.signal.aborted &&
+                this._isCompactionOwnerCurrent(owner) &&
+                compaction?.isCurrent()) {
+                this._failedThresholdCompaction = { ...thresholdConfiguration, isCurrent: compaction.isCurrent };
+            }
+        };
         try {
             const selected = this._resolveCompactionModel();
             const model = selected?.model;
@@ -9148,6 +9189,7 @@ export class AgentSession {
                         : authResult.error;
                 await this._endCompactionUnsuccessfully(reason, "failed", `Compaction failed: ${detail}`, { owner });
                 this._clearQueuedAutonomousContinuationsAfterSkippedThresholdCompaction(reason === "threshold" && shouldContinueAfterCompaction, queuedAutonomousContinuationsForThisCompaction);
+                rememberThresholdFailure();
                 resumeAfterFailure();
                 return false;
             }
@@ -9224,6 +9266,7 @@ export class AgentSession {
                         ? `Requested compaction failed: ${errorMessage}`
                         : `Auto-compaction failed: ${errorMessage}`, { customInstructions, owner });
             }
+            rememberThresholdFailure();
             resumeAfterFailure();
             return false;
         }