@oh-my-pi/pi-coding-agent 4.5.0 → 4.7.0

package/src/modes/interactive/components/hook-selector.ts

@@ -21,11 +21,12 @@ import { DynamicBorder } from "./dynamic-border";
 export interface HookSelectorOptions {
 	tui?: TUI;
 	timeout?: number;
+	initialIndex?: number;
 }
 
 export class HookSelectorComponent extends Container {
 	private options: string[];
-	private selectedIndex = 0;
+	private selectedIndex: number;
 	private listContainer: Container;
 	private onSelectCallback: (option: string) => void;
 	private onCancelCallback: () => void;
@@ -43,6 +44,7 @@ export class HookSelectorComponent extends Container {
 		super();
 
 		this.options = options;
+		this.selectedIndex = Math.min(opts?.initialIndex ?? 0, options.length - 1);
 		this.onSelectCallback = onSelect;
 		this.onCancelCallback = onCancel;
 		this.baseTitle = title;

package/src/modes/interactive/components/index.ts

@@ -31,6 +31,7 @@ export { ShowImagesSelectorComponent } from "./show-images-selector";
 export { StatusLineComponent } from "./status-line";
 export { ThemeSelectorComponent } from "./theme-selector";
 export { ThinkingSelectorComponent } from "./thinking-selector";
+export { TodoReminderComponent } from "./todo-reminder";
 export { ToolExecutionComponent, type ToolExecutionHandle, type ToolExecutionOptions } from "./tool-execution";
 export { TreeSelectorComponent } from "./tree-selector";
 export { TtsrNotificationComponent } from "./ttsr-notification";

package/src/modes/interactive/components/read-tool-group.ts

@@ -74,15 +74,23 @@ export class ReadToolGroupComponent extends Container implements ToolExecutionHa
 
 	private updateDisplay(): void {
 		const entries = [...this.entries.values()];
-		const header = `${theme.fg("toolTitle", theme.bold("Read"))}${
-			entries.length > 1 ? theme.fg("dim", ` (${entries.length})`) : ""
-		}`;
 
 		if (entries.length === 0) {
-			this.text.setText(` ${theme.format.bullet} ${header}`);
+			this.text.setText(` ${theme.format.bullet} ${theme.fg("toolTitle", theme.bold("Read"))}`);
 			return;
 		}
 
+		if (entries.length === 1) {
+			const entry = entries[0];
+			const statusSymbol = this.formatStatus(entry.status);
+			const pathDisplay = this.formatPath(entry);
+			this.text.setText(
+				` ${theme.format.bullet} ${theme.fg("toolTitle", theme.bold("Read"))} ${pathDisplay} ${statusSymbol}`.trimEnd(),
+			);
+			return;
+		}
+
+		const header = `${theme.fg("toolTitle", theme.bold("Read"))}${theme.fg("dim", ` (${entries.length})`)}`;
 		const lines = [` ${theme.format.bullet} ${header}`];
 		const total = entries.length;
 		for (const [index, entry] of entries.entries()) {

package/src/modes/interactive/components/settings-defs.ts

@@ -97,6 +97,15 @@ export const SETTINGS_DEFS: SettingDef[] = [
 		get: (sm) => sm.getBranchSummaryEnabled(),
 		set: (sm, v) => sm.setBranchSummaryEnabled(v),
 	},
+	{
+		id: "todoCompletion",
+		tab: "config",
+		type: "boolean",
+		label: "Todo completion",
+		description: "Remind agent to complete todos before stopping (up to 3 reminders)",
+		get: (sm) => sm.getTodoCompletionEnabled(),
+		set: (sm, v) => sm.setTodoCompletionEnabled(v),
+	},
 	{
 		id: "showImages",
 		tab: "config",

package/src/modes/interactive/components/todo-display.ts

@@ -98,7 +98,7 @@ export class TodoDisplayComponent {
 		}
 
 		if (hasMore) {
-			lines.push(theme.fg("dim", `      ${theme.tree.hook} +${this.todos.length - 5} more (Ctrl+T to expand)`));
+			lines.push(theme.fg("dim", `        ${theme.tree.hook} +${this.todos.length - 5} more (Ctrl+T to expand)`));
 		}
 
 		return lines;

package/src/modes/interactive/components/todo-reminder.ts

@@ -0,0 +1,42 @@
+import { Box, Container, Spacer, Text } from "@oh-my-pi/pi-tui";
+import type { TodoItem } from "../../../core/tools/todo-write";
+import { theme } from "../theme/theme";
+
+/**
+ * Component that renders a todo completion reminder notification.
+ * Shows when the agent stops with incomplete todos.
+ */
+export class TodoReminderComponent extends Container {
+	private todos: TodoItem[];
+	private attempt: number;
+	private maxAttempts: number;
+	private box: Box;
+
+	constructor(todos: TodoItem[], attempt: number, maxAttempts: number) {
+		super();
+		this.todos = todos;
+		this.attempt = attempt;
+		this.maxAttempts = maxAttempts;
+
+		this.addChild(new Spacer(1));
+
+		this.box = new Box(1, 1, (t) => theme.inverse(theme.fg("warning", t)));
+		this.addChild(this.box);
+
+		this.rebuild();
+	}
+
+	private rebuild(): void {
+		this.box.clear();
+
+		const count = this.todos.length;
+		const label = count === 1 ? "todo" : "todos";
+		const header = `${theme.icon.warning} ${count} incomplete ${label} - reminder ${this.attempt}/${this.maxAttempts}`;
+
+		this.box.addChild(new Text(header, 0, 0));
+		this.box.addChild(new Spacer(1));
+
+		const todoList = this.todos.map((t) => `  ${theme.checkbox.unchecked} ${t.content}`).join("\n");
+		this.box.addChild(new Text(theme.italic(todoList), 0, 0));
+	}
+}

package/src/modes/interactive/controllers/command-controller.ts

@@ -376,6 +376,7 @@ export class CommandController {
 		this.ctx.chatContainer.addChild(
 			new Text(`${theme.fg("accent", `${theme.status.success} New session started`)}`, 1, 1),
 		);
+		await this.ctx.reloadTodos();
 		this.ctx.ui.requestRender();
 	}
 
@@ -476,6 +477,17 @@ export class CommandController {
 		await this.executeCompaction(customInstructions, false);
 	}
 
+	async handleSkillCommand(skillPath: string, args: string): Promise<void> {
+		try {
+			const content = fs.readFileSync(skillPath, "utf-8");
+			const body = content.replace(/^---\n[\s\S]*?\n---\n/, "").trim();
+			const message = args ? `${body}\n\n---\n\nUser: ${args}` : body;
+			await this.ctx.session.prompt(message);
+		} catch (err) {
+			this.ctx.showError(`Failed to load skill: ${err instanceof Error ? err.message : String(err)}`);
+		}
+	}
+
 	async executeCompaction(customInstructions?: string, isAuto = false): Promise<void> {
 		if (this.ctx.loadingAnimation) {
 			this.ctx.loadingAnimation.stop();

package/src/modes/interactive/controllers/event-controller.ts

@@ -3,6 +3,7 @@ import type { AgentSessionEvent } from "../../../core/agent-session";
 import { detectNotificationProtocol, isNotificationSuppressed, sendNotification } from "../../../core/terminal-notify";
 import { AssistantMessageComponent } from "../components/assistant-message";
 import { ReadToolGroupComponent } from "../components/read-tool-group";
+import { TodoReminderComponent } from "../components/todo-reminder";
 import { ToolExecutionComponent } from "../components/tool-execution";
 import { TtsrNotificationComponent } from "../components/ttsr-notification";
 import { getSymbolTheme, theme } from "../theme/theme";
@@ -150,6 +151,15 @@ export class EventController {
 				if (event.message.role === "user") break;
 				if (this.ctx.streamingComponent && event.message.role === "assistant") {
 					this.ctx.streamingMessage = event.message;
+					let errorMessage: string | undefined;
+					if (this.ctx.streamingMessage.stopReason === "aborted" && !this.ctx.session.isTtsrAbortPending) {
+						const retryAttempt = this.ctx.session.retryAttempt;
+						errorMessage =
+							retryAttempt > 0
+								? `Aborted after ${retryAttempt} retry attempt${retryAttempt > 1 ? "s" : ""}`
+								: "Operation aborted";
+						this.ctx.streamingMessage.errorMessage = errorMessage;
+					}
 					if (this.ctx.session.isTtsrAbortPending && this.ctx.streamingMessage.stopReason === "aborted") {
 						const msgWithoutAbort = { ...this.ctx.streamingMessage, stopReason: "stop" as const };
 						this.ctx.streamingComponent.updateContent(msgWithoutAbort);
@@ -162,14 +172,7 @@ export class EventController {
 						this.ctx.streamingMessage.stopReason === "error"
 					) {
 						if (!this.ctx.session.isTtsrAbortPending) {
-							let errorMessage: string;
-							if (this.ctx.streamingMessage.stopReason === "aborted") {
-								const retryAttempt = this.ctx.session.retryAttempt;
-								errorMessage =
-									retryAttempt > 0
-										? `Aborted after ${retryAttempt} retry attempt${retryAttempt > 1 ? "s" : ""}`
-										: "Operation aborted";
-							} else {
+							if (!errorMessage) {
 								errorMessage = this.ctx.streamingMessage.errorMessage || "Error";
 							}
 							for (const [toolCallId, component] of this.ctx.pendingTools.entries()) {
@@ -372,6 +375,13 @@ export class EventController {
 				this.ctx.ui.requestRender();
 				break;
 			}
+
+			case "todo_reminder": {
+				const component = new TodoReminderComponent(event.todos, event.attempt, event.maxAttempts);
+				this.ctx.chatContainer.addChild(component);
+				this.ctx.ui.requestRender();
+				break;
+			}
 		}
 	}
 

package/src/modes/interactive/controllers/extension-ui-controller.ts

@@ -25,7 +25,7 @@ export class ExtensionUiController {
 	async initHooksAndCustomTools(): Promise<void> {
 		// Create and set hook & tool UI context
 		const uiContext: ExtensionUIContext = {
-			select: (title, options, _dialogOptions) => this.showHookSelector(title, options),
+			select: (title, options, dialogOptions) => this.showHookSelector(title, options, dialogOptions?.initialIndex),
 			confirm: (title, message, _dialogOptions) => this.showHookConfirm(title, message),
 			input: (title, placeholder, _dialogOptions) => this.showHookInput(title, placeholder),
 			notify: (message, type) => this.showHookNotify(message, type),
@@ -141,6 +141,7 @@ export class ExtensionUiController {
 				this.ctx.chatContainer.addChild(
 					new Text(`${theme.fg("accent", `${theme.status.success} New session started`)}`, 1, 1),
 				);
+				await this.ctx.reloadTodos();
 				this.ctx.ui.requestRender();
 
 				return { cancelled: false };
@@ -154,6 +155,7 @@ export class ExtensionUiController {
 				// Update UI
 				this.ctx.chatContainer.clear();
 				this.ctx.renderInitialMessages();
+				await this.ctx.reloadTodos();
 				this.ctx.editor.setText(result.selectedText);
 				this.ctx.showStatus("Branched to new session");
 
@@ -168,6 +170,7 @@ export class ExtensionUiController {
 				// Update UI
 				this.ctx.chatContainer.clear();
 				this.ctx.renderInitialMessages();
+				await this.ctx.reloadTodos();
 				if (result.editorText) {
 					this.ctx.editor.setText(result.editorText);
 				}
@@ -289,6 +292,7 @@ export class ExtensionUiController {
 				this.ctx.chatContainer.addChild(
 					new Text(`${theme.fg("accent", `${theme.status.success} New session started`)}`, 1, 1),
 				);
+				await this.ctx.reloadTodos();
 				this.ctx.ui.requestRender();
 
 				return { cancelled: false };
@@ -305,6 +309,7 @@ export class ExtensionUiController {
 				// Update UI
 				this.ctx.chatContainer.clear();
 				this.ctx.renderInitialMessages();
+				await this.ctx.reloadTodos();
 				this.ctx.editor.setText(result.selectedText);
 				this.ctx.showStatus("Branched to new session");
 
@@ -322,6 +327,7 @@ export class ExtensionUiController {
 				// Update UI
 				this.ctx.chatContainer.clear();
 				this.ctx.renderInitialMessages();
+				await this.ctx.reloadTodos();
 				if (result.editorText) {
 					this.ctx.editor.setText(result.editorText);
 				}
@@ -425,7 +431,7 @@ export class ExtensionUiController {
 	/**
 	 * Show a selector for hooks.
 	 */
-	showHookSelector(title: string, options: string[]): Promise<string | undefined> {
+	showHookSelector(title: string, options: string[], initialIndex?: number): Promise<string | undefined> {
 		return new Promise((resolve) => {
 			this.ctx.hookSelector = new HookSelectorComponent(
 				title,
@@ -438,6 +444,7 @@ export class ExtensionUiController {
 					this.hideHookSelector();
 					resolve(undefined);
 				},
+				{ initialIndex },
 			);
 
 			this.ctx.editorContainer.clear();

package/src/modes/interactive/controllers/input-controller.ts

@@ -24,14 +24,7 @@ export class InputController {
 	setupKeyHandlers(): void {
 		this.ctx.editor.onEscape = () => {
 			if (this.ctx.loadingAnimation) {
-				// Abort and restore queued messages to editor
-				const queuedMessages = this.ctx.session.clearQueue();
-				const queuedText = [...queuedMessages.steering, ...queuedMessages.followUp].join("\n\n");
-				const currentText = this.ctx.editor.getText();
-				const combinedText = [queuedText, currentText].filter((t) => t.trim()).join("\n\n");
-				this.ctx.editor.setText(combinedText);
-				this.ctx.updatePendingMessagesDisplay();
-				this.ctx.agent.abort();
+				this.restoreQueuedMessagesToEditor({ abort: true });
 			} else if (this.ctx.session.isBashRunning) {
 				this.ctx.session.abortBash();
 			} else if (this.ctx.isBashMode) {
@@ -241,6 +234,27 @@ export class InputController {
 				return;
 			}
 
+			// Handle skill commands (/skill:name [args])
+			if (text.startsWith("/skill:")) {
+				const spaceIndex = text.indexOf(" ");
+				const commandName = spaceIndex === -1 ? text.slice(1) : text.slice(1, spaceIndex);
+				const args = spaceIndex === -1 ? "" : text.slice(spaceIndex + 1).trim();
+				const skillPath = this.ctx.skillCommands?.get(commandName);
+				if (skillPath) {
+					this.ctx.editor.addToHistory(text);
+					this.ctx.editor.setText("");
+					try {
+						const content = fs.readFileSync(skillPath, "utf-8");
+						const body = content.replace(/^---\n[\s\S]*?\n---\n/, "").trim();
+						const message = args ? `${body}\n\n---\n\nUser: ${args}` : body;
+						await this.ctx.session.prompt(message);
+					} catch (err) {
+						this.ctx.showError(`Failed to load skill: ${err instanceof Error ? err.message : String(err)}`);
+					}
+					return;
+				}
+			}
+
 			// Handle bash command (! for normal, !! for excluded from context)
 			if (text.startsWith("!")) {
 				const isExcluded = text.startsWith("!!");
@@ -295,7 +309,7 @@ export class InputController {
 					.then(async (title) => {
 						if (title) {
 							await this.ctx.sessionManager.setSessionTitle(title);
-							setTerminalTitle(`omp: ${title}`);
+							setTerminalTitle(`π: ${title}`);
 						}
 					})
 					.catch(() => {});
@@ -341,15 +355,33 @@ export class InputController {
 	}
 
 	handleDequeue(): void {
-		const message = this.ctx.session.popLastQueuedMessage();
-		if (!message) return;
+		const restored = this.restoreQueuedMessagesToEditor();
+		if (restored === 0) {
+			this.ctx.showStatus("No queued messages to restore");
+		} else {
+			this.ctx.showStatus(`Restored ${restored} queued message${restored > 1 ? "s" : ""} to editor`);
+		}
+	}
 
-		// Prepend to existing editor text (if any)
-		const currentText = this.ctx.editor.getText();
-		const newText = currentText ? `${message}\n\n${currentText}` : message;
-		this.ctx.editor.setText(newText);
+	restoreQueuedMessagesToEditor(options?: { abort?: boolean; currentText?: string }): number {
+		const { steering, followUp } = this.ctx.session.clearQueue();
+		const allQueued = [...steering, ...followUp];
+		if (allQueued.length === 0) {
+			this.ctx.updatePendingMessagesDisplay();
+			if (options?.abort) {
+				this.ctx.agent.abort();
+			}
+			return 0;
+		}
+		const queuedText = allQueued.join("\n\n");
+		const currentText = options?.currentText ?? this.ctx.editor.getText();
+		const combinedText = [queuedText, currentText].filter((t) => t.trim()).join("\n\n");
+		this.ctx.editor.setText(combinedText);
 		this.ctx.updatePendingMessagesDisplay();
-		this.ctx.ui.requestRender();
+		if (options?.abort) {
+			this.ctx.agent.abort();
+		}
+		return allQueued.length;
 	}
 
 	handleBackgroundCommand(): void {

package/src/modes/interactive/controllers/selector-controller.ts

@@ -352,16 +352,41 @@ export class SelectorController {
 						return;
 					}
 
-					// Ask about summarization (or skip if disabled in settings)
+					// Ask about summarization
 					done(); // Close selector first
 
+					// Loop until user makes a complete choice or cancels to tree
+					let wantsSummary = false;
+					let customInstructions: string | undefined;
+
 					const branchSummariesEnabled = this.ctx.settingsManager.getBranchSummaryEnabled();
-					const wantsSummary = branchSummariesEnabled
-						? await this.ctx.showHookConfirm(
-								"Summarize branch?",
-								"Create a summary of the branch you're leaving?",
-							)
-						: false;
+
+					while (branchSummariesEnabled) {
+						const summaryChoice = await this.ctx.showHookSelector("Summarize branch?", [
+							"No summary",
+							"Summarize",
+							"Summarize with custom prompt",
+						]);
+
+						if (summaryChoice === undefined) {
+							// User pressed escape - re-show tree selector
+							this.showTreeSelector();
+							return;
+						}
+
+						wantsSummary = summaryChoice !== "No summary";
+
+						if (summaryChoice === "Summarize with custom prompt") {
+							customInstructions = await this.ctx.showHookEditor("Custom summarization instructions");
+							if (customInstructions === undefined) {
+								// User cancelled - loop back to summary selector
+								continue;
+							}
+						}
+
+						// User made a complete choice
+						break;
+					}
 
 					// Set up escape handler and loader if summarizing
 					let summaryLoader: Loader | undefined;
@@ -384,7 +409,10 @@ export class SelectorController {
 					}
 
 					try {
-						const result = await this.ctx.session.navigateTree(entryId, { summarize: wantsSummary });
+						const result = await this.ctx.session.navigateTree(entryId, {
+							summarize: wantsSummary,
+							customInstructions,
+						});
 
 						if (result.aborted) {
 							// Summarization aborted - re-show tree selector
@@ -400,6 +428,7 @@ export class SelectorController {
 						// Update UI
 						this.ctx.chatContainer.clear();
 						this.ctx.renderInitialMessages();
+						await this.ctx.reloadTodos();
 						if (result.editorText) {
 							this.ctx.editor.setText(result.editorText);
 						}
@@ -472,6 +501,7 @@ export class SelectorController {
 		// Clear and re-render the chat
 		this.ctx.chatContainer.clear();
 		this.ctx.renderInitialMessages();
+		await this.ctx.reloadTodos();
 		this.ctx.showStatus("Resumed session");
 	}
 

package/src/modes/interactive/interactive-mode.ts

@@ -109,6 +109,8 @@ export class InteractiveMode implements InteractiveModeContext {
 	public lastEscapeTime = 0;
 	public lastVoiceInterruptAt = 0;
 	public voiceAutoModeEnabled = false;
+	public shutdownRequested = false;
+	private isShuttingDown = false;
 	public voiceProgressTimer: ReturnType<typeof setTimeout> | undefined = undefined;
 	public voiceProgressSpoken = false;
 	public voiceProgressLastLength = 0;
@@ -118,6 +120,7 @@ export class InteractiveMode implements InteractiveModeContext {
 	public lastStatusSpacer: Spacer | undefined = undefined;
 	public lastStatusText: Text | undefined = undefined;
 	public fileSlashCommands: Set<string> = new Set();
+	public skillCommands: Map<string, string> = new Map();
 
 	private pendingSlashCommands: SlashCommand[] = [];
 	private cleanupUnsubscribe?: () => void;
@@ -231,8 +234,18 @@ export class InteractiveMode implements InteractiveModeContext {
 			description: `${loaded.command.description} (${loaded.source})`,
 		}));
 
+		// Build skill commands from session.skills (if enabled)
+		const skillCommandList: SlashCommand[] = [];
+		if (this.settingsManager.getEnableSkillCommands?.()) {
+			for (const skill of this.session.skills) {
+				const commandName = `skill:${skill.name}`;
+				this.skillCommands.set(commandName, skill.filePath);
+				skillCommandList.push({ name: commandName, description: skill.description });
+			}
+		}
+
 		// Store pending commands for init() where file commands are loaded async
-		this.pendingSlashCommands = [...slashCommands, ...hookCommands, ...customCommands];
+		this.pendingSlashCommands = [...slashCommands, ...hookCommands, ...customCommands, ...skillCommandList];
 
 		this.uiHelpers = new UiHelpers(this);
 		this.voiceManager = new VoiceManager(this);
@@ -433,7 +446,7 @@ export class InteractiveMode implements InteractiveModeContext {
 
 		if (!this.todoExpanded && visibleTodos.length < this.todoItems.length) {
 			const remaining = this.todoItems.length - visibleTodos.length;
-			lines.push(theme.fg("muted", `${indent}${hook} +${remaining} more (Ctrl+T to expand)`));
+			lines.push(theme.fg("muted", `${indent}  ${hook} +${remaining} more (Ctrl+T to expand)`));
 		}
 
 		this.todoContainer.addChild(new Text(lines.join("\n"), 1, 0));
@@ -486,6 +499,9 @@ export class InteractiveMode implements InteractiveModeContext {
 	}
 
 	async shutdown(): Promise<void> {
+		if (this.isShuttingDown) return;
+		this.isShuttingDown = true;
+
 		this.voiceAutoModeEnabled = false;
 		await this.voiceSupervisor.stop();
 
@@ -499,6 +515,11 @@ export class InteractiveMode implements InteractiveModeContext {
 		process.exit(0);
 	}
 
+	async checkShutdownRequested(): Promise<void> {
+		if (!this.shutdownRequested) return;
+		await this.shutdown();
+	}
+
 	// Extension UI integration
 	setToolUIContext(uiContext: ExtensionUIContext, hasUI: boolean): void {
 		this.toolUiContextSetter(uiContext, hasUI);
@@ -736,6 +757,11 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.ui.requestRender();
 	}
 
+	async reloadTodos(): Promise<void> {
+		await this.loadTodoList();
+		this.ui.requestRender();
+	}
+
 	openExternalEditor(): void {
 		this.inputController.openExternalEditor();
 	}
@@ -789,8 +815,8 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.extensionUiController.setHookStatus(key, text);
 	}
 
-	showHookSelector(title: string, options: string[]): Promise<string | undefined> {
-		return this.extensionUiController.showHookSelector(title, options);
+	showHookSelector(title: string, options: string[], initialIndex?: number): Promise<string | undefined> {
+		return this.extensionUiController.showHookSelector(title, options, initialIndex);
 	}
 
 	hideHookSelector(): void {

package/src/modes/interactive/types.ts

@@ -74,6 +74,7 @@ export interface InteractiveModeContext {
 	lastEscapeTime: number;
 	lastVoiceInterruptAt: number;
 	voiceAutoModeEnabled: boolean;
+	shutdownRequested: boolean;
 	voiceProgressTimer: ReturnType<typeof setTimeout> | undefined;
 	voiceProgressSpoken: boolean;
 	voiceProgressLastLength: number;
@@ -83,11 +84,13 @@ export interface InteractiveModeContext {
 	lastStatusSpacer: Spacer | undefined;
 	lastStatusText: Text | undefined;
 	fileSlashCommands: Set<string>;
+	skillCommands: Map<string, string>;
 	todoItems: TodoItem[];
 
 	// Lifecycle
 	init(): Promise<void>;
 	shutdown(): Promise<void>;
+	checkShutdownRequested(): Promise<void>;
 
 	// Extension UI integration
 	setToolUIContext(uiContext: ExtensionUIContext, hasUI: boolean): void;
@@ -121,6 +124,7 @@ export interface InteractiveModeContext {
 	updateEditorBorderColor(): void;
 	rebuildChatFromMessages(): void;
 	setTodos(todos: TodoItem[]): void;
+	reloadTodos(): Promise<void>;
 	toggleTodoExpansion(): void;
 
 	// Command handling
@@ -181,7 +185,7 @@ export interface InteractiveModeContext {
 	): Promise<void>;
 	setHookWidget(key: string, content: unknown): void;
 	setHookStatus(key: string, text: string | undefined): void;
-	showHookSelector(title: string, options: string[]): Promise<string | undefined>;
+	showHookSelector(title: string, options: string[], initialIndex?: number): Promise<string | undefined>;
 	hideHookSelector(): void;
 	showHookInput(title: string, placeholder?: string): Promise<string | undefined>;
 	hideHookInput(): void;

package/src/modes/rpc/rpc-mode.ts

@@ -189,6 +189,14 @@ export async function runRpcMode(session: AgentSession): Promise<never> {
 			// Component factories are not supported in RPC mode - would need TUI access
 		},
 
+		setFooter(_factory: unknown): void {
+			// Custom footer not supported in RPC mode - requires TUI access
+		},
+
+		setHeader(_factory: unknown): void {
+			// Custom header not supported in RPC mode - requires TUI access
+		},
+
 		setTitle(title: string): void {
 			// Fire and forget - host can implement terminal title control
 			output({
@@ -257,9 +265,9 @@ export async function runRpcMode(session: AgentSession): Promise<never> {
 			return { success: false, error: "Theme switching not supported in RPC mode" };
 		},
 
-		setFooter() {},
-		setHeader() {},
-		setEditorComponent() {},
+		setEditorComponent(): void {
+			// Custom editor components not supported in RPC mode
+		},
 	});
 
 	// Set up extensions with RPC-based UI context

package/src/prompts/tools/ask.md

@@ -13,11 +13,25 @@ Tips:
 - 2-5 concise, distinct options
 - Users can always select "Other" for custom input
 
+**Do NOT include an "Other" option in your options array.** The UI automatically adds "Other (type your own)" to every question. Adding your own creates duplicate "Other" options.
+
 <example>
 question: "Which authentication method should this API use?"
 options: [{"label": "JWT (Recommended)"}, {"label": "OAuth2"}, {"label": "Session cookies"}]
 </example>
 
+## Multi-part questions
+
+When you have multiple related questions, use the `questions` array instead of asking one at a time. Each question has its own id, options, and optional `multi` flag.
+
+<example>
+questions: [
+  {"id": "auth", "question": "Which auth method?", "options": [{"label": "JWT"}, {"label": "OAuth2"}]},
+  {"id": "cache", "question": "Enable caching?", "options": [{"label": "Yes"}, {"label": "No"}]},
+  {"id": "features", "question": "Which features to include?", "options": [{"label": "Logging"}, {"label": "Metrics"}, {"label": "Tracing"}], "multi": true}
+]
+</example>
+
 ## Critical: Resolve before asking
 
 **Exhaust all other options before asking.** Questions interrupt user flow.