@codex-infinity/pi-infinity 0.60.1 → 0.61.1

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";
@@ -56,61 +56,56 @@ const THINKING_LEVELS_WITH_XHIGH = ["off", "minimal", "low", "medium", "high", "
 // AgentSession Class
 // ============================================================================
 export class AgentSession {
-    agent;
-    sessionManager;
-    settingsManager;
-    _scopedModels;
-    // Event subscription state
-    _unsubscribeAgent;
-    _eventListeners = [];
-    _agentEventQueue = Promise.resolve();
-    /** Tracks pending steering messages for UI display. Removed when delivered. */
-    _steeringMessages = [];
-    /** Tracks pending follow-up messages for UI display. Removed when delivered. */
-    _followUpMessages = [];
-    /** Messages queued to be included with the next user prompt as context ("asides"). */
-    _pendingNextTurnMessages = [];
-    // Compaction state
-    _compactionAbortController = undefined;
-    _autoCompactionAbortController = undefined;
-    _overflowRecoveryAttempted = false;
-    // Branch summarization state
-    _branchSummaryAbortController = undefined;
-    // Retry state
-    _retryAbortController = undefined;
-    _retryAttempt = 0;
-    _retryPromise = undefined;
-    _retryResolve = undefined;
-    // Autonomous mode settings
-    _autoNextSteps = false;
-    _autoNextIdea = false;
-    // Bash execution state
-    _bashAbortController = undefined;
-    _pendingBashMessages = [];
-    // Extension system
-    _extensionRunner = undefined;
-    _turnIndex = 0;
-    _resourceLoader;
-    _customTools;
-    _baseToolRegistry = new Map();
-    _cwd;
-    _extensionRunnerRef;
-    _initialActiveToolNames;
-    _baseToolsOverride;
-    _extensionUIContext;
-    _extensionCommandContextActions;
-    _extensionShutdownHandler;
-    _extensionErrorListener;
-    _extensionErrorUnsubscriber;
-    // Model registry for API key resolution
-    _modelRegistry;
-    // Tool registry for extension getTools/setTools
-    _toolRegistry = new Map();
-    _toolPromptSnippets = new Map();
-    _toolPromptGuidelines = new Map();
-    // Base system prompt (without extension appends) - used to apply fresh appends each turn
-    _baseSystemPrompt = "";
     constructor(config) {
+        this._eventListeners = [];
+        this._agentEventQueue = Promise.resolve();
+        /** Tracks pending steering messages for UI display. Removed when delivered. */
+        this._steeringMessages = [];
+        /** Tracks pending follow-up messages for UI display. Removed when delivered. */
+        this._followUpMessages = [];
+        /** Messages queued to be included with the next user prompt as context ("asides"). */
+        this._pendingNextTurnMessages = [];
+        // Compaction state
+        this._compactionAbortController = undefined;
+        this._autoCompactionAbortController = undefined;
+        this._overflowRecoveryAttempted = false;
+        // Branch summarization state
+        this._branchSummaryAbortController = undefined;
+        // Retry state
+        this._retryAbortController = undefined;
+        this._retryAttempt = 0;
+        this._retryPromise = undefined;
+        this._retryResolve = undefined;
+        // Autonomous mode settings
+        this._autoNextSteps = false;
+        this._autoNextIdea = false;
+        // Bash execution state
+        this._bashAbortController = undefined;
+        this._pendingBashMessages = [];
+        // Extension system
+        this._extensionRunner = undefined;
+        this._turnIndex = 0;
+        this._baseToolRegistry = new Map();
+        // Tool registry for extension getTools/setTools
+        this._toolRegistry = new Map();
+        this._toolPromptSnippets = new Map();
+        this._toolPromptGuidelines = new Map();
+        // Base system prompt (without extension appends) - used to apply fresh appends each turn
+        this._baseSystemPrompt = "";
+        // Track last assistant message for auto-compaction check
+        this._lastAssistantMessage = undefined;
+        /** Internal handler for agent events - shared by subscribe and reconnect */
+        this._handleAgentEvent = (event) => {
+            // Create retry promise synchronously before queueing async processing.
+            // Agent.emit() calls this handler synchronously, and prompt() calls waitForRetry()
+            // as soon as agent.prompt() resolves. If _retryPromise is created only inside
+            // _processAgentEvent, slow earlier queued events can delay agent_end processing
+            // and waitForRetry() can miss the in-flight retry.
+            this._createRetryPromiseForAgentEnd(event);
+            this._agentEventQueue = this._agentEventQueue.then(() => this._processAgentEvent(event), () => this._processAgentEvent(event));
+            // Keep queue alive if an event handler fails
+            this._agentEventQueue.catch(() => { });
+        };
         this.agent = config.agent;
         this.sessionManager = config.sessionManager;
         this.settingsManager = config.settingsManager;
@@ -199,20 +194,6 @@ export class AgentSession {
             l(event);
         }
     }
-    // Track last assistant message for auto-compaction check
-    _lastAssistantMessage = undefined;
-    /** Internal handler for agent events - shared by subscribe and reconnect */
-    _handleAgentEvent = (event) => {
-        // Create retry promise synchronously before queueing async processing.
-        // Agent.emit() calls this handler synchronously, and prompt() calls waitForRetry()
-        // as soon as agent.prompt() resolves. If _retryPromise is created only inside
-        // _processAgentEvent, slow earlier queued events can delay agent_end processing
-        // and waitForRetry() can miss the in-flight retry.
-        this._createRetryPromiseForAgentEnd(event);
-        this._agentEventQueue = this._agentEventQueue.then(() => this._processAgentEvent(event), () => this._processAgentEvent(event));
-        // Keep queue alive if an event handler fails
-        this._agentEventQueue.catch(() => { });
-    };
     _createRetryPromiseForAgentEnd(event) {
         if (event.type !== "agent_end" || this._retryPromise) {
             return;
@@ -293,7 +274,6 @@ export class AgentSession {
                         attempt: this._retryAttempt,
                     });
                     this._retryAttempt = 0;
-                    this._resolveRetry();
                 }
             }
         }
@@ -307,6 +287,7 @@ export class AgentSession {
                 if (didRetry)
                     return; // Retry was initiated, don't proceed to compaction
             }
+            this._resolveRetry();
             await this._checkCompaction(msg);
             // Queue autonomous follow-up if enabled (after compaction, so it has full context)
             this._maybeQueueAutonomousFollowUp(msg);
@@ -2558,6 +2539,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
     // =========================================================================