gsd-pi 2.70.1 → 2.71.0-dev.4c35d99

package/packages/pi-coding-agent/dist/modes/interactive/interactive-mode.js

@@ -136,6 +136,7 @@ export class InteractiveMode {
         this.chatContainer = new Container();
         this.pendingMessagesContainer = new Container();
         this.statusContainer = new Container();
+        this.pinnedMessageContainer = new Container();
         this.widgetContainerAbove = new Container();
         this.widgetContainerBelow = new Container();
         this.keybindings = KeybindingsManager.create();
@@ -313,6 +314,7 @@ export class InteractiveMode {
         this.ui.addChild(this.chatContainer);
         this.ui.addChild(this.pendingMessagesContainer);
         this.ui.addChild(this.statusContainer);
+        this.ui.addChild(this.pinnedMessageContainer);
         this.renderWidgets(); // Initialize with default spacer
         this.ui.addChild(this.widgetContainerAbove);
         this.ui.addChild(this.editorContainer);
@@ -1080,7 +1082,17 @@ export class InteractiveMode {
     renderWidgets() {
         if (!this.widgetContainerAbove || !this.widgetContainerBelow)
             return;
-        this.renderWidgetContainer(this.widgetContainerAbove, this.extensionWidgetsAbove, true, true);
+        // widgetContainerAbove: spacer collapses when pinned content is visible
+        // so there's no extra blank line between pinned output and the editor border.
+        this.widgetContainerAbove.clear();
+        const pinned = this.pinnedMessageContainer;
+        this.widgetContainerAbove.addChild({
+            render: () => pinned.children.length > 0 ? [] : [""],
+            invalidate: () => { },
+        });
+        for (const component of this.extensionWidgetsAbove.values()) {
+            this.widgetContainerAbove.addChild(component);
+        }
         this.renderWidgetContainer(this.widgetContainerBelow, this.extensionWidgetsBelow, false, false);
         this.ui.requestRender();
     }
@@ -1259,7 +1271,7 @@ export class InteractiveMode {
                 opts?.signal?.removeEventListener("abort", onAbort);
                 this.hideExtensionInput();
                 resolve(undefined);
-            }, { tui: this.ui, timeout: opts?.timeout });
+            }, { tui: this.ui, timeout: opts?.timeout, secure: opts?.secure });
             this.editorContainer.clear();
             this.editorContainer.addChild(this.extensionInput);
             this.ui.setFocus(this.extensionInput);
@@ -1375,7 +1387,7 @@ export class InteractiveMode {
             this.showWarning(message);
         }
         else {
-            this.showStatus(message);
+            this.showStatus(message, { append: true });
         }
     }
     /** Show a custom component with keyboard focus. Overlay mode renders on top of existing content. */
@@ -1622,11 +1634,12 @@ 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, options) {
+        const append = options?.append ?? false;
         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;
-        if (last && secondLast && last === this.lastStatusText && secondLast === this.lastStatusSpacer) {
+        if (!append && last && secondLast && last === this.lastStatusText && secondLast === this.lastStatusSpacer) {
             this.lastStatusText.setText(theme.fg("dim", message));
             this.ui.requestRender();
             return;
@@ -1811,6 +1824,7 @@ export class InteractiveMode {
             updateFooter: true,
             populateHistory: true,
         });
+        this.populatePinnedFromMessages(context.messages);
         // Show compaction info if session was compacted
         const allEntries = this.sessionManager.getEntries();
         const compactionCount = allEntries.filter((e) => e.type === "compaction").length;
@@ -1831,6 +1845,49 @@ export class InteractiveMode {
         this.chatContainer.clear();
         const context = this.sessionManager.buildSessionContext();
         this.renderSessionContext(context);
+        this.populatePinnedFromMessages(context.messages);
+    }
+    /**
+     * After rebuilding chat from messages, pin the last assistant text above the
+     * editor if tool results would otherwise push it out of the viewport.
+     */
+    populatePinnedFromMessages(messages) {
+        this.pinnedMessageContainer.clear();
+        // Walk backwards to find the last assistant message
+        let lastAssistant;
+        for (let i = messages.length - 1; i >= 0; i--) {
+            const msg = messages[i];
+            if (msg && "role" in msg && msg.role === "assistant") {
+                lastAssistant = msg;
+                break;
+            }
+        }
+        if (!lastAssistant)
+            return;
+        // Check if any tool calls follow the last text block
+        const content = lastAssistant.content;
+        let lastTextIndex = -1;
+        let hasToolAfterText = false;
+        for (let i = 0; i < content.length; i++) {
+            if (content[i].type === "text")
+                lastTextIndex = i;
+        }
+        if (lastTextIndex >= 0) {
+            for (let i = lastTextIndex + 1; i < content.length; i++) {
+                if (content[i].type === "toolCall" || content[i].type === "serverToolUse") {
+                    hasToolAfterText = true;
+                    break;
+                }
+            }
+        }
+        if (!hasToolAfterText || lastTextIndex < 0)
+            return;
+        const textBlock = content[lastTextIndex];
+        const text = textBlock.text?.trim();
+        if (!text)
+            return;
+        this.pinnedMessageContainer.addChild(new DynamicBorder((str) => theme.fg("dim", str), "Latest Output"));
+        this.pinnedMessageContainer.addChild(new Markdown(text, 1, 0, this.getMarkdownThemeWithSettings()));
     }
     // =========================================================================
     // Key handlers