@apholdings/jensen-code 0.0.4 → 0.0.6

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

@@ -122,6 +122,10 @@ export class InteractiveMode {
     // Epoch hardening
     uiEpoch = 0;
     sessionEpoch = 0;
+    isInitialMessagesRendered = false;
+    // Visual region ownership
+    statusOwner = undefined;
+    promptOwner = undefined;
     // Extension UI state
     extensionSelector = undefined;
     extensionInput = undefined;
@@ -357,6 +361,7 @@ export class InteractiveMode {
         // Invalidate all stale async callbacks
         this.uiEpoch++;
         this.sessionEpoch++;
+        this.isInitialMessagesRendered = false;
         // Stop all loaders
         if (this.loadingAnimation) {
             this.loadingAnimation.dispose();
@@ -421,57 +426,63 @@ export class InteractiveMode {
                 // Both are needed: fd for autocomplete, rg for grep tool and bash commands
                 const [fdPath] = await Promise.all([ensureTool("fd"), ensureTool("rg")]);
                 this.fdPath = fdPath;
+                // Add containers only if they're not already children
+                const addIfMissing = (parent, child) => {
+                    if (!parent.children.includes(child)) {
+                        parent.addChild(child);
+                    }
+                };
                 // Add header container as first child
-                this.ui.addChild(this.headerContainer);
+                addIfMissing(this.ui, this.headerContainer);
                 // Always show the branded header/logo, even when quietStartup is enabled
-                this.headerContainer.addChild(this.header);
-                this.headerContainer.addChild(new Spacer(1));
+                addIfMissing(this.headerContainer, this.header);
+                addIfMissing(this.headerContainer, new Spacer(1));
                 // Add startup instructions only when not silenced
                 if (this.options.verbose || !this.settingsManager.getQuietStartup()) {
                     const instructions = this.buildStartupInstructionsText();
                     this.builtInHeader = new Text(instructions, 1, 0);
-                    this.headerContainer.addChild(this.builtInHeader);
-                    this.headerContainer.addChild(new Spacer(1));
+                    addIfMissing(this.headerContainer, this.builtInHeader);
+                    addIfMissing(this.headerContainer, new Spacer(1));
                     // Add changelog if provided
                     if (this.changelogMarkdown) {
-                        this.headerContainer.addChild(new DynamicBorder());
+                        addIfMissing(this.headerContainer, new DynamicBorder());
                         if (this.settingsManager.getCollapseChangelog()) {
                             const versionMatch = this.changelogMarkdown.match(/##\s+\[?(\d+\.\d+\.\d+)\]?/);
                             const latestVersion = versionMatch ? versionMatch[1] : this.version;
                             const condensedText = `Updated to v${latestVersion}. Use ${theme.bold("/changelog")} to view full changelog.`;
-                            this.headerContainer.addChild(new Text(condensedText, 1, 0));
+                            addIfMissing(this.headerContainer, new Text(condensedText, 1, 0));
                         }
                         else {
-                            this.headerContainer.addChild(new Text(theme.bold(theme.fg("accent", "What's New")), 1, 0));
-                            this.headerContainer.addChild(new Spacer(1));
-                            this.headerContainer.addChild(new Markdown(this.changelogMarkdown.trim(), 1, 0, this.getMarkdownThemeWithSettings()));
-                            this.headerContainer.addChild(new Spacer(1));
+                            addIfMissing(this.headerContainer, new Text(theme.bold(theme.fg("accent", "What's New")), 1, 0));
+                            addIfMissing(this.headerContainer, new Spacer(1));
+                            addIfMissing(this.headerContainer, new Markdown(this.changelogMarkdown.trim(), 1, 0, this.getMarkdownThemeWithSettings()));
+                            addIfMissing(this.headerContainer, new Spacer(1));
                         }
-                        this.headerContainer.addChild(new DynamicBorder());
+                        addIfMissing(this.headerContainer, new DynamicBorder());
                     }
                 }
                 else {
                     // Quiet startup: keep the logo visible, but suppress instruction text
                     this.builtInHeader = new Text("", 0, 0);
-                    this.headerContainer.addChild(this.builtInHeader);
+                    addIfMissing(this.headerContainer, this.builtInHeader);
                     if (this.changelogMarkdown) {
-                        this.headerContainer.addChild(new Spacer(1));
+                        addIfMissing(this.headerContainer, new Spacer(1));
                         const versionMatch = this.changelogMarkdown.match(/##\s+\[?(\d+\.\d+\.\d+)\]?/);
                         const latestVersion = versionMatch ? versionMatch[1] : this.version;
                         const condensedText = `Updated to v${latestVersion}. Use ${theme.bold("/changelog")} to view full changelog.`;
-                        this.headerContainer.addChild(new Text(condensedText, 1, 0));
+                        addIfMissing(this.headerContainer, new Text(condensedText, 1, 0));
                     }
                 }
-                this.ui.addChild(this.chatContainer);
-                this.ui.addChild(this.pendingMessagesContainer);
-                this.ui.addChild(this.statusContainer);
+                addIfMissing(this.ui, this.chatContainer);
+                addIfMissing(this.ui, this.pendingMessagesContainer);
+                addIfMissing(this.ui, this.statusContainer);
                 this.renderWidgets(); // Initialize with default spacer
                 // The prompt area consists of an optional widget strip, the editor, and a bottom widget strip.
                 // Extensions should use ctx.ui.setWidget(..., { placement: "aboveEditor" }) for the top strip.
-                this.ui.addChild(this.widgetContainerAbove);
-                this.ui.addChild(this.editorContainer);
-                this.ui.addChild(this.widgetContainerBelow);
-                this.ui.addChild(this.footer);
+                addIfMissing(this.ui, this.widgetContainerAbove);
+                addIfMissing(this.ui, this.editorContainer);
+                addIfMissing(this.ui, this.widgetContainerBelow);
+                addIfMissing(this.ui, this.footer);
                 this.ui.setFocus(this.editor);
                 this.updatePromptChrome();
                 this.setupKeyHandlers();
@@ -1210,7 +1221,7 @@ export class InteractiveMode {
         this.widgetContainerAbove.clear();
         this.widgetContainerBelow.clear();
     }
-    mountPromptOwner(component, options) {
+    mountPromptOwner(component, owner, options) {
         const focus = options?.focus ?? component;
         const showWidgets = options?.showWidgets ?? false;
         const requestRender = options?.requestRender ?? true;
@@ -1218,6 +1229,7 @@ export class InteractiveMode {
             this.editorContainer.children.length === 1 &&
             this.editorContainer.children[0] === component;
         if (!isMounted) {
+            this.promptOwner = owner;
             this.editorContainer.clear();
             this.editorContainer.addChild(component);
             this.promptAreaComponent = component;
@@ -1236,6 +1248,9 @@ export class InteractiveMode {
         }
     }
     restoreCanonicalEditor(options) {
+        if (options?.owner !== undefined && this.promptOwner !== options.owner) {
+            return;
+        }
         if (options?.text !== undefined) {
             this.editor.setText(options.text);
         }
@@ -1244,6 +1259,7 @@ export class InteractiveMode {
             this.editorContainer.children.length === 1 &&
             this.editorContainer.children[0] === editorComponent;
         if (!isMounted) {
+            this.promptOwner = undefined;
             this.editorContainer.clear();
             this.editorContainer.addChild(editorComponent);
             this.promptAreaComponent = editorComponent;
@@ -1264,12 +1280,13 @@ export class InteractiveMode {
             this.ui.requestRender();
         }
     }
-    mountStatusOwner(component, options) {
+    mountStatusOwner(component, owner, options) {
         const requestRender = options?.requestRender ?? true;
         const isMounted = this.statusComponent === component &&
             this.statusContainer.children.length === 1 &&
             this.statusContainer.children[0] === component;
         if (!isMounted) {
+            this.statusOwner = owner;
             this.statusContainer.clear();
             this.statusContainer.addChild(component);
             this.statusComponent = component;
@@ -1287,11 +1304,15 @@ export class InteractiveMode {
         const row = new Container();
         row.addChild(new Spacer(1));
         row.addChild(loader);
-        this.mountStatusOwner(row, options);
+        this.mountStatusOwner(row, loader, options);
     }
     clearStatusOwner(options) {
+        if (options?.owner !== undefined && this.statusOwner !== options.owner) {
+            return;
+        }
         const requestRender = options?.requestRender ?? true;
         if (this.statusComponent !== undefined || this.statusContainer.children.length > 0) {
+            this.statusOwner = undefined;
             this.statusContainer.clear();
             this.statusComponent = undefined;
         }
@@ -1337,7 +1358,7 @@ export class InteractiveMode {
             return;
         }
         if (leadingSpacer) {
-            container.addChild(new Spacer(0));
+            container.addChild(new Spacer(1));
         }
         if (builtInComponent) {
             container.addChild(builtInComponent);
@@ -1426,14 +1447,44 @@ export class InteractiveMode {
      * Create the ExtensionUIContext for extensions.
      */
     createExtensionUIContext() {
+        const capturedUiEpoch = this.uiEpoch;
+        const capturedSessionEpoch = this.sessionEpoch;
+        const guard = (fn) => {
+            return ((...args) => {
+                if (this.uiEpoch !== capturedUiEpoch || this.sessionEpoch !== capturedSessionEpoch) {
+                    return undefined;
+                }
+                return fn(...args);
+            });
+        };
         return {
-            select: (title, options, opts) => this.showExtensionSelector(title, options, opts),
-            confirm: (title, message, opts) => this.showExtensionConfirm(title, message, opts),
-            input: (title, placeholder, opts) => this.showExtensionInput(title, placeholder, opts),
-            notify: (message, type) => this.showExtensionNotify(message, type),
-            onTerminalInput: (handler) => this.addExtensionTerminalInputListener(handler),
-            setStatus: (key, text) => this.setExtensionStatus(key, text),
-            setWorkingMessage: (message) => {
+            select: (title, options, opts) => {
+                if (this.uiEpoch !== capturedUiEpoch || this.sessionEpoch !== capturedSessionEpoch) {
+                    return Promise.resolve(undefined);
+                }
+                return this.showExtensionSelector(title, options, opts);
+            },
+            confirm: (title, message, opts) => {
+                if (this.uiEpoch !== capturedUiEpoch || this.sessionEpoch !== capturedSessionEpoch) {
+                    return Promise.resolve(false);
+                }
+                return this.showExtensionConfirm(title, message, opts);
+            },
+            input: (title, placeholder, opts) => {
+                if (this.uiEpoch !== capturedUiEpoch || this.sessionEpoch !== capturedSessionEpoch) {
+                    return Promise.resolve(undefined);
+                }
+                return this.showExtensionInput(title, placeholder, opts);
+            },
+            notify: guard((message, type) => this.showExtensionNotify(message, type)),
+            onTerminalInput: (handler) => {
+                if (this.uiEpoch !== capturedUiEpoch || this.sessionEpoch !== capturedSessionEpoch) {
+                    return () => { };
+                }
+                return this.addExtensionTerminalInputListener(handler);
+            },
+            setStatus: guard((key, text) => this.setExtensionStatus(key, text)),
+            setWorkingMessage: guard((message) => {
                 if (this.loadingAnimation) {
                     if (message) {
                         this.loadingAnimation.setMessage(message);
@@ -1446,23 +1497,41 @@ export class InteractiveMode {
                     // Queue message for when loadingAnimation is created (handles agent_start race)
                     this.pendingWorkingMessage = message;
                 }
+            }),
+            setWidget: guard((key, content, options) => this.setExtensionWidget(key, content, options)),
+            setFooter: guard((factory) => this.setExtensionFooter(factory)),
+            setHeader: guard((factory) => this.setExtensionHeader(factory)),
+            setTitle: guard((title) => this.ui.terminal.setTitle(title)),
+            custom: (factory, options) => {
+                if (this.uiEpoch !== capturedUiEpoch || this.sessionEpoch !== capturedSessionEpoch) {
+                    return Promise.resolve(undefined);
+                }
+                return this.showExtensionCustom(factory, options);
+            },
+            pasteToEditor: guard((text) => this.editor.handleInput(`\x1b[200~${text}\x1b[201~`)),
+            setEditorText: guard((text) => this.editor.setText(text)),
+            getEditorText: () => {
+                if (this.uiEpoch !== capturedUiEpoch || this.sessionEpoch !== capturedSessionEpoch) {
+                    return "";
+                }
+                return this.editor.getText();
             },
-            setWidget: (key, content, options) => this.setExtensionWidget(key, content, options),
-            setFooter: (factory) => this.setExtensionFooter(factory),
-            setHeader: (factory) => this.setExtensionHeader(factory),
-            setTitle: (title) => this.ui.terminal.setTitle(title),
-            custom: (factory, options) => this.showExtensionCustom(factory, options),
-            pasteToEditor: (text) => this.editor.handleInput(`\x1b[200~${text}\x1b[201~`),
-            setEditorText: (text) => this.editor.setText(text),
-            getEditorText: () => this.editor.getText(),
-            editor: (title, prefill) => this.showExtensionEditor(title, prefill),
-            setEditorComponent: (factory) => this.setCustomEditorComponent(factory),
+            editor: (title, prefill) => {
+                if (this.uiEpoch !== capturedUiEpoch || this.sessionEpoch !== capturedSessionEpoch) {
+                    return Promise.resolve(undefined);
+                }
+                return this.showExtensionEditor(title, prefill);
+            },
+            setEditorComponent: guard((factory) => this.setCustomEditorComponent(factory)),
             get theme() {
                 return theme;
             },
             getAllThemes: () => getAvailableThemesWithPaths(),
             getTheme: (name) => getThemeByName(name),
             setTheme: (themeOrName) => {
+                if (this.uiEpoch !== capturedUiEpoch || this.sessionEpoch !== capturedSessionEpoch) {
+                    return { success: false, error: "Stale context" };
+                }
                 if (themeOrName instanceof Theme) {
                     setThemeInstance(themeOrName);
                     this.ui.requestRender();
@@ -1478,7 +1547,7 @@ export class InteractiveMode {
                 return result;
             },
             getToolsExpanded: () => this.toolOutputExpanded,
-            setToolsExpanded: (expanded) => this.setToolsExpanded(expanded),
+            setToolsExpanded: guard((expanded) => this.setToolsExpanded(expanded)),
         };
     }
     /**
@@ -1506,7 +1575,7 @@ export class InteractiveMode {
                     resolve(undefined);
                     return;
                 }
-                this.hideExtensionSelector();
+                this.hideExtensionSelector(this.extensionSelector);
                 resolve(option);
             }, () => {
                 opts?.signal?.removeEventListener("abort", onAbort);
@@ -1514,19 +1583,19 @@ export class InteractiveMode {
                     resolve(undefined);
                     return;
                 }
-                this.hideExtensionSelector();
+                this.hideExtensionSelector(this.extensionSelector);
                 resolve(undefined);
             }, { tui: this.ui, timeout: opts?.timeout });
-            this.mountPromptOwner(this.extensionSelector);
+            this.mountPromptOwner(this.extensionSelector, this.extensionSelector);
         });
     }
     /**
      * Hide the extension selector.
      */
-    hideExtensionSelector() {
+    hideExtensionSelector(owner) {
         this.extensionSelector?.dispose();
         this.extensionSelector = undefined;
-        this.restoreCanonicalEditor();
+        this.restoreCanonicalEditor({ owner });
     }
     /**
      * Show a confirmation dialog for extensions.
@@ -1550,7 +1619,7 @@ export class InteractiveMode {
                     resolve(undefined);
                     return;
                 }
-                this.hideExtensionInput();
+                this.hideExtensionInput(this.extensionInput);
                 resolve(undefined);
             };
             opts?.signal?.addEventListener("abort", onAbort, { once: true });
@@ -1560,7 +1629,7 @@ export class InteractiveMode {
                     resolve(undefined);
                     return;
                 }
-                this.hideExtensionInput();
+                this.hideExtensionInput(this.extensionInput);
                 resolve(value);
             }, () => {
                 opts?.signal?.removeEventListener("abort", onAbort);
@@ -1568,19 +1637,19 @@ export class InteractiveMode {
                     resolve(undefined);
                     return;
                 }
-                this.hideExtensionInput();
+                this.hideExtensionInput(this.extensionInput);
                 resolve(undefined);
             }, { tui: this.ui, timeout: opts?.timeout });
-            this.mountPromptOwner(this.extensionInput);
+            this.mountPromptOwner(this.extensionInput, this.extensionInput);
         });
     }
     /**
      * Hide the extension input.
      */
-    hideExtensionInput() {
+    hideExtensionInput(owner) {
         this.extensionInput?.dispose();
         this.extensionInput = undefined;
-        this.restoreCanonicalEditor();
+        this.restoreCanonicalEditor({ owner });
     }
     /**
      * Show a multi-line editor for extensions (with Ctrl+G support).
@@ -1593,25 +1662,25 @@ export class InteractiveMode {
                     resolve(undefined);
                     return;
                 }
-                this.hideExtensionEditor();
+                this.hideExtensionEditor(this.extensionEditor);
                 resolve(value);
             }, () => {
                 if (this.uiEpoch !== capturedEpoch) {
                     resolve(undefined);
                     return;
                 }
-                this.hideExtensionEditor();
+                this.hideExtensionEditor(this.extensionEditor);
                 resolve(undefined);
             });
-            this.mountPromptOwner(this.extensionEditor);
+            this.mountPromptOwner(this.extensionEditor, this.extensionEditor);
         });
     }
     /**
      * Hide the extension editor.
      */
-    hideExtensionEditor() {
+    hideExtensionEditor(owner) {
         this.extensionEditor = undefined;
-        this.restoreCanonicalEditor();
+        this.restoreCanonicalEditor({ owner });
     }
     /**
      * Set a custom editor component from an extension.
@@ -1685,11 +1754,11 @@ export class InteractiveMode {
         const capturedEpoch = this.uiEpoch;
         const savedText = this.editor.getText();
         const isOverlay = options?.overlay ?? false;
+        let component;
         const restoreEditor = () => {
-            this.restoreCanonicalEditor({ text: savedText });
+            this.restoreCanonicalEditor({ text: savedText, owner: component });
         };
         return new Promise((resolve, reject) => {
-            let component;
             let closed = false;
             const close = (result) => {
                 if (closed)
@@ -1744,7 +1813,7 @@ export class InteractiveMode {
                     options?.onHandle?.(handle);
                 }
                 else {
-                    this.mountPromptOwner(component);
+                    this.mountPromptOwner(component, component);
                 }
             })
                 .catch((err) => {
@@ -2059,8 +2128,13 @@ export class InteractiveMode {
                 }
                 if (this.loadingAnimation) {
                     this.loadingAnimation.dispose();
+                    const oldLoader = this.loadingAnimation;
+                    this.loadingAnimation = undefined;
+                    this.clearStatusOwner({ requestRender: false, owner: oldLoader });
+                }
+                else {
+                    this.clearStatusOwner({ requestRender: false });
                 }
-                this.clearStatusOwner({ requestRender: false });
                 this.loadingAnimation = new Loader(this.ui, (spinner) => theme.fg("accent", spinner), (text) => theme.fg("muted", text), this.defaultWorkingMessage);
                 this.mountStatusLoader(this.loadingAnimation, { requestRender: false });
                 // Apply any pending working message queued before loader existed
@@ -2089,7 +2163,16 @@ export class InteractiveMode {
                     this.ui.requestRender();
                 }
                 else if (event.message.role === "assistant") {
-                    this.streamingComponent = new AssistantMessageComponent(undefined, this.hideThinkingBlock, this.getMarkdownThemeWithSettings(), 0, 1);
+                    // Check if we already have a streaming component for this message to prevent duplicates
+                    if (this.streamingComponent && this.streamingMessage === event.message) {
+                        return;
+                    }
+                    // If we have a different streaming component, something is wrong, but let's at least not leak it
+                    if (this.streamingComponent) {
+                        this.chatContainer.removeChild(this.streamingComponent);
+                        this.streamingComponent = undefined;
+                    }
+                    this.streamingComponent = new AssistantMessageComponent(undefined, this.hideThinkingBlock, this.getMarkdownThemeWithSettings());
                     this.streamingMessage = event.message;
                     this.chatContainer.addChild(this.streamingComponent);
                     this.streamingComponent.updateContent(this.streamingMessage);
@@ -2192,8 +2275,9 @@ export class InteractiveMode {
             case "agent_end":
                 if (this.loadingAnimation) {
                     this.loadingAnimation.dispose();
+                    const oldLoader = this.loadingAnimation;
                     this.loadingAnimation = undefined;
-                    this.clearStatusOwner({ requestRender: false });
+                    this.clearStatusOwner({ requestRender: false, owner: oldLoader });
                 }
                 if (this.streamingComponent) {
                     this.chatContainer.removeChild(this.streamingComponent);
@@ -2217,8 +2301,13 @@ export class InteractiveMode {
                 this.defaultEditor.onEscape = () => {
                     this.session.abortCompaction();
                 };
-                // Show compacting indicator with reason
+                // Stop loading animation
+                if (this.loadingAnimation) {
+                    this.loadingAnimation.dispose();
+                    this.loadingAnimation = undefined;
+                }
                 this.clearStatusOwner({ requestRender: false });
+                // Show compacting indicator with reason
                 const reasonText = event.reason === "overflow" ? "Context overflow detected, " : "";
                 this.autoCompactionLoader = new Loader(this.ui, (spinner) => theme.fg("accent", spinner), (text) => theme.fg("muted", text), `${reasonText}Auto-compacting... (${appKey(this.keybindings, "interrupt")} to cancel)`);
                 this.mountStatusLoader(this.autoCompactionLoader, { requestRender: false });
@@ -2234,8 +2323,9 @@ export class InteractiveMode {
                 // Stop loader
                 if (this.autoCompactionLoader) {
                     this.autoCompactionLoader.dispose();
+                    const oldLoader = this.autoCompactionLoader;
                     this.autoCompactionLoader = undefined;
-                    this.clearStatusOwner({ requestRender: false });
+                    this.clearStatusOwner({ requestRender: false, owner: oldLoader });
                 }
                 // Handle result
                 if (event.aborted) {
@@ -2269,8 +2359,13 @@ export class InteractiveMode {
                 this.defaultEditor.onEscape = () => {
                     this.session.abortRetry();
                 };
-                // Show retry indicator
+                // Stop loading animation
+                if (this.loadingAnimation) {
+                    this.loadingAnimation.dispose();
+                    this.loadingAnimation = undefined;
+                }
                 this.clearStatusOwner({ requestRender: false });
+                // Show retry indicator
                 const delaySeconds = Math.round(event.delayMs / 1000);
                 this.retryLoader = new Loader(this.ui, (spinner) => theme.fg("warning", spinner), (text) => theme.fg("muted", text), `Retrying (${event.attempt}/${event.maxAttempts}) in ${delaySeconds}s... (${appKey(this.keybindings, "interrupt")} to cancel)`);
                 this.mountStatusLoader(this.retryLoader, { requestRender: false });
@@ -2286,8 +2381,9 @@ export class InteractiveMode {
                 // Stop loader
                 if (this.retryLoader) {
                     this.retryLoader.dispose();
+                    const oldLoader = this.retryLoader;
                     this.retryLoader = undefined;
-                    this.clearStatusOwner({ requestRender: false });
+                    this.clearStatusOwner({ requestRender: false, owner: oldLoader });
                 }
                 // Show error only on final failure (success shows normal response)
                 if (!event.success) {
@@ -2313,7 +2409,9 @@ export class InteractiveMode {
      * If multiple status messages are emitted back-to-back (without anything else being added to the chat),
      * we update the previous status line instead of appending new ones to avoid log spam.
      */
-    showStatus(message) {
+    showStatus(message, ownerEpoch) {
+        if (ownerEpoch !== undefined && this.sessionEpoch !== ownerEpoch)
+            return;
         const children = this.chatContainer.children;
         const last = children.length > 0 ? children[children.length - 1] : undefined;
         const secondLast = children.length > 1 ? children[children.length - 2] : undefined;
@@ -2391,7 +2489,7 @@ export class InteractiveMode {
                 break;
             }
             case "assistant": {
-                const assistantComponent = new AssistantMessageComponent(message, this.hideThinkingBlock, this.getMarkdownThemeWithSettings(), 0, 1);
+                const assistantComponent = new AssistantMessageComponent(message, this.hideThinkingBlock, this.getMarkdownThemeWithSettings());
                 this.chatContainer.addChild(assistantComponent);
                 break;
             }
@@ -2463,6 +2561,9 @@ export class InteractiveMode {
         this.ui.requestRender();
     }
     renderInitialMessages() {
+        if (this.isInitialMessagesRendered)
+            return;
+        this.isInitialMessagesRendered = true;
         // Get aligned messages and entries from session context
         const context = this.sessionManager.buildSessionContext();
         this.renderSessionContext(context, {
@@ -2747,7 +2848,9 @@ export class InteractiveMode {
         this.editor.setText("");
         this.ui.requestRender();
     }
-    showError(errorMessage) {
+    showError(errorMessage, ownerEpoch) {
+        if (ownerEpoch !== undefined && this.sessionEpoch !== ownerEpoch)
+            return;
         this.chatContainer.addChild(new Spacer(1));
         this.chatContainer.addChild(new Text(theme.fg("error", `Error: ${errorMessage}`), 1, 0));
         this.ui.requestRender();
@@ -2772,13 +2875,17 @@ export class InteractiveMode {
         this.ui.invalidate();
         this.ui.requestRender();
     }
-    showWarning(warningMessage) {
+    showWarning(warningMessage, ownerEpoch) {
+        if (ownerEpoch !== undefined && this.sessionEpoch !== ownerEpoch)
+            return;
         this.enqueueStartupNotice(() => {
             this.chatContainer.addChild(new Spacer(1));
             this.chatContainer.addChild(new Text(theme.fg("warning", `Warning: ${warningMessage}`), 1, 0));
         });
     }
-    showNewVersionNotification(newVersion) {
+    showNewVersionNotification(newVersion, ownerEpoch) {
+        if (ownerEpoch !== undefined && this.sessionEpoch !== ownerEpoch)
+            return;
         const action = theme.fg("accent", getUpdateInstruction(PACKAGE_NAME));
         const updateInstruction = theme.fg("muted", `New version ${newVersion} is available. `) + action;
         const changelogUrl = theme.fg("accent", "https://github.com/apholdings/jensen-code/blob/main/packages/coding-agent/CHANGELOG.md");
@@ -2985,10 +3092,10 @@ export class InteractiveMode {
         const done = () => {
             if (this.uiEpoch !== capturedEpoch)
                 return;
-            this.restoreCanonicalEditor({ requestRender: false });
+            this.restoreCanonicalEditor({ requestRender: false, owner: component });
         };
         const { component, focus } = create(done);
-        this.mountPromptOwner(component, { focus });
+        this.mountPromptOwner(component, component, { focus });
     }
     showSettingsSelector() {
         this.showSelector((done) => {
@@ -3436,7 +3543,7 @@ export class InteractiveMode {
                 finally {
                     if (summaryLoader) {
                         summaryLoader.dispose();
-                        this.clearStatusOwner({ requestRender: false });
+                        this.clearStatusOwner({ requestRender: false, owner: summaryLoader });
                     }
                     this.defaultEditor.onEscape = originalOnEscape;
                 }
@@ -3537,7 +3644,7 @@ export class InteractiveMode {
             // Completion handled below
         });
         // Show dialog in editor container
-        this.mountPromptOwner(dialog);
+        this.mountPromptOwner(dialog, dialog);
         // Promise for manual code input (racing with callback server)
         let manualCodeResolve;
         let manualCodeReject;
@@ -3550,7 +3657,7 @@ export class InteractiveMode {
         const restoreEditor = () => {
             if (this.uiEpoch !== capturedEpoch)
                 return;
-            this.restoreCanonicalEditor();
+            this.restoreCanonicalEditor({ owner: dialog });
         };
         try {
             await this.session.modelRegistry.authStorage.login(providerId, {
@@ -3623,13 +3730,13 @@ export class InteractiveMode {
             cancellable: false,
         });
         const previousEditor = this.editor;
-        this.mountPromptOwner(loader);
+        this.mountPromptOwner(loader, loader);
         const capturedEpoch = this.uiEpoch;
         const dismissLoader = (_editor) => {
             loader.dispose();
             if (this.uiEpoch !== capturedEpoch)
                 return;
-            this.restoreCanonicalEditor();
+            this.restoreCanonicalEditor({ owner: loader });
         };
         try {
             await this.session.reload();
@@ -3727,12 +3834,12 @@ export class InteractiveMode {
         }
         // Show cancellable loader, replacing the editor
         const loader = new BorderedLoader(this.ui, theme, "Creating gist...");
-        this.mountPromptOwner(loader);
+        this.mountPromptOwner(loader, loader);
         const restoreEditor = () => {
             loader.dispose();
             if (this.uiEpoch !== capturedEpoch)
                 return;
-            this.restoreCanonicalEditor({ requestRender: false });
+            this.restoreCanonicalEditor({ requestRender: false, owner: loader });
             try {
                 fs.unlinkSync(tmpFile);
             }
@@ -4008,7 +4115,10 @@ export class InteractiveMode {
     }
     async handleClearCommand() {
         // New session via session (emits extension session events)
-        await this.session.newSession();
+        const success = await this.session.newSession();
+        if (!success) {
+            return;
+        }
         this.resetInteractiveSessionUI(true);
         this.ui.requestRender();
     }
@@ -4185,7 +4295,7 @@ export class InteractiveMode {
         finally {
             if (this.sessionEpoch === capturedEpoch) {
                 compactingLoader.dispose();
-                this.clearStatusOwner({ requestRender: false });
+                this.clearStatusOwner({ requestRender: false, owner: compactingLoader });
                 this.defaultEditor.onEscape = originalOnEscape;
             }
         }
@@ -4199,6 +4309,14 @@ export class InteractiveMode {
             this.loadingAnimation.dispose();
             this.loadingAnimation = undefined;
         }
+        if (this.autoCompactionLoader) {
+            this.autoCompactionLoader.dispose();
+            this.autoCompactionLoader = undefined;
+        }
+        if (this.retryLoader) {
+            this.retryLoader.dispose();
+            this.retryLoader = undefined;
+        }
         this.clearExtensionTerminalInputListeners();
         this.footer.dispose();
         this.footerDataProvider.dispose();