@gajae-code/coding-agent 0.11.10 → 0.11.11

package/src/modes/acp/acp-event-mapper.ts

@@ -197,21 +197,26 @@ export function mapAgentSessionEventToAcpSessionUpdates(
 			return [toSessionNotification(sessionId, update)];
 		}
 		case "tool_execution_end": {
+			const args = getToolExecutionEndArgs(event, options);
 			const resultContent = [...extractDiffToolCallContent(event.result), ...extractToolCallContent(event.result)];
-			const content = mergeToolUpdateContent(
-				buildToolStartContent(event.toolName, getToolExecutionEndArgs(event, options)),
-				resultContent,
-			);
+			const content = mergeToolUpdateContent(buildToolStartContent(event.toolName, args), resultContent);
 			const update: SessionUpdate = {
 				sessionUpdate: "tool_call_update",
 				toolCallId: event.toolCallId,
 				status: event.isError ? "failed" : "completed",
 				rawOutput: event.result,
 			};
+			if (event.isError) {
+				update.title = `Failed: ${buildToolTitle(event.toolName, args, undefined)}`;
+				update.kind = "other";
+			}
 			if (content.length > 0) {
 				update.content = content;
 			}
-			const locations = extractToolLocationsFromResult(event.result, options.cwd);
+			const locations = mergeToolLocations(
+				extractToolLocations(args, options.cwd),
+				extractToolLocationsFromResult(event.result, options.cwd),
+			);
 			if (locations.length > 0) {
 				update.locations = locations;
 			}
@@ -295,14 +300,83 @@ export function mapAgentSessionEventToAcpSessionUpdates(
 			return [toSessionNotification(sessionId, { sessionUpdate: "session_info_update", _meta: meta })];
 		}
 		case "auto_retry_start":
+			return [
+				toSessionNotification(sessionId, {
+					sessionUpdate: "session_info_update",
+					_meta: {
+						gjcPhase: "retrying",
+						gjcRetryState: "waiting",
+						gjcRetryAttempt: event.attempt,
+						gjcRetryMaxAttempts: event.maxAttempts,
+						gjcRetryDelayMs: event.delayMs,
+						gjcRetryErrorMessage: event.errorMessage,
+						gjcRetryUnbounded: event.unbounded ?? false,
+						running: true,
+						gjcRunning: true,
+					},
+				}),
+			];
 		case "auto_retry_end":
+			return [
+				toSessionNotification(sessionId, {
+					sessionUpdate: "session_info_update",
+					_meta: {
+						gjcPhase: event.success ? "responding" : "retry_failed",
+						gjcRetryState: event.success ? "succeeded" : "failed",
+						gjcRetryAttempt: event.attempt,
+						...(event.finalError ? { gjcRetryFinalError: event.finalError } : {}),
+						running: true,
+						gjcRunning: true,
+					},
+				}),
+			];
 		case "ttsr_triggered":
+			return [
+				toSessionNotification(sessionId, {
+					sessionUpdate: "session_info_update",
+					_meta: {
+						gjcTtsrTriggered: true,
+						gjcTtsrRuleCount: event.rules.length,
+					},
+				}),
+			];
 		case "irc_message":
 		case "subagent_steer_message":
+			return [];
 		case "notice":
+			return [
+				toSessionNotification(sessionId, {
+					sessionUpdate: "agent_thought_chunk",
+					content: {
+						type: "text",
+						text: `[${event.level}${event.source ? `:${event.source}` : ""}] ${event.message}\n`,
+					},
+				}),
+			];
 		case "thinking_level_changed":
+			return [
+				toSessionNotification(sessionId, {
+					sessionUpdate: "session_info_update",
+					_meta: { gjcThinkingLevel: event.thinkingLevel ?? "off" },
+				}),
+			];
 		case "goal_updated":
-			return [];
+			return [
+				toSessionNotification(sessionId, {
+					sessionUpdate: "session_info_update",
+					_meta: {
+						gjcGoalActive: event.goal !== null,
+						...(event.goal
+							? {
+									gjcGoalId: event.goal.id,
+									gjcGoalStatus: event.goal.status,
+									gjcGoalObjective: event.goal.objective,
+								}
+							: {}),
+						...(event.state ? { gjcGoalModeState: event.state } : {}),
+					},
+				}),
+			];
 		default:
 			return assertNeverAcp(event);
 	}
