@gajae-code/coding-agent 0.11.11 → 0.12.0

package/src/modes/components/irc-sidebar.ts

@@ -1,3 +1,4 @@
+import * as crypto from "node:crypto";
 import {
 	type Component,
 	padding,
@@ -21,6 +22,46 @@ const IRC_SIDEBAR_MAX_RENDER_SOURCE_UTF8_BYTES = 64 * 1_024;
 const IRC_SIDEBAR_OLDER_MESSAGES_ELISION = "… older IRC messages elided …";
 const IRC_SIDEBAR_MESSAGE_ELISION = "  … message elided …";
 
+export const __ircSidebarPerfCounters = {
+	enabled: false,
+	projectionMemoHits: 0,
+	projectionMemoMisses: 0,
+	recordsVisited: 0,
+	sourceBytes: 0,
+	rows: 0,
+	styledCacheHits: 0,
+	styledCacheMisses: 0,
+	wrapCalls: 0,
+	snapshot() {
+		return {
+			projectionMemoHits: this.projectionMemoHits,
+			projectionMemoMisses: this.projectionMemoMisses,
+			recordsVisited: this.recordsVisited,
+			sourceBytes: this.sourceBytes,
+			rows: this.rows,
+			styledCacheHits: this.styledCacheHits,
+			styledCacheMisses: this.styledCacheMisses,
+			wrapCalls: this.wrapCalls,
+		};
+	},
+	enable(): void {
+		this.enabled = true;
+	},
+	disable(): void {
+		this.enabled = false;
+	},
+	reset(): void {
+		this.projectionMemoHits = 0;
+		this.projectionMemoMisses = 0;
+		this.recordsVisited = 0;
+		this.sourceBytes = 0;
+		this.rows = 0;
+		this.styledCacheHits = 0;
+		this.styledCacheMisses = 0;
+		this.wrapCalls = 0;
+	},
+};
+
 /** Computes transcript/sidebar widths while preserving at least half the terminal for the transcript. */
 export function computeIrcSplitWidths(width: number): {
 	leftWidth: number;
@@ -34,12 +75,7 @@ export function computeIrcSplitWidths(width: number): {
 		0,
 		Math.min(preferredSidebar, normalizedWidth - IRC_SEPARATOR_WIDTH - transcriptFloor),
 	);
-
-	// The sidebar yields entirely rather than rendering below its readable minimum.
-	if (sidebarWidth < IRC_SIDEBAR_MIN_WIDTH) {
-		return { leftWidth: normalizedWidth, separatorWidth: 0, rightWidth: 0 };
-	}
-
+	if (sidebarWidth < IRC_SIDEBAR_MIN_WIDTH) return { leftWidth: normalizedWidth, separatorWidth: 0, rightWidth: 0 };
 	return {
 		leftWidth: normalizedWidth - IRC_SEPARATOR_WIDTH - sidebarWidth,
 		separatorWidth: IRC_SEPARATOR_WIDTH,
@@ -47,52 +83,99 @@ export function computeIrcSplitWidths(width: number): {
 	};
 }
 
-function styleSender(componentTheme: IrcSidebarTheme, sender: string): string {
-	return componentTheme.fg("accent", componentTheme.bold(sender));
+type SemanticLine = Readonly<{
+	kind: "header" | "body" | "elision" | "blank";
+	text: string;
+	sender?: string;
+	recipient?: string;
+	time?: string;
+}>;
+export type IrcSidebarSemanticProjection = Readonly<{ token: string; lines: readonly SemanticLine[] }>;
+const projectionMemo = new WeakMap<
+	IrcObservationLedger,
+	{ epoch: number; width: number; projection: IrcSidebarSemanticProjection }
+>();
+
+function semanticProjectionToken(lines: readonly SemanticLine[]): string {
+	const hash = crypto.createHash("sha256");
+	const length = Buffer.allocUnsafe(4);
+	const writeField = (value: string | undefined): void => {
+		length.writeUInt32BE(value === undefined ? 0xffffffff : Buffer.byteLength(value, "utf8"));
+		hash.update(length);
+		if (value !== undefined) hash.update(value, "utf8");
+	};
+
+	hash.update("gjc:irc:sidebar-semantic-projection:v1\0");
+	length.writeUInt32BE(lines.length);
+	hash.update(length);
+	for (const line of lines) {
+		writeField(line.kind);
+		writeField(line.text);
+		writeField(line.sender);
+		writeField(line.recipient);
+		writeField(line.time);
+	}
+	return hash.digest("hex");
 }
 
-function renderSidebarRecord(
+function projectRecord(
 	record: IrcObservationRecord,
 	width: number,
-	componentTheme: IrcSidebarTheme,
 	maxRows: number,
 	maxSourceUtf8Bytes: number,
-): { lines: string[]; sourceUtf8Bytes: number; truncated: boolean } {
+): { lines: SemanticLine[]; sourceUtf8Bytes: number; truncated: boolean } {
 	const bodyWidth = Math.max(1, width - 2);
 	const sourceLimit = Math.min(maxSourceUtf8Bytes, Math.max(0, maxRows - 1) * bodyWidth);
 	const clipped = projectIrcText(record.text, sourceLimit);
 	const block = formatIrcMessageBlock({ ...record, text: clipped.text });
-	const sender = styleSender(componentTheme, block.sender);
-	const time = componentTheme.fg("dim", block.time);
-	const lines = [truncateToWidth(`${sender} → ${block.recipient} · ${time}`, width)];
+	const lines: SemanticLine[] = [
+		{
+			kind: "header",
+			text: `${block.sender} → ${block.recipient} · ${block.time}`,
+			sender: block.sender,
+			recipient: block.recipient,
+			time: block.time,
+		},
+	];
 	let truncated = clipped.truncated;
-
 	body: for (const bodyLine of block.bodyLines) {
+		if (__ircSidebarPerfCounters.enabled) __ircSidebarPerfCounters.wrapCalls++;
 		for (const wrappedLine of wrapTextWithAnsi(bodyLine, bodyWidth)) {
 			if (lines.length >= maxRows) {
 				truncated = true;
 				break body;
 			}
-			lines.push(truncateToWidth(`  ${wrappedLine}`, width));
+			lines.push({ kind: "body", text: `  ${wrappedLine}` });
 		}
 	}
 	if (truncated && maxRows > 1) {
-		const marker = componentTheme.fg("dim", IRC_SIDEBAR_MESSAGE_ELISION);
-		if (lines.length >= maxRows) lines[maxRows - 1] = truncateToWidth(marker, width);
-		else lines.push(truncateToWidth(marker, width));
+		const marker: SemanticLine = { kind: "elision", text: IRC_SIDEBAR_MESSAGE_ELISION };
+		if (lines.length >= maxRows) lines[maxRows - 1] = marker;
+		else lines.push(marker);
 	}
 	return { lines, sourceUtf8Bytes: clipped.utf8Bytes, truncated };
 }
 
-function renderSidebarRecords(ledger: IrcObservationLedger, width: number, componentTheme: IrcSidebarTheme): string[] {
-	if (width <= 0) return [];
-
-	const records = ledger.getSidebarRecords();
-	const newestFirstBlocks: string[][] = [];
+/** The authoritative bounded, display-neutral IRC sidebar projection. */
+export function getIrcSidebarSemanticProjection(
+	ledger: IrcObservationLedger,
+	width: number,
+): IrcSidebarSemanticProjection {
+	if (width <= 0) return { token: "", lines: [] };
+	const memo = projectionMemo.get(ledger);
+	const cachedProjection = memo?.epoch === ledger.mutationEpoch && memo.width === width ? memo.projection : undefined;
+	if (cachedProjection) {
+		if (__ircSidebarPerfCounters.enabled) __ircSidebarPerfCounters.projectionMemoHits++;
+		return cachedProjection;
+	}
+	if (__ircSidebarPerfCounters.enabled) __ircSidebarPerfCounters.projectionMemoMisses++;
+	const newestFirstBlocks: SemanticLine[][] = [];
 	let renderedRows = 0;
 	let renderedSourceUtf8Bytes = 0;
 	let omittedOlderRecords = false;
+	const records = ledger.getSidebarRecords();
 	for (let index = records.length - 1; index >= 0; index--) {
+		if (__ircSidebarPerfCounters.enabled) __ircSidebarPerfCounters.recordsVisited++;
 		const separatorRows = newestFirstBlocks.length > 0 ? 1 : 0;
 		const availableRows = IRC_SIDEBAR_MAX_RENDER_ROWS - renderedRows - separatorRows - 2;
 		const availableSourceUtf8Bytes = IRC_SIDEBAR_MAX_RENDER_SOURCE_UTF8_BYTES - renderedSourceUtf8Bytes;
@@ -101,32 +184,32 @@ function renderSidebarRecords(ledger: IrcObservationLedger, width: number, compo
 			omittedOlderRecords = true;
 			break;
 		}
-
-		const rendered = renderSidebarRecord(
-			records[index],
-			width,
-			componentTheme,
-			availableRows,
-			availableSourceUtf8Bytes,
-		);
-		newestFirstBlocks.push(rendered.lines);
-		renderedRows += separatorRows + rendered.lines.length;
-		renderedSourceUtf8Bytes += rendered.sourceUtf8Bytes;
-		if (rendered.truncated) {
+		const projected = projectRecord(records[index], width, availableRows, availableSourceUtf8Bytes);
+		newestFirstBlocks.push(projected.lines);
+		renderedRows += separatorRows + projected.lines.length;
+		renderedSourceUtf8Bytes += projected.sourceUtf8Bytes;
+		if (__ircSidebarPerfCounters.enabled) __ircSidebarPerfCounters.sourceBytes += projected.sourceUtf8Bytes;
+		if (projected.truncated) {
 			omittedOlderRecords = index > 0;
 			break;
 		}
 	}
-
-	const lines: string[] = [];
-	if (omittedOlderRecords) {
-		lines.push(truncateToWidth(componentTheme.fg("dim", IRC_SIDEBAR_OLDER_MESSAGES_ELISION), width));
-	}
+	const lines: SemanticLine[] = omittedOlderRecords
+		? [{ kind: "elision", text: IRC_SIDEBAR_OLDER_MESSAGES_ELISION }]
+		: [];
 	for (const block of newestFirstBlocks.reverse()) {
-		if (lines.length > 0) lines.push("");
+		if (lines.length > 0) lines.push({ kind: "blank", text: "" });
 		lines.push(...block);
 	}
-	return lines.slice(0, IRC_SIDEBAR_MAX_RENDER_ROWS);
+	const bounded = lines.slice(0, IRC_SIDEBAR_MAX_RENDER_ROWS);
+	if (__ircSidebarPerfCounters.enabled) __ircSidebarPerfCounters.rows += bounded.length;
+	const projection = { token: semanticProjectionToken(bounded), lines: bounded };
+	projectionMemo.set(ledger, { epoch: ledger.mutationEpoch, width, projection });
+	return projection;
+}
+
+export function getIrcSidebarSemanticToken(ledger: IrcObservationLedger, width: number): string {
+	return getIrcSidebarSemanticProjection(ledger, width).token;
 }
 
 export interface IrcSidebarTheme {
@@ -134,64 +217,96 @@ export interface IrcSidebarTheme {
 	bold(text: string): string;
 	readonly boxSharp: { readonly vertical: string };
 }
-
 export type IrcSidebarThemeSource = IrcSidebarTheme | (() => IrcSidebarTheme);
 
 /** Read-only IRC history alongside the active transcript. */
 export class IrcSplitViewComponent implements ViewportAnchorProvider {
 	#visible = false;
+	#themeGeneration = 0;
+	#styledMemo:
+		| { token: string; width: number; themeGeneration: number; theme: IrcSidebarTheme; lines: string[] }
+		| undefined;
 
 	constructor(
 		private readonly leftPane: Component,
 		private readonly ledger: IrcObservationLedger,
 		private readonly componentTheme: IrcSidebarThemeSource,
 	) {}
-
 	get visible(): boolean {
 		return this.#visible;
 	}
-
 	effectiveSidebarVisible(width = process.stdout.columns ?? 0): boolean {
 		return this.#visible && computeIrcSplitWidths(width).rightWidth > 0;
 	}
-
 	setVisible(visible: boolean): void {
-		if (this.#visible === visible) return;
-		this.#visible = visible;
-		this.invalidate();
+		if (this.#visible !== visible) {
+			this.#visible = visible;
+			this.invalidate();
+		}
+	}
+	invalidateTheme(): void {
+		this.#themeGeneration++;
+		this.#styledMemo = undefined;
+	}
+	resetSource(): void {
+		projectionMemo.delete(this.ledger);
+		this.#styledMemo = undefined;
 	}
-
 	render(width: number): string[] {
 		return this.renderWithViewportAnchors(width).lines;
 	}
-
+	#renderSidebar(width: number, componentTheme: IrcSidebarTheme): string[] {
+		const projection = getIrcSidebarSemanticProjection(this.ledger, width);
+		const cached = this.#styledMemo;
+		if (
+			cached?.token === projection.token &&
+			cached.width === width &&
+			cached.themeGeneration === this.#themeGeneration &&
+			cached.theme === componentTheme
+		) {
+			if (__ircSidebarPerfCounters.enabled) __ircSidebarPerfCounters.styledCacheHits++;
+			return cached.lines;
+		}
+		if (__ircSidebarPerfCounters.enabled) __ircSidebarPerfCounters.styledCacheMisses++;
+		const lines = projection.lines.map(line => {
+			if (line.kind === "header")
+				return truncateToWidth(
+					`${componentTheme.fg("accent", componentTheme.bold(line.sender!))} → ${line.recipient} · ${componentTheme.fg("dim", line.time!)}`,
+					width,
+				);
+			return truncateToWidth(line.kind === "elision" ? componentTheme.fg("dim", line.text) : line.text, width);
+		});
+		this.#styledMemo = {
+			token: projection.token,
+			width,
+			themeGeneration: this.#themeGeneration,
+			theme: componentTheme,
+			lines,
+		};
+		return lines;
+	}
 	renderWithViewportAnchors(width: number): ViewportAnchorRender {
 		if (!this.#visible) return renderComponentWithViewportAnchors(this.leftPane, width);
-
 		const componentTheme = typeof this.componentTheme === "function" ? this.componentTheme() : this.componentTheme;
 		const { leftWidth, separatorWidth, rightWidth } = computeIrcSplitWidths(width);
 		if (rightWidth === 0) return renderComponentWithViewportAnchors(this.leftPane, width);
-
-		const separatorText = componentTheme.fg("dim", ` ${componentTheme.boxSharp.vertical} `);
-		const separator = separatorWidth > 0 ? separatorText : "";
+		const separator = separatorWidth > 0 ? componentTheme.fg("dim", ` ${componentTheme.boxSharp.vertical} `) : "";
 		const leftRender = withTerminalGraphicsFallback(
 			() => renderComponentWithViewportAnchors(this.leftPane, leftWidth),
 			{ allowCursorNeutralImages: true },
 		);
-		const rightLines = renderSidebarRecords(this.ledger, rightWidth, componentTheme);
+		const rightLines = this.#renderSidebar(rightWidth, componentTheme);
 		const lineCount = Math.max(leftRender.lines.length, rightLines.length);
 		const lines: string[] = [];
 		const anchors: ViewportAnchorRender["anchors"] = [];
-
 		const leftOffset = lineCount - leftRender.lines.length;
 		const rightOffset = lineCount - rightLines.length;
 		for (let index = 0; index < lineCount; index++) {
 			const leftIndex = index - leftOffset;
 			const leftRaw = leftRender.lines[leftIndex] ?? "";
 			const right = truncateToWidth(rightLines[index - rightOffset] ?? "", rightWidth);
-			if (TERMINAL.isImageLine(leftRaw)) {
-				lines.push(leftRaw + padding(leftWidth) + separator + right);
-			} else {
+			if (TERMINAL.isImageLine(leftRaw)) lines.push(leftRaw + padding(leftWidth) + separator + right);
+			else {
 				const left = truncateToWidth(leftRaw, leftWidth);
 				lines.push(left + padding(Math.max(0, leftWidth - visibleWidth(left))) + separator + right);
 			}
@@ -199,7 +314,6 @@ export class IrcSplitViewComponent implements ViewportAnchorProvider {
 		}
 		return { lines, anchors };
 	}
-
 	invalidate(): void {
 		this.leftPane.invalidate?.();
 	}

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

@@ -31,6 +31,8 @@ import {
 } from "../../config/model-resolver";
 import { type ModelSelectorValue, normalizeModelSelectorValue, selectorHead } from "../../config/model-selector-value";
 import type { ModelProfileConfig } from "../../config/models-config-schema";
+import { getProviderAuthHealth } from "../../config/provider-auth-health";
+import { compareRankedProviders, type ProviderAuthState } from "../../config/provider-ranking";
 import type { Settings } from "../../config/settings";
 import { type ThemeColor, theme } from "../../modes/theme/theme";
 import { formatModelOnboardingInlineHint } from "../../setup/model-onboarding-guidance";
@@ -542,10 +544,22 @@ export class ModelSelectorComponent extends Container {
 		this.#applyTabFilter();
 	}
 
+	#resolveProviderAuthState(providerId: string): ProviderAuthState {
+		const health = getProviderAuthHealth(this.#modelRegistry.authStorage, providerId);
+		if (health) return health;
+		return this.#modelRegistry.hasConfiguredProviderAuth(providerId) ? "configured" : "none";
+	}
+
 	#sortModels(models: ModelItem[]): void {
-		// Sort: default-tagged model first, then MRU, then alphabetical
+		// Sort: default-tagged model first, then MRU, then provider ranking
 		const mruOrder = this.#settings.getStorage()?.getModelUsageOrder() ?? [];
 		const mruIndex = new Map(mruOrder.map((key, i) => [key, i]));
+		const providerAuthStateById = new Map<string, ProviderAuthState>();
+		for (const item of models) {
+			if (!providerAuthStateById.has(item.provider)) {
+				providerAuthStateById.set(item.provider, this.#resolveProviderAuthState(item.provider));
+			}
+		}
 
 		const modelRank = (item: ModelItem) => computeModelRank(item.model, this.#roles);
 
@@ -566,7 +580,18 @@ export class ModelSelectorComponent extends Container {
 			if (aMru !== bMru) return aMru - bMru;
 
 			// By provider, then recency within provider
-			const providerCmp = a.provider.localeCompare(b.provider);
+			const providerCmp = compareRankedProviders(
+				{
+					id: a.provider,
+					label: a.provider,
+					authState: providerAuthStateById.get(a.provider) ?? "none",
+				},
+				{
+					id: b.provider,
+					label: b.provider,
+					authState: providerAuthStateById.get(b.provider) ?? "none",
+				},
+			);
 			if (providerCmp !== 0) return providerCmp;
 
 			// Priority field (lower = better, e.g. OpenAI code backend priority values)
@@ -608,6 +633,12 @@ export class ModelSelectorComponent extends Container {
 	#sortCanonicalModels(models: CanonicalModelItem[]): void {
 		const mruOrder = this.#settings.getStorage()?.getModelUsageOrder() ?? [];
 		const mruIndex = new Map(mruOrder.map((key, i) => [key, i]));
+		const providerAuthStateById = new Map<string, ProviderAuthState>();
+		for (const item of models) {
+			if (!providerAuthStateById.has(item.model.provider)) {
+				providerAuthStateById.set(item.model.provider, this.#resolveProviderAuthState(item.model.provider));
+			}
+		}
 
 		const modelRank = (item: CanonicalModelItem) => computeModelRank(item.model, this.#roles);
 
@@ -620,7 +651,18 @@ export class ModelSelectorComponent extends Container {
 			const bMru = mruIndex.get(`${b.model.provider}/${b.model.id}`) ?? Number.MAX_SAFE_INTEGER;
 			if (aMru !== bMru) return aMru - bMru;
 
-			const providerCmp = a.model.provider.localeCompare(b.model.provider);
+			const providerCmp = compareRankedProviders(
+				{
+					id: a.model.provider,
+					label: a.model.provider,
+					authState: providerAuthStateById.get(a.model.provider) ?? "none",
+				},
+				{
+					id: b.model.provider,
+					label: b.model.provider,
+					authState: providerAuthStateById.get(b.model.provider) ?? "none",
+				},
+			);
 			if (providerCmp !== 0) return providerCmp;
 
 			return a.id.localeCompare(b.id);
@@ -735,8 +777,23 @@ export class ModelSelectorComponent extends Container {
 		for (const provider of this.#modelRegistry.getDiscoverableProviders()) {
 			providerSet.add(provider);
 		}
+		const providerAuthStateById = new Map<string, ProviderAuthState>();
+		for (const provider of providerSet) {
+			providerAuthStateById.set(provider, this.#resolveProviderAuthState(provider));
+		}
 		const sortedProviderIds = Array.from(providerSet).sort((left, right) =>
-			formatProviderTabLabel(left).localeCompare(formatProviderTabLabel(right)),
+			compareRankedProviders(
+				{
+					id: left,
+					label: formatProviderTabLabel(left),
+					authState: providerAuthStateById.get(left) ?? "none",
+				},
+				{
+					id: right,
+					label: formatProviderTabLabel(right),
+					authState: providerAuthStateById.get(right) ?? "none",
+				},
+			),
 		);
 		this.#providers = [...STATIC_PROVIDER_TABS, ...sortedProviderIds.map(createProviderTab)];
 		const activeIndex = this.#providers.findIndex(tab => tab.id === activeTabId);

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

@@ -1,6 +1,8 @@
 import { getOAuthProviders } from "@gajae-code/ai/utils/oauth";
 import type { OAuthProviderInfo } from "@gajae-code/ai/utils/oauth/types";
 import { Container, matchesKey, Spacer, TruncatedText } from "@gajae-code/tui";
+import { recordProviderAuthHealth } from "../../config/provider-auth-health";
+import { compareRankedProviders, type ProviderAuthState } from "../../config/provider-ranking";
 import { theme } from "../../modes/theme/theme";
 import { matchesSelectCancel } from "../../modes/utils/keybinding-matchers";
 import type { AuthStorage } from "../../session/auth-storage";
@@ -14,6 +16,7 @@ const OAUTH_SELECTOR_MAX_VISIBLE = 10;
 export class OAuthSelectorComponent extends Container {
 	#listContainer: Container;
 	#allProviders: OAuthProviderInfo[] = [];
+	#sortedProviders: OAuthProviderInfo[] = [];
 	#selectedIndex: number = 0;
 	#mode: "login" | "logout";
 	#authStorage: AuthStorage;
@@ -91,7 +94,7 @@ export class OAuthSelectorComponent extends Container {
 			}
 			this.#authState.set(provider.id, "checking");
 			pending += 1;
-			void this.#validateProvider(provider.id, generation);
+			void this.#validateProvider(provider.id, generation, this.#authStorage.getGeneration());
 		}
 
 		if (pending > 0) {
@@ -101,7 +104,7 @@ export class OAuthSelectorComponent extends Container {
 		}
 	}
 
-	async #validateProvider(providerId: string, generation: number): Promise<void> {
+	async #validateProvider(providerId: string, generation: number, authGeneration: number): Promise<void> {
 		if (!this.#validateAuthCallback) return;
 		let isValid = false;
 		try {
@@ -112,6 +115,11 @@ export class OAuthSelectorComponent extends Container {
 
 		if (generation !== this.#validationGeneration) return;
 		this.#authState.set(providerId, isValid ? "valid" : "invalid");
+		// Only record the ordering hint when the credentials validated are still the
+		// current ones; a result from a superseded generation must not describe them.
+		if (authGeneration === this.#authStorage.getGeneration()) {
+			recordProviderAuthHealth(this.#authStorage, providerId, isValid ? "valid" : "invalid");
+		}
 		if (![...this.#authState.values()].includes("checking")) {
 			this.#stopSpinner();
 		}
@@ -138,6 +146,10 @@ export class OAuthSelectorComponent extends Container {
 		}
 	}
 
+	#getProviderAuthState(providerId: string): ProviderAuthState {
+		return this.#authState.get(providerId) ?? "none";
+	}
+
 	#getStatusIndicator(providerId: string): string {
 		const state = this.#authState.get(providerId);
 		if (state === "checking") {
@@ -154,9 +166,25 @@ export class OAuthSelectorComponent extends Container {
 		return this.#authStorage.hasAuth(providerId) ? theme.fg("success", ` ${theme.status.success} logged in`) : "";
 	}
 	#updateList(): void {
+		const selectedProviderId = this.#sortedProviders[this.#selectedIndex]?.id;
+		const rankedProviders = this.#allProviders.map(provider => ({
+			provider,
+			id: provider.id,
+			label: provider.name,
+			authState: this.#getProviderAuthState(provider.id),
+		}));
+		rankedProviders.sort(compareRankedProviders);
+		this.#sortedProviders = rankedProviders.map(({ provider }) => provider);
+		if (selectedProviderId !== undefined) {
+			const selectedIndex = this.#sortedProviders.findIndex(provider => provider.id === selectedProviderId);
+			if (selectedIndex >= 0) this.#selectedIndex = selectedIndex;
+		}
+		if (this.#selectedIndex >= this.#sortedProviders.length) {
+			this.#selectedIndex = Math.max(0, this.#sortedProviders.length - 1);
+		}
 		this.#listContainer.clear();
 
-		const total = this.#allProviders.length;
+		const total = this.#sortedProviders.length;
 		const maxVisible = OAUTH_SELECTOR_MAX_VISIBLE;
 		const startIndex =
 			total <= maxVisible
@@ -165,7 +193,7 @@ export class OAuthSelectorComponent extends Container {
 		const endIndex = Math.min(startIndex + maxVisible, total);
 
 		for (let i = startIndex; i < endIndex; i++) {
-			const provider = this.#allProviders[i];
+			const provider = this.#sortedProviders[i];
 			if (!provider) continue;
 			const isSelected = i === this.#selectedIndex;
 			const isAvailable = provider.available;
@@ -218,23 +246,25 @@ export class OAuthSelectorComponent extends Container {
 	handleInput(keyData: string): void {
 		// Up arrow
 		if (matchesKey(keyData, "up")) {
-			if (this.#allProviders.length > 0) {
-				this.#selectedIndex = this.#selectedIndex === 0 ? this.#allProviders.length - 1 : this.#selectedIndex - 1;
+			if (this.#sortedProviders.length > 0) {
+				this.#selectedIndex =
+					this.#selectedIndex === 0 ? this.#sortedProviders.length - 1 : this.#selectedIndex - 1;
 			}
 			this.#statusMessage = undefined;
 			this.#updateList();
 		}
 		// Down arrow
 		else if (matchesKey(keyData, "down")) {
-			if (this.#allProviders.length > 0) {
-				this.#selectedIndex = this.#selectedIndex === this.#allProviders.length - 1 ? 0 : this.#selectedIndex + 1;
+			if (this.#sortedProviders.length > 0) {
+				this.#selectedIndex =
+					this.#selectedIndex === this.#sortedProviders.length - 1 ? 0 : this.#selectedIndex + 1;
 			}
 			this.#statusMessage = undefined;
 			this.#updateList();
 		}
 		// Page up - jump up by one visible page
 		else if (matchesKey(keyData, "pageUp")) {
-			if (this.#allProviders.length > 0) {
+			if (this.#sortedProviders.length > 0) {
 				this.#selectedIndex = Math.max(0, this.#selectedIndex - OAUTH_SELECTOR_MAX_VISIBLE);
 			}
 			this.#statusMessage = undefined;
@@ -242,9 +272,9 @@ export class OAuthSelectorComponent extends Container {
 		}
 		// Page down - jump down by one visible page
 		else if (matchesKey(keyData, "pageDown")) {
-			if (this.#allProviders.length > 0) {
+			if (this.#sortedProviders.length > 0) {
 				this.#selectedIndex = Math.min(
-					this.#allProviders.length - 1,
+					this.#sortedProviders.length - 1,
 					this.#selectedIndex + OAUTH_SELECTOR_MAX_VISIBLE,
 				);
 			}
@@ -253,7 +283,7 @@ export class OAuthSelectorComponent extends Container {
 		}
 		// Enter
 		else if (matchesKey(keyData, "enter") || matchesKey(keyData, "return") || keyData === "\n") {
-			const selectedProvider = this.#allProviders[this.#selectedIndex];
+			const selectedProvider = this.#sortedProviders[this.#selectedIndex];
 			if (selectedProvider?.available) {
 				this.#statusMessage = undefined;
 				this.stopValidation();