@fleetagent/pi-coding-agent 0.0.5 → 0.0.7

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;
@@ -299,6 +302,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 +509,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 = [];
@@ -663,10 +684,12 @@ export class AgentSession {
         const loaderAppendSystemPrompt = this._resourceLoader.getAppendSystemPrompt();
         const appendSystemPrompt = loaderAppendSystemPrompt.length > 0 ? loaderAppendSystemPrompt.join("\n\n") : undefined;
         const loadedSkills = this._resourceLoader.getSkills().skills;
+        const loadedRules = this._resourceLoader.getRules().rules;
         const loadedContextFiles = this._resourceLoader.getAgentsFiles().agentsFiles;
         this._baseSystemPromptOptions = {
             cwd: this._cwd,
             skills: loadedSkills,
+            rules: loadedRules,
             contextFiles: loadedContextFiles,
             customPrompt: loaderSystemPrompt,
             appendSystemPrompt,
@@ -708,7 +731,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) {
@@ -918,7 +946,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;
@@ -928,10 +956,11 @@ export class AgentSession {
                     currentImages = inputResult.images ?? currentImages;
                 }
             }
-            // Expand skill commands (/skill:name args) and prompt templates (/template args)
+            // Expand skill/rule commands (/skill:name or /rule:name args) and prompt templates (/template args)
             let expandedText = currentText;
             if (expandPromptTemplates) {
                 expandedText = this._expandSkillCommand(expandedText);
+                expandedText = this._expandRuleCommand(expandedText);
                 expandedText = expandPromptTemplate(expandedText, [...this.promptTemplates]);
             }
             // If streaming, queue via steer() or followUp() based on option
@@ -1084,11 +1113,35 @@ export class AgentSession {
             return text; // Return original on error
         }
     }
+    _expandRuleCommand(text) {
+        if (!text.startsWith("/rule:"))
+            return text;
+        const spaceIndex = text.indexOf(" ");
+        const ruleName = spaceIndex === -1 ? text.slice(6) : text.slice(6, spaceIndex);
+        const args = spaceIndex === -1 ? "" : text.slice(spaceIndex + 1).trim();
+        const rule = this.resourceLoader.getRules().rules.find((r) => r.name === ruleName);
+        if (!rule)
+            return text; // Unknown rule, pass through
+        try {
+            const content = readFileSync(rule.filePath, "utf-8");
+            const body = stripFrontmatter(content).trim();
+            const ruleBlock = `<rule name="${rule.name}" location="${rule.filePath}">\nReferences are relative to ${rule.baseDir}.\n\n${body}\n</rule>`;
+            return args ? `${ruleBlock}\n\n${args}` : ruleBlock;
+        }
+        catch (err) {
+            this._extensionRunner.emitError({
+                extensionPath: rule.filePath,
+                event: "rule_expansion",
+                error: err instanceof Error ? err.message : String(err),
+            });
+            return text;
+        }
+    }
     /**
      * Queue a steering message while the agent is running.
      * Delivered after the current assistant turn finishes executing its tool calls,
      * before the next LLM call.
-     * Expands skill commands and prompt templates. Errors on extension commands.
+     * Expands skill/rule commands and prompt templates. Errors on extension commands.
      * @param images Optional image attachments to include with the message
      * @throws Error if text is an extension command
      */
@@ -1097,15 +1150,16 @@ export class AgentSession {
         if (text.startsWith("/")) {
             this._throwIfExtensionCommand(text);
         }
-        // Expand skill commands and prompt templates
+        // Expand skill/rule commands and prompt templates
         let expandedText = this._expandSkillCommand(text);
+        expandedText = this._expandRuleCommand(expandedText);
         expandedText = expandPromptTemplate(expandedText, [...this.promptTemplates]);
         await this._queueSteer(expandedText, images);
     }
     /**
      * Queue a follow-up message to be processed after the agent finishes.
      * Delivered only when agent has no more tool calls or steering messages.
-     * Expands skill commands and prompt templates. Errors on extension commands.
+     * Expands skill/rule commands and prompt templates. Errors on extension commands.
      * @param images Optional image attachments to include with the message
      * @throws Error if text is an extension command
      */
@@ -1114,8 +1168,9 @@ export class AgentSession {
         if (text.startsWith("/")) {
             this._throwIfExtensionCommand(text);
         }
-        // Expand skill commands and prompt templates
+        // Expand skill/rule commands and prompt templates
         let expandedText = this._expandSkillCommand(text);
+        expandedText = this._expandRuleCommand(expandedText);
         expandedText = expandPromptTemplate(expandedText, [...this.promptTemplates]);
         await this._queueFollowUp(expandedText, images);
     }
@@ -1200,8 +1255,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 });
         }
     }
     /**
@@ -1456,6 +1511,55 @@ 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() {
+        if (this._extensionCompactionRunning) {
+            return;
+        }
+        this._extensionCompactionRunning = true;
+        try {
+            while (!this.isStreaming) {
+                const options = this._extensionCompactionQueue.shift();
+                if (!options) {
+                    break;
+                }
+                await this._runRequestedExtensionCompaction(options);
+            }
+        }
+        finally {
+            this._extensionCompactionRunning = false;
+        }
+        if (!this.isStreaming) {
+            this._scheduleExtensionCompactions();
+        }
+    }
+    async _runRequestedExtensionCompaction(options) {
+        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);
+        }
+    }
     /**
      * Manually compact the session context.
      * Aborts current agent operation first.
@@ -1851,12 +1955,13 @@ export class AgentSession {
         if (!this._extensionRunner.hasHandlers("resources_discover")) {
             return;
         }
-        const { skillPaths, promptPaths, themePaths } = await this._extensionRunner.emitResourcesDiscover(this._cwd, reason);
-        if (skillPaths.length === 0 && promptPaths.length === 0 && themePaths.length === 0) {
+        const { skillPaths, rulePaths, promptPaths, themePaths } = await this._extensionRunner.emitResourcesDiscover(this._cwd, reason);
+        if (skillPaths.length === 0 && rulePaths.length === 0 && promptPaths.length === 0 && themePaths.length === 0) {
             return;
         }
         const extensionPaths = {
             skillPaths: this.buildExtensionResourcePaths(skillPaths),
+            rulePaths: this.buildExtensionResourcePaths(rulePaths),
             promptPaths: this.buildExtensionResourcePaths(promptPaths),
             themePaths: this.buildExtensionResourcePaths(themePaths),
         };
@@ -1926,7 +2031,13 @@ export class AgentSession {
                 source: "skill",
                 sourceInfo: skill.sourceInfo,
             }));
-            return [...extensionCommands, ...templates, ...skills];
+            const rules = this._resourceLoader.getRules().rules.map((rule) => ({
+                name: `rule:${rule.name}`,
+                description: rule.description,
+                source: "rule",
+                sourceInfo: rule.sourceInfo,
+            }));
+            return [...extensionCommands, ...templates, ...skills, ...rules];
         };
         runner.bindCore({
             sendMessage: (message, options) => {
@@ -1989,16 +2100,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,
         }, {
@@ -2146,6 +2248,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).
@@ -2158,6 +2263,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);
     }
@@ -2325,7 +2432,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