@@ -547,6 +621,19 @@ function mergeToolUpdateContent(startContent: ToolCallContent[], resultContent:
 	return merged;
 }
 
+function mergeToolLocations(...groups: ToolCallLocation[][]): ToolCallLocation[] {
+	const locations: ToolCallLocation[] = [];
+	const seen = new Set<string>();
+	for (const group of groups) {
+		for (const location of group) {
+			if (seen.has(location.path)) continue;
+			seen.add(location.path);
+			locations.push(location);
+		}
+	}
+	return locations;
+}
+
 function isCommandToolName(toolName: string): boolean {
 	return toolName === "bash" || toolName === "shell" || toolName === "exec";
 }

package/src/modes/components/model-selector.ts

@@ -1245,8 +1245,14 @@ export class ModelSelectorComponent extends Container {
 					new Text(`${prefix}${i === this.#presetScopeIndex ? theme.fg("accent", label) : label}`, 0, 0),
 				);
 			}
+			this.#listContainer.addChild(new Spacer(1));
+			this.#listContainer.addChild(
+				new Text(theme.fg("muted", "  Enter: apply | d: set as default | Esc: back"), 0, 0),
+			);
 		} else {
-			this.#listContainer.addChild(new Text(theme.fg("muted", "  Press Enter to apply this preset"), 0, 0));
+			this.#listContainer.addChild(
+				new Text(theme.fg("muted", "  Press Enter to apply or d to set as default"), 0, 0),
+			);
 		}
 	}
 
@@ -1558,6 +1564,14 @@ export class ModelSelectorComponent extends Container {
 	}
 
 	#handlePresetLandingInput(keyData: string): void {
+		if (keyData === "d" || keyData === "D") {
+			if (this.#previewProfileName) {
+				this.#presetScopeMenuOpen = true;
+				this.#presetScopeIndex = 1;
+				this.#handlePresetEnter();
+				return;
+			}
+		}
 		if (isPrintableCharacter(keyData)) {
 			this.#switchToModelMode(keyData);
 			return;

package/src/modes/components/notifications-settings-editor.ts

@@ -195,7 +195,7 @@ function emptyState(): NotificationsEditorState {
 			sessionScope: "all",
 			richEnabled: true,
 			richDraftEnabled: false,
-			toolActivityEnabled: true,
+			toolActivityEnabled: false,
 			streamingEnabled: true,
 		},
 	};

package/src/modes/components/queue-pane.ts

@@ -1,11 +1,12 @@
 import { Container, matchesKey, type SelectItem, SelectList, Spacer, Text } from "@gajae-code/tui";
+import { formatKeyHint } from "../../config/keybindings";
 import type { QueuedMessageEditEntry } from "../../session/agent-session";
 import { getSelectListTheme, theme } from "../theme/theme";
 import { DynamicBorder } from "./dynamic-border";
 
 const MAX_VISIBLE_QUEUE_MESSAGES = 8;
