lsd-pi 1.3.9 → 1.3.10

package/packages/pi-coding-agent/src/modes/interactive/controllers/__tests__/chat-controller.collapsed-tool-summary.test.ts

@@ -113,15 +113,19 @@ function createHost(options: { collapseToolCalls?: boolean; collapsedToolCallsEx
 }
 
 function addPendingTool(host: any, toolCallId: string, elapsed: number): { hidden?: boolean; component: any } {
-    const state: { hidden?: boolean; component: any } = { hidden: false, component: undefined };
+    const state: { hidden?: boolean; component: any; indented?: boolean } = { hidden: false, component: undefined, indented: false };
     const component = {
         render: () => (state.hidden ? [] : ["tool"]),
         updateResult: () => { },
+        updateArgs: () => { },
         setHidden: (hidden: boolean) => {
             state.hidden = hidden;
         },
         isHidden: () => !!state.hidden,
         setArgsComplete: () => { },
+        setIndented: (indented: boolean) => {
+            state.indented = indented;
+        },
         getElapsed: () => elapsed,
     };
     state.component = component;
@@ -175,7 +179,7 @@ describe("chat-controller collapsed tool summary lifecycle", () => {
         assert.equal(summaryLines(host).length, 1);
     });
 
-    it("reveals initially hidden on-error tools when they fail", async () => {
+    it("keeps on-error tools visible when they fail", async () => {
         const host = createHost();
 
         await handleAgentEvent(host, {
@@ -186,7 +190,7 @@ describe("chat-controller collapsed tool summary lifecycle", () => {
         await handleAgentEvent(host, toolStartEvent("tool-1", "bash", { command: "exit 1" }));
         const pending = host.pendingTools.get("tool-1");
         assert.ok(pending);
-        assert.equal(pending.isHidden(), true);
+        assert.equal(pending.isHidden(), false);
 
         await handleAgentEvent(host, {
             type: "tool_execution_end",
@@ -228,7 +232,7 @@ describe("chat-controller collapsed tool summary lifecycle", () => {
         assert.ok(stripAnsi(summaries[0].render(160).join("\n")).includes("reading 2 files · 1.0s"));
     });
 
-    it("does not group web fetches", async () => {
+    it("keeps last grouped tool label visible after completion", async () => {
         const host = createHost();
 
         await handleAgentEvent(host, {
@@ -236,19 +240,35 @@ describe("chat-controller collapsed tool summary lifecycle", () => {
             message: assistantMessage(),
         });
 
-        addPendingTool(host, "tool-1", 200);
+        await handleAgentEvent(host, toolStartEvent("tool-1", "read", { path: "README.md" }));
+        await handleAgentEvent(host, toolEndEvent("tool-1", "read"));
+
+        const summaries = summaryLines(host);
+        assert.equal(summaries.length, 1);
+        assert.ok(stripAnsi(summaries[0].render(160).join("\n")).includes("└ README.md"));
+    });
+
+    it("keeps non-groupable web fetches visible", async () => {
+        const host = createHost();
+
+        await handleAgentEvent(host, {
+            type: "message_start",
+            message: assistantMessage(),
+        });
+
+        const first = addPendingTool(host, "tool-1", 200);
         await handleAgentEvent(host, toolEndEvent("tool-1", "fetch_page"));
 
-        addPendingTool(host, "tool-2", 300);
+        const second = addPendingTool(host, "tool-2", 300);
         await handleAgentEvent(host, toolEndEvent("tool-2", "fetch_page"));
 
         const summaries = summaryLines(host);
-        assert.equal(summaries.length, 2);
-        assert.ok(stripAnsi(summaries[0].render(160).join("\n")).includes("reading 1 page · 0.2s"));
-        assert.ok(stripAnsi(summaries[1].render(160).join("\n")).includes("reading 1 page · 0.3s"));
+        assert.equal(summaries.length, 0);
+        assert.equal(first.hidden, false);
+        assert.equal(second.hidden, false);
     });
 
-    it("keeps different collapsed tool types in separate summaries", async () => {
+    it("groups mixed collapsed file/nav tools into one summary", async () => {
         const host = createHost();
 
         await handleAgentEvent(host, {
@@ -263,9 +283,10 @@ describe("chat-controller collapsed tool summary lifecycle", () => {
         await handleAgentEvent(host, toolEndEvent("tool-2", "find"));
 
         const summaries = summaryLines(host);
-        assert.equal(summaries.length, 2);
-        assert.ok(stripAnsi(summaries[0].render(160).join("\n")).includes("reading 1 file · 0.2s"));
-        assert.ok(stripAnsi(summaries[1].render(160).join("\n")).includes("finding 1 path · 0.3s"));
+        assert.equal(summaries.length, 1);
+        const rendered = stripAnsi(summaries[0].render(160).join("\n"));
+        assert.ok(rendered.includes("reading 1 file"));
+        assert.ok(rendered.includes("finding 1 path"));
     });
 
     it("resets grouping after visible tool result", async () => {
@@ -345,6 +366,32 @@ describe("chat-controller collapsed tool summary lifecycle", () => {
         assert.ok(stripAnsi(summaries[1].render(160).join("\n")).includes("0.4s"));
     });
 
+    it("stops grouped spinner on aborted assistant message", async () => {
+        const host = createHost();
+
+        await handleAgentEvent(host, {
+            type: "message_start",
+            message: assistantMessage(),
+        });
+
+        await handleAgentEvent(host, toolStartEvent("tool-1", "read", { path: "README.md" }));
+
+        await handleAgentEvent(host, {
+            type: "message_end",
+            message: {
+                ...assistantMessage(),
+                stopReason: "aborted",
+                errorMessage: "Operation aborted",
+            },
+        } as any);
+
+        const summaries = summaryLines(host);
+        assert.equal(summaries.length, 1);
+        const rendered = stripAnsi(summaries[0].render(160).join("\n"));
+        assert.ok(!rendered.includes("…"));
+        assert.ok(rendered.includes("README.md") || rendered === "");
+    });
+
     it("keeps collapsed tool calls visible in intermediate mode", async () => {
         const host = createHost({ collapseToolCalls: true, collapsedToolCallsExpanded: true });
 

package/packages/pi-coding-agent/src/modes/interactive/controllers/chat-controller.ts

@@ -1,5 +1,5 @@
 import { spawn } from "node:child_process";
-import { Loader, Spacer, Text } from "@gsd/pi-tui";
+import { Loader, Markdown, Spacer, Text } from "@gsd/pi-tui";
 
 import type { InteractiveModeEvent, InteractiveModeStateHost } from "../interactive-mode-state.js";
 import { theme } from "../theme/theme.js";
@@ -51,6 +51,14 @@ export async function handleAgentEvent(host: InteractiveModeStateHost & {
         host.collapsedToolSummaryLine = undefined;
     };
 
+    const clearPendingCollapsedToolSummaries = (): void => {
+        for (const child of host.chatContainer.children) {
+            if (child instanceof ToolSummaryLine && child.hasPendingTools()) {
+                child.clearPendingTools();
+            }
+        }
+    };
+
     // Tools that always render as their own visible row, never folded into a summary line
     const ALWAYS_DIRECT_TOOLS = new Set([
         "bash", "bg_shell",
@@ -94,14 +102,13 @@ export async function handleAgentEvent(host: InteractiveModeStateHost & {
         return undefined;
     };
 
-    const appendCollapsedToolSummary = (
+    const findOrCreateSummaryForPending = (
         toolName: string,
-        elapsed: number,
         anchor?: { render: (width: number) => string[] },
     ): ToolSummaryLine => {
         let summary = findAdjacentCollapsedToolSummary(toolName, anchor);
         if (!summary) {
-            summary = new ToolSummaryLine();
+            summary = new ToolSummaryLine(host.ui);
             summary.setHidden(host.collapsedToolCallsExpanded);
             if (anchor) {
                 const anchorIndex = host.chatContainer.children.indexOf(anchor);
@@ -115,10 +122,47 @@ export async function handleAgentEvent(host: InteractiveModeStateHost & {
             }
         }
         host.collapsedToolSummaryLine = summary;
+        return summary;
+    };
+
+    const findCollapsedSummaryByPendingTool = (toolCallId: string): ToolSummaryLine | undefined => {
+        for (const child of host.chatContainer.children) {
+            if (child instanceof ToolSummaryLine && child.hasPendingTool(toolCallId)) {
+                return child;
+            }
+        }
+        return undefined;
+    };
+
+    const appendCollapsedToolSummary = (
+        toolName: string,
+        elapsed: number,
+        anchor?: { render: (width: number) => string[] },
+    ): ToolSummaryLine => {
+        const summary = findOrCreateSummaryForPending(toolName, anchor);
         summary.addTool(toolName, elapsed);
         return summary;
     };
 
+    const clearStreamingPostToolComponents = (): void => {
+        for (const entry of host.streamingPostToolComponents) {
+            host.chatContainer.removeChild(entry.component);
+        }
+        host.streamingPostToolComponents = [];
+    };
+
+    /**
+     * Find the index of the last tool-type content block (toolCall or serverToolUse).
+     */
+    const findLastToolBlockIndex = (content: Array<{ type: string }>): number => {
+        for (let i = content.length - 1; i >= 0; i--) {
+            if (content[i].type === "toolCall" || content[i].type === "serverToolUse") {
+                return i;
+            }
+        }
+        return -1;
+    };
+
     switch (event.type) {
         case "session_state_changed":
             switch (event.reason) {
@@ -128,6 +172,7 @@ export async function handleAgentEvent(host: InteractiveModeStateHost & {
                     resetCollapsedToolSummary();
                     host.streamingComponent = undefined;
                     host.streamingMessage = undefined;
+                    host.streamingPostToolComponents = [];
                     host.pendingTools.clear();
                     host.clearAgentPtyComponents();
                     host.pendingMessagesContainer.clear();
@@ -222,7 +267,15 @@ export async function handleAgentEvent(host: InteractiveModeStateHost & {
             if (host.streamingComponent && event.message.role === "assistant") {
                 host.streamingMessage = event.message;
                 host.streamingComponent.updateContent(host.streamingMessage);
-                for (const content of host.streamingMessage.content) {
+
+                // Remove previously added post-tool text components (they'll be re-created below)
+                clearStreamingPostToolComponents();
+
+                const lastToolIdx = findLastToolBlockIndex(host.streamingMessage.content);
+
+                for (let ci = 0; ci < host.streamingMessage.content.length; ci++) {
+                    const content = host.streamingMessage.content[ci];
+
                     // Keep collapsed summary active across assistant text updates.
                     // Streamed message updates include all prior text blocks, so resetting
                     // here fragments one contiguous collapsed-tool group into many lines.
@@ -252,12 +305,15 @@ export async function handleAgentEvent(host: InteractiveModeStateHost & {
                                 if (adjacentSummary) {
                                     component.setIndented(true);
                                 }
+                                const summary = findOrCreateSummaryForPending(content.name, component);
+                                summary.addPendingTool(content.id, content.name, content.arguments ?? {});
                             }
                             component.setHidden(shouldHide);
                             host.pendingTools.set(content.id, component);
                             host.updateEditorExpandHint();
                         } else {
                             host.pendingTools.get(content.id)?.updateArgs(content.arguments);
+                            findCollapsedSummaryByPendingTool(content.id)?.updatePendingToolArgs(content.id, content.arguments ?? {});
                         }
                     } else if (content.type === "serverToolUse") {
                         if (!host.pendingTools.has(content.id)) {
@@ -282,6 +338,8 @@ export async function handleAgentEvent(host: InteractiveModeStateHost & {
                                 if (adjacentSummary) {
                                     component.setIndented(true);
                                 }
+                                const summary = findOrCreateSummaryForPending(content.name, component);
+                                summary.addPendingTool(content.id, content.name, content.input ?? {});
                             }
                             component.setHidden(shouldHide);
                             host.pendingTools.set(content.id, component);
@@ -304,6 +362,22 @@ export async function handleAgentEvent(host: InteractiveModeStateHost & {
                                 });
                             }
                         }
+                    } else if (content.type === "text" && content.text.trim() && ci > lastToolIdx && lastToolIdx >= 0) {
+                        // Text blocks that appear AFTER tool blocks need to be rendered
+                        // after the tool rows to preserve content order.
+                        const mdTheme = host.getMarkdownThemeWithSettings();
+                        const component = new Markdown(content.text.trim(), 1, 0, mdTheme);
+                        host.chatContainer.addChild(component);
+                        host.streamingPostToolComponents.push({ index: ci, component });
+                    } else if (content.type === "thinking" && content.thinking.trim() && ci > lastToolIdx && lastToolIdx >= 0 && !host.hideThinkingBlock) {
+                        // Thinking blocks after tool blocks — render in correct position.
+                        const mdTheme = host.getMarkdownThemeWithSettings();
+                        const component = new Markdown(content.thinking.trim(), 1, 0, mdTheme, {
+                            color: (text: string) => theme.fg("thinkingText", text),
+                            italic: true,
+                        });
+                        host.chatContainer.addChild(component);
+                        host.streamingPostToolComponents.push({ index: ci, component });
                     }
                 }
                 host.ui.requestRender();
@@ -332,6 +406,7 @@ export async function handleAgentEvent(host: InteractiveModeStateHost & {
                         component.updateResult({ content: [{ type: "text", text: errorMessage }], isError: true });
                     }
                     host.pendingTools.clear();
+                    clearPendingCollapsedToolSummaries();
                 } else {
                     host.playNotificationSoundOnAgentEnd = true;
                     for (const [, component] of host.pendingTools.entries()) {
@@ -375,6 +450,8 @@ export async function handleAgentEvent(host: InteractiveModeStateHost & {
                     if (adjacentSummary) {
                         component.setIndented(true);
                     }
+                    const summary = findOrCreateSummaryForPending(event.toolName, component);
+                    summary.addPendingTool(event.toolCallId, event.toolName, event.args ?? {});
                 }
                 component.setHidden(shouldHide);
                 host.pendingTools.set(event.toolCallId, component);
@@ -428,11 +505,13 @@ export async function handleAgentEvent(host: InteractiveModeStateHost & {
                 component.updateResult({ ...event.result, isError: event.isError });
                 const collapseToolCalls = host.settingsManager.getCollapseToolCalls?.() ?? false;
                 if (collapseToolCalls && shouldCollapse(event.toolName, event.isError) && !ALWAYS_DIRECT_TOOLS.has(event.toolName)) {
+                    findCollapsedSummaryByPendingTool(event.toolCallId)?.removePendingTool(event.toolCallId);
                     appendCollapsedToolSummary(event.toolName, component.getElapsed(), component);
                     component.setHidden(!host.collapsedToolCallsExpanded);
                     component.setIndented(false);
                     host.updateEditorExpandHint();
                 } else {
+                    findCollapsedSummaryByPendingTool(event.toolCallId)?.removePendingTool(event.toolCallId);
                     component.setHidden(false);
                     resetCollapsedToolSummary();
                 }
@@ -452,8 +531,10 @@ export async function handleAgentEvent(host: InteractiveModeStateHost & {
                 host.chatContainer.removeChild(host.streamingComponent);
                 host.streamingComponent = undefined;
                 host.streamingMessage = undefined;
+                clearStreamingPostToolComponents();
             }
             host.pendingTools.clear();
+            clearPendingCollapsedToolSummaries();
             resetCollapsedToolSummary();
             // Update hint: show expand/collapse if tool outputs exist, else clear
             host.defaultEditor.bottomHint = "";

package/packages/pi-coding-agent/src/modes/interactive/interactive-mode-state.ts

@@ -26,6 +26,7 @@ export interface InteractiveModeStateHost {
 	workingMessages: string[];
 	streamingComponent?: any;
 	streamingMessage?: any;
+	streamingPostToolComponents: Array<{ index: number; component: any }>;
 	retryEscapeHandler?: () => void;
 	retryLoader?: any;
 	autoCompactionLoader?: any;

package/packages/pi-coding-agent/src/modes/interactive/interactive-mode.ts

@@ -318,6 +318,7 @@ export class InteractiveMode {
 	// Streaming message tracking
 	private streamingComponent: AssistantMessageComponent | undefined = undefined;
 	private streamingMessage: AssistantMessage | undefined = undefined;
+	streamingPostToolComponents: Array<{ index: number; component: any }> = [];
 
 	// Tool execution tracking: toolCallId -> component
 	private pendingTools = new Map<string, ToolExecutionComponent>();
@@ -2773,9 +2774,24 @@ export class InteractiveMode {
 		for (const message of sessionContext.messages) {
 			// Assistant messages need special handling for tool calls
 			if (message.role === "assistant") {
+				// Render content blocks in order to preserve correct visual ordering.
+				// Text/thinking blocks before tools go into AssistantMessageComponent.
+				// Tool blocks are added as separate ToolExecutionComponent instances.
+				// Text/thinking blocks after tools are added as individual Markdown components.
+				const lastToolIdx = (() => {
+					for (let i = message.content.length - 1; i >= 0; i--) {
+						if (message.content[i].type === "toolCall" || message.content[i].type === "serverToolUse") return i;
+					}
+					return -1;
+				})();
+
+				// Phase 1: Render pre-tool text/thinking via AssistantMessageComponent
 				this.addMessageToChat(message);
-				// Render tool call components
-				for (const content of message.content) {
+
+				// Phase 2: Render tool blocks and post-tool text/thinking in content order
+				for (let ci = 0; ci < message.content.length; ci++) {
+					const content = message.content[ci];
+
 					if (content.type === "toolCall") {
 						const component = new ToolExecutionComponent(
 							content.name,
@@ -2837,6 +2853,19 @@ export class InteractiveMode {
 							// No result yet (aborted stream?) - show as pending
 							this.pendingTools.set(content.id, component);
 						}
+					} else if (ci > lastToolIdx && lastToolIdx >= 0) {
+						// Text/thinking blocks after tools — render as individual components
+						// to maintain correct visual ordering relative to tool rows.
+						if (content.type === "text" && content.text.trim()) {
+							const md = new Markdown(content.text.trim(), 1, 0, this.getMarkdownThemeWithSettings());
+							this.chatContainer.addChild(md);
+						} else if (content.type === "thinking" && content.thinking.trim() && !this.hideThinkingBlock) {
+							const md = new Markdown(content.thinking.trim(), 1, 0, this.getMarkdownThemeWithSettings(), {
+								color: (text: string) => theme.fg("thinkingText", text),
+								italic: true,
+							});
+							this.chatContainer.addChild(md);
+						}
 					}
 				}
 			} else if (message.role === "toolResult") {

package/pkg/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lsd-pi",
-  "version": "1.3.9",
+  "version": "1.3.10",
   "piConfig": {
     "name": "lsd",
     "configDir": ".lsd"