@gajae-code/coding-agent 0.16.3 → 0.16.4

package/src/main.ts

@@ -31,7 +31,15 @@ import { selectSession } from "./cli/session-picker";
 import { findConfigFile } from "./config";
 import { activateModelProfile, ModelProfileCredentialError } from "./config/model-profile-activation";
 import { ModelRegistry, ModelsConfigFile } from "./config/model-registry";
-import { resolveCliModel, resolveModelRoleValue, resolveModelScope, type ScopedModel } from "./config/model-resolver";
+import {
+	parseModelString,
+	refreshMissingQualifiedModelProviders,
+	resolveCliModel,
+	resolveModelRoleValue,
+	resolveModelScope,
+	resolveStartupModelRefreshSelectors,
+	type ScopedModel,
+} from "./config/model-resolver";
 import { selectorHead } from "./config/model-selector-value";
 import { getDefault, type SettingPath, Settings, settings } from "./config/settings";
 import { resolveMachineLocalUpdateChannel, type UpdateChannel } from "./config/update-channel";
@@ -49,7 +57,7 @@ import type { PrintModeOptions } from "./modes/print-mode";
 import { initTheme, stopThemeWatcher } from "./modes/theme/theme";
 import type { SubmittedUserInput } from "./modes/types";
 import { applyCliRuntimeApiKeyOverride } from "./runtime-api-key";
