@oh-my-pi/pi-coding-agent 17.2.2 → 17.2.4

package/src/modes/components/ask-dialog.ts

@@ -15,6 +15,7 @@ import {
 	wrapTextWithAnsi,
 } from "@oh-my-pi/pi-tui";
 import type {
+	ExtensionAskDialogOption,
 	ExtensionAskDialogQuestion,
 	ExtensionAskDialogResultItem,
 	ExtensionAskDialogSubmitResult,
@@ -337,6 +338,45 @@ function renderRowLabel(
 	return lines;
 }
 
+/**
+ * Coerce untrusted dialog questions into a render-safe shape. The live ask
+ * dialog is reached from the public `askDialog` extension surface and from
+ * streamed tool args, where a question entry can arrive with a missing or
+ * non-string `question` field. The render helpers (`replaceTabs`,
+ * `renderQuestionTitle`, `questionTabLabel`) assume strings, so a malformed
+ * entry throws and takes down the whole TUI render loop. Mirrors
+ * `normalizeRenderQuestions` on the transcript path.
+ */
+function normalizeDialogQuestions(questions: ExtensionAskDialogQuestion[]): ExtensionAskDialogQuestion[] {
+	if (!Array.isArray(questions)) return [];
+	const out: ExtensionAskDialogQuestion[] = [];
+	for (const entry of questions) {
+		if (!entry || typeof entry !== "object") continue;
+		const q = entry as Partial<ExtensionAskDialogQuestion>;
+		const options: ExtensionAskDialogOption[] = [];
+		if (Array.isArray(q.options)) {
+			for (const opt of q.options) {
+				if (!opt || typeof opt !== "object") continue;
+				const o = opt as Partial<ExtensionAskDialogOption>;
+				options.push({
+					label: typeof o.label === "string" ? o.label : "",
+					...(typeof o.description === "string" ? { description: o.description } : {}),
+					...(typeof o.preview === "string" ? { preview: o.preview } : {}),
+				});
+			}
+		}
+		out.push({
+			id: typeof q.id === "string" ? q.id : "?",
+			question: typeof q.question === "string" ? q.question : "",
+			...(typeof q.header === "string" ? { header: q.header } : {}),
+			options,
+			...(typeof q.multi === "boolean" ? { multi: q.multi } : {}),
+			...(Number.isInteger(q.recommended) ? { recommended: q.recommended } : {}),
+		});
+	}
+	return out;
+}
+
 export class AskDialogComponent implements Component {
 	#states: QuestionState[];
 	#activeTabIndex = 0;
@@ -352,13 +392,15 @@ export class AskDialogComponent implements Component {
 	#stableHeight: { key: string; total: number } | undefined;
 	#previewCache: PreviewRenderCache = new Map();
 	#overflowLayouts = new WeakMap<ExtensionAskDialogQuestion, Set<string>>();
+	readonly #questions: ExtensionAskDialogQuestion[];
 
 	constructor(
-		private readonly questions: ExtensionAskDialogQuestion[],
+		questions: ExtensionAskDialogQuestion[],
 		private readonly callbacks: AskDialogCallbacks,
 		private readonly options: AskDialogOptions = {},
 	) {
-		this.#states = questions.map(question => {
+		this.#questions = normalizeDialogQuestions(questions);
+		this.#states = this.#questions.map(question => {
 			const recommended = Number.isInteger(question.recommended) ? question.recommended : 0;
 			const maxIndex = Math.max(0, question.options.length - 1);
 			return {
@@ -474,8 +516,8 @@ export class AskDialogComponent implements Component {
 		const tabBarRows = this.#hasSubmitTab() ? 1 : 0;
 		const mdTheme = getMarkdownTheme();
 		let needed = MIN_DIALOG_ROWS;
-		for (let index = 0; index < this.questions.length; index++) {
-			const question = this.questions[index];
+		for (let index = 0; index < this.#questions.length; index++) {
+			const question = this.#questions[index];
 			const state = this.#states[index];
 			if (!question || !state) continue;
 			const headerRows = tabBarRows + renderQuestionTitle(question, width).length;
@@ -493,7 +535,7 @@ export class AskDialogComponent implements Component {
 		if (this.#hasSubmitTab()) {
 			// Warning line + blank, one summary line per question, blank, and
 			// the Submit row; note lines added later scroll within the body.
-			const body = 2 + this.questions.length + 2;
+			const body = 2 + this.#questions.length + 2;
 			needed = Math.max(needed, chrome + tabBarRows + 1 + Math.max(MIN_BODY_ROWS, body));
 		}
 		return Math.min(needed, maxHeight);
@@ -507,11 +549,11 @@ export class AskDialogComponent implements Component {
 		// Multi questions confirm on the Submit tab (Enter toggles, never
 		// submits), so any multi question forces the tab even when there is
 		// only one question.
-		return this.questions.length > 1 || this.questions.some(question => question.multi);
+		return this.#questions.length > 1 || this.#questions.some(question => question.multi);
 	}
 
 	#submitTabIndex(): number {
-		return this.questions.length;
+		return this.#questions.length;
 	}
 
 	#isSubmitTab(): boolean {
@@ -519,7 +561,7 @@ export class AskDialogComponent implements Component {
 	}
 
 	#currentQuestionIndex(): number {
-		return clamp(this.#activeTabIndex, 0, Math.max(0, this.questions.length - 1));
+		return clamp(this.#activeTabIndex, 0, Math.max(0, this.#questions.length - 1));
 	}
 
 	#requestRender(): void {
@@ -530,7 +572,7 @@ export class AskDialogComponent implements Component {
 		const lines: string[] = [];
 		if (this.#hasSubmitTab()) {
 			const tabs: Tab[] = [
-				...this.questions.map((question, index) => ({
+				...this.#questions.map((question, index) => ({
 					id: String(index),
 					label: questionTabLabel(question, index),
 				})),
@@ -545,7 +587,7 @@ export class AskDialogComponent implements Component {
 			return lines;
 		}
 		const questionIndex = this.#currentQuestionIndex();
-		const question = this.questions[questionIndex];
+		const question = this.#questions[questionIndex];
 		if (!question) return lines;
 		lines.push(...renderQuestionTitle(question, width));
 		return lines;
@@ -559,7 +601,7 @@ export class AskDialogComponent implements Component {
 			const scroll = indicator ? ` ${indicator} scroll ·` : "";
 			return `Enter submit · ↑/↓ scroll ·${scroll} ${cancel}`;
 		}
-		const question = this.questions[this.#currentQuestionIndex()];
+		const question = this.#questions[this.#currentQuestionIndex()];
 		const action = question?.multi ? "Space/Enter toggle · n note" : "Enter select · n note";
 		const tabs = this.#hasSubmitTab() ? " · Tab/←/→" : "";
 		if (this.#questionCanPage && indicator) {
@@ -585,7 +627,7 @@ export class AskDialogComponent implements Component {
 	}
 
 	#activeQuestionState(): { question: ExtensionAskDialogQuestion; state: QuestionState } | undefined {
-		const question = this.questions[this.#currentQuestionIndex()];
+		const question = this.#questions[this.#currentQuestionIndex()];
 		const state = this.#states[this.#currentQuestionIndex()];
 		if (!question || !state) return undefined;
 		return { question, state };
@@ -672,18 +714,18 @@ export class AskDialogComponent implements Component {
 	}
 
 	#switchTab(direction: 1 | -1): void {
-		const tabCount = this.questions.length + 1;
+		const tabCount = this.#questions.length + 1;
 		this.#activeTabIndex = (this.#activeTabIndex + direction + tabCount) % tabCount;
 		this.#submitScrollOffset = 0;
 	}
 
 	#advanceAfterQuestion(): void {
 		const current = this.#currentQuestionIndex();
-		if (this.questions.length === 1) {
+		if (this.#questions.length === 1) {
 			this.#finishSubmit();
 			return;
 		}
-		this.#activeTabIndex = current + 1 < this.questions.length ? current + 1 : this.#submitTabIndex();
+		this.#activeTabIndex = current + 1 < this.#questions.length ? current + 1 : this.#submitTabIndex();
 		this.#submitScrollOffset = 0;
 		this.#requestRender();
 	}
@@ -829,8 +871,8 @@ export class AskDialogComponent implements Component {
 			);
 			allLines.push("");
 		}
-		for (let index = 0; index < this.questions.length; index++) {
-			const question = this.questions[index];
+		for (let index = 0; index < this.#questions.length; index++) {
+			const question = this.#questions[index];
 			const state = this.#states[index];
 			if (!question || !state) continue;
 			const label = questionTabLabel(question, index);
@@ -895,8 +937,8 @@ export class AskDialogComponent implements Component {
 
 	#unansweredCount(): number {
 		let count = 0;
-		for (let index = 0; index < this.questions.length; index++) {
-			const question = this.questions[index];
+		for (let index = 0; index < this.#questions.length; index++) {
+			const question = this.#questions[index];
 			const state = this.#states[index];
 			if (!question || !state) continue;
 			if (state.selectedOptions.size === 0 && state.customInput === undefined) count += 1;
@@ -911,8 +953,8 @@ export class AskDialogComponent implements Component {
 			return;
 		}
 		this.options.onTimeout?.();
-		for (let index = 0; index < this.questions.length; index++) {
-			const question = this.questions[index];
+		for (let index = 0; index < this.#questions.length; index++) {
+			const question = this.#questions[index];
 			const state = this.#states[index];
 			if (!question || !state) continue;
 			if (state.selectedOptions.size === 0 && state.customInput === undefined) {
@@ -952,8 +994,8 @@ export class AskDialogComponent implements Component {
 
 	#buildResults(): ExtensionAskDialogResultItem[] {
 		const results: ExtensionAskDialogResultItem[] = [];
-		for (let index = 0; index < this.questions.length; index++) {
-			const question = this.questions[index];
+		for (let index = 0; index < this.#questions.length; index++) {
+			const question = this.#questions[index];
 			const state = this.#states[index];
 			if (!question || !state) continue;
 			const selectedOptions = question.options

package/src/modes/components/custom-editor.ts

@@ -56,7 +56,7 @@ const DEFAULT_ACTION_KEYS: Record<ConfigurableEditorAction, KeyId[]> = {
 	"app.thinking.toggle": ["ctrl+t"],
 	"app.editor.external": ["ctrl+g"],
 	"app.history.search": ["ctrl+r"],
-	"app.message.dequeue": ["alt+up"],
+	"app.message.dequeue": ["alt+up", "shift+up"],
 	"app.retry": ["alt+r"],
 	"app.clipboard.pasteImage": ["ctrl+v"],
 	"app.clipboard.pasteTextRaw": ["ctrl+shift+v", "alt+shift+v"],

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

@@ -314,10 +314,10 @@ function padLeftVisible(text: string, width: number): string {
 export interface ModelBrowserOptions {
 	/** Render the dim `provider/` prefix before model ids. Default true. */
 	showProvider?: boolean;
-	/** Session token count used to disable models whose context window is exceeded. */
+	/** Session token count used to flag models whose context window is exceeded. */
 	currentContextTokens?: number;
-	/** When true, rows over the current context are unselectable (session-switch mode). */
-	disableOverContext?: boolean;
+	/** When true, over-context rows render grayed; picking one compacts first (session-switch mode). */
+	markOverContext?: boolean;
 	/** Host-provided empty-state text (e.g. provider discovery status). */
 	emptyText?: () => string | undefined;
 }
@@ -351,7 +351,7 @@ export class ModelBrowser implements Component {
 	#maxVisible = 10;
 	#showProvider: boolean;
 	#currentContextTokens: number;
-	#disableOverContext: boolean;
+	#markOverContext: boolean;
 	#emptyText?: () => string | undefined;
 	/** Keep role-like virtual rows in their host-defined order during search. */
 	#preserveQueryOrder = false;
@@ -375,7 +375,7 @@ export class ModelBrowser implements Component {
 		this.#showProvider = options.showProvider ?? true;
 		const tokens = options.currentContextTokens ?? 0;
 		this.#currentContextTokens = Number.isFinite(tokens) && tokens > 0 ? Math.floor(tokens) : 0;
-		this.#disableOverContext = options.disableOverContext ?? false;
+		this.#markOverContext = options.markOverContext ?? false;
 		this.#emptyText = options.emptyText;
 	}
 
@@ -420,9 +420,9 @@ export class ModelBrowser implements Component {
 	setPreserveQueryOrder(preserve: boolean): void {
 		this.#preserveQueryOrder = preserve;
 	}
-	/** Allow hosts to toggle context-window eligibility between browser modes. */
-	setDisableOverContext(disable: boolean): void {
-		this.#disableOverContext = disable;
+	/** Allow hosts to toggle context-window flagging between browser modes. */
+	setMarkOverContext(mark: boolean): void {
+		this.#markOverContext = mark;
 	}
 	/** Focused: accent cursor + selected-row background band. Unfocused: dim cursor, no band. */
 	setFocused(focused: boolean): void {
@@ -461,8 +461,13 @@ export class ModelBrowser implements Component {
 	}
 
 	#isDisabled(item: ModelBrowserItem): boolean {
-		if (item.id === "separator") return true;
-		if (!this.#disableOverContext || this.#currentContextTokens <= 0) return false;
+		return item.id === "separator";
+	}
+
+	/** True when `item`'s context window is smaller than the live session token count (grayed row; hosts compact before switching). */
+	isOverContext(item: ModelBrowserItem): boolean {
+		if (item.id === "separator") return false;
+		if (!this.#markOverContext || this.#currentContextTokens <= 0) return false;
 		const contextWindow = item.model.contextWindow ?? 0;
 		return contextWindow > 0 && this.#currentContextTokens > contextWindow;
 	}
@@ -718,7 +723,7 @@ export class ModelBrowser implements Component {
 			const line = theme.fg("muted", "─".repeat(dashCount));
 			return `  ${line}  `;
 		}
-		const disabled = this.#isDisabled(item);
+		const overContext = this.isOverContext(item);
 		const prefix = selected && this.#focused ? `${theme.fg("accent", theme.nav.cursor)} ` : "  ";
 		const providerPrefix = this.#showProvider ? theme.fg("dim", `${item.provider}/`) : "";
 		const name = item.labelColor
@@ -728,7 +733,7 @@ export class ModelBrowser implements Component {
 				: item.id;
 		const currentMark =
 			item.selector === this.#currentSelector ? ` ${theme.fg("success", theme.status.enabled)}` : "";
-		const overLimit = disabled
+		const overLimit = overContext
 			? ` ${theme.status.disabled} context>${formatNumber(item.model.contextWindow ?? 0).toLowerCase()}`
 			: "";
 		let left = `${prefix}${providerPrefix}${name}${currentMark}${overLimit}`;
@@ -743,12 +748,15 @@ export class ModelBrowser implements Component {
 		const gap = Math.max(0, available - visibleWidth(left));
 
 		let line = `${left}${" ".repeat(gap)} ${meta}`;
-		if (disabled) {
-			line = theme.fg("dim", Bun.stripANSI(line));
+		if (overContext) {
+			// Gray the whole row but keep the selection cursor visible: over-context
+			// models stay selectable (the host compacts before switching).
+			const plainPrefix = Bun.stripANSI(prefix);
+			line = `${prefix}${theme.fg("dim", Bun.stripANSI(line).slice(plainPrefix.length))}`;
 		}
 		// The bg band is reserved for the mouse: it marks hover, nothing else.
 		// Keyboard selection is the cursor glyph + accent name.
-		if (hovered && !disabled) {
+		if (hovered) {
 			line = theme.bg("selectedBg", line);
 		}
 		return line;
@@ -772,8 +780,8 @@ export class ModelBrowser implements Component {
 		}
 		const line1 = truncateToWidth(theme.fg("muted", `  ${facts.join(" · ")}`), width);
 
-		if (this.#isDisabled(selected)) {
-			const warning = `  ${theme.status.disabled} current context ${formatNumber(this.#currentContextTokens).toLowerCase()} exceeds ${formatNumber(model.contextWindow ?? 0).toLowerCase()} limit`;
+		if (this.isOverContext(selected)) {
+			const warning = `  ${theme.status.disabled} context ${formatNumber(this.#currentContextTokens).toLowerCase()} exceeds ${formatNumber(model.contextWindow ?? 0).toLowerCase()} limit · compacts with current model, then switches`;
 			return [line1, truncateToWidth(theme.fg("warning", warning), width)];
 		}
 

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

@@ -22,8 +22,12 @@ import { bottomBorder, row, topBorder } from "./overlay-box";
 import { resolveSegmentPalette } from "./segment-track";
 
 export interface ModelPickerCallbacks {
-	/** A model was chosen for a session-only switch. `selector` is `provider/id`. */
-	onPick: (model: Model, selector: string) => void;
+	/**
+	 * A model was chosen for a session-only switch. `selector` is `provider/id`.
+	 * `overContext` is true when the session transcript exceeds the model's
+	 * context window — the host must compact before switching.
+	 */
+	onPick: (model: Model, selector: string, meta: { overContext: boolean }) => void;
 	/** A configured ctrl+p quick role was chosen. */
 	onPickRole?: (entry: ResolvedRoleModel) => void;
 	/** The picker was dismissed. */
@@ -31,7 +35,7 @@ export interface ModelPickerCallbacks {
 }
 
 export interface ModelPickerOptions {
-	/** Session token count; models with smaller context windows are disabled. */
+	/** Session token count; models with smaller context windows are grayed and compact-first on pick. */
 	currentContextTokens?: number;
 	/** `provider/id` of the session's active model; highlighted and preselected. */
 	currentSelector?: string;
@@ -97,7 +101,7 @@ export class ModelPickerComponent implements Component {
 
 		this.#browser = new ModelBrowser(settings, {
 			currentContextTokens: options.currentContextTokens,
-			disableOverContext: true,
+			markOverContext: true,
 			emptyText: () => (this.#roleMode ? "  No quick roles in the Ctrl+P cycle" : undefined),
 		});
 		this.#browser.onActivate = item => {
@@ -106,7 +110,7 @@ export class ModelPickerComponent implements Component {
 				callbacks.onPickRole?.(quickRole);
 				return;
 			}
-			callbacks.onPick(item.model, item.selector);
+			callbacks.onPick(item.model, item.selector, { overContext: this.#browser.isOverContext(item) });
 		};
 		this.#browser.onCancel = () => callbacks.onCancel();
 		this.#browser.onQueryChange = query => this.#syncItemsForQuery(query);
@@ -193,7 +197,7 @@ export class ModelPickerComponent implements Component {
 
 		this.#roleMode = roleMode;
 		this.#browser.setShowProvider(!roleMode);
-		this.#browser.setDisableOverContext(!roleMode);
+		this.#browser.setMarkOverContext(!roleMode);
 		this.#browser.setPreserveQueryOrder(roleMode);
 		const currentSelector = roleMode ? this.#currentQuickRoleSelector : this.#currentSelector;
 		this.#browser.setCurrentSelector(currentSelector);

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

@@ -397,6 +397,32 @@ export class ReadToolGroupComponent extends Container implements ToolExecutionHa
 		this.#updateDisplay();
 	}
 
+	/**
+	 * Re-key an entry whose streamed tool-call id changed mid-stream (a provider
+	 * rewriting the id across deltas; see EventController's
+	 * `#streamedToolCallIdByIndex`). Preserves row order so a sibling read run is
+	 * not visibly reshuffled, and no-ops when the rename would collide.
+	 */
+	renameEntry(oldId: string, newId: string): void {
+		if (oldId === newId || !newId) return;
+		const entry = this.#entries.get(oldId);
+		if (!entry || this.#entries.has(newId)) return;
+		entry.toolCallId = newId;
+		const reordered = [...this.#entries].map(([key, value]): [string, ReadEntry] => [
+			key === oldId ? newId : key,
+			value,
+		]);
+		this.#entries.clear();
+		for (const [key, value] of reordered) this.#entries.set(key, value);
+		this.#updateDisplay();
+	}
+	/** Remove one call without discarding successful siblings in the shared group. */
+	removeEntry(toolCallId: string): boolean {
+		if (!this.#entries.delete(toolCallId)) return this.#entries.size === 0;
+		this.#updateDisplay();
+		return this.#entries.size === 0;
+	}
+
 	updateResult(
 		result: { content: Array<{ type: string; text?: string }>; details?: unknown; isError?: boolean },
 		isPartial = false,

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

@@ -276,6 +276,9 @@ let toolExecutionInstanceSeq = 0;
 export class ToolExecutionComponent extends Container implements NativeScrollbackLiveRegion {
 	#contentBox: Box; // Used for custom tools and bash visual truncation
 	#contentText: WidthAwareText; // Generic fallback (no custom/built-in renderer)
+	// Which container the constructor mounted: bespoke/built-in renderers use
+	// #contentBox, everything else the generic #contentText fallback.
+	#usesContentBox = false;
 	#multiFileBoxes: (Box | Spacer)[] = []; // Extra boxes for multi-file edit results
 	#imageComponents: Image[] = [];
 	#imageSpacers: Spacer[] = [];
@@ -411,26 +414,13 @@ export class ToolExecutionComponent extends Container implements NativeScrollbac
 		// strips PLAIN-blank edges, so framed/minimal blocks (no bg set) drop these
 		// lines and keep their tight spacing — only tinted lines survive.
 		this.#contentBox = new Box(0, 1);
-		this.#contentText = new WidthAwareText(
-			contentWidth =>
-				formatDefaultToolExecution(
-					{
-						label: this.#toolLabel,
-						args: this.#args,
-						result: this.#result ? { output: this.#getTextOutput(), isError: this.#result.isError } : undefined,
-						options: this.#renderState,
-					},
-					contentWidth,
-					theme,
-				),
-			1,
-			1,
-		);
+		this.#contentText = new WidthAwareText(contentWidth => this.#renderDefaultCard(contentWidth), 1, 1);
 
 		// Use Box for custom tools or built-in tools that have renderers
 		const hasRenderer = toolName in toolRenderers;
 		const hasCustomRenderer = !!(tool?.renderCall || tool?.renderResult);
-		if (hasCustomRenderer || hasRenderer) {
+		this.#usesContentBox = hasCustomRenderer || hasRenderer;
+		if (this.#usesContentBox) {
 			this.addChild(this.#contentBox);
 		} else {
 			this.addChild(this.#contentText);
@@ -998,12 +988,21 @@ export class ToolExecutionComponent extends Container implements NativeScrollbac
 
 		// Non-self-framing tools (custom/extension renderers and the generic
 		// fallback) get a padded, state-tinted block — built-ins that draw their
-		// own frame opt out below via the framed-component mark.
-		const stateBgKey = this.#isPartial ? "toolPendingBg" : this.#result?.isError ? "toolErrorBg" : "toolSuccessBg";
+		// own frame opt out below via the framed-component mark. A benign skip
+		// (steering/peer interrupt aborted a still-pending call) never ran, so it
+		// gets the neutral pending tint rather than the error tint (#7199).
+		const benignSkip = this.#isBenignSkip();
+		const stateBgKey =
+			this.#isPartial || benignSkip ? "toolPendingBg" : this.#result?.isError ? "toolErrorBg" : "toolSuccessBg";
 		const stateBgFn = (t: string) => theme.bg(stateBgKey, t);
 
-		// Check for custom tool rendering
-		if (this.#tool && (this.#tool.renderCall || this.#tool.renderResult)) {
+		// A benign skip is a synthetic placeholder for a call that never executed,
+		// so bypass any bespoke error frame and draw the neutral generic card —
+		// the per-tool ✘/red-border would misread normal mid-turn steering as a
+		// failure (#7199).
+		if (benignSkip) {
+			this.#renderBenignSkipCard(stateBgFn);
+		} else if (this.#tool && (this.#tool.renderCall || this.#tool.renderResult)) {
 			const tool = this.#tool;
 			const mergeCallAndResult = Boolean((tool as { mergeCallAndResult?: boolean }).mergeCallAndResult);
 			// Custom tools use Box for flexible component rendering
@@ -1399,4 +1398,62 @@ export class ToolExecutionComponent extends Container implements NativeScrollbac
 
 		return output;
 	}
+
+	/**
+	 * Format the generic call/result card at `contentWidth`. Shared by the
+	 * #contentText fallback and the benign-skip path so both render identically.
+	 */
+	#renderDefaultCard(contentWidth: number): string {
+		return formatDefaultToolExecution(
+			{
+				label: this.#toolLabel,
+				args: this.#args,
+				result: this.#result
+					? { output: this.#getTextOutput(), isError: this.#result.isError, skipped: this.#isBenignSkip() }
+					: undefined,
+				options: this.#renderState,
+			},
+			contentWidth,
+			theme,
+		);
+	}
+
+	/**
+	 * True for a steering/peer-interrupt placeholder. A synthetic placeholder
+	 * identifies a call that never entered `tool.execute`; an interrupted
+	 * placeholder identifies one that started but threw before returning usable
+	 * output. Both are normal steering control flow and render neutrally (#7199).
+	 */
+	#isBenignSkip(): boolean {
+		if (this.#isPartial || !this.#result) return false;
+		const details = this.#result.details as
+			| { __synthetic?: boolean; __interrupted?: boolean; source?: string; execution?: string }
+			| undefined;
+		if (details?.source !== "interrupt_skipped") return false;
+		return details.__synthetic === true || (details.__interrupted === true && details.execution === "started");
+	}
+
+	/**
+	 * Render a benign skip as the neutral generic card, replacing any bespoke
+	 * renderer's error frame. Generic-fallback tools already route through
+	 * {@link #renderDefaultCard} (which emits the info card for a skip); they
+	 * only need the neutral tint. Bespoke-renderer tools get their content box
+	 * swapped for the same neutral card.
+	 */
+	#renderBenignSkipCard(stateBgFn: (text: string) => string): void {
+		if (!this.#usesContentBox) {
+			this.#contentText.setCustomBgFn(stateBgFn);
+			this.#contentText.invalidate();
+			return;
+		}
+		for (const box of this.#multiFileBoxes) {
+			this.removeChild(box);
+		}
+		this.#multiFileBoxes = [];
+		this.#contentBox.setBgFn(undefined);
+		this.#contentBox.clear();
+		this.#contentBox.setPaddingX(1);
+		this.#contentBox.setBgFn(stateBgFn);
+		this.#contentBox.addChild(new WidthAwareText(contentWidth => this.#renderDefaultCard(contentWidth), 0, 0));
+	}
 }

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

@@ -28,7 +28,7 @@ import {
 	seedAlreadyExists,
 	summarizeMentalModel,
 } from "../../hindsight";
-import { resolveMemoryBackend } from "../../memory-backend";
+import { memoryStatsUnavailableMessage, resolveMemoryBackend } from "../../memory-backend";
 import { BashExecutionComponent } from "../../modes/components/bash-execution";
 import { BorderedLoader } from "../../modes/components/bordered-loader";
 import { DynamicBorder } from "../../modes/components/dynamic-border";
@@ -658,7 +658,7 @@ export class CommandController {
 			try {
 				const payload = await hook?.(agentDir, this.ctx.sessionManager.getCwd(), this.ctx.session);
 				if (!payload) {
-					this.ctx.showWarning(`Memory ${action} is not available for the ${backend.id} backend.`);
+					this.ctx.showWarning(memoryStatsUnavailableMessage(backend.id, action));
 					return;
 				}
 				showMarkdownPanel(this.ctx, `Memory ${action === "stats" ? "Stats" : "Diagnostics"}`, payload);