@astralyn/pi 1.4.11 → 1.5.0

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

@@ -30,6 +30,7 @@ import { RADIUS_MCP_URL, RADIUS_PROVIDER_ID } from "../../core/radius.js";
 import { formatMissingSessionCwdPrompt, MissingSessionCwdError } from "../../core/session-cwd.js";
 import { SessionManager, sessionEntryToContextMessages, } from "../../core/session-manager.js";
 import { BUILTIN_SLASH_COMMANDS } from "../../core/slash-commands.js";
+import { getSourcePackageKey } from "../../core/source-info.js";
 import { isInstallTelemetryEnabled } from "../../core/telemetry.js";
 import { withBuiltInRenderers } from "../../core/tools/renderers/index.js";
 import { hasTrustRequiringProjectResources, ProjectTrustStore } from "../../core/trust-manager.js";
@@ -40,16 +41,17 @@ import { copyToClipboard, readClipboardFilePaths, readClipboardText } from "../.
 import { extensionForImageMimeType, readClipboardImage } from "../../utils/clipboard-image.js";
 import { parseGitUrl } from "../../utils/git.js";
 import { ensurePngTranscoder } from "../../utils/image-convert.js";
-import { getCwdRelativePath } from "../../utils/paths.js";
+import { getCwdRelativePath, shortenHomePath } from "../../utils/paths.js";
 import { getPiUserAgent } from "../../utils/pi-user-agent.js";
 import { killTrackedDetachedChildren } from "../../utils/shell.js";
 import { loadAllHighlightLanguages } from "../../utils/syntax-highlight.js";
+import { stripBom } from "../../utils/text.js";
 import { ensureTool } from "../../utils/tools-manager.js";
 import { checkForNewPiVersion } from "../../utils/version-check.js";
 import { reportBug } from "./bug-report.js";
 import { createChatViewport } from "./chat-viewport.js";
 import { ArminComponent } from "./components/armin.js";
-import { AssistantMessageComponent, DEFAULT_ACTIVE_THINKING_LABEL } from "./components/assistant-message.js";
+import { AssistantMessageComponent } from "./components/assistant-message.js";
 import { BashExecutionComponent } from "./components/bash-execution.js";
 import { BranchSummaryMessageComponent } from "./components/branch-summary-message.js";
 import { CompactionSummaryMessageComponent } from "./components/compaction-summary-message.js";
@@ -123,9 +125,6 @@ class BuiltInHeader extends ExpandableText {
         return { handled: true };
     }
 }
-function isTranscriptNote(item) {
-    return "type" in item && item.type === "transcript_note";
-}
 function isCustomSessionEntry(item) {
     return "type" in item && item.type === "custom";
 }
