@code-yeongyu/senpi 2026.5.18 → 2026.5.20-2

package/dist/core/agent-session.js

@@ -57,8 +57,8 @@ class CompactionRejectedError extends Error {
     rejectionCause;
     constructor(rejectionCause) {
         super(rejectionCause === "cancelled-by-extension" ? "Compaction cancelled" : "Compaction rejected");
-        this.rejectionCause = rejectionCause;
         this.name = "CompactionRejectedError";
+        this.rejectionCause = rejectionCause;
     }
 }
 // ============================================================================
@@ -314,6 +314,25 @@ export class AgentSession {
         }
         return undefined;
     }
+    _willRetryAfterAgentEnd(messages) {
+        const settings = this.settingsManager.getRetrySettings();
+        if (!settings.enabled) {
+            return false;
+        }
+        const lastAssistant = this._lastAssistantMessage ?? this._findLastAssistantInMessages(messages);
+        if (!lastAssistant || !this._isRetryableError(lastAssistant)) {
+            return false;
+        }
+        if (this._retryAttempt + 1 > settings.maxRetries) {
+            return false;
+        }
+        const errorMessage = lastAssistant.errorMessage || "Unknown error";
+        const providerDelayMs = this._getProviderRetryDelayMs(errorMessage);
+        if (providerDelayMs === undefined) {
+            return true;
+        }
+        return providerDelayMs <= this.settingsManager.getProviderRetrySettings().maxRetryDelayMs;
+    }
     async _processAgentEvent(event) {
         // 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
@@ -340,7 +359,7 @@ export class AgentSession {
         // Emit to extensions first
         await this._emitExtensionEvent(event);
         // Notify all listeners
-        this._emit(event);
+        this._emit(event.type === "agent_end" ? { ...event, willRetry: this._willRetryAfterAgentEnd(event.messages) } : event);
         // Handle session persistence
         if (event.type === "message_end") {
             // Check if this is a custom message from extensions
@@ -389,6 +408,9 @@ export class AgentSession {
             this._resolveRetry();
             await this._checkCompaction(msg);
         }
+        if (event.type === "agent_end") {
+            this._flushPendingBashMessages();
+        }
     }
     /** Resolve the pending retry promise */
     _resolveRetry() {
@@ -890,6 +912,7 @@ export class AgentSession {
         preflightResult?.(true);
         await this.agent.prompt(messages);
         await this.waitForRetry();
+        await this._agentEventQueue;
     }
     /**
      * Try to execute an extension command. Returns true if command was found and executed.
@@ -1762,7 +1785,7 @@ export class AgentSession {
                     aborted: false,
                     willRetry: false,
                 });
-                return;
+                return false;
             }
             const authResult = await this._modelRegistry.getApiKeyAndHeaders(this.model);
             if (this.agent.streamFn === streamSimple && (!authResult.ok || !authResult.apiKey)) {
@@ -1775,7 +1798,7 @@ export class AgentSession {
                     aborted: false,
                     willRetry: false,
                 });
-                return;
+                return false;
             }
             const preparation = prepareCompaction(this.sessionManager.getBranch(), this.settingsManager.getCompactionSettings());
             if (!preparation) {
@@ -1788,13 +1811,13 @@ export class AgentSession {
                     aborted: false,
                     willRetry: false,
                 });
-                return;
+                return false;
             }
             const execution = await this._executeCompaction({ reason, willRetry });
             if (!execution.accepted) {
                 if (reason === "overflow")
                     this._overflowRecoveryAttempted = false;
-                return;
+                return false;
             }
             if (willRetry) {
                 const messages = this.agent.state.messages;
@@ -1806,6 +1829,7 @@ export class AgentSession {
                 setTimeout(() => {
                     this.agent.continue().catch(() => { });
                 }, 100);
+                return true;
             }
             else if (this.agent.hasQueuedMessages()) {
                 // Auto-compaction can complete while follow-up/steering/custom messages are waiting.
@@ -1813,7 +1837,9 @@ export class AgentSession {
                 setTimeout(() => {
                     this.agent.continue().catch(() => { });
                 }, 100);
+                return true;
             }
+            return false;
         }
         catch (error) {
             if (reason === "overflow")
@@ -1832,6 +1858,7 @@ export class AgentSession {
                         ? `Context overflow recovery failed: ${errorMessage}`
                         : `Auto-compaction failed: ${errorMessage}`,
             });
+            return false;
         }
         finally {
             this._autoCompactionAbortController = undefined;
@@ -1906,6 +1933,9 @@ export class AgentSession {
     }
     _applyExtensionBindings(runner) {
         runner.setUIContext(this._extensionUIContext);
+        runner.setToolHookLifecycleObserver((event) => {
+            this._emit(event);
+        });
         runner.bindCommandContext(this._extensionCommandContextActions);
         this._extensionErrorUnsubscriber?.();
         this._extensionErrorUnsubscriber = this._extensionErrorListener