-import { parseCliCredentialSelector } from "./runtime-credential-selector";
+import { type CliCredentialSelector, parseCliCredentialSelector } from "./runtime-credential-selector";
 import type { MCPManager } from "./runtime-mcp";
 import {
 	type CreateAgentSessionOptions,
@@ -1645,6 +1653,66 @@ export async function runRootCommand(
 			)
 		: undefined;
 
+	if (parsedArgs.apiKey && parsedArgs.credential) {
+		process.stderr.write(`${chalk.red("--api-key and --credential cannot be used together")}\n`);
+		process.exit(1);
+	}
+	if (parsedArgs.credential && parsedArgs.preferCredential) {
+		process.stderr.write(`${chalk.red("--credential and --prefer-credential cannot be used together")}\n`);
+		process.exit(1);
+	}
+	if (parsedArgs.apiKey && parsedArgs.preferCredential) {
+		process.stderr.write(`${chalk.red("--api-key and --prefer-credential cannot be used together")}\n`);
+		process.exit(1);
+	}
+
+	let credentialSelector: CliCredentialSelector | undefined;
+	let preferredCredentialSelector: CliCredentialSelector | undefined;
+	try {
+		credentialSelector = parsedArgs.credential ? parseCliCredentialSelector(parsedArgs.credential) : undefined;
+		preferredCredentialSelector = parsedArgs.preferCredential
+			? parseCliCredentialSelector(parsedArgs.preferCredential)
+			: undefined;
+		if (preferredCredentialSelector) {
+			const provider =
+				preferredCredentialSelector.provider ??
+				authStorage.resolveRuntimePreferredCredentialSelectorProvider(preferredCredentialSelector.selector);
+			authStorage.setRuntimePreferredCredentialSelector(provider, preferredCredentialSelector.selector);
+		}
+	} catch (error) {
+		const message = error instanceof Error ? error.message : String(error);
+		process.stderr.write(`${chalk.red(message)}\n`);
+		process.exit(1);
+	}
+
+	const hasRootStartupProfile = Boolean(settingsInstance.get("modelProfile.default") || parsedArgs.mpreset);
+	const startupModelSelectors = resolveStartupModelRefreshSelectors(
+		{
+			model: parsedArgs.model,
+			provider: parsedArgs.provider,
+			credential: parsedArgs.credential,
+			continue: parsedArgs.continue,
+			resume: parsedArgs.resume,
+			hasStartupProfile: hasRootStartupProfile,
+		},
+		settingsInstance,
+	);
+	const explicitStartupModelSelector = parsedArgs.model
+		? typeof startupModelSelectors === "string"
+			? startupModelSelectors
+			: parsedArgs.model
+		: undefined;
+	if (parsedArgs.apiKey && explicitStartupModelSelector) {
+		const parsedModel = parseModelString(explicitStartupModelSelector);
+		if (parsedModel) authStorage.setRuntimeApiKey(parsedModel.provider, parsedArgs.apiKey);
+	}
+	await logger.time(
+		"refreshStartupModelProviders",
+		refreshMissingQualifiedModelProviders,
+		startupModelSelectors,
+		modelRegistry,
+	);
+
 	let scopedModels: ScopedModel[] = [];
 	const modelPatterns = parsedArgs.models ?? settingsInstance.get("enabledModels");
 	const modelMatchPreferences = {
@@ -1779,7 +1847,6 @@ export async function runRootCommand(
 	if (isInteractive && sessionOptions.mcpConfigPath) {
 		sessionOptions.deferMcpConfigStartup = true;
 	}
-	const hasRootStartupProfile = Boolean(settingsInstance.get("modelProfile.default") || parsedArgs.mpreset);
 	// ACP is not carved out: `gjc acp` is broker-backed and never builds a local
 	// session here, and the broker-launched lifecycle child defers memory startup
 	// unconditionally (createLifecycleAgentSession) so readiness never waits on
@@ -1790,37 +1857,8 @@ export async function runRootCommand(
 	const acpStartupOptions = mode === "acp" ? resolveAcpStartupOptions(parsedArgs, sessionOptions) : undefined;
 
 	// Handle CLI credential selection and --api-key as runtime overrides (not persisted).
-	if (parsedArgs.apiKey && parsedArgs.credential) {
-		process.stderr.write(`${chalk.red("--api-key and --credential cannot be used together")}\n`);
-		process.exit(1);
-	}
-	if (parsedArgs.credential && parsedArgs.preferCredential) {
-		process.stderr.write(`${chalk.red("--credential and --prefer-credential cannot be used together")}\n`);
-		process.exit(1);
-	}
-	if (parsedArgs.apiKey && parsedArgs.preferCredential) {
-		process.stderr.write(`${chalk.red("--api-key and --prefer-credential cannot be used together")}\n`);
-		process.exit(1);
-	}
-
-	if (parsedArgs.credential) {
-		try {
-			sessionOptions.credentialSelector = parseCliCredentialSelector(parsedArgs.credential);
-		} catch (error) {
-			const message = error instanceof Error ? error.message : String(error);
-			process.stderr.write(`${chalk.red(message)}\n`);
-			process.exit(1);
-		}
-	}
-	if (parsedArgs.preferCredential) {
-		try {
-			sessionOptions.preferredCredentialSelector = parseCliCredentialSelector(parsedArgs.preferCredential);
-		} catch (error) {
-			const message = error instanceof Error ? error.message : String(error);
-			process.stderr.write(`${chalk.red(message)}\n`);
-			process.exit(1);
-		}
-	}
+	if (credentialSelector) sessionOptions.credentialSelector = credentialSelector;
+	if (preferredCredentialSelector) sessionOptions.preferredCredentialSelector = preferredCredentialSelector;
 	if (parsedArgs.apiKey) {
 		if (!sessionOptions.model && !sessionOptions.modelPattern) {
 			process.stderr.write(

package/src/modes/DESIGN.md

@@ -347,6 +347,60 @@ CJK/Latin todo, IRC, status, and BTW text break at semantic phrase boundaries,
 not inside a phase/action/status label, short identifier, or grapheme cluster.
 Those defects, width overflow, overlap, hidden focus/cursor, and lost anchors
 are blocking visual-QA failures.
+
+### Status Line Custom Editor simulation
+
+The Appearance tab's Status Line Custom Editor is a spatial editor, not a
+generic setting row list. It renders a simulated statusbar with left/right
+segment areas, a hidden-segment palette, visible Separator and segment-option
+controls, and Confirm/Exit actions. It must not render legacy `Segment`,
+`Move left`, or `Move right` rows.
+
+The editor owns transient state locally: focused statusbar slot, focused palette
+item, focused root control, open visible-choice panel, picked segment, floating
+ghost, empty origin slot, and overflow warning. Durable settings remain only the
+existing `statusLine.leftSegments`, `statusLine.rightSegments`,
+`statusLine.separator`, and `statusLine.segmentOptions` keys; Confirm persists
+through the existing settings guard, while Exit or root-state Escape restores
+the previous preview and closes.
+
+Focus variants are `statusbar`, `palette`, `separator-control`,
+`option-control(path)`, `choice(target, focusedValue, returnFocus)`, `confirm`,
+and `exit`. Left/Right is owned by the editor while active and never switches
+settings tabs. Enter selects/deselects, picks/drops, applies a focused choice,
+or activates Confirm/Exit according to focus. Up/Down traverses palette,
+visible root controls, actions, and choice candidates. Escape inside `choice`
+returns to the opener without mutation; Escape everywhere else cancels and
+restores. Delete only hides a focused visible statusbar segment.
+
+Separator and every segment option are visible-choice controls, never cycle-only
+rows. Descriptor data owns labels, allowed values, visible current-value
+formatting, and typed draft application. Separator choices are Powerline, Thin
+chevron, Slash, Pipe, Block, None, and ASCII. Boolean options show `true` and
+`false`; enum options show their union values; `path.maxLength` shows `16`,
+`24`, `32`, `40`, `50`, `60`, and `80`.
+
+At constrained width the simulated statusbar renders as two rows and emits an
+explicit overflow/wrap warning. ANSI-aware cell measurement remains mandatory;
+ASCII/no-color output must retain textual focus, ghost/origin, selected choice,
+and warning affordances.
+
+Deterministic evidence belongs to
+`test/fixtures/tui/status-line-custom-editor-showcase.ts`, captured by
+`scripts/capture-status-line-custom-editor-showcase.ts --out
+.gjc/qa/status-line-custom-editor-<run>` and verified by
+`scripts/verify-status-line-custom-editor-showcase.ts --root
+.gjc/qa/status-line-custom-editor-<run> --require-independent-review`. The
+canonical states are `root-statusbar`, `picked-origin-slot`,
+`palette-exact-insert`, `separator-control`, `separator-choice-focused`,
+`separator-choice-applied`, `option-boolean-choice-focused`,
+`option-enum-choice-focused`, `option-numeric-choice-focused`,
+`option-choice-applied`, `exit-restored`, `confirm-persisted`,
+`overflow-two-row-warning`, and `narrow-cjk`. Each state records
+`terminal.txt`, `terminal-ansi.txt`, `terminal.html`, and `metadata.json`, plus
+the root manifest. Missing state witnesses, ANSI/plain mismatch, invalid
+metadata, and absent independent review are blocking visual-QA failures.
+
 ### Sticky viewport deterministic visual QA
 
 `test/fixtures/tui/sticky-viewport-showcase.ts` is a fixed-clock, no-network,

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

@@ -106,16 +106,24 @@ export class AssistantMessageComponent extends Container {
 	#toolImagesRevision = 0;
 	#convertedToolImagesRevision = 0;
 	#disposed = false;
+	// Cached Markdown children can outlive their attachment to this assistant.
+	// Session/live-parent validity belongs to the owner, not the paint lifetime.
+	readonly #requestRepaint?: () => void;
 	constructor(
 		message?: AssistantMessage,
 		private hideThinkingBlock = false,
-		private readonly onImageUpdate?: () => void,
+		onImageUpdate?: () => void,
 		viewportAnchorId?: string,
 		private readonly onVisibleMutation?: () => void,
 		private readonly hintSession?: ProviderSafetyStopHintSession,
 	) {
 		super();
 		this.#viewportAnchorId = viewportAnchorId;
+		if (onImageUpdate) {
+			this.#requestRepaint = () => {
+				if (!this.#disposed) onImageUpdate();
+			};
+		}
 
 		this.#contentContainer = new Container();
 		this.addChild(this.#contentContainer);
@@ -172,6 +180,7 @@ export class AssistantMessageComponent extends Container {
 	}
 
 	#notifyVisibleMutation(): void {
+		if (this.#disposed) return;
 		const after = this.#visibleContentSignature();
 		if (after === this.#visibleSignature) return;
 		this.#visibleSignature = after;
@@ -186,6 +195,7 @@ export class AssistantMessageComponent extends Container {
 	}
 
 	override invalidate(): void {
+		if (this.#disposed) return;
 		super.invalidate();
 		if (this.#lastMessage) {
 			this.updateContent(this.#lastMessage, { streaming: this.#lastStreaming });
@@ -193,13 +203,14 @@ export class AssistantMessageComponent extends Container {
 	}
 
 	setHideThinkingBlock(hide: boolean): void {
+		if (this.#disposed) return;
 		if (this.hideThinkingBlock === hide) return;
 		this.hideThinkingBlock = hide;
 		this.#notifyVisibleMutation();
 	}
 
 	setToolResultImages(toolCallId: string, images: ImageContent[]): void {
-		if (!toolCallId) return;
+		if (this.#disposed || !toolCallId) return;
 		const validImages = images.filter(img => img.type === "image" && img.data && img.mimeType);
 		const previousImages = this.#toolImagesByCallId.get(toolCallId);
 		if (
@@ -268,7 +279,7 @@ export class AssistantMessageComponent extends Container {
 					this.#convertedKittyImages.set(key, { type: "image", data, mimeType: "image/png", source });
 					this.#convertedToolImagesRevision += 1;
 					if (this.#lastMessage) this.updateContent(this.#lastMessage, { streaming: this.#lastStreaming });
-					this.onImageUpdate?.();
+					this.#requestRepaint?.();
 				})
 				.catch(() => {
 					if (
@@ -283,6 +294,7 @@ export class AssistantMessageComponent extends Container {
 	}
 
 	setUsageInfo(usage: Usage): void {
+		if (this.#disposed) return;
 		this.#usageInfo = usage;
 		if (this.#lastMessage) {
 			this.updateContent(this.#lastMessage, { streaming: this.#lastStreaming });
@@ -311,7 +323,7 @@ export class AssistantMessageComponent extends Container {
 		const cached = this.#contentBlocksCache.get(content);
 		if (cached?.source === content.text) {
 			if (cached.component instanceof Markdown) {
-				cached.component.setOnStaleThrottle(this.onImageUpdate);
+				cached.component.setOnStaleThrottle(this.#requestRepaint);
 				cached.component.setStreaming(streaming);
 			}
 			return cached.component;
@@ -322,14 +334,14 @@ export class AssistantMessageComponent extends Container {
 		// instead of constructing a new one each chunk; combined with the markdown
 		// per-code-block highlight cache, appends no longer re-highlight the whole prefix.
 		if (!deepInterview && cached && cached.component instanceof Markdown) {
-			cached.component.setOnStaleThrottle(this.onImageUpdate);
+			cached.component.setOnStaleThrottle(this.#requestRepaint);
 			cached.component.setText(trimmed, { streaming });
 			cached.source = content.text;
 			return cached.component;
 		}
 		const component = deepInterview ?? new Markdown(trimmed, 1, 0, getMarkdownTheme());
 		if (component instanceof Markdown) {
-			component.setOnStaleThrottle(this.onImageUpdate);
+			component.setOnStaleThrottle(this.#requestRepaint);
 			component.setStreaming(streaming);
 		}
 		this.#contentBlocksCache.set(content, { source: content.text, component });
@@ -341,14 +353,14 @@ export class AssistantMessageComponent extends Container {
 		const cached = this.#contentBlocksCache.get(content);
 		if (cached?.source === content.thinking) {
 			if (cached.component instanceof Markdown) {
-				cached.component.setOnStaleThrottle(this.onImageUpdate);
+				cached.component.setOnStaleThrottle(this.#requestRepaint);
 				cached.component.setStreaming(streaming);
 			}
 			return cached.component as Markdown;
 		}
 		const trimmed = elideRunawayThinkingRepetition(content.thinking.trim());
 		if (cached?.component instanceof Markdown) {
-			cached.component.setOnStaleThrottle(this.onImageUpdate);
+			cached.component.setOnStaleThrottle(this.#requestRepaint);
 			cached.component.setText(trimmed, { streaming });
 			cached.source = content.thinking;
 			return cached.component;
@@ -357,7 +369,7 @@ export class AssistantMessageComponent extends Container {
 			color: (text: string) => theme.fg("thinkingText", text),
 			italic: true,
 		});
-		component.setOnStaleThrottle(this.onImageUpdate);
+		component.setOnStaleThrottle(this.#requestRepaint);
 		component.setStreaming(streaming);
 		this.#contentBlocksCache.set(content, { source: content.thinking, component });
 		this.#reusableChildren.add(component);
@@ -437,6 +449,7 @@ export class AssistantMessageComponent extends Container {
 	}
 
 	updateContent(message: AssistantMessage, options?: AssistantMessageUpdateOptions): void {
+		if (this.#disposed) return;
 		this.#lastMessage = message;
 		this.#lastStreaming = options?.streaming ?? false;
 

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

@@ -410,6 +410,10 @@ export class ModelSelectorComponent extends Container {
 	#unsubscribeProviderOrderChanged: () => void = () => {};
 	#unsubscribeAuthGeneration: () => void = () => {};
 	#disposed = false;
+	#catalogLoaded = false;
+	#catalogLoadPromise?: Promise<void>;
+	#presetCatalogRefreshPending = false;
+	#openSmartRoutingAfterPresetRefresh = false;
 	/** Standalone smart-routing entry: cancel closes the selector instead of falling back to the preset landing. */
 	#smartRoutingOnly = false;
 
@@ -422,6 +426,8 @@ export class ModelSelectorComponent extends Container {
 	#presetScopeIndex: number = 0;
 	#providerAuthById = new Map<string, boolean>();
 	#bareProfileAuthByName = new Map<string, boolean>();
+	// Rebuilt with the provider and bare-selector snapshots on every catalog or credential refresh.
+	#profileAuthByName = new Map<string, boolean>();
 	#providerAuthPending: boolean = false;
 	#providerAuthRefreshGeneration = 0;
 	#presetLoginHint?: string;
@@ -545,21 +551,39 @@ export class ModelSelectorComponent extends Container {
 			this.#unsubscribeCatalogChanged = this.#modelRegistry.onCatalogChanged(() => {
 				if (this.#disposed) return;
 				if (this.#viewMode === "presets") {
-					this.#refreshCatalogView();
+					if (this.#presetCatalogRefreshPending) return;
+					this.#rebuildRoleModels();
 					this.#clampPresetCursor();
 					void this.#refreshProviderAuth();
 					this.#renderPresetLanding();
 					this.#tui.requestRender();
 					return;
 				}
+				if (this.#viewMode === "smart-routing" && this.#smartRoutingPanel) return;
+				// The in-flight load already consumes the latest registry snapshot. Avoid
+				// materializing the same catalog again from its own change notification.
+				if (this.#catalogLoadPromise) return;
+				if (!this.#catalogLoaded) {
+					void this.#initializeCatalogView();
+					return;
+				}
 				if (this.#refreshCatalogView()) this.#tui.requestRender();
 			});
 		}
 
-		// Advisory drift only, and only while the smart-routing panel is mounted. This
-		// must not call refreshState: that would discard the user's unsaved draft.
+		// Proxy and provider-policy changes invalidate preset availability. Provider-order changes are
+		// advisory only while smart routing is mounted and must not discard its draft.
 		this.#unsubscribeProviderOrderChanged = this.#settings.onChanged?.(path => {
-			if (this.#disposed || path !== "modelProviderOrder") return;
+			if (this.#disposed) return;
+			if (
+				path === "modelProfile.proxyProvider" ||
+				path === "modelProfile.proxyMode" ||
+				path === "disabledProviders"
+			) {
+				if (this.#viewMode === "presets") void this.#refreshProviderAuth();
+				return;
+			}
+			if (path !== "modelProviderOrder") return;
 			if (this.#viewMode !== "smart-routing") return;
 			const panel = this.#smartRoutingPanel;
 			if (!panel) return;
@@ -572,34 +596,21 @@ export class ModelSelectorComponent extends Container {
 				void this.#refreshProviderAuth();
 			}) ?? (() => {});
 
-		// Load models and do initial render
-		this.#loadModels().then(() => {
-			this.#buildProviderTabs();
-			if (this.#smartRoutingOnly) {
-				this.#enterSmartRoutingMode();
-				this.#tui.requestRender();
-				return;
-			}
-			if (this.#viewMode === "presets" && (this.#modelRegistry.getModelProfiles?.().size ?? 0) === 0) {
-				this.#viewMode = "models";
-			}
-			if (this.#viewMode === "presets") {
-				void this.#refreshProviderAuth();
+		if (this.#viewMode === "presets") {
+			// The landing only needs profile definitions and provider authentication.
+			// Refresh static configuration without enumerating and canonicalizing the
+			// full browser catalog, then resolve preset authentication once.
+			this.#presetCatalogRefreshPending = true;
+			if ((this.#modelRegistry.getModelProfiles?.().size ?? 0) > 0) {
 				this.#renderPresetLanding();
 			} else {
-				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();
-				}
+				this.#listContainer.addChild(new Text(theme.fg("muted", "Loading model presets..."), 0, 0));
 			}
-			// Request re-render after models are loaded
 			this.#tui.requestRender();
-		});
+			void this.#initializePresetLanding();
+		} else {
+			void this.#initializeCatalogView();
+		}
 	}
 
 	override dispose(): void {
@@ -1332,6 +1343,10 @@ export class ModelSelectorComponent extends Container {
 		return this.#modelRegistry.getModelProfile?.(name) ?? this.#modelRegistry.getModelProfiles?.().get(name);
 	}
 
+	#isPresetAvailabilityPending(): boolean {
+		return this.#presetCatalogRefreshPending || this.#providerAuthPending;
+	}
+
 	#isProviderAuthenticated(providerId: string): boolean | undefined {
 		return this.#providerAuthById.get(providerId);
 	}
@@ -1405,9 +1420,13 @@ export class ModelSelectorComponent extends Container {
 		return [...missing].sort((a, b) => a.localeCompare(b));
 	}
 
-	#isPresetAuthenticated(profileOrProfiles: ModelProfileDefinition | ModelProfileDefinition[]): boolean {
+	#isPresetAuthenticated(
+		profileOrProfiles: ModelProfileDefinition | ModelProfileDefinition[],
+		computeCurrent = false,
+	): boolean {
 		const profiles = Array.isArray(profileOrProfiles) ? profileOrProfiles : [profileOrProfiles];
 		return profiles.every(profile => {
+			if (!computeCurrent) return this.#profileAuthByName.get(profile.name) === true;
 			if (profile.source !== "user") {
 				if (inspectProxyProviderId(this.#settings).status === "invalid") return false;
 				const proxyProvider = tryResolveProxyProviderId(this.#settings);
@@ -1503,6 +1522,7 @@ export class ModelSelectorComponent extends Container {
 		const refreshGeneration = ++this.#providerAuthRefreshGeneration;
 		this.#providerAuthById = new Map();
 		this.#bareProfileAuthByName = new Map();
+		this.#profileAuthByName = new Map();
 		const availableModels = this.#getProfileAvailableModels();
 		const resolutionRegistry = this.#createProfileResolutionRegistry(availableModels);
 		const providers = new Set<string>();
@@ -1612,6 +1632,11 @@ export class ModelSelectorComponent extends Container {
 			)
 				return;
 			this.#bareProfileAuthByName = new Map(profileAuthEntries);
+			this.#profileAuthByName = new Map(
+				[...this.#getPresetGroups().values()]
+					.flat()
+					.map(profile => [profile.name, this.#isPresetAuthenticated(profile, true)]),
+			);
 		} finally {
 			if (
 				!this.#disposed &&
@@ -1684,6 +1709,39 @@ export class ModelSelectorComponent extends Container {
 		this.#searchInput.setValue(value);
 	}
 
+	async #initializePresetLanding(): Promise<void> {
+		this.#presetCatalogRefreshPending = true;
+		let refreshFailed = false;
+		try {
+			const refreshStatic = this.#modelRegistry.refreshStatic;
+			if (typeof refreshStatic === "function") await refreshStatic.call(this.#modelRegistry);
+			this.#errorMessage = this.#modelRegistry.getError();
+		} catch (error) {
+			refreshFailed = true;
+			this.#errorMessage = error instanceof Error ? error.message : String(error);
+		} finally {
+			this.#presetCatalogRefreshPending = false;
+		}
+		if (this.#disposed || this.#viewMode !== "presets") return;
+		if ((this.#modelRegistry.getModelProfiles?.().size ?? 0) === 0) {
+			this.#viewMode = "models";
+			void this.#initializeCatalogView();
+			return;
+		}
+		this.#rebuildRoleModels();
+		this.#clampPresetCursor();
+		if (this.#openSmartRoutingAfterPresetRefresh) {
+			this.#openSmartRoutingAfterPresetRefresh = false;
+			if (!refreshFailed) {
+				this.#enterSmartRoutingMode();
+				return;
+			}
+		}
+		void this.#refreshProviderAuth();
+		this.#renderPresetLanding();
+		this.#tui.requestRender();
+	}
+
 	#switchToModelMode(seed?: string, options?: { imageRoleFilter?: boolean }): void {
 		this.#viewMode = "models";
 		this.#expandedPresetProviderId = undefined;
@@ -1695,8 +1753,52 @@ export class ModelSelectorComponent extends Container {
 		this.#selectedIndex = 0;
 		this.#imageRoleFilter = options?.imageRoleFilter ?? false;
 		this.#setSearchInputValue(seed ?? this.#searchInput.getValue());
+		void this.#initializeCatalogView();
+	}
+
+	async #initializeCatalogView(): Promise<void> {
+		if (this.#catalogLoaded) {
+			this.#presentCatalogView();
+			return;
+		}
+		if (this.#catalogLoadPromise) return this.#catalogLoadPromise;
+
+		this.#headerContainer.clear();
+		this.#listContainer.clear();
+		this.#listContainer.addChild(new Text(theme.fg("muted", "Loading models..."), 0, 0));
+		this.#tui.requestRender();
+
+		const load = this.#loadModels().then(() => {
+			this.#catalogLoaded = true;
+			if (this.#disposed) return;
+			if (this.#smartRoutingOnly) {
+				this.#enterSmartRoutingMode();
+				return;
+			}
+			if (this.#viewMode === "models") this.#presentCatalogView();
+		});
+		this.#catalogLoadPromise = load;
+		try {
+			await load;
+		} catch (error) {
+			if (!this.#disposed && (this.#viewMode === "models" || this.#viewMode === "smart-routing")) {
+				this.#errorMessage = error instanceof Error ? error.message : String(error);
+				this.#buildProviderTabs();
+				this.#updateTabBar();
+				this.#updateList();
+				this.#tui.requestRender();
+			}
+		} finally {
+			if (this.#catalogLoadPromise === load) this.#catalogLoadPromise = undefined;
+		}
+	}
+
+	#presentCatalogView(): void {
+		this.#buildProviderTabs();
 		this.#updateTabBar();
+		// Apply the latest query: input remains responsive while the catalog loads.
 		this.#filterModels(this.#searchInput.getValue());
+		this.#tui.requestRender();
 	}
 
 	/**
@@ -1880,6 +1982,12 @@ export class ModelSelectorComponent extends Container {
 		for (const line of this.#formatCurrentSessionLines()) {
 			this.#headerContainer.addChild(new Text(line, 0, 0));
 		}
+		if (this.#errorMessage) {
+			for (const line of String(this.#errorMessage).split("\n")) {
+				this.#listContainer.addChild(new Text(theme.fg("error", line), 0, 0));
+			}
+			this.#listContainer.addChild(new Spacer(1));
+		}
 		const rows = this.#getPresetRows();
 		for (let i = 0; i < rows.length; i++) {
 			const row = rows[i];
@@ -1926,7 +2034,7 @@ export class ModelSelectorComponent extends Container {
 			}
 			if (row.kind === "group") {
 				const authenticated = this.#isPresetGroupUsable(row.profiles);
-				const mark = this.#providerAuthPending ? "…" : authenticated ? "✓" : "✗";
+				const mark = this.#isPresetAvailabilityPending() ? "…" : authenticated ? "✓" : "✗";
 				const containsActive =
 					this.#activeModelProfile !== undefined &&
 					row.profiles.some(profile => profile.name === this.#activeModelProfile);
@@ -1938,7 +2046,7 @@ export class ModelSelectorComponent extends Container {
 			}
 			const presentation = getModelProfilePresentation(row.profile);
 			const authenticated = this.#isPresetAuthenticated(row.profile);
-			const mark = this.#providerAuthPending ? "…" : authenticated ? "✓" : "✗";
+			const mark = this.#isPresetAvailabilityPending() ? "…" : authenticated ? "✓" : "✗";
 			const isActive = row.profile.name === this.#activeModelProfile;
 			const label = `  ${mark} ${presentation.displayName}`;
 			const renderedLabel = selected ? theme.fg("accent", label) : authenticated ? label : theme.fg("dim", label);
@@ -2305,7 +2413,11 @@ export class ModelSelectorComponent extends Container {
 
 	handleInput(keyData: string): void {
 		if (this.#viewMode === "smart-routing") {
-			this.#smartRoutingPanel?.handleInput(keyData);
+			if (this.#smartRoutingPanel) {
+				this.#smartRoutingPanel.handleInput(keyData);
+			} else if (getKeybindings().matches(keyData, "tui.select.cancel")) {
+				this.#onCancelCallback();
+			}
 			return;
 		}
 		if (this.#assignmentState === "assigning") {
@@ -2477,6 +2589,11 @@ export class ModelSelectorComponent extends Container {
 				this.#onSelectCallback({ kind: "deleteProfile", profileName: this.#previewProfileName });
 				return;
 			}
+			if (this.#isPresetAvailabilityPending()) {
+				this.#presetLoginHint = "Refreshing preset availability...";
+				this.#renderPresetLanding();
+				return;
+			}
 			const missing = this.#getMissingProviders(profile);
 			if (missing.length > 0) {
 				this.#presetLoginHint = `Run ${missing.map(provider => `/login ${provider}`).join(", ")}`;
@@ -2504,6 +2621,12 @@ export class ModelSelectorComponent extends Container {
 		const row = this.#getSelectedPresetRow();
 		if (!row) return;
 		if (row.kind === "smartRouting") {
+			if (this.#presetCatalogRefreshPending) {
+				this.#openSmartRoutingAfterPresetRefresh = true;
+				this.#presetLoginHint = "Refreshing model configuration...";
+				this.#renderPresetLanding();
+				return;
+			}
 			this.#enterSmartRoutingMode();
 			return;
 		}
@@ -2523,6 +2646,11 @@ export class ModelSelectorComponent extends Container {
 			return;
 		}
 		if (row.kind === "group") {
+			if (this.#isPresetAvailabilityPending()) {
+				this.#presetLoginHint = "Refreshing preset availability...";
+				this.#renderPresetLanding();
+				return;
+			}
 			// A group is a list of alternative presets; only surface a login hint
 			// when none of its members are usable. A partially-usable group stays
 			// navigable so the user can drill in and pick a usable member.
@@ -2546,6 +2674,11 @@ export class ModelSelectorComponent extends Container {
 			this.#renderPresetLanding();
 			return;
 		}
+		if (this.#isPresetAvailabilityPending() && !isCustomUserProfile(row.profile)) {
+			this.#presetLoginHint = "Refreshing preset availability...";
+			this.#renderPresetLanding();
+			return;
+		}
 		const missing = this.#getMissingProviders(row.profile);
 		if (missing.length > 0 && !isCustomUserProfile(row.profile)) {
 			this.#presetLoginHint = `Run ${missing.map(provider => `/login ${provider}`).join(", ")}`;
@@ -2583,7 +2716,7 @@ export class ModelSelectorComponent extends Container {
 			this.#presetLoginHint = undefined;
 			this.#clampPresetCursor();
 		}
-		this.#renderPresetLanding();
+		void this.#refreshProviderAuth();
 		this.#tui.requestRender();
 	}