-const RAW_UP = "\x1b[A";
-const RAW_DOWN = "\x1b[B";
+type QueueSelectorAction = "tui.select.confirm" | "tui.select.cancel";
+type QueueSelectorNavigationAction = "tui.select.up" | "tui.select.down" | "tui.select.pageUp" | "tui.select.pageDown";
 
 export class QueuePaneComponent extends Container {
 	#selectList: SelectList;
@@ -13,11 +14,20 @@ export class QueuePaneComponent extends Container {
 	#selectedIndex: number;
 	#onDelete: (entry: QueuedMessageEditEntry, index: number) => void;
 	#onMove: (entry: QueuedMessageEditEntry, index: number, direction: "up" | "down") => void;
-
+	#onSelect: (entry: QueuedMessageEditEntry) => void;
+	#onClose: () => void;
+	#entries: QueuedMessageEditEntry[];
+	#matchesSelectAction: (keyData: string, action: QueueSelectorAction) => boolean;
+	#resolveSelectNavigation: (keyData: string) => QueueSelectorNavigationAction | undefined;
 	constructor(
 		entries: QueuedMessageEditEntry[],
 		options: {
 			selectedIndex?: number;
+			formatKeyHint?: (key: string) => string;
+			formatSelectAction?: (action: QueueSelectorAction) => string;
+			matchesSelectAction?: (keyData: string, action: QueueSelectorAction) => boolean;
+			resolveSelectNavigation?: (keyData: string) => QueueSelectorNavigationAction | undefined;
+			onSelect: (entry: QueuedMessageEditEntry) => void;
 			onDelete: (entry: QueuedMessageEditEntry, index: number) => void;
 			onMove: (entry: QueuedMessageEditEntry, index: number, direction: "up" | "down") => void;
 			onClose: () => void;
@@ -25,23 +35,46 @@ export class QueuePaneComponent extends Container {
 	) {
 		super();
 		this.#onDelete = options.onDelete;
+		this.#onSelect = options.onSelect;
 		this.#onMove = options.onMove;
+		this.#onClose = options.onClose;
+		this.#entries = entries;
+		this.#matchesSelectAction =
+			options.matchesSelectAction ??
+			((keyData, action) => matchesKey(keyData, action === "tui.select.confirm" ? "enter" : "escape"));
+		this.#resolveSelectNavigation = options.resolveSelectNavigation ?? (() => undefined);
 		this.#selectedIndex = Math.max(0, Math.min(options.selectedIndex ?? 0, entries.length - 1));
 		this.#selectedEntry = entries[this.#selectedIndex];
 		const byId = new Map(entries.map(entry => [entry.id, entry]));
+		const displayKey = options.formatKeyHint ?? formatKeyHint;
+		const selectKeys = `${displayKey("alt+up")}/${displayKey("alt+down")}`;
+		const editKey = options.formatSelectAction
+			? options.formatSelectAction("tui.select.confirm") || "Disabled"
+			: displayKey("enter");
+		const deleteKey = displayKey("delete");
+		const moveKeys = `${displayKey("ctrl+up")}/${displayKey("ctrl+down")}`;
+		const closeKey = options.formatSelectAction
+			? options.formatSelectAction("tui.select.cancel") || "Disabled"
+			: displayKey("escape");
+		const itemHint = `${editKey} edit · ${deleteKey} remove · ${moveKeys} move`;
+		const controlsHint = `${selectKeys} select · ${itemHint} · ${closeKey} close`;
 		const items: SelectItem[] = entries.map((entry, index) => ({
 			value: entry.id,
 			label: `${entry.label} ${index + 1}`,
 			description: entry.text,
-			hint: "Del remove · Ctrl+↑/↓ move",
+			hint: itemHint,
 		}));
 
 		this.addChild(new Spacer(1));
 		this.addChild(new Text(theme.bold("Message queue"), 1, 0));
-		this.addChild(new Text(theme.fg("muted", "Del remove · Ctrl+↑/↓ move · Esc close"), 1, 0));
+		this.addChild(new Text(theme.fg("muted", controlsHint), 1, 0));
 		this.addChild(new Spacer(1));
 		this.addChild(new DynamicBorder());
 		this.#selectList = new SelectList(items, MAX_VISIBLE_QUEUE_MESSAGES, getSelectListTheme());
+		this.#selectList.onSelect = item => {
+			const entry = byId.get(item.value);
+			if (entry) this.#onSelect(entry);
+		};
 		this.#selectList.onSelectionChange = item => {
 			const index = entries.findIndex(entry => entry.id === item.value);
 			this.#selectedIndex = index === -1 ? this.#selectedIndex : index;
@@ -54,12 +87,25 @@ export class QueuePaneComponent extends Container {
 	}
 
 	handleInput(keyData: string): void {
-		if (matchesKey(keyData, "alt+up")) {
-			this.#selectList.handleInput(RAW_UP);
+		if (this.#matchesSelectAction(keyData, "tui.select.confirm")) {
+			if (this.#selectedEntry) this.#onSelect(this.#selectedEntry);
+			return;
+		}
+		if (this.#matchesSelectAction(keyData, "tui.select.cancel")) {
+			this.#onClose();
+			return;
+		}
+		const navigation = this.#resolveSelectNavigation(keyData);
+		if (navigation) {
+			this.#selectList.handleNavigation(navigation);
 			return;
 		}
-		if (matchesKey(keyData, "alt+down")) {
-			this.#selectList.handleInput(RAW_DOWN);
+		if (matchesKey(keyData, "enter") || matchesKey(keyData, "escape")) return;
+		if (matchesKey(keyData, "alt+up") || matchesKey(keyData, "alt+down")) {
+			const direction = matchesKey(keyData, "alt+up") ? -1 : 1;
+			this.#selectedIndex = (this.#selectedIndex + direction + this.#entries.length) % this.#entries.length;
+			this.#selectedEntry = this.#entries[this.#selectedIndex];
+			this.#selectList.setSelectedIndex(this.#selectedIndex);
 			return;
 		}
 		if (matchesKey(keyData, "ctrl+up") || matchesKey(keyData, "ctrl+shift+up")) {

package/src/modes/components/queued-message-selector.ts

@@ -1,12 +1,13 @@
 import { Container, matchesKey, type SelectItem, SelectList, Spacer, Text } from "@gajae-code/tui";
+import { formatKeyHint } from "../../config/keybindings";
 import type { QueuedMessageEditEntry } from "../../session/agent-session";
 import { getSelectListTheme, theme } from "../theme/theme";
 import { DynamicBorder } from "./dynamic-border";
 
 const MAX_VISIBLE_QUEUED_MESSAGES = 8;
-const RAW_UP = "\x1b[A";
-const RAW_DOWN = "\x1b[B";
 type QueuedMessageMoveDirection = "up" | "down";
+type QueueSelectorAction = "tui.select.confirm" | "tui.select.cancel";
+type QueueSelectorNavigationAction = "tui.select.up" | "tui.select.down" | "tui.select.pageUp" | "tui.select.pageDown";
 
 export type { QueuedMessageMoveDirection };
 
@@ -16,32 +17,61 @@ export class QueuedMessageSelectorComponent extends Container {
 	#selectedIndex = 0;
 	#onDelete: (entry: QueuedMessageEditEntry, selectedIndex: number) => void;
 	#onMove: (entry: QueuedMessageEditEntry, selectedIndex: number, direction: QueuedMessageMoveDirection) => void;
-
+	#onSelect: (entry: QueuedMessageEditEntry) => void;
+	#onCancel: () => void;
+	#entries: QueuedMessageEditEntry[];
+	#matchesSelectAction: (keyData: string, action: QueueSelectorAction) => boolean;
+	#resolveSelectNavigation: (keyData: string) => QueueSelectorNavigationAction | undefined;
 	constructor(
 		entries: QueuedMessageEditEntry[],
 		onSelect: (entry: QueuedMessageEditEntry) => void,
 		onDelete: (entry: QueuedMessageEditEntry, selectedIndex: number) => void,
 		onMove: (entry: QueuedMessageEditEntry, selectedIndex: number, direction: QueuedMessageMoveDirection) => void,
 		onCancel: () => void,
-		options?: { selectedIndex?: number },
+		options?: {
+			selectedIndex?: number;
+			formatKeyHint?: (key: string) => string;
+			formatSelectAction?: (action: QueueSelectorAction) => string;
+			matchesSelectAction?: (keyData: string, action: QueueSelectorAction) => boolean;
+			resolveSelectNavigation?: (keyData: string) => QueueSelectorNavigationAction | undefined;
+		},
 	) {
 		super();
 
 		this.#onDelete = onDelete;
 		this.#onMove = onMove;
+		this.#onSelect = onSelect;
+		this.#onCancel = onCancel;
+		this.#entries = entries;
+		this.#matchesSelectAction =
+			options?.matchesSelectAction ??
+			((keyData, action) => matchesKey(keyData, action === "tui.select.confirm" ? "enter" : "escape"));
+		this.#resolveSelectNavigation = options?.resolveSelectNavigation ?? (() => undefined);
 		const byId = new Map(entries.map(entry => [entry.id, entry]));
 		this.#selectedIndex = Math.max(0, Math.min(options?.selectedIndex ?? 0, entries.length - 1));
 		this.#selectedEntry = entries[this.#selectedIndex];
+		const displayKey = options?.formatKeyHint ?? formatKeyHint;
+		const selectKeys = `${displayKey("alt+up")}/${displayKey("alt+down")}`;
+		const editKey = options?.formatSelectAction
+			? options.formatSelectAction("tui.select.confirm") || "Disabled"
+			: displayKey("enter");
+		const deleteKey = displayKey("delete");
+		const moveKeys = `${displayKey("ctrl+up")}/${displayKey("ctrl+down")}`;
+		const cancelKey = options?.formatSelectAction
+			? options.formatSelectAction("tui.select.cancel") || "Disabled"
+			: displayKey("escape");
+		const itemHint = `${editKey} edit · ${deleteKey} remove · ${moveKeys} move`;
+		const controlsHint = `${selectKeys} select · ${itemHint} · ${cancelKey} cancel`;
 		const items: SelectItem[] = entries.map((entry, index) => ({
 			value: entry.id,
 			label: `${entry.label} ${index + 1}`,
 			description: entry.text,
-			hint: "Enter edit · Del remove · Ctrl+↑/↓ move",
+			hint: itemHint,
 		}));
 
 		this.addChild(new Spacer(1));
 		this.addChild(new Text(theme.bold("Queued messages"), 1, 0));
-		this.addChild(new Text(theme.fg("muted", "Enter edit · Del remove · Ctrl+↑/↓ move · Esc cancel"), 1, 0));
+		this.addChild(new Text(theme.fg("muted", controlsHint), 1, 0));
 		this.addChild(new Spacer(1));
 		this.addChild(new DynamicBorder());
 
@@ -63,12 +93,25 @@ export class QueuedMessageSelectorComponent extends Container {
 	}
 
 	handleInput(keyData: string): void {
-		if (matchesKey(keyData, "alt+up")) {
-			this.#selectList.handleInput(RAW_UP);
+		if (this.#matchesSelectAction(keyData, "tui.select.confirm")) {
+			if (this.#selectedEntry) this.#onSelect(this.#selectedEntry);
+			return;
+		}
+		if (this.#matchesSelectAction(keyData, "tui.select.cancel")) {
+			this.#onCancel();
+			return;
+		}
+		const navigation = this.#resolveSelectNavigation(keyData);
+		if (navigation) {
+			this.#selectList.handleNavigation(navigation);
 			return;
 		}
-		if (matchesKey(keyData, "alt+down")) {
-			this.#selectList.handleInput(RAW_DOWN);
+		if (matchesKey(keyData, "enter") || matchesKey(keyData, "escape")) return;
+		if (matchesKey(keyData, "alt+up") || matchesKey(keyData, "alt+down")) {
+			const direction = matchesKey(keyData, "alt+up") ? -1 : 1;
+			this.#selectedIndex = (this.#selectedIndex + direction + this.#entries.length) % this.#entries.length;
+			this.#selectedEntry = this.#entries[this.#selectedIndex];
+			this.#selectList.setSelectedIndex(this.#selectedIndex);
 			return;
 		}
 		if (matchesKey(keyData, "ctrl+up") || matchesKey(keyData, "ctrl+shift+up")) {

package/src/modes/components/tool-status-header.ts

@@ -70,16 +70,13 @@ export interface StatusLineActionHint {
 
 const ACTION_HINT_PRIORITY: readonly AppKeybinding[] = [
 	"app.message.sendNow",
-	"app.message.queue",
 	"app.message.followUp",
+	"app.message.queue",
 	"app.message.dequeue",
 	"app.commandPalette.open",
 	"app.plan.toggle",
 	"app.mode.cycle",
-	"app.thinking.cycle",
-	"app.model.select",
 	"app.model.cycleForward",
-	"app.history.search",
 	"app.session.togglePath",
 	"app.session.toggleSort",
 	"app.session.rename",

package/src/modes/components/welcome.ts

@@ -20,6 +20,7 @@ export interface WelcomeComponentOptions {
 	getViewportRows?: () => number | undefined;
 	getReservedBottomRows?: (termWidth: number) => number;
 	changelogMarkdown?: string;
+	rightGutterWidth?: number;
 	collapseChangelog?: boolean;
 	buildLabel?: string;
 	keyDisplayContext?: KeyDisplayContext;
@@ -110,7 +111,8 @@ export class WelcomeComponent implements Component {
 	}
 
 	render(termWidth: number): string[] {
-		const boxWidth = Math.max(0, termWidth);
+		const rightGutterWidth = this.#rightGutterWidth(termWidth);
+		const boxWidth = Math.max(0, termWidth - rightGutterWidth);
 		if (boxWidth < 4) {
 			return [];
 		}
@@ -245,7 +247,7 @@ export class WelcomeComponent implements Component {
 			lines.push(tl + titleStyled + theme.fg("dim", hChar.repeat(afterTitle)) + tr);
 		}
 		if (outputRows === 1) {
-			return lines;
+			return this.#withRightGutter(lines, rightGutterWidth);
 		}
 
 		if (showRightColumn) {
@@ -273,7 +275,7 @@ export class WelcomeComponent implements Component {
 			lines.push(bl + h.repeat(leftCol) + br);
 		}
 
-		return lines;
+		return this.#withRightGutter(lines, rightGutterWidth);
 	}
 
 	/** Center text within a given width */
@@ -295,6 +297,19 @@ export class WelcomeComponent implements Component {
 		}
 		return str + padding(width - visLen);
 	}
+	#rightGutterWidth(termWidth: number): number {
+		const configured = this.options.rightGutterWidth ?? 0;
+		if (!Number.isFinite(configured) || configured <= 0) return 0;
+		const gutterWidth = Math.floor(configured);
+		return Math.min(gutterWidth, Math.max(0, termWidth - 4));
+	}
+
+	#withRightGutter(lines: string[], rightGutterWidth: number): string[] {
+		if (rightGutterWidth <= 0) return lines;
+		const gutter = padding(rightGutterWidth);
+		return lines.map(line => line + gutter);
+	}
+
 	#targetRows(termWidth: number): number | undefined {
 		const viewportRows = this.options.getViewportRows?.();
 		if (typeof viewportRows !== "number" || !Number.isFinite(viewportRows) || viewportRows <= 0) {

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

@@ -65,6 +65,8 @@ export function buildHelpMarkdown(keybindings: Pick<KeybindingsManager, "getAcce
 	const displayKey = (action: Keybinding): string => keybindings.getAccessibleDisplayString(action) || "Disabled";
 	const sessionNewKey = formatHotkeyMarkdownCode(displayKey("app.session.new"));
 	const selectModelKey = formatHotkeyMarkdownCode(displayKey("app.model.select"));
+	const queueMessageKey = formatHotkeyMarkdownCode(displayKey("app.message.queue"));
+	const dequeueMessageKey = formatHotkeyMarkdownCode(displayKey("app.message.dequeue"));
 	const autocompleteNavigationKeys = formatHotkeyMarkdownCode(
 		`${displayKey("tui.select.up")}/${displayKey("tui.select.down")}`,
 		false,
@@ -84,6 +86,8 @@ export function buildHelpMarkdown(keybindings: Pick<KeybindingsManager, "getAcce
 		"| Show session details | `/session info` |",
 		"| Delete current session transcript/artifacts | `/session delete` |",
 		`| Select a model | \`/model\` or ${selectModelKey} |`,
+		`| Queue a message for the next turn | ${queueMessageKey} |`,
+		`| Select or edit a queued message | ${dequeueMessageKey} |`,
 		"| Show all shortcuts | `?` on an empty prompt or `/hotkeys` |",
 		"",
 		"**Finding commands**",

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

@@ -425,6 +425,7 @@ export class ExtensionUiController {
 			getSystemPrompt: () => this.ctx.session.systemPrompt,
 			clearContext: () => this.ctx.session.clearContext(),
 			cycleModel: () => this.ctx.session.cycleModel(),
+			setModelProfile: name => this.ctx.session.activateModelProfileForControl(name),
 			cycleThinkingLevel: () => this.ctx.session.cycleThinkingLevel(),
 			setQueueMode: (kind, mode) => {
 				if (kind === "steering" && (mode === "all" || mode === "one-at-a-time")) {
@@ -446,11 +447,7 @@ export class ExtensionUiController {
 			operateGoal: (op, objective) => this.ctx.session.operateGoal(op, objective),
 			getSkillState: () =>
 				this.ctx.session.skills.map(skill => ({ name: skill.name, description: skill.description })),
-			getConfigItems: () => ({
-				steeringMode: this.ctx.session.steeringMode,
-				followUpMode: this.ctx.session.followUpMode,
-				interruptMode: this.ctx.session.interruptMode,
-			}),
+			getConfigItems: () => this.ctx.session.getSdkConfigItems(),
 			getBranchCandidates: () => this.ctx.sessionManager.getTree(),
 			getExtensions: () => this.ctx.session.extensionRunner?.getExtensionPaths() ?? [],
 			setSdkPermissionProvider: provider => this.ctx.session.setSdkPermissionProvider(provider),
@@ -727,6 +724,7 @@ export class ExtensionUiController {
 			getSystemPrompt: () => this.ctx.session.systemPrompt,
 			clearContext: () => this.ctx.session.clearContext(),
 			cycleModel: () => this.ctx.session.cycleModel(),
+			setModelProfile: name => this.ctx.session.activateModelProfileForControl(name),
 			cycleThinkingLevel: () => this.ctx.session.cycleThinkingLevel(),
 			setQueueMode: (kind, mode) => {
 				if (kind === "steering" && (mode === "all" || mode === "one-at-a-time")) {
@@ -745,11 +743,7 @@ export class ExtensionUiController {
 			},
 			getSkillState: () =>
 				this.ctx.session.skills.map(skill => ({ name: skill.name, description: skill.description })),
-			getConfigItems: () => ({
-				steeringMode: this.ctx.session.steeringMode,
-				followUpMode: this.ctx.session.followUpMode,
-				interruptMode: this.ctx.session.interruptMode,
-			}),
+			getConfigItems: () => this.ctx.session.getSdkConfigItems(),
 			getBranchCandidates: () => this.ctx.sessionManager.getTree(),
 			getExtensions: () => this.ctx.session.extensionRunner?.getExtensionPaths() ?? [],
 			setSdkPermissionProvider: provider => this.ctx.session.setSdkPermissionProvider(provider),

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

@@ -33,6 +33,13 @@ import type { PasteTextContext } from "../components/custom-editor";
 import { QueuePaneComponent } from "../components/queue-pane";
 import { type QueuedMessageMoveDirection, QueuedMessageSelectorComponent } from "../components/queued-message-selector";
 
+const QUEUE_SELECTOR_NAVIGATION_ACTIONS = [
+	"tui.select.up",
+	"tui.select.down",
+	"tui.select.pageUp",
+	"tui.select.pageDown",
+] as const;
+
 interface Expandable {
 	setExpanded(expanded: boolean): void;
 	setManuallyExpanded?(expanded: boolean): void;
@@ -151,15 +158,24 @@ export class InputController {
 			case "app.editor.external":
 				return Boolean(getEditorCommand());
 			case "app.message.followUp":
-			case "app.message.queue":
 				return (
 					this.ctx.session.isStreaming ||
 					this.ctx.session.isCompacting ||
 					this.ctx.session.isBashRunning ||
 					this.ctx.session.isEvalRunning
 				);
+			case "app.message.queue":
+				return (
+					this.ctx.editor.getText().trim().length > 0 &&
+					(this.ctx.session.isStreaming ||
+						this.ctx.session.isCompacting ||
+						this.ctx.session.isBashRunning ||
+						this.ctx.session.isEvalRunning)
+				);
 			case "app.message.dequeue":
-				return this.ctx.session.queuedMessageCount > 0;
+				return (
+					this.ctx.session.getQueuedMessageEntries().length > 0 || this.ctx.compactionQueuedMessages.length > 0
+				);
 			case "app.clipboard.copyPrompt":
 				return this.ctx.editor.getText().length > 0;
 			case "app.session.tree":
@@ -1037,6 +1053,21 @@ export class InputController {
 		};
 		const pane = new QueuePaneComponent(entries, {
 			selectedIndex,
+			formatKeyHint: key => this.ctx.keybindings.formatKeyHint(key),
+			formatSelectAction: action => this.ctx.keybindings.getDisplayString(action),
+			matchesSelectAction: (keyData, action) =>
+				this.ctx.keybindings.getKeys(action).some(key => matchesKey(keyData, key)),
+			resolveSelectNavigation: keyData =>
+				QUEUE_SELECTOR_NAVIGATION_ACTIONS.find(action =>
+					this.ctx.keybindings.getKeys(action).some(key => matchesKey(keyData, key)),
+				),
+			onSelect: entry => {
+				const restored = this.#restoreQueuedMessageToEditor(entry);
+				close();
+				this.ctx.showStatus(
+					restored === 0 ? "Queued message is no longer available" : "Restored queued message to editor",
+				);
+			},
 			onDelete: (entry, index) => {
 				const deleted = this.ctx.session.removeQueuedMessageForEditing(entry.id) !== undefined;
 				const remaining = this.ctx.session.getQueuedMessageEntries();
@@ -1209,7 +1240,17 @@ export class InputController {
 				this.#restoreEditorFocus();
 				this.ctx.ui.requestRender();
 			},
-			{ selectedIndex },
+			{
+				selectedIndex,
+				formatKeyHint: key => this.ctx.keybindings.formatKeyHint(key),
+				formatSelectAction: action => this.ctx.keybindings.getDisplayString(action),
+				matchesSelectAction: (keyData, action) =>
+					this.ctx.keybindings.getKeys(action).some(key => matchesKey(keyData, key)),
+				resolveSelectNavigation: keyData =>
+					QUEUE_SELECTOR_NAVIGATION_ACTIONS.find(action =>
+						this.ctx.keybindings.getKeys(action).some(key => matchesKey(keyData, key)),
+					),
+			},
 		);
 		this.ctx.editorContainer.clear();
 		this.ctx.editorContainer.addChild(selector);