@astralyn/pi 0.82.3 → 0.82.4

package/dist/core/agent-session.js

@@ -71,6 +71,7 @@ function estimateMessagesTokens(messages) {
 // Constants
 // ============================================================================
 const CONTEXT_REMAINS_OVER_COMPACTION_THRESHOLD = "Estimated retained context remains above the configured auto-compaction threshold. Reduce compaction.keepRecentTokens, remove large retained content, or switch to a model with a larger context window before continuing.";
+const NOTHING_TO_COMPACT_WITHIN_KEEP_WINDOW = "Nothing to compact while preserving the configured recent context. Reduce compaction.keepRecentTokens, remove large retained content, or switch to a model with a larger context window before continuing.";
 const AUTO_COMPACTION_STOPPED_BEFORE_NEXT_PROVIDER = "Stopped before the next provider request because auto-compaction did not produce a safe context. Review the compaction warning before continuing.";
 /** Standard thinking levels */
 const THINKING_LEVELS = ["off", "minimal", "low", "medium", "high"];
@@ -98,6 +99,8 @@ export class AgentSession {
     _compactionAbortController = undefined;
     _autoCompactionAbortController = undefined;
     _stopAfterTurnRequested = false;
+    /** An extension cancelled a mid-turn compaction; skip further mid-turn checks this run. */
+    _midTurnCompactionDeclined = false;
     _overflowRecoveryAttempted = false;
     // Branch summarization state
     _branchSummaryAbortController = undefined;
@@ -764,6 +767,7 @@ export class AgentSession {
     async _runAgentPrompt(messages) {
         this._isAgentRunActive = true;
         this._stopAfterTurnRequested = false;
+        this._midTurnCompactionDeclined = false;
         try {
             await this.agent.prompt(messages);
             while (await this._handlePostAgentRun()) {
@@ -890,7 +894,7 @@ export class AgentSession {
             // The user's new prompt is sent below, so do not call agent.continue() here.
             const lastAssistant = this._findLastAssistantMessage();
             if (lastAssistant) {
-                await this._checkCompaction(lastAssistant, false);
+                await this._checkCompaction(lastAssistant, false, "prePrompt");
             }
             const compactionSettings = this.settingsManager.getCompactionSettings();
             // A compaction entry can be valid while its retained suffix is still too large.
@@ -1433,6 +1437,7 @@ export class AgentSession {
                     branchEntries: pathEntries,
                     customInstructions,
                     reason: "manual",
+                    timing: "manual",
                     willRetry: false,
                     signal: this._compactionAbortController.signal,
                 }));
@@ -1551,7 +1556,13 @@ export class AgentSession {
         if (signal?.aborted) {
             return { stopErrorMessage: AUTO_COMPACTION_STOPPED_BEFORE_NEXT_PROVIDER };
         }
-        if (turn.toolResults.length === 0) {
+        // Tool batches always continue the run; a turn without tool results only
+        // continues when steering/follow-up messages are queued, otherwise the
+        // post-run path covers it.
+        if (turn.toolResults.length === 0 && !this.agent.hasQueuedMessages()) {
+            return {};
+        }
+        if (this._midTurnCompactionDeclined) {
             return {};
         }
         const settings = this.settingsManager.getCompactionSettings();
@@ -1563,8 +1574,13 @@ export class AgentSession {
         if (!shouldCompact(contextTokens, contextWindow, settings)) {
             return {};
         }
-        const outcome = await this._runAutoCompactionWithOutcome("threshold", false, signal);
+        const outcome = await this._runAutoCompactionWithOutcome("threshold", false, "midTurn", signal);
         if (!outcome.compacted) {
+            if (outcome.cancelled && signal?.aborted !== true) {
+                // The extension took ownership of the risk; don't re-ask on every batch.
+                this._midTurnCompactionDeclined = true;
+                return {};
+            }
             return { stopErrorMessage: AUTO_COMPACTION_STOPPED_BEFORE_NEXT_PROVIDER };
         }
         return {
@@ -1587,7 +1603,7 @@ export class AgentSession {
      * @param assistantMessage The assistant message to check
      * @param skipAbortedCheck If false, include aborted messages (for pre-prompt check). Default: true
      */
-    async _checkCompaction(assistantMessage, skipAbortedCheck = true) {
+    async _checkCompaction(assistantMessage, skipAbortedCheck = true, timing = "postRun") {
         const settings = this.settingsManager.getCompactionSettings();
         if (!settings.enabled)
             return false;
@@ -1615,7 +1631,7 @@ export class AgentSession {
         if (sameModel && isContextOverflow(assistantMessage, contextWindow)) {
             const willRetry = assistantMessage.stopReason !== "stop";
             if (!willRetry) {
-                return await this._runAutoCompaction("overflow", false);
+                return await this._runAutoCompaction("overflow", false, timing);
             }
             if (this._overflowRecoveryAttempted) {
                 this._stopAfterTurnRequested = true;
@@ -1636,7 +1652,7 @@ export class AgentSession {
             if (messages.length > 0 && messages[messages.length - 1].role === "assistant") {
                 this.agent.state.messages = messages.slice(0, -1);
             }
-            return await this._runAutoCompaction("overflow", willRetry);
+            return await this._runAutoCompaction("overflow", willRetry, timing);
         }
         // Case 2: Threshold - context is getting large
         // For error messages or all-zero usage messages, estimate from the last valid response.
@@ -1664,21 +1680,21 @@ export class AgentSession {
             contextTokens = directContextTokens;
         }
         if (shouldCompact(contextTokens, contextWindow, settings)) {
-            return await this._runAutoCompaction("threshold", false);
+            return await this._runAutoCompaction("threshold", false, timing);
         }
         return false;
     }
     /**
      * Internal: Run auto-compaction with events.
      */
-    async _runAutoCompaction(reason, willRetry) {
-        const outcome = await this._runAutoCompactionWithOutcome(reason, willRetry);
+    async _runAutoCompaction(reason, willRetry, timing = "postRun") {
+        const outcome = await this._runAutoCompactionWithOutcome(reason, willRetry, timing);
         if (!outcome.compacted || outcome.mustStop) {
             this._stopAfterTurnRequested = true;
         }
         return outcome.shouldContinue;
     }
-    async _runAutoCompactionWithOutcome(reason, willRetry, parentSignal) {
+    async _runAutoCompactionWithOutcome(reason, willRetry, timing, parentSignal) {
         const settings = this.settingsManager.getCompactionSettings();
         let started = false;
         let controller;
@@ -1721,7 +1737,7 @@ export class AgentSession {
             const pathEntries = this.sessionManager.getBranch();
             const preparation = prepareCompaction(pathEntries, settings);
             if (!preparation) {
-                throw new Error("Nothing to compact while preserving the configured recent context.");
+                throw new Error(NOTHING_TO_COMPACT_WITHIN_KEEP_WINDOW);
             }
             if (this._extensionRunner.hasHandlers("session_before_compact")) {
                 const extensionResult = (await this._extensionRunner.emit({
@@ -1730,6 +1746,7 @@ export class AgentSession {
                     branchEntries: pathEntries,
                     customInstructions: undefined,
                     reason,
+                    timing,
                     willRetry,
                     signal: controller.signal,
                 }));
@@ -1741,7 +1758,9 @@ export class AgentSession {
                         aborted: true,
                         willRetry: false,
                     });
-                    return { compacted: false, shouldContinue: false };
+                    // A cancel produced by an abort (abortCompaction/parent abort) is not an
+                    // extension decision; only a voluntary cancel hands the risk to the extension.
+                    return { compacted: false, shouldContinue: false, cancelled: !controller.signal.aborted };
                 }
                 if (extensionResult?.compaction) {
                     extensionCompaction = extensionResult.compaction;