@astralyn/pi 0.84.0 → 0.84.2

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

@@ -167,7 +167,10 @@ function formatLoginProviderCompletionDescription(provider) {
 export function createInteractiveTui(options) {
     const terminal = options.terminal ?? new ProcessTerminal();
     if (options.tuiMode === "fullscreen") {
-        return new TuiAltScreen(terminal, options.showHardwareCursor, options.logDirectory, { openUrl: openBrowser });
+        return new TuiAltScreen(terminal, options.showHardwareCursor, options.logDirectory, {
+            openUrl: openBrowser,
+            onRightClickPaste: options.onRightClickPaste,
+        });
     }
     return new TuiMainScreen(terminal, options.showHardwareCursor, options.logDirectory);
 }
@@ -179,12 +182,19 @@ export function createInteractiveTuiReference(getTui) {
             const value = Reflect.get(tui, property, tui);
             if (typeof value !== "function")
                 return value;
+            let methodTui = tui;
+            let method = value;
             return (...args) => {
-                const tui = getTui();
-                const method = Reflect.get(tui, property, tui);
-                if (typeof method !== "function")
-                    throw new TypeError(`TUI property ${String(property)} is not callable`);
-                return Reflect.apply(method, tui, args);
+                const currentTui = getTui();
+                if (currentTui !== methodTui) {
+                    const currentMethod = Reflect.get(currentTui, property, currentTui);
+                    if (typeof currentMethod !== "function") {
+                        throw new TypeError(`TUI property ${String(property)} is not callable`);
+                    }
+                    methodTui = currentTui;
+                    method = currentMethod;
+                }
+                return Reflect.apply(method, methodTui, args);
             };
         },
         set: (_target, property, value) => {
@@ -210,16 +220,6 @@ export class InteractiveMode {
         return this.session.settingsManager;
     }
     constructor(runtimeHost, options = {}) {
-        // Input listeners live on the TUI renderer instance, which switchTuiMode
-        // replaces; this pair tracks the scrollback-preservation listener so it
-        // can be unsubscribed from the outgoing renderer and re-registered on the
-        // incoming one without duplicates.
-        this.scrollbackPreservationInputHandler = () => {
-            if (!this.agentRunActive)
-                this.coalescingTerminal.setScrollbackPreservation(false);
-            return undefined;
-        };
-        this.agentRunActive = false;
         this.autocompleteProviderWrappers = [];
         this.isInitialized = false;
         this.pendingUserInputs = [];
@@ -280,6 +280,9 @@ export class InteractiveMode {
         this.builtInHeader = undefined;
         // Custom header from extension (undefined = use built-in header)
         this.customHeader = undefined;
+        this.onRightClickPaste = () => {
+            void this.handleRightClickPaste();
+        };
         /**
          * Gracefully shutdown the agent.
          * Stops the TUI before emitting shutdown events so extension UI cleanup cannot
@@ -304,22 +307,17 @@ export class InteractiveMode {
             showHardwareCursor: this.settingsManager.getShowHardwareCursor(),
             logDirectory: getAgentDir(),
             terminal,
+            onRightClickPaste: this.onRightClickPaste,
         });
         this.ui = createInteractiveTuiReference(() => this.renderer);
         // 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.
-        // The listener is registered on the initial renderer and rebound by
-        // switchTuiMode whenever the renderer is replaced.
-        this.scrollbackPreservationInputUnsubscribe = this.ui.addInputListener(this.scrollbackPreservationInputHandler);
+        // instead of dropping the lines pushed above the screen. The render
+        // state comes from pi-tui's public captureRenderState(); pi-tui
+        // writes each full-redraw frame before updating its bookkeeping, so
+        // the wrapper observes the pre-frame viewport top. Fullscreen
+        // renderers return undefined (their frames do not match the rewrite
+        // shape anyway), falling back to the bottom-anchored repaint.
+        terminal.setViewportTopProvider(() => this.renderer instanceof TuiMainScreen ? this.renderer.captureRenderState().previousViewportTop : undefined);
         this.ui.setClearOnShrink(this.settingsManager.getClearOnShrink());
         this.headerContainer = new Container();
         this.loadedResourcesContainer = new Container();
@@ -550,6 +548,7 @@ export class InteractiveMode {
             showHardwareCursor,
             logDirectory: getAgentDir(),
             terminal,
+            onRightClickPaste: this.onRightClickPaste,
         });
         nextUi.setClearOnShrink(clearOnShrink);
         nextUi.onDebug = onDebug;
@@ -557,9 +556,6 @@ export class InteractiveMode {
             nextUi.restoreRenderState(this.mainScreenRenderState);
         }
         this.renderer = nextUi;
-        // Renderers own their input-listener sets; move the preservation
-        // listener onto the incoming renderer before anything else touches it.
-        this.rebindScrollbackPreservationInputListener();
         this.options.tuiMode = mode;
         this.mountInteractiveTui(nextUi, components);
         nextUi.invalidate();
@@ -1825,10 +1821,6 @@ export class InteractiveMode {
             this.extensionTerminalInputSubscriptions.delete(subscription);
         };
     }
-    rebindScrollbackPreservationInputListener() {
-        this.scrollbackPreservationInputUnsubscribe?.();
-        this.scrollbackPreservationInputUnsubscribe = this.ui.addInputListener(this.scrollbackPreservationInputHandler);
-    }
     rebindExtensionTerminalInputListeners() {
         for (const subscription of this.extensionTerminalInputSubscriptions) {
             subscription.unsubscribe();
@@ -2279,6 +2271,22 @@ export class InteractiveMode {
             void this.handleClipboardPaste();
         };
     }
+    async handleRightClickPaste() {
+        const target = this.renderer.getFocusedComponent();
+        const handleInput = target?.handleInput;
+        if (!target || !handleInput)
+            return;
+        try {
+            const text = await readClipboardText();
+            if (!text || this.renderer.getFocusedComponent() !== target)
+                return;
+            handleInput.call(target, `\x1b[200~${text}\x1b[201~`);
+            this.ui.requestRender();
+        }
+        catch {
+            // Silently ignore clipboard errors (may not have permission, etc.)
+        }
+    }
     async handleClipboardPaste() {
         try {
             const image = await readClipboardImage();
@@ -2499,8 +2507,9 @@ export class InteractiveMode {
         this.footer.invalidate();
         switch (event.type) {
             case "agent_start":
-                this.agentRunActive = true;
-                this.coalescingTerminal.setScrollbackPreservation(true);
+                // Opens the scrollback-preservation window; the terminal
+                // closes it on the user's next input after the run settles.
+                this.coalescingTerminal.setAgentRunActive(true);
                 this.clearPendingTools();
                 if (this.settingsManager.getShowTerminalProgress()) {
                     this.ui.terminal.setProgress(true);
@@ -2677,7 +2686,7 @@ export class InteractiveMode {
                 // 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;
+                this.coalescingTerminal.setAgentRunActive(false);
                 await this.checkShutdownRequested();
                 break;
             case "compaction_start": {
@@ -5401,8 +5410,6 @@ export class InteractiveMode {
         this.clearStatusIndicator();
         this.themeController.disableAutoSync();
         this.clearExtensionTerminalInputListeners();
-        this.scrollbackPreservationInputUnsubscribe?.();
-        this.scrollbackPreservationInputUnsubscribe = undefined;
         this.clearPendingTools();
         this.disposeChatToolComponents();
         this.footer.dispose();