@gajae-code/coding-agent 0.9.1 → 0.9.3

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

@@ -269,7 +269,7 @@ export class AssistantMessageComponent extends Container {
 								displayImage.data,
 								displayImage.mimeType,
 								{ fallbackColor: (text: string) => theme.fg("toolOutput", text) },
-								resolveImageOptions(),
+								{ ...resolveImageOptions(), refetch: () => displayImage.data },
 							),
 					),
 				});

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

@@ -1,4 +1,4 @@
-import type { ThinkingLevel } from "@gajae-code/agent-core";
+import { ThinkingLevel, type ThinkingLevel as ThinkingLevelValue } from "@gajae-code/agent-core";
 import type { Effort } from "@gajae-code/ai";
 import {
 	Container,
@@ -654,7 +654,7 @@ export interface SettingsRuntimeContext {
 	/** Available thinking levels (from session) */
 	availableThinkingLevels: Effort[];
 	/** Current thinking level (from session) */
-	thinkingLevel: ThinkingLevel | undefined;
+	thinkingLevel: ThinkingLevelValue | undefined;
 	/** Available themes */
 	availableThemes: string[];
 	/** Available model profile names (from the model registry) */
@@ -843,7 +843,7 @@ export class SettingsSelectorComponent extends Container {
 
 		// Special case: inject runtime options for thinking level
 		if (def.path === "defaultThinkingLevel") {
-			options = this.context.availableThinkingLevels.map(level => {
+			options = [ThinkingLevel.Off, ...this.context.availableThinkingLevels].map(level => {
 				const baseOpt = options.find(o => o.value === level);
 				return baseOpt || { value: level, label: level };
 			});

package/src/modes/components/status-line/presets.ts

@@ -3,7 +3,7 @@ import type { PresetDef, StatusLinePreset } from "./types";
 export const STATUS_LINE_PRESETS: Record<StatusLinePreset, PresetDef> = {
 	default: {
 		leftSegments: ["model", "mode", "git", "pr", "path"],
-		rightSegments: ["session_name", "jobs", "token_rate", "context_pct", "cost"],
+		rightSegments: ["session_name", "jobs", "token_rate", "cost"],
 		separator: "slash",
 		segmentOptions: {
 			model: { showThinkingLevel: true },
@@ -14,7 +14,7 @@ export const STATUS_LINE_PRESETS: Record<StatusLinePreset, PresetDef> = {
 
 	"default-usage": {
 		leftSegments: ["model", "mode", "git", "pr", "path"],
-		rightSegments: ["session_name", "jobs", "token_rate", "usage", "context_pct", "cost"],
+		rightSegments: ["session_name", "jobs", "token_rate", "usage", "cost"],
 		separator: "slash",
 		segmentOptions: {
 			model: { showThinkingLevel: true },
@@ -35,7 +35,7 @@ export const STATUS_LINE_PRESETS: Record<StatusLinePreset, PresetDef> = {
 
 	compact: {
 		leftSegments: ["model", "mode", "git", "pr"],
-		rightSegments: ["session_name", "jobs", "cost", "context_pct"],
+		rightSegments: ["session_name", "jobs", "cost"],
 		separator: "slash",
 		segmentOptions: {
 			model: { showThinkingLevel: false },
@@ -53,7 +53,6 @@ export const STATUS_LINE_PRESETS: Record<StatusLinePreset, PresetDef> = {
 			"token_rate",
 			"cache_read",
 			"cost",
-			"context_pct",
 			"time_spent",
 			"time",
 		],
@@ -78,7 +77,6 @@ export const STATUS_LINE_PRESETS: Record<StatusLinePreset, PresetDef> = {
 			"cache_write",
 			"token_rate",
 			"cost",
-			"context_pct",
 			"context_total",
 			"time_spent",
 			"time",
@@ -95,7 +93,7 @@ export const STATUS_LINE_PRESETS: Record<StatusLinePreset, PresetDef> = {
 	ascii: {
 		// No Nerd Font dependencies
 		leftSegments: ["model", "mode", "path", "git", "pr"],
-		rightSegments: ["session_name", "jobs", "token_total", "cost", "context_pct"],
+		rightSegments: ["session_name", "jobs", "token_total", "cost"],
 		separator: "ascii",
 		segmentOptions: {
 			model: { showThinkingLevel: true },
@@ -107,7 +105,7 @@ export const STATUS_LINE_PRESETS: Record<StatusLinePreset, PresetDef> = {
 	custom: {
 		// User-defined - these are just defaults that get overridden
 		leftSegments: ["model", "mode", "path", "git", "pr"],
-		rightSegments: ["session_name", "jobs", "token_total", "cost", "context_pct"],
+		rightSegments: ["session_name", "jobs", "token_total", "cost"],
 		separator: "slash",
 		segmentOptions: {},
 	},

package/src/modes/components/status-line/segments.ts

@@ -105,6 +105,20 @@ const modelSegment: StatusLineSegment = {
 				}
 			}
 		}
+		// Show the context-window token percentage right next to the model /
+		// reasoning effort (rather than as a trailing segment) so it stays
+		// grouped with the model it describes. Disable per-preset with
+		// `segmentOptions.model.showContextPercent: false`. Suppressed
+		// automatically when a standalone context_pct segment is also in the
+		// active layout, so the value is never shown twice.
+		if (opts.showContextPercent !== false && ctx.contextPctSegmentActive !== true) {
+			const pct = ctx.contextPercent;
+			const window = ctx.contextWindow;
+			if (window > 0 && Number.isFinite(pct)) {
+				const color = getContextUsageThemeColor(getContextUsageLevel(pct, window));
+				content += `${theme.sep.dot}${theme.fg(color, `${pct.toFixed(1)}%`)}`;
+			}
+		}
 
 		return { content: theme.fg("statusLineModel", content), visible: true };
 	},

package/src/modes/components/status-line/types.ts

@@ -41,6 +41,12 @@ export interface SegmentContext {
 	};
 	contextPercent: number;
 	contextWindow: number;
+	/**
+	 * True when a standalone `context_pct` segment is also part of the active
+	 * layout. The model segment suppresses its inline percentage in that case to
+	 * avoid showing the same value twice.
+	 */
+	contextPctSegmentActive?: boolean;
 	autoCompactEnabled: boolean;
 	subagentCount: number;
 	jobs: JobsSnapshot;

package/src/modes/components/status-line.ts

@@ -29,7 +29,7 @@ import { calculateTokensPerSecond } from "./status-line/token-rate";
 import type { SeparatorDef } from "./status-line/types";
 
 export interface StatusLineSegmentOptions {
-	model?: { showThinkingLevel?: boolean };
+	model?: { showThinkingLevel?: boolean; showContextPercent?: boolean };
 	path?: { abbreviate?: boolean; maxLength?: number; stripWorkPrefix?: boolean };
 	git?: { showBranch?: boolean; showStaged?: boolean; showUnstaged?: boolean; showUntracked?: boolean };
 	time?: { format?: "12h" | "24h"; showSeconds?: boolean };
@@ -700,6 +700,11 @@ export class StatusLineComponent implements Component {
 		const contextTokens = breakdown.usedTokens;
 		const contextWindow = breakdown.contextWindow || state.model?.contextWindow || 0;
 		const contextPercent = contextWindow > 0 ? (contextTokens / contextWindow) * 100 : 0;
+		// Suppress the inline model percentage when a standalone context_pct
+		// segment is also rendered, so the value is not shown twice.
+		const contextPctSegmentActive =
+			effectiveSettings.leftSegments.includes("context_pct") ||
+			effectiveSettings.rightSegments.includes("context_pct");
 
 		return {
 			session: this.session,
@@ -710,6 +715,7 @@ export class StatusLineComponent implements Component {
 			usageStats,
 			contextPercent,
 			contextWindow,
+			contextPctSegmentActive,
 			autoCompactEnabled: this.#autoCompactEnabled,
 			subagentCount: this.#subagentCount,
 			jobs: this.#jobs,

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

@@ -1,53 +1,114 @@
 import { ThinkingLevel, type ThinkingLevel as ThinkingLevelValue } from "@gajae-code/agent-core";
-import { Container, type SelectItem, SelectList } from "@gajae-code/tui";
-import { getSelectListTheme } from "../../modes/theme/theme";
+import { Container, type SelectItem, SelectList, Text } from "@gajae-code/tui";
+import { getSelectListTheme, theme } from "../../modes/theme/theme";
 import { getThinkingLevelMetadata, type ThinkingLevelValue as ThinkingMetadataValue } from "../../thinking-metadata";
 import { DynamicBorder } from "./dynamic-border";
 
+const SCOPE_ITEMS = [
+	{
+		value: "session",
+		label: "Apply for this session",
+		description: "Use this effort until the session changes it again",
+	},
+	{
+		value: "default",
+		label: "Set as default",
+		description: "Save this effort for future sessions",
+	},
+] as const satisfies readonly SelectItem[];
+
+export interface ThinkingSelectorSelection {
+	level: ThinkingLevelValue;
+	persistDefault: boolean;
+}
+
 /**
  * Component that renders a thinking level selector with borders
  */
 export class ThinkingSelectorComponent extends Container {
 	#selectList: SelectList;
+	#levelList: SelectList;
+	#selectedLevel: ThinkingLevelValue | undefined;
+	readonly #onSelect: (selection: ThinkingSelectorSelection) => void;
+	readonly #onCancel: () => void;
 
 	constructor(
 		currentLevel: ThinkingLevelValue | undefined,
 		availableLevels: ThinkingLevelValue[],
-		onSelect: (level: ThinkingLevelValue) => void,
+		onSelect: (selection: ThinkingSelectorSelection) => void,
 		onCancel: () => void,
 	) {
 		super();
 
-		const thinkingLevels: SelectItem[] = availableLevels.map(level =>
-			getThinkingLevelMetadata(level as ThinkingMetadataValue),
-		);
+		this.#onSelect = onSelect;
+		this.#onCancel = onCancel;
 
-		// Add top border
-		this.addChild(new DynamicBorder());
+		const currentValue = currentLevel ?? ThinkingLevel.Off;
+		const thinkingLevels: SelectItem[] = availableLevels.map(level => {
+			const metadata = getThinkingLevelMetadata(level as ThinkingMetadataValue);
+			return level === currentValue
+				? { ...metadata, label: metadata.label + theme.fg("muted", " (current)") }
+				: metadata;
+		});
 
-		// Create selector
-		this.#selectList = new SelectList(thinkingLevels, thinkingLevels.length, getSelectListTheme());
+		this.#levelList = new SelectList(thinkingLevels, thinkingLevels.length, getSelectListTheme());
+		this.#selectList = this.#levelList;
 
 		// Preselect current level
-		const currentIndex = thinkingLevels.findIndex(item => item.value === (currentLevel ?? ThinkingLevel.Off));
+		const currentIndex = thinkingLevels.findIndex(item => item.value === currentValue);
 		if (currentIndex !== -1) {
-			this.#selectList.setSelectedIndex(currentIndex);
+			this.#levelList.setSelectedIndex(currentIndex);
 		}
 
-		this.#selectList.onSelect = item => {
-			onSelect(item.value as ThinkingLevelValue);
+		this.#levelList.onSelect = item => {
+			this.#selectedLevel = item.value as ThinkingLevelValue;
+			this.#renderScopeList();
 		};
 
-		this.#selectList.onCancel = () => {
-			onCancel();
+		this.#levelList.onCancel = () => {
+			this.#onCancel();
 		};
 
-		this.addChild(this.#selectList);
+		this.#renderLevelList();
+	}
+
+	#renderLevelList(): void {
+		this.detachAll();
+		this.#selectedLevel = undefined;
+		this.#selectList = this.#levelList;
+		this.addChild(new DynamicBorder());
+		this.addChild(this.#levelList);
+		this.addChild(new DynamicBorder());
+	}
+
+	#renderScopeList(): void {
+		const level = this.#selectedLevel;
+		if (!level) return;
+
+		const scopeList = new SelectList(SCOPE_ITEMS, SCOPE_ITEMS.length, getSelectListTheme());
+		scopeList.onSelect = item => {
+			this.#onSelect({
+				level,
+				persistDefault: item.value === "default",
+			});
+		};
+		scopeList.onCancel = () => {
+			this.#renderLevelList();
+		};
 
-		// Add bottom border
+		const metadata = getThinkingLevelMetadata(level as ThinkingMetadataValue);
+		this.detachAll();
+		this.#selectList = scopeList;
+		this.addChild(new DynamicBorder());
+		this.addChild(new Text(theme.fg("muted", `  Reasoning effort: ${metadata.label}`), 0, 0));
+		this.addChild(scopeList);
 		this.addChild(new DynamicBorder());
 	}
 
+	handleInput(data: string): void {
+		this.#selectList.handleInput(data);
+	}
+
 	getSelectList(): SelectList {
 		return this.#selectList;
 	}

package/src/modes/components/tool-execution.ts

@@ -678,7 +678,7 @@ export class ToolExecutionComponent extends Container {
 						imageData,
 						imageMimeType,
 						{ fallbackColor: (s: string) => theme.fg("toolOutput", s) },
-						resolveImageOptions(),
+						{ ...resolveImageOptions(), refetch: () => imageData },
 					);
 					this.#imageComponents.push(imageComponent);
 					this.addChild(imageComponent);

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

@@ -26,7 +26,7 @@ import { interruptHint } from "../shared";
 import { buildAbortDisplayMessage } from "../utils/abort-message";
 import { consumeInjectedOptimisticSignature } from "../utils/injected-user-submission";
 import { ringTerminalBell } from "../utils/terminal-bell";
-import { argsWithPartialJson } from "../utils/ui-helpers";
+import { addChatChild, argsWithPartialJson } from "../utils/ui-helpers";
 
 type AgentSessionEventKind = AgentSessionEvent["type"];
 
@@ -169,12 +169,12 @@ export class EventController {
 
 	#getReadGroup(): ReadToolGroupComponent {
 		if (!this.#lastReadGroup) {
-			this.ctx.chatContainer.addChild(new Text("", 0, 0));
+			addChatChild(this.ctx, new Text("", 0, 0));
 			const group = new ReadToolGroupComponent({
 				showContentPreview: this.ctx.settings.get("read.toolResultPreview"),
 			});
 			group.setExpanded(this.ctx.toolOutputExpanded);
-			this.ctx.chatContainer.addChild(group);
+			addChatChild(this.ctx, group);
 			this.#lastReadGroup = group;
 		}
 		return this.#lastReadGroup;
@@ -332,7 +332,7 @@ export class EventController {
 				this.ctx.ui.requestRender(),
 			);
 			this.ctx.streamingMessage = event.message;
-			this.ctx.chatContainer.addChild(this.ctx.streamingComponent);
+			addChatChild(this.ctx, this.ctx.streamingComponent);
 			this.ctx.streamingComponent.updateContent(this.ctx.streamingMessage, { streaming: true });
 			this.ctx.ui.requestRender();
 		}
@@ -445,7 +445,7 @@ export class EventController {
 				);
 				if (!this.ctx.pendingTools.has(content.id)) {
 					this.#resetReadGroup();
-					this.ctx.chatContainer.addChild(new Text("", 0, 0));
+					addChatChild(this.ctx, new Text("", 0, 0));
 					const tool = this.ctx.session.getToolByName(content.name);
 					const component = new ToolExecutionComponent(
 						content.name,
@@ -462,8 +462,8 @@ export class EventController {
 						content.id,
 					);
 					component.setExpanded(this.ctx.toolOutputExpanded);
-					this.ctx.chatContainer.addChild(component);
 					this.ctx.pendingTools.set(content.id, component);
+					addChatChild(this.ctx, component);
 				} else {
 					this.ctx.pendingTools.get(content.id)?.updateArgs(renderArgs, content.id);
 				}
@@ -575,8 +575,8 @@ export class EventController {
 				event.toolCallId,
 			);
 			component.setExpanded(this.ctx.toolOutputExpanded);
-			this.ctx.chatContainer.addChild(component);
 			this.ctx.pendingTools.set(event.toolCallId, component);
+			addChatChild(this.ctx, component);
 			this.ctx.ui.requestRender();
 		}
 	}
@@ -869,13 +869,13 @@ export class EventController {
 	async #handleTtsrTriggered(event: Extract<AgentSessionEvent, { type: "ttsr_triggered" }>): Promise<void> {
 		const component = new TtsrNotificationComponent(event.rules);
 		component.setExpanded(this.ctx.toolOutputExpanded);
-		this.ctx.chatContainer.addChild(component);
+		addChatChild(this.ctx, component);
 		this.ctx.ui.requestRender();
 	}
 
 	async #handleTodoReminder(event: Extract<AgentSessionEvent, { type: "todo_reminder" }>): Promise<void> {
 		const component = new TodoReminderComponent(event.todos, event.attempt, event.maxAttempts);
-		this.ctx.chatContainer.addChild(component);
+		addChatChild(this.ctx, component);
 		this.ctx.ui.requestRender();
 	}
 

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

@@ -18,7 +18,7 @@ import { copyToClipboard, readImageFromClipboard } from "../../utils/clipboard";
 import { getEditorCommand, openInEditor } from "../../utils/external-editor";
 import { ensureSupportedImageInput, ImageInputTooLargeError, loadImageInput } from "../../utils/image-loading";
 import { resizeImage } from "../../utils/image-resize";
-import { resolvePastedImagePath } from "../../utils/pasted-image-path";
+import { formatPastedImageReference, resolvePastedImagePath } from "../../utils/pasted-image-path";
 import { generateSessionTitle, setSessionTerminalTitle } from "../../utils/title-generator";
 import { type QueuedMessageMoveDirection, QueuedMessageSelectorComponent } from "../components/queued-message-selector";
 
@@ -27,6 +27,8 @@ interface Expandable {
 }
 
 const INTERACTIVE_ABORT_CLEANUP_TIMEOUT_MS = 5_000;
+const IMAGE_PLACEHOLDER_PATTERN = /\[image ([1-9]\d*)\]/g;
+const IMAGE_PLACEHOLDER_PRESENT_PATTERN = /\[image [1-9]\d*\]/;
 
 function isExpandable(obj: unknown): obj is Expandable {
 	return typeof obj === "object" && obj !== null && "setExpanded" in obj && typeof obj.setExpanded === "function";
@@ -383,6 +385,7 @@ export class InputController {
 			this.ctx.isBashMode = trimmed.startsWith("!");
 			this.ctx.isBashNoContext = trimmed.startsWith("!!");
 			this.ctx.isPythonMode = trimmed.startsWith("$") && !trimmed.startsWith("${");
+			this.#clearPendingImagesIfPlaceholdersRemoved(text);
 			if (
 				wasBashMode !== this.ctx.isBashMode ||
 				wasBashNoContext !== this.ctx.isBashNoContext ||
@@ -418,7 +421,7 @@ export class InputController {
 			}
 
 			const runner = this.ctx.session.extensionRunner;
-			let inputImages = this.ctx.pendingImages.length > 0 ? [...this.ctx.pendingImages] : undefined;
+			let inputImages = this.#visiblePendingImagesForText(text);
 
 			if (runner?.hasHandlers("input")) {
 				const result = await runner.emitInput(text, inputImages, "interactive");
@@ -498,7 +501,7 @@ export class InputController {
 
 			// Queue input during compaction
 			if (this.ctx.session.isCompacting) {
-				if (this.ctx.pendingImages.length > 0) {
+				if ((inputImages?.length ?? 0) > 0) {
 					this.ctx.showStatus("Compaction in progress. Retry after it completes to send images.");
 					return;
 				}
@@ -520,11 +523,13 @@ export class InputController {
 				// typed since queuing intact. Same protection as #783, applied to
 				// the streaming/queue path.
 				const streamingBehavior = this.#busyStreamingBehavior();
-				await this.ctx.withLocalSubmission(
-					text,
-					() => this.ctx.session.prompt(text, { streamingBehavior, images }),
-					{ imageCount: images?.length ?? 0 },
-				);
+				const promptOptions =
+					streamingBehavior === "followUp"
+						? { streamingBehavior, images, followUpQueuePolicy: "sequential" as const }
+						: { streamingBehavior, images };
+				await this.ctx.withLocalSubmission(text, () => this.ctx.session.prompt(text, promptOptions), {
+					imageCount: images?.length ?? 0,
+				});
 				this.ctx.updatePendingMessagesDisplay();
 				this.ctx.ui.requestRender();
 				return;
@@ -869,7 +874,9 @@ export class InputController {
 						details,
 						attribution: "user",
 					},
-					{ streamingBehavior },
+					streamingBehavior === "followUp"
+						? { streamingBehavior, followUpQueuePolicy: "sequential" }
+						: { streamingBehavior },
 				);
 			}
 			if (this.ctx.session.isStreaming) {
@@ -911,7 +918,10 @@ export class InputController {
 			this.ctx.editor.addToHistory(text);
 			this.ctx.editor.setText("");
 			await this.ctx.withLocalSubmission(text, () =>
-				this.ctx.session.prompt(text, { streamingBehavior: "followUp" }),
+				this.ctx.session.prompt(text, {
+					streamingBehavior: "followUp",
+					followUpQueuePolicy: "sequential",
+				}),
 			);
 			this.ctx.updatePendingMessagesDisplay();
 			this.ctx.ui.requestRender();
@@ -1086,7 +1096,7 @@ export class InputController {
 				data: image.data,
 				mimeType: image.mimeType,
 			});
-			this.ctx.editor.insertText(`${this.#nextImagePlaceholder()} `);
+			this.ctx.editor.insertText(`${formatPastedImageReference(this.#nextImagePlaceholder(), image.resolvedPath)} `);
 			this.ctx.showStatus(`Attached image: ${path.basename(image.resolvedPath)}`, { dim: true });
 			this.ctx.ui.requestRender();
 			return true;
@@ -1104,6 +1114,37 @@ export class InputController {
 		return `[image ${this.ctx.pendingImages.length}]`;
 	}
 
+	#visiblePendingImagesForText(text: string): InteractiveModeContext["pendingImages"] | undefined {
+		if (this.ctx.pendingImages.length === 0) {
+			return undefined;
+		}
+
+		const images: InteractiveModeContext["pendingImages"] = [];
+		const seenImageIndexes = new Set<number>();
+		for (const match of text.matchAll(IMAGE_PLACEHOLDER_PATTERN)) {
+			const placeholderNumberText = match[1];
+			if (!placeholderNumberText) continue;
+			const placeholderNumber = Number.parseInt(placeholderNumberText, 10);
+			const imageIndex = placeholderNumber - 1;
+			if (imageIndex < 0 || imageIndex >= this.ctx.pendingImages.length || seenImageIndexes.has(imageIndex)) {
+				continue;
+			}
+			const image = this.ctx.pendingImages[imageIndex];
+			if (!image) continue;
+			images.push(image);
+			seenImageIndexes.add(imageIndex);
+		}
+
+		return images.length > 0 ? images : undefined;
+	}
+
+	#clearPendingImagesIfPlaceholdersRemoved(text: string): void {
+		if (this.ctx.pendingImages.length === 0 || IMAGE_PLACEHOLDER_PRESENT_PATTERN.test(text)) {
+			return;
+		}
+		this.ctx.pendingImages = [];
+	}
+
 	async handleImagePaste(): Promise<boolean> {
 		try {
 			const image = await readImageFromClipboard();

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

@@ -443,12 +443,13 @@ export class SelectorController {
 			const selector = new ThinkingSelectorComponent(
 				this.ctx.session.thinkingLevel,
 				availableLevels,
-				level => {
+				selection => {
 					done();
 
+					const { level, persistDefault } = selection;
 					const configuredDefault = this.ctx.settings.get("defaultThinkingLevel");
 					const levelToApply = level === ThinkingLevel.Inherit ? configuredDefault : level;
-					this.ctx.session.setThinkingLevel(levelToApply, false);
+					this.ctx.session.setThinkingLevel(levelToApply, persistDefault);
 					const effectiveLevel = this.ctx.session.thinkingLevel ?? ThinkingLevel.Off;
 					const requestedLabel =
 						level === ThinkingLevel.Inherit ? `${level} (configured default: ${configuredDefault})` : level;
@@ -458,9 +459,11 @@ export class SelectorController {
 					this.ctx.statusLine.invalidate();
 					this.ctx.updateEditorBorderColor();
 					this.ctx.updateEditorTopBorder();
+					if (persistDefault) void this.ctx.notifyConfigChanged?.();
 					this.ctx.ui.requestRender();
+					const scopeLabel = persistDefault ? "Default reasoning effort" : "Reasoning effort";
 					this.ctx.showStatus(
-						`Reasoning effort set to ${requestedLabel}. Effective effort: ${effectiveLevel}.${clampedSuffix}`,
+						`${scopeLabel} set to ${requestedLabel}. Effective effort: ${effectiveLevel}.${clampedSuffix}`,
 					);
 				},
 				() => {
@@ -468,10 +471,9 @@ export class SelectorController {
 					this.ctx.ui.requestRender();
 				},
 			);
-			return { component: selector, focus: selector.getSelectList() };
+			return { component: selector, focus: selector };
 		});
 	}
-
 	showSettingsSelector(): void {
 		getAvailableThemes().then(availableThemes => {
 			this.showSelector(done => {

package/src/modes/interactive-mode.ts

@@ -18,6 +18,7 @@ import type { Component, EditorTheme, SlashCommand } from "@gajae-code/tui";
 import {
 	Container,
 	clearRenderCache,
+	getRenderCacheRetainedBytes,
 	Loader,
 	Markdown,
 	ProcessTerminal,
@@ -114,7 +115,7 @@ import {
 	theme,
 } from "./theme/theme";
 import type { CompactionQueuedMessage, InteractiveModeContext, SubmittedUserInput, TodoItem, TodoPhase } from "./types";
-import { UiHelpers } from "./utils/ui-helpers";
+import { addChatChild, UiHelpers } from "./utils/ui-helpers";
 
 const INTERACTIVE_ABORT_CLEANUP_TIMEOUT_MS = 5_000;
 const COMPOSER_NEWLINE_HINT = process.platform === "win32" ? "Alt+Enter/Ctrl+J" : "Shift+Enter/Ctrl+J";
@@ -398,6 +399,10 @@ export class InteractiveMode implements InteractiveModeContext {
 	) {
 		this.session = session;
 		this.sessionManager = session.sessionManager;
+		this.session.setRetainedMemorySampler(() => ({
+			tuiChatChildren: this.chatContainer.children.length,
+			tuiCachedRenderBytes: getRenderCacheRetainedBytes(),
+		}));
 		this.settings = session.settings;
 		this.keybindings = KeybindingsManager.inMemory();
 		this.agent = session.agent;
@@ -1514,8 +1519,11 @@ export class InteractiveMode implements InteractiveModeContext {
 
 	#renderPlanPreview(planContent: string, options?: { append?: boolean }): void {
 		const existingContainer = this.#planReviewContainer;
-		const replaceExisting = options?.append !== true && existingContainer !== undefined;
-		const planReviewContainer = replaceExisting ? existingContainer : new Container();
+		// Only reuse the existing preview when it is still attached to the chat container;
+		// a collapsed/disposed container must be re-added, not mutated in place.
+		const stillAttached = existingContainer !== undefined && this.chatContainer.children.includes(existingContainer);
+		const replaceExisting = options?.append !== true && stillAttached;
+		const planReviewContainer = replaceExisting && existingContainer ? existingContainer : new Container();
 		planReviewContainer.clear();
 		planReviewContainer.addChild(new Spacer(1));
 		planReviewContainer.addChild(new DynamicBorder());
@@ -1524,7 +1532,7 @@ export class InteractiveMode implements InteractiveModeContext {
 		planReviewContainer.addChild(new Markdown(planContent, 1, 1, getMarkdownTheme()));
 		planReviewContainer.addChild(new DynamicBorder());
 		if (!replaceExisting) {
-			this.chatContainer.addChild(planReviewContainer);
+			addChatChild(this, planReviewContainer);
 		}
 		this.#planReviewContainer = planReviewContainer;
 		this.ui.requestRender();

package/src/modes/types.ts

@@ -34,6 +34,7 @@ import type { Theme } from "./theme/theme";
 export type CompactionQueuedMessage = {
 	text: string;
 	mode: "steer" | "followUp";
+	followUpQueuePolicy?: "sequential";
 };
 
 export type SubmittedUserInput = {