lsd-pi 1.0.0 → 1.1.1

package/packages/pi-coding-agent/src/modes/interactive/components/settings-selector.ts

@@ -25,7 +25,9 @@ export const THINKING_DESCRIPTIONS: Record<ThinkingLevel, string> = {
 
 export interface SettingsConfig {
 	autoCompact: boolean;
+	autoCompactThresholdPercent: number;
 	classifierModel: string;
+	budgetSubagentModel: string;
 	showImages: boolean;
 	autoResizeImages: boolean;
 	blockImages: boolean;
@@ -48,12 +50,16 @@ export interface SettingsConfig {
 	quietStartup: boolean;
 	clearOnShrink: boolean;
 	timestampFormat: "date-time-iso" | "date-time-us";
+	toolOutputMode: "minimal" | "normal";
 	classifierModelSubmenu?: (currentValue: string, done: (selectedValue?: string) => void) => Component;
+	budgetSubagentModelSubmenu?: (currentValue: string, done: (selectedValue?: string) => void) => Component;
 }
 
 export interface SettingsCallbacks {
 	onAutoCompactChange: (enabled: boolean) => void;
+	onAutoCompactThresholdPercentChange: (percent: number) => void;
 	onClassifierModelChange: (modelRef: string) => void;
+	onBudgetSubagentModelChange: (modelRef: string) => void;
 	onShowImagesChange: (enabled: boolean) => void;
 	onAutoResizeImagesChange: (enabled: boolean) => void;
 	onBlockImagesChange: (blocked: boolean) => void;
@@ -75,6 +81,7 @@ export interface SettingsCallbacks {
 	onQuietStartupChange: (enabled: boolean) => void;
 	onClearOnShrinkChange: (enabled: boolean) => void;
 	onTimestampFormatChange: (format: "date-time-iso" | "date-time-us") => void;
+	onToolOutputModeChange: (mode: "minimal" | "normal") => void;
 	onCancel: () => void;
 }
 
@@ -159,6 +166,13 @@ export class SettingsSelectorComponent extends Container {
 				currentValue: config.autoCompact ? "true" : "false",
 				values: ["true", "false"],
 			},
+			{
+				id: "autocompact-threshold",
+				label: "Auto-compact threshold",
+				description: "Trigger auto-compaction when context usage reaches this percentage",
+				currentValue: String(config.autoCompactThresholdPercent),
+				values: ["70", "75", "80", "85", "90", "95"],
+			},
 			{
 				id: "classifier-model",
 				label: "Classifier model",
@@ -166,6 +180,13 @@ export class SettingsSelectorComponent extends Container {
 				currentValue: config.classifierModel,
 				submenu: config.classifierModelSubmenu,
 			},
+			{
+				id: "budget-subagent-model",
+				label: "Budget subagent model",
+				description: "Cheap model alias for subagents like scout",
+				currentValue: config.budgetSubagentModel,
+				submenu: config.budgetSubagentModelSubmenu,
+			},
 			{
 				id: "steering-mode",
 				label: "Steering mode",
@@ -196,6 +217,13 @@ export class SettingsSelectorComponent extends Container {
 				currentValue: config.hideThinkingBlock ? "true" : "false",
 				values: ["true", "false"],
 			},
+			{
+				id: "tool-output-mode",
+				label: "Tool output mode",
+				description: "Minimal hides collapsed previews until Ctrl+O. Normal shows collapsed previews.",
+				currentValue: config.toolOutputMode,
+				values: ["minimal", "normal"],
+			},
 			{
 				id: "collapse-changelog",
 				label: "Collapse changelog",
@@ -279,8 +307,8 @@ export class SettingsSelectorComponent extends Container {
 
 		// Only show image toggle if terminal supports it
 		if (supportsImages) {
-			// Insert after autocompact
-			items.splice(1, 0, {
+			// Insert after autocompact threshold
+			items.splice(2, 0, {
 				id: "show-images",
 				label: "Show images",
 				description: "Render images inline in terminal",
@@ -290,7 +318,7 @@ export class SettingsSelectorComponent extends Container {
 		}
 
 		// Image auto-resize toggle (always available, affects both attached and read images)
-		items.splice(supportsImages ? 2 : 1, 0, {
+		items.splice(supportsImages ? 3 : 2, 0, {
 			id: "auto-resize-images",
 			label: "Auto-resize images",
 			description: "Resize large images to 2000x2000 max for better model compatibility",
@@ -390,9 +418,15 @@ export class SettingsSelectorComponent extends Container {
 					case "autocompact":
 						callbacks.onAutoCompactChange(newValue === "true");
 						break;
+					case "autocompact-threshold":
+						callbacks.onAutoCompactThresholdPercentChange(parseInt(newValue, 10));
+						break;
 					case "classifier-model":
 						callbacks.onClassifierModelChange(newValue);
 						break;
+					case "budget-subagent-model":
+						callbacks.onBudgetSubagentModelChange(newValue);
+						break;
 					case "show-images":
 						callbacks.onShowImagesChange(newValue === "true");
 						break;
@@ -417,6 +451,9 @@ export class SettingsSelectorComponent extends Container {
 					case "hide-thinking":
 						callbacks.onHideThinkingBlockChange(newValue === "true");
 						break;
+					case "tool-output-mode":
+						callbacks.onToolOutputModeChange(newValue as "minimal" | "normal");
+						break;
 					case "collapse-changelog":
 						callbacks.onCollapseChangelogChange(newValue === "true");
 						break;

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

@@ -52,6 +52,7 @@ function str(value: unknown): string | null {
 
 export interface ToolExecutionOptions {
 	showImages?: boolean; // default: true (only used if terminal supports images)
+	renderMode?: "minimal" | "normal";
 }
 
 type WriteHighlightCache = {
@@ -73,6 +74,7 @@ export class ToolExecutionComponent extends Container {
 	private toolName: string;
 	private args: any;
 	private expanded = false;
+	private renderMode: "minimal" | "normal";
 	private showImages: boolean;
 	private isPartial = true;
 	private toolDefinition?: ToolDefinition;
@@ -105,6 +107,7 @@ export class ToolExecutionComponent extends Container {
 		this.toolName = toolName;
 		this.args = args;
 		this.showImages = options.showImages ?? true;
+		this.renderMode = options.renderMode ?? "normal";
 		this.toolDefinition = toolDefinition;
 		this.ui = ui;
 		this.cwd = cwd;
@@ -343,6 +346,13 @@ export class ToolExecutionComponent extends Container {
 		this.updateDisplay();
 	}
 
+	setRenderMode(mode: "minimal" | "normal"): void {
+		if (this.renderMode !== mode) {
+			this.renderMode = mode;
+			this.updateDisplay();
+		}
+	}
+
 	setShowImages(show: boolean): void {
 		this.showImages = show;
 		this.updateDisplay();
@@ -411,14 +421,23 @@ export class ToolExecutionComponent extends Container {
 			// Render result component if we have a result
 			if (this.result && this.toolDefinition.renderResult) {
 				try {
-					const resultComponent = this.toolDefinition.renderResult(
-						{ content: this.result.content as any, details: this.result.details },
-						{ expanded: this.expanded, isPartial: this.isPartial },
-						theme,
-					);
-					if (resultComponent !== undefined) {
-						this.contentBox.addChild(resultComponent);
-						customRendererHasContent = true;
+					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));
+							customRendererHasContent = true;
+						}
+					} else {
+						const resultComponent = this.toolDefinition.renderResult(
+							{ content: this.result.content as any, details: this.result.details },
+							{ expanded: this.expanded, isPartial: this.isPartial },
+							theme,
+						);
+						if (resultComponent !== undefined) {
+							this.contentBox.addChild(resultComponent);
+							customRendererHasContent = true;
+						}
 					}
 				} catch {
 					// Fall back to showing raw output on error
@@ -432,7 +451,11 @@ export class ToolExecutionComponent extends Container {
 				// Has result but no custom renderResult
 				const output = this.getTextOutput();
 				if (output) {
-					this.contentBox.addChild(new Text(theme.fg("toolOutput", output), 0, 0));
+					if (this.shouldHideCollapsedPreview()) {
+						this.contentBox.addChild(new Text(`\n${this.collapsedExpandHint()}`, 0, 0));
+					} else {
+						this.contentBox.addChild(new Text(theme.fg("toolOutput", output), 0, 0));
+					}
 					customRendererHasContent = true;
 				}
 			}
@@ -521,6 +544,8 @@ export class ToolExecutionComponent extends Container {
 				if (this.expanded) {
 					// Show all lines when expanded
 					this.contentBox.addChild(new Text(`\n${styledOutput}`, 0, 0));
+				} else if (this.renderMode === "minimal") {
+					this.contentBox.addChild(new Text(`\n${this.collapsedExpandHint()}`, 0, 0));
 				} else {
 					// Use visual line truncation when collapsed with width-aware caching
 					let cachedWidth: number | undefined;
@@ -601,9 +626,23 @@ export class ToolExecutionComponent extends Container {
 		return output;
 	}
 
+	private shouldHideCollapsedPreview(): boolean {
+		return !this.expanded && this.renderMode === "minimal" && !this.result?.isError;
+	}
+
+	private collapsedExpandHint(label = keyHint("expandTools", "to expand")): string {
+		return theme.fg("muted", `(${label})`);
+	}
+
+	private collapsedFirstLine(output: string): string | undefined {
+		const first = output.split("\n").map((line) => line.trim()).find(Boolean);
+		return first ? truncateToWidth(first, 120, "...") : undefined;
+	}
+
 	private formatToolExecution(): string {
 		let text = "";
 		const invalidArg = theme.fg("error", "[invalid arg]");
+		const hideCollapsedPreview = this.shouldHideCollapsedPreview();
 
 		if (this.toolName === "read") {
 			const rawPath = str(this.args?.file_path ?? this.args?.path);
@@ -628,17 +667,23 @@ export class ToolExecutionComponent extends Container {
 				const lang = rawPath ? getLanguageFromPath(rawPath) : undefined;
 				const lines = lang ? highlightCode(replaceTabs(output), lang) : 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((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")})`;
+				if (hideCollapsedPreview) {
+					if (output.trim()) {
+						text += `\n\n${this.collapsedExpandHint()}`;
+					}
+				} else {
+					const maxLines = this.expanded ? lines.length : 10;
+					const displayLines = lines.slice(0, maxLines);
+					const remaining = lines.length - maxLines;
+
+					text +=
+						"\n\n" +
+						displayLines
+							.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")})`;
+					}
 				}
 
 				const truncation = this.result.details?.truncation;
@@ -704,18 +749,22 @@ export class ToolExecutionComponent extends Container {
 					this.writeHighlightCache = undefined;
 				}
 
-				const totalLines = lines.length;
-				const maxLines = this.expanded ? lines.length : 10;
-				const displayLines = lines.slice(0, maxLines);
-				const remaining = lines.length - maxLines;
+				if (hideCollapsedPreview) {
+					text += `\n\n${this.collapsedExpandHint()}`;
+				} else {
+					const totalLines = lines.length;
+					const maxLines = this.expanded ? lines.length : 10;
+					const displayLines = lines.slice(0, maxLines);
+					const remaining = lines.length - maxLines;
 
-				text +=
-					"\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")})`;
+						"\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")})`;
+					}
 				}
 			}
 
@@ -753,13 +802,17 @@ export class ToolExecutionComponent extends Container {
 				// Tool executed successfully - use the diff from result
 				// This takes priority over editDiffPreview which may have a stale error
 				// due to race condition (async preview computed after file was modified)
-				text += `\n\n${renderDiff(this.result.details.diff, { filePath: rawPath ?? undefined })}`;
+				text += hideCollapsedPreview
+					? `\n\n${this.collapsedExpandHint()}`
+					: `\n\n${renderDiff(this.result.details.diff, { filePath: rawPath ?? undefined })}`;
 			} else if (this.editDiffPreview) {
 				// Use cached diff preview (before tool executes)
 				if ("error" in this.editDiffPreview) {
 					text += `\n\n${theme.fg("error", this.editDiffPreview.error)}`;
 				} else if (this.editDiffPreview.diff) {
-					text += `\n\n${renderDiff(this.editDiffPreview.diff, { filePath: rawPath ?? undefined })}`;
+					text += hideCollapsedPreview
+						? `\n\n${this.collapsedExpandHint()}`
+						: `\n\n${renderDiff(this.editDiffPreview.diff, { filePath: rawPath ?? undefined })}`;
 				}
 			}
 		} else if (this.toolName === "ls") {
@@ -775,14 +828,18 @@ export class ToolExecutionComponent extends Container {
 			if (this.result) {
 				const output = this.getTextOutput().trim();
 				if (output) {
-					const lines = output.split("\n");
-					const maxLines = this.expanded ? lines.length : 20;
-					const displayLines = lines.slice(0, maxLines);
-					const remaining = lines.length - maxLines;
-
-					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")})`;
+					if (hideCollapsedPreview) {
+						text += `\n\n${this.collapsedExpandHint()}`;
+					} else {
+						const lines = output.split("\n");
+						const maxLines = this.expanded ? lines.length : 20;
+						const displayLines = lines.slice(0, maxLines);
+						const remaining = lines.length - maxLines;
+
+						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")})`;
+						}
 					}
 				}
 
@@ -817,14 +874,18 @@ export class ToolExecutionComponent extends Container {
 			if (this.result) {
 				const output = this.getTextOutput().trim();
 				if (output) {
-					const lines = output.split("\n");
-					const maxLines = this.expanded ? lines.length : 20;
-					const displayLines = lines.slice(0, maxLines);
-					const remaining = lines.length - maxLines;
-
-					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")})`;
+					if (hideCollapsedPreview) {
+						text += `\n\n${this.collapsedExpandHint()}`;
+					} else {
+						const lines = output.split("\n");
+						const maxLines = this.expanded ? lines.length : 20;
+						const displayLines = lines.slice(0, maxLines);
+						const remaining = lines.length - maxLines;
+
+						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")})`;
+						}
 					}
 				}
 
@@ -863,14 +924,18 @@ export class ToolExecutionComponent extends Container {
 			if (this.result) {
 				const output = this.getTextOutput().trim();
 				if (output) {
-					const lines = output.split("\n");
-					const maxLines = this.expanded ? lines.length : 15;
-					const displayLines = lines.slice(0, maxLines);
-					const remaining = lines.length - maxLines;
-
-					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")})`;
+					if (hideCollapsedPreview) {
+						text += `\n\n${this.collapsedExpandHint()}`;
+					} else {
+						const lines = output.split("\n");
+						const maxLines = this.expanded ? lines.length : 15;
+						const displayLines = lines.slice(0, maxLines);
+						const remaining = lines.length - maxLines;
+
+						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")})`;
+						}
 					}
 				}
 
@@ -900,14 +965,18 @@ export class ToolExecutionComponent extends Container {
 			} else if (this.result) {
 				const output = this.getTextOutput().trim();
 				if (output) {
-					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((line: string) => theme.fg("toolOutput", line)).join("\n")}`;
-					if (remaining > 0) {
-						text += `${theme.fg("muted", `\n... (${remaining} more lines,`)} ${keyHint("expandTools", "to expand")})`;
+					if (hideCollapsedPreview) {
+						text += `\n\n${this.collapsedExpandHint()}`;
+					} 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((line: string) => theme.fg("toolOutput", line)).join("\n")}`;
+						if (remaining > 0) {
+							text += `${theme.fg("muted", `\n... (${remaining} more lines,`)} ${keyHint("expandTools", "to expand")})`;
+						}
 					}
 				}
 			}
@@ -916,9 +985,9 @@ export class ToolExecutionComponent extends Container {
 			text = theme.fg("toolTitle", theme.bold(this.toolName));
 
 			const content = JSON.stringify(this.args, null, 2);
-			text += `\n\n${content}`;
+			text += hideCollapsedPreview ? `\n\n${this.collapsedExpandHint()}` : `\n\n${content}`;
 			const output = this.getTextOutput();
-			if (output) {
+			if (output && !hideCollapsedPreview) {
 				text += `\n${output}`;
 			}
 		}

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

@@ -119,7 +119,10 @@ export async function handleAgentEvent(host: InteractiveModeStateHost & {
 							const component = new ToolExecutionComponent(
 								content.name,
 								content.arguments,
-								{ showImages: host.settingsManager.getShowImages() },
+								{
+									showImages: host.settingsManager.getShowImages(),
+									renderMode: host.settingsManager.getToolOutputMode(),
+								},
 								host.getRegisteredToolDefinition(content.name),
 								host.ui,
 							);
@@ -134,7 +137,10 @@ export async function handleAgentEvent(host: InteractiveModeStateHost & {
 							const component = new ToolExecutionComponent(
 								content.name,
 								content.input ?? {},
-								{ showImages: host.settingsManager.getShowImages() },
+								{
+									showImages: host.settingsManager.getShowImages(),
+									renderMode: host.settingsManager.getToolOutputMode(),
+								},
 								undefined,
 								host.ui,
 							);
@@ -203,7 +209,10 @@ export async function handleAgentEvent(host: InteractiveModeStateHost & {
 				const component = new ToolExecutionComponent(
 					event.toolName,
 					event.args,
-					{ showImages: host.settingsManager.getShowImages() },
+					{
+						showImages: host.settingsManager.getShowImages(),
+						renderMode: host.settingsManager.getToolOutputMode(),
+					},
 					host.getRegisteredToolDefinition(event.toolName),
 					host.ui,
 				);

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

@@ -2135,7 +2135,7 @@ export class InteractiveMode {
 	}
 
 	private cyclePermissionMode(): void {
-		const modes: PermissionMode[] = ["danger-full-access", "accept-on-edit", "auto"];
+		const modes: PermissionMode[] = ["danger-full-access", "accept-on-edit", "auto", "plan"];
 		const current = getPermissionMode();
 		const idx = modes.indexOf(current);
 		const next = modes[(idx + 1) % modes.length];
@@ -2178,7 +2178,12 @@ export class InteractiveMode {
 	private addMessageToChat(message: AgentMessage, options?: { populateHistory?: boolean }): void {
 		switch (message.role) {
 			case "bashExecution": {
-				const component = new BashExecutionComponent(message.command, this.ui, message.excludeFromContext);
+				const component = new BashExecutionComponent(
+					message.command,
+					this.ui,
+					message.excludeFromContext,
+					this.settingsManager.getToolOutputMode(),
+				);
 				if (message.output) {
 					component.appendOutput(message.output);
 				}
@@ -2188,6 +2193,7 @@ export class InteractiveMode {
 					message.truncated ? ({ truncated: true } as TruncationResult) : undefined,
 					message.fullOutputPath,
 				);
+				component.setExpanded(this.toolOutputExpanded);
 				this.chatContainer.addChild(component);
 				break;
 			}
@@ -2294,7 +2300,10 @@ export class InteractiveMode {
 						const component = new ToolExecutionComponent(
 							content.name,
 							content.arguments,
-							{ showImages: this.settingsManager.getShowImages() },
+							{
+								showImages: this.settingsManager.getShowImages(),
+								renderMode: this.settingsManager.getToolOutputMode(),
+							},
 							this.getRegisteredToolDefinition(content.name),
 							this.ui,
 						);
@@ -2321,7 +2330,10 @@ export class InteractiveMode {
 						const component = new ToolExecutionComponent(
 							content.name,
 							content.input ?? {},
-							{ showImages: this.settingsManager.getShowImages() },
+							{
+								showImages: this.settingsManager.getShowImages(),
+								renderMode: this.settingsManager.getToolOutputMode(),
+							},
 							undefined,
 							this.ui,
 						);
@@ -2584,6 +2596,12 @@ export class InteractiveMode {
 				child.setExpanded(expanded);
 			}
 		}
+		if (this.bashComponent) {
+			this.bashComponent.setExpanded(expanded);
+		}
+		for (const component of this.pendingBashComponents) {
+			component.setExpanded(expanded);
+		}
 		this.ui.requestRender();
 	}
 
@@ -2910,7 +2928,9 @@ export class InteractiveMode {
 			const selector = new SettingsSelectorComponent(
 				{
 					autoCompact: this.session.autoCompactionEnabled,
+					autoCompactThresholdPercent: this.settingsManager.getCompactionThresholdPercent(),
 					classifierModel: this.settingsManager.getClassifierModel() ?? "default",
+					budgetSubagentModel: this.settingsManager.getBudgetSubagentModel() ?? "default",
 					showImages: this.settingsManager.getShowImages(),
 					autoResizeImages: this.settingsManager.getImageAutoResize(),
 					blockImages: this.settingsManager.getBlockImages(),
@@ -2933,6 +2953,7 @@ export class InteractiveMode {
 					quietStartup: this.settingsManager.getQuietStartup(),
 					clearOnShrink: this.settingsManager.getClearOnShrink(),
 					timestampFormat: this.settingsManager.getTimestampFormat(),
+					toolOutputMode: this.settingsManager.getToolOutputMode(),
 					classifierModelSubmenu: (_currentValue, submenuDone) =>
 						new ModelSelectorComponent(
 							this.ui,
@@ -2943,16 +2964,36 @@ export class InteractiveMode {
 							(model) => submenuDone(`${model.provider}/${model.id}`),
 							() => submenuDone(),
 						),
+					budgetSubagentModelSubmenu: (_currentValue, submenuDone) =>
+						new ModelSelectorComponent(
+							this.ui,
+							undefined,
+							this.settingsManager,
+							this.session.modelRegistry,
+							[],
+							(model) => submenuDone(`${model.provider}/${model.id}`),
+							() => submenuDone(),
+						),
 				},
 				{
 					onAutoCompactChange: (enabled) => {
 						this.session.setAutoCompactionEnabled(enabled);
 						this.footer.setAutoCompactEnabled(enabled);
 					},
+					onAutoCompactThresholdPercentChange: (percent) => {
+						this.settingsManager.setCompactionThresholdPercent(percent);
+						this.showStatus(`Auto-compact threshold: ${percent}%`);
+					},
 					onClassifierModelChange: (modelRef) => {
 						this.settingsManager.setClassifierModel(modelRef);
 						this.showStatus(`Classifier model: ${modelRef}`);
 					},
+					onBudgetSubagentModelChange: (modelRef) => {
+						this.settingsManager.setBudgetSubagentModel(modelRef === "default" ? undefined : modelRef);
+						this.showStatus(
+							`Budget subagent model: ${modelRef === "default" ? "use current/default model" : modelRef}`,
+						);
+					},
 					onShowImagesChange: (enabled) => {
 						this.settingsManager.setShowImages(enabled);
 						for (const child of this.chatContainer.children) {
@@ -3053,6 +3094,17 @@ export class InteractiveMode {
 					onTimestampFormatChange: (format) => {
 						this.settingsManager.setTimestampFormat(format);
 					},
+					onToolOutputModeChange: (mode) => {
+						this.settingsManager.setToolOutputMode(mode);
+						for (const child of this.chatContainer.children) {
+							if (child instanceof ToolExecutionComponent || child instanceof BashExecutionComponent) {
+								child.setRenderMode(mode);
+							}
+						}
+						if (this.bashComponent) this.bashComponent.setRenderMode(mode);
+						for (const component of this.pendingBashComponents) component.setRenderMode(mode);
+						this.ui.requestRender();
+					},
 					onCancel: () => {
 						done();
 						this.ui.requestRender();
@@ -3814,7 +3866,13 @@ export class InteractiveMode {
 			const result = eventResult.result;
 
 			// Create UI component for display
-			this.bashComponent = new BashExecutionComponent(label, this.ui, excludeFromContext);
+			this.bashComponent = new BashExecutionComponent(
+				label,
+				this.ui,
+				excludeFromContext,
+				this.settingsManager.getToolOutputMode(),
+			);
+			this.bashComponent.setExpanded(this.toolOutputExpanded);
 			if (this.session.isStreaming) {
 				this.pendingMessagesContainer.addChild(this.bashComponent);
 				this.pendingBashComponents.push(this.bashComponent);
@@ -3842,7 +3900,13 @@ export class InteractiveMode {
 
 		// Normal execution path (possibly with custom operations)
 		const isDeferred = this.session.isStreaming;
-		this.bashComponent = new BashExecutionComponent(label, this.ui, excludeFromContext);
+		this.bashComponent = new BashExecutionComponent(
+			label,
+			this.ui,
+			excludeFromContext,
+			this.settingsManager.getToolOutputMode(),
+		);
+		this.bashComponent.setExpanded(this.toolOutputExpanded);
 
 		if (isDeferred) {
 			// Show in pending area when agent is streaming