@hyav/pi-provider 0.1.8 → 0.2.0

package/core/provider-registration.ts

@@ -1,6 +1,6 @@
 import type { ProviderConfig } from "@earendil-works/pi-coding-agent";
 import { validateProviderModelDrafts } from "./adapter-validation.ts";
-import { applyOfficialModelMetadata, findOfficialMeta, type OfficialModelMeta } from "./official-pricing.ts";
+import { mergeModelWithPiCatalog, type PiCatalogSnapshot, toPiCatalogSnapshot } from "./pi-model-metadata.ts";
 import { resolvePricingDetails } from "./pricing-adjustments.ts";
 import type { PiProviderDependencies } from "./runtime-config.ts";
 import type {
@@ -99,13 +99,6 @@ export function normalizeProviderModels(models: ProviderModelDraft[]): ProviderM
 	});
 }
 
-function cloneQuality(quality: NonNullable<OfficialModelMeta["quality"]>): NonNullable<OfficialModelMeta["quality"]> {
-	return quality.map((score) => ({
-		...score,
-		...(score.confidenceInterval ? { confidenceInterval: { ...score.confidenceInterval } } : {}),
-	}));
-}
-
 function selectPricingAdjustment(
 	adapter: ProviderAdapter,
 	model: ProviderModelDraft,
@@ -147,81 +140,71 @@ function inputsEqual(left: ProviderModelDraft["input"], right: ProviderModel["in
 	return Array.isArray(left) && left.length === right.length && left.every((value, index) => value === right[index]);
 }
 
-function getDraftCostSource(
-	draft: ProviderModelDraft | undefined,
-	officialMeta: OfficialModelMeta | undefined,
-	normalizedCost: ProviderCost,
-): ProviderPricingSource | "default" | "normalized" {
-	const candidate = draft?.cost ?? (officialMeta?.costKnown !== false ? officialMeta?.cost : undefined);
-	if (candidate === undefined) return "default";
-	if (!costsEqual(candidate, normalizedCost)) return "normalized";
-	return draft?.cost !== undefined ? (draft.pricingSource ?? "provider") : "official";
-}
-
-function getFieldSource(
-	providerValue: unknown,
-	officialValue: unknown,
-	wasNormalized: boolean,
-): "provider" | "official" | "default" | "normalized" {
-	if (providerValue === undefined && officialValue === undefined) return "default";
-	if (wasNormalized) return "normalized";
-	return providerValue !== undefined ? "provider" : "official";
-}
-
 function resolveModelRegistration(
 	adapter: ProviderAdapter,
 	runtime: PiProviderDependencies,
 	modelDrafts: ProviderModelDraft[],
-	officialPricing: Record<string, OfficialModelMeta>,
+	catalogSnapshot?: PiCatalogSnapshot | Record<string, unknown>,
 ): { models: ProviderModel[]; modelMetadata: Record<string, ProviderModelMetadata> } {
 	validateProviderModelDrafts(modelDrafts, `Provider ${adapter.id}`);
-	const enrichedDrafts = applyOfficialModelMetadata(modelDrafts, officialPricing);
+	const catalog = toPiCatalogSnapshot(catalogSnapshot);
 	const pricingPolicy = runtime.pricingPolicies?.[adapter.id] ?? adapter.pricing;
 	const metadata: Record<string, ProviderModelMetadata> = {};
-	const adjustedDrafts = enrichedDrafts.map((model, index) => {
-		const modelId = model.id.trim();
-		const originalDraft = modelDrafts[index];
-		const officialMeta = findOfficialMeta(modelId, officialPricing);
-		const normalizedModel = normalizeProviderModel(model);
-		const normalizedCost = normalizeCost(model.cost);
-		const fieldSources = {
-			cost: getDraftCostSource(originalDraft, officialMeta, normalizedCost),
-			contextWindow: getFieldSource(
-				originalDraft?.contextWindow,
-				officialMeta?.contextWindow,
-				model.contextWindow !== undefined && model.contextWindow !== normalizedModel.contextWindow,
-			),
-			maxTokens: getFieldSource(
-				originalDraft?.maxTokens,
-				officialMeta?.maxTokens,
-				model.maxTokens !== undefined && model.maxTokens !== normalizedModel.maxTokens,
-			),
-			input: getFieldSource(
-				originalDraft?.input,
-				officialMeta?.input,
-				model.input !== undefined && !inputsEqual(model.input, normalizedModel.input),
-			),
-			reasoning: getFieldSource(
-				originalDraft?.reasoning,
-				officialMeta?.reasoning,
-				model.reasoning !== undefined && model.reasoning !== normalizedModel.reasoning,
-			),
-			thinkingLevelMap: getFieldSource(originalDraft?.thinkingLevelMap, officialMeta?.thinkingLevelMap, false),
-		};
+	const adjustedDrafts = modelDrafts.map((originalDraft) => {
+		const modelId = originalDraft.id.trim();
+		const useFallback = adapter.usePiModelMetaFallback ?? true;
+		const merged = mergeModelWithPiCatalog(originalDraft, catalog, {
+			useFallback,
+			currentProviderId: adapter.id,
+		});
+		const mergedDraft = merged.draft;
+		const fieldSources = { ...merged.fieldSources };
+
+		const normalizedModel = normalizeProviderModel(mergedDraft);
+		const normalizedCost = normalizeCost(mergedDraft.cost);
+
+		if (mergedDraft.contextWindow !== undefined && mergedDraft.contextWindow !== normalizedModel.contextWindow) {
+			fieldSources.contextWindow = "normalized";
+		}
+		if (mergedDraft.maxTokens !== undefined && mergedDraft.maxTokens !== normalizedModel.maxTokens) {
+			fieldSources.maxTokens = "normalized";
+		}
+		if (mergedDraft.input !== undefined && !inputsEqual(mergedDraft.input, normalizedModel.input)) {
+			fieldSources.input = "normalized";
+		}
+		if (mergedDraft.reasoning !== undefined && mergedDraft.reasoning !== normalizedModel.reasoning) {
+			fieldSources.reasoning = "normalized";
+		}
+		if (mergedDraft.cost !== undefined && !costsEqual(mergedDraft.cost, normalizedCost)) {
+			fieldSources.cost = "normalized";
+		}
+
 		const source: ProviderPricingSource | "none" =
-			model.cost === undefined ? "none" : (model.pricingSource ?? "provider");
+			mergedDraft.cost === undefined
+				? "none"
+				: (mergedDraft.pricingSource ??
+					(fieldSources.cost === "mixed"
+						? "mixed"
+						: fieldSources.cost === "pi"
+							? "pi"
+							: fieldSources.cost === "provider"
+								? "provider"
+								: (originalDraft.pricingSource ?? "provider")));
+
 		const pricing = resolvePricingDetails(
-			model.cost === undefined ? undefined : normalizedCost,
+			mergedDraft.cost === undefined ? undefined : normalizedCost,
 			source,
-			selectPricingAdjustment(adapter, model, pricingPolicy),
+			selectPricingAdjustment(adapter, mergedDraft, pricingPolicy),
 		);
+		if (fieldSources.costBySku) {
+			pricing.costBySku = fieldSources.costBySku;
+		}
 		metadata[modelId] = {
 			pricing,
 			fieldSources,
-			...(officialMeta?.quality ? { quality: cloneQuality(officialMeta.quality) } : {}),
 		};
 		return {
-			...model,
+			...mergedDraft,
 			...(pricing.effectiveCost ? { cost: pricing.effectiveCost } : {}),
 		};
 	});
@@ -286,7 +269,6 @@ function getRegistrationState(adapter: ProviderAdapter): NonNullable<ProviderAda
 	if (!registration) return undefined;
 	registration.normalizedModels ??= [];
 	registration.modelMetadata ??= {};
-	registration.officialPricing ??= {};
 	registration.activeRefreshes ??= 0;
 	return registration;
 }
@@ -321,7 +303,7 @@ function shouldOmitOptionalApiKey(adapter: ProviderAdapter, runtime: PiProviderD
 export function prepareProviderRegistration(
 	adapter: ProviderAdapter,
 	runtime: PiProviderDependencies,
-	officialPricing: Record<string, OfficialModelMeta> = {},
+	catalogSnapshot?: PiCatalogSnapshot | Record<string, unknown>,
 	modelDrafts?: ProviderModelDraft[],
 ): ProviderConfig {
 	const drafts =
@@ -329,18 +311,24 @@ export function prepareProviderRegistration(
 		(adapter.registration?.normalizedModels === adapter.provider.models
 			? adapter.registration.modelDrafts
 			: adapter.provider.models);
-	const resolved = resolveModelRegistration(adapter, runtime, drafts, officialPricing);
+	const lifecycle = adapter.lifecycle ?? (adapter.provider.refreshModels as any)?.lifecycle;
+	if (lifecycle && drafts && drafts.length > 0) {
+		lifecycle.setModels(drafts, adapter.catalog?.source, adapter.catalog?.updatedAt);
+	}
+	const catalog = toPiCatalogSnapshot(catalogSnapshot);
+	const resolved = resolveModelRegistration(adapter, runtime, drafts, catalog);
 	const existingRegistration = getRegistrationState(adapter);
 	const registration: NonNullable<ProviderAdapter["registration"]> = existingRegistration ?? {
 		modelDrafts: drafts,
 		normalizedModels: [],
 		modelMetadata: {},
-		officialPricing,
+		piCatalog: catalog,
 		activeRefreshes: 0,
 	};
 	registration.modelDrafts = drafts;
 	registration.modelMetadata = resolved.modelMetadata;
-	registration.officialPricing = officialPricing;
+	registration.piCatalog = catalog;
+	registration.officialPricing = catalogSnapshot as any;
 	const models = replaceModels(registration.normalizedModels, resolved.models);
 	const adapterOwnsCatalog = adapter.catalog !== undefined;
 	adapter.registration = registration;
@@ -365,7 +353,12 @@ export function prepareProviderRegistration(
 			registration.activeRefreshes++;
 			try {
 				const refreshedModels = await originalRefresh(options);
-				const resolved = resolveModelRegistration(adapter, runtime, refreshedModels, registration.officialPricing);
+				const resolved = resolveModelRegistration(
+					adapter,
+					runtime,
+					refreshedModels,
+					registration.piCatalog ?? registration.officialPricing,
+				);
 				const normalizedModels = replaceModels(registration.normalizedModels, resolved.models);
 				registration.modelDrafts = refreshedModels;
 				registration.modelMetadata = resolved.modelMetadata;
@@ -410,18 +403,22 @@ export function refreshProviderRegistrations(
 	pi: ProviderRegistrationApi,
 	providers: readonly ProviderAdapter[],
 	runtime: PiProviderDependencies,
-	officialPricing: Record<string, OfficialModelMeta>,
+	catalogSnapshot?: PiCatalogSnapshot | Record<string, unknown>,
 	providerDrafts?: ReadonlyMap<ProviderAdapter, ProviderModelDraft[]>,
 ): void {
+	const catalog = toPiCatalogSnapshot(catalogSnapshot);
 	for (const adapter of providers) {
 		const registration = getRegistrationState(adapter);
-		if (registration) registration.officialPricing = officialPricing;
+		if (registration) {
+			registration.piCatalog = catalog;
+			registration.officialPricing = catalogSnapshot as any;
+		}
 		if (registration && registration.activeRefreshes > 0) {
 			registration.deferredRegistration = () =>
-				registerProviderAdapter(pi, adapter, runtime, officialPricing, providerDrafts?.get(adapter));
+				registerProviderAdapter(pi, adapter, runtime, catalogSnapshot, providerDrafts?.get(adapter));
 			continue;
 		}
-		registerProviderAdapter(pi, adapter, runtime, officialPricing, providerDrafts?.get(adapter));
+		registerProviderAdapter(pi, adapter, runtime, catalogSnapshot, providerDrafts?.get(adapter));
 	}
 }
 
@@ -429,10 +426,10 @@ export function registerProviderAdapter(
 	pi: ProviderRegistrationApi,
 	adapter: ProviderAdapter,
 	runtime: PiProviderDependencies,
-	officialPricing: Record<string, OfficialModelMeta> = {},
+	catalogSnapshot?: PiCatalogSnapshot | Record<string, unknown>,
 	modelDrafts?: ProviderModelDraft[],
 ): ProviderConfig {
-	const registeredProvider = prepareProviderRegistration(adapter, runtime, officialPricing, modelDrafts);
+	const registeredProvider = prepareProviderRegistration(adapter, runtime, catalogSnapshot, modelDrafts);
 	// Pi merges re-registrations, so omission alone cannot clear a raw API key
 	// left by the previous extension instance during /reload.
 	if (registeredProvider.apiKey === undefined) pi.unregisterProvider?.(adapter.id);

package/core/public-adapters.ts

@@ -18,7 +18,7 @@ export {
 	defineStatusExtension,
 	defineTunerExtension,
 } from "./adapter-extensions.ts";
-export { MAX_PROVIDER_MODEL_COUNT } from "./adapter-validation.ts";
+export { MAX_PROVIDER_MODEL_COUNT, validateProviderModelDrafts } from "./adapter-validation.ts";
 export { createCatalogPreflightAdapter } from "./catalog-preflight.ts";
 export { withDeadline } from "./deadline.ts";
 export {
@@ -37,6 +37,7 @@ export type {
 } from "./model-catalog.ts";
 export { createModelCatalogLifecycle } from "./model-catalog.ts";
 export { createOpenCodeCatalogPreflightAdapter } from "./opencode-preflight.ts";
+export { isLegacyNormalizedModel, isLegacyNormalizedSnapshot } from "./pi-model-metadata.ts";
 export type {
 	PreflightAdapter,
 	PreflightContextLike,
@@ -48,10 +49,15 @@ export { parseRetryAfter } from "./retry-after.ts";
 export type { StatusContextLike } from "./status-manager.ts";
 export type {
 	ActiveModel,
+	ModelCatalogSource,
 	ModelCatalogStatus,
 	ProviderAdapter,
+	ProviderCost,
 	ProviderModel,
 	ProviderModelDraft,
+	ProviderPricingAdjustment,
+	ProviderPricingPolicy,
+	ProviderPricingSource,
 	ProviderRefreshContext,
 	ProviderRequestAuth,
 	StatusAdapter,
@@ -59,5 +65,7 @@ export type {
 	StatusEntry,
 	StatusSnapshot,
 	StoredCredentialLike,
+	ThinkingLevel,
+	TunerAdapter,
 	TunerContext,
 } from "./types.ts";

package/core/runtime-config.ts

@@ -2,7 +2,6 @@ import { homedir } from "node:os";
 import { join } from "node:path";
 import { isValidTimeoutMs } from "./deadline.ts";
 import type { PiProviderDefinition } from "./definition.ts";
-import { getDefaultOpenRouterMetadataCachePath, OPENROUTER_MODELS_URL } from "./official-pricing.ts";
 import { validatePricingPolicy } from "./pricing-adjustments.ts";
 import type { ProviderPricingPolicy, StoredCredentialLike } from "./types.ts";
 
@@ -12,21 +11,26 @@ export interface PiProviderDependencies {
 	modelDiscoveryTimeoutMs: number;
 	statusRequestTimeoutMs: number;
 	liveCheckRequestTimeoutMs: number;
-	officialPricingUrl: string;
-	officialPricingTimeoutMs: number;
-	officialPricingCacheTtlMs: number;
-	officialPricingMaxStaleMs: number;
-	/** Resolved Pi agent directory; empty disables disk persistence of pricing metadata. */
+	/** Resolved Pi agent directory. */
 	agentDir: string;
-	/** Persistent cache for OpenRouter metadata used by the pricing fallback. */
-	openRouterMetadataCachePath: string;
 	/** Read Pi's stored credential metadata; injected by the Pi entrypoint. */
 	readStoredCredential: (providerId: string) => StoredCredentialLike | undefined;
 	/** Wrap ANSI-aware text to a render width; injected by the Pi entrypoint. */
 	wrapTextWithAnsi: (text: string, width: number) => string[];
-	enableOfficialPricingFallback: boolean;
 	/** Optional Pi Provider-level price policies keyed by Provider ID. */
 	pricingPolicies?: Record<string, ProviderPricingPolicy>;
+	/** @deprecated OpenRouter pricing metadata has been removed. */
+	officialPricingUrl?: string;
+	/** @deprecated No longer used. */
+	officialPricingTimeoutMs?: number;
+	/** @deprecated No longer used. */
+	officialPricingCacheTtlMs?: number;
+	/** @deprecated No longer used. */
+	officialPricingMaxStaleMs?: number;
+	/** @deprecated No longer used. */
+	openRouterMetadataCachePath?: string;
+	/** @deprecated No longer used. */
+	enableOfficialPricingFallback?: boolean;
 }
 
 export type PiProviderLoader = (runtime: PiProviderDependencies) => Promise<PiProviderDefinition>;
@@ -90,7 +94,7 @@ function defaultWrapTextWithAnsi(text: string, width: number): string[] {
 	return chunks;
 }
 
-type DefaultDependencies = Omit<PiProviderDependencies, "agentDir" | "openRouterMetadataCachePath">;
+type DefaultDependencies = Omit<PiProviderDependencies, "agentDir">;
 
 const defaultDependencies: DefaultDependencies = {
 	fetch: globalThis.fetch,
@@ -98,25 +102,19 @@ const defaultDependencies: DefaultDependencies = {
 	modelDiscoveryTimeoutMs: 3_000,
 	statusRequestTimeoutMs: 8_000,
 	liveCheckRequestTimeoutMs: 8_000,
-	officialPricingUrl: OPENROUTER_MODELS_URL,
-	officialPricingTimeoutMs: 3_000,
-	officialPricingCacheTtlMs: 60 * 60 * 1_000,
-	officialPricingMaxStaleMs: 24 * 60 * 60 * 1_000,
 	readStoredCredential: () => undefined,
 	wrapTextWithAnsi: defaultWrapTextWithAnsi,
-	enableOfficialPricingFallback: true,
 	pricingPolicies: {},
 };
 
 /**
- * Programmatic defaults keep the resolved agent directory and its pricing cache
- * path. The Pi entrypoint overrides `agentDir` with Pi's own resolution.
+ * Programmatic defaults keep the resolved agent directory.
+ * The Pi entrypoint overrides `agentDir` with Pi's own resolution.
  */
 export function getDefaultPiProviderDependencies(agentDir = resolveDefaultAgentDir()): PiProviderDependencies {
 	return {
 		...defaultDependencies,
 		agentDir,
-		openRouterMetadataCachePath: getDefaultOpenRouterMetadataCachePath(agentDir),
 	};
 }
 
@@ -127,23 +125,11 @@ export function validatePiProviderDependencies(runtime: PiProviderDependencies):
 		["modelDiscoveryTimeoutMs", runtime.modelDiscoveryTimeoutMs],
 		["statusRequestTimeoutMs", runtime.statusRequestTimeoutMs],
 		["liveCheckRequestTimeoutMs", runtime.liveCheckRequestTimeoutMs],
-		["officialPricingTimeoutMs", runtime.officialPricingTimeoutMs],
 	] as const) {
 		if (!isValidTimeoutMs(value)) throw new Error(`Pi Provider ${name} must be a valid timeout`);
 	}
-	for (const [name, value] of [
-		["officialPricingCacheTtlMs", runtime.officialPricingCacheTtlMs],
-		["officialPricingMaxStaleMs", runtime.officialPricingMaxStaleMs],
-	] as const) {
-		if (typeof value !== "number" || !Number.isFinite(value) || value < 0) {
-			throw new Error(`Pi Provider ${name} must be a finite non-negative number`);
-		}
-	}
-	if (typeof runtime.officialPricingUrl !== "string" || runtime.officialPricingUrl.trim() === "") {
-		throw new Error("Pi Provider officialPricingUrl must be a non-empty string");
-	}
-	if (typeof runtime.openRouterMetadataCachePath !== "string") {
-		throw new Error("Pi Provider openRouterMetadataCachePath must be a string");
+	if (typeof runtime.agentDir !== "string") {
+		throw new Error("Pi Provider agentDir must be a string");
 	}
 	if (typeof runtime.readStoredCredential !== "function") {
 		throw new Error("Pi Provider readStoredCredential must be a function");
@@ -151,9 +137,6 @@ export function validatePiProviderDependencies(runtime: PiProviderDependencies):
 	if (typeof runtime.wrapTextWithAnsi !== "function") {
 		throw new Error("Pi Provider wrapTextWithAnsi must be a function");
 	}
-	if (typeof runtime.enableOfficialPricingFallback !== "boolean") {
-		throw new Error("Pi Provider enableOfficialPricingFallback must be a boolean");
-	}
 	if (runtime.pricingPolicies !== undefined) {
 		if (
 			runtime.pricingPolicies === null ||
@@ -173,9 +156,6 @@ export function resolvePiProviderDependencies(
 	dependencies: Partial<PiProviderDependencies> = {},
 ): PiProviderDependencies {
 	const runtime = { ...getDefaultPiProviderDependencies(), ...dependencies };
-	if (!Object.hasOwn(dependencies, "openRouterMetadataCachePath")) {
-		runtime.openRouterMetadataCachePath = getDefaultOpenRouterMetadataCachePath(runtime.agentDir);
-	}
 	if (runtime.pricingPolicies === undefined) runtime.pricingPolicies = {};
 	validatePiProviderDependencies(runtime);
 	return runtime;

package/core/runtime-entry.ts

@@ -1,6 +1,7 @@
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { loadPackageAdapterExtensions } from "./adapter-loader.ts";
 import { createPiProviderHost } from "./host.ts";
+import type { PiCatalogSource } from "./pi-model-metadata.ts";
 import type { PiProviderDependencies } from "./runtime-config.ts";
 import type { StoredCredentialLike } from "./types.ts";
 
@@ -11,16 +12,20 @@ export interface PiProviderEntry {
 	wrapTextWithAnsi: (text: string, width: number) => string[];
 	adapterRoot?: string;
 	dependencies?: Partial<PiProviderDependencies>;
+	piCatalogSource?: PiCatalogSource;
 }
 
 /** Runs the Pi Provider host and adapter discovery inside a single Jiti module graph. */
 export async function runPiProviderEntry(pi: ExtensionAPI, entry: PiProviderEntry): Promise<void> {
-	const piProviderHost = createPiProviderHost({
-		agentDir: entry.agentDir,
-		readStoredCredential: entry.readStoredCredential,
-		wrapTextWithAnsi: entry.wrapTextWithAnsi,
-		...entry.dependencies,
-	});
+	const piProviderHost = createPiProviderHost(
+		{
+			agentDir: entry.agentDir,
+			readStoredCredential: entry.readStoredCredential,
+			wrapTextWithAnsi: entry.wrapTextWithAnsi,
+			...entry.dependencies,
+		},
+		{ piCatalogSource: entry.piCatalogSource },
+	);
 	piProviderHost(pi);
 	await loadPackageAdapterExtensions(pi, { agentDir: entry.agentDir, userRoot: entry.adapterRoot });
 }