@gajae-code/coding-agent 0.11.10 → 0.12.0

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

@@ -12,7 +12,7 @@ import {
 	readArgsTargetInternalUrl,
 } from "../../modes/components/read-tool-group";
 import { TodoReminderComponent } from "../../modes/components/todo-reminder";
-import { ToolExecutionComponent } from "../../modes/components/tool-execution";
+import { ToolExecutionComponent, type ToolExecutionHandle } from "../../modes/components/tool-execution";
 import { TtsrNotificationComponent } from "../../modes/components/ttsr-notification";
 import { getSymbolTheme, theme } from "../../modes/theme/theme";
 import type { InteractiveModeContext, TodoPhase } from "../../modes/types";
@@ -23,6 +23,7 @@ import type { AgentSessionEvent } from "../../session/agent-session";
 import { type CustomMessage, isSilentAbort, readPendingDisplayTag } from "../../session/messages";
 import { transferSessionMessageIdentity } from "../../session/session-manager";
 import type { ResolveToolDetails } from "../../tools/resolve";
+import { computeIrcSplitWidths, getIrcSidebarSemanticToken } from "../components/irc-sidebar";
 import type { IrcObservationRecord } from "../irc-observation-ledger";
 import { interruptHint } from "../shared";
 import { buildAbortDisplayMessage } from "../utils/abort-message";
@@ -36,7 +37,14 @@ type AgentSessionEventKind = AgentSessionEvent["type"];
 
 /** Test-only performance counters for advisory baseline tests. */
 export const __eventControllerPerfCounters = {
+	enabled: false,
 	messageUpdateContentVisits: 0,
+	enable(): void {
+		this.enabled = true;
+	},
+	disable(): void {
+		this.enabled = false;
+	},
 	reset(): void {
 		this.messageUpdateContentVisits = 0;
 	},
@@ -118,6 +126,9 @@ export class EventController {
 	#toolIntentCache = new Map<string, { args: unknown; intent: string | undefined }>();
 	#thinkingContentIndices = new Set<number>();
 	#handlers: AgentSessionEventHandlers;
+	#visibleTranscriptChanged = false;
+	#handlingEvent = false;
+	#eventQueue: Promise<void> = Promise.resolve();
 
 	constructor(private ctx: InteractiveModeContext) {
 		this.#handlers = {
@@ -162,6 +173,26 @@ export class EventController {
 		this.clearIrcExpiryTimers();
 	}
 
+	#recordVisibleTranscriptMutation(): void {
+		this.#visibleTranscriptChanged = true;
+	}
+
+	#observeVisibleTranscriptMutation(): void {
+		if (this.#handlingEvent) {
+			this.#recordVisibleTranscriptMutation();
+			return;
+		}
+		this.ctx.recordVisibleTranscriptMutation?.();
+	}
+
+	#consumeToolVisibleChange(handle: ToolExecutionHandle): void {
+		// Structural third-party renderers may not implement the optional exact-consume
+		// capability; preserve revision correctness conservatively until they opt in.
+		if (typeof handle.consumeVisibleTranscriptChange !== "function" || handle.consumeVisibleTranscriptChange()) {
+			this.#recordVisibleTranscriptMutation();
+		}
+	}
+
 	#resetReadGroup(): void {
 		this.#lastReadGroup = undefined;
 	}
@@ -228,17 +259,26 @@ export class EventController {
 		});
 	}
 
