@mariozechner/pi-coding-agent 0.55.4 → 0.56.1

package/dist/core/agent-session.js

@@ -73,6 +73,7 @@ export class AgentSession {
     // Compaction state
     _compactionAbortController = undefined;
     _autoCompactionAbortController = undefined;
+    _overflowRecoveryAttempted = false;
     // Branch summarization state
     _branchSummaryAbortController = undefined;
     // Retry state
@@ -182,6 +183,7 @@ export class AgentSession {
         // When a user message starts, check if it's from either queue and remove it BEFORE emitting
         // This ensures the UI sees the updated queue state
         if (event.type === "message_start" && event.message.role === "user") {
+            this._overflowRecoveryAttempted = false;
             const messageText = this._getUserMessageText(event.message);
             if (messageText) {
                 // Check steering queue first
@@ -219,9 +221,12 @@ export class AgentSession {
             // Track assistant message for auto-compaction (checked on agent_end)
             if (event.message.role === "assistant") {
                 this._lastAssistantMessage = event.message;
+                const assistantMsg = event.message;
+                if (assistantMsg.stopReason !== "error") {
+                    this._overflowRecoveryAttempted = false;
+                }
                 // Reset retry counter immediately on successful assistant response
                 // This prevents accumulation across multiple LLM calls within a turn
-                const assistantMsg = event.message;
                 if (assistantMsg.stopReason !== "error" && this._retryAttempt > 0) {
                     this._emit({
                         type: "auto_retry_end",
@@ -464,9 +469,11 @@ export class AgentSession {
         this._baseSystemPrompt = this._rebuildSystemPrompt(validToolNames);
         this.agent.setSystemPrompt(this._baseSystemPrompt);
     }
-    /** Whether auto-compaction is currently running */
+    /** Whether compaction or branch summarization is currently running */
     get isCompacting() {
-        return this._autoCompactionAbortController !== undefined || this._compactionAbortController !== undefined;
+        return (this._autoCompactionAbortController !== undefined ||
+            this._compactionAbortController !== undefined ||
+            this._branchSummaryAbortController !== undefined);
     }
     /** All messages including custom types like BashExecutionMessage */
     get messages() {
@@ -1059,8 +1066,11 @@ export class AgentSession {
         this.agent.setModel(next.model);
         this.sessionManager.appendModelChange(next.model.provider, next.model.id);
         this.settingsManager.setDefaultModelAndProvider(next.model.provider, next.model.id);
-        // Apply thinking level (setThinkingLevel clamps to model capabilities)
-        this.setThinkingLevel(next.thinkingLevel);
+        // Apply thinking level.
+        // - Explicit scoped model thinking level overrides current session level
+        // - Undefined scoped model thinking level inherits current session level
+        // setThinkingLevel clamps to model capabilities.
+        this.setThinkingLevel(next.thinkingLevel ?? this.thinkingLevel);
         await this._emitModelSelect(next.model, currentModel, "cycle");
         return { model: next.model, thinkingLevel: this.thinkingLevel, isScoped: true };
     }
@@ -1321,6 +1331,17 @@ export class AgentSession {
         const errorIsFromBeforeCompaction = compactionEntry !== null && assistantMessage.timestamp < new Date(compactionEntry.timestamp).getTime();
         // Case 1: Overflow - LLM returned context overflow error
         if (sameModel && !errorIsFromBeforeCompaction && isContextOverflow(assistantMessage, contextWindow)) {
+            if (this._overflowRecoveryAttempted) {
+                this._emit({
+                    type: "auto_compaction_end",
+                    result: undefined,
+                    aborted: false,
+                    willRetry: false,
+                    errorMessage: "Context overflow recovery failed after one compact-and-retry attempt. Try reducing context or switching to a larger-context model.",
+                });
+                return;
+            }
+            this._overflowRecoveryAttempted = true;
             // Remove the error message from agent state (it IS saved to session for history,
             // but we don't want it in context for the retry)
             const messages = this.agent.state.messages;