lsd-pi 1.1.4 → 1.1.6

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

@@ -69,12 +69,14 @@ import {
 	type PermissionMode,
 } from "../../core/tool-approval.js";
 import type { TruncationResult } from "../../core/tools/truncate.js";
+import { isPtyAvailable } from "../../core/pty-executor.js";
 import { getChangelogPath, getNewEntries, parseChangelog } from "../../utils/changelog.js";
 import { extensionForImageMimeType, readClipboardImage } from "../../utils/clipboard-image.js";
 import { resetStdinForTui } from "../../utils/reset-stdin.js";
 import { ensureTool } from "../../utils/tools-manager.js";
 import { AssistantMessageComponent } from "./components/assistant-message.js";
 import { BashExecutionComponent } from "./components/bash-execution.js";
+import { EmbeddedTerminalComponent } from "./components/embedded-terminal.js";
 import { BorderedLoader } from "./components/bordered-loader.js";
 import { BranchSummaryMessageComponent } from "./components/branch-summary-message.js";
 import { CompactionSummaryMessageComponent } from "./components/compaction-summary-message.js";
@@ -137,6 +139,8 @@ interface Expandable {
 	setExpanded(expanded: boolean): void;
 }
 
+type InteractiveBashComponent = BashExecutionComponent | EmbeddedTerminalComponent;
+
 function isExpandable(obj: unknown): obj is Expandable {
 	return typeof obj === "object" && obj !== null && "setExpanded" in obj && typeof obj.setExpanded === "function";
 }
