@mariozechner/pi-coding-agent 0.37.8 → 0.39.0

package/dist/core/agent-session.js

@@ -14,7 +14,7 @@
  */
 import { isContextOverflow, modelsAreEqual, supportsXhigh } from "@mariozechner/pi-ai";
 import { getAuthPath } from "../config.js";
-import { executeBash as executeBashCommand } from "./bash-executor.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 { expandPromptTemplate } from "./prompt-templates.js";
@@ -59,6 +59,8 @@ export class AgentSession {
     // Extension system
     _extensionRunner = undefined;
     _turnIndex = 0;
+    _skills;
+    _skillWarnings;
     _skillsSettings;
     // Model registry for API key resolution
     _modelRegistry;
@@ -75,6 +77,8 @@ export class AgentSession {
         this._scopedModels = config.scopedModels ?? [];
         this._promptTemplates = config.promptTemplates ?? [];
         this._extensionRunner = config.extensionRunner;
+        this._skills = config.skills ?? [];
+        this._skillWarnings = config.skillWarnings ?? [];
         this._skillsSettings = config.skillsSettings;
         this._modelRegistry = config.modelRegistry;
         this._toolRegistry = config.toolRegistry ?? new Map();
@@ -288,6 +292,10 @@ export class AgentSession {
     get isStreaming() {
         return this.agent.state.isStreaming;
     }
+    /** Current retry attempt (0 if not retrying) */
+    get retryAttempt() {
+        return this._retryAttempt;
+    }
     /**
      * Get the names of currently active tools.
      * Returns the names of tools currently set on the agent.
@@ -432,7 +440,7 @@ export class AgentSession {
         this._pendingNextTurnMessages = [];
         // Emit before_agent_start extension event
         if (this._extensionRunner) {
-            const result = await this._extensionRunner.emitBeforeAgentStart(expandedText, options?.images);
+            const result = await this._extensionRunner.emitBeforeAgentStart(expandedText, options?.images, this._baseSystemPrompt);
             // Add all custom messages from extensions
             if (result?.messages) {
                 for (const msg of result.messages) {
@@ -446,12 +454,12 @@ export class AgentSession {
                     });
                 }
             }
-            // Apply extension systemPromptAppend on top of base prompt
-            if (result?.systemPromptAppend) {
-                this.agent.setSystemPrompt(`${this._baseSystemPrompt}\n\n${result.systemPromptAppend}`);
+            // Apply extension-modified system prompt, or reset to base
+            if (result?.systemPrompt) {
+                this.agent.setSystemPrompt(result.systemPrompt);
             }
             else {
-                // Ensure we're using the base prompt (in case previous turn had appends)
+                // Ensure we're using the base prompt (in case previous turn had modifications)
                 this.agent.setSystemPrompt(this._baseSystemPrompt);
             }
         }
@@ -656,6 +664,14 @@ export class AgentSession {
     get skillsSettings() {
         return this._skillsSettings;
     }
+    /** Skills loaded by SDK (empty if --no-skills or skills: [] was passed) */
+    get skills() {
+        return this._skills;
+    }
+    /** Skill loading warnings captured by SDK */
+    get skillWarnings() {
+        return this._skillWarnings;
+    }
     /**
      * Abort current operation and wait for agent to become idle.
      */
@@ -1001,8 +1017,20 @@ export class AgentSession {
         if (skipAbortedCheck && assistantMessage.stopReason === "aborted")
             return;
         const contextWindow = this.model?.contextWindow ?? 0;
+        // Skip overflow check if the message came from a different model.
+        // This handles the case where user switched from a smaller-context model (e.g. opus)
+        // to a larger-context model (e.g. codex) - the overflow error from the old model
+        // shouldn't trigger compaction for the new model.
+        const sameModel = this.model && assistantMessage.provider === this.model.provider && assistantMessage.model === this.model.id;
+        // Skip overflow check if the error is from before a compaction in the current path.
+        // This handles the case where an error was kept after compaction (in the "kept" region).
+        // The error shouldn't trigger another compaction since we already compacted.
+        // Example: opus fails → switch to codex → compact → switch back to opus → opus error
+        // is still in context but shouldn't trigger compaction again.
+        const compactionEntry = this.sessionManager.getBranch().find((e) => e.type === "compaction");
+        const errorIsFromBeforeCompaction = compactionEntry && assistantMessage.timestamp < new Date(compactionEntry.timestamp).getTime();
         // Case 1: Overflow - LLM returned context overflow error
-        if (isContextOverflow(assistantMessage, contextWindow)) {
+        if (sameModel && !errorIsFromBeforeCompaction && isContextOverflow(assistantMessage, contextWindow)) {
             // Remove the error message from agent state (it IS saved to session for history,
             // but we don't want it in context for the retry)
             const messages = this.agent.state.messages;
@@ -1244,7 +1272,7 @@ export class AgentSession {
      */
     abortRetry() {
         this._retryAbortController?.abort();
-        this._retryAttempt = 0;
+        // Note: _retryAttempt is reset in the catch block of _autoRetry
         this._resolveRetry();
     }
     /**
@@ -1279,43 +1307,55 @@ export class AgentSession {
      * @param command The bash command to execute
      * @param onChunk Optional streaming callback for output
      * @param options.excludeFromContext If true, command output won't be sent to LLM (!! prefix)
+     * @param options.operations Custom BashOperations for remote execution
      */
     async executeBash(command, onChunk, options) {
         this._bashAbortController = new AbortController();
         try {
-            const result = await executeBashCommand(command, {
-                onChunk,
-                signal: this._bashAbortController.signal,
-            });
-            // Create and save message
-            const bashMessage = {
-                role: "bashExecution",
-                command,
-                output: result.output,
-                exitCode: result.exitCode,
-                cancelled: result.cancelled,
-                truncated: result.truncated,
-                fullOutputPath: result.fullOutputPath,
-                timestamp: Date.now(),
-                excludeFromContext: options?.excludeFromContext,
-            };
-            // If agent is streaming, defer adding to avoid breaking tool_use/tool_result ordering
-            if (this.isStreaming) {
-                // Queue for later - will be flushed on agent_end
-                this._pendingBashMessages.push(bashMessage);
-            }
-            else {
-                // Add to agent state immediately
-                this.agent.appendMessage(bashMessage);
-                // Save to session
-                this.sessionManager.appendMessage(bashMessage);
-            }
+            const result = options?.operations
+                ? await executeBashWithOperations(command, process.cwd(), options.operations, {
+                    onChunk,
+                    signal: this._bashAbortController.signal,
+                })
+                : await executeBashCommand(command, {
+                    onChunk,
+                    signal: this._bashAbortController.signal,
+                });
+            this.recordBashResult(command, result, options);
             return result;
         }
         finally {
             this._bashAbortController = undefined;
         }
     }
+    /**
+     * Record a bash execution result in session history.
+     * Used by executeBash and by extensions that handle bash execution themselves.
+     */
+    recordBashResult(command, result, options) {
+        const bashMessage = {
+            role: "bashExecution",
+            command,
+            output: result.output,
+            exitCode: result.exitCode,
+            cancelled: result.cancelled,
+            truncated: result.truncated,
+            fullOutputPath: result.fullOutputPath,
+            timestamp: Date.now(),
+            excludeFromContext: options?.excludeFromContext,
+        };
+        // If agent is streaming, defer adding to avoid breaking tool_use/tool_result ordering
+        if (this.isStreaming) {
+            // Queue for later - will be flushed on agent_end
+            this._pendingBashMessages.push(bashMessage);
+        }
+        else {
+            // Add to agent state immediately
+            this.agent.appendMessage(bashMessage);
+            // Save to session
+            this.sessionManager.appendMessage(bashMessage);
+        }
+    }
     /**
      * Cancel running bash command.
      */