gsd-pi 2.74.0-dev.28a6415 → 2.74.0-dev.658744a

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

@@ -56,6 +56,35 @@ import { getAvailableThemes, getEditorTheme, getMarkdownTheme, initTheme, onThem
 function isExpandable(obj) {
     return typeof obj === "object" && obj !== null && "setExpanded" in obj && typeof obj.setExpanded === "function";
 }
+/**
+ * Build replay segments for historical assistant messages so rebuild paths
+ * preserve the original content[] ordering between assistant prose and tools.
+ */
+export function buildAssistantReplaySegments(contentBlocks) {
+    const segments = [];
+    let runStart = -1;
+    for (let i = 0; i < contentBlocks.length; i++) {
+        const block = contentBlocks[i];
+        const isAssistantText = block?.type === "text" || block?.type === "thinking";
+        const isTool = block?.type === "toolCall" || block?.type === "serverToolUse";
+        if (isAssistantText) {
+            if (runStart === -1)
+                runStart = i;
+            continue;
+        }
+        if (runStart !== -1) {
+            segments.push({ kind: "assistant", startIndex: runStart, endIndex: i - 1 });
+            runStart = -1;
+        }
+        if (isTool) {
+            segments.push({ kind: "tool", contentIndex: i });
+        }
+    }
+    if (runStart !== -1) {
+        segments.push({ kind: "assistant", startIndex: runStart, endIndex: contentBlocks.length - 1 });
+    }
+    return segments;
+}
 export class InteractiveMode {
     // Cap rendered chat components to prevent unbounded memory/CPU growth.
     // Only render-components are removed — session transcript stays on disk.
@@ -1390,6 +1419,9 @@ export class InteractiveMode {
         else if (type === "warning") {
             this.showWarning(message);
         }
+        else if (type === "success") {
+            this.showSuccess(message);
+        }
         else {
             this.showStatus(message, { append: true });
         }
@@ -1657,6 +1689,7 @@ export class InteractiveMode {
         this.ui.requestRender();
     }
     addMessageToChat(message, options) {
+        const timestampFormat = this.settingsManager.getTimestampFormat();
         switch (message.role) {
             case "bashExecution": {
                 const component = new BashExecutionComponent(message.command, this.ui, message.excludeFromContext);
@@ -1702,12 +1735,12 @@ export class InteractiveMode {
                         this.chatContainer.addChild(component);
                         // Render user message separately if present
                         if (skillBlock.userMessage) {
-                            const userComponent = new UserMessageComponent(skillBlock.userMessage, this.getMarkdownThemeWithSettings(), message.timestamp, this.settingsManager.getTimestampFormat());
+                            const userComponent = new UserMessageComponent(skillBlock.userMessage, this.getMarkdownThemeWithSettings(), message.timestamp, timestampFormat);
                             this.chatContainer.addChild(userComponent);
                         }
                     }
                     else {
-                        const userComponent = new UserMessageComponent(textContent, this.getMarkdownThemeWithSettings(), message.timestamp, this.settingsManager.getTimestampFormat());
+                        const userComponent = new UserMessageComponent(textContent, this.getMarkdownThemeWithSettings(), message.timestamp, timestampFormat);
                         this.chatContainer.addChild(userComponent);
                     }
                     if (options?.populateHistory) {
@@ -1717,7 +1750,7 @@ export class InteractiveMode {
                 break;
             }
             case "assistant": {
-                const assistantComponent = new AssistantMessageComponent(message, this.hideThinkingBlock, this.getMarkdownThemeWithSettings(), this.settingsManager.getTimestampFormat());
+                const assistantComponent = new AssistantMessageComponent(message, this.hideThinkingBlock, this.getMarkdownThemeWithSettings(), timestampFormat);
                 this.chatContainer.addChild(assistantComponent);
                 break;
             }
@@ -1749,6 +1782,7 @@ export class InteractiveMode {
      */
     renderSessionContext(sessionContext, options = {}) {
         this.pendingTools.clear();
+        const timestampFormat = this.settingsManager.getTimestampFormat();
         if (options.updateFooter) {
             this.footer.invalidate();
             this.updateEditorBorderColor();
@@ -1756,9 +1790,21 @@ export class InteractiveMode {
         for (const message of sessionContext.messages) {
             // Assistant messages need special handling for tool calls
             if (message.role === "assistant") {
-                this.addMessageToChat(message);
-                // Render tool call components
-                for (const content of message.content) {
+                const hasToolBlocks = message.content.some((c) => c.type === "toolCall" || c.type === "serverToolUse");
+                if (!hasToolBlocks) {
+                    this.addMessageToChat(message);
+                    continue;
+                }
+                const assistantSegments = [];
+                const replaySegments = buildAssistantReplaySegments(message.content);
+                for (const segment of replaySegments) {
+                    if (segment.kind === "assistant") {
+                        const assistantComponent = new AssistantMessageComponent(message, this.hideThinkingBlock, this.getMarkdownThemeWithSettings(), timestampFormat, { startIndex: segment.startIndex, endIndex: segment.endIndex });
+                        this.chatContainer.addChild(assistantComponent);
+                        assistantSegments.push(assistantComponent);
+                        continue;
+                    }
+                    const content = message.content[segment.contentIndex];
                     if (content.type === "toolCall") {
                         const component = new ToolExecutionComponent(content.name, content.arguments, { showImages: this.settingsManager.getShowImages() }, this.getRegisteredToolDefinition(content.name), this.ui);
                         component.setExpanded(this.toolOutputExpanded);
@@ -1803,6 +1849,10 @@ export class InteractiveMode {
                         }
                     }
                 }
+                // Match streaming-mode behavior: show metadata once on the final
+                // assistant prose segment for this message.
+                const lastAssistantSegment = assistantSegments[assistantSegments.length - 1];
+                lastAssistantSegment?.setShowMetadata(true);
             }
             else if (message.role === "toolResult") {
                 // Match tool results to pending tool components
@@ -1817,6 +1867,12 @@ export class InteractiveMode {
                 this.addMessageToChat(message, options);
             }
         }
+        // Any pendingTools entries left over after replay are historical tool
+        // calls whose results were squashed out of session context (commonly by
+        // compaction). Mark them finished so the frame stops showing "Running".
+        for (const component of this.pendingTools.values()) {
+            component.markHistoricalNoResult();
+        }
         this.pendingTools.clear();
         this.trimChatHistory();
         this.ui.requestRender();
@@ -2174,6 +2230,14 @@ export class InteractiveMode {
         this.chatContainer.addChild(new Text(theme.fg("warning", `Warning: ${warningMessage}`), 1, 0));
         this.ui.requestRender();
     }
+    showSuccess(successMessage) {
+        this.chatContainer.addChild(new Spacer(1));
+        this.chatContainer.addChild(new DynamicBorder((text) => theme.fg("success", text)));
+        this.chatContainer.addChild(new Text(theme.fg("success", successMessage), 1, 0));
+        this.chatContainer.addChild(new DynamicBorder((text) => theme.fg("success", text)));
+        this.chatContainer.addChild(new Spacer(1));
+        this.ui.requestRender();
+    }
     showTip(message) {
         this.chatContainer.addChild(new Spacer(1));
         this.chatContainer.addChild(new Text(theme.fg("dim", `💡 ${message}`), 1, 0));