@mariozechner/pi-coding-agent 0.64.0 → 0.65.1

package/dist/modes/interactive/interactive-mode.js

@@ -15,6 +15,7 @@ import { KeybindingsManager } from "../../core/keybindings.js";
 import { createCompactionSummaryMessage } from "../../core/messages.js";
 import { findExactModelReferenceMatch, resolveModelScope } from "../../core/model-resolver.js";
 import { DefaultPackageManager } from "../../core/package-manager.js";
+import { formatMissingSessionCwdPrompt, MissingSessionCwdError } from "../../core/session-cwd.js";
 import { SessionManager } from "../../core/session-manager.js";
 import { BUILTIN_SLASH_COMMANDS } from "../../core/slash-commands.js";
 import { getChangelogPath, getNewEntries, parseChangelog } from "../../utils/changelog.js";
@@ -48,13 +49,13 @@ import { ToolExecutionComponent } from "./components/tool-execution.js";
 import { TreeSelectorComponent } from "./components/tree-selector.js";
 import { UserMessageComponent } from "./components/user-message.js";
 import { UserMessageSelectorComponent } from "./components/user-message-selector.js";
-import { getAvailableThemes, getAvailableThemesWithPaths, getEditorTheme, getMarkdownTheme, getThemeByName, initTheme, onThemeChange, setRegisteredThemes, setTheme, setThemeInstance, Theme, theme, } from "./theme/theme.js";
+import { getAvailableThemes, getAvailableThemesWithPaths, getEditorTheme, getMarkdownTheme, getThemeByName, initTheme, onThemeChange, setRegisteredThemes, setTheme, setThemeInstance, stopThemeWatcher, Theme, theme, } from "./theme/theme.js";
 function isExpandable(obj) {
     return typeof obj === "object" && obj !== null && "setExpanded" in obj && typeof obj.setExpanded === "function";
 }
 export class InteractiveMode {
     options;
-    session;
+    runtimeHost;
     ui;
     chatContainer;
     pendingMessagesContainer;
@@ -130,6 +131,9 @@ export class InteractiveMode {
     // Custom header from extension (undefined = use built-in header)
     customHeader = undefined;
     // Convenience accessors
+    get session() {
+        return this.runtimeHost.session;
+    }
     get agent() {
         return this.session.agent;
     }
@@ -139,9 +143,9 @@ export class InteractiveMode {
     get settingsManager() {
         return this.session.settingsManager;
     }
-    constructor(session, options = {}) {
+    constructor(runtimeHost, options = {}) {
         this.options = options;
-        this.session = session;
+        this.runtimeHost = runtimeHost;
         this.version = VERSION;
         this.ui = new TUI(new ProcessTerminal(), this.settingsManager.getShowHardwareCursor());
         this.ui.setClearOnShrink(this.settingsManager.getClearOnShrink());
@@ -162,9 +166,9 @@ export class InteractiveMode {
         this.editor = this.defaultEditor;
         this.editorContainer = new Container();
         this.editorContainer.addChild(this.editor);
-        this.footerDataProvider = new FooterDataProvider();
-        this.footer = new FooterComponent(session, this.footerDataProvider);
-        this.footer.setAutoCompactEnabled(session.autoCompactionEnabled);
+        this.footerDataProvider = new FooterDataProvider(this.sessionManager.getCwd());
+        this.footer = new FooterComponent(this.session, this.footerDataProvider);
+        this.footer.setAutoCompactEnabled(this.session.autoCompactionEnabled);
         // Load hide thinking block setting
         this.hideThinkingBlock = this.settingsManager.getHideThinkingBlock();
         // Register themes from resource loader and initialize
@@ -271,7 +275,7 @@ export class InteractiveMode {
             }
         }
         // Setup autocomplete
-        this.autocompleteProvider = new CombinedAutocompleteProvider([...slashCommands, ...templateCommands, ...extensionCommands, ...skillCommandList], process.cwd(), fdPath);
+        this.autocompleteProvider = new CombinedAutocompleteProvider([...slashCommands, ...templateCommands, ...extensionCommands, ...skillCommandList], this.sessionManager.getCwd(), fdPath);
         this.defaultEditor.setAutocompleteProvider(this.autocompleteProvider);
         if (this.editor !== this.defaultEditor) {
             this.editor.setAutocompleteProvider?.(this.autocompleteProvider);
@@ -366,7 +370,7 @@ export class InteractiveMode {
         this.ui.start();
         this.isInitialized = true;
         // Initialize extensions first so resources are shown before messages
-        await this.initExtensions();
+        await this.bindCurrentSessionExtensions();
         // Render initial messages AFTER showing loaded resources
         this.renderInitialMessages();
         // Set terminal title
@@ -390,7 +394,7 @@ export class InteractiveMode {
      * Update terminal title with session name and cwd.
      */
     updateTerminalTitle() {
-        const cwdBasename = path.basename(process.cwd());
+        const cwdBasename = path.basename(this.sessionManager.getCwd());
         const sessionName = this.sessionManager.getSessionName();
         if (sessionName) {
             this.ui.terminal.setTitle(`π - ${sessionName} - ${cwdBasename}`);
@@ -497,7 +501,7 @@ export class InteractiveMode {
         }
         try {
             const packageManager = new DefaultPackageManager({
-                cwd: process.cwd(),
+                cwd: this.sessionManager.getCwd(),
                 agentDir: getAgentDir(),
                 settingsManager: this.settingsManager,
             });
@@ -885,7 +889,7 @@ export class InteractiveMode {
     /**
      * Initialize the extension system with TUI-based UI context.
      */
-    async initExtensions() {
+    async bindCurrentSessionExtensions() {
         const uiContext = this.createExtensionUIContext();
         await this.session.bindExtensions({
             uiContext,
@@ -897,33 +901,33 @@ export class InteractiveMode {
                         this.loadingAnimation = undefined;
                     }
                     this.statusContainer.clear();
-                    // Delegate to AgentSession (handles setup + agent state sync)
-                    const success = await this.session.newSession(options);
-                    if (!success) {
-                        return { cancelled: true };
+                    try {
+                        const result = await this.runtimeHost.newSession(options);
+                        if (!result.cancelled) {
+                            await this.handleRuntimeSessionChange();
+                            this.renderCurrentSessionState();
+                            this.ui.requestRender();
+                        }
+                        return result;
+                    }
+                    catch (error) {
+                        return this.handleFatalRuntimeError("Failed to create session", error);
                     }
-                    // Clear UI state
-                    this.chatContainer.clear();
-                    this.pendingMessagesContainer.clear();
-                    this.compactionQueuedMessages = [];
-                    this.streamingComponent = undefined;
-                    this.streamingMessage = undefined;
-                    this.pendingTools.clear();
-                    // Render any messages added via setup, or show empty session
-                    this.renderInitialMessages();
-                    this.ui.requestRender();
-                    return { cancelled: false };
                 },
                 fork: async (entryId) => {
-                    const result = await this.session.fork(entryId);
-                    if (result.cancelled) {
-                        return { cancelled: true };
+                    try {
+                        const result = await this.runtimeHost.fork(entryId);
+                        if (!result.cancelled) {
+                            await this.handleRuntimeSessionChange();
+                            this.renderCurrentSessionState();
+                            this.editor.setText(result.selectedText ?? "");
+                            this.showStatus("Forked to new session");
+                        }
+                        return { cancelled: result.cancelled };
+                    }
+                    catch (error) {
+                        return this.handleFatalRuntimeError("Failed to fork session", error);
                     }
-                    this.chatContainer.clear();
-                    this.renderInitialMessages();
-                    this.editor.setText(result.selectedText);
-                    this.showStatus("Forked to new session");
-                    return { cancelled: false };
                 },
                 navigateTree: async (targetId, options) => {
                     const result = await this.session.navigateTree(targetId, {
@@ -971,6 +975,49 @@ export class InteractiveMode {
         this.setupExtensionShortcuts(extensionRunner);
         this.showLoadedResources({ force: false });
     }
+    applyRuntimeSettings() {
+        this.footer.setSession(this.session);
+        this.footer.setAutoCompactEnabled(this.session.autoCompactionEnabled);
+        this.footerDataProvider.setCwd(this.sessionManager.getCwd());
+        this.hideThinkingBlock = this.settingsManager.getHideThinkingBlock();
+        this.ui.setShowHardwareCursor(this.settingsManager.getShowHardwareCursor());
+        this.ui.setClearOnShrink(this.settingsManager.getClearOnShrink());
+        const editorPaddingX = this.settingsManager.getEditorPaddingX();
+        const autocompleteMaxVisible = this.settingsManager.getAutocompleteMaxVisible();
+        this.defaultEditor.setPaddingX(editorPaddingX);
+        this.defaultEditor.setAutocompleteMaxVisible(autocompleteMaxVisible);
+        if (this.editor !== this.defaultEditor) {
+            this.editor.setPaddingX?.(editorPaddingX);
+            this.editor.setAutocompleteMaxVisible?.(autocompleteMaxVisible);
+        }
+    }
+    async handleRuntimeSessionChange() {
+        this.resetExtensionUI();
+        this.unsubscribe?.();
+        this.unsubscribe = undefined;
+        this.applyRuntimeSettings();
+        await this.bindCurrentSessionExtensions();
+        this.subscribeToAgent();
+        await this.updateAvailableProviderCount();
+        this.updateEditorBorderColor();
+        this.updateTerminalTitle();
+    }
+    async handleFatalRuntimeError(prefix, error) {
+        const message = error instanceof Error ? error.message : String(error);
+        this.showError(`${prefix}: ${message}`);
+        stopThemeWatcher();
+        this.stop();
+        process.exit(1);
+    }
+    renderCurrentSessionState() {
+        this.chatContainer.clear();
+        this.pendingMessagesContainer.clear();
+        this.compactionQueuedMessages = [];
+        this.streamingComponent = undefined;
+        this.streamingMessage = undefined;
+        this.pendingTools.clear();
+        this.renderInitialMessages();
+    }
     /**
      * Get a registered tool definition by name (for custom rendering).
      */
@@ -988,7 +1035,7 @@ export class InteractiveMode {
         const createContext = () => ({
             ui: this.createExtensionUIContext(),
             hasUI: true,
-            cwd: process.cwd(),
+            cwd: this.sessionManager.getCwd(),
             sessionManager: this.sessionManager,
             modelRegistry: this.session.modelRegistry,
             model: this.session.model,
@@ -1331,6 +1378,10 @@ export class InteractiveMode {
         const result = await this.showExtensionSelector(`${title}\n${message}`, ["Yes", "No"], opts);
         return result === "Yes";
     }
+    async promptForMissingSessionCwd(error) {
+        const confirmed = await this.showExtensionConfirm("Session cwd not found", formatMissingSessionCwdPrompt(error.issue));
+        return confirmed ? error.issue.fallbackCwd : undefined;
+    }
     /**
      * Show a text input for extensions.
      */
@@ -1884,7 +1935,7 @@ export class InteractiveMode {
                             if (!this.pendingTools.has(content.id)) {
                                 const component = new ToolExecutionComponent(content.name, content.id, content.arguments, {
                                     showImages: this.settingsManager.getShowImages(),
-                                }, this.getRegisteredToolDefinition(content.name), this.ui);
+                                }, this.getRegisteredToolDefinition(content.name), this.ui, this.sessionManager.getCwd());
                                 component.setExpanded(this.toolOutputExpanded);
                                 this.chatContainer.addChild(component);
                                 this.pendingTools.set(content.id, component);
@@ -1944,7 +1995,7 @@ export class InteractiveMode {
                 if (!component) {
                     component = new ToolExecutionComponent(event.toolName, event.toolCallId, event.args, {
                         showImages: this.settingsManager.getShowImages(),
-                    }, this.getRegisteredToolDefinition(event.toolName), this.ui);
+                    }, this.getRegisteredToolDefinition(event.toolName), this.ui, this.sessionManager.getCwd());
                     component.setExpanded(this.toolOutputExpanded);
                     this.chatContainer.addChild(component);
                     this.pendingTools.set(event.toolCallId, component);
@@ -2198,7 +2249,7 @@ export class InteractiveMode {
                 // Render tool call components
                 for (const content of message.content) {
                     if (content.type === "toolCall") {
-                        const component = new ToolExecutionComponent(content.name, content.id, content.arguments, { showImages: this.settingsManager.getShowImages() }, this.getRegisteredToolDefinition(content.name), this.ui);
+                        const component = new ToolExecutionComponent(content.name, content.id, content.arguments, { showImages: this.settingsManager.getShowImages() }, this.getRegisteredToolDefinition(content.name), this.ui, this.sessionManager.getCwd());
                         component.setExpanded(this.toolOutputExpanded);
                         this.chatContainer.addChild(component);
                         if (message.stopReason === "aborted" || message.stopReason === "error") {
@@ -2291,13 +2342,7 @@ export class InteractiveMode {
         if (this.isShuttingDown)
             return;
         this.isShuttingDown = true;
-        // Emit shutdown event to extensions
-        const extensionRunner = this.session.extensionRunner;
-        if (extensionRunner?.hasHandlers("session_shutdown")) {
-            await extensionRunner.emit({
-                type: "session_shutdown",
-            });
-        }
+        await this.runtimeHost.dispose();
         // Wait for any pending renders to complete
         // requestRender() uses process.nextTick(), so we wait one tick
         await new Promise((resolve) => process.nextTick(resolve));
@@ -2767,7 +2812,7 @@ export class InteractiveMode {
                 },
                 onTransportChange: (transport) => {
                     this.settingsManager.setTransport(transport);
-                    this.session.agent.setTransport(transport);
+                    this.session.agent.transport = transport;
                 },
                 onThinkingLevelChange: (level) => {
                     this.session.setThinkingLevel(level);
@@ -3023,16 +3068,15 @@ export class InteractiveMode {
         }
         this.showSelector((done) => {
             const selector = new UserMessageSelectorComponent(userMessages.map((m) => ({ id: m.entryId, text: m.text })), async (entryId) => {
-                const result = await this.session.fork(entryId);
+                const result = await this.runtimeHost.fork(entryId);
                 if (result.cancelled) {
-                    // Extension cancelled the fork
                     done();
                     this.ui.requestRender();
                     return;
                 }
-                this.chatContainer.clear();
-                this.renderInitialMessages();
-                this.editor.setText(result.selectedText);
+                await this.handleRuntimeSessionChange();
+                this.renderCurrentSessionState();
+                this.editor.setText(result.selectedText ?? "");
                 done();
                 this.showStatus("Branched to new session");
             }, () => {
@@ -3168,24 +3212,38 @@ export class InteractiveMode {
         });
     }
     async handleResumeSession(sessionPath) {
-        // Stop loading animation
         if (this.loadingAnimation) {
             this.loadingAnimation.stop();
             this.loadingAnimation = undefined;
         }
         this.statusContainer.clear();
-        // Clear UI state
-        this.pendingMessagesContainer.clear();
-        this.compactionQueuedMessages = [];
-        this.streamingComponent = undefined;
-        this.streamingMessage = undefined;
-        this.pendingTools.clear();
-        // Switch session via AgentSession (emits extension session events)
-        await this.session.switchSession(sessionPath);
-        // Clear and re-render the chat
-        this.chatContainer.clear();
-        this.renderInitialMessages();
-        this.showStatus("Resumed session");
+        try {
+            const result = await this.runtimeHost.switchSession(sessionPath);
+            if (result.cancelled) {
+                return;
+            }
+            await this.handleRuntimeSessionChange();
+            this.renderCurrentSessionState();
+            this.showStatus("Resumed session");
+        }
+        catch (error) {
+            if (error instanceof MissingSessionCwdError) {
+                const selectedCwd = await this.promptForMissingSessionCwd(error);
+                if (!selectedCwd) {
+                    this.showStatus("Resume cancelled");
+                    return;
+                }
+                const result = await this.runtimeHost.switchSession(sessionPath, selectedCwd);
+                if (result.cancelled) {
+                    return;
+                }
+                await this.handleRuntimeSessionChange();
+                this.renderCurrentSessionState();
+                this.showStatus("Resumed session in current cwd");
+                return;
+            }
+            await this.handleFatalRuntimeError("Failed to resume session", error);
+        }
     }
     async showOAuthSelector(mode) {
         if (mode === "logout") {
@@ -3403,30 +3461,38 @@ export class InteractiveMode {
             return;
         }
         try {
-            // Stop loading animation
             if (this.loadingAnimation) {
                 this.loadingAnimation.stop();
                 this.loadingAnimation = undefined;
             }
             this.statusContainer.clear();
-            // Clear UI state
-            this.pendingMessagesContainer.clear();
-            this.compactionQueuedMessages = [];
-            this.streamingComponent = undefined;
-            this.streamingMessage = undefined;
-            this.pendingTools.clear();
-            const success = await this.session.importFromJsonl(inputPath);
-            if (!success) {
-                this.showWarning("Import cancelled");
+            const result = await this.runtimeHost.importFromJsonl(inputPath);
+            if (result.cancelled) {
+                this.showStatus("Import cancelled");
                 return;
             }
-            // Clear and re-render the chat
-            this.chatContainer.clear();
-            this.renderInitialMessages();
+            await this.handleRuntimeSessionChange();
+            this.renderCurrentSessionState();
             this.showStatus(`Session imported from: ${inputPath}`);
         }
         catch (error) {
-            this.showError(`Failed to import session: ${error instanceof Error ? error.message : "Unknown error"}`);
+            if (error instanceof MissingSessionCwdError) {
+                const selectedCwd = await this.promptForMissingSessionCwd(error);
+                if (!selectedCwd) {
+                    this.showStatus("Import cancelled");
+                    return;
+                }
+                const result = await this.runtimeHost.importFromJsonl(inputPath, selectedCwd);
+                if (result.cancelled) {
+                    this.showStatus("Import cancelled");
+                    return;
+                }
+                await this.handleRuntimeSessionChange();
+                this.renderCurrentSessionState();
+                this.showStatus(`Session imported from: ${inputPath}`);
+                return;
+            }
+            await this.handleFatalRuntimeError("Failed to import session", error);
         }
     }
     async handleShareCommand() {
@@ -3736,25 +3802,25 @@ export class InteractiveMode {
         this.ui.requestRender();
     }
     async handleClearCommand() {
-        // Stop loading animation
         if (this.loadingAnimation) {
             this.loadingAnimation.stop();
             this.loadingAnimation = undefined;
         }
         this.statusContainer.clear();
-        // New session via session (emits extension session events)
-        await this.session.newSession();
-        // Clear UI state
-        this.headerContainer.clear();
-        this.chatContainer.clear();
-        this.pendingMessagesContainer.clear();
-        this.compactionQueuedMessages = [];
-        this.streamingComponent = undefined;
-        this.streamingMessage = undefined;
-        this.pendingTools.clear();
-        this.chatContainer.addChild(new Spacer(1));
-        this.chatContainer.addChild(new Text(`${theme.fg("accent", "✓ New session started")}`, 1, 1));
-        this.ui.requestRender();
+        try {
+            const result = await this.runtimeHost.newSession();
+            if (result.cancelled) {
+                return;
+            }
+            await this.handleRuntimeSessionChange();
+            this.renderCurrentSessionState();
+            this.chatContainer.addChild(new Spacer(1));
+            this.chatContainer.addChild(new Text(`${theme.fg("accent", "✓ New session started")}`, 1, 1));
+            this.ui.requestRender();
+        }
+        catch (error) {
+            await this.handleFatalRuntimeError("Failed to create session", error);
+        }
     }
     handleDebugCommand() {
         const width = this.ui.terminal.columns;
@@ -3806,7 +3872,7 @@ export class InteractiveMode {
                 type: "user_bash",
                 command,
                 excludeFromContext,
-                cwd: process.cwd(),
+                cwd: this.sessionManager.getCwd(),
             })
             : undefined;
         // If extension returned a full result, use it directly