@fleetagent/pi-coding-agent 0.0.6 → 0.0.8

package/dist/core/agent-session.js

@@ -110,6 +110,9 @@ export class AgentSession {
     // Compaction state
     _compactionAbortController = undefined;
     _autoCompactionAbortController = undefined;
+    _extensionCompactionQueue = [];
+    _extensionCompactionTimer = undefined;
+    _extensionCompactionRunning = false;
     _overflowRecoveryAttempted = false;
     // Branch summarization state
     _branchSummaryAbortController = undefined;
@@ -165,6 +168,7 @@ export class AgentSession {
         // (session persistence, extensions, auto-compaction, retry logic)
         this._unsubscribeAgent = this.agent.subscribe(this._handleAgentEvent);
         this._installAgentToolHooks();
+        this._installAgentTurnPreparation();
         this._buildRuntime({
             activeToolNames: this._initialActiveToolNames,
             includeAllExtensionTools: true,
@@ -253,6 +257,27 @@ export class AgentSession {
             };
         };
     }
+    _installAgentTurnPreparation() {
+        const previousPrepareNextTurn = this.agent.prepareNextTurn;
+        this.agent.prepareNextTurn = async (signal) => {
+            const previousUpdate = await previousPrepareNextTurn?.(signal);
+            const compacted = await this._drainExtensionCompactionQueue("between-turns");
+            if (!compacted) {
+                return previousUpdate;
+            }
+            return {
+                ...previousUpdate,
+                context: this._buildCurrentAgentContext(previousUpdate?.context),
+            };
+        };
+    }
+    _buildCurrentAgentContext(previousContext) {
+        return {
+            systemPrompt: previousContext?.systemPrompt ?? this.agent.state.systemPrompt,
+            messages: this.agent.state.messages.slice(),
+            tools: previousContext?.tools ?? this.agent.state.tools.slice(),
+        };
+    }
     // =========================================================================
     // Event Subscription
     // =========================================================================
@@ -299,6 +324,9 @@ export class AgentSession {
         await this._emitExtensionEvent(event);
         // Notify all listeners
         this._emit(event.type === "agent_end" ? { ...event, willRetry: this._willRetryAfterAgentEnd(event) } : event);
+        if (event.type === "agent_end") {
+            this._scheduleExtensionCompactions();
+        }
         // Handle session persistence
         if (event.type === "message_end") {
             // Check if this is a custom message from extensions
@@ -503,6 +531,21 @@ export class AgentSession {
      * Call this when completely done with the session.
      */
     dispose() {
+        try {
+            this.abortRetry();
+            this.abortCompaction();
+            this.abortBranchSummary();
+            this.abortBash();
+            this.agent.abort();
+        }
+        catch {
+            // Dispose must succeed even if an abort hook throws.
+        }
+        if (this._extensionCompactionTimer !== undefined) {
+            clearTimeout(this._extensionCompactionTimer);
+            this._extensionCompactionTimer = undefined;
+        }
+        this._extensionCompactionQueue = [];
         this._extensionRunner.invalidate("This extension ctx is stale after session replacement or reload. Do not use a captured pi or command ctx after ctx.newSession(), ctx.fork(), ctx.switchSession(), or ctx.reload(). For newSession, fork, and switchSession, move post-replacement work into withSession and use the ctx passed to withSession. For reload, do not use the old ctx after await ctx.reload().");
         this._disconnectFromAgent();
         this._eventListeners = [];
@@ -710,7 +753,12 @@ export class AgentSession {
             });
             this._retryAttempt = 0;
         }
-        return await this._checkCompaction(msg);
+        if (await this._checkCompaction(msg)) {
+            return true;
+        }
+        // The agent loop drains both queues before emitting agent_end. Any messages
+        // here were queued by agent_end extension handlers and need a continuation.
+        return this.agent.hasQueuedMessages();
     }
     async getStructuredResponse(options) {
         if (this.isStreaming) {
@@ -920,7 +968,7 @@ export class AgentSession {
             let currentText = text;
             let currentImages = options?.images;
             if (this._extensionRunner.hasHandlers("input")) {
-                const inputResult = await this._extensionRunner.emitInput(currentText, currentImages, options?.source ?? "interactive");
+                const inputResult = await this._extensionRunner.emitInput(currentText, currentImages, options?.source ?? "interactive", this.isStreaming ? options?.streamingBehavior : undefined);
                 if (inputResult.action === "handled") {
                     preflightResult?.(true);
                     return;
@@ -1229,8 +1277,8 @@ export class AgentSession {
         else {
             this.agent.state.messages.push(appMessage);
             this.session.appendCustomMessageEntry(message.customType, message.content, message.display, message.details);
-            this._emit({ type: "message_start", message: appMessage });
-            this._emit({ type: "message_end", message: appMessage });
+            await this._emit({ type: "message_start", message: appMessage });
+            await this._emit({ type: "message_end", message: appMessage });
         }
     }
     /**
@@ -1485,14 +1533,73 @@ export class AgentSession {
     // =========================================================================
     // Compaction
     // =========================================================================
+    /** Queue extension-triggered compaction outside the currently active agent turn. */
+    _requestExtensionCompaction(options) {
+        this._extensionCompactionQueue.push(options ?? {});
+        if (this.isStreaming) {
+            return;
+        }
+        this._scheduleExtensionCompactions();
+    }
+    _scheduleExtensionCompactions() {
+        const alreadyScheduled = this._extensionCompactionTimer !== undefined;
+        if (this._extensionCompactionRunning || alreadyScheduled || this._extensionCompactionQueue.length === 0) {
+            return;
+        }
+        this._extensionCompactionTimer = setTimeout(() => {
+            this._extensionCompactionTimer = undefined;
+            void this._drainExtensionCompactionQueue();
+        }, 0);
+    }
+    async _drainExtensionCompactionQueue(mode = "idle") {
+        if (this._extensionCompactionRunning) {
+            return false;
+        }
+        this._extensionCompactionRunning = true;
+        let compacted = false;
+        try {
+            while (mode === "between-turns" || !this.isStreaming) {
+                const options = this._extensionCompactionQueue.shift();
+                if (!options) {
+                    break;
+                }
+                compacted = true;
+                await this._runRequestedExtensionCompaction(options, mode === "idle");
+            }
+        }
+        finally {
+            this._extensionCompactionRunning = false;
+        }
+        if (mode === "idle" && !this.isStreaming) {
+            this._scheduleExtensionCompactions();
+        }
+        return compacted;
+    }
+    async _runRequestedExtensionCompaction(options, abortActiveRun) {
+        try {
+            const result = await this._compactSession(options.customInstructions, { abortActiveRun });
+            options.onComplete?.(result);
+        }
+        catch (error) {
+            const err = error instanceof Error ? error : new Error(String(error));
+            options.onError?.(err);
+        }
+    }
     /**
      * Manually compact the session context.
      * Aborts current agent operation first.
      * @param customInstructions Optional instructions for the compaction summary
      */
     async compact(customInstructions) {
-        this._disconnectFromAgent();
-        await this.abort();
+        return this._compactSession(customInstructions, { abortActiveRun: true });
+    }
+    async _compactSession(customInstructions, options) {
+        let disconnected = false;
+        if (options.abortActiveRun) {
+            this._disconnectFromAgent();
+            disconnected = true;
+            await this.abort();
+        }
         this._compactionAbortController = new AbortController();
         this._emit({ type: "compaction_start", reason: "manual" });
         try {
@@ -1594,7 +1701,9 @@ export class AgentSession {
         }
         finally {
             this._compactionAbortController = undefined;
-            this._reconnectToAgent();
+            if (disconnected) {
+                this._reconnectToAgent();
+            }
         }
     }
     /**
@@ -2025,16 +2134,7 @@ export class AgentSession {
             },
             getContextUsage: () => this.getContextUsage(),
             compact: (options) => {
-                void (async () => {
-                    try {
-                        const result = await this.compact(options?.customInstructions);
-                        options?.onComplete?.(result);
-                    }
-                    catch (error) {
-                        const err = error instanceof Error ? error : new Error(String(error));
-                        options?.onError?.(err);
-                    }
-                })();
+                this._requestExtensionCompaction(options);
             },
             getSystemPrompt: () => this.systemPrompt,
         }, {
@@ -2182,6 +2282,9 @@ export class AgentSession {
     // =========================================================================
     // Auto-Retry
     // =========================================================================
+    _isNonRetryableProviderLimitError(errorMessage) {
+        return /GoUsageLimitError|FreeUsageLimitError|Monthly usage limit reached|available balance|insufficient_quota|out of budget|quota exceeded|billing/i.test(errorMessage);
+    }
     /**
      * Check if an error is retryable (overloaded, rate limit, server errors).
      * Context overflow errors are NOT retryable (handled by compaction instead).
@@ -2194,6 +2297,8 @@ export class AgentSession {
         if (isContextOverflow(message, contextWindow))
             return false;
         const err = message.errorMessage;
+        if (this._isNonRetryableProviderLimitError(err))
+            return false;
         // Match: overloaded_error, provider returned error, rate limit, 429, 500, 502, 503, 504, service unavailable, network/connection errors (including connection lost), WebSocket transport closes/errors, fetch failed, premature stream endings, HTTP/2 closed before response, terminated, retry delay exceeded
         return /overloaded|provider.?returned.?error|rate.?limit|too many requests|429|500|502|503|504|service.?unavailable|server.?error|internal.?error|network.?error|connection.?error|connection.?refused|connection.?lost|websocket.?closed|websocket.?error|other side closed|fetch failed|upstream.?connect|reset before headers|socket hang up|ended without|stream ended before message_stop|http2 request did not get a response|timed? out|timeout|terminated|retry delay/i.test(err);
     }
@@ -2361,7 +2466,7 @@ export class AgentSession {
      */
     setSessionName(name) {
         this.session.appendSessionInfo(name);
-        this._emit({ type: "session_info_changed", name: this.session.getSessionName() });
+        void this._emit({ type: "session_info_changed", name: this.session.getSessionName() });
     }
     // =========================================================================
     // Tree Navigation