@@ -262,10 +261,12 @@ export class InteractiveMode {
         this.workingVisible = true;
         this.workingIndicatorOptions = undefined;
         this.defaultWorkingMessage = "Working";
-        this.activeThinkingLabel = DEFAULT_ACTIVE_THINKING_LABEL;
+        this.defaultHiddenThinkingLabel = "Thinking...";
+        this.hiddenThinkingLabel = this.defaultHiddenThinkingLabel;
         this.lastSigintTime = 0;
         this.lastEscapeTime = 0;
         this.changelogMarkdown = undefined;
+        this.extensionChangelogUpdates = [];
         this.startupNoticesShown = false;
         this.anthropicSubscriptionWarningShown = false;
         // Status line tracking (for mutating immediately-sequential status updates)
@@ -323,10 +324,6 @@ export class InteractiveMode {
         // The last entry is visible; see pushExtensionDialog().
         this.extensionDialogs = [];
         this.extensionTerminalInputSubscriptions = new Set();
-        // Ephemeral extension notes anchored to session entries and rebuilt with the transcript.
-        this.extensionTranscriptNotes = new Map();
-        this.hasRenderedTranscript = false;
-        this.transcriptNotesRefreshScheduled = false;
         // Extension widgets (components rendered above/below the editor)
         this.extensionWidgetsAbove = new Map();
         this.extensionWidgetsBelow = new Map();
@@ -550,24 +547,44 @@ export class InteractiveMode {
             return;
         }
         this.startupNoticesShown = true;
-        if (!this.changelogMarkdown) {
+        if (!this.changelogMarkdown && this.extensionChangelogUpdates.length === 0) {
             return;
         }
         if (this.chatContainer.children.length > 0) {
             this.chatContainer.addChild(new Spacer(1));
         }
         this.chatContainer.addChild(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.chatContainer.addChild(new Text(condensedText, 1, 0));
+        if (this.changelogMarkdown) {
+            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.chatContainer.addChild(new Text(condensedText, 1, 0));
+            }
+            else {
+                this.chatContainer.addChild(new ThemedText(() => theme.bold(theme.fg("accent", "What's New")), 1, 0));
+                this.chatContainer.addChild(new Spacer(1));
+                this.chatContainer.addChild(new Markdown(this.changelogMarkdown.trim(), 1, 0, this.getMarkdownThemeWithSettings()));
+                this.chatContainer.addChild(new Spacer(1));
+            }
         }
-        else {
-            this.chatContainer.addChild(new ThemedText(() => theme.bold(theme.fg("accent", "What's New")), 1, 0));
-            this.chatContainer.addChild(new Spacer(1));
-            this.chatContainer.addChild(new Markdown(this.changelogMarkdown.trim(), 1, 0, this.getMarkdownThemeWithSettings()));
-            this.chatContainer.addChild(new Spacer(1));
+        if (this.extensionChangelogUpdates.length > 0) {
+            if (this.changelogMarkdown) {
+                this.chatContainer.addChild(new Spacer(1));
+            }
+            if (this.settingsManager.getCollapseChangelog()) {
+                const condensedText = this.extensionChangelogUpdates
+                    .map((update) => `Updated ${update.name} to v${update.version}.`)
+                    .join("\n");
+                this.chatContainer.addChild(new Text(condensedText, 1, 0));
+            }
+            else {
+                this.chatContainer.addChild(new ThemedText(() => theme.bold(theme.fg("accent", "Extension Updates")), 1, 0));
+                this.chatContainer.addChild(new Spacer(1));
+                const markdown = this.extensionChangelogUpdates.map((update) => update.markdown).join("\n\n");
+                this.chatContainer.addChild(new Markdown(markdown, 1, 0, this.getMarkdownThemeWithSettings()));
+                this.chatContainer.addChild(new Spacer(1));
+            }
         }
         this.chatContainer.addChild(new DynamicBorder());
     }
@@ -644,20 +661,15 @@ export class InteractiveMode {
         if (this.isInitialized)
             return;
         this.registerSignalHandlers();
-        // Load changelog (only show new entries, skip for resumed sessions)
+        // Load changelogs (only show new entries, skip for resumed sessions)
         this.changelogMarkdown = this.getChangelogForDisplay();
-        if (this.session.scopedModels.length > 0 && this.shouldShowStartupDetails()) {
-            const modelList = this.session.scopedModels
-                .map((sm) => {
-                const thinkingStr = sm.thinkingLevel ? `:${sm.thinkingLevel}` : "";
-                return `${sm.model.id}${thinkingStr}`;
-            })
-                .join(", ");
-            const cycleKeys = this.keybindings.getKeys("app.model.cycleForward");
-            const cycleHint = cycleKeys.length > 0
-                ? theme.fg("muted", ` (${formatKeyText(cycleKeys.join("/"), { capitalize: true })} to cycle)`)
-                : "";
-            console.log(theme.fg("dim", `Model scope: ${modelList}${cycleHint}`));
+        this.extensionChangelogUpdates = this.getExtensionChangelogUpdates();
+        // Fullscreen renders on the alternate screen, so text printed to stdout here would stay in the shell
+        // after exit. Fullscreen shows the notice in the header instead (#11508).
+        if (this.renderer.mode !== "fullscreen") {
+            const modelScopeNotice = this.getModelScopeNotice();
+            if (modelScopeNotice)
+                console.log(modelScopeNotice);
         }
         // Keep one component tree and remount it when changing renderers.
         this.renderWidgets(); // Initialize with default spacer
@@ -759,6 +771,8 @@ export class InteractiveMode {
             this.builtInHeader = new Text("", 0, 0);
             this.headerContainer.addChild(this.builtInHeader);
         }
+        if (this.renderer.mode === "fullscreen")
+            this.showFullscreenModelScopeNotice();
         this.ui.requestRender();
         // Ensure fd and rg are available after mounting the TUI (downloads if missing, adds to PATH via getBinDir)
         // so slow downloads do not make startup appear frozen.
@@ -996,6 +1010,58 @@ export class InteractiveMode {
         }
         return undefined;
     }
+    getExtensionChangelogUpdates() {
+        // Skip changelog for resumed/continued sessions (already have messages)
+        if (this.session.state.messages.length > 0) {
+            return [];
+        }
+        const seenKeys = new Set();
+        const updates = [];
+        for (const { sourceInfo } of this.session.resourceLoader.getExtensions().extensions) {
+            if (sourceInfo.origin !== "package" || !sourceInfo.baseDir || !sourceInfo.changelogPath) {
+                continue;
+            }
+            const key = getSourcePackageKey(sourceInfo);
+            if (seenKeys.has(key)) {
+                continue;
+            }
+            seenKeys.add(key);
+            const pkg = this.readPackageJson(sourceInfo.baseDir);
+            if (!pkg?.version) {
+                continue;
+            }
+            const lastVersion = this.settingsManager.getExtensionChangelogVersion(key);
+            if (!lastVersion) {
+                // Fresh install - record the version, don't show changelog
+                this.settingsManager.setExtensionChangelogVersion(key, pkg.version);
+                continue;
+            }
+            const newEntries = getNewEntries(parseChangelog(sourceInfo.changelogPath), lastVersion);
+            if (newEntries.length > 0) {
+                this.settingsManager.setExtensionChangelogVersion(key, pkg.version);
+                const name = pkg.name || sourceInfo.source;
+                // Prefix each "## [x.y.z]" heading with the package name so entries render like Pi's own.
+                const markdown = newEntries
+                    .map((entry) => entry.content.replace(/^##\s+/, `## ${name} `))
+                    .join("\n\n")
+                    .trim();
+                updates.push({ name, version: pkg.version, markdown });
+            }
+        }
+        return updates;
+    }
+    readPackageJson(packageRoot) {
+        try {
+            const pkg = JSON.parse(stripBom(fs.readFileSync(path.join(packageRoot, "package.json"), "utf-8")));
+            return {
+                name: typeof pkg.name === "string" ? pkg.name : undefined,
+                version: typeof pkg.version === "string" ? pkg.version : undefined,
+            };
+        }
+        catch {
+            return undefined;
+        }
+    }
     reportInstallTelemetry(version) {
         if (process.env.PI_OFFLINE) {
             return;
@@ -1024,13 +1090,7 @@ export class InteractiveMode {
     // Extension System
     // =========================================================================
     formatDisplayPath(p) {
-        const home = os.homedir();
-        let result = p;
-        // Replace home directory with ~
-        if (result.startsWith(home)) {
-            result = `~${result.slice(home.length)}`;
-        }
-        return result;
+        return shortenHomePath(p);
     }
     formatExtensionDisplayPath(path) {
         let result = this.formatDisplayPath(path);
@@ -1054,6 +1114,27 @@ export class InteractiveMode {
         return this.options.verbose === true || this.settingsManager.getQuietStartup() !== true;
     }
     /** Startup details (model scope, loaded resources). Hidden by quietStartup: true or "header". */
+    getModelScopeNotice() {
+        if (this.session.scopedModels.length === 0 || !this.shouldShowStartupDetails())
+            return undefined;
+        const modelList = this.session.scopedModels
+            .map((sm) => {
+            const thinkingStr = sm.thinkingLevel ? `:${sm.thinkingLevel}` : "";
+            return `${sm.model.id}${thinkingStr}`;
+        })
+            .join(", ");
+        const cycleKeys = this.keybindings.getKeys("app.model.cycleForward");
+        const cycleHint = cycleKeys.length > 0
+            ? theme.fg("muted", ` (${formatKeyText(cycleKeys.join("/"), { capitalize: true })} to cycle)`)
+            : "";
+        return theme.fg("dim", `Model scope: ${modelList}${cycleHint}`);
+    }
+    showFullscreenModelScopeNotice() {
+        if (!this.getModelScopeNotice())
+            return;
+        this.headerContainer.addChild(new ThemedText(() => this.getModelScopeNotice() ?? "", 1, 0));
+        this.headerContainer.addChild(new Spacer(1));
+    }
     shouldShowStartupDetails() {
         return this.options.verbose === true || this.settingsManager.getQuietStartup() === false;
     }
@@ -1424,7 +1505,7 @@ export class InteractiveMode {
             const skillDiagnostics = skillsResult.diagnostics;
             if (skillDiagnostics.length > 0) {
                 const warningLines = () => this.formatDiagnostics(skillDiagnostics, sourceInfos);
-                this.loadedResourcesContainer.addChild(new ThemedText(() => `${theme.fg("warning", "[Skill conflicts]")}\n${warningLines()}`, 0, 0));
+                this.loadedResourcesContainer.addChild(new ThemedText(() => `${theme.fg("warning", "[Skill warnings]")}\n${warningLines()}`, 0, 0));
                 this.loadedResourcesContainer.addChild(new Spacer(1));
             }
             const promptDiagnostics = promptsResult.diagnostics;
@@ -1792,14 +1873,14 @@ export class InteractiveMode {
         this.ui.requestRender();
     }
     setHiddenThinkingLabel(label) {
-        this.activeThinkingLabel = label ?? DEFAULT_ACTIVE_THINKING_LABEL;
+        this.hiddenThinkingLabel = label ?? this.defaultHiddenThinkingLabel;
         for (const child of this.chatContainer.children) {
             if (child instanceof AssistantMessageComponent) {
-                child.setHiddenThinkingLabel(this.activeThinkingLabel);
+                child.setHiddenThinkingLabel(this.hiddenThinkingLabel);
             }
         }
         if (this.streamingComponent) {
-            this.streamingComponent.setHiddenThinkingLabel(this.activeThinkingLabel);
+            this.streamingComponent.setHiddenThinkingLabel(this.hiddenThinkingLabel);
         }
         this.ui.requestRender();
     }
@@ -1853,9 +1934,6 @@ export class InteractiveMode {
     }
     resetExtensionUI() {
         this.editorHost.clear();
-        this.extensionTranscriptNotes.clear();
-        this.hasRenderedTranscript = false;
-        this.transcriptNotesRefreshScheduled = false;
         if (this.extensionDialogs.length > 0) {
             for (const dialog of this.extensionDialogs) {
                 dialog.component.dispose?.();
@@ -2027,7 +2105,6 @@ export class InteractiveMode {
             setWorkingIndicator: (options) => this.setWorkingIndicator(options),
             setHiddenThinkingLabel: (label) => this.setHiddenThinkingLabel(label),
             setWidget: (key, content, options) => this.setExtensionWidget(key, content, options),
-            addTranscriptNote: (key, text, options) => this.addExtensionTranscriptNote(key, text, options),
             setFooter: (factory) => this.setExtensionFooter(factory),
             setHeader: (factory) => this.setExtensionHeader(factory),
             setTitle: (title) => this.ui.terminal.setTitle(title),
@@ -2173,8 +2250,12 @@ export class InteractiveMode {
         this.editorComponentFactory = factory;
         // Save text from current editor before switching
         const currentText = this.editor.getText();
-        this.disposeActiveSelector();
-        this.editorContainer.clear();
+        // An open extension dialog keeps the editor slot; the new editor is shown when the last dialog closes.
+        const dialogOpen = this.extensionDialogs.length > 0;
+        if (!dialogOpen) {
+            this.disposeActiveSelector();
+            this.editorContainer.clear();
+        }
         if (factory) {
             // Create the custom editor with tui, theme, and keybindings
             const newEditor = factory(this.ui, getEditorTheme(), this.keybindings);
@@ -2225,7 +2306,8 @@ export class InteractiveMode {
             this.defaultEditor.setText(currentText);
             this.editor = this.defaultEditor;
         }
-        this.editorContainer.addChild(this.editor);
+        if (!dialogOpen)
+            this.editorContainer.addChild(this.editor);
         if (this.activeStatusIndicator) {
             this.statusContainer.clear();
             this.activeWorkingIndicatorEmbedded = this.setEditorWorkingStatusIndicator(this.activeStatusIndicator);
@@ -2233,7 +2315,8 @@ export class InteractiveMode {
                 this.statusContainer.addChild(this.activeStatusIndicator);
             }
         }
-        this.ui.setFocus(this.editor);
+        if (!dialogOpen)
+            this.ui.setFocus(this.editor);
         this.ui.requestRender();
     }
     /**
@@ -2305,7 +2388,7 @@ export class InteractiveMode {
                     options?.onHandle?.(overlayHandle);
                 }
                 else {
-                    this.pushExtensionDialog(c);
+                    this.pushExtensionDialog(c, options?.blocked);
                 }
             })
                 .catch((err) => {
@@ -2762,7 +2845,7 @@ export class InteractiveMode {
                     this.ui.requestRender();
                 }
                 else if (event.message.role === "assistant") {
-                    this.streamingComponent = new AssistantMessageComponent(undefined, this.hideThinkingBlock, this.getMarkdownThemeWithSettings(), this.activeThinkingLabel, this.outputPad, this.getMarkdownTransformers());
+                    this.streamingComponent = new AssistantMessageComponent(undefined, this.hideThinkingBlock, this.getMarkdownThemeWithSettings(), this.hiddenThinkingLabel, this.outputPad, this.getMarkdownTransformers());
                     this.streamingMessage = event.message;
                     this.chatContainer.addChild(this.streamingComponent);
                     this.streamingComponent.updateContent(this.streamingMessage, true);
@@ -3064,41 +3147,6 @@ export class InteractiveMode {
         this.lastStatusText = text;
         this.ui.requestRender();
     }
-    addExtensionTranscriptNote(key, text, options) {
-        if (this.extensionTranscriptNotes.has(key))
-            return;
-        const note = { key, text, afterEntryId: options.afterEntryId };
-        this.extensionTranscriptNotes.set(key, note);
-        if (this.hasRenderedTranscript && options.afterEntryId === this.sessionManager.getLeafId()) {
-            this.addTranscriptNoteToChat({ type: "transcript_note", ...note });
-            this.ui.requestRender();
-            return;
-        }
-        this.scheduleTranscriptNotesRefresh();
-    }
-    /** Coalesce restored historical notes into one rebuild; initial rendering will pick them up itself. */
-    scheduleTranscriptNotesRefresh() {
-        if (!this.hasRenderedTranscript || this.transcriptNotesRefreshScheduled || !this.session.isIdle)
-            return;
-        this.transcriptNotesRefreshScheduled = true;
-        const session = this.session;
-        queueMicrotask(() => {
-            if (this.session !== session || !this.transcriptNotesRefreshScheduled)
-                return;
-            this.transcriptNotesRefreshScheduled = false;
-            if (!session.isIdle)
-                return;
-            this.rebuildTranscriptWithNotes();
-        });
-    }
-    rebuildTranscriptWithNotes() {
-        this.chatContainer.clear();
-        this.renderInitialMessages({ populateHistory: false });
-    }
-    addTranscriptNoteToChat(note) {
-        this.chatContainer.addChild(new Spacer(1));
-        this.chatContainer.addChild(new ThemedText(() => theme.fg("dim", note.text), this.outputPad, 0));
-    }
     addCustomEntryToChat(entry) {
         const renderer = this.session.extensionRunner.getEntryRenderer(entry.customType);
         if (!renderer) {
@@ -3169,12 +3217,12 @@ export class InteractiveMode {
                         // Render user message separately if present
                         if (skillBlock.userMessage) {
                             this.chatContainer.addChild(new Spacer(1));
-                            const userComponent = new UserMessageComponent(skillBlock.userMessage, this.getMarkdownThemeWithSettings(), this.outputPad, this.getMarkdownTransformers());
+                            const userComponent = new UserMessageComponent(skillBlock.userMessage, this.getMarkdownThemeWithSettings(), this.outputPad, this.getMarkdownTransformers(), options?.messageId, options?.timestamp);
                             this.chatContainer.addChild(userComponent);
                         }
                     }
                     else {
-                        const userComponent = new UserMessageComponent(textContent, this.getMarkdownThemeWithSettings(), this.outputPad, this.getMarkdownTransformers());
+                        const userComponent = new UserMessageComponent(textContent, this.getMarkdownThemeWithSettings(), this.outputPad, this.getMarkdownTransformers(), options?.messageId, options?.timestamp);
                         this.chatContainer.addChild(userComponent);
                     }
                     if (options?.populateHistory) {
@@ -3184,7 +3232,7 @@ export class InteractiveMode {
                 break;
             }
             case "assistant": {
-                const assistantComponent = new AssistantMessageComponent(message, this.hideThinkingBlock, this.getMarkdownThemeWithSettings(), this.activeThinkingLabel, this.outputPad, this.getMarkdownTransformers());
+                const assistantComponent = new AssistantMessageComponent(message, this.hideThinkingBlock, this.getMarkdownThemeWithSettings(), this.hiddenThinkingLabel, this.outputPad, this.getMarkdownTransformers(), options?.messageId, options?.timestamp);
                 this.chatContainer.addChild(assistantComponent);
                 break;
             }
@@ -3197,7 +3245,7 @@ export class InteractiveMode {
             }
         }
     }
-    renderSessionItems(items, options = {}) {
+    renderSessionItems(items, messageMeta, options = {}) {
         this.pendingTools.clear();
         const renderedPendingTools = new Map();
         // Cache misses are not persisted, unlike successful cache-warming usage.
@@ -3210,10 +3258,6 @@ export class InteractiveMode {
             this.updateEditorBorderColor();
         }
         for (const item of items) {
-            if (isTranscriptNote(item)) {
-                this.addTranscriptNoteToChat(item);
-                continue;
-            }
             if (isCustomSessionEntry(item)) {
                 this.addCustomEntryToChat(item);
                 continue;
@@ -3229,7 +3273,11 @@ export class InteractiveMode {
             const message = item;
             // Assistant messages need special handling for tool calls
             if (message.role === "assistant") {
-                this.addMessageToChat(message);
+                const meta = messageMeta?.get(message);
+                this.addMessageToChat(message, {
+                    messageId: meta?.id,
+                    timestamp: meta?.timestamp,
+                });
                 // Render tool call components
                 for (const content of message.content) {
                     if (content.type === "toolCall") {
@@ -3275,7 +3323,12 @@ export class InteractiveMode {
             }
             else {
                 // All other messages use standard rendering
-                this.addMessageToChat(message, options);
+                const meta = messageMeta?.get(message);
+                this.addMessageToChat(message, {
+                    ...options,
+                    messageId: meta?.id,
+                    timestamp: meta?.timestamp,
+                });
             }
         }
         for (const [toolCallId, component] of renderedPendingTools) {
@@ -3293,22 +3346,21 @@ export class InteractiveMode {
         // Selection coordinates point into the transcript being replaced (#9311).
         if (this.renderer instanceof TuiAltScreen)
             this.renderer.resetTextSelection();
+        const messageMeta = new Map();
         const items = entries.flatMap((entry) => {
-            const notes = [...this.extensionTranscriptNotes.values()]
-                .filter((note) => note.afterEntryId === entry.id)
-                .map((note) => ({ type: "transcript_note", ...note }));
             if (entry.type === "custom" || (entry.type === "usage" && entry.kind === "cache_warm")) {
-                return [entry, ...notes];
+                return [entry];
             }
             const messages = sessionEntryToContextMessages(entry);
+            for (const msg of messages) {
+                messageMeta.set(msg, { id: entry.id, timestamp: entry.timestamp });
+            }
             if ((entry.type === "compaction" || entry.type === "branch_summary") && entry.usage && messages.length > 0) {
-                return [...messages, { type: "compaction_cost", kind: entry.type, usage: entry.usage }, ...notes];
+                return [...messages, { type: "compaction_cost", kind: entry.type, usage: entry.usage }];
             }
-            return [...messages, ...notes];
+            return messages;
         });
-        this.renderSessionItems(items, options);
-        this.hasRenderedTranscript = true;
-        this.transcriptNotesRefreshScheduled = false;
+        this.renderSessionItems(items, messageMeta, options);
     }
     addCacheWarmingUsage(entry) {
         if (!this.settingsManager.getShowCacheMissNotices())
@@ -3396,11 +3448,11 @@ export class InteractiveMode {
         this.chatContainer.addChild(new Spacer(1));
         this.chatContainer.addChild(new ThemedText(() => theme.fg("warning", `${label}: ${reBilled}`), 1, 0));
     }
-    renderInitialMessages(options = {}) {
+    renderInitialMessages() {
         const entries = this.sessionManager.buildContextEntries();
         this.renderSessionEntries(entries, {
             updateFooter: true,
-            populateHistory: options.populateHistory ?? true,
+            populateHistory: true,
         });
         this.renderProjectTrustWarningIfNeeded();
         // Show compaction info if session was compacted
@@ -3457,7 +3509,6 @@ export class InteractiveMode {
         if (this.isShuttingDown)
             return;
         this.isShuttingDown = true;
-        this.session.tasks.close();
         // Keep signal handlers registered until terminal cleanup has completed.
         // `signal-exit` checks the listener list during the same SIGTERM/SIGHUP
         // dispatch and re-sends the signal if only its own listeners remain.
@@ -3480,9 +3531,12 @@ export class InteractiveMode {
         // the final frame while the process is exiting.
         // Drain any in-flight Kitty key release events before stopping.
         // This prevents escape sequences from leaking to the parent shell over slow SSH.
+        // Close task admission first, so no completion turn starts while the terminal drains.
+        const stoppingTasks = this.session.shutdownTasks();
         this.themeController.disableAutoSync();
         await this.ui.terminal.drainInput(1000);
         this.stop();
+        await stoppingTasks;
         await this.runtimeHost.dispose();
         const resumeCommand = formatResumeCommand(this.sessionManager);
         if (resumeCommand) {
@@ -3754,6 +3808,9 @@ export class InteractiveMode {
             if (result.status === "complete") {
                 this.editor.setText(result.content);
             }
+            else {
+                this.showStatus(result.message);
+            }
         }
         finally {
             this.ui.start();