@draht/coding-agent 2026.3.25-1 → 2026.4.5

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

@@ -54,7 +54,7 @@ function isExpandable(obj) {
 }
 export class InteractiveMode {
     options;
-    session;
+    runtimeHost;
     ui;
     chatContainer;
     pendingMessagesContainer;
@@ -128,6 +128,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;
     }
@@ -137,9 +140,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());
@@ -160,9 +163,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
@@ -269,7 +272,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);
@@ -363,7 +366,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
@@ -387,7 +390,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(`D - ${sessionName} - ${cwdBasename}`);
@@ -494,7 +497,7 @@ export class InteractiveMode {
         }
         try {
             const packageManager = new DefaultPackageManager({
-                cwd: process.cwd(),
+                cwd: this.sessionManager.getCwd(),
                 agentDir: getAgentDir(),
                 settingsManager: this.settingsManager,
             });
@@ -882,7 +885,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,
@@ -894,33 +897,23 @@ 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 };
+                    const result = await this.runtimeHost.newSession(options);
+                    if (!result.cancelled) {
+                        await this.handleRuntimeSessionChange();
+                        this.renderCurrentSessionState();
+                        this.ui.requestRender();
                     }
-                    // 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 };
+                    return result;
                 },
                 fork: async (entryId) => {
-                    const result = await this.session.fork(entryId);
-                    if (result.cancelled) {
-                        return { cancelled: true };
+                    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");
                     }
-                    this.chatContainer.clear();
-                    this.renderInitialMessages();
-                    this.editor.setText(result.selectedText);
-                    this.showStatus("Forked to new session");
-                    return { cancelled: false };
+                    return { cancelled: result.cancelled };
                 },
                 navigateTree: async (targetId, options) => {
                     const result = await this.session.navigateTree(targetId, {
@@ -968,6 +961,42 @@ 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();
+    }
+    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).
      */
@@ -985,7 +1014,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,
@@ -1864,7 +1893,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);
@@ -1924,7 +1953,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);
@@ -2178,7 +2207,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") {
@@ -2271,13 +2300,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));
@@ -3003,16 +3026,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");
             }, () => {
@@ -3148,23 +3170,17 @@ 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();
+        const result = await this.runtimeHost.switchSession(sessionPath);
+        if (result.cancelled) {
+            return;
+        }
+        await this.handleRuntimeSessionChange();
+        this.renderCurrentSessionState();
         this.showStatus("Resumed session");
     }
     async showOAuthSelector(mode) {
@@ -3383,26 +3399,18 @@ 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) {
@@ -3716,22 +3724,17 @@ 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();
+        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();
@@ -3786,7 +3789,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