lsd-pi 1.1.4 → 1.1.6

package/packages/pi-coding-agent/src/modes/interactive/components/tool-execution.ts

@@ -16,6 +16,7 @@ import { allTools } from "../../../core/tools/index.js";
 import { DEFAULT_MAX_BYTES, DEFAULT_MAX_LINES, formatSize } from "../../../core/tools/truncate.js";
 import { convertToPng } from "../../../utils/image-convert.js";
 import { sanitizeBinaryOutput } from "../../../utils/shell.js";
+import { renderTerminalText } from "../../../utils/terminal-serializer.js";
 import { getLanguageFromPath, highlightCode, theme } from "../theme/theme.js";
 import { type EditorScheme, editorLink } from "../utils/editor-link.js";
 import { shortenPath } from "../utils/shorten-path.js";
@@ -25,17 +26,9 @@ import { truncateToVisualLines } from "./visual-truncate.js";
 
 // Preview line limit for bash when not expanded
 const BASH_PREVIEW_LINES = 5;
-// Flash interval for RTK badge animation (ms)
-const RTK_FLASH_INTERVAL_MS = 400;
 // Flash interval for tool status spinner (ms)
 const SPINNER_INTERVAL_MS = 150;
 
-/** Returns true when RTK is active in this process. */
-function isRtkEnabled(): boolean {
-	const v = (process.env["GSD_RTK_DISABLED"] ?? "").trim().toLowerCase();
-	return v !== "1" && v !== "true" && v !== "yes";
-}
-
 // Spinner animation frames
 const SPINNER_FRAMES = ["◯", "◔", "◑", "◕", "●"];
 let spinnerFrame = 0;
