@oh-my-pi/pi-coding-agent 15.10.9 → 15.10.11

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

@@ -36,6 +36,9 @@ export class AssistantMessageComponent extends Container {
 	 * transcript keeps the error in history.
 	 */
 	#errorPinned = false;
+	/** Whether the last updateContent carried an in-flight streaming partial; such
+	 *  renders bypass the markdown module LRU (see Markdown.transientRenderCache). */
+	#lastUpdateTransient = false;
 
 	constructor(
 		message?: AssistantMessage,
@@ -59,7 +62,7 @@ export class AssistantMessageComponent extends Container {
 	override invalidate(): void {
 		super.invalidate();
 		if (this.#lastMessage) {
-			this.updateContent(this.#lastMessage);
+			this.updateContent(this.#lastMessage, { transient: this.#lastUpdateTransient });
 		}
 	}
 
@@ -75,7 +78,7 @@ export class AssistantMessageComponent extends Container {
 		if (this.#errorPinned === pinned) return;
 		this.#errorPinned = pinned;
 		if (this.#lastMessage) {
-			this.updateContent(this.#lastMessage);
+			this.updateContent(this.#lastMessage, { transient: this.#lastUpdateTransient });
 		}
 	}
 
@@ -123,7 +126,7 @@ export class AssistantMessageComponent extends Container {
 			this.#convertToolImagesForKitty(toolCallId, validImages);
 		}
 		if (this.#lastMessage) {
-			this.updateContent(this.#lastMessage);
+			this.updateContent(this.#lastMessage, { transient: this.#lastUpdateTransient });
 		}
 	}
 
@@ -146,7 +149,7 @@ export class AssistantMessageComponent extends Container {
 						mimeType: "image/png",
 					});
 					if (this.#lastMessage) {
-						this.updateContent(this.#lastMessage);
+						this.updateContent(this.#lastMessage, { transient: this.#lastUpdateTransient });
 					}
 					this.onImageUpdate?.();
 				})
@@ -159,7 +162,7 @@ export class AssistantMessageComponent extends Container {
 	setUsageInfo(usage: Usage): void {
 		this.#usageInfo = usage;
 		if (this.#lastMessage) {
-			this.updateContent(this.#lastMessage);
+			this.updateContent(this.#lastMessage, { transient: this.#lastUpdateTransient });
 		}
 	}
 
@@ -211,8 +214,9 @@ export class AssistantMessageComponent extends Container {
 		}
 	}
 
-	updateContent(message: AssistantMessage): void {
+	updateContent(message: AssistantMessage, opts?: { transient?: boolean }): void {
 		this.#lastMessage = message;
+		this.#lastUpdateTransient = opts?.transient === true;
 
 		// Clear content container
 		this.#contentContainer.clear();
@@ -228,7 +232,9 @@ export class AssistantMessageComponent extends Container {
 			if (content.type === "text" && content.text.trim()) {
 				// Assistant text messages with no background - trim the text
 				// Set paddingY=0 to avoid extra spacing before tool executions
-				this.#contentContainer.addChild(new Markdown(content.text.trim(), 1, 0, getMarkdownTheme()));
+				const markdown = new Markdown(content.text.trim(), 1, 0, getMarkdownTheme());
+				markdown.transientRenderCache = this.#lastUpdateTransient;
+				this.#contentContainer.addChild(markdown);
 			} else if (content.type === "thinking" && content.thinking.trim()) {
 				// Add spacing only when another visible assistant content block follows.
 				// This avoids a superfluous blank line before separately-rendered tool execution blocks.
@@ -245,12 +251,12 @@ export class AssistantMessageComponent extends Container {
 				} else {
 					const thinkingText = content.thinking.trim();
 					// Thinking traces in thinkingText color, italic
-					this.#contentContainer.addChild(
-						new Markdown(thinkingText, 1, 0, getMarkdownTheme(), {
-							color: (text: string) => theme.fg("thinkingText", text),
-							italic: true,
-						}),
-					);
+					const thinkingMarkdown = new Markdown(thinkingText, 1, 0, getMarkdownTheme(), {
+						color: (text: string) => theme.fg("thinkingText", text),
+						italic: true,
+					});
+					thinkingMarkdown.transientRenderCache = this.#lastUpdateTransient;
+					this.#contentContainer.addChild(thinkingMarkdown);
 					this.#appendThinkingExtensions(i, thinkingIndex, thinkingText);
 					thinkingIndex += 1;
 					if (hasVisibleContentAfter) {

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

@@ -126,7 +126,7 @@ export class BashExecutionComponent extends Container {
 		this.#updateDisplay();
 	}
 
-	override render(width: number): string[] {
+	override render(width: number): readonly string[] {
 		if (this.#displayDirty) {
 			this.#displayDirty = false;
 			this.#updateDisplay();

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

@@ -173,7 +173,7 @@ export class CopySelectorComponent implements Component {
 		return out;
 	}
 
-	render(width: number): string[] {
+	render(width: number): readonly string[] {
 		const height = process.stdout.rows || 40;
 		const flat = this.#flatten();
 		const cursorIdx = Math.max(

package/src/modes/components/diff.ts

@@ -109,10 +109,16 @@ export function renderDiff(diffText: string, options: RenderDiffOptions = {}): s
 	const lines = sanitizeText(diffText).split("\n");
 	const result: string[] = [];
 	const parsedLines = lines.map(parseDiffLine);
+	// Reserve 3 gutter digits: a streaming preview re-renders this diff as it
+	// grows, and a width derived purely from the current max line number widens
+	// at the 100-line crossing — re-padding every already-rendered row, which
+	// breaks the transcript's append-only commit detection and forces a full
+	// recommit of the block into native scrollback. A constant gutter through
+	// 999 lines keeps streamed rows byte-identical to the final result render.
 	const lineNumberWidth = parsedLines.reduce((width, parsed) => {
 		const lineNumber = parsed?.lineNum.trim() ?? "";
 		return Math.max(width, lineNumber.length);
-	}, 0);
+	}, 3);
 
 	// Batch-highlight context (unedited) lines so consecutive lines tokenize
 	// with full multi-line context. Highlighting is a no-op when no language
@@ -142,7 +148,12 @@ export function renderDiff(diffText: string, options: RenderDiffOptions = {}): s
 
 		if (!parsed) {
 			prevLineNum = "";
-			result.push(theme.fg("toolDiffContext", replaceTabs(line, options.filePath)));
+			// Blank gap rows (and legacy "..." markers from older transcripts)
+			// mark non-contiguous diff regions; display them as a single dim
+			// unicode ellipsis.
+			const trimmed = line.trim();
+			const isGapRow = trimmed.length === 0 || trimmed === "..." || trimmed === "…";
+			result.push(theme.fg("toolDiffContext", isGapRow ? "…" : replaceTabs(line, options.filePath)));
 			i++;
 			continue;
 		}

package/src/modes/components/dynamic-border.ts

@@ -10,16 +10,25 @@ import { theme } from "../../modes/theme/theme";
  */
 export class DynamicBorder implements Component {
 	#color: (str: string) => string;
+	#cachedWidth = -1;
+	#cachedLines: string[] | undefined;
 
 	constructor(color: (str: string) => string = str => theme.fg("border", str)) {
 		this.#color = color;
 	}
 
 	invalidate(): void {
-		// No cached state to invalidate currently
+		this.#cachedWidth = -1;
+		this.#cachedLines = undefined;
 	}
 
-	render(width: number): string[] {
-		return [this.#color(theme.boxSharp.horizontal.repeat(Math.max(1, width)))];
+	render(width: number): readonly string[] {
+		if (this.#cachedLines && this.#cachedWidth === width) {
+			return this.#cachedLines;
+		}
+		const lines = [this.#color(theme.boxSharp.horizontal.repeat(Math.max(1, width)))];
+		this.#cachedWidth = width;
+		this.#cachedLines = lines;
+		return lines;
 	}
 }

package/src/modes/components/extensions/extension-dashboard.ts

@@ -137,7 +137,7 @@ export class ExtensionDashboard extends Container {
 		return Math.max(3, this.#computeBodyHeight() - 3);
 	}
 
-	override render(width: number): string[] {
+	override render(width: number): readonly string[] {
 		// Rebuild when terminal geometry changes so the full-screen overlay
 		// re-fits on resize.
 		if (this.#terminalRows() !== this.#builtRows || this.#uiWidth() !== this.#builtCols) {
@@ -145,10 +145,13 @@ export class ExtensionDashboard extends Container {
 		}
 		const lines = super.render(width);
 		// Pad to the full viewport so the dashboard covers the screen instead of
-		// letting the transcript peek through below it.
+		// letting the transcript peek through below it. Copy before padding — the
+		// container's render result is component-owned and must not be mutated.
 		const rows = this.#terminalRows();
-		while (lines.length < rows) lines.push("");
-		return lines;
+		if (lines.length >= rows) return lines;
+		const padded = lines.slice();
+		while (padded.length < rows) padded.push("");
+		return padded;
 	}
 
 	#buildLayout(): void {
@@ -367,7 +370,7 @@ class TwoColumnBody implements Component {
 		private readonly maxHeight: number,
 	) {}
 
-	render(width: number): string[] {
+	render(width: number): readonly string[] {
 		const leftWidth = Math.floor(width * 0.5);
 		const rightWidth = Math.max(0, width - leftWidth - 3);
 

package/src/modes/components/extensions/extension-list.ts

@@ -113,7 +113,7 @@ export class ExtensionList implements Component {
 
 	invalidate(): void {}
 
-	render(width: number): string[] {
+	render(width: number): readonly string[] {
 		const lines: string[] = [];
 
 		// Search bar

package/src/modes/components/extensions/inspector-panel.ts

@@ -18,7 +18,7 @@ export class InspectorPanel implements Component {
 
 	invalidate(): void {}
 
-	render(width: number): string[] {
+	render(width: number): readonly string[] {
 		if (!this.#extension) {
 			return [theme.fg("muted", "Select an extension"), theme.fg("dim", "to view details")];
 		}

package/src/modes/components/footer.ts

@@ -110,7 +110,7 @@ export class FooterComponent implements Component {
 		return this.#cachedBranch;
 	}
 
-	render(width: number): string[] {
+	render(width: number): readonly string[] {
 		const state = this.session.state;
 
 		// Calculate cumulative usage from ALL session entries (not just post-compaction messages)

package/src/modes/components/history-search.ts

@@ -98,7 +98,7 @@ class HistoryResultsList implements Component {
 		// No cached state to invalidate currently
 	}
 
-	render(width: number): string[] {
+	render(width: number): readonly string[] {
 		const lines: string[] = [];
 
 		if (this.#results.length === 0) {

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

@@ -86,6 +86,14 @@ export class HookEditorComponent extends Container {
 		this.#onSubmitCallback(this.#editor.getExpandedText());
 	}
 
+	/** Route non-bracketed paste transports (e.g. kitty's OSC 5522 enhanced clipboard)
+	 *  into the inner editor, mirroring bracketed-paste semantics. Without this hook,
+	 *  enhanced-paste routing falls back to the main prompt editor hidden behind the
+	 *  dialog (#2127 routing contract). */
+	pasteText(text: string): void {
+		this.#editor.pasteText(text);
+	}
+
 	/** Prompt-style: raw Enter submits; Editor owns newline-producing sequences. */
 	#handlePromptStyleInput(keyData: string): void {
 		// Prompt-style keeps Escape as an explicit cancel key and also honors app.interrupt remaps.

package/src/modes/components/hook-input.ts

@@ -73,6 +73,14 @@ export class HookInputComponent extends Container {
 		}
 	}
 
+	/** Route non-bracketed paste transports (e.g. kitty's OSC 5522 enhanced clipboard)
+	 *  into the inner input, mirroring bracketed-paste semantics. Pasting counts as
+	 *  interaction, so the timeout countdown resets like any keystroke. */
+	pasteText(text: string): void {
+		this.#countdown?.reset();
+		this.#input.pasteText(text);
+	}
+
 	dispose(): void {
 		this.#countdown?.dispose();
 	}

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

@@ -122,7 +122,7 @@ class OutlinedList extends Container {
 		this.invalidate();
 	}
 
-	render(width: number): string[] {
+	render(width: number): readonly string[] {
 		const borderColor = (text: string) => theme.fg("border", text);
 		const horizontal = borderColor(theme.boxSharp.horizontal.repeat(Math.max(1, width)));
 		const innerWidth = Math.max(1, width - 2);
@@ -645,7 +645,7 @@ export class HookSelectorComponent extends Container {
 		}
 	}
 
-	override render(width: number): string[] {
+	override render(width: number): readonly string[] {
 		const renderWidth = Math.max(1, width);
 		if (this.#lastRenderWidth !== renderWidth) {
 			this.#lastRenderWidth = renderWidth;

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

@@ -1,5 +1,7 @@
 import { ThinkingLevel } from "@oh-my-pi/pi-agent-core";
-import { getSupportedEfforts, type Model, modelsAreEqual } from "@oh-my-pi/pi-ai";
+import type { Model } from "@oh-my-pi/pi-ai";
+import { getSupportedEfforts } from "@oh-my-pi/pi-catalog/model-thinking";
+import { modelsAreEqual } from "@oh-my-pi/pi-catalog/models";
 import {
 	Container,
 	fuzzyFilter,
@@ -16,8 +18,8 @@ import {
 } from "@oh-my-pi/pi-tui";
 import { formatNumber } from "@oh-my-pi/pi-utils";
 import type { ModelRegistry } from "../../config/model-registry";
-import { getKnownRoleIds, getRoleInfo, MODEL_ROLE_IDS, MODEL_ROLES } from "../../config/model-registry";
 import { getModelMatchPreferences, resolveModelRoleValue } from "../../config/model-resolver";
+import { getKnownRoleIds, getRoleInfo, MODEL_ROLE_IDS, MODEL_ROLES } from "../../config/model-roles";
 import type { Settings } from "../../config/settings";
 import { type ThemeColor, theme } from "../../modes/theme/theme";
 import { matchesSelectDown, matchesSelectUp } from "../../modes/utils/keybinding-matchers";
@@ -263,21 +265,26 @@ export class ModelSelectorComponent extends Container {
 		// Add bottom border
 		this.addChild(new DynamicBorder());
 
-		// Load models and do initial render
-		this.#loadModels().then(() => {
-			this.#buildProviderTabs();
-			this.#updateTabBar();
-			// Always apply the current search query — the user may have typed
-			// while models were loading asynchronously.
-			const currentQuery = this.#searchInput.getValue();
-			if (currentQuery) {
-				this.#filterModels(currentQuery);
-			} else {
-				this.#updateList();
-			}
-			// Request re-render after models are loaded
-			this.#tui.requestRender();
-		});
+		// Hydrate synchronously from the current registry snapshot so the first
+		// Enter after opening the selector acts on cached models instead of being
+		// dropped while the offline refresh promise is still pending. This stays
+		// on the open path, so it must remain cheap — heavy lifting lives in the
+		// registry's one-pass getCanonicalModelSelections.
+		this.#syncFromRegistryState();
+
+		// Reconcile with cached discovery state in the background. A --models
+		// scope is registry-independent, so the offline reload would only repeat
+		// the synchronous hydration above.
+		if (this.#scopedModels.length === 0) {
+			this.#modelRegistry
+				.refresh("offline")
+				.then(() => this.#syncFromRegistryState())
+				.catch(error => {
+					this.#errorMessage = error instanceof Error ? error.message : String(error);
+					this.#updateList();
+				})
+				.finally(() => this.#tui.requestRender());
+		}
 	}
 
 	#buildMenuRoleActions(): void {
@@ -477,37 +484,30 @@ export class ModelSelectorComponent extends Container {
 
 		const candidates = models.map(item => item.model);
 		this.#loadRoleModels(candidates);
-		const canonicalRecords = this.#modelRegistry.getCanonicalModels({
+		const canonicalSelections = this.#modelRegistry.getCanonicalModelSelections({
 			availableOnly: this.#scopedModels.length === 0,
 			candidates,
 		});
-		const canonicalModels = canonicalRecords
-			.map(record => {
-				const selectedModel = this.#modelRegistry.resolveCanonicalModel(record.id, {
-					availableOnly: this.#scopedModels.length === 0,
-					candidates,
-				});
-				if (!selectedModel) return undefined;
-				const searchText = [
-					record.id,
-					record.name,
-					selectedModel.provider,
-					selectedModel.id,
-					selectedModel.name,
-					...record.variants.flatMap(variant => [variant.selector, variant.model.name]),
-				].join(" ");
-				return {
-					kind: "canonical" as const,
-					id: record.id,
-					model: selectedModel,
-					selector: record.id,
-					variantCount: record.variants.length,
-					searchText,
-					normalizedSearchText: normalizeSearchText(searchText),
-					compactSearchText: compactSearchText(searchText),
-				};
-			})
-			.filter((item): item is CanonicalModelItem => item !== undefined);
+		const canonicalModels = canonicalSelections.map(({ record, model: selectedModel }): CanonicalModelItem => {
+			const searchText = [
+				record.id,
+				record.name,
+				selectedModel.provider,
+				selectedModel.id,
+				selectedModel.name,
+				...record.variants.flatMap(variant => [variant.selector, variant.model.name]),
+			].join(" ");
+			return {
+				kind: "canonical",
+				id: record.id,
+				model: selectedModel,
+				selector: record.id,
+				variantCount: record.variants.length,
+				searchText,
+				normalizedSearchText: normalizeSearchText(searchText),
+				compactSearchText: compactSearchText(searchText),
+			};
+		});
 
 		this.#sortModels(models);
 		this.#sortCanonicalModels(canonicalModels);
@@ -523,12 +523,27 @@ export class ModelSelectorComponent extends Container {
 		);
 	}
 
-	async #loadModels(): Promise<void> {
-		if (this.#scopedModels.length === 0) {
-			// Reload config and cached discovery state without blocking on live provider refresh
-			await this.#modelRegistry.refresh("offline");
-		}
+	/**
+	 * Rebuild the visible model lists from the registry's in-memory state.
+	 * Re-entrant: runs once synchronously at construction and again whenever a
+	 * background refresh lands, so it re-applies the live search query and pins
+	 * the highlighted item by selector — a refresh that reorders or inserts
+	 * models must not yank the user's selection out from under a pending Enter.
+	 */
+	#syncFromRegistryState(): void {
+		const selectedKey = this.#getSelectedItem()?.selector;
 		this.#loadModelsFromCurrentRegistryState();
+		this.#buildProviderTabs();
+		this.#updateTabBar();
+		this.#applyTabFilter();
+		if (selectedKey) {
+			const visibleItems = this.#getVisibleItems();
+			const restoredIndex = visibleItems.findIndex(item => item.selector === selectedKey);
+			if (restoredIndex >= 0 && restoredIndex !== this.#selectedIndex) {
+				this.#selectedIndex = this.#coerceSelectedIndex(restoredIndex, visibleItems);
+				this.#updateList();
+			}
+		}
 	}
 
 	#buildProviderTabs(): void {
@@ -631,10 +646,7 @@ export class ModelSelectorComponent extends Container {
 			// here must stay purely in-memory — do not call modelRegistry.refresh()
 			// again or tab switches will pay an extra whole-registry reload after the
 			// network round-trip completes.
-			this.#loadModelsFromCurrentRegistryState();
-			this.#buildProviderTabs();
-			this.#updateTabBar();
-			this.#applyTabFilter();
+			this.#syncFromRegistryState();
 		} catch (error) {
 			this.#errorMessage = error instanceof Error ? error.message : String(error);
 			this.#updateList();

package/src/modes/components/plan-review-overlay.ts

@@ -754,7 +754,7 @@ export class PlanReviewOverlay implements Component {
 		return [theme.fg("dim", this.#buildHelp())];
 	}
 
-	render(width: number): string[] {
+	render(width: number): readonly string[] {
 		const termHeight = process.stdout.rows || 40;
 		const sidebarShown = this.#sidebarVisible(width);
 		this.#sidebarShown = sidebarShown;

package/src/modes/components/session-observer-overlay.ts

@@ -118,12 +118,12 @@ export class SessionObserverOverlayComponent extends Container {
 		return pool.sort((a, b) => b.lastUpdate - a.lastUpdate)[0];
 	}
 
-	override render(width: number): string[] {
+	override render(width: number): readonly string[] {
 		return this.#renderViewer(width);
 	}
 
 	#setupViewer(): void {
-		this.children = [];
+		this.clear();
 		this.#scrollOffset = 0;
 		this.#selectedEntryIndex = 0;
 		this.#expandedEntries.clear();

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

@@ -255,7 +255,7 @@ class SessionList implements Component {
 		// No cached state to invalidate currently
 	}
 
-	render(width: number): string[] {
+	render(width: number): readonly string[] {
 		const lines: string[] = [];
 
 		// Render search input

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

@@ -631,8 +631,12 @@ export class SettingsSelectorComponent extends Container {
 			return;
 		}
 
-		// Escape at top level cancels
+		// Escape clears an active settings search before closing the panel.
 		if (matchesAppInterrupt(data) && !this.#currentSubmenu) {
+			if (this.#currentList?.hasSearchQuery()) {
+				this.#currentList.clearSearch();
+				return;
+			}
 			this.callbacks.onCancel();
 			return;
 		}

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

@@ -769,7 +769,7 @@ export class StatusLineComponent implements Component {
 		};
 	}
 
-	render(width: number): string[] {
+	render(width: number): readonly string[] {
 		// Only render hook statuses - main status is in editor's top border
 		const showHooks = this.#settings.showHookStatus ?? true;
 		if (!showHooks || this.#hookStatuses.size === 0) {

package/src/modes/components/tiny-title-download-progress.ts

@@ -71,7 +71,7 @@ export class TinyTitleDownloadProgressComponent implements Component {
 		// No cached state.
 	}
 
-	render(width: number): string[] {
+	render(width: number): readonly string[] {
 		width = Math.max(1, width);
 		const spec = getTinyTitleModelSpec(this.#modelKey);
 		const border = theme.fg("border", theme.boxSharp.horizontal.repeat(width));