@oh-my-pi/pi-coding-agent 15.9.0 → 15.9.1

package/src/mcp/tool-bridge.ts

@@ -116,10 +116,12 @@ function buildResult(
 		provider,
 		providerName,
 	};
+	const contentText = result.isError ? `Error: ${text}` : text;
+	const toolResult: CustomToolResult<MCPToolDetails> = { content: [{ type: "text", text: contentText }], details };
 	if (result.isError) {
-		return { content: [{ type: "text", text: `Error: ${text}` }], details };
+		toolResult.isError = true;
 	}
-	return { content: [{ type: "text", text }], details };
+	return toolResult;
 }
 
 /** Build an error CustomToolResult from a caught exception. */
@@ -134,6 +136,7 @@ function buildErrorResult(
 	return {
 		content: [{ type: "text", text: `MCP error: ${message}` }],
 		details: { serverName, mcpToolName, isError: true, provider, providerName },
+		isError: true,
 	};
 }
 
@@ -217,6 +220,8 @@ export class MCPTool implements CustomTool<TSchema, MCPToolDetails> {
 	readonly mcpToolName: string;
 	/** Server name */
 	readonly mcpServerName: string;
+	/** Render completed MCP calls with the result header replacing the pending call header. */
+	readonly mergeCallAndResult = true;
 
 	/** Create MCPTool instances for all tools from an MCP server connection */
 	static fromTools(connection: MCPServerConnection, tools: MCPToolDefinition[], reconnect?: MCPReconnect): MCPTool[] {
@@ -300,6 +305,9 @@ export class DeferredMCPTool implements CustomTool<TSchema, MCPToolDetails> {
 	readonly mcpToolName: string;
 	/** Server name */
 	readonly mcpServerName: string;
+	/** Render completed MCP calls with the result header replacing the pending call header. */
+	readonly mergeCallAndResult = true;
+
 	readonly #fallbackProvider: string | undefined;
 	readonly #fallbackProviderName: string | undefined;
 

package/src/mcp/transports/http.ts

@@ -87,45 +87,62 @@ export class HttpTransport implements MCPTransport {
 			headers["Mcp-Session-Id"] = this.#sessionId;
 		}
 
-		let response: Response;
+		let response: Response | null;
 		let timedOut = false;
+		let startupFinished = false;
+		const connection = this.#sseConnection;
 		const startupTimeoutMs = resolveSSEConnectTimeoutMs(this.config.timeout);
-		const timeoutId =
+		const fetchPromise = fetch(this.config.url, {
+			method: "GET",
+			headers,
+			signal: connection.signal,
+		});
+		const timeoutPromise =
 			startupTimeoutMs > 0
-				? setTimeout(() => {
-						timedOut = true;
-						this.#sseConnection?.abort();
-					}, startupTimeoutMs)
+				? new Promise<null>(resolve => {
+						setTimeout(() => {
+							if (!startupFinished) {
+								timedOut = true;
+								connection.abort();
+							}
+							resolve(null);
+						}, startupTimeoutMs);
+					})
 				: null;
 		try {
-			response = await fetch(this.config.url, {
-				method: "GET",
-				headers,
-				signal: this.#sseConnection.signal,
-			});
+			response = timeoutPromise === null ? await fetchPromise : await Promise.race([fetchPromise, timeoutPromise]);
 		} catch (error) {
-			this.#sseConnection = null;
+			if (this.#sseConnection === connection) this.#sseConnection = null;
 			if (error instanceof Error && error.name !== "AbortError" && !timedOut) {
 				this.onError?.(error);
 			}
 			return;
 		} finally {
-			if (timeoutId !== null) clearTimeout(timeoutId);
+			startupFinished = true;
+		}
+		if (response === null) {
+			if (this.#sseConnection === connection) this.#sseConnection = null;
+			void fetchPromise.then(lateResponse => lateResponse.body?.cancel()).catch(() => {});
+			return;
 		}
 
+		if (this.#sseConnection !== connection) {
+			await response.body?.cancel();
+			return;
+		}
 		if (response.status === 405 || !response.ok || !response.body) {
 			await response.body?.cancel();
-			this.#sseConnection = null;
+			if (this.#sseConnection === connection) this.#sseConnection = null;
 			return;
 		}
 
 		// Connection established — read messages in background.
 		// If the stream ends unexpectedly (server restart, network drop),
 		// fire onClose so the manager can trigger reconnection.
-		const signal = this.#sseConnection.signal;
+		const signal = connection.signal;
 		void this.#readSSEStream(response.body!, signal).finally(() => {
 			const wasConnected = this.#connected;
-			this.#sseConnection = null;
+			if (this.#sseConnection === connection) this.#sseConnection = null;
 			if (wasConnected) this.onClose?.();
 		});
 	}

package/src/mnemopi/state.ts

@@ -173,7 +173,7 @@ export class MnemopiSessionState {
 		return lines.join("\n\n");
 	}
 
-	collectScopedRecallResults(query: string): RecallResult[] {
+	async collectScopedRecallResults(query: string): Promise<RecallResult[]> {
 		const merged: RecallResult[] = [];
 		const byId = new Map<string, number>();
 		const byContent = new Map<string, number>();
@@ -187,7 +187,7 @@ export class MnemopiSessionState {
 				target.bank === this.scoped.global?.bank && sharedFallbackQuery ? [query, sharedFallbackQuery] : [query];
 			try {
 				for (const recallQuery of queries) {
-					const results = target.memory.recallEnhanced(recallQuery, this.config.recallLimit, {
+					const results = await target.memory.recallEnhanced(recallQuery, this.config.recallLimit, {
 						includeFacts: true,
 						channelId: target.bank,
 					});
@@ -209,7 +209,7 @@ export class MnemopiSessionState {
 		return merged;
 	}
 
-	recallResultsScoped(query: string): RecallResult[] {
+	recallResultsScoped(query: string): Promise<RecallResult[]> {
 		return this.collectScopedRecallResults(query);
 	}
 
@@ -242,7 +242,7 @@ export class MnemopiSessionState {
 	}
 
 	async recallForContext(query: string): Promise<string | undefined> {
-		const results = this.collectScopedRecallResults(query);
+		const results = await this.collectScopedRecallResults(query);
 		if (results.length === 0) return undefined;
 		return formatRecallBlock(results);
 	}

package/src/modes/acp/acp-agent.ts

@@ -42,8 +42,9 @@ import {
 	type SetSessionModeResponse,
 	type Usage,
 } from "@agentclientprotocol/sdk";
+import type { AgentToolResult } from "@oh-my-pi/pi-agent-core";
 import type { AssistantMessage, Model } from "@oh-my-pi/pi-ai";
-import { logger, VERSION } from "@oh-my-pi/pi-utils";
+import { isEnoent, logger, VERSION } from "@oh-my-pi/pi-utils";
 import { disableProvider, enableProvider, reset as resetCapabilities } from "../../capability";
 import { Settings } from "../../config/settings";
 import { clearPluginRootsAndCaches, resolveActiveProjectRegistryPath } from "../../discovery/helpers";
@@ -56,10 +57,12 @@ import { runExtensionCompact } from "../../extensibility/extensions/compact-hand
 import { getSessionSlashCommands } from "../../extensibility/extensions/get-commands-handler";
 import { buildSkillPromptMessage, getSkillSlashCommandName } from "../../extensibility/skills";
 import { loadSlashCommands } from "../../extensibility/slash-commands";
+import { resolveLocalUrlToPath } from "../../internal-urls";
 import { MCPManager } from "../../mcp/manager";
 import type { MCPServerConfig } from "../../mcp/types";
 import { loadAllExtensions } from "../../modes/components/extensions/state-manager";
 import { theme } from "../../modes/theme/theme";
+import { type PlanApprovalDetails, renameApprovedPlanFile, resolvePlanTitle } from "../../plan-mode/approved-plan";
 import type { AgentSession, AgentSessionEvent } from "../../session/agent-session";
 import { isSilentAbort, SKILL_PROMPT_MESSAGE_TYPE } from "../../session/messages";
 import {
@@ -69,6 +72,9 @@ import {
 } from "../../session/session-manager";
 import { ACP_BUILTIN_SLASH_COMMANDS, executeAcpBuiltinSlashCommand } from "../../slash-commands/acp-builtins";
 import { AUTO_THINKING, parseConfiguredThinkingLevel } from "../../thinking";
+import { normalizeLocalScheme } from "../../tools/path-utils";
+import { runResolveInvocation } from "../../tools/resolve";
+import { ToolError } from "../../tools/tool-errors";
 import { createAcpClientBridge } from "./acp-client-bridge";
 import {
 	buildToolCallStartUpdate,
@@ -80,6 +86,8 @@ import { ACP_TERMINAL_AUTH_FLAG } from "./terminal-auth";
 const ACP_DEFAULT_MODE_ID = "default";
 const ACP_PLAN_MODE_ID = "plan";
 const DEFAULT_PLAN_FILE_URL = "local://PLAN.md";
+const APPROVE_OPTION = "Approve and execute";
+const REFINE_OPTION = "Refine plan";
 const MODE_CONFIG_ID = "mode";
 const MODEL_CONFIG_ID = "model";
 const THINKING_CONFIG_ID = "thinking";
@@ -1229,11 +1237,15 @@ export class AcpAgent implements Agent {
 	}
 
 	async #pushConfigOptionUpdate(record: ManagedSessionRecord): Promise<void> {
+		await this.#pushConfigOptionUpdateForSession(record.session);
+	}
+
+	async #pushConfigOptionUpdateForSession(session: AgentSession): Promise<void> {
 		await this.#connection.sessionUpdate({
-			sessionId: record.session.sessionId,
+			sessionId: session.sessionId,
 			update: {
 				sessionUpdate: "config_option_update",
-				configOptions: this.#buildConfigOptions(record.session),
+				configOptions: this.#buildConfigOptions(session),
 			},
 		});
 	}
@@ -1380,11 +1392,164 @@ export class AcpAgent implements Agent {
 				workflow: previous?.workflow ?? "parallel",
 				reentry: previous !== undefined,
 			});
+			// Mirror `InteractiveMode.#enterPlanMode`: register the standing resolve
+			// handler that consumes `resolve { action: "apply" }` from plan-mode.
+			// Without this, the agent's resolve call falls through to the "No
+			// pending action to resolve" error (issue #1869).
+			session.setStandingResolveHandler?.(input => this.#runAcpPlanApprovalResolve(session, input));
 		} else {
+			session.setStandingResolveHandler?.(null);
 			session.setPlanModeState(undefined);
 		}
 	}
 
+	/**
+	 * Standing resolve handler installed while ACP plan mode is active. The agent
+	 * submits the finalized plan via `resolve { action: "apply", extra: { title } }`;
+	 * this handler validates the plan file, normalizes the title, asks the ACP
+	 * client to confirm (via `unstable_createElicitation` when supported), and on
+	 * approval renames the plan to `local://<title>.md`, exits plan mode, and
+	 * notifies the client of both mode surfaces so the agent regains full tools.
+	 *
+	 * Mirrors `InteractiveMode.#runPlanApprovalResolve` for the parts the agent
+	 * sees (same `PlanApprovalDetails` shape, same source tool name `plan_approval`).
+	 * Clients without form-mode elicitation get an auto-approve so plan mode is
+	 * never stranded — the agent always has a way out.
+	 */
+	#runAcpPlanApprovalResolve(session: AgentSession, input: unknown): Promise<AgentToolResult<unknown>> {
+		return runResolveInvocation(input as Parameters<typeof runResolveInvocation>[0], {
+			sourceToolName: "plan_approval",
+			label: "Plan ready for approval",
+			apply: async (_reason, extra) => {
+				const state = session.getPlanModeState();
+				if (!state?.enabled) {
+					throw new ToolError("Plan mode is not active.");
+				}
+				const planFilePath = state.planFilePath;
+				const planContent = await this.#readAcpPlanFile(session, planFilePath);
+				if (planContent === null) {
+					throw new ToolError(
+						`Plan file not found at ${planFilePath}. Write the finalized plan to ${planFilePath} before requesting approval.`,
+					);
+				}
+				const normalized = resolvePlanTitle({
+					suppliedTitle: extra?.title,
+					planContent,
+					planFilePath,
+				});
+				const finalPlanFilePath = `local://${normalized.fileName}`;
+				const approved = await this.#requestAcpPlanApprovalChoice(session.sessionId, normalized.title, planContent);
+				const details: PlanApprovalDetails = {
+					planFilePath,
+					finalPlanFilePath,
+					title: normalized.title,
+					planExists: true,
+				};
+				if (!approved) {
+					// User chose to refine: leave plan mode active so the agent
+					// keeps the read-only toolset and can iterate on the plan file.
+					return {
+						content: [
+							{
+								type: "text" as const,
+								text: 'Plan refinement requested. Update the plan file, then call `resolve { action: "apply" }` again when ready.',
+							},
+						],
+						details,
+					};
+				}
+				// Approved. Rename plan to its titled filename, set the plan
+				// reference so the next turn injects the plan content as
+				// context, then exit plan mode so the agent regains full tools.
+				await renameApprovedPlanFile({
+					planFilePath,
+					finalPlanFilePath,
+					getArtifactsDir: () => session.sessionManager.getArtifactsDir(),
+					getSessionId: () => session.sessionManager.getSessionId(),
+				});
+				session.setPlanReferencePath(finalPlanFilePath);
+				session.setStandingResolveHandler?.(null);
+				session.setPlanModeState(undefined);
+				try {
+					await this.#connection.sessionUpdate({
+						sessionId: session.sessionId,
+						update: this.#buildCurrentModeUpdate(session),
+					});
+					await this.#pushConfigOptionUpdateForSession(session);
+				} catch (error) {
+					logger.warn("Failed to emit mode updates after plan approval", {
+						sessionId: session.sessionId,
+						error,
+					});
+				}
+				return {
+					content: [
+						{
+							type: "text" as const,
+							text: `Plan approved at ${finalPlanFilePath}. Plan mode exited; proceed with the implementation.`,
+						},
+					],
+					details,
+				};
+			},
+		});
+	}
+
+	#resolveAcpPlanFilePath(session: AgentSession, planFilePath: string): string {
+		if (planFilePath.startsWith("local:")) {
+			const normalized = normalizeLocalScheme(planFilePath);
+			return resolveLocalUrlToPath(normalized, {
+				getArtifactsDir: () => session.sessionManager.getArtifactsDir(),
+				getSessionId: () => session.sessionManager.getSessionId(),
+			});
+		}
+		return path.resolve(session.sessionManager.getCwd(), planFilePath);
+	}
+
+	async #readAcpPlanFile(session: AgentSession, planFilePath: string): Promise<string | null> {
+		const resolvedPath = this.#resolveAcpPlanFilePath(session, planFilePath);
+		try {
+			return await Bun.file(resolvedPath).text();
+		} catch (error) {
+			if (isEnoent(error)) {
+				return null;
+			}
+			throw error;
+		}
+	}
+
+	/**
+	 * Ask the ACP client to confirm plan approval. Returns `true` only on an
+	 * explicit `APPROVE_OPTION` selection. Refine, dismissal (`undefined`), or
+	 * any unrecognized value falls through to refine semantics — the caller
+	 * keeps plan mode active and surfaces guidance text to the agent. Clients
+	 * without `elicitation.form` support auto-approve because there is no
+	 * confirmation surface available; without that, plan mode would strand
+	 * the agent (the bug this method exists to fix).
+	 */
+	async #requestAcpPlanApprovalChoice(sessionId: string, title: string, planContent: string): Promise<boolean> {
+		const supportsForm = this.#clientCapabilities?.elicitation?.form != null;
+		if (!supportsForm) return true;
+		// Include a short preview of the plan so the user has context in the
+		// dialog. Keep the body bounded — Zed renders elicitation messages
+		// inline and a multi-thousand-line plan blows out the dialog.
+		const previewLines = planContent.split("\n").slice(0, 12).join("\n");
+		const ellipsis = planContent.split("\n").length > 12 ? "\n…" : "";
+		const message = `Approve plan "${title}" and start implementation?\n\n${previewLines}${ellipsis}`;
+		const value = await elicitFromAcpClient(
+			this.#connection,
+			sessionId,
+			"select",
+			message,
+			{ type: "string", enum: [APPROVE_OPTION, REFINE_OPTION] },
+			undefined,
+		);
+		// Approve ONLY on the explicit approve selection. Dismissal, cancel,
+		// timeout, or any other non-approve response falls through to refine
+		// semantics so closing the dialog can never grant write access.
+		return value === APPROVE_OPTION;
+	}
+
 	#buildModeState(session: AgentSession): SessionModeState {
 		return {
 			availableModes: this.#getAvailableModes(session),

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

@@ -7,7 +7,7 @@
  *
  * Controls:
  * - Up/Down or j/k: move selection
- * - Tab / Shift+Tab: switch source tab
+ * - Tab / Shift+Tab or Left/Right: switch source tab
  * - Space: enable/disable selected agent
  * - Enter: edit model override for selected agent
  * - N: start agent creation flow
@@ -20,6 +20,7 @@ import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
 import {
 	type Component,
 	Container,
+	Editor,
 	extractPrintableText,
 	fuzzyMatch,
 	Input,
@@ -49,7 +50,7 @@ import { createAgentSession } from "../../sdk";
 import { discoverAgents } from "../../task/discovery";
 import type { AgentDefinition, AgentSource } from "../../task/types";
 import { shortenPath } from "../../tools/render-utils";
-import { theme } from "../theme/theme";
+import { getEditorTheme, theme } from "../theme/theme";
 import { matchesAppInterrupt, matchesSelectDown, matchesSelectUp } from "../utils/keybinding-matchers";
 import { DynamicBorder } from "./dynamic-border";
 
@@ -97,8 +98,10 @@ const SOURCE_LABEL: Record<AgentSource, string> = {
 	bundled: "Bundled",
 };
 
-const IDENTIFIER_PATTERN = /^[a-z0-9]+(?:-[a-z0-9]+){1,5}$/;
+const LIST_FOOTER =
+	" ↑/↓: navigate  Space: toggle  Enter: model override  N: new agent  ←/→: source  Ctrl+R: reload  Esc: close";
 
+const IDENTIFIER_PATTERN = /^[a-z0-9]+(?:-[a-z0-9]+){1,5}$/;
 function joinPatterns(patterns: string[]): string {
 	if (patterns.length === 0) return "(session model)";
 	return patterns.join(", ");
@@ -307,7 +310,7 @@ class TwoColumnBody implements Component {
 		const rightWidth = width - leftWidth - 3;
 		const leftLines = this.leftPane.render(leftWidth);
 		const rightLines = this.rightPane.render(rightWidth);
-		const lineCount = Math.min(this.maxHeight, Math.max(leftLines.length, rightLines.length));
+		const lineCount = this.maxHeight;
 		const out: string[] = [];
 		const separator = theme.fg("dim", ` ${theme.boxSharp.vertical} `);
 
@@ -339,11 +342,13 @@ export class AgentDashboard extends Container {
 	#loading = true;
 	#loadError: string | null = null;
 	#notice: string | null = null;
+	#builtRows = -1;
+	#builtCols = -1;
 
 	#editInput: Input | null = null;
 	#editingAgentName: string | null = null;
 
-	#createInput: Input | null = null;
+	#createInput: Editor | null = null;
 	#createDescription = "";
 	#createScope: AgentScope = "project";
 	#createGenerating = false;
@@ -466,8 +471,46 @@ export class AgentDashboard extends Container {
 		this.#clampSelection();
 	}
 
+	/** Live terminal height so the dashboard tracks resize while open. */
+	#terminalRows(): number {
+		return process.stdout.rows || this.terminalHeight || 24;
+	}
+
+	#noticeBlockLines(): number {
+		if (!this.#notice) return 0;
+		return wrapTextWithAnsi(theme.fg("success", replaceTabs(this.#notice)), this.#uiWidth()).length + 1;
+	}
+
+	#footerLines(): number {
+		return Math.max(1, wrapTextWithAnsi(theme.fg("dim", LIST_FOOTER), this.#uiWidth()).length);
+	}
+
+	/** Height budget for the two-column body, sized to the live terminal. */
+	#computeBodyHeight(): number {
+		// Chrome around the body: top border + title + tab bar + spacer (4),
+		// optional notice block, then spacer + footer + bottom border.
+		const chrome = 4 + this.#noticeBlockLines() + 1 + this.#footerLines() + 1;
+		return Math.max(5, this.#terminalRows() - chrome);
+	}
+
 	#getMaxVisibleItems(): number {
-		return Math.max(5, this.terminalHeight - 14);
+		// List pane chrome inside the body: search line, blank line, count line.
+		return Math.max(3, this.#computeBodyHeight() - 3);
+	}
+
+	override render(width: number): string[] {
+		// Rebuild when terminal geometry changes so the full-screen overlay
+		// re-fits on resize.
+		if (this.#terminalRows() !== this.#builtRows || this.#uiWidth() !== this.#builtCols) {
+			this.#buildLayout();
+		}
+		const lines = super.render(width);
+		// Pad to the full viewport so every state (list, edit, create) covers the
+		// screen as a true full-screen view instead of letting the transcript peek
+		// through below it.
+		const rows = this.#terminalRows();
+		while (lines.length < rows) lines.push("");
+		return lines;
 	}
 
 	#clampSelection(): void {
@@ -557,10 +600,15 @@ export class AgentDashboard extends Container {
 		this.#createError = null;
 		this.#createSpec = null;
 		this.#createDescription = "";
-		this.#createInput = new Input();
-		this.#createInput.onSubmit = value => {
-			void this.#generateAgentFromDescription(value);
+		const editor = new Editor(getEditorTheme());
+		editor.setBorderVisible(false);
+		editor.setPromptGutter("> ");
+		editor.setMaxHeight(Math.max(3, Math.min(8, this.#terminalRows() - 12)));
+		editor.disableSubmit = true;
+		editor.onChange = value => {
+			this.#createDescription = value;
 		};
+		this.#createInput = editor;
 		this.#buildLayout();
 	}
 
@@ -578,6 +626,20 @@ export class AgentDashboard extends Container {
 		this.#buildLayout();
 	}
 
+	#submitCreateDescription(): void {
+		if (!this.#createInput || this.#createGenerating) return;
+		const description = this.#createInput.getExpandedText();
+		this.#createDescription = description;
+		void this.#generateAgentFromDescription(description);
+	}
+
+	#insertCreateNewline(): void {
+		if (!this.#createInput || this.#createGenerating) return;
+		this.#createInput.handleInput("\n");
+		this.#createDescription = this.#createInput.getExpandedText();
+		this.#buildLayout();
+	}
+
 	async #generateAgentFromDescription(rawDescription: string): Promise<void> {
 		const description = rawDescription.trim();
 		this.#createDescription = description;
@@ -626,7 +688,7 @@ export class AgentDashboard extends Container {
 			throw new Error("No available model to generate agent specification.");
 		}
 
-		const systemPrompt = prompt.render(agentCreationArchitectPrompt, { TASK_TOOL_NAME: "task" });
+		const systemPrompt = prompt.render(agentCreationArchitectPrompt, {});
 		const userPrompt = prompt.render(agentCreationUserPrompt, { request: description });
 
 		const { session } = await createAgentSession({
@@ -694,10 +756,14 @@ export class AgentDashboard extends Container {
 			}
 		}
 
-		const frontmatter = YAML.stringify({
-			name: spec.identifier,
-			description: spec.whenToUse,
-		}).trimEnd();
+		const frontmatter = YAML.stringify(
+			{
+				name: spec.identifier,
+				description: spec.whenToUse,
+			},
+			null,
+			2,
+		).trimEnd();
 		const content = `---\n${frontmatter}\n---\n\n${spec.systemPrompt.trim()}\n`;
 		await Bun.write(filePath, content);
 		await this.#reloadData();
@@ -789,13 +855,13 @@ export class AgentDashboard extends Container {
 		}
 		return parts.join("");
 	}
-
 	#renderCreateInput(): void {
 		this.addChild(new Text(theme.bold(theme.fg("accent", " Create New Agent")), 0, 0));
 		this.addChild(new Spacer(1));
 		this.addChild(new Text(theme.fg("muted", "Describe what the new agent should do:"), 0, 0));
 		this.addChild(new Spacer(1));
 		if (this.#createInput) {
+			this.#createInput.setMaxHeight(Math.max(3, Math.min(8, this.#terminalRows() - 12)));
 			this.addChild(this.#createInput);
 		}
 		this.addChild(new Spacer(1));
@@ -805,7 +871,7 @@ export class AgentDashboard extends Container {
 			this.addChild(new Text(theme.fg("accent", "Generating agent specification..."), 0, 0));
 			if (this.#createStreamingText) {
 				this.addChild(new Spacer(1));
-				const maxPreview = Math.max(3, this.terminalHeight - 18);
+				const maxPreview = Math.max(3, this.#terminalRows() - 18);
 				const contentWidth = Math.max(20, this.#uiWidth() - 4);
 				const wrappedLines: string[] = [];
 				for (const raw of this.#createStreamingText.split("\n")) {
@@ -826,7 +892,9 @@ export class AgentDashboard extends Container {
 			this.addChild(new Text(theme.fg("error", replaceTabs(this.#createError)), 0, 0));
 		}
 		this.addChild(new Spacer(1));
-		const hints = this.#createGenerating ? " Generating..." : " Enter: generate  Tab: toggle scope  Esc: cancel";
+		const hints = this.#createGenerating
+			? " Generating..."
+			: " Ctrl+Enter: generate  Enter: newline  Tab: toggle scope  Esc: cancel";
 		this.addChild(new Text(theme.fg("dim", hints), 0, 0));
 	}
 
@@ -968,22 +1036,15 @@ export class AgentDashboard extends Container {
 				effectivePatterns,
 				effectiveResolution,
 			);
-			const bodyHeight = Math.max(5, this.terminalHeight - 8);
+			const bodyHeight = this.#computeBodyHeight();
 			this.addChild(new TwoColumnBody(listPane, inspector, bodyHeight));
 			this.addChild(new Spacer(1));
-			this.addChild(
-				new Text(
-					theme.fg(
-						"dim",
-						" ↑/↓: navigate  Space: toggle  Enter: model override  N: new agent  Tab: source  Ctrl+R: reload  Esc: close",
-					),
-					0,
-					0,
-				),
-			);
+			this.addChild(new Text(theme.fg("dim", LIST_FOOTER), 0, 0));
 		}
 
 		this.addChild(new DynamicBorder());
+		this.#builtRows = this.#terminalRows();
+		this.#builtCols = this.#uiWidth();
 	}
 
 	handleInput(data: string): void {
@@ -1024,13 +1085,24 @@ export class AgentDashboard extends Container {
 				}
 				return;
 			}
+			if (
+				!this.#createGenerating &&
+				(matchesKey(data, "ctrl+enter") || (data.charCodeAt(0) === 10 && data.length > 1))
+			) {
+				this.#submitCreateDescription();
+				return;
+			}
+			if (!this.#createGenerating && (matchesKey(data, "enter") || matchesKey(data, "return") || data === "\n")) {
+				this.#insertCreateNewline();
+				return;
+			}
 			if (!this.#createGenerating && (matchesKey(data, "tab") || matchesKey(data, "shift+tab"))) {
 				this.#toggleCreateScope();
 				return;
 			}
 			if (!this.#createGenerating && this.#createInput) {
 				this.#createInput.handleInput(data);
-				this.#createDescription = this.#createInput.getValue();
+				this.#createDescription = this.#createInput.getExpandedText();
 				this.#buildLayout();
 			}
 			return;
@@ -1064,11 +1136,11 @@ export class AgentDashboard extends Container {
 			return;
 		}
 
-		if (matchesKey(data, "tab")) {
+		if (matchesKey(data, "tab") || matchesKey(data, "right")) {
 			this.#switchTab(1);
 			return;
 		}
-		if (matchesKey(data, "shift+tab")) {
+		if (matchesKey(data, "shift+tab") || matchesKey(data, "left")) {
 			this.#switchTab(-1);
 			return;
 		}