@oh-my-pi/pi-coding-agent 16.2.9 → 16.2.12

package/src/config/model-registry.ts

@@ -51,21 +51,7 @@ const LOCAL_PROVIDER_PLACEHOLDERS = new Set<string>(["llama-cpp-local", "lm-stud
 import type { ApiKeyResolver, FetchImpl } from "@oh-my-pi/pi-ai";
 import { registerOAuthProvider, unregisterOAuthProviders } from "@oh-my-pi/pi-ai/oauth";
 import type { OAuthCredentials, OAuthLoginCallbacks } from "@oh-my-pi/pi-ai/oauth/types";
-import {
-	buildCanonicalModelIndex,
-	buildCanonicalModelOrder,
-	buildModelProviderPriorityRank,
-	type CanonicalModelIndex,
-	type CanonicalModelRecord,
-	type CanonicalModelVariant,
-	type CanonicalVariantPreferences,
-	formatCanonicalVariantSelector,
-	getBundledCanonicalReferenceData,
-	getBundledModelReferenceIndex,
-	type ModelEquivalenceConfig,
-	resolveCanonicalVariant,
-	resolveModelReference,
-} from "@oh-my-pi/pi-catalog/identity";
+import { getBundledModelReferenceIndex, resolveModelReference } from "@oh-my-pi/pi-catalog/identity";
 import { isBunTestRuntime, isRecord, logger } from "@oh-my-pi/pi-utils";
 import { parseModelString, resolveProviderModelReference } from "../config/model-resolver";
 import type { AuthStorage, OAuthCredential } from "../session/auth-storage";
@@ -85,8 +71,6 @@ import { ModelsConfigFile, type ProviderValidationModel, validateProviderConfigu
 import type { ModelOverride, ModelsConfig, ProviderAuthMode } from "./models-config-schema";
 import { settings } from "./settings";
 
-export type { CanonicalModelIndex, CanonicalModelRecord, CanonicalModelVariant, ModelEquivalenceConfig };
-
 export const kNoAuth = "N/A";
 
 export function isAuthenticated(apiKey: string | undefined | null): apiKey is string {
@@ -243,17 +227,6 @@ export interface ProviderDiscoveryState {
 	error?: string;
 }
 
-export interface CanonicalModelQueryOptions {
-	availableOnly?: boolean;
-	candidates?: readonly Model<Api>[];
-}
-
-/** A canonical record (with query-filtered variants) plus the variant model selected for it. */
-export interface CanonicalModelSelection {
-	record: CanonicalModelRecord;
-	model: Model<Api>;
-}
-
 /** Result of loading custom models from models.json */
 interface CustomModelsResult {
 	models?: CustomModelOverlay[];
@@ -262,7 +235,6 @@ interface CustomModelsResult {
 	keylessProviders?: Set<string>;
 	discoverableProviders?: DiscoveryProviderConfig[];
 	configuredProviders?: Set<string>;
-	equivalence?: ModelEquivalenceConfig;
 	error?: ConfigError;
 	found: boolean;
 }
@@ -718,28 +690,17 @@ function getDisabledProviderIdsFromSettings(): Set<string> {
 	}
 }
 
-function getConfiguredProviderOrderFromSettings(): string[] {
-	try {
-		return settings.get("modelProviderOrder");
-	} catch {
-		return [];
-	}
-}
-
 /**
  * Model registry - loads and manages models, resolves API keys via AuthStorage.
  */
 export class ModelRegistry {
 	#models: Model<Api>[] = [];
-	#canonicalIndex: CanonicalModelIndex = { records: [], byId: new Map(), bySelector: new Map() };
-	#canonicalIndexDirty: boolean = true;
 	#customProviderApiKeys: Map<string, string> = new Map();
 	#keylessProviders: Set<string> = new Set();
 	#discoverableProviders: DiscoveryProviderConfig[] = [];
 	#customModelOverlays: CustomModelOverlay[] = [];
 	#providerOverrides: Map<string, ProviderOverride> = new Map();
 	#modelOverrides: Map<string, Map<string, ModelOverride>> = new Map();
-	#equivalenceConfig: ModelEquivalenceConfig | undefined;
 	#configError: ConfigError | undefined = undefined;
 	#modelsConfigFile: ConfigFile<ModelsConfig>;
 	#lastStaticLoadMtime: number | null = null;
@@ -759,8 +720,6 @@ export class ModelRegistry {
 	// Runtime model managers registered by extensions via fetchDynamicModels.
 	// Keyed by provider name; use the same SQLite cache path as builtins.
 	#runtimeModelManagers: Map<string, { options: ModelManagerOptions<Api>; sourceId: string }> = new Map();
-	#rebuildPending: boolean = false;
-	#rebuildSuspended: number = 0;
 	#fetch: FetchImpl;
 
 	#resolveCommandBackedApiKey(provider: string): CommandApiKeyResolution {
@@ -820,14 +779,9 @@ export class ModelRegistry {
 	 * Reload models from disk (built-in + custom from models.json).
 	 */
 	async refresh(strategy: ModelRefreshStrategy = "online-if-uncached"): Promise<void> {
-		this.#suspendRebuild();
-		try {
-			this.#reloadStaticModels();
-			this.#suppressedSelectors.clear();
-			await this.#refreshRuntimeDiscoveries(strategy);
-		} finally {
-			this.#resumeRebuild();
-		}
+		this.#reloadStaticModels();
+		this.#suppressedSelectors.clear();
+		await this.#refreshRuntimeDiscoveries(strategy);
 	}
 
 	refreshInBackground(strategy: ModelRefreshStrategy = "online-if-uncached"): void {
@@ -849,18 +803,13 @@ export class ModelRegistry {
 	}
 
 	async refreshProvider(providerId: string, strategy: ModelRefreshStrategy = "online"): Promise<void> {
-		this.#suspendRebuild();
-		try {
-			this.#reloadStaticModels();
-			for (const selector of this.#suppressedSelectors.keys()) {
-				if (selector.startsWith(`${providerId}/`)) {
-					this.#suppressedSelectors.delete(selector);
-				}
+		this.#reloadStaticModels();
+		for (const selector of this.#suppressedSelectors.keys()) {
+			if (selector.startsWith(`${providerId}/`)) {
+				this.#suppressedSelectors.delete(selector);
 			}
-			await this.#refreshRuntimeDiscoveries(strategy, new Set([providerId]));
-		} finally {
-			this.#resumeRebuild();
 		}
+		await this.#refreshRuntimeDiscoveries(strategy, new Set([providerId]));
 	}
 
 	/**
@@ -910,7 +859,6 @@ export class ModelRegistry {
 		this.#models = this.#models.map(candidate =>
 			candidate.provider === current.provider && candidate.id === current.id ? patched : candidate,
 		);
-		this.#rebuildCanonicalIndex();
 		return patched;
 	}
 
@@ -927,18 +875,13 @@ export class ModelRegistry {
 		if (this.#runtimeModelManagers.size === 0) {
 			return;
 		}
-		this.#suspendRebuild();
-		try {
-			await this.#refreshRuntimeDiscoveries(strategy, new Set(this.#runtimeModelManagers.keys()));
-		} finally {
-			this.#resumeRebuild();
-		}
+		await this.#refreshRuntimeDiscoveries(strategy, new Set(this.#runtimeModelManagers.keys()));
 	}
 
 	#reloadStaticModels(): void {
 		const currentMtime = this.#modelsConfigFile.getMtimeMs();
 		if (currentMtime !== null && currentMtime === this.#lastStaticLoadMtime) {
-			// models.json unchanged since last load; reload + canonical rebuild would be redundant.
+			// models.json unchanged since last load; reloading would be redundant.
 			return;
 		}
 		this.#modelsConfigFile.invalidate();
@@ -956,7 +899,6 @@ export class ModelRegistry {
 		}
 		this.#providerOverrides.clear();
 		this.#modelOverrides.clear();
-		this.#equivalenceConfig = undefined;
 		this.#configError = undefined;
 		this.#providerDiscoveryStates.clear();
 		this.#loadModels();
@@ -978,7 +920,6 @@ export class ModelRegistry {
 			keylessProviders = new Set(),
 			discoverableProviders = [],
 			configuredProviders = new Set(),
-			equivalence,
 			error: configError,
 		} = this.#loadCustomModels();
 		this.#configError = configError;
@@ -987,7 +928,6 @@ export class ModelRegistry {
 		this.#customModelOverlays = customModels;
 		this.#providerOverrides = overrides;
 		this.#modelOverrides = modelOverrides;
-		this.#equivalenceConfig = equivalence;
 
 		this.#addImplicitDiscoverableProviders(configuredProviders);
 		let builtInModels = this.#applyHardcodedModelPolicies(this.#loadBuiltInModels(overrides));
@@ -1024,7 +964,6 @@ export class ModelRegistry {
 		// collapse effort-tier variants here so X/X-thinking twins fold.
 		const withModelOverrides = this.#applyModelOverrides(collapseBuiltModelVariants(combined), this.#modelOverrides);
 		this.#models = this.#applyRuntimeProviderOverrides(withModelOverrides);
-		this.#rebuildCanonicalIndex();
 		this.#lastStaticLoadMtime = this.#modelsConfigFile.getMtimeMs();
 	}
 
@@ -1373,7 +1312,6 @@ export class ModelRegistry {
 			keylessProviders,
 			discoverableProviders,
 			configuredProviders,
-			equivalence: value.equivalence,
 			found: true,
 		};
 	}
@@ -1423,7 +1361,6 @@ export class ModelRegistry {
 		const combined = this.#mergeCustomModels(withConfigModels, this.#runtimeModelOverlays);
 		const withModelOverrides = this.#applyModelOverrides(collapseBuiltModelVariants(combined), this.#modelOverrides);
 		this.#models = this.#applyRuntimeProviderOverrides(withModelOverrides);
-		this.#rebuildCanonicalIndex();
 	}
 
 	#configuredDiscoveryCacheProviderId(providerConfig: DiscoveryProviderConfig): string {
@@ -1819,44 +1756,6 @@ export class ModelRegistry {
 		});
 	}
 
-	#rebuildCanonicalIndex(): void {
-		if (this.#rebuildSuspended > 0) {
-			this.#rebuildPending = true;
-			return;
-		}
-		// Defer the catalog-wide index build to first read. Boot model
-		// resolution reads it only when enabledModels or a default-role pattern
-		// is configured; the empty interactive launch never reads it pre-paint,
-		// so the ~200ms build over the full catalog moves off the first-paint
-		// critical path.
-		this.#canonicalIndexDirty = true;
-		this.#rebuildPending = false;
-	}
-
-	#ensureCanonicalIndex(): CanonicalModelIndex {
-		if (this.#canonicalIndexDirty) {
-			this.#canonicalIndex = logger.time("buildCanonicalModelIndex", () =>
-				buildCanonicalModelIndex(this.#models, getBundledCanonicalReferenceData(), this.#equivalenceConfig),
-			);
-			this.#canonicalIndexDirty = false;
-		}
-		return this.#canonicalIndex;
-	}
-
-	#suspendRebuild(): void {
-		this.#rebuildSuspended += 1;
-	}
-
-	#resumeRebuild(): void {
-		if (this.#rebuildSuspended > 0) {
-			this.#rebuildSuspended -= 1;
-		}
-		if (this.#rebuildSuspended === 0 && this.#rebuildPending) {
-			this.#rebuildPending = false;
-			this.#canonicalIndexDirty = true;
-		}
-	}
-
 	#parseModels(config: ModelsConfig): CustomModelOverlay[] {
 		const models: CustomModelOverlay[] = [];
 		for (const [providerName, providerConfig] of Object.entries(config.providers ?? {})) {
@@ -1918,115 +1817,6 @@ export class ModelRegistry {
 		};
 	}
 
-	/**
-	 * Build the shared per-query filter state for canonical model queries.
-	 * Hoisted out of the per-record loop: building the candidate-selector set
-	 * and availability memo once per query instead of once per record is what
-	 * keeps `getCanonicalModelSelections` linear instead of O(records × candidates).
-	 */
-	#canonicalQueryFilters(options: CanonicalModelQueryOptions | undefined): {
-		candidateKeys: Set<string> | undefined;
-		isAvailable: ((model: Model<Api>) => boolean) | undefined;
-	} {
-		return {
-			candidateKeys: options?.candidates
-				? new Set(options.candidates.map(candidate => formatCanonicalVariantSelector(candidate)))
-				: undefined,
-			isAvailable: options?.availableOnly ? this.#createAvailabilityCheck() : undefined,
-		};
-	}
-
-	#filterCanonicalVariants(
-		record: CanonicalModelRecord,
-		candidateKeys: ReadonlySet<string> | undefined,
-		isAvailable: ((model: Model<Api>) => boolean) | undefined,
-	): CanonicalModelVariant[] {
-		return record.variants.filter(variant => {
-			if (candidateKeys && !candidateKeys.has(variant.selector)) {
-				return false;
-			}
-			if (isAvailable && !isAvailable(variant.model)) {
-				return false;
-			}
-			return true;
-		});
-	}
-
-	#variantPreferences(candidates: readonly Model<Api>[]): CanonicalVariantPreferences {
-		return {
-			modelOrder: buildCanonicalModelOrder(candidates),
-			providerRank: buildModelProviderPriorityRank(getConfiguredProviderOrderFromSettings()),
-		};
-	}
-
-	getCanonicalModels(options?: CanonicalModelQueryOptions): CanonicalModelRecord[] {
-		const { candidateKeys, isAvailable } = this.#canonicalQueryFilters(options);
-		const records: CanonicalModelRecord[] = [];
-		for (const record of this.#ensureCanonicalIndex().records) {
-			const variants = this.#filterCanonicalVariants(record, candidateKeys, isAvailable);
-			if (variants.length === 0) {
-				continue;
-			}
-			records.push({
-				id: record.id,
-				name: record.name,
-				variants,
-			});
-		}
-		return records;
-	}
-
-	/**
-	 * One-pass equivalent of `getCanonicalModels` + `resolveCanonicalModel` per
-	 * record. The per-query state (candidate-selector set, availability memo,
-	 * provider rank, candidate order) is built once, so the whole catalog
-	 * resolves in O(records + candidates) instead of O(records × candidates).
-	 * This is the path the model selector hydrates from synchronously on open.
-	 */
-	getCanonicalModelSelections(options?: CanonicalModelQueryOptions): CanonicalModelSelection[] {
-		const { candidateKeys, isAvailable } = this.#canonicalQueryFilters(options);
-		const candidates = options?.candidates ?? (options?.availableOnly ? this.getAvailable() : this.getAll());
-		const preferences = this.#variantPreferences(candidates);
-		const selections: CanonicalModelSelection[] = [];
-		for (const record of this.#ensureCanonicalIndex().records) {
-			const variants = this.#filterCanonicalVariants(record, candidateKeys, isAvailable);
-			if (variants.length === 0) {
-				continue;
-			}
-			const resolved = resolveCanonicalVariant(variants, preferences);
-			if (!resolved) {
-				continue;
-			}
-			selections.push({
-				record: { id: record.id, name: record.name, variants },
-				model: resolved.model,
-			});
-		}
-		return selections;
-	}
-
-	getCanonicalVariants(canonicalId: string, options?: CanonicalModelQueryOptions): CanonicalModelVariant[] {
-		const record = this.#ensureCanonicalIndex().byId.get(canonicalId.trim().toLowerCase());
-		if (!record) {
-			return [];
-		}
-		const { candidateKeys, isAvailable } = this.#canonicalQueryFilters(options);
-		return this.#filterCanonicalVariants(record, candidateKeys, isAvailable);
-	}
-
-	resolveCanonicalModel(canonicalId: string, options?: CanonicalModelQueryOptions): Model<Api> | undefined {
-		const variants = this.getCanonicalVariants(canonicalId, options);
-		if (variants.length === 0) {
-			return undefined;
-		}
-		const candidates = options?.candidates ?? (options?.availableOnly ? this.getAvailable() : this.getAll());
-		return resolveCanonicalVariant(variants, this.#variantPreferences(candidates))?.model;
-	}
-
-	getCanonicalId(model: Model<Api>): string | undefined {
-		return this.#ensureCanonicalIndex().bySelector.get(formatCanonicalVariantSelector(model).toLowerCase());
-	}
-
 	/**
 	 * Get only models that have auth configured.
 	 * This is a fast check that doesn't refresh OAuth tokens.
@@ -2187,7 +1977,6 @@ export class ModelRegistry {
 		}
 		this.#lastStaticLoadMtime = null;
 		this.#reloadStaticModels();
-		this.#rebuildCanonicalIndex();
 	}
 
 	/**
@@ -2316,13 +2105,11 @@ export class ModelRegistry {
 				const credential = this.authStorage.getOAuthCredential(providerName);
 				if (credential) {
 					this.#models = config.oauth.modifyModels(withRuntimeTransportOverride, credential);
-					this.#rebuildCanonicalIndex();
 					return;
 				}
 			}
 
 			this.#models = withRuntimeTransportOverride;
-			this.#rebuildCanonicalIndex();
 			return;
 		}
 
@@ -2393,7 +2180,6 @@ export class ModelRegistry {
 				if (m.provider !== providerName) return m;
 				return this.#applyProviderTransportOverride(m, transportOverride);
 			});
-			this.#rebuildCanonicalIndex();
 		}
 	}