@mariozechner/pi-coding-agent 0.46.0 → 0.48.0

package/dist/core/agent-session.js

@@ -12,11 +12,15 @@
  *
  * Modes use this class and add their own I/O layer on top.
  */
+import { readFileSync } from "node:fs";
 import { isContextOverflow, modelsAreEqual, supportsXhigh } from "@mariozechner/pi-ai";
 import { getAuthPath } from "../config.js";
+import { theme } from "../modes/interactive/theme/theme.js";
+import { stripFrontmatter } from "../utils/frontmatter.js";
 import { executeBash as executeBashCommand, executeBashWithOperations } from "./bash-executor.js";
 import { calculateContextTokens, collectEntriesForBranchSummary, compact, generateBranchSummary, prepareCompaction, shouldCompact, } from "./compaction/index.js";
 import { exportSessionToHtml } from "./export-html/index.js";
+import { createToolHtmlRenderer } from "./export-html/tool-renderer.js";
 import { expandPromptTemplate } from "./prompt-templates.js";
 // ============================================================================
 // Constants
@@ -394,8 +398,25 @@ export class AgentSession {
                 return;
             }
         }
-        // Expand file-based prompt templates if requested
-        const expandedText = expandPromptTemplates ? expandPromptTemplate(text, [...this._promptTemplates]) : text;
+        // Emit input event for extension interception (before skill/template expansion)
+        let currentText = text;
+        let currentImages = options?.images;
+        if (this._extensionRunner?.hasHandlers("input")) {
+            const inputResult = await this._extensionRunner.emitInput(currentText, currentImages, options?.source ?? "interactive");
+            if (inputResult.action === "handled") {
+                return;
+            }
+            if (inputResult.action === "transform") {
+                currentText = inputResult.text;
+                currentImages = inputResult.images ?? currentImages;
+            }
+        }
+        // Expand skill commands (/skill:name args) and prompt templates (/template args)
+        let expandedText = currentText;
+        if (expandPromptTemplates) {
+            expandedText = this._expandSkillCommand(expandedText);
+            expandedText = expandPromptTemplate(expandedText, [...this._promptTemplates]);
+        }
         // If streaming, queue via steer() or followUp() based on option
         if (this.isStreaming) {
             if (!options?.streamingBehavior) {
@@ -432,8 +453,8 @@ export class AgentSession {
         const messages = [];
         // Add user message
         const userContent = [{ type: "text", text: expandedText }];
-        if (options?.images) {
-            userContent.push(...options.images);
+        if (currentImages) {
+            userContent.push(...currentImages);
         }
         messages.push({
             role: "user",
@@ -447,7 +468,7 @@ export class AgentSession {
         this._pendingNextTurnMessages = [];
         // Emit before_agent_start extension event
         if (this._extensionRunner) {
-            const result = await this._extensionRunner.emitBeforeAgentStart(expandedText, options?.images, this._baseSystemPrompt);
+            const result = await this._extensionRunner.emitBeforeAgentStart(expandedText, currentImages, this._baseSystemPrompt);
             // Add all custom messages from extensions
             if (result?.messages) {
                 for (const msg of result.messages) {
@@ -502,10 +523,41 @@ export class AgentSession {
             return true;
         }
     }
+    /**
+     * Expand skill commands (/skill:name args) to their full content.
+     * Returns the expanded text, or the original text if not a skill command or skill not found.
+     * Emits errors via extension runner if file read fails.
+     */
+    _expandSkillCommand(text) {
+        if (!text.startsWith("/skill:"))
+            return text;
+        const spaceIndex = text.indexOf(" ");
+        const skillName = spaceIndex === -1 ? text.slice(7) : text.slice(7, spaceIndex);
+        const args = spaceIndex === -1 ? "" : text.slice(spaceIndex + 1).trim();
+        const skill = this._skills.find((s) => s.name === skillName);
+        if (!skill)
+            return text; // Unknown skill, pass through
+        try {
+            const content = readFileSync(skill.filePath, "utf-8");
+            const body = stripFrontmatter(content).trim();
+            const header = `Skill location: ${skill.filePath}\nReferences are relative to ${skill.baseDir}.`;
+            const skillMessage = `${header}\n\n${body}`;
+            return args ? `${skillMessage}\n\n---\n\nUser: ${args}` : skillMessage;
+        }
+        catch (err) {
+            // Emit error like extension commands do
+            this._extensionRunner?.emitError({
+                extensionPath: skill.filePath,
+                event: "skill_expansion",
+                error: err instanceof Error ? err.message : String(err),
+            });
+            return text; // Return original on error
+        }
+    }
     /**
      * Queue a steering message to interrupt the agent mid-run.
      * Delivered after current tool execution, skips remaining tools.
-     * Expands file-based prompt templates. Errors on extension commands.
+     * Expands skill commands and prompt templates. Errors on extension commands.
      * @throws Error if text is an extension command
      */
     async steer(text) {
@@ -513,14 +565,15 @@ export class AgentSession {
         if (text.startsWith("/")) {
             this._throwIfExtensionCommand(text);
         }
-        // Expand file-based prompt templates
-        const expandedText = expandPromptTemplate(text, [...this._promptTemplates]);
+        // Expand skill commands and prompt templates
+        let expandedText = this._expandSkillCommand(text);
+        expandedText = expandPromptTemplate(expandedText, [...this._promptTemplates]);
         await this._queueSteer(expandedText);
     }
     /**
      * 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 file-based prompt templates. Errors on extension commands.
+     * Expands skill commands and prompt templates. Errors on extension commands.
      * @throws Error if text is an extension command
      */
     async followUp(text) {
@@ -528,8 +581,9 @@ export class AgentSession {
         if (text.startsWith("/")) {
             this._throwIfExtensionCommand(text);
         }
-        // Expand file-based prompt templates
-        const expandedText = expandPromptTemplate(text, [...this._promptTemplates]);
+        // Expand skill commands and prompt templates
+        let expandedText = this._expandSkillCommand(text);
+        expandedText = expandPromptTemplate(expandedText, [...this._promptTemplates]);
         await this._queueFollowUp(expandedText);
     }
     /**
@@ -641,6 +695,7 @@ export class AgentSession {
             expandPromptTemplates: false,
             streamingBehavior: options?.deliverAs,
             images,
+            source: "extension",
         });
     }
     /**
@@ -1169,10 +1224,16 @@ export class AgentSession {
             }
         }
         catch (error) {
-            this._emit({ type: "auto_compaction_end", result: undefined, aborted: false, willRetry: false });
-            if (reason === "overflow") {
-                throw new Error(`Context overflow: ${error instanceof Error ? error.message : "compaction failed"}. Your input may be too large for the context window.`);
-            }
+            const errorMessage = error instanceof Error ? error.message : "compaction failed";
+            this._emit({
+                type: "auto_compaction_end",
+                result: undefined,
+                aborted: false,
+                willRetry: false,
+                errorMessage: reason === "overflow"
+                    ? `Context overflow recovery failed: ${errorMessage}`
+                    : `Auto-compaction failed: ${errorMessage}`,
+            });
         }
         finally {
             this._autoCompactionAbortController = undefined;
@@ -1203,8 +1264,8 @@ export class AgentSession {
         if (isContextOverflow(message, contextWindow))
             return false;
         const err = message.errorMessage;
-        // Match: overloaded_error, rate limit, 429, 500, 502, 503, 504, service unavailable, connection error, other side closed, fetch failed
-        return /overloaded|rate.?limit|too many requests|429|500|502|503|504|service.?unavailable|server error|internal error|connection.?error|other side closed|fetch failed/i.test(err);
+        // Match: overloaded_error, rate limit, 429, 500, 502, 503, 504, service unavailable, connection errors, fetch failed
+        return /overloaded|rate.?limit|too many requests|429|500|502|503|504|service.?unavailable|server error|internal error|connection.?error|connection.?refused|other side closed|fetch failed|upstream.?connect|reset before headers/i.test(err);
     }
     /**
      * Handle retryable errors with exponential backoff.
@@ -1334,13 +1395,16 @@ export class AgentSession {
      */
     async executeBash(command, onChunk, options) {
         this._bashAbortController = new AbortController();
+        // Apply command prefix if configured (e.g., "shopt -s expand_aliases" for alias support)
+        const prefix = this.settingsManager.getShellCommandPrefix();
+        const resolvedCommand = prefix ? `${prefix}\n${command}` : command;
         try {
             const result = options?.operations
-                ? await executeBashWithOperations(command, process.cwd(), options.operations, {
+                ? await executeBashWithOperations(resolvedCommand, process.cwd(), options.operations, {
                     onChunk,
                     signal: this._bashAbortController.signal,
                 })
-                : await executeBashCommand(command, {
+                : await executeBashCommand(resolvedCommand, {
                     onChunk,
                     signal: this._bashAbortController.signal,
                 });
@@ -1529,6 +1593,8 @@ export class AgentSession {
      * @param targetId The entry ID to navigate to
      * @param options.summarize Whether user wants to summarize abandoned branch
      * @param options.customInstructions Custom instructions for summarizer
+     * @param options.replaceInstructions If true, customInstructions replaces the default prompt
+     * @param options.label Label to attach to the branch summary entry
      * @returns Result with editorText (if user message) and cancelled status
      */
     async navigateTree(targetId, options = {}) {
@@ -1547,13 +1613,19 @@ export class AgentSession {
         }
         // Collect entries to summarize (from old leaf to common ancestor)
         const { entries: entriesToSummarize, commonAncestorId } = collectEntriesForBranchSummary(this.sessionManager, oldLeafId, targetId);
-        // Prepare event data
+        // Prepare event data - mutable so extensions can override
+        let customInstructions = options.customInstructions;
+        let replaceInstructions = options.replaceInstructions;
+        let label = options.label;
         const preparation = {
             targetId,
             oldLeafId,
             commonAncestorId,
             entriesToSummarize,
             userWantsSummary: options.summarize ?? false,
+            customInstructions,
+            replaceInstructions,
+            label,
         };
         // Set up abort controller for summarization
         this._branchSummaryAbortController = new AbortController();
@@ -1573,6 +1645,16 @@ export class AgentSession {
                 extensionSummary = result.summary;
                 fromExtension = true;
             }
+            // Allow extensions to override instructions and label
+            if (result?.customInstructions !== undefined) {
+                customInstructions = result.customInstructions;
+            }
+            if (result?.replaceInstructions !== undefined) {
+                replaceInstructions = result.replaceInstructions;
+            }
+            if (result?.label !== undefined) {
+                label = result.label;
+            }
         }
         // Run default summarizer if needed
         let summaryText;
@@ -1588,7 +1670,8 @@ export class AgentSession {
                 model,
                 apiKey,
                 signal: this._branchSummaryAbortController.signal,
-                customInstructions: options.customInstructions,
+                customInstructions,
+                replaceInstructions,
                 reserveTokens: branchSummarySettings.reserveTokens,
             });
             this._branchSummaryAbortController = undefined;
@@ -1638,6 +1721,10 @@ export class AgentSession {
             // Create summary at target position (can be null for root)
             const summaryId = this.sessionManager.branchWithSummary(newLeafId, summaryText, summaryDetails, fromExtension);
             summaryEntry = this.sessionManager.getEntry(summaryId);
+            // Attach label to the summary entry
+            if (label) {
+                this.sessionManager.appendLabelChange(summaryId, label);
+            }
         }
         else if (newLeafId === null) {
             // No summary, navigating to root - reset leaf
@@ -1647,6 +1734,10 @@ export class AgentSession {
             // No summary, navigating to non-root
             this.sessionManager.branch(newLeafId);
         }
+        // Attach label to target entry when not summarizing (no summary entry to label)
+        if (label && !summaryText) {
+            this.sessionManager.appendLabelChange(targetId, label);
+        }
         // Update agent state
         const sessionContext = this.sessionManager.buildSessionContext();
         this.agent.replaceMessages(sessionContext.messages);
@@ -1743,7 +1834,19 @@ export class AgentSession {
      */
     async exportToHtml(outputPath) {
         const themeName = this.settingsManager.getTheme();
-        return await exportSessionToHtml(this.sessionManager, this.state, { outputPath, themeName });
+        // Create tool renderer if we have an extension runner (for custom tool HTML rendering)
+        let toolRenderer;
+        if (this._extensionRunner) {
+            toolRenderer = createToolHtmlRenderer({
+                getToolDefinition: (name) => this._extensionRunner.getToolDefinition(name),
+                theme,
+            });
+        }
+        return await exportSessionToHtml(this.sessionManager, this.state, {
+            outputPath,
+            themeName,
+            toolRenderer,
+        });
     }
     // =========================================================================
     // Utilities