@mariozechner/pi-coding-agent 0.59.0 → 0.61.0

package/dist/core/agent-session.js

@@ -12,8 +12,8 @@
  *
  * Modes use this class and add their own I/O layer on top.
  */
-import { readFileSync } from "node:fs";
-import { basename, dirname, join } from "node:path";
+import { copyFileSync, existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { basename, dirname, join, resolve } from "node:path";
 import { isContextOverflow, modelsAreEqual, resetApiProviders, supportsXhigh } from "@mariozechner/pi-ai";
 import { getDocsPath } from "../config.js";
 import { theme } from "../modes/interactive/theme/theme.js";
@@ -26,7 +26,7 @@ import { exportSessionToHtml } from "./export-html/index.js";
 import { createToolHtmlRenderer } from "./export-html/tool-renderer.js";
 import { ExtensionRunner, wrapRegisteredTools, } from "./extensions/index.js";
 import { expandPromptTemplate } from "./prompt-templates.js";
-import { getLatestCompactionEntry } from "./session-manager.js";
+import { CURRENT_SESSION_VERSION, getLatestCompactionEntry } from "./session-manager.js";
 import { BUILTIN_SLASH_COMMANDS } from "./slash-commands.js";
 import { buildSystemPrompt } from "./system-prompt.js";
 import { createAllTools } from "./tools/index.js";
@@ -288,7 +288,6 @@ export class AgentSession {
                         attempt: this._retryAttempt,
                     });
                     this._retryAttempt = 0;
-                    this._resolveRetry();
                 }
             }
         }
@@ -302,6 +301,7 @@ export class AgentSession {
                 if (didRetry)
                     return; // Retry was initiated, don't proceed to compaction
             }
+            this._resolveRetry();
             await this._checkCompaction(msg);
         }
     }
@@ -802,8 +802,9 @@ export class AgentSession {
         }
     }
     /**
-     * Queue a steering message to interrupt the agent mid-run.
-     * Delivered after current tool execution, skips remaining tools.
+     * 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.
      * @param images Optional image attachments to include with the message
      * @throws Error if text is an extension command
@@ -1643,6 +1644,17 @@ export class AgentSession {
             ? runner.onError(this._extensionErrorListener)
             : undefined;
     }
+    _refreshCurrentModelFromRegistry() {
+        const currentModel = this.model;
+        if (!currentModel) {
+            return;
+        }
+        const refreshedModel = this._modelRegistry.find(currentModel.provider, currentModel.id);
+        if (!refreshedModel || refreshedModel === currentModel) {
+            return;
+        }
+        this.agent.setModel(refreshedModel);
+    }
     _bindExtensionCore(runner) {
         const normalizeLocation = (source) => {
             if (source === "user" || source === "project" || source === "path") {
@@ -1744,6 +1756,15 @@ export class AgentSession {
                 })();
             },
             getSystemPrompt: () => this.systemPrompt,
+        }, {
+            registerProvider: (name, config) => {
+                this._modelRegistry.registerProvider(name, config);
+                this._refreshCurrentModelFromRegistry();
+            },
+            unregisterProvider: (name) => {
+                this._modelRegistry.unregisterProvider(name);
+                this._refreshCurrentModelFromRegistry();
+            },
         });
     }
     _refreshToolRegistry(options) {
@@ -1864,8 +1885,8 @@ export class AgentSession {
         if (isContextOverflow(message, contextWindow))
             return false;
         const err = message.errorMessage;
-        // Match: overloaded_error, provider returned error, rate limit, 429, 500, 502, 503, 504, service unavailable, connection errors, fetch failed, 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|connection.?error|connection.?refused|other side closed|fetch failed|upstream.?connect|reset before headers|terminated|retry delay/i.test(err);
+        // Match: overloaded_error, provider returned error, rate limit, 429, 500, 502, 503, 504, service unavailable, network/connection errors, fetch failed, 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|other side closed|fetch failed|upstream.?connect|reset before headers|socket hang up|timed? out|timeout|terminated|retry delay/i.test(err);
     }
     /**
      * Handle retryable errors with exponential backoff.
@@ -2492,6 +2513,60 @@ export class AgentSession {
             toolRenderer,
         });
     }
+    /**
+     * Export the current session branch to a JSONL file.
+     * Writes the session header followed by all entries on the current branch path.
+     * @param outputPath Target file path. If omitted, generates a timestamped file in cwd.
+     * @returns The resolved output file path.
+     */
+    exportToJsonl(outputPath) {
+        const filePath = resolve(outputPath ?? `session-${new Date().toISOString().replace(/[:.]/g, "-")}.jsonl`);
+        const dir = dirname(filePath);
+        if (!existsSync(dir)) {
+            mkdirSync(dir, { recursive: true });
+        }
+        const header = {
+            type: "session",
+            version: CURRENT_SESSION_VERSION,
+            id: this.sessionManager.getSessionId(),
+            timestamp: new Date().toISOString(),
+            cwd: this.sessionManager.getCwd(),
+        };
+        const branchEntries = this.sessionManager.getBranch();
+        const lines = [JSON.stringify(header)];
+        // Re-chain parentIds to form a linear sequence
+        let prevId = null;
+        for (const entry of branchEntries) {
+            const linear = { ...entry, parentId: prevId };
+            lines.push(JSON.stringify(linear));
+            prevId = entry.id;
+        }
+        writeFileSync(filePath, `${lines.join("\n")}\n`);
+        return filePath;
+    }
+    /**
+     * Import a JSONL session file.
+     * Copies the file into the session directory and switches to it (like /resume).
+     * @param inputPath Path to the JSONL file to import.
+     * @returns true if the session was switched successfully.
+     */
+    async importFromJsonl(inputPath) {
+        const resolved = resolve(inputPath);
+        if (!existsSync(resolved)) {
+            throw new Error(`File not found: ${resolved}`);
+        }
+        // Copy into the session directory so we don't modify the original
+        const sessionDir = this.sessionManager.getSessionDir();
+        if (!existsSync(sessionDir)) {
+            mkdirSync(sessionDir, { recursive: true });
+        }
+        const destPath = join(sessionDir, basename(resolved));
+        // Avoid overwriting if source and destination are the same file
+        if (resolve(destPath) !== resolved) {
+            copyFileSync(resolved, destPath);
+        }
+        return this.switchSession(destPath);
+    }
     // =========================================================================
     // Utilities
     // =========================================================================