@@ -112,9 +105,7 @@ export class ToolExecutionComponent extends Container {
 	private writeHighlightCache?: WriteHighlightCache;
 	// When true, this component intentionally renders no lines
 	private hideComponent = false;
-	// RTK badge flash state
-	private rtkFlashOn = true;
-	private rtkFlashTimer: NodeJS.Timeout | null = null;
+
 	// Tool status spinner state
 	private spinnerTimer: NodeJS.Timeout | null = null;
 	private spinnerFrame = 0;
@@ -138,8 +129,8 @@ export class ToolExecutionComponent extends Container {
 		this.cwd = cwd;
 
 		// Always create both - contentBox for custom tools/bash, contentText for other built-ins
-		this.contentBox = new Box(1, 1, (text: string) => theme.bg("toolPendingBg", text));
-		this.contentText = new Text("", 1, 1, (text: string) => theme.bg("toolPendingBg", text));
+		this.contentBox = new Box(1, 0, (text: string) => theme.bg("toolPendingBg", text));
+		this.contentText = new Text("", 1, 0, (text: string) => theme.bg("toolPendingBg", text));
 
 		// Use contentBox for bash (visual truncation) or custom tools with custom renderers
 		// Use contentText for built-in tools (including overrides without custom renderers)
@@ -321,12 +312,7 @@ export class ToolExecutionComponent extends Container {
 	): void {
 		this.result = result;
 		this.isPartial = isPartial;
-		// Stop RTK flash when result arrives — settle to dim
-		if (!isPartial && this.rtkFlashTimer) {
-			clearInterval(this.rtkFlashTimer);
-			this.rtkFlashTimer = null;
-			this.rtkFlashOn = false;
-		}
+
 		if (this.toolName === "write" && !isPartial) {
 			const rawPath = str(this.args?.file_path ?? this.args?.path);
 			const fileContent = str(this.args?.content);
@@ -393,10 +379,6 @@ export class ToolExecutionComponent extends Container {
 	}
 
 	dispose(): void {
-		if (this.rtkFlashTimer) {
-			clearInterval(this.rtkFlashTimer);
-			this.rtkFlashTimer = null;
-		}
 		if (this.spinnerTimer) {
 			clearInterval(this.spinnerTimer);
 			this.spinnerTimer = null;
@@ -412,7 +394,7 @@ export class ToolExecutionComponent extends Container {
 		if (this.hideComponent) {
 			return [];
 		}
-		return super.render(width);
+		return [...super.render(width), ""];
 	}
 
 	private updateDisplay(): void {
@@ -471,7 +453,7 @@ export class ToolExecutionComponent extends Container {
 			// Render call component
 			if (this.toolDefinition.renderCall) {
 				try {
-					const callComponent = this.toolDefinition.renderCall(this.args, theme);
+					const callComponent = this.toolDefinition.renderCall(this.args, theme, { statusIndicator });
 					if (callComponent !== undefined) {
 						this.contentBox.addChild(callComponent);
 						customRendererHasContent = true;
@@ -493,8 +475,9 @@ export class ToolExecutionComponent extends Container {
 					if (this.shouldHideCollapsedPreview()) {
 						const output = this.getTextOutput();
 						const hasDetails = output.trim().length > 0 || this.imageComponents.length > 0 || this.result.details !== undefined;
-						if (hasDetails) {
-							this.contentBox.addChild(new Text(`\n${this.collapsedExpandHint()}`, 0, 0));
+						const collapsedHint = this.collapsedHintWithPrefix("\n");
+						if (hasDetails && collapsedHint) {
+							this.contentBox.addChild(new Text(collapsedHint, 0, 0));
 							customRendererHasContent = true;
 						}
 					} else {
@@ -521,7 +504,10 @@ export class ToolExecutionComponent extends Container {
 				const output = this.getTextOutput();
 				if (output) {
 					if (this.shouldHideCollapsedPreview()) {
-						this.contentBox.addChild(new Text(`\n${this.collapsedExpandHint()}`, 0, 0));
+						const collapsedHint = this.collapsedHintWithPrefix("\n");
+						if (collapsedHint) {
+							this.contentBox.addChild(new Text(collapsedHint, 0, 0));
+						}
 					} else {
 						this.contentBox.addChild(new Text(theme.fg("toolOutput", output), 0, 0));
 					}
@@ -591,65 +577,55 @@ export class ToolExecutionComponent extends Container {
 	private renderBashContent(statusIndicator: string): void {
 		const command = str(this.args?.command);
 		const timeout = this.args?.timeout as number | undefined;
-		const rtkActive = isRtkEnabled();
+		const body = new Container();
 
-		// Start RTK flash timer on first partial render
-		if (rtkActive && this.isPartial && !this.result && !this.rtkFlashTimer) {
-			this.rtkFlashTimer = setInterval(() => {
-				this.rtkFlashOn = !this.rtkFlashOn;
-				this.updateDisplay();
-				this.ui.requestRender();
-			}, RTK_FLASH_INTERVAL_MS);
-		}
+		this.contentBox.addChild(body);
 
-		// Header with status indicator
 		const timeoutSuffix = timeout ? theme.fg("muted", ` (timeout ${timeout}s)`) : "";
 		const commandDisplay =
-			command === null ? theme.fg("error", "[invalid arg]") : command ? command : theme.fg("toolOutput", "...");
+			command === null
+				? theme.fg("error", "[invalid arg]")
+				: command
+					? theme.fg("toolOutput", command)
+					: theme.fg("toolOutput", "...");
 		const sandboxBadge = this.result?.details?.sandboxed ? `  ${theme.fg("success", "[sandboxed]")}` : "";
-		const rtkBadge = rtkActive
-			? "  " + (this.rtkFlashOn ? theme.fg("accent", "$ RTK") : theme.fg("dim", "$ RTK"))
-			: "";
-		this.contentBox.addChild(
-			new Text(`${statusIndicator} ${theme.fg("toolTitle", theme.bold(`$ ${commandDisplay}`))}${timeoutSuffix}${sandboxBadge}${rtkBadge}`, 0, 0),
-		);
+		const toolLabel = theme.fg("toolTitle", theme.bold("bash"));
+		const shellPrompt = theme.fg("muted", "$ ");
+		body.addChild(new Text(`${statusIndicator} ${toolLabel} ${shellPrompt}${commandDisplay}${timeoutSuffix}${sandboxBadge}`, 0, 0));
 
 		if (this.result) {
 			const output = this.getTextOutput().trim();
 
 			if (output) {
-				// Style each line for the output
 				const styledOutput = output
 					.split("\n")
 					.map((line) => theme.fg("toolOutput", line))
 					.join("\n");
 
 				if (this.expanded) {
-					// Show all lines when expanded
-					this.contentBox.addChild(new Text(`\n${styledOutput}`, 0, 0));
+					body.addChild(new Text(`\n${styledOutput}`, 0, 0));
 				} else if (this.renderMode === "minimal") {
-					this.contentBox.addChild(new Text(`\n${this.collapsedExpandHint()}`, 0, 0));
+					const collapsedHint = this.collapsedHintWithPrefix("\n");
+					if (collapsedHint) {
+						body.addChild(new Text(collapsedHint, 1, 0));
+					}
 				} else {
-					// Use visual line truncation when collapsed with width-aware caching
 					let cachedWidth: number | undefined;
 					let cachedLines: string[] | undefined;
 					let cachedSkipped: number | undefined;
 
-					this.contentBox.addChild({
+					body.addChild({
 						render: (width: number) => {
 							if (cachedLines === undefined || cachedWidth !== width) {
-								const result = truncateToVisualLines(styledOutput, BASH_PREVIEW_LINES, width);
-								cachedLines = result.visualLines;
+								const result = truncateToVisualLines(styledOutput, BASH_PREVIEW_LINES, Math.max(1, width - 1));
+								cachedLines = result.visualLines.map((line) => ` ${line}`);
 								cachedSkipped = result.skippedCount;
 								cachedWidth = width;
 							}
 							if (cachedSkipped && cachedSkipped > 0) {
-								const hint =
-									theme.fg("muted", `... (${cachedSkipped} earlier lines,`) +
-									` ${keyHint("expandTools", "to expand")})`;
-								return ["", truncateToWidth(hint, width, "..."), ...cachedLines];
+								const hint = theme.fg("muted", `... (${cachedSkipped} earlier lines)`);
+								return ["", truncateToWidth(` ${hint}`, width, "..."), ...cachedLines];
 							}
-							// Add blank line for spacing (matches expanded case)
 							return ["", ...cachedLines];
 						},
 						invalidate: () => {
@@ -661,7 +637,6 @@ export class ToolExecutionComponent extends Container {
 				}
 			}
 
-			// Truncation warnings
 			const truncation = this.result.details?.truncation;
 			const fullOutputPath = this.result.details?.fullOutputPath;
 			if (truncation?.truncated || fullOutputPath) {
@@ -678,7 +653,7 @@ export class ToolExecutionComponent extends Container {
 						);
 					}
 				}
-				this.contentBox.addChild(new Text(`\n${theme.fg("warning", `[${warnings.join(". ")}]`)}`, 0, 0));
+				body.addChild(new Text(`\n${theme.fg("warning", `[${warnings.join(". ")}]`)}`, 0, 0));
 			}
 		}
 	}
@@ -689,13 +664,20 @@ export class ToolExecutionComponent extends Container {
 		const textBlocks = this.result.content?.filter((c: any) => c.type === "text") || [];
 		const imageBlocks = this.result.content?.filter((c: any) => c.type === "image") || [];
 
-		let output = textBlocks
+	let output = textBlocks
 			.map((c: any) => {
 				// Use sanitizeBinaryOutput to handle binary data that crashes string-width
-				return sanitizeBinaryOutput(stripAnsi(c.text || "")).replace(/\r/g, "");
+				return sanitizeBinaryOutput(c.text || "");
 			})
 			.join("\n");
 
+		if (this.toolName === "bash") {
+			output = renderTerminalText(output);
+		} else {
+			output = output.replace(/\r/g, "");
+			output = stripAnsi(output);
+		}
+
 		const caps = getCapabilities();
 		if (imageBlocks.length > 0 && (!caps.images || !this.showImages)) {
 			const imageIndicators = imageBlocks
@@ -718,8 +700,13 @@ export class ToolExecutionComponent extends Container {
 		return !this.expanded && this.renderMode === "minimal" && !this.result?.isError;
 	}
 
-	private collapsedExpandHint(label = keyHint("expandTools", "to expand")): string {
-		return theme.fg("muted", `(${label})`);
+	private collapsedExpandHint(_label?: string): string {
+		return ""; // hint is shown in editor bottom border instead
+	}
+
+	private collapsedHintWithPrefix(prefix = "\n\n"): string {
+		const hint = this.collapsedExpandHint();
+		return hint ? `${prefix}${hint}` : "";
 	}
 
 	private collapsedFirstLine(output: string): string | undefined {
@@ -763,7 +750,7 @@ export class ToolExecutionComponent extends Container {
 
 				if (hideCollapsedPreview) {
 					if (output.trim()) {
-						text += `\n\n${this.collapsedExpandHint()}`;
+						text += this.collapsedHintWithPrefix();
 					}
 				} else {
 					const maxLines = this.expanded ? lines.length : 10;
@@ -776,7 +763,7 @@ export class ToolExecutionComponent extends Container {
 							.map((line: string) => (lang ? replaceTabs(line) : theme.fg("toolOutput", replaceTabs(line))))
 							.join("\n");
 					if (remaining > 0) {
-						text += `${theme.fg("muted", `\n... (${remaining} more lines,`)} ${keyHint("expandTools", "to expand")})`;
+						text += theme.fg("muted", `\n... (${remaining} more lines)`);
 					}
 				}
 
@@ -845,7 +832,7 @@ export class ToolExecutionComponent extends Container {
 				}
 
 				if (hideCollapsedPreview) {
-					text += `\n\n${this.collapsedExpandHint()}`;
+					text += this.collapsedHintWithPrefix();
 				} else {
 					const totalLines = lines.length;
 					const maxLines = this.expanded ? lines.length : 10;
@@ -856,9 +843,7 @@ export class ToolExecutionComponent extends Container {
 						"\n\n" +
 						displayLines.map((line: string) => (lang ? line : theme.fg("toolOutput", replaceTabs(line)))).join("\n");
 					if (remaining > 0) {
-						text +=
-							theme.fg("muted", `\n... (${remaining} more lines, ${totalLines} total,`) +
-							` ${keyHint("expandTools", "to expand")})`;
+						text += theme.fg("muted", `\n... (${remaining} more lines, ${totalLines} total)`);
 					}
 				}
 			}
@@ -907,7 +892,7 @@ export class ToolExecutionComponent extends Container {
 				// This takes priority over editDiffPreview which may have a stale error
 				// due to race condition (async preview computed after file was modified)
 				text += hideCollapsedPreview
-					? `\n\n${this.collapsedExpandHint()}`
+					? this.collapsedHintWithPrefix()
 					: `\n\n${renderDiff(this.result.details.diff, { filePath: rawPath ?? undefined })}`;
 			} else if (this.editDiffPreview) {
 				// Use cached diff preview (before tool executes)
@@ -915,7 +900,7 @@ export class ToolExecutionComponent extends Container {
 					text += `\n\n${theme.fg("error", this.editDiffPreview.error)}`;
 				} else if (this.editDiffPreview.diff) {
 					text += hideCollapsedPreview
-						? `\n\n${this.collapsedExpandHint()}`
+						? this.collapsedHintWithPrefix()
 						: `\n\n${renderDiff(this.editDiffPreview.diff, { filePath: rawPath ?? undefined })}`;
 				}
 			}
@@ -937,7 +922,7 @@ export class ToolExecutionComponent extends Container {
 				const output = this.getTextOutput().trim();
 				if (output) {
 					if (hideCollapsedPreview) {
-						text += `\n\n${this.collapsedExpandHint()}`;
+						text += this.collapsedHintWithPrefix();
 					} else {
 						const lines = output.split("\n");
 						const maxLines = this.expanded ? lines.length : 20;
@@ -946,7 +931,7 @@ export class ToolExecutionComponent extends Container {
 
 						text += `\n\n${displayLines.map((line: string) => theme.fg("toolOutput", line)).join("\n")}`;
 						if (remaining > 0) {
-							text += `${theme.fg("muted", `\n... (${remaining} more lines,`)} ${keyHint("expandTools", "to expand")})`;
+							text += theme.fg("muted", `\n... (${remaining} more lines)`);
 						}
 					}
 				}
@@ -990,7 +975,7 @@ export class ToolExecutionComponent extends Container {
 				const output = this.getTextOutput().trim();
 				if (output) {
 					if (hideCollapsedPreview) {
-						text += `\n\n${this.collapsedExpandHint()}`;
+						text += this.collapsedHintWithPrefix();
 					} else {
 						const lines = output.split("\n");
 						const maxLines = this.expanded ? lines.length : 20;
@@ -999,7 +984,7 @@ export class ToolExecutionComponent extends Container {
 
 						text += `\n\n${displayLines.map((line: string) => theme.fg("toolOutput", line)).join("\n")}`;
 						if (remaining > 0) {
-							text += `${theme.fg("muted", `\n... (${remaining} more lines,`)} ${keyHint("expandTools", "to expand")})`;
+							text += theme.fg("muted", `\n... (${remaining} more lines)`);
 						}
 					}
 				}
@@ -1047,7 +1032,7 @@ export class ToolExecutionComponent extends Container {
 				const output = this.getTextOutput().trim();
 				if (output) {
 					if (hideCollapsedPreview) {
-						text += `\n\n${this.collapsedExpandHint()}`;
+						text += this.collapsedHintWithPrefix();
 					} else {
 						const lines = output.split("\n");
 						const maxLines = this.expanded ? lines.length : 15;
@@ -1056,7 +1041,7 @@ export class ToolExecutionComponent extends Container {
 
 						text += `\n\n${displayLines.map((line: string) => theme.fg("toolOutput", line)).join("\n")}`;
 						if (remaining > 0) {
-							text += `${theme.fg("muted", `\n... (${remaining} more lines,`)} ${keyHint("expandTools", "to expand")})`;
+							text += theme.fg("muted", `\n... (${remaining} more lines)`);
 						}
 					}
 				}
@@ -1088,7 +1073,7 @@ export class ToolExecutionComponent extends Container {
 				const output = this.getTextOutput().trim();
 				if (output) {
 					if (hideCollapsedPreview) {
-						text += `\n\n${this.collapsedExpandHint()}`;
+						text += this.collapsedHintWithPrefix();
 					} else {
 						const lines = output.split("\n");
 						const maxLines = this.expanded ? lines.length : 10;
@@ -1097,17 +1082,55 @@ export class ToolExecutionComponent extends Container {
 
 						text += `\n\n${displayLines.map((line: string) => theme.fg("toolOutput", line)).join("\n")}`;
 						if (remaining > 0) {
-							text += `${theme.fg("muted", `\n... (${remaining} more lines,`)} ${keyHint("expandTools", "to expand")})`;
+							text += theme.fg("muted", `\n... (${remaining} more lines)`);
 						}
 					}
 				}
 			}
+		} else if (this.toolName === "lsp") {
+			const action = this.args?.action as string | undefined;
+			const file = this.args?.file as string | undefined;
+			const line = this.args?.line as number | undefined;
+			const symbol = this.args?.symbol as string | undefined;
+			const query = this.args?.query as string | undefined;
+			const newName = this.args?.new_name as string | undefined;
+
+			text = `${statusIndicator} ${theme.fg("toolTitle", theme.bold("lsp"))}`;
+			if (action) text += ` ${theme.fg("accent", action)}`;
+			if (file) {
+				const shortFile = shortenPath(file);
+				let styledFile = theme.fg("muted", shortFile);
+				if (file && shortFile) {
+					styledFile = editorLink(file, styledFile, { cwd: this.cwd, line, scheme: this.editorScheme });
+				}
+				text += ` ${styledFile}`;
+				if (line !== undefined) text += theme.fg("warning", `:${line}`);
+			}
+			if (symbol) text += ` ${theme.fg("toolOutput", symbol)}`;
+			if (query) text += ` ${theme.fg("muted", `"${query}"`)}`;
+			if (newName) text += ` → ${theme.fg("accent", newName)}`;
+
+			if (this.result) {
+				const output = this.getTextOutput().trim();
+				if (output) {
+					if (hideCollapsedPreview) {
+						text += this.collapsedHintWithPrefix();
+					} else {
+						const lines = output.split("\n");
+						const maxLines = this.expanded ? lines.length : 10;
+						const displayLines = lines.slice(0, maxLines);
+						const remaining = lines.length - maxLines;
+						text += `\n\n${displayLines.map((l: string) => theme.fg("toolOutput", l)).join("\n")}`;
+						if (remaining > 0) text += theme.fg("muted", `\n... (${remaining} more lines)`);
+					}
+				}
+			}
 		} else {
 			// Generic tool (shouldn't reach here for custom tools)
 			text = `${statusIndicator} ${theme.fg("toolTitle", theme.bold(this.toolName))}`;
 
 			const content = JSON.stringify(this.args, null, 2);
-			text += hideCollapsedPreview ? `\n\n${this.collapsedExpandHint()}` : `\n\n${content}`;
+			text += hideCollapsedPreview ? this.collapsedHintWithPrefix() : `\n\n${content}`;
 			const output = this.getTextOutput();
 			if (output && !hideCollapsedPreview) {
 				text += `\n${output}`;

package/packages/pi-coding-agent/src/modes/interactive/components/user-message.ts

@@ -1,24 +1,19 @@
-import { Container, Markdown, type MarkdownTheme, Spacer, Text } from "@gsd/pi-tui";
+import { Container, Markdown, type MarkdownTheme, Spacer } from "@gsd/pi-tui";
 import { getMarkdownTheme, theme } from "../theme/theme.js";
-import { formatTimestamp, type TimestampFormat } from "./timestamp.js";
 
 const OSC133_ZONE_START = "\x1b]133;A\x07";
 const OSC133_ZONE_END = "\x1b]133;B\x07";
 
 /**
- * Component that renders a user message with a right-aligned timestamp.
+ * Component that renders a user message with a visual prompt marker.
  */
 export class UserMessageComponent extends Container {
-	private timestamp: number | undefined;
-	private timestampFormat: TimestampFormat;
-
-	constructor(text: string, markdownTheme: MarkdownTheme = getMarkdownTheme(), timestamp?: number, timestampFormat: TimestampFormat = "date-time-iso") {
+	constructor(text: string, markdownTheme: MarkdownTheme = getMarkdownTheme(), _timestamp?: number, _timestampFormat: string = "date-time-iso") {
 		super();
-		this.timestamp = timestamp;
-		this.timestampFormat = timestampFormat;
 		this.addChild(new Spacer(1));
+		const promptMarker = `${theme.fg("accent", "▶")} `;
 		this.addChild(
-			new Markdown(text, 1, 1, markdownTheme, {
+			new Markdown(`${promptMarker}${text}`, 1, 1, markdownTheme, {
 				bgColor: (text: string) => theme.bg("userMessageBg", text),
 				color: (text: string) => theme.fg("userMessageText", text),
 			}),
@@ -31,15 +26,6 @@ export class UserMessageComponent extends Container {
 			return lines;
 		}
 
-		// Timestamp display removed
-		// if (this.timestamp) {
-		// 	const timeStr = formatTimestamp(this.timestamp, this.timestampFormat);
-		// 	const label = theme.fg("dim", timeStr);
-		// 	const padding = Math.max(0, width - timeStr.length - 1);
-		// 	const timestampLine = " ".repeat(padding) + label;
-		// 	lines.splice(0, 0, timestampLine);
-		// }
-
 		lines[0] = OSC133_ZONE_START + lines[0];
 		lines[lines.length - 1] = lines[lines.length - 1] + OSC133_ZONE_END;
 		return lines;

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

@@ -20,6 +20,11 @@ export async function handleAgentEvent(host: InteractiveModeStateHost & {
 	updatePendingMessagesDisplay: () => void;
 	updateTerminalTitle: () => void;
 	updateEditorBorderColor: () => void;
+	updateEditorExpandHint: () => void;
+	getAgentPtyComponent: (sessionId: string) => any;
+	ensureAgentPtyComponent: (sessionId: string, command?: string) => any;
+	updateAgentPtyComponent: (sessionId: string, options?: { command?: string; screenText?: string; completed?: boolean; cancelled?: boolean; exitCode?: number }) => void;
+	clearAgentPtyComponents: () => void;
 	pendingMessagesContainer: { clear: () => void };
 }, event: InteractiveModeEvent): Promise<void> {
 	if (!host.isInitialized) {
@@ -37,6 +42,7 @@ export async function handleAgentEvent(host: InteractiveModeStateHost & {
 					host.streamingComponent = undefined;
 					host.streamingMessage = undefined;
 					host.pendingTools.clear();
+					host.clearAgentPtyComponents();
 					host.pendingMessagesContainer.clear();
 					host.compactionQueuedMessages = [];
 					host.rebuildChatFromMessages();
@@ -73,19 +79,14 @@ export async function handleAgentEvent(host: InteractiveModeStateHost & {
 			host.statusContainer.clear();
 			host.loadingAnimation = new Loader(
 				host.ui,
-				(spinner) => theme.fg("accent", spinner),
-				(text) => theme.fg("muted", text),
+				(spinner) => theme.fg("text", spinner),
+				(text) => theme.fg("accent", text),
 				host.defaultWorkingMessage,
 			);
+			host.loadingAnimation.setCycleMessages(host.workingMessages, 3000);
 			host.statusContainer.addChild(host.loadingAnimation);
-			// Show steer/queue hint in editor bottom border while agent is running
-			{
-				const enterKey = theme.fg("dim", "↵");
-				const followUpKey = theme.fg("dim", appKey(host.keybindings, "followUp"));
-				const steerLabel = theme.fg("muted", " steer");
-				const queueLabel = theme.fg("muted", " queue");
-				host.defaultEditor.bottomHint = `${enterKey}${steerLabel}  ${followUpKey}${queueLabel}`;
-			}
+			// Show steer/queue + expand hint in editor bottom border while agent is running
+			host.updateEditorExpandHint();
 			if (host.pendingWorkingMessage !== undefined) {
 				if (host.pendingWorkingMessage) {
 					host.loadingAnimation.setMessage(host.pendingWorkingMessage);
@@ -109,6 +110,7 @@ export async function handleAgentEvent(host: InteractiveModeStateHost & {
 					host.hideThinkingBlock,
 					host.getMarkdownThemeWithSettings(),
 					host.settingsManager.getTimestampFormat(),
+					host.session?.thinkingLevel || "off",
 				);
 				host.streamingMessage = event.message;
 				host.chatContainer.addChild(host.streamingComponent);
@@ -123,6 +125,9 @@ export async function handleAgentEvent(host: InteractiveModeStateHost & {
 				host.streamingComponent.updateContent(host.streamingMessage);
 				for (const content of host.streamingMessage.content) {
 					if (content.type === "toolCall") {
+						if (content.name === "pty_start" || content.name === "pty_send" || content.name === "pty_read" || content.name === "pty_wait" || content.name === "pty_resize" || content.name === "pty_kill") {
+							continue;
+						}
 						if (!host.pendingTools.has(content.id)) {
 							const component = new ToolExecutionComponent(
 								content.name,
@@ -215,6 +220,12 @@ export async function handleAgentEvent(host: InteractiveModeStateHost & {
 			break;
 
 		case "tool_execution_start":
+			if (event.toolName === "pty_start") {
+				return;
+			}
+			if (event.toolName === "pty_send" || event.toolName === "pty_read" || event.toolName === "pty_wait" || event.toolName === "pty_resize" || event.toolName === "pty_kill") {
+				return;
+			}
 			if (!host.pendingTools.has(event.toolCallId)) {
 				const component = new ToolExecutionComponent(
 					event.toolName,
@@ -235,6 +246,21 @@ export async function handleAgentEvent(host: InteractiveModeStateHost & {
 			break;
 
 		case "tool_execution_update": {
+			if (event.toolName === "pty_start" || event.toolName === "pty_send" || event.toolName === "pty_read" || event.toolName === "pty_wait" || event.toolName === "pty_resize" || event.toolName === "pty_kill") {
+				const details = event.partialResult?.details as { sessionId?: string; screenText?: string; exitCode?: number; cancelled?: boolean; completed?: boolean } | undefined;
+				const sessionId = details?.sessionId ?? (event.args as { sessionId?: string } | undefined)?.sessionId;
+				if (sessionId) {
+					host.updateAgentPtyComponent(sessionId, {
+						command: event.toolName === "pty_start" ? (event.args as { command?: string } | undefined)?.command : undefined,
+						screenText: details?.screenText,
+						completed: details?.completed,
+						cancelled: details?.cancelled,
+						exitCode: details?.exitCode,
+					});
+					host.ui.requestRender();
+				}
+				break;
+			}
 			const component = host.pendingTools.get(event.toolCallId);
 			if (component) {
 				component.updateResult({ ...event.partialResult, isError: false }, true);
@@ -244,6 +270,21 @@ export async function handleAgentEvent(host: InteractiveModeStateHost & {
 		}
 
 		case "tool_execution_end": {
+			if (event.toolName === "pty_start" || event.toolName === "pty_send" || event.toolName === "pty_read" || event.toolName === "pty_wait" || event.toolName === "pty_resize" || event.toolName === "pty_kill") {
+				const details = event.result?.details as { sessionId?: string; screenText?: string; exitCode?: number; cancelled?: boolean; completed?: boolean } | undefined;
+				const sessionId = details?.sessionId;
+				if (sessionId) {
+					host.updateAgentPtyComponent(sessionId, {
+						command: undefined,
+						screenText: details?.screenText,
+						completed: event.toolName === "pty_kill" || !!details?.completed,
+						cancelled: details?.cancelled ?? event.toolName === "pty_kill",
+						exitCode: details?.exitCode,
+					});
+					host.ui.requestRender();
+				}
+				break;
+			}
 			const component = host.pendingTools.get(event.toolCallId);
 			if (component) {
 				component.updateResult({ ...event.result, isError: event.isError });
@@ -265,8 +306,9 @@ export async function handleAgentEvent(host: InteractiveModeStateHost & {
 				host.streamingMessage = undefined;
 			}
 			host.pendingTools.clear();
-			// Clear the steer/queue hint when agent finishes
+			// Update hint: show expand/collapse if tool outputs exist, else clear
 			host.defaultEditor.bottomHint = "";
+			host.updateEditorExpandHint();
 			await host.checkShutdownRequested();
 			host.ui.requestRender();
 			break;
@@ -277,7 +319,7 @@ export async function handleAgentEvent(host: InteractiveModeStateHost & {
 			host.statusContainer.clear();
 			host.autoCompactionLoader = new Loader(
 				host.ui,
-				(spinner) => theme.fg("accent", spinner),
+				(spinner) => theme.fg("text", spinner),
 				(text) => theme.fg("muted", text),
 				`${event.reason === "overflow" ? "Context overflow detected, " : ""}Auto-compacting... (${appKey(host.keybindings, "interrupt")} to cancel)`,
 			);
@@ -323,7 +365,7 @@ export async function handleAgentEvent(host: InteractiveModeStateHost & {
 			host.statusContainer.clear();
 			host.retryLoader = new Loader(
 				host.ui,
-				(spinner) => theme.fg("warning", spinner),
+				(spinner) => theme.fg("text", spinner),
 				(text) => theme.fg("muted", text),
 				`Retrying (${event.attempt}/${event.maxAttempts}) in ${Math.round(event.delayMs / 1000)}s... (${appKey(host.keybindings, "interrupt")} to cancel)`,
 			);

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

@@ -17,6 +17,7 @@ export function createExtensionUIContext(host: any): ExtensionUIContext {
 					host.loadingAnimation.setMessage(message);
 				} else {
 					host.loadingAnimation.setMessage(`${host.defaultWorkingMessage} (${appKey(host.keybindings, "interrupt")} to interrupt)`);
+					host.loadingAnimation.resumeCycle();
 				}
 			} else {
 				host.pendingWorkingMessage = message;

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

@@ -56,6 +56,7 @@ export function setupEditorSubmitHandler(host: InteractiveModeStateHost & {
 		if (host.session.isStreaming) {
 			host.editor.addToHistory?.(text);
 			host.editor.setText("");
+			host.recordLastSentPrompt?.(text);
 			await host.session.prompt(text, { streamingBehavior: "steer" });
 			host.updatePendingMessagesDisplay();
 			host.ui.requestRender();
@@ -72,6 +73,7 @@ export function setupEditorSubmitHandler(host: InteractiveModeStateHost & {
 
 		if (host.options?.submitPromptsDirectly) {
 			host.editor.addToHistory?.(text);
+			host.recordLastSentPrompt?.(text);
 			try {
 				await host.session.prompt(text);
 			} catch (error: unknown) {

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

@@ -19,6 +19,7 @@ export interface InteractiveModeStateHost {
 	loadingAnimation?: any;
 	pendingWorkingMessage?: string;
 	defaultWorkingMessage: string;
+	workingMessages: string[];
 	streamingComponent?: any;
 	streamingMessage?: any;
 	retryEscapeHandler?: () => void;
@@ -31,6 +32,8 @@ export interface InteractiveModeStateHost {
 	extensionEditor?: any;
 	editorContainer: any;
 	keybindingsManager?: any;
+	updateEditorExpandHint(): void;
+	recordLastSentPrompt?(text: string): void;
 }
 
 export type InteractiveModeEvent = AgentSessionEvent;