@earendil-works/pi-coding-agent 0.79.7 → 0.79.8

package/dist/core/agent-session.js

@@ -21,7 +21,7 @@ import { resolvePath } from "../utils/paths.js";
 import { sleep } from "../utils/sleep.js";
 import { formatNoApiKeyFoundMessage, formatNoModelSelectedMessage } from "./auth-guidance.js";
 import { executeBashWithOperations } from "./bash-executor.js";
-import { calculateContextTokens, collectEntriesForBranchSummary, compact, estimateContextTokens, generateBranchSummary, prepareCompaction, shouldCompact, } from "./compaction/index.js";
+import { calculateContextTokens, collectEntriesForBranchSummary, compact, estimateContextTokens, estimateTokens, generateBranchSummary, prepareCompaction, shouldCompact, } from "./compaction/index.js";
 import { DEFAULT_THINKING_LEVEL } from "./defaults.js";
 import { exportSessionToHtml } from "./export-html/index.js";
 import { createToolHtmlRenderer } from "./export-html/tool-renderer.js";
@@ -49,6 +49,13 @@ export function parseSkillBlock(text) {
         userMessage: match[4]?.trim() || undefined,
     };
 }
+function estimateMessagesTokens(messages) {
+    let tokens = 0;
+    for (const message of messages) {
+        tokens += estimateTokens(message);
+    }
+    return tokens;
+}
 // ============================================================================
 // Constants
 // ============================================================================
@@ -1329,6 +1336,7 @@ export class AgentSession {
             const newEntries = this.sessionManager.getEntries();
             const sessionContext = this.sessionManager.buildSessionContext();
             this.agent.state.messages = sessionContext.messages;
+            const estimatedTokensAfter = estimateMessagesTokens(sessionContext.messages);
             // Get the saved compaction entry for the extension event
             const savedCompactionEntry = newEntries.find((e) => e.type === "compaction" && e.summary === summary);
             if (this._extensionRunner && savedCompactionEntry) {
@@ -1342,6 +1350,7 @@ export class AgentSession {
                 summary,
                 firstKeptEntryId,
                 tokensBefore,
+                estimatedTokensAfter,
                 details,
             };
             this._emit({
@@ -1416,8 +1425,15 @@ export class AgentSession {
         if (assistantIsFromBeforeCompaction) {
             return false;
         }
-        // Case 1: Overflow - LLM returned context overflow error
+        // Case 1: Overflow - LLM returned context overflow error, or reported usage exceeded
+        // the configured window. A successful response over the configured window should compact
+        // but must not retry: the assistant answer already completed and agent.continue() cannot
+        // continue from an assistant message.
         if (sameModel && isContextOverflow(assistantMessage, contextWindow)) {
+            const willRetry = assistantMessage.stopReason !== "stop";
+            if (!willRetry) {
+                return await this._runAutoCompaction("overflow", false);
+            }
             if (this._overflowRecoveryAttempted) {
                 this._emit({
                     type: "compaction_end",
@@ -1436,7 +1452,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", true);
+            return await this._runAutoCompaction("overflow", willRetry);
         }
         // Case 2: Threshold - context is getting large
         // For error messages (no usage data), estimate from last successful response.
@@ -1471,17 +1487,9 @@ export class AgentSession {
      */
     async _runAutoCompaction(reason, willRetry) {
         const settings = this.settingsManager.getCompactionSettings();
-        this._emit({ type: "compaction_start", reason });
-        this._autoCompactionAbortController = new AbortController();
+        let started = false;
         try {
             if (!this.model) {
-                this._emit({
-                    type: "compaction_end",
-                    reason,
-                    result: undefined,
-                    aborted: false,
-                    willRetry: false,
-                });
                 return false;
             }
             let apiKey;
@@ -1490,13 +1498,6 @@ export class AgentSession {
             if (this.agent.streamFn === streamSimple) {
                 const authResult = await this._modelRegistry.getApiKeyAndHeaders(this.model);
                 if (!authResult.ok || !authResult.apiKey) {
-                    this._emit({
-                        type: "compaction_end",
-                        reason,
-                        result: undefined,
-                        aborted: false,
-                        willRetry: false,
-                    });
                     return false;
                 }
                 apiKey = authResult.apiKey;
@@ -1509,15 +1510,11 @@ export class AgentSession {
             const pathEntries = this.sessionManager.getBranch();
             const preparation = prepareCompaction(pathEntries, settings);
             if (!preparation) {
-                this._emit({
-                    type: "compaction_end",
-                    reason,
-                    result: undefined,
-                    aborted: false,
-                    willRetry: false,
-                });
                 return false;
             }
+            this._emit({ type: "compaction_start", reason });
+            this._autoCompactionAbortController = new AbortController();
+            started = true;
             let extensionCompaction;
             let fromExtension = false;
             if (this._extensionRunner.hasHandlers("session_before_compact")) {
@@ -1576,6 +1573,7 @@ export class AgentSession {
             const newEntries = this.sessionManager.getEntries();
             const sessionContext = this.sessionManager.buildSessionContext();
             this.agent.state.messages = sessionContext.messages;
+            const estimatedTokensAfter = estimateMessagesTokens(sessionContext.messages);
             // Get the saved compaction entry for the extension event
             const savedCompactionEntry = newEntries.find((e) => e.type === "compaction" && e.summary === summary);
             if (this._extensionRunner && savedCompactionEntry) {
@@ -1589,6 +1587,7 @@ export class AgentSession {
                 summary,
                 firstKeptEntryId,
                 tokensBefore,
+                estimatedTokensAfter,
                 details,
             };
             this._emit({ type: "compaction_end", reason, result, aborted: false, willRetry });
@@ -1606,16 +1605,18 @@ export class AgentSession {
         }
         catch (error) {
             const errorMessage = error instanceof Error ? error.message : "compaction failed";
-            this._emit({
-                type: "compaction_end",
-                reason,
-                result: undefined,
-                aborted: false,
-                willRetry: false,
-                errorMessage: reason === "overflow"
-                    ? `Context overflow recovery failed: ${errorMessage}`
-                    : `Auto-compaction failed: ${errorMessage}`,
-            });
+            if (started) {
+                this._emit({
+                    type: "compaction_end",
+                    reason,
+                    result: undefined,
+                    aborted: false,
+                    willRetry: false,
+                    errorMessage: reason === "overflow"
+                        ? `Context overflow recovery failed: ${errorMessage}`
+                        : `Auto-compaction failed: ${errorMessage}`,
+                });
+            }
             return false;
         }
         finally {