@codex-infinity/pi-infinity 0.60.2 → 0.61.1

package/dist/core/agent-session.js

@@ -56,61 +56,56 @@ const THINKING_LEVELS_WITH_XHIGH = ["off", "minimal", "low", "medium", "high", "
 // AgentSession Class
 // ============================================================================
 export class AgentSession {
-    agent;
-    sessionManager;
-    settingsManager;
-    _scopedModels;
-    // Event subscription state
-    _unsubscribeAgent;
-    _eventListeners = [];
-    _agentEventQueue = Promise.resolve();
-    /** Tracks pending steering messages for UI display. Removed when delivered. */
-    _steeringMessages = [];
-    /** Tracks pending follow-up messages for UI display. Removed when delivered. */
-    _followUpMessages = [];
-    /** Messages queued to be included with the next user prompt as context ("asides"). */
-    _pendingNextTurnMessages = [];
-    // Compaction state
-    _compactionAbortController = undefined;
-    _autoCompactionAbortController = undefined;
-    _overflowRecoveryAttempted = false;
-    // Branch summarization state
-    _branchSummaryAbortController = undefined;
-    // Retry state
-    _retryAbortController = undefined;
-    _retryAttempt = 0;
-    _retryPromise = undefined;
-    _retryResolve = undefined;
-    // Autonomous mode settings
-    _autoNextSteps = false;
-    _autoNextIdea = false;
-    // Bash execution state
-    _bashAbortController = undefined;
-    _pendingBashMessages = [];
-    // Extension system
-    _extensionRunner = undefined;
-    _turnIndex = 0;
-    _resourceLoader;
-    _customTools;
-    _baseToolRegistry = new Map();
-    _cwd;
-    _extensionRunnerRef;
-    _initialActiveToolNames;
-    _baseToolsOverride;
-    _extensionUIContext;
-    _extensionCommandContextActions;
-    _extensionShutdownHandler;
-    _extensionErrorListener;
-    _extensionErrorUnsubscriber;
-    // Model registry for API key resolution
-    _modelRegistry;
-    // Tool registry for extension getTools/setTools
-    _toolRegistry = new Map();
-    _toolPromptSnippets = new Map();
-    _toolPromptGuidelines = new Map();
-    // Base system prompt (without extension appends) - used to apply fresh appends each turn
-    _baseSystemPrompt = "";
     constructor(config) {
+        this._eventListeners = [];
+        this._agentEventQueue = Promise.resolve();
+        /** Tracks pending steering messages for UI display. Removed when delivered. */
+        this._steeringMessages = [];
+        /** Tracks pending follow-up messages for UI display. Removed when delivered. */
+        this._followUpMessages = [];
+        /** Messages queued to be included with the next user prompt as context ("asides"). */
+        this._pendingNextTurnMessages = [];
+        // Compaction state
+        this._compactionAbortController = undefined;
+        this._autoCompactionAbortController = undefined;
+        this._overflowRecoveryAttempted = false;
+        // Branch summarization state
+        this._branchSummaryAbortController = undefined;
+        // Retry state
+        this._retryAbortController = undefined;
+        this._retryAttempt = 0;
+        this._retryPromise = undefined;
+        this._retryResolve = undefined;
+        // Autonomous mode settings
+        this._autoNextSteps = false;
+        this._autoNextIdea = false;
+        // Bash execution state
+        this._bashAbortController = undefined;
+        this._pendingBashMessages = [];
+        // Extension system
+        this._extensionRunner = undefined;
+        this._turnIndex = 0;
+        this._baseToolRegistry = new Map();
+        // Tool registry for extension getTools/setTools
+        this._toolRegistry = new Map();
+        this._toolPromptSnippets = new Map();
+        this._toolPromptGuidelines = new Map();
+        // Base system prompt (without extension appends) - used to apply fresh appends each turn
+        this._baseSystemPrompt = "";
+        // Track last assistant message for auto-compaction check
+        this._lastAssistantMessage = undefined;
+        /** Internal handler for agent events - shared by subscribe and reconnect */
+        this._handleAgentEvent = (event) => {
+            // Create retry promise synchronously before queueing async processing.
+            // Agent.emit() calls this handler synchronously, and prompt() calls waitForRetry()
+            // as soon as agent.prompt() resolves. If _retryPromise is created only inside
+            // _processAgentEvent, slow earlier queued events can delay agent_end processing
+            // and waitForRetry() can miss the in-flight retry.
+            this._createRetryPromiseForAgentEnd(event);
+            this._agentEventQueue = this._agentEventQueue.then(() => this._processAgentEvent(event), () => this._processAgentEvent(event));
+            // Keep queue alive if an event handler fails
+            this._agentEventQueue.catch(() => { });
+        };
         this.agent = config.agent;
         this.sessionManager = config.sessionManager;
         this.settingsManager = config.settingsManager;
@@ -199,20 +194,6 @@ export class AgentSession {
             l(event);
         }
     }
-    // Track last assistant message for auto-compaction check
-    _lastAssistantMessage = undefined;
-    /** Internal handler for agent events - shared by subscribe and reconnect */
-    _handleAgentEvent = (event) => {
-        // Create retry promise synchronously before queueing async processing.
-        // Agent.emit() calls this handler synchronously, and prompt() calls waitForRetry()
-        // as soon as agent.prompt() resolves. If _retryPromise is created only inside
-        // _processAgentEvent, slow earlier queued events can delay agent_end processing
-        // and waitForRetry() can miss the in-flight retry.
-        this._createRetryPromiseForAgentEnd(event);
-        this._agentEventQueue = this._agentEventQueue.then(() => this._processAgentEvent(event), () => this._processAgentEvent(event));
-        // Keep queue alive if an event handler fails
-        this._agentEventQueue.catch(() => { });
-    };
     _createRetryPromiseForAgentEnd(event) {
         if (event.type !== "agent_end" || this._retryPromise) {
             return;
@@ -293,7 +274,6 @@ export class AgentSession {
                         attempt: this._retryAttempt,
                     });
                     this._retryAttempt = 0;
-                    this._resolveRetry();
                 }
             }
         }
@@ -307,6 +287,7 @@ export class AgentSession {
                 if (didRetry)
                     return; // Retry was initiated, don't proceed to compaction
             }
+            this._resolveRetry();
             await this._checkCompaction(msg);
             // Queue autonomous follow-up if enabled (after compaction, so it has full context)
             this._maybeQueueAutonomousFollowUp(msg);