@hyav/pi-provider 0.1.1 → 0.1.3

package/core/official-pricing.ts

@@ -1,6 +1,5 @@
 import { randomUUID } from "node:crypto";
 import { mkdir, readFile, rename, unlink, writeFile } from "node:fs/promises";
-import { homedir } from "node:os";
 import { dirname, join } from "node:path";
 import { withDeadline } from "./deadline.ts";
 import type { ModelQualityScore, ProviderCost, ProviderModel, ProviderModelDraft } from "./types.ts";
@@ -68,11 +67,8 @@ const pricingCache = new Map<string, PricingCacheEntry>();
 const pricingRequests = new Map<string, Promise<Record<string, OfficialModelMeta>>>();
 
 /** Default cache for OpenRouter metadata, not Pi's native model catalog. */
-export function getDefaultOpenRouterMetadataCachePath(): string {
-	const configuredAgentDir = process.env.PI_CODING_AGENT_DIR;
-	const agentDir =
-		configuredAgentDir && configuredAgentDir.trim() !== "" ? configuredAgentDir : join(homedir(), ".pi", "agent");
-	return join(agentDir, "provider-kit", "openrouter-model-metadata.json");
+export function getDefaultOpenRouterMetadataCachePath(agentDir: string): string {
+	return join(agentDir, "extensions", "pi-provider", "openrouter-model-metadata.json");
 }
 
 function cloneCost(cost: ProviderCost): ProviderCost {

package/core/provider-registration.ts

@@ -1,7 +1,7 @@
 import type { ExtensionAPI, ProviderConfig } from "@earendil-works/pi-coding-agent";
 import { applyOfficialModelCosts, findOfficialMeta, type OfficialModelMeta } from "./official-pricing.ts";
 import { resolvePricingDetails } from "./pricing-adjustments.ts";
-import type { ProviderKitDependencies } from "./runtime-config.ts";
+import type { PiProviderDependencies } from "./runtime-config.ts";
 import type {
 	ProviderAdapter,
 	ProviderCost,
@@ -109,7 +109,7 @@ function selectPricingAdjustment(
 
 function resolveModelRegistration(
 	adapter: ProviderAdapter,
-	runtime: ProviderKitDependencies,
+	runtime: PiProviderDependencies,
 	modelDrafts: ProviderModelDraft[],
 	officialPricing: Record<string, OfficialModelMeta>,
 ): { models: ProviderModel[]; modelMetadata: Record<string, ProviderModelMetadata> } {
@@ -184,7 +184,7 @@ function getErrorCode(error: unknown): string {
  */
 export function prepareProviderRegistration(
 	adapter: ProviderAdapter,
-	runtime: ProviderKitDependencies,
+	runtime: PiProviderDependencies,
 	officialPricing: Record<string, OfficialModelMeta> = {},
 	modelDrafts?: ProviderModelDraft[],
 ): ProviderConfig {
@@ -239,7 +239,7 @@ export function prepareProviderRegistration(
 export function refreshProviderRegistrations(
 	pi: Pick<ExtensionAPI, "registerProvider">,
 	providers: readonly ProviderAdapter[],
-	runtime: ProviderKitDependencies,
+	runtime: PiProviderDependencies,
 	officialPricing: Record<string, OfficialModelMeta>,
 	providerDrafts?: ReadonlyMap<ProviderAdapter, ProviderModelDraft[]>,
 ): void {
@@ -251,7 +251,7 @@ export function refreshProviderRegistrations(
 export function registerProviderAdapter(
 	pi: Pick<ExtensionAPI, "registerProvider">,
 	adapter: ProviderAdapter,
-	runtime: ProviderKitDependencies,
+	runtime: PiProviderDependencies,
 	officialPricing: Record<string, OfficialModelMeta> = {},
 	modelDrafts?: ProviderModelDraft[],
 ): ProviderConfig {

package/core/public-adapters.ts

@@ -0,0 +1,46 @@
+/**
+ * Jiti-safe public entrypoint for user adapter files discovered from the
+ * adapter roots. `loadPackageAdapterExtensions` aliases `@hyav/pi-provider`
+ * to this module so adapter files can import the same helpers and types the
+ * built-in adapters use, without resolving Pi's bundled runtime packages.
+ */
+
+export type {
+	AdapterExtensionContext,
+	PreflightExtensionDefinition,
+	ProviderExtensionDefinition,
+	StatusExtensionDefinition,
+	TunerExtensionDefinition,
+} from "./adapter-extensions.ts";
+export {
+	definePreflightExtension,
+	defineProviderExtension,
+	defineStatusExtension,
+	defineTunerExtension,
+} from "./adapter-extensions.ts";
+export { withDeadline } from "./deadline.ts";
+export { isProviderDataError, ProviderDataError } from "./errors.ts";
+export { createOpenCodeCatalogPreflightAdapter } from "./opencode-preflight.ts";
+export type {
+	PreflightAdapter,
+	PreflightContextLike,
+	PreflightModel,
+	PreflightSnapshot,
+} from "./preflight-manager.ts";
+export { normalizeProviderModels } from "./provider-registration.ts";
+export { parseRetryAfter } from "./retry-after.ts";
+export type { StatusContextLike } from "./status-manager.ts";
+export type {
+	ActiveModel,
+	ModelCatalogStatus,
+	ProviderAdapter,
+	ProviderModel,
+	ProviderModelDraft,
+	ProviderRefreshContext,
+	StatusAdapter,
+	StatusContext,
+	StatusEntry,
+	StatusSnapshot,
+	StoredCredentialLike,
+	TunerContext,
+} from "./types.ts";

package/core/runtime-config.ts

@@ -1,10 +1,12 @@
+import { homedir } from "node:os";
+import { join } from "node:path";
 import { isValidTimeoutMs } from "./deadline.ts";
-import type { ProviderKitDefinition } from "./definition.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 } from "./types.ts";
+import type { ProviderPricingPolicy, StoredCredentialLike } from "./types.ts";
 
-export interface ProviderKitDependencies {
+export interface PiProviderDependencies {
 	fetch: typeof globalThis.fetch;
 	now: () => number;
 	modelDiscoveryTimeoutMs: number;
@@ -14,16 +16,83 @@ export interface ProviderKitDependencies {
 	officialPricingTimeoutMs: number;
 	officialPricingCacheTtlMs: number;
 	officialPricingMaxStaleMs: number;
+	/** Resolved Pi agent directory; empty disables disk persistence of pricing metadata. */
+	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 Provider Kit-level price policies keyed by Provider ID. */
+	/** Optional Pi Provider-level price policies keyed by Provider ID. */
 	pricingPolicies?: Record<string, ProviderPricingPolicy>;
 }
 
-export type ProviderKitLoader = (runtime: ProviderKitDependencies) => Promise<ProviderKitDefinition>;
+export type PiProviderLoader = (runtime: PiProviderDependencies) => Promise<PiProviderDefinition>;
 
-const defaultDependencies: ProviderKitDependencies = {
+/**
+ * Resolve Pi's agent directory without importing Pi's bundled packages, so the
+ * Jiti module graph and programmatic consumers share the same default. Mirrors
+ * Pi's `getAgentDir()`: `PI_CODING_AGENT_DIR` wins, `~/` expands to the home
+ * directory, and the fallback is `~/.pi/agent`.
+ */
+export function resolveDefaultAgentDir(): string {
+	const configured = process.env.PI_CODING_AGENT_DIR;
+	const raw =
+		configured !== undefined && configured.trim() !== "" ? configured.trim() : join(homedir(), ".pi", "agent");
+	if (raw === "~") return homedir();
+	if (raw.startsWith("~/")) return join(homedir(), raw.slice(2));
+	return raw;
+}
+
+/** Degraded fallback used only when the Pi entrypoint does not inject the real wrapper. */
+const WIDE_CHAR_RANGES: Array<[number, number]> = [
+	[0x1100, 0x115f],
+	[0x2329, 0x232a],
+	[0x2e80, 0xa4cf],
+	[0xac00, 0xd7a3],
+	[0xf900, 0xfaff],
+	[0xfe30, 0xfe4f],
+	[0xff00, 0xff60],
+	[0xffe0, 0xffe6],
+	[0x1f300, 0x1f64f],
+	[0x1f900, 0x1f9ff],
+	[0x20000, 0x2fffd],
+	[0x30000, 0x3fffd],
+];
+
+function displayWidth(text: string): number {
+	let width = 0;
+	for (const ch of text) {
+		const code = ch.codePointAt(0) ?? 0;
+		const wide = WIDE_CHAR_RANGES.some(([start, end]) => code >= start && code <= end);
+		width += wide ? 2 : 1;
+	}
+	return width;
+}
+
+function defaultWrapTextWithAnsi(text: string, width: number): string[] {
+	if (width <= 0) return [text];
+	const plain = text.replace(/\u001b\[[0-9;]*m/g, "");
+	if (displayWidth(plain) <= width) return [text];
+	const chunks: string[] = [];
+	let chunk = "";
+	for (const ch of plain) {
+		if (chunk !== "" && displayWidth(chunk) + displayWidth(ch) > width) {
+			chunks.push(chunk);
+			chunk = ch;
+		} else {
+			chunk += ch;
+		}
+	}
+	if (chunk !== "") chunks.push(chunk);
+	return chunks;
+}
+
+type DefaultDependencies = Omit<PiProviderDependencies, "agentDir" | "openRouterMetadataCachePath">;
+
+const defaultDependencies: DefaultDependencies = {
 	fetch: globalThis.fetch,
 	now: Date.now,
 	modelDiscoveryTimeoutMs: 3_000,
@@ -33,42 +102,57 @@ const defaultDependencies: ProviderKitDependencies = {
 	officialPricingTimeoutMs: 3_000,
 	officialPricingCacheTtlMs: 60 * 60 * 1_000,
 	officialPricingMaxStaleMs: 24 * 60 * 60 * 1_000,
-	openRouterMetadataCachePath: getDefaultOpenRouterMetadataCachePath(),
+	readStoredCredential: () => undefined,
+	wrapTextWithAnsi: defaultWrapTextWithAnsi,
 	enableOfficialPricingFallback: true,
 	pricingPolicies: {},
 };
 
-export function getDefaultProviderKitDependencies(): ProviderKitDependencies {
-	return { ...defaultDependencies };
+/**
+ * Programmatic defaults keep the resolved agent directory and its pricing cache
+ * path. The Pi entrypoint overrides `agentDir` with Pi's own resolution.
+ */
+export function getDefaultPiProviderDependencies(agentDir = resolveDefaultAgentDir()): PiProviderDependencies {
+	return {
+		...defaultDependencies,
+		agentDir,
+		openRouterMetadataCachePath: getDefaultOpenRouterMetadataCachePath(agentDir),
+	};
 }
 
-export function validateProviderKitDependencies(runtime: ProviderKitDependencies): void {
-	if (typeof runtime.fetch !== "function") throw new Error("Provider Kit fetch must be a function");
-	if (typeof runtime.now !== "function") throw new Error("Provider Kit now must be a function");
+export function validatePiProviderDependencies(runtime: PiProviderDependencies): void {
+	if (typeof runtime.fetch !== "function") throw new Error("Pi Provider fetch must be a function");
+	if (typeof runtime.now !== "function") throw new Error("Pi Provider now must be a function");
 	for (const [name, value] of [
 		["modelDiscoveryTimeoutMs", runtime.modelDiscoveryTimeoutMs],
 		["statusRequestTimeoutMs", runtime.statusRequestTimeoutMs],
 		["liveCheckRequestTimeoutMs", runtime.liveCheckRequestTimeoutMs],
 		["officialPricingTimeoutMs", runtime.officialPricingTimeoutMs],
 	] as const) {
-		if (!isValidTimeoutMs(value)) throw new Error(`Provider Kit ${name} must be a valid timeout`);
+		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(`Provider Kit ${name} must be a finite non-negative number`);
+			throw new Error(`Pi Provider ${name} must be a finite non-negative number`);
 		}
 	}
 	if (typeof runtime.officialPricingUrl !== "string" || runtime.officialPricingUrl.trim() === "") {
-		throw new Error("Provider Kit officialPricingUrl must be a non-empty string");
+		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.readStoredCredential !== "function") {
+		throw new Error("Pi Provider readStoredCredential must be a function");
 	}
-	if (typeof runtime.openRouterMetadataCachePath !== "string" || runtime.openRouterMetadataCachePath.trim() === "") {
-		throw new Error("Provider Kit openRouterMetadataCachePath must be a non-empty path");
+	if (typeof runtime.wrapTextWithAnsi !== "function") {
+		throw new Error("Pi Provider wrapTextWithAnsi must be a function");
 	}
 	if (typeof runtime.enableOfficialPricingFallback !== "boolean") {
-		throw new Error("Provider Kit enableOfficialPricingFallback must be a boolean");
+		throw new Error("Pi Provider enableOfficialPricingFallback must be a boolean");
 	}
 	if (runtime.pricingPolicies !== undefined) {
 		if (
@@ -76,20 +160,20 @@ export function validateProviderKitDependencies(runtime: ProviderKitDependencies
 			typeof runtime.pricingPolicies !== "object" ||
 			Array.isArray(runtime.pricingPolicies)
 		) {
-			throw new Error("Provider Kit pricingPolicies must be an object");
+			throw new Error("Pi Provider pricingPolicies must be an object");
 		}
 		for (const [providerId, policy] of Object.entries(runtime.pricingPolicies)) {
-			if (providerId.trim() === "") throw new Error("Provider Kit pricingPolicies has an empty Provider ID");
-			validatePricingPolicy(policy, `Provider Kit pricingPolicies.${providerId}`);
+			if (providerId.trim() === "") throw new Error("Pi Provider pricingPolicies has an empty Provider ID");
+			validatePricingPolicy(policy, `Pi Provider pricingPolicies.${providerId}`);
 		}
 	}
 }
 
-export function resolveProviderKitDependencies(
-	dependencies: Partial<ProviderKitDependencies> = {},
-): ProviderKitDependencies {
-	const runtime = { ...defaultDependencies, ...dependencies };
+export function resolvePiProviderDependencies(
+	dependencies: Partial<PiProviderDependencies> = {},
+): PiProviderDependencies {
+	const runtime = { ...getDefaultPiProviderDependencies(), ...dependencies };
 	if (runtime.pricingPolicies === undefined) runtime.pricingPolicies = {};
-	validateProviderKitDependencies(runtime);
+	validatePiProviderDependencies(runtime);
 	return runtime;
 }

package/core/runtime-entry.ts

@@ -0,0 +1,26 @@
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { loadPackageAdapterExtensions } from "./adapter-loader.ts";
+import { createPiProviderHost } from "./host.ts";
+import type { PiProviderDependencies } from "./runtime-config.ts";
+import type { StoredCredentialLike } from "./types.ts";
+
+/** Runtime values resolved by the Pi-loaded entrypoint and injected into the Jiti graph. */
+export interface PiProviderEntry {
+	agentDir: string;
+	readStoredCredential: (providerId: string) => StoredCredentialLike | undefined;
+	wrapTextWithAnsi: (text: string, width: number) => string[];
+	adapterRoot?: string;
+	dependencies?: Partial<PiProviderDependencies>;
+}
+
+/** 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,
+	});
+	piProviderHost(pi);
+	await loadPackageAdapterExtensions(pi, { agentDir: entry.agentDir, userRoot: entry.adapterRoot });
+}

package/core/runtime.ts

@@ -1,8 +1,6 @@
 import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
-import { readStoredCredential } from "@earendil-works/pi-coding-agent";
-import { wrapTextWithAnsi } from "@earendil-works/pi-tui";
-import type { ProviderKitDefinition } from "./definition.ts";
-import { validateProviderKitDefinition } from "./definition.ts";
+import type { PiProviderDefinition } from "./definition.ts";
+import { validatePiProviderDefinition } from "./definition.ts";
 import { LiveCheckManager, type LiveCheckResult } from "./live-check-manager.ts";
 import {
 	fetchOfficialPricing,
@@ -14,8 +12,8 @@ import {
 import type { PreflightContextLike } from "./preflight-manager.ts";
 import { PreflightManager } from "./preflight-manager.ts";
 import { refreshProviderRegistrations, registerProviderAdapter } from "./provider-registration.ts";
-import type { ProviderKitDependencies, ProviderKitLoader } from "./runtime-config.ts";
-import { resolveProviderKitDependencies } from "./runtime-config.ts";
+import type { PiProviderDependencies, PiProviderLoader } from "./runtime-config.ts";
+import { resolvePiProviderDependencies } from "./runtime-config.ts";
 import type { StatusContextLike } from "./status-manager.ts";
 import { StatusManager } from "./status-manager.ts";
 import {
@@ -33,15 +31,19 @@ import type {
 	ProviderCost,
 	ProviderModelDraft,
 	ProviderModelMetadata,
+	StoredCredentialLike,
 } from "./types.ts";
 
 type ActiveModel = NonNullable<ExtensionContext["model"]>;
 type StatusNotificationContext = Pick<ExtensionContext, "modelRegistry" | "ui"> & {
 	mode?: ExtensionContext["mode"];
 };
-const STATUS_WIDGET_KEY = "provider-kit-status";
+const STATUS_WIDGET_KEY = "pi-provider-status";
 
-function readProviderCredentialMetadata(provider: string): unknown {
+function readProviderCredentialMetadata(
+	provider: string,
+	readStoredCredential: (providerId: string) => StoredCredentialLike | undefined,
+): unknown {
 	try {
 		const credential = readStoredCredential(provider);
 		if (credential?.type !== "oauth") return undefined;
@@ -59,7 +61,11 @@ function clearTransientStatus(ctx: Pick<ExtensionContext, "ui">): void {
 	ctx.ui.setWidget(STATUS_WIDGET_KEY, undefined);
 }
 
-function showTransientStatus(message: string, ctx: StatusNotificationContext): boolean {
+function showTransientStatus(
+	message: string,
+	ctx: StatusNotificationContext,
+	wrapTextWithAnsi: (text: string, width: number) => string[],
+): boolean {
 	if ((ctx.mode !== "tui" && ctx.mode !== "rpc") || typeof ctx.ui.setWidget !== "function") return false;
 	// RPC cannot render component factories, so keep its plain text protocol unchanged.
 	if (ctx.mode === "rpc") {
@@ -103,7 +109,7 @@ export function scheduleModelCatalogRefresh(ctx: Pick<ExtensionContext, "modelRe
 		.catch(() => undefined);
 }
 
-export interface ProviderKitRuntimeController {
+export interface PiProviderRuntimeController {
 	resetForSession(): void;
 	updateOfficialPricing?(snapshot: Record<string, OfficialModelMeta>): void;
 	shutdown(): void;
@@ -126,7 +132,7 @@ function cloneProviderCost(cost: ProviderCost): ProviderCost {
 
 function getOfficialMetadataStatus(
 	snapshot: Record<string, OfficialModelMeta>,
-	runtime: ProviderKitDependencies,
+	runtime: PiProviderDependencies,
 ): ModelMetadataStatus | undefined {
 	const source = runtime.officialPricingUrl === OPENROUTER_MODELS_URL ? "AA/OpenRouter" : "Official metadata";
 	if (!runtime.enableOfficialPricingFallback && Object.keys(snapshot).length === 0) return undefined;
@@ -185,17 +191,17 @@ function getNativeModelMetadata(
 	};
 }
 
-export function installProviderKitRuntime(
+export function installPiProviderRuntime(
 	pi: ExtensionAPI,
-	runtime: ProviderKitDependencies,
-	definition: ProviderKitDefinition,
+	runtime: PiProviderDependencies,
+	definition: PiProviderDefinition,
 	officialPricing: Record<string, OfficialModelMeta> = {},
 	options: {
 		registerHandlers?: boolean;
 		providerDrafts?: ReadonlyMap<ProviderAdapter, ProviderModelDraft[]>;
 	} = {},
-): ProviderKitRuntimeController {
-	validateProviderKitDefinition(definition);
+): PiProviderRuntimeController {
+	validatePiProviderDefinition(definition);
 	const registerHandlers = options.registerHandlers ?? true;
 	let currentOfficialPricing = officialPricing;
 	let currentOfficialMetadataStatus = getOfficialMetadataStatus(officialPricing, runtime);
@@ -301,7 +307,7 @@ export function installProviderKitRuntime(
 		);
 		const message = report.report;
 		if (report.warningLevel !== "hard") {
-			statusPresentationVisible = showTransientStatus(message, ctx);
+			statusPresentationVisible = showTransientStatus(message, ctx, runtime.wrapTextWithAnsi);
 			if (!statusPresentationVisible) ctx.ui.notify(message, "info");
 			return;
 		}
@@ -335,7 +341,7 @@ export function installProviderKitRuntime(
 				model,
 				modelRegistry: ctx.modelRegistry,
 				getCredentialKey: () => ctx.modelRegistry.getApiKeyForProvider(model.provider),
-				getCredentialMetadata: () => readProviderCredentialMetadata(model.provider),
+				getCredentialMetadata: () => readProviderCredentialMetadata(model.provider, runtime.readStoredCredential),
 			};
 			const preflightContext: PreflightContextLike = { model, modelRegistry: ctx.modelRegistry };
 			const refreshChecks: Array<Promise<unknown>> = [];
@@ -387,7 +393,7 @@ export function installProviderKitRuntime(
 		liveCheckManager.clear();
 	};
 
-	const controller: ProviderKitRuntimeController = {
+	const controller: PiProviderRuntimeController = {
 		resetForSession,
 		updateOfficialPricing(snapshot) {
 			currentOfficialPricing = snapshot;
@@ -425,15 +431,15 @@ export function installProviderKitRuntime(
 	return controller;
 }
 
-export function createProviderKitRuntime(
-	loadDefinition: ProviderKitLoader,
-	dependencies: Partial<ProviderKitDependencies> = {},
+export function createPiProviderRuntime(
+	loadDefinition: PiProviderLoader,
+	dependencies: Partial<PiProviderDependencies> = {},
 ): (pi: ExtensionAPI) => Promise<void> {
-	const runtime = resolveProviderKitDependencies(dependencies);
+	const runtime = resolvePiProviderDependencies(dependencies);
 	return async (pi) => {
 		let latestBackgroundPricing: Record<string, OfficialModelMeta> | undefined;
-		let installedDefinition: ProviderKitDefinition | undefined;
-		let installedController: ProviderKitRuntimeController | undefined;
+		let installedDefinition: PiProviderDefinition | undefined;
+		let installedController: PiProviderRuntimeController | undefined;
 		let disposed = false;
 		const onBackgroundRefresh = (snapshot: Record<string, OfficialModelMeta>): void => {
 			latestBackgroundPricing = snapshot;
@@ -462,8 +468,8 @@ export function createProviderKitRuntime(
 			: Promise.resolve({});
 		const definitionPromise = loadDefinition(runtime);
 		const [officialPricing, definition] = await Promise.all([officialPricingPromise, definitionPromise]);
-		validateProviderKitDefinition(definition);
-		installedController = installProviderKitRuntime(pi, runtime, definition, officialPricing);
+		validatePiProviderDefinition(definition);
+		installedController = installPiProviderRuntime(pi, runtime, definition, officialPricing);
 		installedDefinition = definition;
 		if (latestBackgroundPricing !== undefined) onBackgroundRefresh(latestBackgroundPricing);
 		pi.on("session_shutdown", () => {

package/core/status-report.ts

@@ -264,7 +264,7 @@ function formatCatalog(
 	now: number,
 ): { lines: string[]; issue: ReportIssue } {
 	if (!adapter) {
-		if (!nativeLookupAvailable) return { lines: ["Status: not managed by Provider Kit"], issue: { level: "none" } };
+		if (!nativeLookupAvailable) return { lines: ["Status: not managed by Pi Provider"], issue: { level: "none" } };
 		if (!nativeProvider) return { lines: ["Status: unavailable in Pi"], issue: { level: "none" } };
 		const count = getNativeModelCount(nativeProvider);
 		return {
@@ -482,7 +482,7 @@ function appendLiveCheckReport(
 		return { level: "none" };
 	}
 	if (options.showScope) {
-		lines.push("Live check scope: streamSimple() · Provider Kit tuners only (other hooks not replayed)");
+		lines.push("Live check scope: streamSimple() · Pi Provider tuners only (other hooks not replayed)");
 	}
 	if (diagnostics?.pending) lines.push("Availability: checking");
 	else if (!diagnostics?.snapshot && !diagnostics?.lastError) lines.push("Availability: not checked");

package/core/types.ts

@@ -10,7 +10,7 @@ export type ThinkingLevel = ReturnType<ExtensionAPI["getThinkingLevel"]>;
 export type ProviderCost = ProviderModelConfig["cost"];
 export type ProviderModel = ProviderModelConfig;
 export type PricingSku = "input" | "output" | "cacheRead" | "cacheWrite";
-/** Pricing provenance used by Provider Kit sidecars; not added to Pi model objects. */
+/** Pricing provenance used by Pi Provider sidecars; not added to Pi model objects. */
 export type ProviderPricingSource = "provider" | "fallback" | "official";
 export type ModelPricingSource = ProviderPricingSource | "native";
 export type ModelFieldSource = ProviderPricingSource | "native" | "default";
@@ -22,6 +22,16 @@ export interface ModelMetadataStatus {
 	source?: string;
 }
 
+/**
+ * Narrow credential shape shared across Pi's isolated extension module contexts.
+ * The full Credential type comes from Pi's bundled AI package; consumers of
+ * injected credential readers must not rely on `instanceof` or extra fields.
+ */
+export interface StoredCredentialLike {
+	readonly type?: string;
+	readonly teamName?: string;
+}
+
 export interface ModelFieldSources {
 	contextWindow?: ModelFieldSource;
 	maxTokens?: ModelFieldSource;

package/index.ts

@@ -1,4 +1,8 @@
-import { createProviderKitHost } from "./core/host.ts";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { getAgentDir, readStoredCredential } from "@earendil-works/pi-coding-agent";
+import { wrapTextWithAnsi } from "@earendil-works/pi-tui";
+import { createJiti } from "jiti";
+import type { PiProviderDependencies } from "./core/runtime-config.ts";
 
 export type {
 	AdapterExtensionContext,
@@ -13,25 +17,26 @@ export {
 	defineStatusExtension,
 	defineTunerExtension,
 } from "./core/adapter-extensions.ts";
+export { withDeadline } from "./core/deadline.ts";
 export type { ProviderDataErrorLike } from "./core/errors.ts";
 export { isProviderDataError, ProviderDataError } from "./core/errors.ts";
 export type {
-	ProviderKitDefinition,
-	ProviderKitDependencies,
-	ProviderKitLoader,
-	ProviderKitRuntimeController,
+	PiProviderDefinition,
+	PiProviderDependencies,
+	PiProviderLoader,
+	PiProviderRuntimeController,
 } from "./core/extension.ts";
 export {
-	createProviderKitRuntime,
-	getDefaultProviderKitDependencies,
-	installProviderKitRuntime,
+	createPiProviderRuntime,
+	getDefaultPiProviderDependencies,
+	installPiProviderRuntime,
 	prepareProviderRegistration,
 	registerProviderAdapter,
-	resolveProviderKitDependencies,
-	validateProviderKitDefinition,
-	validateProviderKitDependencies,
+	resolvePiProviderDependencies,
+	validatePiProviderDefinition,
+	validatePiProviderDependencies,
 } from "./core/extension.ts";
-export { createProviderKitHost } from "./core/host.ts";
+export { createPiProviderHost } from "./core/host.ts";
 export type {
 	LiveCheckContextLike,
 	LiveCheckDiagnostics,
@@ -56,6 +61,7 @@ export {
 	parseOpenRouterPricing,
 	setPricingCache,
 } from "./core/official-pricing.ts";
+export { createOpenCodeCatalogPreflightAdapter } from "./core/opencode-preflight.ts";
 export type {
 	PreflightAdapter,
 	PreflightContext,
@@ -67,6 +73,8 @@ export type {
 } from "./core/preflight-manager.ts";
 export { getPreflightKey, normalizePreflightSnapshot, PreflightManager } from "./core/preflight-manager.ts";
 export { applyPricingAdjustment, resolvePricingDetails } from "./core/pricing-adjustments.ts";
+export { normalizeProviderModels } from "./core/provider-registration.ts";
+export { parseRetryAfter } from "./core/retry-after.ts";
 export type { StatusDiagnostics, StatusErrorState } from "./core/status-manager.ts";
 export { normalizeStatusSnapshot, StatusManager } from "./core/status-manager.ts";
 export { applyTunerAdapters, sortTunerAdapters } from "./core/tuner-manager.ts";
@@ -105,4 +113,39 @@ export type {
 	TunerContext,
 } from "./core/types.ts";
 
-export default createProviderKitHost();
+export interface PiProviderExtensionOptions {
+	/** User adapter root; replaces the default `<agentDir>/pi-provider` directory. */
+	adapterRoot?: string;
+	/** Host runtime dependency overrides. */
+	dependencies?: Partial<PiProviderDependencies>;
+}
+
+/** Create one Pi extension that discovers the current Adapter files when it loads. */
+export function createPiProviderExtension(
+	options: PiProviderExtensionOptions = {},
+): (pi: ExtensionAPI) => Promise<void> {
+	return async (pi) => {
+		const jiti = createJiti(import.meta.url, { moduleCache: true, tryNative: false });
+		const { runPiProviderEntry } = (await jiti.import("./core/runtime-entry.ts")) as {
+			runPiProviderEntry: (
+				pi: ExtensionAPI,
+				entry: {
+					agentDir: string;
+					readStoredCredential: typeof readStoredCredential;
+					wrapTextWithAnsi: typeof wrapTextWithAnsi;
+					adapterRoot?: string;
+					dependencies?: Partial<PiProviderDependencies>;
+				},
+			) => Promise<void>;
+		};
+		await runPiProviderEntry(pi, {
+			agentDir: getAgentDir(),
+			readStoredCredential,
+			wrapTextWithAnsi,
+			adapterRoot: options.adapterRoot,
+			dependencies: options.dependencies,
+		});
+	};
+}
+
+export default createPiProviderExtension();