@@ -192,7 +196,24 @@ export class InteractiveMode {
 	private onInputCallback?: (text: string) => void;
 	private loadingAnimation: Loader | undefined = undefined;
 	private pendingWorkingMessage: string | undefined = undefined;
-	private readonly defaultWorkingMessage = "Working...";
+	private readonly defaultWorkingMessage = "Cooking…";
+	private readonly workingMessages = [
+		"Cooking…",
+		"Vibing…",
+		"Brainworming…",
+		"Scheming…",
+		"Spelunking…",
+		"Manifesting…",
+		"Yak shaving…",
+		"Grokking…",
+		"Pondering…",
+		"Going deep…",
+		"Caffeinating…",
+		"On a mission…",
+		"Consulting the void…",
+		"Doing the thing…",
+		"Almost maybe…",
+	];
 
 	private lastSigintTime = 0;
 	private lastEscapeTime = 0;
@@ -208,6 +229,7 @@ export class InteractiveMode {
 
 	// Tool execution tracking: toolCallId -> component
 	private pendingTools = new Map<string, ToolExecutionComponent>();
+	private agentPtyComponents = new Map<string, EmbeddedTerminalComponent>();
 
 	// Tool output expansion state
 	private toolOutputExpanded = false;
@@ -215,6 +237,10 @@ export class InteractiveMode {
 	// Thinking block visibility state
 	private hideThinkingBlock = false;
 
+	// Pin last prompt feature
+	private pinLastPromptEnabled = false;
+	private lastSentPromptText: string | undefined = undefined;
+
 	// Skill commands: command name -> skill file path
 	private skillCommands = new Map<string, string>();
 
@@ -225,10 +251,12 @@ export class InteractiveMode {
 	private isBashMode = false;
 
 	// Track current bash execution component
-	private bashComponent: BashExecutionComponent | undefined = undefined;
+	private bashComponent: InteractiveBashComponent | undefined = undefined;
 
 	// Track pending bash components (shown in pending area, moved to chat on submit)
-	private pendingBashComponents: BashExecutionComponent[] = [];
+	private pendingBashComponents: InteractiveBashComponent[] = [];
+	private focusedEmbeddedTerminal?: EmbeddedTerminalComponent;
+	private lastEmbeddedTerminalSize?: { cols: number; rows: number };
 
 	// Auto-compaction state
 	private autoCompactionLoader: Loader | undefined = undefined;
@@ -312,6 +340,9 @@ export class InteractiveMode {
 		// Load hide thinking block setting
 		this.hideThinkingBlock = this.settingsManager.getHideThinkingBlock();
 
+		// Load pin last prompt setting
+		this.pinLastPromptEnabled = this.settingsManager.getPinLastPrompt();
+
 		// Register themes from resource loader and initialize
 		setRegisteredThemes(this.session.resourceLoader.getThemes().themes);
 		initTheme(this.settingsManager.getTheme(), true, this.settingsManager.getThemeAccent());
@@ -618,6 +649,7 @@ export class InteractiveMode {
 		// Main interactive loop
 		while (true) {
 			const userInput = await this.getUserInput();
+			this.recordLastSentPrompt(userInput);
 			try {
 				await this.session.prompt(userInput);
 			} catch (error: unknown) {
@@ -1403,9 +1435,7 @@ export class InteractiveMode {
 		this.defaultEditor.onExtensionShortcut = undefined;
 		this.updateTerminalTitle();
 		if (this.loadingAnimation) {
-			this.loadingAnimation.setMessage(
-				`${this.defaultWorkingMessage} (${appKey(this.keybindings, "interrupt")} to interrupt)`,
-			);
+			this.loadingAnimation.setCycleMessages(this.workingMessages);
 		}
 	}
 
@@ -1415,6 +1445,44 @@ export class InteractiveMode {
 	/**
 	 * Render all extension widgets to the widget container.
 	 */
+	/**
+	 * Record the last user-sent prompt text and refresh the widget.
+	 * Called from the main loop and input-controller paths.
+	 */
+	recordLastSentPrompt(text: string): void {
+		// Ignore slash commands and bash commands — they're not "topic" prompts
+		const trimmed = text.trim();
+		if (trimmed.startsWith("/") || trimmed.startsWith("!")) return;
+		this.lastSentPromptText = trimmed;
+		this.updatePinLastPromptWidget();
+	}
+
+	/**
+	 * Update (or remove) the "pin last prompt" widget above the editor.
+	 * Uses the built-in extension widget slot with key "__pin-last-prompt__".
+	 */
+	private updatePinLastPromptWidget(): void {
+		const key = "__pin-last-prompt__";
+		if (!this.pinLastPromptEnabled || !this.lastSentPromptText) {
+			// Remove widget
+			const existing = this.extensionWidgetsAbove.get(key);
+			if (existing?.dispose) existing.dispose();
+			this.extensionWidgetsAbove.delete(key);
+		} else {
+			// Truncate to one line (max 200 chars) to keep it compact
+			const raw = this.lastSentPromptText.replace(/[\r\n]+/g, " ").trim();
+			const label = raw.length > 200 ? raw.slice(0, 197) + "…" : raw;
+			const container = new Container();
+			container.addChild(new Text(
+				theme.fg("dim", `  last prompt: ${label}`),
+				0,
+				0,
+			));
+			this.extensionWidgetsAbove.set(key, container);
+		}
+		this.renderWidgets();
+	}
+
 	private renderWidgets(): void {
 		if (!this.widgetContainerAbove || !this.widgetContainerBelow) return;
 		this.renderWidgetContainer(this.widgetContainerAbove, this.extensionWidgetsAbove, true, true);
@@ -1619,6 +1687,13 @@ export class InteractiveMode {
 		return result === "Yes";
 	}
 
+	/** Reset the loading animation back to cycling working messages. */
+	private resetLoadingMessage(): void {
+		if (this.loadingAnimation) {
+			this.loadingAnimation.setCycleMessages(this.workingMessages);
+		}
+	}
+
 	private _registerApprovalHandlers(): void {
 		const classifierService = new ClassifierService(this.session.modelRegistry.authStorage);
 
@@ -1629,9 +1704,7 @@ export class InteractiveMode {
 			const title = `Allow ${actionLabel}: ${request.path}\n${request.message}`;
 			const approved = await this._showApprovalConfirm(title);
 
-			if (this.loadingAnimation) {
-				this.loadingAnimation.setMessage(this.defaultWorkingMessage);
-			}
+			this.resetLoadingMessage();
 			return approved;
 		});
 
@@ -1671,9 +1744,7 @@ export class InteractiveMode {
 			});
 
 			if (decision.approved) {
-				if (this.loadingAnimation) {
-					this.loadingAnimation.setMessage(this.defaultWorkingMessage);
-				}
+				this.resetLoadingMessage();
 				return true;
 			}
 
@@ -1681,9 +1752,7 @@ export class InteractiveMode {
 			const title = `Classifier ${decision.source === "rule" ? "blocked" : "did not approve"} ${request.toolName}\n${decision.reason}\n${argsPreview}`;
 			const approved = await this._showApprovalConfirm(title);
 
-			if (this.loadingAnimation) {
-				this.loadingAnimation.setMessage(this.defaultWorkingMessage);
-			}
+			this.resetLoadingMessage();
 			return approved;
 		});
 
@@ -1693,9 +1762,7 @@ export class InteractiveMode {
 				`${request.message}\n${request.command}`,
 				["Allow once", "Allow for session", "Deny"],
 			);
-			if (this.loadingAnimation) {
-				this.loadingAnimation.setMessage(this.defaultWorkingMessage);
-			}
+			this.resetLoadingMessage();
 			if (result === "Allow once") return "allow-once";
 			if (result === "Allow for session") return "allow-session";
 			return "deny";
@@ -2027,6 +2094,7 @@ export class InteractiveMode {
 		this.defaultEditor.onAction("cycleModelBackward", () => this.cycleModel("backward"));
 		this.defaultEditor.onAction("cyclePermissionMode", () => this.cyclePermissionMode());
 		this.defaultEditor.onAction("showHotkeys", () => showHotkeys(this.getSlashCommandContext()));
+		this.defaultEditor.onAction("terminalFocus", () => this.toggleEmbeddedTerminalFocus());
 
 		// Global debug handler on TUI (works regardless of focus)
 		this.ui.onDebug = () => this.handleDebugCommand();
@@ -2382,6 +2450,7 @@ export class InteractiveMode {
 					this.hideThinkingBlock,
 					this.getMarkdownThemeWithSettings(),
 					this.settingsManager.getTimestampFormat(),
+					this.session.thinkingLevel || "off",
 				);
 				this.chatContainer.addChild(assistantComponent);
 				break;
@@ -2727,9 +2796,42 @@ export class InteractiveMode {
 		for (const component of this.pendingBashComponents) {
 			component.setExpanded(expanded);
 		}
+		this.updateEditorExpandHint();
 		this.ui.requestRender();
 	}
 
+	/** Append/remove the "ctrl+o to expand" hint in the editor bottom border. */
+	updateEditorExpandHint(): void {
+		const expandKey = appKey(this.keybindings, "expandTools");
+		const collapseHint = `${theme.fg("dim", expandKey)}${theme.fg("muted", " collapse")}`;
+		const expandHint = `${theme.fg("dim", expandKey)}${theme.fg("muted", " : verbose")}`;
+		// The base hint set during agent_start
+		const enterKey = theme.fg("dim", "↵");
+		const followUpKey = theme.fg("dim", appKey(this.keybindings, "followUp"));
+		const steerLabel = theme.fg("muted", " steer");
+		const queueLabel = theme.fg("muted", " queue");
+		const baseHint = `${enterKey}${steerLabel}  ${followUpKey}${queueLabel}`;
+
+		// Check if there are any expandable tool outputs in the chat
+		const hasToolOutputs =
+			this.chatContainer.children.some(isExpandable) ||
+			!!this.bashComponent ||
+			this.pendingBashComponents.length > 0;
+
+		const activeHint = this.toolOutputExpanded ? collapseHint : expandHint;
+
+		if (this.loadingAnimation) {
+			// Agent is running — always show expand/collapse hint when there are tool outputs
+			this.defaultEditor.bottomHint = hasToolOutputs
+				? `${baseHint}  ${activeHint}`
+				: baseHint;
+		} else if (hasToolOutputs) {
+			// Idle — show expand/collapse hint so user knows ctrl+o works
+			this.defaultEditor.bottomHint = activeHint;
+		}
+		// If no tool outputs and idle, leave bottomHint as-is (cleared by agent_end)
+	}
+
 	private toggleThinkingBlockVisibility(): void {
 		this.hideThinkingBlock = !this.hideThinkingBlock;
 		this.settingsManager.setHideThinkingBlock(this.hideThinkingBlock);
@@ -3063,6 +3165,7 @@ export class InteractiveMode {
 					enableSkillCommands: this.settingsManager.getEnableSkillCommands(),
 					codexRotate: this.settingsManager.getCodexRotate(),
 					cacheTimer: this.settingsManager.getCacheTimer(),
+					pinLastPrompt: this.settingsManager.getPinLastPrompt(),
 					steeringMode: this.session.steeringMode,
 					followUpMode: this.session.followUpMode,
 					transport: this.settingsManager.getTransport(),
@@ -3086,6 +3189,8 @@ export class InteractiveMode {
 					toolOutputMode: this.settingsManager.getToolOutputMode(),
 					rtk: this.settingsManager.getRtk(),
 					editorScheme: this.settingsManager.getEditorScheme(),
+					autoDream: this.settingsManager.getAutoDream(),
+					autoMemory: this.settingsManager.getAutoMemory(),
 					sandboxEnabled: this.settingsManager.getSandboxSettings().enabled ?? true,
 					sandboxNetworkMode: this.settingsManager.getSandboxSettings().networkMode
 						?? (this.settingsManager.getSandboxSettings().networkEnabled === true ? "allow" : this.settingsManager.getSandboxSettings().networkEnabled === false ? "deny" : "ask"),
@@ -3171,10 +3276,24 @@ export class InteractiveMode {
 						this.settingsManager.setCacheTimer(enabled);
 						this.showStatus(`Cache timer: ${enabled ? "enabled" : "disabled"}`);
 					},
+					onPinLastPromptChange: (enabled) => {
+						this.settingsManager.setPinLastPrompt(enabled);
+						this.pinLastPromptEnabled = enabled;
+						this.updatePinLastPromptWidget();
+						this.showStatus(`Pin last prompt: ${enabled ? "enabled" : "disabled"}`);
+					},
 					onRtkChange: (enabled) => {
 						this.settingsManager.setRtk(enabled);
 						this.showStatus(`RTK: ${enabled ? "enabled" : "disabled"} (restart required)`);
 					},
+					onAutoDreamChange: (enabled) => {
+						this.settingsManager.setAutoDream(enabled);
+						this.showStatus(`Auto dream: ${enabled ? "enabled" : "disabled"}`);
+					},
+					onAutoMemoryChange: (enabled) => {
+						this.settingsManager.setAutoMemory(enabled);
+						this.showStatus(`Auto memory: ${enabled ? "enabled" : "disabled"}`);
+					},
 					onSteeringModeChange: (mode) => {
 						this.session.setSteeringMode(mode);
 					},
@@ -3579,7 +3698,7 @@ export class InteractiveMode {
 						this.chatContainer.addChild(new Spacer(1));
 						summaryLoader = new Loader(
 							this.ui,
-							(spinner) => theme.fg("accent", spinner),
+							(spinner) => theme.fg("text", spinner),
 							(text) => theme.fg("muted", text),
 							`Summarizing branch... (${appKey(this.keybindings, "interrupt")} to cancel)`,
 						);
@@ -4042,6 +4161,78 @@ export class InteractiveMode {
 		}
 	}
 
+	private getAgentPtyComponent(sessionId: string): EmbeddedTerminalComponent | undefined {
+		return this.agentPtyComponents.get(sessionId);
+	}
+
+	private ensureAgentPtyComponent(sessionId: string, command?: string): EmbeddedTerminalComponent {
+		let component = this.agentPtyComponents.get(sessionId);
+		if (component) return component;
+
+		component = new EmbeddedTerminalComponent(
+			command || `PTY ${sessionId}`,
+			this.ui,
+			this.settingsManager.getToolOutputMode(),
+			appKey(this.keybindings, "terminalFocus"),
+			false,
+		);
+		component.setStatusOverride(theme.fg("muted", "Agent-controlled terminal session"));
+		component.setExpanded(true);
+		this.chatContainer.addChild(component);
+		this.agentPtyComponents.set(sessionId, component);
+		return component;
+	}
+
+	private updateAgentPtyComponent(
+		sessionId: string,
+		options?: { command?: string; screenText?: string; completed?: boolean; cancelled?: boolean; exitCode?: number },
+	): void {
+		const component = this.ensureAgentPtyComponent(sessionId, options?.command);
+		if (options?.screenText !== undefined) {
+			component.setScreenText(options.screenText);
+		}
+		if (options?.completed) {
+			component.setStatusOverride(undefined);
+			component.setComplete(options.exitCode, options.cancelled ?? false);
+		} else {
+			component.setStatusOverride(theme.fg("muted", "Agent-controlled terminal session"));
+		}
+	}
+
+	private clearAgentPtyComponents(): void {
+		for (const [, component] of this.agentPtyComponents) {
+			this.chatContainer.removeChild(component);
+		}
+		this.agentPtyComponents.clear();
+	}
+
+	private focusEmbeddedTerminal(component: EmbeddedTerminalComponent): void {
+		this.focusedEmbeddedTerminal = component;
+		this.lastEmbeddedTerminalSize = undefined;
+		this.ui.setFocus(component);
+		component.invalidate();
+		this.ui.requestRender();
+	}
+
+	private releaseEmbeddedTerminalFocus(): void {
+		const focused = this.focusedEmbeddedTerminal;
+		this.focusedEmbeddedTerminal = undefined;
+		this.lastEmbeddedTerminalSize = undefined;
+		this.ui.setFocus(this.editor);
+		focused?.invalidate();
+		this.ui.requestRender();
+	}
+
+	private toggleEmbeddedTerminalFocus(): void {
+		if (this.focusedEmbeddedTerminal) {
+			this.releaseEmbeddedTerminalFocus();
+			return;
+		}
+		if (this.bashComponent instanceof EmbeddedTerminalComponent) {
+			this.focusEmbeddedTerminal(this.bashComponent);
+		}
+	}
+
 	private async handleBashCommand(command: string, excludeFromContext = false, displayCommand?: string, loginShell?: boolean): Promise<void> {
 		const extensionRunner = this.session.extensionRunner;
 		const label = displayCommand || command;
@@ -4061,7 +4252,7 @@ export class InteractiveMode {
 			const result = eventResult.result;
 
 			// Create UI component for display
-			this.bashComponent = new BashExecutionComponent(
+			const component = new BashExecutionComponent(
 				label,
 				this.ui,
 				excludeFromContext,
@@ -4069,19 +4260,20 @@ export class InteractiveMode {
 				isRtkEnabled(),
 				result.sandboxed ?? false,
 			);
-			this.bashComponent.setExpanded(this.toolOutputExpanded);
+			this.bashComponent = component;
+			component.setExpanded(this.toolOutputExpanded);
 			if (this.session.isStreaming) {
-				this.pendingMessagesContainer.addChild(this.bashComponent);
-				this.pendingBashComponents.push(this.bashComponent);
+				this.pendingMessagesContainer.addChild(component);
+				this.pendingBashComponents.push(component);
 			} else {
-				this.chatContainer.addChild(this.bashComponent);
+				this.chatContainer.addChild(component);
 			}
 
 			// Show output and complete
 			if (result.output) {
-				this.bashComponent.appendOutput(result.output);
+				component.appendOutput(result.output);
 			}
-			this.bashComponent.setComplete(
+			component.setComplete(
 				result.exitCode,
 				result.cancelled,
 				result.truncated ? ({ truncated: true, content: result.output } as TruncationResult) : undefined,
@@ -4098,7 +4290,60 @@ export class InteractiveMode {
 
 		// Normal execution path (possibly with custom operations)
 		const isDeferred = this.session.isStreaming;
-		this.bashComponent = new BashExecutionComponent(
+		const canUsePty = !eventResult?.operations && await isPtyAvailable();
+
+		if (canUsePty) {
+			const component = new EmbeddedTerminalComponent(
+				label,
+				this.ui,
+				this.settingsManager.getToolOutputMode(),
+				appKey(this.keybindings, "terminalFocus"),
+				excludeFromContext,
+			);
+			this.bashComponent = component;
+			component.setExpanded(this.toolOutputExpanded);
+
+			if (isDeferred) {
+				this.pendingMessagesContainer.addChild(component);
+				this.pendingBashComponents.push(component);
+			} else {
+				this.chatContainer.addChild(component);
+			}
+			this.ui.requestRender();
+
+			try {
+				const session = await this.session.executeBashInteractive(command, {
+					onChunk: (chunk) => {
+						component.appendOutput(chunk);
+						this.ui.requestRender();
+					},
+					cols: Math.max(40, this.ui.terminal.columns - 2),
+					rows: Math.max(10, this.ui.terminal.rows - 8),
+					loginShell,
+				});
+				component.setHandle(session.handle, () => this.releaseEmbeddedTerminalFocus());
+				if (!isDeferred) {
+					this.focusEmbeddedTerminal(component);
+				}
+
+				const result = await session.result;
+				component.setComplete(result.exitCode, result.cancelled);
+				this.session.recordBashResult(command, result, { excludeFromContext });
+			} catch (error) {
+				component.setComplete(undefined, false);
+				this.showError(`Bash command failed: ${error instanceof Error ? error.message : "Unknown error"}`);
+			} finally {
+				if (this.focusedEmbeddedTerminal === component) {
+					this.releaseEmbeddedTerminalFocus();
+				}
+				this.session.clearBashAbortController();
+				this.bashComponent = undefined;
+				this.ui.requestRender();
+			}
+			return;
+		}
+
+		const fallbackComponent = new BashExecutionComponent(
 			label,
 			this.ui,
 			excludeFromContext,
@@ -4106,15 +4351,16 @@ export class InteractiveMode {
 			isRtkEnabled(),
 			false,
 		);
-		this.bashComponent.setExpanded(this.toolOutputExpanded);
+		this.bashComponent = fallbackComponent;
+		fallbackComponent.setExpanded(this.toolOutputExpanded);
 
 		if (isDeferred) {
 			// Show in pending area when agent is streaming
-			this.pendingMessagesContainer.addChild(this.bashComponent);
-			this.pendingBashComponents.push(this.bashComponent);
+			this.pendingMessagesContainer.addChild(fallbackComponent);
+			this.pendingBashComponents.push(fallbackComponent);
 		} else {
 			// Show in chat immediately when agent is idle
-			this.chatContainer.addChild(this.bashComponent);
+			this.chatContainer.addChild(fallbackComponent);
 		}
 		this.ui.requestRender();
 
@@ -4122,27 +4368,21 @@ export class InteractiveMode {
 			const result = await this.session.executeBash(
 				command,
 				(chunk) => {
-					if (this.bashComponent) {
-						this.bashComponent.appendOutput(chunk);
-						this.ui.requestRender();
-					}
+					fallbackComponent.appendOutput(chunk);
+					this.ui.requestRender();
 				},
 				{ excludeFromContext, operations: eventResult?.operations, loginShell },
 			);
 
-			if (this.bashComponent) {
-				this.bashComponent.setComplete(
-					result.exitCode,
-					result.cancelled,
-					result.truncated ? ({ truncated: true, content: result.output } as TruncationResult) : undefined,
-					result.fullOutputPath,
-					result.sandboxed,
-				);
-			}
+			fallbackComponent.setComplete(
+				result.exitCode,
+				result.cancelled,
+				result.truncated ? ({ truncated: true, content: result.output } as TruncationResult) : undefined,
+				result.fullOutputPath,
+				result.sandboxed,
+			);
 		} catch (error) {
-			if (this.bashComponent) {
-				this.bashComponent.setComplete(undefined, false);
-			}
+			fallbackComponent.setComplete(undefined, false);
 			this.showError(`Bash command failed: ${error instanceof Error ? error.message : "Unknown error"}`);
 		}
 
@@ -4170,7 +4410,7 @@ export class InteractiveMode {
 		const label = isAuto ? `Auto-compacting context... ${cancelHint}` : `Compacting context... ${cancelHint}`;
 		const compactingLoader = new Loader(
 			this.ui,
-			(spinner) => theme.fg("accent", spinner),
+			(spinner) => theme.fg("text", spinner),
 			(text) => theme.fg("muted", text),
 			label,
 		);
@@ -4208,6 +4448,14 @@ export class InteractiveMode {
 
 	requestRender(force = false): void {
 		if (!this.isInitialized) return;
+		if (this.focusedEmbeddedTerminal) {
+			const cols = Math.max(40, this.ui.terminal.columns - 2);
+			const rows = Math.max(10, this.ui.terminal.rows - 8);
+			if (!this.lastEmbeddedTerminalSize || this.lastEmbeddedTerminalSize.cols !== cols || this.lastEmbeddedTerminalSize.rows !== rows) {
+				this.focusedEmbeddedTerminal.resize(cols, rows);
+				this.lastEmbeddedTerminalSize = { cols, rows };
+			}
+		}
 		this.ui.requestRender(force);
 	}
 

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

@@ -99,7 +99,7 @@ const dark: ThemeJson = {
 		thinkingHigh: "blueXhigh",
 		thinkingXhigh: "cyan",
 
-		bashMode: "green",
+		bashMode: "accent",
 	},
 	export: {
 		pageBg: "#18181e",
@@ -195,7 +195,7 @@ const light: ThemeJson = {
 		thinkingHigh: "blueHigh",
 		thinkingXhigh: "blueXhigh",
 
-		bashMode: "green",
+		bashMode: "accent",
 	},
 	export: {
 		pageBg: "#f8f8f8",

package/packages/pi-coding-agent/src/utils/terminal-screen.ts

@@ -0,0 +1,77 @@
+import xtermPkg from "@xterm/headless";
+
+const { Terminal } = xtermPkg;
+
+export type HeadlessTerminal = InstanceType<typeof Terminal>;
+
+export function createHeadlessTerminal(cols = 80, rows = 24, scrollback = 5000): HeadlessTerminal {
+	return new Terminal({
+		cols: Math.max(20, cols),
+		rows: Math.max(5, rows),
+		scrollback,
+		allowProposedApi: true,
+	});
+}
+
+function findLastContentLine(terminal: HeadlessTerminal, startLine = 0): number {
+	const buffer = terminal.buffer.active;
+	for (let i = buffer.length - 1; i >= startLine; i--) {
+		const line = buffer.getLine(i);
+		if (line && line.translateToString(true).length > 0) {
+			return i;
+		}
+	}
+	return -1;
+}
+
+function collectTerminalLines(terminal: HeadlessTerminal, startLine: number, endLineInclusive: number): string[] {
+	const buffer = terminal.buffer.active;
+	if (endLineInclusive < startLine) return [];
+
+	const lines: string[] = [];
+	for (let i = startLine; i <= endLineInclusive; i++) {
+		const line = buffer.getLine(i);
+		if (!line) {
+			lines.push("");
+			continue;
+		}
+
+		let trimRight = true;
+		if (i + 1 <= endLineInclusive) {
+			const nextLine = buffer.getLine(i + 1);
+			if (nextLine?.isWrapped) {
+				trimRight = false;
+			}
+		}
+
+		const lineContent = line.translateToString(trimRight);
+		if (line.isWrapped && lines.length > 0) {
+			lines[lines.length - 1] += lineContent;
+		} else {
+			lines.push(lineContent);
+		}
+	}
+
+	return lines;
+}
+
+export function snapshotTerminalLines(terminal: HeadlessTerminal, startLine = 0): string[] {
+	const lastContentLine = findLastContentLine(terminal, startLine);
+	if (lastContentLine < startLine) return [];
+	return collectTerminalLines(terminal, startLine, lastContentLine);
+}
+
+export function snapshotTerminalViewport(terminal: HeadlessTerminal): string[] {
+	const buffer = terminal.buffer.active;
+	const start = buffer.viewportY;
+	const end = Math.max(start, start + terminal.rows - 1);
+	return collectTerminalLines(terminal, start, end);
+}
+
+export function snapshotTerminalViewportText(terminal: HeadlessTerminal): string {
+	return snapshotTerminalViewport(terminal).join("\n").replace(/[ \t]+$/gmu, "");
+}
+
+export function snapshotTerminalBufferText(terminal: HeadlessTerminal): string {
+	return snapshotTerminalLines(terminal).join("\n");
+}