@oh-my-pi/pi-coding-agent 16.0.4 → 16.0.6

package/src/lsp/types.ts

@@ -1,38 +1,24 @@
 import type { ptree } from "@oh-my-pi/pi-utils";
-import { z } from "zod/v4";
+import { type } from "arktype";
 
 // =============================================================================
 // Tool Schema
 // =============================================================================
 
-export const lspSchema = z.object({
-	action: z.enum([
-		"diagnostics",
-		"definition",
-		"references",
-		"hover",
-		"symbols",
-		"rename",
-		"rename_file",
-		"code_actions",
-		"type_definition",
-		"implementation",
-		"status",
-		"reload",
-		"capabilities",
-		"request",
-	]),
-	file: z.string().describe("file path or source path for rename_file").optional(),
-	line: z.number().describe("line number (1-indexed)").optional(),
-	symbol: z.string().describe("symbol substring on the line").optional(),
-	query: z.string().describe("search query or code-action selector").optional(),
-	new_name: z.string().describe("new symbol name or destination path").optional(),
-	apply: z.boolean().describe("apply edits").optional(),
-	timeout: z.number().describe("request timeout in seconds").optional(),
-	payload: z.string().describe("json-encoded request params").optional(),
+export const lspSchema = type({
+	action:
+		"'diagnostics' | 'definition' | 'references' | 'hover' | 'symbols' | 'rename' | 'rename_file' | 'code_actions' | 'type_definition' | 'implementation' | 'status' | 'reload' | 'capabilities' | 'request'",
+	file: "string?",
+	line: "number?",
+	symbol: "string?",
+	query: "string?",
+	new_name: "string?",
+	apply: "boolean?",
+	timeout: "number?",
+	payload: "string?",
 });
 
-export type LspParams = z.infer<typeof lspSchema>;
+export type LspParams = typeof lspSchema.infer;
 
 export interface LspToolDetails {
 	serverName?: string;

package/src/main.ts

@@ -68,6 +68,7 @@ import type { AuthStorage } from "./session/auth-storage";
 import { resolveResumableSession, type SessionInfo } from "./session/session-listing";
 import { SessionManager } from "./session/session-manager";
 import { executeBuiltinSlashCommand } from "./slash-commands/builtin-registry";
+import { shouldShowStartupSplash } from "./startup-splash";
 import { discoverTitleSystemPromptFile, resolvePromptInput } from "./system-prompt";
 import { createPersistedSubagentReviverFactory } from "./task/persisted-revive";
 import { initTelemetryExport, isTelemetryExportEnabled } from "./telemetry-export";
@@ -90,17 +91,8 @@ type RunRpcMode = (
 	eventBus?: EventBus,
 ) => Promise<never>;
 
-function maybeShowStartupSplash(options: {
-	isInteractive: boolean;
-	resuming: boolean;
-	quiet: boolean;
-	version: string;
-}): void {
-	if (!options.isInteractive) return;
-	if (options.resuming || options.quiet) return;
-	if ($env.PI_TIMING) return;
-	if (!process.stdin.isTTY || !process.stdout.isTTY) return;
-	//process.stdout.write(`${chalk.dim(`omp ${options.version}`)}\n${chalk.dim("Initializing session…")}\n`);
+export function writeStartupNotice(parsedArgs: Pick<Args, "mode">, text: string): void {
+	(parsedArgs.mode === "json" ? process.stderr : process.stdout).write(text);
 }
 
 async function checkForNewVersion(currentVersion: string): Promise<string | undefined> {
@@ -387,6 +379,7 @@ async function runInteractiveMode(
 	mcpManager: MCPManager | undefined,
 	resuming: boolean,
 	forceSetupWizard: boolean,
+	showStartupSplash: boolean,
 	eventBus?: EventBus,
 	initialMessage?: string,
 	initialImages?: ImageContent[],
@@ -407,10 +400,13 @@ async function runInteractiveMode(
 	// Cold-launch gate: the full setup wizard (every scene + the overlay and
 	// their TUI/OAuth/search/theme deps) is heavy, yet the common case only needs
 	// to know whether the stored setup version is current. Lazy-load the wizard
-	// barrel only when setup is stale or forced; otherwise skip it entirely.
+	// barrel only when setup is stale, forced, or the explicit startup splash
+	// setting needs the shared setup splash renderer.
 	const storedSetupVersion = settings.get("setupVersion");
 	const setupWizard =
-		forceSetupWizard || storedSetupVersion < CURRENT_SETUP_VERSION ? await import("./modes/setup-wizard") : undefined;
+		forceSetupWizard || storedSetupVersion < CURRENT_SETUP_VERSION || showStartupSplash
+			? await import("./modes/setup-wizard")
+			: undefined;
 	const setupScenes = setupWizard
 		? await setupWizard.selectSetupScenes(storedSetupVersion, setupWizard.ALL_SCENES, mode, {
 				resuming,
@@ -419,12 +415,17 @@ async function runInteractiveMode(
 				force: forceSetupWizard,
 			})
 		: [];
+	const playStartupSplash = showStartupSplash && setupScenes.length === 0;
 
 	await mode.init({
-		suppressWelcomeIntro: resuming || setupScenes.length > 0,
+		suppressWelcomeIntro: resuming || setupScenes.length > 0 || playStartupSplash,
 		clearInitialTerminalHistory: true,
 	});
 
+	if (setupWizard && playStartupSplash) {
+		await setupWizard.runStartupSplash(mode);
+	}
+
 	if (setupWizard && setupScenes.length > 0) {
 		await setupWizard.runSetupWizard(mode, setupScenes);
 	}
@@ -758,6 +759,9 @@ async function buildSessionOptions(
 		cwd: parsed.cwd ?? getProjectDir(),
 		autoApprove: parsed.autoApprove ?? false,
 	};
+	if (parsed.maxTime !== undefined) {
+		options.deadline = Date.now() + parsed.maxTime * 1000;
+	}
 
 	// Auto-discover SYSTEM.md if no CLI system prompt provided
 	const systemPromptSource = parsed.systemPrompt ?? discoverSystemPromptFile();
@@ -944,7 +948,7 @@ export async function runRootCommand(
 	const modelRegistry = logger.time("modelRegistry:init", () => new ModelRegistry(authStorage));
 
 	if (parsedArgs.version) {
-		process.stdout.write(`${VERSION}\n`);
+		writeStartupNotice(parsedArgs, `${VERSION}\n`);
 		process.exit(0);
 	}
 
@@ -959,7 +963,7 @@ export async function runRootCommand(
 			process.stderr.write(`${chalk.red(`Error: ${message}`)}\n`);
 			process.exit(1);
 		}
-		process.stdout.write(`Exported to: ${result}\n`);
+		writeStartupNotice(parsedArgs, `Exported to: ${result}\n`);
 		process.exit(0);
 	}
 
@@ -1095,7 +1099,7 @@ export async function runRootCommand(
 	// message rather than letting the decline bubble up as an uncaught exception
 	// (see issue #1668).
 	if (typeof parsedArgs.resume === "string" && !sessionManager) {
-		process.stdout.write(`${chalk.dim("Resume cancelled: session is in another project.")}\n`);
+		writeStartupNotice(parsedArgs, `${chalk.dim("Resume cancelled: session is in another project.")}\n`);
 		return;
 	}
 
@@ -1109,7 +1113,7 @@ export async function runRootCommand(
 			// picker can still open in all-projects scope instead of dead-ending.
 			preloadedAllSessions = await logger.time("SessionManager.listAll", SessionManager.listAll);
 			if (preloadedAllSessions.length === 0) {
-				process.stdout.write(`${chalk.dim("No sessions found")}\n`);
+				writeStartupNotice(parsedArgs, `${chalk.dim("No sessions found")}\n`);
 				return;
 			}
 			startInAllScope = true;
@@ -1121,7 +1125,7 @@ export async function runRootCommand(
 		});
 		resumeStartupWatchdog();
 		if (!selected) {
-			process.stdout.write(`${chalk.dim("No session selected")}\n`);
+			writeStartupNotice(parsedArgs, `${chalk.dim("No session selected")}\n`);
 			return;
 		}
 		// Resuming a session from another project: switch the process into that
@@ -1254,11 +1258,14 @@ export async function runRootCommand(
 			stdinContent: pipedInput,
 		});
 
-		maybeShowStartupSplash({
+		const showStartupSplash = shouldShowStartupSplash({
+			configured: settingsInstance.get("startup.showSplash"),
 			isInteractive,
 			resuming: Boolean(parsedArgs.continue || parsedArgs.resume || parsedArgs.fork),
 			quiet: settingsInstance.get("startup.quiet"),
-			version: VERSION,
+			timing: Boolean($env.PI_TIMING),
+			stdinIsTTY: process.stdin.isTTY,
+			stdoutIsTTY: process.stdout.isTTY,
 		});
 
 		const { session, setToolUIContext, modelFallbackMessage, lspServers, mcpManager } = await createSession({
@@ -1350,6 +1357,7 @@ export async function runRootCommand(
 				mcpManager,
 				Boolean(parsedArgs.continue || parsedArgs.resume || parsedArgs.fork),
 				deps.forceSetupWizard === true,
+				showStartupSplash,
 				eventBus,
 				initialMessage,
 				initialImages,

package/src/mcp/client.ts

@@ -303,8 +303,22 @@ export async function listResources(
 	return allResources;
 }
 
+/** True when an error is a JSON-RPC "method not found" (-32601) response. */
+function isMethodNotFoundError(error: unknown): boolean {
+	const message = error instanceof Error ? error.message : String(error);
+	return message.includes("-32601") || /method not found/i.test(message);
+}
+
 /**
  * List resource templates from a connected server.
+ *
+ * A server MAY advertise the `resources` capability without implementing the
+ * optional `resources/templates/list` method (it is optional in the MCP spec).
+ * Such servers reject the request with JSON-RPC -32601 ("Method not found").
+ * Treat that as "no templates" and return `[]` rather than throwing — otherwise
+ * a caller that loads resources and templates together (see `MCPManager`'s
+ * `Promise.all([listResources, listResourceTemplates])`) would discard the
+ * server's concrete resources too. Any other error still propagates.
  */
 export async function listResourceTemplates(
 	connection: MCPServerConnection,
@@ -321,20 +335,31 @@ export async function listResourceTemplates(
 	const allTemplates: MCPResourceTemplate[] = [];
 	let cursor: string | undefined;
 
-	do {
-		const params: Record<string, unknown> = {};
-		if (cursor) {
-			params.cursor = cursor;
+	try {
+		do {
+			const params: Record<string, unknown> = {};
+			if (cursor) {
+				params.cursor = cursor;
+			}
+
+			const result = await connection.transport.request<MCPResourceTemplatesListResult>(
+				"resources/templates/list",
+				params,
+				options,
+			);
+			allTemplates.push(...result.resourceTemplates);
+			cursor = result.nextCursor;
+		} while (cursor);
+	} catch (error) {
+		// A server that doesn't implement the optional templates method answers
+		// -32601; cache an empty list so we neither retry nor let the failure
+		// bubble up and discard the server's concrete resources.
+		if (isMethodNotFoundError(error)) {
+			connection.resourceTemplates = [];
+			return [];
 		}
-
-		const result = await connection.transport.request<MCPResourceTemplatesListResult>(
-			"resources/templates/list",
-			params,
-			options,
-		);
-		allTemplates.push(...result.resourceTemplates);
-		cursor = result.nextCursor;
-	} while (cursor);
+		throw error;
+	}
 
 	connection.resourceTemplates = allTemplates;
 	return allTemplates;

package/src/mcp/render.ts

@@ -5,7 +5,6 @@
  * showing args and output in JSON tree format similar to task tool.
  */
 import type { Component } from "@oh-my-pi/pi-tui";
-import { Text } from "@oh-my-pi/pi-tui";
 import type { RenderResultOptions } from "../extensibility/custom-tools/types";
 import type { Theme } from "../modes/theme/theme";
 import {
@@ -20,25 +19,33 @@ import {
 } from "../tools/json-tree";
 import { formatStyledTruncationWarning, stripOutputNotice } from "../tools/output-meta";
 import { formatExpandHint, truncateToWidth } from "../tools/render-utils";
-import { renderStatusLine } from "../tui";
+import { renderStatusLine, WidthAwareText } from "../tui";
 import type { MCPToolDetails } from "./tool-bridge";
 
 /**
  * Render MCP tool call.
  */
 export function renderMCPCall(args: Record<string, unknown>, theme: Theme, label: string): Component {
-	const lines: string[] = [];
-	lines.push(renderStatusLine({ icon: "pending", title: label }, theme));
+	return new WidthAwareText(
+		contentWidth => {
+			const lines: string[] = [];
+			lines.push(renderStatusLine({ icon: "pending", title: label }, theme));
 
-	if (args && typeof args === "object" && Object.keys(args).length > 0) {
-		// Show args inline preview
-		const preview = formatArgsInline(args, 70);
-		if (preview) {
-			lines.push(` ${theme.fg("dim", theme.tree.last)} ${theme.fg("dim", preview)}`);
-		}
-	}
+			if (args && typeof args === "object" && Object.keys(args).length > 0) {
+				// Inline preview budgeted against the render width, leaving room for
+				// the ` └─ ` connector prefix instead of a fixed cap.
+				const inlineBudget = Math.max(20, contentWidth - Bun.stringWidth(theme.tree.last) - 2);
+				const preview = formatArgsInline(args, inlineBudget);
+				if (preview) {
+					lines.push(` ${theme.fg("dim", theme.tree.last)} ${theme.fg("dim", preview)}`);
+				}
+			}
 
-	return new Text(lines.join("\n"), 0, 0);
+			return lines.join("\n");
+		},
+		0,
+		0,
+	);
 }
 
 /**
@@ -51,92 +58,98 @@ export function renderMCPResult(
 	args?: Record<string, unknown>,
 ): Component {
 	const { expanded } = options;
-	const lines: string[] = [];
-	const isError = result.isError ?? result.details?.isError ?? false;
-	const title = result.details ? `${result.details.serverName}/${result.details.mcpToolName}` : "MCP";
-	const success = !isError;
-	lines.push(
-		renderStatusLine(
-			success ? { iconOverride: theme.styledSymbol("tool.mcp", "accent"), title } : { icon: "error", title },
-			theme,
-		),
-	);
-
-	// Args section (when expanded)
-	if (expanded && args && typeof args === "object" && Object.keys(args).length > 0) {
-		lines.push(`${theme.fg("dim", "Args")}`);
-		const maxDepth = JSON_TREE_MAX_DEPTH_EXPANDED;
-		const maxLines = JSON_TREE_MAX_LINES_EXPANDED;
-		const tree = renderJsonTreeLines(args, theme, maxDepth, maxLines, JSON_TREE_SCALAR_LEN_EXPANDED);
-		for (const line of tree.lines) {
-			lines.push(line);
-		}
-		if (tree.truncated) {
-			lines.push(theme.fg("dim", "…"));
-		}
-		lines.push(""); // Blank line before output
-	}
+	return new WidthAwareText(
+		contentWidth => {
+			const lines: string[] = [];
+			const isError = result.isError ?? result.details?.isError ?? false;
+			const title = result.details ? `${result.details.serverName}/${result.details.mcpToolName}` : "MCP";
+			const success = !isError;
+			lines.push(
+				renderStatusLine(
+					success ? { iconOverride: theme.styledSymbol("tool.mcp", "accent"), title } : { icon: "error", title },
+					theme,
+				),
+			);
 
-	// Output section
-	const textContent = result.content?.find(c => c.type === "text")?.text ?? "";
-	// Strip the LLM-facing spill notice before parsing/rendering: a spilled
-	// result appends `[Showing… artifact://N]` to the body, which would break
-	// JSON detection and bury the recovery link. Surface it as a styled warning
-	// instead, mirroring the built-in read/bash/ssh/browser renderers.
-	const trimmedOutput = stripOutputNotice(textContent, result.details?.meta).trimEnd();
-	const truncationWarning = result.details?.meta?.truncation
-		? formatStyledTruncationWarning(result.details.meta, theme)
-		: null;
-
-	if (!trimmedOutput) {
-		lines.push(theme.fg("dim", "(no output)"));
-		return new Text(lines.join("\n"), 0, 0);
-	}
-
-	// Try to parse as JSON for structured display
-	if (trimmedOutput.startsWith("{") || trimmedOutput.startsWith("[")) {
-		try {
-			const parsed = JSON.parse(trimmedOutput);
-			const maxDepth = expanded ? JSON_TREE_MAX_DEPTH_EXPANDED : JSON_TREE_MAX_DEPTH_COLLAPSED;
-			const maxLines = expanded ? JSON_TREE_MAX_LINES_EXPANDED : JSON_TREE_MAX_LINES_COLLAPSED;
-			const maxScalarLen = expanded ? JSON_TREE_SCALAR_LEN_EXPANDED : JSON_TREE_SCALAR_LEN_COLLAPSED;
-			const tree = renderJsonTreeLines(parsed, theme, maxDepth, maxLines, maxScalarLen);
-
-			if (tree.lines.length > 0) {
+			// Args section (when expanded)
+			if (expanded && args && typeof args === "object" && Object.keys(args).length > 0) {
+				lines.push(`${theme.fg("dim", "Args")}`);
+				const maxDepth = JSON_TREE_MAX_DEPTH_EXPANDED;
+				const maxLines = JSON_TREE_MAX_LINES_EXPANDED;
+				const tree = renderJsonTreeLines(args, theme, maxDepth, maxLines, JSON_TREE_SCALAR_LEN_EXPANDED);
 				for (const line of tree.lines) {
 					lines.push(line);
 				}
-				// Always show expand hint when collapsed (expanded view shows longer values and deeper nesting)
-				if (!expanded) {
-					lines.push(formatExpandHint(theme, expanded, true));
-				} else if (tree.truncated) {
+				if (tree.truncated) {
 					lines.push(theme.fg("dim", "…"));
 				}
-				if (truncationWarning) lines.push(truncationWarning);
-				return new Text(lines.join("\n"), 0, 0);
+				lines.push(""); // Blank line before output
+			}
+
+			// Output section
+			const textContent = result.content?.find(c => c.type === "text")?.text ?? "";
+			// Strip the LLM-facing spill notice before parsing/rendering: a spilled
+			// result appends `[Showing… artifact://N]` to the body, which would break
+			// JSON detection and bury the recovery link. Surface it as a styled warning
+			// instead, mirroring the built-in read/bash/ssh/browser renderers.
+			const trimmedOutput = stripOutputNotice(textContent, result.details?.meta).trimEnd();
+			const truncationWarning = result.details?.meta?.truncation
+				? formatStyledTruncationWarning(result.details.meta, theme)
+				: null;
+
+			if (!trimmedOutput) {
+				lines.push(theme.fg("dim", "(no output)"));
+				return lines.join("\n");
+			}
+
+			// Try to parse as JSON for structured display
+			if (trimmedOutput.startsWith("{") || trimmedOutput.startsWith("[")) {
+				try {
+					const parsed = JSON.parse(trimmedOutput);
+					const maxDepth = expanded ? JSON_TREE_MAX_DEPTH_EXPANDED : JSON_TREE_MAX_DEPTH_COLLAPSED;
+					const maxLines = expanded ? JSON_TREE_MAX_LINES_EXPANDED : JSON_TREE_MAX_LINES_COLLAPSED;
+					const maxScalarLen = expanded ? JSON_TREE_SCALAR_LEN_EXPANDED : JSON_TREE_SCALAR_LEN_COLLAPSED;
+					const tree = renderJsonTreeLines(parsed, theme, maxDepth, maxLines, maxScalarLen);
+
+					if (tree.lines.length > 0) {
+						for (const line of tree.lines) {
+							lines.push(line);
+						}
+						// Always show expand hint when collapsed (expanded view shows longer values and deeper nesting)
+						if (!expanded) {
+							lines.push(formatExpandHint(theme, expanded, true));
+						} else if (tree.truncated) {
+							lines.push(theme.fg("dim", "…"));
+						}
+						if (truncationWarning) lines.push(truncationWarning);
+						return lines.join("\n");
+					}
+				} catch {
+					// Fall through to raw output
+				}
 			}
-		} catch {
-			// Fall through to raw output
-		}
-	}
 
-	// Raw text output
-	const outputLines = trimmedOutput.split("\n");
-	const maxOutputLines = expanded ? 12 : 4;
-	const displayLines = outputLines.slice(0, maxOutputLines);
+			// Raw text output
+			const outputLines = trimmedOutput.split("\n");
+			const maxOutputLines = expanded ? 12 : 4;
+			const displayLines = outputLines.slice(0, maxOutputLines);
 
-	for (const line of displayLines) {
-		lines.push(theme.fg("toolOutput", truncateToWidth(line, 80)));
-	}
+			for (const line of displayLines) {
+				lines.push(theme.fg("toolOutput", truncateToWidth(line, contentWidth)));
+			}
 
-	if (outputLines.length > maxOutputLines) {
-		const remaining = outputLines.length - maxOutputLines;
-		lines.push(`${theme.fg("dim", `… ${remaining} more lines`)} ${formatExpandHint(theme, expanded, true)}`);
-	} else if (!expanded) {
-		// Show expand hint when collapsed even if all lines shown (lines may be truncated)
-		lines.push(formatExpandHint(theme, expanded, true));
-	}
+			if (outputLines.length > maxOutputLines) {
+				const remaining = outputLines.length - maxOutputLines;
+				lines.push(`${theme.fg("dim", `… ${remaining} more lines`)} ${formatExpandHint(theme, expanded, true)}`);
+			} else if (!expanded) {
+				// Show expand hint when collapsed even if all lines shown (lines may be truncated)
+				lines.push(formatExpandHint(theme, expanded, true));
+			}
 
-	if (truncationWarning) lines.push(truncationWarning);
-	return new Text(lines.join("\n"), 0, 0);
+			if (truncationWarning) lines.push(truncationWarning);
+			return lines.join("\n");
+		},
+		0,
+		0,
+	);
 }

package/src/modes/components/agent-hub.ts

@@ -17,7 +17,7 @@ import * as fs from "node:fs";
 import * as path from "node:path";
 import type { AgentMessage, AgentTool } from "@oh-my-pi/pi-agent-core";
 import type { Usage } from "@oh-my-pi/pi-ai";
-import { Container, Editor, matchesKey, ScrollView, Text, type TUI } from "@oh-my-pi/pi-tui";
+import { Container, Editor, Ellipsis, matchesKey, ScrollView, Text, type TUI } from "@oh-my-pi/pi-tui";
 import { formatAge, formatBytes, formatDuration, formatNumber, getProjectDir, logger } from "@oh-my-pi/pi-utils";
 import type { AdvisorMessageDetails } from "../../advisor";
 import { COLLAB_PROMPT_MESSAGE_TYPE, type CollabPromptDetails } from "../../collab/protocol";
@@ -81,7 +81,12 @@ function contentWidth(): number {
 
 /** Sanitize a line for TUI display: replace tabs, then truncate to viewport width. */
 function sanitizeLine(text: string, maxWidth?: number): string {
-	return truncateToWidth(replaceTabs(text), maxWidth ?? contentWidth());
+	const singleLine = replaceTabs(text).replace(/[\r\n]+/g, " ");
+	return truncateToWidth(singleLine, maxWidth ?? contentWidth());
+}
+
+function clampHubLine(line: string, width: number): string {
+	return truncateToWidth(line.replace(/[\r\n]+/g, " "), Math.max(1, width - 2), Ellipsis.Omit);
 }
 
 const STATUS_ORDER: Record<AgentStatus, number> = { running: 0, idle: 1, parked: 2, aborted: 3 };
@@ -298,7 +303,8 @@ export class AgentHubOverlayComponent extends Container {
 	}
 
 	override render(width: number): readonly string[] {
-		return this.#view === "table" ? this.#renderTable(width) : this.#renderChat(width);
+		const lines = this.#view === "table" ? this.#renderTable(width) : this.#renderChat(width);
+		return lines.map(line => clampHubLine(line, width));
 	}
 
 	handleInput(keyData: string): void {
@@ -490,7 +496,8 @@ export class AgentHubOverlayComponent extends Container {
 			parts.push(theme.fg("warning", `⧉ ${unread}`));
 		}
 		parts.push(theme.fg("dim", formatAge(Math.max(1, Math.round((Date.now() - ref.lastActivity) / 1000)))));
-		return truncateToWidth(` ${cursor} ${parts.join(theme.sep.dot)}`, Math.max(10, width - 1));
+		const rawLine = ` ${cursor} ${parts.join(theme.sep.dot)}`;
+		return truncateToWidth(rawLine.replace(/[\r\n]+/g, " "), Math.max(1, width - 1));
 	}
 
 	#handleTableInput(keyData: string): void {

package/src/modes/components/branch-summary-message.ts

@@ -11,6 +11,7 @@ export class BranchSummaryMessageComponent extends Box {
 
 	constructor(private readonly message: BranchSummaryMessage) {
 		super(1, 1, t => theme.bg("customMessageBg", t));
+		this.setIgnoreTight(true);
 		this.#updateDisplay();
 	}
 

package/src/modes/components/btw-panel.ts

@@ -58,6 +58,10 @@ export class BtwPanelComponent extends Container {
 		this.#rebuild();
 	}
 
+	isBranchable(): boolean {
+		return this.#state === "complete" && this.#answer.trim().length > 0;
+	}
+
 	close(): void {
 		this.#closed = true;
 	}
@@ -85,7 +89,7 @@ export class BtwPanelComponent extends Container {
 			case "running":
 				return theme.fg("muted", "Esc cancel /btw");
 			case "complete":
-				return theme.fg("muted", "Esc dismiss");
+				return theme.fg("muted", this.isBranchable() ? "b branch · Esc dismiss" : "Esc dismiss");
 			case "aborted":
 				return theme.fg("warning", `${theme.status.warning} Cancelled · Esc dismiss`);
 			case "error":

package/src/modes/components/collab-prompt-message.ts

@@ -12,7 +12,9 @@ export class CollabPromptMessageComponent extends Container {
 	constructor(message: CustomMessage<CollabPromptDetails>) {
 		super();
 		const from = message.details?.from?.trim() || "guest";
-		this.addChild(new Text(theme.fg("accent", `\x1b[1m«${from}»\x1b[22m ›`), 1, 0));
+		const authorText = new Text(theme.fg("accent", `\x1b[1m«${from}»\x1b[22m ›`), 1, 0);
+		authorText.setIgnoreTight(true);
+		this.addChild(authorText);
 		const text =
 			typeof message.content === "string"
 				? message.content
@@ -20,11 +22,11 @@ export class CollabPromptMessageComponent extends Container {
 						.filter((content): content is TextContent => content.type === "text")
 						.map(content => content.text)
 						.join("");
-		this.addChild(
-			new Markdown(text, 1, 1, getMarkdownTheme(), {
-				bgColor: (value: string) => theme.bg("userMessageBg", value),
-				color: (value: string) => theme.fg("userMessageText", value),
-			}),
-		);
+		const md = new Markdown(text, 1, 1, getMarkdownTheme(), {
+			bgColor: (value: string) => theme.bg("userMessageBg", value),
+			color: (value: string) => theme.fg("userMessageText", value),
+		});
+		md.setIgnoreTight(true);
+		this.addChild(md);
 	}
 }

package/src/modes/components/compaction-summary-message.ts

@@ -62,6 +62,7 @@ class SummaryDividerComponent implements Component {
 	#detailBox(): Box {
 		if (this.#detail) return this.#detail;
 		const box = new Box(1, 1, t => theme.bg("customMessageBg", t));
+		box.setIgnoreTight(true);
 		box.addChild(
 			new Markdown(this.options.detailMarkdown(), 0, 0, getMarkdownTheme(), {
 				color: (text: string) => theme.fg("customMessageText", text),

package/src/modes/components/custom-editor.ts

@@ -22,6 +22,7 @@ type ConfigurableEditorAction = Extract<
 	| "app.editor.external"
 	| "app.history.search"
 	| "app.message.dequeue"
+	| "app.retry"
 	| "app.clipboard.pasteImage"
 	| "app.clipboard.pasteTextRaw"
 	| "app.clipboard.copyPrompt"
@@ -43,6 +44,7 @@ const DEFAULT_ACTION_KEYS: Record<ConfigurableEditorAction, KeyId[]> = {
 	"app.editor.external": ["ctrl+g"],
 	"app.history.search": ["ctrl+r"],
 	"app.message.dequeue": ["alt+up"],
+	"app.retry": ["alt+r"],
 	"app.clipboard.pasteImage": ["ctrl+v"],
 	"app.clipboard.pasteTextRaw": ["ctrl+shift+v", "alt+shift+v"],
 	"app.clipboard.copyPrompt": ["alt+shift+c"],
@@ -268,6 +270,8 @@ export class CustomEditor extends Editor {
 	onPasteTextRaw?: () => void;
 	/** Called when the configured dequeue shortcut is pressed. */
 	onDequeue?: () => void;
+	/** Called when the configured retry shortcut is pressed. */
+	onRetry?: () => void;
 	/** Called when Caps Lock is pressed. */
 	onCapsLock?: () => void;
 	/** Called when left-arrow is pressed while the editor is empty (cursor necessarily at start). */
@@ -588,6 +592,20 @@ export class CustomEditor extends Editor {
 				return;
 			}
 
+			// Intercept configured retry shortcut. Later user/custom handlers keep
+			// precedence so adding the default Alt+R binding does not steal existing
+			// shortcuts such as app.plan.toggle or extension commands; copy-prompt is
+			// checked above for the same reason.
+			if (this.#matchesAction(canonical, "app.retry") && this.onRetry) {
+				const customHandler = this.#customMatchKeys.get(canonical);
+				if (customHandler) {
+					customHandler();
+					return;
+				}
+				this.onRetry();
+				return;
+			}
+
 			// Check custom key handlers (extensions)
 			const handler = this.#customMatchKeys.get(canonical);
 			if (handler) {

package/src/modes/components/custom-message.ts

@@ -22,6 +22,7 @@ export class CustomMessageComponent extends Container {
 
 		// Create box with custom background (used for default rendering)
 		this.#box = new Box(1, 1, t => theme.bg("customMessageBg", t));
+		this.#box.setIgnoreTight(true);
 
 		this.#rebuild();
 	}