@astralyn/pi 0.82.3 → 0.82.5

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

@@ -6,7 +6,7 @@ import * as crypto from "node:crypto";
 import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
-import { CombinedAutocompleteProvider, Container, fuzzyFilter, Markdown, matchesKey, ProcessTerminal, Spacer, setKeybindings, Text, TruncatedText, TUI, visibleWidth, } from "@earendil-works/pi-tui";
+import { CombinedAutocompleteProvider, Container, fuzzyFilter, Markdown, matchesKey, Spacer, setKeybindings, Text, TruncatedText, TUI, visibleWidth, } from "@earendil-works/pi-tui";
 import chalk from "chalk";
 import { spawn, spawnSync } from "child_process";
 import { APP_NAME, APP_TITLE, CONFIG_DIR_NAME, getAgentDir, getAuthPath, getDebugLogPath, getDocsPath, getShareViewerUrl, VERSION, } from "../../config.js";
@@ -27,6 +27,7 @@ import { getUsageCostBreakdown } from "../../core/usage-totals.js";
 import { getChangelogPath, getNewEntries, normalizeChangelogLinks, parseChangelog } from "../../utils/changelog.js";
 import { copyToClipboard, readClipboardText } from "../../utils/clipboard.js";
 import { extensionForImageMimeType, readClipboardImage } from "../../utils/clipboard-image.js";
+import { CoalescingTerminal } from "../../utils/coalescing-terminal.js";
 import { parseGitUrl } from "../../utils/git.js";
 import { getCwdRelativePath } from "../../utils/paths.js";
 import { killTrackedDetachedChildren } from "../../utils/shell.js";
@@ -163,6 +164,8 @@ function formatLoginProviderCompletionDescription(provider) {
 export class InteractiveMode {
     runtimeHost;
     ui;
+    coalescingTerminal;
+    agentRunActive = false;
     loadedResourcesContainer;
     chatContainer;
     pendingMessagesContainer;
@@ -272,7 +275,25 @@ export class InteractiveMode {
             await this.rebindCurrentSession({ renderBeforeBind: true });
         });
         this.version = VERSION;
-        this.ui = new TUI(new ProcessTerminal(), this.settingsManager.getShowHardwareCursor(), getAgentDir());
+        const terminal = new CoalescingTerminal();
+        this.coalescingTerminal = terminal;
+        this.ui = new TUI(terminal, this.settingsManager.getShowHardwareCursor(), getAgentDir());
+        // Lets full-redraw rewrites scroll grown content into scrollback
+        // instead of dropping the lines pushed above the screen.
+        // previousViewportTop is TS-private but a plain runtime field, and
+        // pi-tui writes each full-redraw frame before updating it, so the
+        // wrapper observes the pre-frame value; if either assumption breaks,
+        // readViewportTop falls back to the bottom-anchored repaint.
+        terminal.setViewportTopProvider(() => this.ui.previousViewportTop);
+        // Scrollback preservation stays on from agent_start until the user's
+        // next input after the run settles: post-run reflow frames must not
+        // yank a reader who is still scrolled up, but once the user acts they
+        // are back at the bottom and upstream's clean wipe-and-replay wins.
+        this.ui.addInputListener(() => {
+            if (!this.agentRunActive)
+                this.coalescingTerminal.setScrollbackPreservation(false);
+            return undefined;
+        });
         this.ui.setClearOnShrink(this.settingsManager.getClearOnShrink());
         this.headerContainer = new Container();
         this.loadedResourcesContainer = new Container();
@@ -2297,6 +2318,8 @@ export class InteractiveMode {
         this.footer.invalidate();
         switch (event.type) {
             case "agent_start":
+                this.agentRunActive = true;
+                this.coalescingTerminal.setScrollbackPreservation(true);
                 this.pendingTools.clear();
                 if (this.settingsManager.getShowTerminalProgress()) {
                     this.ui.terminal.setProgress(true);
@@ -2470,6 +2493,10 @@ export class InteractiveMode {
                 this.ui.requestRender();
                 break;
             case "agent_settled":
+                // Preservation itself stays on until the next user input; the
+                // run's trailing reflow frames may land after this event while
+                // the reader is still scrolled up.
+                this.agentRunActive = false;
                 await this.checkShutdownRequested();
                 break;
             case "compaction_start": {
@@ -3117,6 +3144,11 @@ export class InteractiveMode {
     }
     setToolsExpanded(expanded) {
         this.toolOutputExpanded = expanded;
+        // An explicit toggle prefers upstream's clean wipe-and-replay even
+        // mid-run: the user just pressed the key, so they are interacting at
+        // the bottom, and a full replay leaves scrollback as the exact new
+        // transcript instead of preservation's stale seams.
+        this.coalescingTerminal.passNextFullRedraw();
         const activeHeader = this.customHeader ?? this.builtInHeader;
         if (isExpandable(activeHeader)) {
             activeHeader.setExpanded(expanded);
@@ -3133,6 +3165,8 @@ export class InteractiveMode {
     toggleThinkingBlockVisibility() {
         this.hideThinkingBlock = !this.hideThinkingBlock;
         this.settingsManager.setHideThinkingBlock(this.hideThinkingBlock);
+        // Same reasoning as setToolsExpanded.
+        this.coalescingTerminal.passNextFullRedraw();
         // Rebuild chat from session messages
         this.chatContainer.clear();
         this.rebuildChatFromMessages();