-	async handleEvent(event: AgentSessionEvent): Promise<void> {
-		if (!this.ctx.isInitialized) {
-			await this.ctx.init();
-		}
-
-		this.ctx.statusLine.invalidate();
-		this.ctx.updateEditorTopBorder();
+	handleEvent(event: AgentSessionEvent): Promise<void> {
+		const dispatch = this.#eventQueue.then(() => this.#dispatchEvent(event));
+		this.#eventQueue = dispatch.catch(() => {});
+		return dispatch;
+	}
 
-		const run = this.#handlers[event.type] as (e: AgentSessionEvent) => Promise<void>;
-		await run(event);
-		if (this.ctx.isTranscriptViewerOpen?.()) this.ctx.refreshTranscriptViewer?.();
+	async #dispatchEvent(event: AgentSessionEvent): Promise<void> {
+		if (!this.ctx.isInitialized) await this.ctx.init();
+		this.#visibleTranscriptChanged = false;
+		this.#handlingEvent = true;
+		try {
+			this.ctx.statusLine.invalidate();
+			this.ctx.updateEditorTopBorder();
+			const run = this.#handlers[event.type] as (e: AgentSessionEvent) => Promise<void>;
+			await run(event);
+			if (this.#visibleTranscriptChanged) this.ctx.recordVisibleTranscriptMutation?.();
+			if (this.ctx.isTranscriptViewerOpen?.()) this.ctx.refreshTranscriptViewer?.();
+		} finally {
+			this.#handlingEvent = false;
+		}
 	}
 
 	async #handleAgentStart(_event: Extract<AgentSessionEvent, { type: "agent_start" }>): Promise<void> {
@@ -268,8 +308,12 @@ export class EventController {
 		const parsed = parseIrcMessage(message);
 		if (!parsed) return;
 		const arrival = this.ctx.captureIrcArrivalSnapshot();
+		const rightWidth = arrival.panelVisible
+			? computeIrcSplitWidths(this.ctx.ui.terminal?.columns ?? 0).rightWidth
+			: 0;
+		const beforeToken = rightWidth > 0 ? getIrcSidebarSemanticToken(this.ctx.ircLedger, rightWidth) : "";
 		const record = this.ctx.ircLedger.observe(parsed, arrival.panelVisible);
-		this.#cleanupEvictedIrcObservations();
+		const evictedInlineRemoved = this.#cleanupIrcObservationIds(this.ctx.ircLedger.drainEvictedObservationIds());
 		if (!record) return;
 		const signature = `irc:${record.observationId}`;
 		if (this.#renderedCustomMessages.has(signature)) return;
@@ -279,9 +323,13 @@ export class EventController {
 		this.#renderedIrcComponents.set(record.observationId, components);
 		this.#scheduleIrcExpiry(record, components);
 		this.ctx.ui.requestRender();
+		const afterToken = rightWidth > 0 ? getIrcSidebarSemanticToken(this.ctx.ircLedger, rightWidth) : "";
+		if (components.length > 0 || evictedInlineRemoved || (rightWidth > 0 && beforeToken !== afterToken)) {
+			this.#recordVisibleTranscriptMutation();
+		}
 	}
 
-	#cleanupIrcObservationIds(observationIds: readonly string[]): void {
+	#cleanupIrcObservationIds(observationIds: readonly string[]): boolean {
 		const removedComponents = new Set<Component>();
 		for (const observationId of observationIds) {
 			const timer = this.#ircExpiryTimers.get(observationId);
@@ -294,23 +342,26 @@ export class EventController {
 			for (const component of this.ctx.removeRenderedIrcInlineComponents(observationId) ?? []) {
 				removedComponents.add(component);
 			}
-
 			this.#renderedCustomMessages.delete(`irc:${observationId}`);
 		}
 		for (const component of removedComponents) this.ctx.chatContainer.removeChild(component);
+		return removedComponents.size > 0;
 	}
 
 	#cleanupEvictedIrcObservations(): void {
-		this.#cleanupIrcObservationIds(this.ctx.ircLedger.drainEvictedObservationIds());
+		if (this.#cleanupIrcObservationIds(this.ctx.ircLedger.drainEvictedObservationIds())) {
+			this.#recordVisibleTranscriptMutation();
+		}
 	}
 
-	#cleanupExpiredIrcInlineComponents(observationId: string): void {
+	#cleanupExpiredIrcInlineComponents(observationId: string): boolean {
 		const removedComponents = new Set<Component>(this.#renderedIrcComponents.get(observationId));
 		this.#renderedIrcComponents.delete(observationId);
 		for (const component of this.ctx.removeRenderedIrcInlineComponents(observationId) ?? []) {
 			removedComponents.add(component);
 		}
 		for (const component of removedComponents) this.ctx.chatContainer.removeChild(component);
+		return removedComponents.size > 0;
 	}
 
 	async #handleMessageStart(event: Extract<AgentSessionEvent, { type: "message_start" }>): Promise<void> {
@@ -326,6 +377,7 @@ export class EventController {
 			this.#renderedCustomMessages.add(signature);
 			this.#resetReadGroup();
 			this.ctx.addMessageToChat(event.message);
+			if (event.message.display) this.#recordVisibleTranscriptMutation();
 			// Tag-keyed pending-bar refresh: when AgentSession.#handleAgentEvent
 			// spliced this dequeued custom message out of #steeringMessages /
 			// #followUpMessages (it ran before this emit), the array state is
@@ -373,10 +425,12 @@ export class EventController {
 				this.ctx.updatePendingMessagesDisplay();
 			}
 			this.ctx.ui.requestRender();
+			if (!wasOptimistic) this.#recordVisibleTranscriptMutation();
 		} else if (event.message.role === "fileMention") {
 			this.#resetReadGroup();
 			this.ctx.addMessageToChat(event.message);
 			this.ctx.ui.requestRender();
+			this.#recordVisibleTranscriptMutation();
 		} else if (event.message.role === "assistant") {
 			this.#lastThinkingCount = 0;
 			this.#resetReadGroup();
@@ -387,6 +441,7 @@ export class EventController {
 				this.ctx.hideThinkingBlock,
 				() => this.ctx.ui.requestRender(),
 				this.ctx.getAssistantViewportAnchorId?.(event.message),
+				() => this.#observeVisibleTranscriptMutation(),
 			);
 			this.ctx.streamingMessage = event.message;
 			addChatChild(this.ctx, this.ctx.streamingComponent);
@@ -429,15 +484,10 @@ export class EventController {
 		this.#cleanupEvictedIrcObservations();
 		const projectedObservationIds = new Set(inlineProjection.map(record => record.observationId));
 		for (const [observationId, components] of componentsByObservationId) {
-			const record = this.ctx.ircLedger.getRecord(observationId);
-			if (
-				!projectedObservationIds.has(observationId) ||
-				(record?.mode === "ephemeral" && record.expiresAt! - now <= 0)
-			) {
+			if (!projectedObservationIds.has(observationId)) {
 				for (const component of components) {
 					this.ctx.chatContainer.removeChild(component);
 				}
-				this.#renderedIrcComponents.delete(observationId);
 				componentsByObservationId.delete(observationId);
 			}
 		}
@@ -468,12 +518,12 @@ export class EventController {
 		}
 		const remainingMs = record.expiresAt! - Date.now();
 		if (remainingMs <= 0) {
-			this.#cleanupExpiredIrcInlineComponents(record.observationId);
+			if (this.#cleanupExpiredIrcInlineComponents(record.observationId)) this.#observeVisibleTranscriptMutation();
 			return false;
 		}
 		const timer = setTimeout(() => {
 			this.#ircExpiryTimers.delete(record.observationId);
-			this.#cleanupExpiredIrcInlineComponents(record.observationId);
+			if (this.#cleanupExpiredIrcInlineComponents(record.observationId)) this.#observeVisibleTranscriptMutation();
 			this.ctx.ui.requestRender();
 		}, remainingMs);
 		timer.unref?.();
@@ -496,6 +546,7 @@ export class EventController {
 		this.#resetReadGroup();
 		this.ctx.addMessageToChat(event.message);
 		this.ctx.ui.requestRender();
+		this.#recordVisibleTranscriptMutation();
 	}
 
 	async #handleModelFallbackSwitched(
@@ -549,19 +600,24 @@ export class EventController {
 			}
 
 			for (const content of contentsToProcess) {
-				__eventControllerPerfCounters.messageUpdateContentVisits += 1;
+				if (__eventControllerPerfCounters.enabled) __eventControllerPerfCounters.messageUpdateContentVisits += 1;
 				if (content.type !== "toolCall") continue;
 				if (content.name === "read") {
 					if (!readArgsHaveTarget(content.arguments)) continue;
 					if (!readArgsTargetInternalUrl(content.arguments)) {
 						this.#trackReadToolCall(content.id, content.arguments);
 						const component = this.ctx.pendingTools.get(content.id);
-						if (component) component.updateArgs(content.arguments, content.id);
-						else {
+						if (component) {
+							component.updateArgs(content.arguments, content.id);
+							this.#consumeToolVisibleChange(component);
+						} else {
 							const group = this.#getReadGroup();
 							group.updateArgs(content.arguments, content.id);
 							this.ctx.pendingTools.set(content.id, group);
+							this.#recordVisibleTranscriptMutation();
+							group.consumeVisibleTranscriptChange();
 						}
+
 						continue;
 					}
 				}
@@ -582,6 +638,7 @@ export class EventController {
 							editFuzzyThreshold: settings.get("edit.fuzzyThreshold"),
 							editAllowFuzzy: settings.get("edit.fuzzyMatch"),
 							hashlineAutoDropPureInsertDuplicates: settings.get("edit.hashlineAutoDropPureInsertDuplicates"),
+							onVisibleTranscriptMutation: () => this.#observeVisibleTranscriptMutation(),
 						},
 						tool,
 						this.ctx.ui,
@@ -591,8 +648,10 @@ export class EventController {
 					component.setExpanded(this.ctx.toolOutputExpanded);
 					this.ctx.pendingTools.set(content.id, component);
 					addChatChild(this.ctx, component);
+					this.#recordVisibleTranscriptMutation();
 				} else {
 					this.ctx.pendingTools.get(content.id)?.updateArgs(renderArgs, content.id);
+					this.#consumeToolVisibleChange(this.ctx.pendingTools.get(content.id)!);
 				}
 
 				const args = content.arguments;
@@ -659,6 +718,7 @@ export class EventController {
 			if (this.ctx.streamingMessage.stopReason !== "aborted" && this.ctx.streamingMessage.stopReason !== "error") {
 				for (const [toolCallId, component] of this.ctx.pendingTools.entries()) {
 					component.setArgsComplete(toolCallId);
+					this.#consumeToolVisibleChange(component);
 				}
 			}
 			this.#lastAssistantComponent = this.ctx.streamingComponent;
@@ -685,6 +745,8 @@ export class EventController {
 					this.ctx.pendingTools.set(event.toolCallId, group);
 				}
 				this.ctx.ui.requestRender();
+				this.#consumeToolVisibleChange(this.ctx.pendingTools.get(event.toolCallId)!);
+
 				return;
 			}
 
@@ -698,6 +760,7 @@ export class EventController {
 					editFuzzyThreshold: settings.get("edit.fuzzyThreshold"),
 					editAllowFuzzy: settings.get("edit.fuzzyMatch"),
 					hashlineAutoDropPureInsertDuplicates: settings.get("edit.hashlineAutoDropPureInsertDuplicates"),
+					onVisibleTranscriptMutation: () => this.#observeVisibleTranscriptMutation(),
 				},
 				tool,
 				this.ctx.ui,
@@ -707,6 +770,8 @@ export class EventController {
 			component.setExpanded(this.ctx.toolOutputExpanded);
 			this.ctx.pendingTools.set(event.toolCallId, component);
 			addChatChild(this.ctx, component);
+			this.#recordVisibleTranscriptMutation();
+
 			this.ctx.ui.requestRender();
 		}
 	}
@@ -723,6 +788,8 @@ export class EventController {
 				!isFinalAsyncState,
 				event.toolCallId,
 			);
+			this.#consumeToolVisibleChange(component);
+
 			if (isFinalAsyncState) {
 				this.ctx.pendingTools.delete(event.toolCallId);
 				this.#backgroundToolCallIds.delete(event.toolCallId);
@@ -737,6 +804,8 @@ export class EventController {
 				const component = this.ctx.pendingTools.get(event.toolCallId);
 				if (component) {
 					component.updateResult({ ...event.result, isError: event.isError }, false, event.toolCallId);
+					this.#consumeToolVisibleChange(component);
+
 					this.ctx.pendingTools.delete(event.toolCallId);
 				}
 				const asyncState = (event.result.details as { async?: { state?: string } } | undefined)?.async?.state;
@@ -761,6 +830,8 @@ export class EventController {
 				const asyncState = (event.result.details as { async?: { state?: string } } | undefined)?.async?.state;
 				const isBackgroundRunning = asyncState === "running";
 				component.updateResult({ ...event.result, isError: event.isError }, isBackgroundRunning, event.toolCallId);
+				this.#consumeToolVisibleChange(component);
+
 				if (isBackgroundRunning) {
 					this.#backgroundToolCallIds.add(event.toolCallId);
 				} else {
@@ -776,6 +847,8 @@ export class EventController {
 				const asyncState = (event.result.details as { async?: { state?: string } } | undefined)?.async?.state;
 				const isBackgroundRunning = asyncState === "running";
 				component.updateResult({ ...event.result, isError: event.isError }, isBackgroundRunning, event.toolCallId);
+				this.#consumeToolVisibleChange(component);
+
 				if (isBackgroundRunning) {
 					this.#backgroundToolCallIds.add(event.toolCallId);
 				} else {
@@ -893,6 +966,12 @@ export class EventController {
 			} else if (event.willRetry && !isHandoffAction) {
 				this.ctx.showStatus("Context overflow maintenance completed");
 			}
+		} else if (
+			event.skipped &&
+			event.errorMessage?.startsWith("Context overflow recovery skipped: nothing eligible to compact.") &&
+			!isHandoffAction
+		) {
+			this.ctx.showStatus(event.errorMessage);
 		} else if (event.errorMessage) {
 			this.ctx.showWarning(event.errorMessage);
 		} else if (isHandoffAction) {
@@ -999,12 +1078,15 @@ export class EventController {
 		const component = new TtsrNotificationComponent(event.rules);
 		component.setExpanded(this.ctx.toolOutputExpanded);
 		addChatChild(this.ctx, component);
+		this.#recordVisibleTranscriptMutation();
+
 		this.ctx.ui.requestRender();
 	}
 
 	async #handleTodoReminder(event: Extract<AgentSessionEvent, { type: "todo_reminder" }>): Promise<void> {
 		const component = new TodoReminderComponent(event.todos, event.attempt, event.maxAttempts);
 		addChatChild(this.ctx, component);
+		this.#recordVisibleTranscriptMutation();
 		this.ctx.ui.requestRender();
 	}
 

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

@@ -281,7 +281,24 @@ export class ExtensionUiController {
 				const disabled = [...(session.settings.get("disabledExtensions") ?? [])];
 				const on = input.on === true;
 				const next = on ? disabled.filter(value => value !== id) : [...new Set([...disabled, id])];
-				session.settings.set("disabledExtensions", next);
+				if (!session.settings.canWriteDurableConfig()) {
+					throw Object.assign(
+						new Error(
+							"Cannot change settings while config.yml has invalid YAML syntax. Repair config.yml and reload settings.",
+						),
+						{ code: "invalid_request" },
+					);
+				}
+				try {
+					session.settings.set("disabledExtensions", next);
+				} catch (error) {
+					if (!session.settings.canWriteDurableConfig()) {
+						throw Object.assign(new Error(error instanceof Error ? error.message : String(error)), {
+							code: "invalid_request",
+						});
+					}
+					throw error;
+				}
 				return { changed: true, enabled: on };
 			}
 			case "session.delete":
@@ -425,6 +442,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")) {
@@ -441,16 +459,12 @@ export class ExtensionUiController {
 				}
 				return false;
 			},
-			invokeSkill: (name, args) => this.ctx.session.invokeSkill(name, args),
+			invokeSkill: (name, args, options) => this.ctx.session.invokeSkill(name, args, options),
 			setPlanMode: on => this.ctx.session.setSdkPlanMode(on),
 			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 +741,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 +760,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);
@@ -2003,9 +2044,24 @@ export class InputController {
 	}
 
 	toggleThinkingBlockVisibility(): void {
-		this.ctx.hideThinkingBlock = !this.ctx.hideThinkingBlock;
-		settings.set("hideThinkingBlock", this.ctx.hideThinkingBlock);
-		this.ctx.session.agent.hideThinkingSummary = this.ctx.hideThinkingBlock;
+		if (!settings.canWriteDurableConfig()) {
+			this.ctx.showError(
+				"Cannot change settings while config.yml has invalid YAML syntax. Repair config.yml and reload settings.",
+			);
+			return;
+		}
+		const hideThinkingBlock = !this.ctx.hideThinkingBlock;
+		try {
+			settings.set("hideThinkingBlock", hideThinkingBlock);
+		} catch (error) {
+			if (!settings.canWriteDurableConfig()) {
+				this.ctx.showError(error instanceof Error ? error.message : String(error));
+				return;
+			}
+			throw error;
+		}
+		this.ctx.hideThinkingBlock = hideThinkingBlock;
+		this.ctx.session.setThinkingVisibility(hideThinkingBlock ? "hidden" : "visible");
 
 		// Rebuild chat from session messages
 		// Detach the live streaming component before the disposing clear() so the