@hyav/pi-provider 0.1.4 → 0.1.5

package/core/provider-registration.ts

@@ -1,4 +1,5 @@
 import type { ExtensionAPI, ProviderConfig } from "@earendil-works/pi-coding-agent";
+import { validateProviderModelDrafts } from "./adapter-validation.ts";
 import { applyOfficialModelCosts, findOfficialMeta, type OfficialModelMeta } from "./official-pricing.ts";
 import { resolvePricingDetails } from "./pricing-adjustments.ts";
 import type { PiProviderDependencies } from "./runtime-config.ts";
@@ -83,6 +84,7 @@ export function normalizeProviderModel(model: ProviderModelDraft): ProviderModel
 }
 
 export function normalizeProviderModels(models: ProviderModelDraft[]): ProviderModel[] {
+	validateProviderModelDrafts(models);
 	const seen = new Set<string>();
 	return models.map((model) => {
 		const normalized = normalizeProviderModel(model);
@@ -113,6 +115,7 @@ function resolveModelRegistration(
 	modelDrafts: ProviderModelDraft[],
 	officialPricing: Record<string, OfficialModelMeta>,
 ): { models: ProviderModel[]; modelMetadata: Record<string, ProviderModelMetadata> } {
+	validateProviderModelDrafts(modelDrafts, `Provider ${adapter.id}`);
 	const enrichedDrafts = applyOfficialModelCosts(modelDrafts, officialPricing);
 	const pricingPolicy = runtime.pricingPolicies?.[adapter.id] ?? adapter.pricing;
 	const metadata: Record<string, ProviderModelMetadata> = {};
@@ -177,6 +180,65 @@ function getErrorCode(error: unknown): string {
 	return "fetch";
 }
 
+const ENVIRONMENT_NAME = /^[A-Za-z_][A-Za-z0-9_]*$/;
+const ENVIRONMENT_NAME_PREFIX = /^[A-Za-z_][A-Za-z0-9_]*/;
+
+/** Match Pi's `$NAME` / `${NAME}` interpolation without executing API-key commands. */
+function getEnvironmentReferences(value: string): string[] {
+	if (value.startsWith("!")) return [];
+	const names = new Set<string>();
+	let index = 0;
+	while (index < value.length) {
+		const dollarIndex = value.indexOf("$", index);
+		if (dollarIndex < 0) break;
+		const next = value[dollarIndex + 1];
+		if (next === "$" || next === "!") {
+			index = dollarIndex + 2;
+			continue;
+		}
+		if (next === "{") {
+			const endIndex = value.indexOf("}", dollarIndex + 2);
+			if (endIndex < 0) {
+				index = dollarIndex + 1;
+				continue;
+			}
+			const name = value.slice(dollarIndex + 2, endIndex);
+			if (ENVIRONMENT_NAME.test(name)) names.add(name);
+			index = endIndex + 1;
+			continue;
+		}
+		const match = value.slice(dollarIndex + 1).match(ENVIRONMENT_NAME_PREFIX);
+		if (match) {
+			names.add(match[0]);
+			index = dollarIndex + 1 + match[0].length;
+		} else {
+			index = dollarIndex + 1;
+		}
+	}
+	return [...names];
+}
+
+function getRegistrationState(adapter: ProviderAdapter): NonNullable<ProviderAdapter["registration"]> | undefined {
+	const registration = adapter.registration;
+	if (!registration) return undefined;
+	registration.normalizedModels ??= [];
+	registration.modelMetadata ??= {};
+	registration.officialPricing ??= {};
+	registration.activeRefreshes ??= 0;
+	return registration;
+}
+
+function replaceModels(target: ProviderModel[], source: ProviderModel[]): ProviderModel[] {
+	target.splice(0, target.length, ...source);
+	return target;
+}
+
+function lacksCatalogRefreshCredential(apiKey: string, context: ProviderRefreshContext): boolean {
+	if (context.allowNetwork !== true || context.credential !== undefined) return false;
+	const environmentNames = getEnvironmentReferences(apiKey);
+	return environmentNames.length > 0 && environmentNames.some((name) => !process.env[name]);
+}
+
 /**
  * Register a normalized Provider before the Host has assembled its final
  * registry. The original drafts remain attached to the adapter so a Host in a
@@ -194,9 +256,19 @@ export function prepareProviderRegistration(
 			? adapter.registration.modelDrafts
 			: adapter.provider.models);
 	const resolved = resolveModelRegistration(adapter, runtime, drafts, officialPricing);
-	const models = resolved.models;
+	const existingRegistration = getRegistrationState(adapter);
+	const registration: NonNullable<ProviderAdapter["registration"]> = existingRegistration ?? {
+		modelDrafts: drafts,
+		normalizedModels: [],
+		modelMetadata: {},
+		officialPricing,
+		activeRefreshes: 0,
+	};
+	registration.modelDrafts = drafts;
+	registration.modelMetadata = resolved.modelMetadata;
+	registration.officialPricing = officialPricing;
+	const models = replaceModels(registration.normalizedModels, resolved.models);
 	const adapterOwnsCatalog = adapter.catalog !== undefined;
-	const registration = { modelDrafts: drafts, normalizedModels: models, modelMetadata: resolved.modelMetadata };
 	adapter.registration = registration;
 	adapter.provider.models = models;
 	adapter.catalog ??= { source: "static", modelCount: models.length };
@@ -206,12 +278,18 @@ export function prepareProviderRegistration(
 	const registeredProvider: ProviderConfig = { ...providerMetadata, models };
 	if (originalRefresh) {
 		registeredProvider.refreshModels = async (options: ProviderRefreshContext) => {
+			// Pi may ask every dynamic Provider to refresh. Keep the current catalog
+			// when this Provider's environment-backed key is absent instead of
+			// attempting an unauthenticated request that becomes a global refresh error.
+			if (lacksCatalogRefreshCredential(adapter.provider.apiKey, options)) {
+				return [...registration.normalizedModels];
+			}
+			registration.activeRefreshes++;
 			try {
 				const refreshedModels = await originalRefresh(options);
-				const resolved = resolveModelRegistration(adapter, runtime, refreshedModels, officialPricing);
-				const normalizedModels = resolved.models;
+				const resolved = resolveModelRegistration(adapter, runtime, refreshedModels, registration.officialPricing);
+				const normalizedModels = replaceModels(registration.normalizedModels, resolved.models);
 				registration.modelDrafts = refreshedModels;
-				registration.normalizedModels = normalizedModels;
 				registration.modelMetadata = resolved.modelMetadata;
 				adapter.provider.models = normalizedModels;
 				registeredProvider.models = normalizedModels;
@@ -226,16 +304,30 @@ export function prepareProviderRegistration(
 						lastError: undefined,
 					};
 				}
-				return normalizedModels;
+				return [...normalizedModels];
 			} catch (error) {
 				if (adapter.catalog && !isAbortError(error)) adapter.catalog.lastError = getErrorCode(error);
 				throw error;
+			} finally {
+				registration.activeRefreshes = Math.max(0, registration.activeRefreshes - 1);
+				if (registration.activeRefreshes === 0 && registration.deferredRegistration) {
+					const deferred = registration.deferredRegistration;
+					registration.deferredRegistration = undefined;
+					queueMicrotask(deferred);
+				}
 			}
 		};
 	}
 	return registeredProvider;
 }
 
+export function cancelDeferredProviderRegistrations(providers: readonly ProviderAdapter[]): void {
+	for (const adapter of providers) {
+		const registration = getRegistrationState(adapter);
+		if (registration) registration.deferredRegistration = undefined;
+	}
+}
+
 export function refreshProviderRegistrations(
 	pi: Pick<ExtensionAPI, "registerProvider">,
 	providers: readonly ProviderAdapter[],
@@ -244,6 +336,13 @@ export function refreshProviderRegistrations(
 	providerDrafts?: ReadonlyMap<ProviderAdapter, ProviderModelDraft[]>,
 ): void {
 	for (const adapter of providers) {
+		const registration = getRegistrationState(adapter);
+		if (registration) registration.officialPricing = officialPricing;
+		if (registration && registration.activeRefreshes > 0) {
+			registration.deferredRegistration = () =>
+				registerProviderAdapter(pi, adapter, runtime, officialPricing, providerDrafts?.get(adapter));
+			continue;
+		}
 		registerProviderAdapter(pi, adapter, runtime, officialPricing, providerDrafts?.get(adapter));
 	}
 }

package/core/public-adapters.ts

@@ -18,8 +18,16 @@ export {
 	defineStatusExtension,
 	defineTunerExtension,
 } from "./adapter-extensions.ts";
+export { MAX_PROVIDER_MODEL_COUNT } from "./adapter-validation.ts";
 export { createCatalogPreflightAdapter } from "./catalog-preflight.ts";
 export { withDeadline } from "./deadline.ts";
+export {
+	appendBaseUrlPath,
+	authDefinesHeader,
+	getContextAuth,
+	hasBaseUrlOrigin,
+	mergeDiagnosticHeaders,
+} from "./diagnostic-auth.ts";
 export { isProviderDataError, ProviderDataError } from "./errors.ts";
 export { createOpenCodeCatalogPreflightAdapter } from "./opencode-preflight.ts";
 export type {
@@ -38,6 +46,7 @@ export type {
 	ProviderModel,
 	ProviderModelDraft,
 	ProviderRefreshContext,
+	ProviderRequestAuth,
 	StatusAdapter,
 	StatusContext,
 	StatusEntry,

package/core/runtime-config.ts

@@ -173,6 +173,9 @@ 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.ts

@@ -11,7 +11,11 @@ import {
 } from "./official-pricing.ts";
 import type { PreflightContextLike } from "./preflight-manager.ts";
 import { PreflightManager } from "./preflight-manager.ts";
-import { refreshProviderRegistrations, registerProviderAdapter } from "./provider-registration.ts";
+import {
+	cancelDeferredProviderRegistrations,
+	refreshProviderRegistrations,
+	registerProviderAdapter,
+} from "./provider-registration.ts";
 import type { PiProviderDependencies, PiProviderLoader } from "./runtime-config.ts";
 import { resolvePiProviderDependencies } from "./runtime-config.ts";
 import type { StatusContextLike } from "./status-manager.ts";
@@ -392,6 +396,7 @@ export function installPiProviderRuntime(
 		lifecycleGeneration++;
 		statusPresentationGeneration++;
 		statusPresentationVisible = false;
+		cancelDeferredProviderRegistrations(providers);
 		statusManager.cancelAll();
 		statusManager.clear();
 		preflightManager.cancelAll();
@@ -444,43 +449,52 @@ export function createPiProviderRuntime(
 ): (pi: ExtensionAPI) => Promise<void> {
 	const runtime = resolvePiProviderDependencies(dependencies);
 	return async (pi) => {
-		let latestBackgroundPricing: Record<string, OfficialModelMeta> | undefined;
-		let installedDefinition: PiProviderDefinition | undefined;
 		let installedController: PiProviderRuntimeController | undefined;
 		let disposed = false;
-		const onBackgroundRefresh = (snapshot: Record<string, OfficialModelMeta>): void => {
-			latestBackgroundPricing = snapshot;
-			if (disposed) return;
-			installedController?.updateOfficialPricing?.(snapshot);
-			if (installedDefinition === undefined) return;
-			refreshProviderRegistrations(pi, installedDefinition.providers, runtime, snapshot);
-		};
+		let pricingRefreshController: AbortController | undefined;
+		const cachePath =
+			runtime.officialPricingUrl === OPENROUTER_MODELS_URL ? runtime.openRouterMetadataCachePath : undefined;
+		const fetchPricing = (options: { allowNetwork?: boolean; signal?: AbortSignal } = {}) =>
+			fetchOfficialPricing(
+				runtime.fetch,
+				runtime.officialPricingUrl,
+				runtime.officialPricingTimeoutMs,
+				runtime.officialPricingCacheTtlMs,
+				runtime.officialPricingMaxStaleMs,
+				runtime.now,
+				{ cachePath, ...options },
+			);
 		const officialPricingPromise = runtime.enableOfficialPricingFallback
-			? fetchOfficialPricing(
-					runtime.fetch,
-					runtime.officialPricingUrl,
-					runtime.officialPricingTimeoutMs,
-					runtime.officialPricingCacheTtlMs,
-					runtime.officialPricingMaxStaleMs,
-					runtime.now,
-					{
-						cachePath:
-							runtime.officialPricingUrl === OPENROUTER_MODELS_URL
-								? runtime.openRouterMetadataCachePath
-								: undefined,
-						background: runtime.officialPricingUrl === OPENROUTER_MODELS_URL,
-						onBackgroundRefresh: onBackgroundRefresh,
-					},
-				)
+			? fetchPricing({ allowNetwork: false })
 			: Promise.resolve({});
 		const definitionPromise = loadDefinition(runtime);
 		const [officialPricing, definition] = await Promise.all([officialPricingPromise, definitionPromise]);
 		validatePiProviderDefinition(definition);
-		installedController = installPiProviderRuntime(pi, runtime, definition, officialPricing);
-		installedDefinition = definition;
-		if (latestBackgroundPricing !== undefined) onBackgroundRefresh(latestBackgroundPricing);
+
+		pi.on("session_start", () => {
+			pricingRefreshController?.abort();
+			pricingRefreshController = undefined;
+			if (!runtime.enableOfficialPricingFallback || disposed) {
+				return;
+			}
+			const controller = new AbortController();
+			pricingRefreshController = controller;
+			void fetchPricing({ signal: controller.signal })
+				.then((snapshot) => {
+					if (disposed || controller.signal.aborted) return;
+					installedController?.updateOfficialPricing?.(snapshot);
+					refreshProviderRegistrations(pi, definition.providers, runtime, snapshot);
+				})
+				.catch(() => undefined)
+				.finally(() => {
+					if (pricingRefreshController === controller) pricingRefreshController = undefined;
+				});
+		});
 		pi.on("session_shutdown", () => {
 			disposed = true;
+			pricingRefreshController?.abort();
+			pricingRefreshController = undefined;
 		});
+		installedController = installPiProviderRuntime(pi, runtime, definition, officialPricing);
 	};
 }

package/core/status-manager.ts

@@ -1,5 +1,7 @@
+import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { deriveCredentialType } from "./credential-type.ts";
 import { isValidTimeoutMs, withDeadline } from "./deadline.ts";
+import { applyDiagnosticBaseUrl, type DiagnosticModelRegistry, resolveDiagnosticAuth } from "./diagnostic-auth.ts";
 import { isProviderDataError, ProviderDataError } from "./errors.ts";
 import type {
 	StatusAdapter,
@@ -10,11 +12,11 @@ import type {
 	StatusWindowEntry,
 } from "./types.ts";
 
+type StatusModel = NonNullable<ExtensionContext["model"]>;
+
 export interface StatusContextLike {
-	model?: { provider?: string };
-	modelRegistry: {
-		getApiKeyForProvider(provider: string): Promise<string | undefined>;
-	};
+	model?: { provider?: string; id?: string; baseUrl?: string };
+	modelRegistry: DiagnosticModelRegistry;
 	/** Optional credential identity used to isolate cached account data. */
 	getCredentialKey?: () => Promise<string | undefined>;
 	/** Optional non-secret credential metadata for provider-specific account labels. */
@@ -223,10 +225,21 @@ export class StatusManager {
 			const cancellation = new AbortController();
 			const generation = ++state.generation;
 			const promise = withDeadline(
-				(signal) =>
-					adapter.fetch({
+				async (signal) => {
+					const sourceModel = ctx.model as StatusModel;
+					const auth = await resolveDiagnosticAuth(sourceModel, ctx.modelRegistry);
+					const model = applyDiagnosticBaseUrl(sourceModel, auth);
+					if (adapter.supportsModel && !adapter.supportsModel(model)) {
+						throw new ProviderDataError(
+							"Status endpoint is unavailable for the effective model URL",
+							"unsupported",
+						);
+					}
+					return await adapter.fetch({
 						fetch: this.fetchFn,
-						getApiKey: () => ctx.modelRegistry.getApiKeyForProvider(adapter.providerId),
+						getApiKey: async () => auth.apiKey,
+						getAuth: async () => auth,
+						model,
 						...(ctx.getCredentialMetadata === undefined
 							? {}
 							: {
@@ -235,7 +248,8 @@ export class StatusManager {
 								}),
 						now: this.now,
 						signal,
-					}),
+					});
+				},
 				adapter.requestTimeoutMs,
 				cancellation.signal,
 			);
@@ -262,6 +276,11 @@ export class StatusManager {
 		} catch (error) {
 			if (state.generation !== generation || isErrorNamed(error, "AbortError")) return "skipped";
 			const dataError = isProviderDataError(error) ? error : undefined;
+			if (dataError?.code === "unsupported") {
+				state.snapshot = undefined;
+				state.lastError = undefined;
+				return "skipped";
+			}
 			const code = dataError?.code ?? (isErrorNamed(error, "TimeoutError") ? "timeout" : "fetch");
 			const retryAt =
 				dataError?.retryAt !== undefined && Number.isFinite(dataError.retryAt) ? dataError.retryAt : undefined;

package/core/types.ts

@@ -4,6 +4,7 @@ import type {
 	ProviderConfig,
 	ProviderModelConfig,
 } from "@earendil-works/pi-coding-agent";
+import type { OfficialModelMeta } from "./official-pricing.ts";
 
 export type ThinkingLevel = ReturnType<ExtensionAPI["getThinkingLevel"]>;
 
@@ -32,6 +33,14 @@ export interface StoredCredentialLike {
 	readonly teamName?: string;
 }
 
+/** Model-scoped authentication resolved by Pi for one diagnostic request. */
+export interface ProviderRequestAuth {
+	apiKey?: string;
+	headers?: Record<string, string | null>;
+	baseUrl?: string;
+	env?: Record<string, string>;
+}
+
 export interface ModelFieldSources {
 	contextWindow?: ModelFieldSource;
 	maxTokens?: ModelFieldSource;
@@ -145,6 +154,10 @@ export interface StatusSnapshot {
 export interface StatusContext {
 	fetch: typeof globalThis.fetch;
 	getApiKey: () => Promise<string | undefined>;
+	/** Complete model-scoped request authentication resolved by Pi. */
+	getAuth?: () => Promise<ProviderRequestAuth>;
+	/** Effective model, including any credential-specific base URL. */
+	model?: ActiveModel;
 	/** Optional non-secret credential metadata for provider-specific account labels. */
 	getCredentialMetadata?: () => unknown;
 	/** Optional non-secret credential type ("oauth" vs "api_key") for providers with dual auth modes. */
@@ -159,6 +172,8 @@ export interface StatusAdapter {
 	name: string;
 	cacheTtlMs: number;
 	requestTimeoutMs: number;
+	/** Return false when this account endpoint cannot safely serve the effective model URL. */
+	supportsModel?: (model: ActiveModel) => boolean;
 	fetch(context: StatusContext): Promise<StatusSnapshot>;
 }
 
@@ -179,8 +194,11 @@ export interface ProviderAdapter {
 	/** @internal Draft state shared across isolated Adapter and Host contexts. */
 	registration?: {
 		modelDrafts: ProviderModelDraft[];
-		normalizedModels?: ProviderModel[];
-		modelMetadata?: Record<string, ProviderModelMetadata>;
+		normalizedModels: ProviderModel[];
+		modelMetadata: Record<string, ProviderModelMetadata>;
+		officialPricing: Record<string, OfficialModelMeta>;
+		activeRefreshes: number;
+		deferredRegistration?: () => void;
 	};
 }
 

package/index.ts

@@ -17,8 +17,16 @@ export {
 	defineStatusExtension,
 	defineTunerExtension,
 } from "./core/adapter-extensions.ts";
+export { MAX_PROVIDER_MODEL_COUNT } from "./core/adapter-validation.ts";
 export { createCatalogPreflightAdapter } from "./core/catalog-preflight.ts";
 export { withDeadline } from "./core/deadline.ts";
+export {
+	appendBaseUrlPath,
+	authDefinesHeader,
+	getContextAuth,
+	hasBaseUrlOrigin,
+	mergeDiagnosticHeaders,
+} from "./core/diagnostic-auth.ts";
 export type { ProviderDataErrorLike } from "./core/errors.ts";
 export { isProviderDataError, ProviderDataError } from "./core/errors.ts";
 export type {
@@ -103,6 +111,7 @@ export type {
 	ProviderPricingPolicy,
 	ProviderPricingSource,
 	ProviderRefreshContext,
+	ProviderRequestAuth,
 	StatusAdapter,
 	StatusAmountEntry,
 	StatusContext,
@@ -116,7 +125,7 @@ export type {
 } from "./core/types.ts";
 
 export interface PiProviderExtensionOptions {
-	/** User adapter root; replaces the default `<agentDir>/pi-provider` directory. */
+	/** User adapter root; replaces the default `<agentDir>/extensions/pi-provider` directory. */
 	adapterRoot?: string;
 	/** Host runtime dependency overrides. */
 	dependencies?: Partial<PiProviderDependencies>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hyav/pi-provider",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "Provider extension toolkit for Pi to integrate and manage custom LLM providers with dynamic models, request tuners, and account status.",
   "author": "hyav",
   "license": "MIT",

package/preflight/charm-hyper.ts

@@ -1,5 +1,5 @@
 import type { PreflightAdapter } from "@hyav/pi-provider";
-import { definePreflightExtension, ProviderDataError, parseRetryAfter } from "@hyav/pi-provider";
+import { definePreflightExtension, hasBaseUrlOrigin, ProviderDataError, parseRetryAfter } from "@hyav/pi-provider";
 import { hyperJsonHeaders } from "../providers/charm-hyper/constants.ts";
 import { HYPER_MODELS_URL, HYPER_PROVIDER_URL, parseHyperModels } from "../providers/charm-hyper.ts";
 
@@ -10,6 +10,7 @@ export function createCharmHyperPreflightAdapter(requestTimeoutMs: number): Pref
 		name: "Charm Hyper",
 		cacheTtlMs: 30_000,
 		requestTimeoutMs,
+		supportsModel: (model) => hasBaseUrlOrigin(model.baseUrl, HYPER_PROVIDER_URL),
 		async fetch(context) {
 			const apiKey = await context.getApiKey();
 			if (!apiKey) return { passed: false, checks: ["auth"], updatedAt: context.now() };

package/preflight/deepseek.ts

@@ -1,5 +1,5 @@
 import type { PreflightAdapter } from "@hyav/pi-provider";
-import { definePreflightExtension, ProviderDataError, parseRetryAfter } from "@hyav/pi-provider";
+import { definePreflightExtension, hasBaseUrlOrigin, ProviderDataError, parseRetryAfter } from "@hyav/pi-provider";
 
 export const DEEPSEEK_MODELS_URL = "https://api.deepseek.com/models";
 
@@ -13,6 +13,7 @@ export const deepSeekPreflightAdapter: PreflightAdapter = {
 	name: "DeepSeek",
 	cacheTtlMs: 30_000,
 	requestTimeoutMs: 8_000,
+	supportsModel: (model) => hasBaseUrlOrigin(model.baseUrl, DEEPSEEK_MODELS_URL),
 	async fetch(context) {
 		const apiKey = await context.getApiKey();
 		if (!apiKey || apiKey === "proxy-managed") {

package/preflight/github-copilot.ts

@@ -1,7 +1,16 @@
 import type { PreflightAdapter } from "@hyav/pi-provider";
-import { definePreflightExtension, ProviderDataError, parseRetryAfter } from "@hyav/pi-provider";
+import {
+	appendBaseUrlPath,
+	authDefinesHeader,
+	definePreflightExtension,
+	getContextAuth,
+	mergeDiagnosticHeaders,
+	ProviderDataError,
+	parseRetryAfter,
+} from "@hyav/pi-provider";
 
-export const COPILOT_MODELS_URL = "https://api.individual.githubcopilot.com/models";
+export const COPILOT_BASE_URL = "https://api.individual.githubcopilot.com";
+export const COPILOT_MODELS_URL = `${COPILOT_BASE_URL}/models`;
 
 function isRecord(value: unknown): value is Record<string, unknown> {
 	return value !== null && typeof value === "object" && !Array.isArray(value);
@@ -14,17 +23,21 @@ export const githubCopilotPreflightAdapter: PreflightAdapter = {
 	cacheTtlMs: 30_000,
 	requestTimeoutMs: 8_000,
 	async fetch(context) {
-		const apiKey = await context.getApiKey();
+		const auth = await getContextAuth(context);
+		const apiKey = auth.apiKey;
 		if (!apiKey || apiKey === "proxy-managed") {
 			return { passed: false, checks: ["auth"], updatedAt: context.now() };
 		}
-		const response = await context.fetch(COPILOT_MODELS_URL, {
-			headers: {
-				Accept: "application/json",
-				"Accept-Encoding": "identity",
-				Authorization: `Bearer ${apiKey}`,
-				"User-Agent": "@hyav/pi-provider",
-			},
+		const url = appendBaseUrlPath(context.model.baseUrl ?? auth.baseUrl, "models", COPILOT_BASE_URL);
+		if (!url) throw new ProviderDataError("GitHub Copilot model endpoint is unavailable", "unsupported");
+		const headers = mergeDiagnosticHeaders(auth, {
+			Accept: "application/json",
+			"Accept-Encoding": "identity",
+			"User-Agent": "@hyav/pi-provider",
+		});
+		if (!authDefinesHeader(auth, "Authorization")) headers.set("Authorization", `Bearer ${apiKey}`);
+		const response = await context.fetch(url, {
+			headers,
 			signal: context.signal,
 		});
 		if (!response.ok) {

package/preflight/google.ts

@@ -1,5 +1,5 @@
 import type { PreflightAdapter } from "@hyav/pi-provider";
-import { definePreflightExtension, ProviderDataError, parseRetryAfter } from "@hyav/pi-provider";
+import { definePreflightExtension, hasBaseUrlOrigin, ProviderDataError, parseRetryAfter } from "@hyav/pi-provider";
 
 export const GOOGLE_MODELS_URL = "https://generativelanguage.googleapis.com/v1beta/models";
 
@@ -28,6 +28,7 @@ export const googlePreflightAdapter: PreflightAdapter = {
 	name: "Google Gemini",
 	cacheTtlMs: 30_000,
 	requestTimeoutMs: 8_000,
+	supportsModel: (model) => hasBaseUrlOrigin(model.baseUrl, GOOGLE_MODELS_URL),
 	async fetch(context) {
 		const apiKey = await context.getApiKey();
 		if (!apiKey || apiKey === "proxy-managed") {

package/preflight/groq.ts

@@ -1,5 +1,5 @@
 import type { PreflightAdapter } from "@hyav/pi-provider";
-import { definePreflightExtension, ProviderDataError, parseRetryAfter } from "@hyav/pi-provider";
+import { definePreflightExtension, hasBaseUrlOrigin, ProviderDataError, parseRetryAfter } from "@hyav/pi-provider";
 import { GROQ_MODELS_URL } from "../status/groq.ts";
 
 function isRecord(value: unknown): value is Record<string, unknown> {
@@ -12,6 +12,7 @@ export const groqPreflightAdapter: PreflightAdapter = {
 	name: "Groq",
 	cacheTtlMs: 30_000,
 	requestTimeoutMs: 8_000,
+	supportsModel: (model) => hasBaseUrlOrigin(model.baseUrl, GROQ_MODELS_URL),
 	async fetch(context) {
 		const apiKey = await context.getApiKey();
 		if (!apiKey || apiKey === "proxy-managed") {

package/preflight/openai-codex.ts

@@ -1,5 +1,5 @@
 import type { PreflightAdapter } from "@hyav/pi-provider";
-import { definePreflightExtension, ProviderDataError, parseRetryAfter } from "@hyav/pi-provider";
+import { definePreflightExtension, hasBaseUrlOrigin, ProviderDataError, parseRetryAfter } from "@hyav/pi-provider";
 import { extractCodexAccountId } from "../status/openai-codex.ts";
 
 export const CODEX_MODELS_URL = "https://chatgpt.com/backend-api/codex/models";
@@ -28,6 +28,7 @@ export const openAICodexPreflightAdapter: PreflightAdapter = {
 	name: "OpenAI Codex",
 	cacheTtlMs: 30_000,
 	requestTimeoutMs: 8_000,
+	supportsModel: (model) => hasBaseUrlOrigin(model.baseUrl, CODEX_MODELS_URL),
 	async fetch(context) {
 		const apiKey = await context.getApiKey();
 		if (!apiKey || apiKey === "proxy-managed") {

package/preflight/openrouter.ts

@@ -1,5 +1,5 @@
 import type { PreflightAdapter } from "@hyav/pi-provider";
-import { definePreflightExtension, ProviderDataError, parseRetryAfter } from "@hyav/pi-provider";
+import { definePreflightExtension, hasBaseUrlOrigin, ProviderDataError, parseRetryAfter } from "@hyav/pi-provider";
 import { OPENROUTER_KEY_URL } from "../status/openrouter.ts";
 
 export const OPENROUTER_MODELS_URL = "https://openrouter.ai/api/v1/models";
@@ -79,6 +79,7 @@ export const openRouterPreflightAdapter: PreflightAdapter = {
 	name: "OpenRouter",
 	cacheTtlMs: 30_000,
 	requestTimeoutMs: 8_000,
+	supportsModel: (model) => hasBaseUrlOrigin(model.baseUrl, OPENROUTER_MODELS_URL),
 	async fetch(context) {
 		const modelIds = await collectModelIds(context);
 		const apiKey = await context.getApiKey();

package/preflight/vercel-ai-gateway.ts

@@ -37,11 +37,6 @@ export function createVercelAIGatewayPreflightAdapter(requestTimeoutMs: number):
 		cacheTtlMs: 30_000,
 		requestTimeoutMs,
 		async fetch(context): Promise<PreflightSnapshot> {
-			const key = await context.getApiKey();
-			if (!key || key === "proxy-managed") {
-				return { passed: false, checks: ["auth"], updatedAt: context.now() };
-			}
-
 			const response = await context.fetch(VERCEL_MODELS_URL, {
 				headers: {
 					Accept: "application/json",
@@ -67,7 +62,7 @@ export function createVercelAIGatewayPreflightAdapter(requestTimeoutMs: number):
 
 			return {
 				passed: parseVercelModelIds(payload).has(context.model.id),
-				checks: ["endpoint", "auth", "catalog"],
+				checks: ["endpoint", "catalog"],
 				updatedAt: context.now(),
 				httpStatus: response.status,
 			};

package/preflight/xai.ts

@@ -1,5 +1,5 @@
 import type { PreflightAdapter } from "@hyav/pi-provider";
-import { definePreflightExtension, ProviderDataError, parseRetryAfter } from "@hyav/pi-provider";
+import { definePreflightExtension, hasBaseUrlOrigin, ProviderDataError, parseRetryAfter } from "@hyav/pi-provider";
 import { XAI_MODELS_URL } from "../status/xai.ts";
 
 function isRecord(value: unknown): value is Record<string, unknown> {
@@ -12,6 +12,7 @@ export const xaiPreflightAdapter: PreflightAdapter = {
 	name: "xAI",
 	cacheTtlMs: 30_000,
 	requestTimeoutMs: 8_000,
+	supportsModel: (model) => hasBaseUrlOrigin(model.baseUrl, XAI_MODELS_URL),
 	async fetch(context) {
 		const apiKey = await context.getApiKey();
 		const authHeaders: Record<string, string> = {