@hyav/pi-provider 0.1.1 → 0.1.3

package/CHANGELOG.md

@@ -2,6 +2,22 @@
 
 This file is the authoritative user-facing release history for `@hyav/pi-provider`.
 
+## 0.1.3 - 2026-08-17
+
+- Discover user Adapter files under `<agent-dir>/extensions/pi-provider/` in addition to built-ins; user files load last and override same-ID built-ins.
+- Run the provider runtime inside a single Jiti module graph behind a thin Pi entrypoint; inject the agent directory, stored credentials, and ANSI text wrapping.
+- Export the Adapter API through a Jiti-safe public entrypoint aliased as `@hyav/pi-provider`, aligned with the built-in Adapters as reference templates.
+- Resolve duplicate Adapter IDs and bindings to the latest registration with a warning instead of excluding all colliding entries.
+- Re-read modified Adapter files on `/reload` by clearing the Adapter module cache.
+- Restore the programmatic default OpenRouter metadata cache path under the resolved agent directory.
+
+## 0.1.2 - 2026-08-17
+
+- Expose one Pi package entrypoint while preserving file-level Adapter discovery when `/reload` runs.
+- Isolate invalid Adapter modules behind capability-relative diagnostics and declare `jiti` as the runtime loader.
+- Rename the public APIs to Pi Provider equivalents and remove legacy aliases; programmatic consumers must update those imported names.
+- Store generated metadata under `<agent-dir>/pi-provider/`, following Pi's resolved agent directory.
+
 ## 0.1.1 - 2026-08-16
 
 - Hardened zero-coupling contract tests and isolated temporary directories for manifest drop-in validation.
@@ -10,7 +26,7 @@ This file is the authoritative user-facing release history for `@hyav/pi-provide
 ## 0.1.0 - 2026-08-16
 
 - Initial public release of `@hyav/pi-provider`.
-- Provider Kit host for dynamic providers, status, preflight, live checks, and request tuners.
+- Pi Provider host for dynamic providers, status, preflight, live checks, and request tuners.
 - Manifest-discovered adapter extensions with deterministic ordering, reload isolation, validation, and conflict handling.
 - Cached model catalogs, bounded background refresh, pricing metadata, and explicit free-versus-billable diagnostics.
 - Built-in Charm Hyper, DeepSeek, Google Gemini, OpenAI Codex, OpenCode Zen, and OpenCode Go integrations.

package/README.md

@@ -1,4 +1,4 @@
-# @hyav/pi-provider
+# pi-provider
 
 [简体中文](README.zh-CN.md)
 
@@ -8,8 +8,8 @@ A provider extension toolkit for [Pi](https://pi.dev). It registers LLM provider
 
 ## Highlights
 
-- One Provider Kit Host for registration, status, preflight checks, live checks, and request tuners
-- Manifest-discovered provider, status, preflight, and tuner adapters reloaded with `/reload`
+- One Pi Provider Host for registration, status, preflight checks, live checks, and request tuners
+- Provider, status, preflight, and tuner Adapter files discovered by one Pi entrypoint on `/reload`
 - Resilient model catalogs with cached fallback, bounded background refresh, and failure retention
 - Provider-first pricing metadata with optional OpenRouter completion and quality indicators
 - Explicit diagnostics: cached `/status`, free `/status refresh`, and potentially billable `/status check`
@@ -46,11 +46,32 @@ Use `/status refresh` for free endpoint, authentication, catalog, and account ch
 | Name | Required | Default | Effect |
 |---|---:|---|---|
 | `HYPER_API_KEY` | For Charm Hyper API-key auth | None | Supplies the built-in `charm-hyper` provider credential; OAuth users may use `/login` |
-| `PI_CODING_AGENT_DIR` | No | `~/.pi/agent` | Changes the base directory for public OpenRouter metadata cache |
+| `PI_CODING_AGENT_DIR` | No | `~/.pi/agent` | Changes Pi's agent directory; public OpenRouter metadata is cached under `<agent-dir>/extensions/pi-provider/` |
 
-Programmatic integrations can configure pricing fallback, pricing policies, request timeouts, metadata URLs, and cache paths through `createProviderKitRuntime()` or `createProviderKitHost()`. The source definition [`ProviderKitDependencies`](core/runtime-config.ts) is authoritative.
+Programmatic integrations can configure pricing fallback, pricing policies, request timeouts, metadata URLs, and cache paths through `createPiProviderRuntime()` or `createPiProviderHost()`. Programmatic defaults resolve the agent directory from `PI_CODING_AGENT_DIR` (falling back to `~/.pi/agent`) and keep the OpenRouter metadata cache on disk under `<agent-dir>/extensions/pi-provider/`, matching the table above; the Pi entrypoint overrides it with Pi's own resolution. Host packages with a custom capability root can call `createPiProviderExtension({ adapterRoot, dependencies })`. The source definition [`PiProviderDependencies`](core/runtime-config.ts) is authoritative.
 
-Trusted packages can add adapters through manifest entries under `providers/`, `status/`, `preflight/`, and `tuners/`. See the [adapter extension contract](https://github.com/hyav/pi-provider/blob/main/docs/adapter-extensions.md) for helpers, validation, conflicts, reload behavior, and lifecycle boundaries. The root [`index.ts`](index.ts) defines the public TypeScript exports.
+## Adapter discovery (file-level plug and play)
+
+Built-in Adapters ship inside the package and are always discovered. User Adapters live under Pi's resolved agent directory and are discovered too:
+
+```text
+<agent-dir>/extensions/pi-provider/
+  providers/   # provider Adapter files
+  status/      # status Adapter files
+  preflight/   # preflight Adapter files
+  tuners/      # tuner Adapter files
+```
+
+
+Add, remove, or modify files there, then run `/reload` to rediscover them without touching the package; edits to existing files are re-read from disk. User Adapters load after built-ins, so a same-ID file overrides the built-in Adapter (the Host keeps the latest registration and warns). `createPiProviderExtension({ adapterRoot })` replaces the default user directory with a custom root; built-ins are always scanned. The built-in Adapters under the package's `providers/`, `status/`, and `preflight/` are reference templates with this exact shape — copy one and customize it (Charm Hyper and `preflight/openai-codex.ts` also use package-private helpers).
+
+Adapter files import helpers and types from `@hyav/pi-provider` (aliased inside the loader):
+
+```ts
+import { defineProviderExtension } from "@hyav/pi-provider";
+```
+
+Adapter files must not runtime-import Pi's bundled packages (`@earendil-works/pi-coding-agent`, `@earendil-works/pi-tui`, `@earendil-works/pi-ai`); type-only imports are fine. Runtime values such as the agent directory, stored credentials, and the ANSI text wrapper are injected by the Pi entrypoint. See the [adapter extension contract](https://github.com/hyav/pi-provider/blob/main/docs/adapter-extensions.md) for helpers, validation, conflicts, reload behavior, and lifecycle boundaries. The root [`index.ts`](index.ts) defines the public TypeScript exports.
 
 ## Before you use it
 

package/README.zh-CN.md

@@ -1,4 +1,4 @@
-# @hyav/pi-provider
+# pi-provider
 
 [English](README.md)
 
@@ -8,8 +8,8 @@
 
 ## 核心能力
 
-- 由一个 Provider Kit Host 统一负责注册、Status、Preflight、实时检查和请求 Tuner
-- 通过 manifest 发现 Provider、Status、Preflight 和 Tuner Adapter，并在 `/reload` 后重新加载
+- 由一个 Pi Provider Host 统一负责注册、Status、Preflight、实时检查和请求 Tuner
+- 由单一 Pi 入口在 `/reload` 时发现 Provider、Status、Preflight 和 Tuner Adapter 文件
 - 通过缓存回退、有界后台刷新和失败保留提供可靠的模型目录
 - 优先采用 Provider 价格元数据，并可由 OpenRouter 补全价格和质量指标
 - 显式诊断：缓存 `/status`、免费 `/status refresh` 和可能计费的 `/status check`
@@ -46,11 +46,32 @@ pi install npm:@hyav/pi-provider
 | 名称 | 必需 | 默认值 | 作用 |
 |---|---:|---|---|
 | `HYPER_API_KEY` | Charm Hyper API Key 鉴权需要 | 无 | 为内置 `charm-hyper` Provider 提供凭据；OAuth 用户可以使用 `/login` |
-| `PI_CODING_AGENT_DIR` | 否 | `~/.pi/agent` | 修改公开 OpenRouter 元数据缓存的基础目录 |
+| `PI_CODING_AGENT_DIR` | 否 | `~/.pi/agent` | 修改 Pi agent 目录；公开 OpenRouter 元数据缓存在 `<agent-dir>/extensions/pi-provider/` 下 |
 
-程序化集成可以通过 `createProviderKitRuntime()` 或 `createProviderKitHost()` 配置价格回退、价格策略、请求超时、元数据 URL 和缓存路径。源码定义 [`ProviderKitDependencies`](core/runtime-config.ts) 是权威依据。
+程序化集成可以通过 `createPiProviderRuntime()` 或 `createPiProviderHost()` 配置价格回退、价格策略、请求超时、元数据 URL 和缓存路径。程序化默认值会从 `PI_CODING_AGENT_DIR`（回退到 `~/.pi/agent`）解析 agent 目录，并保持 OpenRouter 元数据缓存落盘到 `<agent-dir>/extensions/pi-provider/`，与上表一致；Pi 入口会用 Pi 自身的解析覆盖它。使用自定义 capability 根目录的 Host 包可以调用 `createPiProviderExtension({ adapterRoot, dependencies })`。源码定义 [`PiProviderDependencies`](core/runtime-config.ts) 是权威依据。
 
-可信包可以通过 manifest 中的 `providers/`、`status/`、`preflight/` 和 `tuners/` 条目添加 Adapter。Helper、校验、冲突、reload 行为和生命周期边界见 [Adapter Extension 契约](https://github.com/hyav/pi-provider/blob/main/docs/adapter-extensions.zh-CN.md)。根目录 [`index.ts`](index.ts) 定义公开 TypeScript 导出。
+## Adapter 发现（文件级即插即用）
+
+内置 Adapter 随包发布，始终被扫描。用户 Adapter 放在 Pi 解析出的 agent 目录下，同样会被发现：
+
+```text
+<agent-dir>/extensions/pi-provider/
+  providers/   # Provider Adapter 文件
+  status/      # Status Adapter 文件
+  preflight/   # Preflight Adapter 文件
+  tuners/      # Tuner Adapter 文件
+```
+
+
+在目录中增删或修改文件后执行 `/reload` 即可重新发现，无需改动包；对现有文件的修改会重新从磁盘读取。用户 Adapter 在内置之后加载，因此同 ID 的用户文件会覆盖内置 Adapter（Host 保留最新注册并发出警告）。`createPiProviderExtension({ adapterRoot })` 用自定义根替换默认用户目录；内置目录始终被扫描。包内 `providers/`、`status/`、`preflight/` 下的内置 Adapter 就是采用这种写法的参考模板——复制一份改改即可（Charm Hyper 与 `preflight/openai-codex.ts` 还依赖包内私有辅助文件）。
+
+Adapter 文件从 `@hyav/pi-provider` 导入 helper 和类型（加载器内部做了别名映射）：
+
+```ts
+import { defineProviderExtension } from "@hyav/pi-provider";
+```
+
+Adapter 文件不得运行时导入 Pi 的内置包（`@earendil-works/pi-coding-agent`、`@earendil-works/pi-tui`、`@earendil-works/pi-ai`），仅 type-only 导入可以；agent 目录、存储凭据和 ANSI 文本包装器等运行时值由 Pi 入口注入。Helper、校验、冲突、reload 行为和生命周期边界见 [Adapter Extension 契约](https://github.com/hyav/pi-provider/blob/main/docs/adapter-extensions.zh-CN.md)。根目录 [`index.ts`](index.ts) 定义公开 TypeScript 导出。
 
 ## 使用须知
 

package/SECURITY.md

@@ -30,7 +30,7 @@ Reports are handled on a best-effort basis; no acknowledgement, remediation, or
 
 ## Scope and dependency boundary
 
-This policy covers the source repository, the published `@hyav/pi-provider` npm artifact, its Pi manifest, built-in adapters, credential handling, remote response validation, deadlines, and the Provider Kit runtime. The published artifact has no bundled runtime dependencies; its Pi core imports are host-supplied peers. CI runs both `npm run audit:runtime` for the published boundary and `npm run audit:all` for development and tested-host dependencies. Scanner findings are triaged rather than force-fixed across an untested host version.
+This policy covers the source repository, the published `@hyav/pi-provider` npm artifact, its Pi manifest, built-in adapters, credential handling, remote response validation, deadlines, and the Pi Provider runtime. The published artifact has no bundled runtime dependencies; its Pi core imports are host-supplied peers. CI runs both `npm run audit:runtime` for the published boundary and `npm run audit:all` for development and tested-host dependencies. Scanner findings are triaged rather than force-fixed across an untested host version.
 
 Vulnerabilities in Pi, a Provider service, npm, GitHub, or another dependency should also be reported to the relevant upstream maintainer. For ordinary defects and usage questions, use [SUPPORT.md](SUPPORT.md) and the [public issue tracker](https://github.com/hyav/pi-provider/issues).
 

package/core/adapter-extensions.ts

@@ -2,21 +2,21 @@ import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import {
 	type AdapterKind,
 	type AdapterRegistrationEnvelope,
-	PROVIDER_KIT_ADAPTER_EVENT,
-	PROVIDER_KIT_ADAPTER_PROTOCOL_VERSION,
-	PROVIDER_KIT_STARTUP_BRIDGE_EVENT,
+	PI_PROVIDER_ADAPTER_EVENT,
+	PI_PROVIDER_ADAPTER_PROTOCOL_VERSION,
+	PI_PROVIDER_STARTUP_BRIDGE_EVENT,
 	type StartupBridge,
 	type StartupBridgeRequest,
 } from "./adapter-protocol.ts";
 import { isStableAdapterId, validateAdapter, validateAdapterIdentity } from "./adapter-validation.ts";
 import type { PreflightAdapter } from "./preflight-manager.ts";
 import { registerProviderAdapter } from "./provider-registration.ts";
-import type { ProviderKitDependencies } from "./runtime-config.ts";
-import { getDefaultProviderKitDependencies } from "./runtime-config.ts";
+import type { PiProviderDependencies } from "./runtime-config.ts";
+import { getDefaultPiProviderDependencies } from "./runtime-config.ts";
 import type { ProviderAdapter, StatusAdapter, TunerAdapter } from "./types.ts";
 
 /** Context supplied to an Adapter Extension factory. */
-export interface AdapterExtensionContext extends ProviderKitDependencies {
+export interface AdapterExtensionContext extends PiProviderDependencies {
 	/** The Pi API that owns this extension factory. */
 	pi: ExtensionAPI;
 }
@@ -52,19 +52,19 @@ function validateStaticIdentity(kind: AdapterKind, id: string, providerId?: stri
 
 function getStartupBridge(pi: ExtensionAPI): StartupBridge {
 	const request: StartupBridgeRequest = {};
-	pi.events.emit(PROVIDER_KIT_STARTUP_BRIDGE_EVENT, request);
+	pi.events.emit(PI_PROVIDER_STARTUP_BRIDGE_EVENT, request);
 	return (
 		request.bridge ?? {
-			dependencies: getDefaultProviderKitDependencies(),
+			dependencies: getDefaultPiProviderDependencies(),
 			officialPricing: Promise.resolve({}),
 		}
 	);
 }
 
 function emitRegistration(pi: ExtensionAPI, envelope: AdapterRegistrationEnvelope): void {
-	pi.events.emit(PROVIDER_KIT_ADAPTER_EVENT, envelope);
+	pi.events.emit(PI_PROVIDER_ADAPTER_EVENT, envelope);
 	pi.on("session_start", () => {
-		pi.events.emit(PROVIDER_KIT_ADAPTER_EVENT, envelope);
+		pi.events.emit(PI_PROVIDER_ADAPTER_EVENT, envelope);
 	});
 }
 
@@ -94,7 +94,7 @@ function createAdapterExtension<TAdapter extends ProviderAdapter | StatusAdapter
 			// loaded later can recreate the adapter with its configured runtime.
 			registerProviderAdapter(pi, providerAdapter, bridge.dependencies, {}, modelDrafts);
 			emitRegistration(pi, {
-				version: PROVIDER_KIT_ADAPTER_PROTOCOL_VERSION,
+				version: PI_PROVIDER_ADAPTER_PROTOCOL_VERSION,
 				kind: "provider",
 				id,
 				token,
@@ -110,7 +110,7 @@ function createAdapterExtension<TAdapter extends ProviderAdapter | StatusAdapter
 			validateAdapter("status", statusAdapter);
 			validateAdapterIdentity("status", id, providerId, statusAdapter);
 			emitRegistration(pi, {
-				version: PROVIDER_KIT_ADAPTER_PROTOCOL_VERSION,
+				version: PI_PROVIDER_ADAPTER_PROTOCOL_VERSION,
 				kind: "status",
 				id,
 				providerId: providerId!,
@@ -126,7 +126,7 @@ function createAdapterExtension<TAdapter extends ProviderAdapter | StatusAdapter
 			validateAdapter("preflight", preflightAdapter);
 			validateAdapterIdentity("preflight", id, providerId, preflightAdapter);
 			emitRegistration(pi, {
-				version: PROVIDER_KIT_ADAPTER_PROTOCOL_VERSION,
+				version: PI_PROVIDER_ADAPTER_PROTOCOL_VERSION,
 				kind: "preflight",
 				id,
 				providerId: providerId!,
@@ -141,7 +141,7 @@ function createAdapterExtension<TAdapter extends ProviderAdapter | StatusAdapter
 		validateAdapter("tuner", tunerAdapter);
 		validateAdapterIdentity("tuner", id, tunerAdapter);
 		emitRegistration(pi, {
-			version: PROVIDER_KIT_ADAPTER_PROTOCOL_VERSION,
+			version: PI_PROVIDER_ADAPTER_PROTOCOL_VERSION,
 			kind: "tuner",
 			id,
 			token,

package/core/adapter-loader.ts

@@ -0,0 +1,99 @@
+import type { Dirent } from "node:fs";
+import { readdir } from "node:fs/promises";
+import { createRequire } from "node:module";
+import { dirname, extname, join, relative, sep } from "node:path";
+import { fileURLToPath } from "node:url";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { createJiti } from "jiti";
+
+const adapterDirectories = ["providers", "status", "preflight", "tuners"] as const;
+const defaultPackageRoot = dirname(dirname(fileURLToPath(import.meta.url)));
+/** Jiti-safe module that adapter files reach through the `@hyav/pi-provider` alias. */
+const publicAdaptersPath = join(defaultPackageRoot, "core", "public-adapters.ts");
+
+type AdapterExtensionFactory = (pi: ExtensionAPI) => void | Promise<void>;
+
+export interface AdapterRootOptions {
+	/** Package root containing built-in adapters; defaults to this package. */
+	packageRoot?: string;
+	/** Pi's resolved agent directory; user adapters are discovered under `<agentDir>/extensions/pi-provider`. */
+	agentDir?: string;
+	/** Explicit user adapter root; replaces the agentDir-based default when provided. */
+	userRoot?: string;
+}
+
+/** Built-in adapters always load first; user adapters load last so they can override. */
+export function resolveAdapterRoots(options: AdapterRootOptions): string[] {
+	const { packageRoot, agentDir, userRoot } = options;
+	const defaultUserRoot =
+		agentDir !== undefined && agentDir !== "" ? join(agentDir, "extensions", "pi-provider") : undefined;
+	const resolvedUserRoot = userRoot ?? defaultUserRoot;
+	const roots = [packageRoot ?? defaultPackageRoot];
+	if (resolvedUserRoot !== undefined) roots.push(resolvedUserRoot);
+	return roots;
+}
+
+/**
+ * Jiti's module cache is Node's global `require.cache`, so a reload would
+ * otherwise reuse previously loaded adapter modules without reading the disk.
+ * Drop every cached module under the adapter roots before each load so edits
+ * to existing adapter files take effect on `/reload`.
+ */
+function clearAdapterModuleCache(roots: string[]): void {
+	const require = createRequire(import.meta.url);
+	for (const key of Object.keys(require.cache)) {
+		if (roots.some((root) => key.startsWith(root.endsWith(sep) ? root : `${root}${sep}`))) {
+			delete require.cache[key];
+		}
+	}
+}
+
+function isAdapterFile(name: string): boolean {
+	if (name.endsWith(".d.ts")) return false;
+	return extname(name) === ".ts" || extname(name) === ".js";
+}
+
+function warnAdapterLoadIssue(path: string, error: unknown): void {
+	const message = error instanceof Error ? error.message : String(error);
+	console.warn(`[pi-provider] failed to load adapter extension ${JSON.stringify(path)}: ${message}`);
+}
+
+async function discoverAdapterPaths(root: string): Promise<string[]> {
+	const paths: string[] = [];
+	for (const directory of adapterDirectories) {
+		let entries: Dirent[];
+		try {
+			entries = await readdir(join(root, directory), { withFileTypes: true });
+		} catch (error) {
+			if ((error as NodeJS.ErrnoException).code === "ENOENT") continue;
+			throw error;
+		}
+		for (const entry of entries) {
+			if (entry.isFile() && isAdapterFile(entry.name)) paths.push(join(root, directory, entry.name));
+		}
+	}
+	return paths.sort();
+}
+
+export async function loadPackageAdapterExtensions(pi: ExtensionAPI, options: AdapterRootOptions = {}): Promise<void> {
+	const roots = resolveAdapterRoots(options);
+	clearAdapterModuleCache(roots);
+	const jiti = createJiti(import.meta.url, {
+		moduleCache: true,
+		tryNative: false,
+		alias: { "@hyav/pi-provider": publicAdaptersPath },
+	});
+	for (const root of roots) {
+		for (const path of await discoverAdapterPaths(root)) {
+			try {
+				const factory = (await jiti.import(path, { default: true })) as unknown;
+				if (typeof factory !== "function") {
+					throw new TypeError("default export must be a Pi extension factory");
+				}
+				await (factory as AdapterExtensionFactory)(pi);
+			} catch (error) {
+				warnAdapterLoadIssue(relative(root, path).replaceAll("\\", "/"), error);
+			}
+		}
+	}
+}

package/core/adapter-protocol.ts

@@ -1,24 +1,24 @@
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import type { OfficialModelMeta } from "./official-pricing.ts";
 import type { PreflightAdapter } from "./preflight-manager.ts";
-import type { ProviderKitDependencies } from "./runtime-config.ts";
+import type { PiProviderDependencies } from "./runtime-config.ts";
 import type { ProviderAdapter, ProviderModelDraft, StatusAdapter, TunerAdapter } from "./types.ts";
 
 /** Registration protocol version shared by Host and Adapter Extensions. */
-export const PROVIDER_KIT_ADAPTER_PROTOCOL_VERSION = 2 as const;
+export const PI_PROVIDER_ADAPTER_PROTOCOL_VERSION = 2 as const;
 
 /** Event-bus channel used for Adapter Extension registration envelopes. */
-export const PROVIDER_KIT_ADAPTER_EVENT = "provider-kit:adapter";
+export const PI_PROVIDER_ADAPTER_EVENT = "pi-provider:adapter";
 
 /** Event-bus channel used by the Host to expose the factory-stage startup bridge. */
-export const PROVIDER_KIT_STARTUP_BRIDGE_EVENT = "provider-kit:startup-bridge";
+export const PI_PROVIDER_STARTUP_BRIDGE_EVENT = "pi-provider:startup-bridge";
 
-/** Event-bus channel used to detect more than one Provider Kit Host. */
-export const PROVIDER_KIT_HOST_CLAIM_EVENT = "provider-kit:host-claim";
+/** Event-bus channel used to detect more than one Pi Provider Host. */
+export const PI_PROVIDER_HOST_CLAIM_EVENT = "pi-provider:host-claim";
 
 export type AdapterKind = "provider" | "status" | "preflight" | "tuner";
 
-export interface AdapterFactoryContext extends ProviderKitDependencies {
+export interface AdapterFactoryContext extends PiProviderDependencies {
 	pi: ExtensionAPI;
 }
 
@@ -32,14 +32,14 @@ export type AdapterFactory = (
 	| Promise<ProviderAdapter | StatusAdapter | PreflightAdapter | TunerAdapter>;
 
 export interface AdapterRegistrationEnvelopeBase {
-	version: typeof PROVIDER_KIT_ADAPTER_PROTOCOL_VERSION;
+	version: typeof PI_PROVIDER_ADAPTER_PROTOCOL_VERSION;
 	kind: AdapterKind;
 	id: string;
 	token: object;
 	/** Factory retained for Host-side rehydration when Host loaded after Adapter. */
 	factory: AdapterFactory;
 	/** Exact dependency object used by the initial factory invocation. */
-	startupDependencies: ProviderKitDependencies;
+	startupDependencies: PiProviderDependencies;
 }
 
 export interface ProviderAdapterRegistrationEnvelope extends AdapterRegistrationEnvelopeBase {
@@ -73,7 +73,7 @@ export type AdapterRegistrationEnvelope =
 	| TunerAdapterRegistrationEnvelope;
 
 export interface StartupBridge {
-	dependencies: ProviderKitDependencies;
+	dependencies: PiProviderDependencies;
 	officialPricing: Promise<Record<string, OfficialModelMeta>>;
 }
 
@@ -102,7 +102,7 @@ export function isAdapterRegistrationEnvelope(value: unknown): value is AdapterR
 	if (value === null || typeof value !== "object") return false;
 	const candidate = value as Partial<AdapterRegistrationEnvelope>;
 	return (
-		candidate.version === PROVIDER_KIT_ADAPTER_PROTOCOL_VERSION &&
+		candidate.version === PI_PROVIDER_ADAPTER_PROTOCOL_VERSION &&
 		(candidate.kind === "provider" ||
 			candidate.kind === "status" ||
 			candidate.kind === "preflight" ||

package/core/definition.ts

@@ -2,7 +2,7 @@ import { validateAdapter } from "./adapter-validation.ts";
 import type { PreflightAdapter } from "./preflight-manager.ts";
 import type { ProviderAdapter, StatusAdapter, TunerAdapter } from "./types.ts";
 
-export interface ProviderKitDefinition {
+export interface PiProviderDefinition {
 	providers: ProviderAdapter[];
 	statuses?: StatusAdapter[];
 	preflights?: PreflightAdapter[];
@@ -24,15 +24,15 @@ function rejectDuplicate(ids: Set<string>, id: string, label: string): void {
  * Dynamic Hosts use the same adapter validators while resolving conflicts, but
  * keep invalid entries isolated instead of failing the whole registry.
  */
-export function validateProviderKitDefinition(value: unknown): asserts value is ProviderKitDefinition {
+export function validatePiProviderDefinition(value: unknown): asserts value is PiProviderDefinition {
 	if (value === null || typeof value !== "object" || Array.isArray(value)) {
-		throw new Error("Provider kit definition must be an object");
+		throw new Error("Pi Provider definition must be an object");
 	}
-	const definition = value as Partial<ProviderKitDefinition>;
-	assertArray(definition.providers, "Provider kit definition providers");
-	if (definition.statuses !== undefined) assertArray(definition.statuses, "Provider kit definition statuses");
-	if (definition.preflights !== undefined) assertArray(definition.preflights, "Provider kit definition preflights");
-	if (definition.tuners !== undefined) assertArray(definition.tuners, "Provider kit definition tuners");
+	const definition = value as Partial<PiProviderDefinition>;
+	assertArray(definition.providers, "Pi Provider definition providers");
+	if (definition.statuses !== undefined) assertArray(definition.statuses, "Pi Provider definition statuses");
+	if (definition.preflights !== undefined) assertArray(definition.preflights, "Pi Provider definition preflights");
+	if (definition.tuners !== undefined) assertArray(definition.tuners, "Pi Provider definition tuners");
 
 	const providerIds = new Set<string>();
 	for (const adapter of definition.providers) {

package/core/extension.ts

@@ -1,5 +1,5 @@
-export type { ProviderKitDefinition } from "./definition.ts";
-export { validateProviderKitDefinition } from "./definition.ts";
+export type { PiProviderDefinition } from "./definition.ts";
+export { validatePiProviderDefinition } from "./definition.ts";
 export {
 	normalizeProviderModel,
 	normalizeProviderModels,
@@ -7,14 +7,14 @@ export {
 	registerProviderAdapter,
 } from "./provider-registration.ts";
 export {
-	createProviderKitRuntime,
-	installProviderKitRuntime,
-	type ProviderKitRuntimeController,
+	createPiProviderRuntime,
+	installPiProviderRuntime,
+	type PiProviderRuntimeController,
 } from "./runtime.ts";
-export type { ProviderKitDependencies, ProviderKitLoader } from "./runtime-config.ts";
+export type { PiProviderDependencies, PiProviderLoader } from "./runtime-config.ts";
 export {
-	getDefaultProviderKitDependencies,
-	resolveProviderKitDependencies,
-	validateProviderKitDependencies,
+	getDefaultPiProviderDependencies,
+	resolvePiProviderDependencies,
+	validatePiProviderDependencies,
 } from "./runtime-config.ts";
 export { getStatusModeCompletions } from "./status-report.ts";

package/core/host.ts

@@ -3,26 +3,26 @@ import {
 	type AdapterRegistrationEnvelope,
 	isAdapterRegistrationEnvelope,
 	isHostClaimRequest,
-	PROVIDER_KIT_ADAPTER_EVENT,
-	PROVIDER_KIT_HOST_CLAIM_EVENT,
-	PROVIDER_KIT_STARTUP_BRIDGE_EVENT,
+	PI_PROVIDER_ADAPTER_EVENT,
+	PI_PROVIDER_HOST_CLAIM_EVENT,
+	PI_PROVIDER_STARTUP_BRIDGE_EVENT,
 	type StartupBridge,
 	type StartupBridgeRequest,
 } from "./adapter-protocol.ts";
 import { validateAdapter, validateAdapterIdentity, validateProviderAdapter } from "./adapter-validation.ts";
-import { type ProviderKitDefinition, validateProviderKitDefinition } from "./definition.ts";
+import { type PiProviderDefinition, validatePiProviderDefinition } from "./definition.ts";
 import {
 	getStatusModeCompletions,
-	installProviderKitRuntime,
-	type ProviderKitRuntimeController,
+	installPiProviderRuntime,
+	type PiProviderRuntimeController,
 	prepareProviderRegistration,
 } from "./extension.ts";
 import { fetchOfficialPricing, type OfficialModelMeta, OPENROUTER_MODELS_URL } from "./official-pricing.ts";
 import type { PreflightAdapter } from "./preflight-manager.ts";
 import { refreshProviderRegistrations } from "./provider-registration.ts";
 import { scheduleModelCatalogRefresh } from "./runtime.ts";
-import type { ProviderKitDependencies } from "./runtime-config.ts";
-import { resolveProviderKitDependencies } from "./runtime-config.ts";
+import type { PiProviderDependencies } from "./runtime-config.ts";
+import { resolvePiProviderDependencies } from "./runtime-config.ts";
 import type { ProviderAdapter, ProviderModelDraft, StatusAdapter, TunerAdapter } from "./types.ts";
 
 function compareAdapterIds(left: { id: string }, right: { id: string }): number {
@@ -34,43 +34,43 @@ function adapterKindLabel(kind: AdapterRegistrationEnvelope["kind"]): string {
 }
 
 function warnAdapterIssue(message: string): void {
-	console.warn(`[provider-kit] ${message}`);
+	console.warn(`[pi-provider] ${message}`);
 }
 
 /**
- * Create the single Provider Kit Host used by the published Pi entrypoint.
+ * Create the single Pi Provider Host used by the published Pi entrypoint.
  *
  * The Host deliberately does not assemble adapters during extension factory
  * loading. Adapter factories can run before or after this factory, so the
  * event-bus envelopes are collected and assembled at the first session-level
  * operation after Pi's session_start registration barrier.
  */
-export function createProviderKitHost(dependencies: Partial<ProviderKitDependencies> = {}): (pi: ExtensionAPI) => void {
-	const runtime = resolveProviderKitDependencies(dependencies);
+export function createPiProviderHost(dependencies: Partial<PiProviderDependencies> = {}): (pi: ExtensionAPI) => void {
+	const runtime = resolvePiProviderDependencies(dependencies);
 	return (pi) => {
 		const hostToken = {};
 		const hostClaim = { token: hostToken, occupied: false };
-		const unsubscribeHostClaim = pi.events.on(PROVIDER_KIT_HOST_CLAIM_EVENT, (value) => {
+		const unsubscribeHostClaim = pi.events.on(PI_PROVIDER_HOST_CLAIM_EVENT, (value) => {
 			if (!isHostClaimRequest(value) || value.token === hostToken) return;
 			value.occupied = true;
 		});
-		pi.events.emit(PROVIDER_KIT_HOST_CLAIM_EVENT, hostClaim);
+		pi.events.emit(PI_PROVIDER_HOST_CLAIM_EVENT, hostClaim);
 		if (hostClaim.occupied) {
 			unsubscribeHostClaim();
-			warnAdapterIssue("ignored a second Provider Kit Host; only one Host is supported per Pi runtime");
+			warnAdapterIssue("ignored a second Pi Provider Host; only one Host is supported per Pi runtime");
 			return;
 		}
 
 		const registrations = new Map<object, AdapterRegistrationEnvelope>();
-		let active: ProviderKitRuntimeController | undefined;
-		let readyPromise: Promise<ProviderKitRuntimeController | undefined> | undefined;
+		let active: PiProviderRuntimeController | undefined;
+		let readyPromise: Promise<PiProviderRuntimeController | undefined> | undefined;
 		let disposed = false;
 		let lifecycleGeneration = 0;
 		let latestBackgroundPricing: Record<string, OfficialModelMeta> | undefined;
 		let installedDefinition:
 			| {
 					generation: number;
-					definition: ProviderKitDefinition;
+					definition: PiProviderDefinition;
 					providerDrafts: Map<ProviderAdapter, ProviderModelDraft[]>;
 			  }
 			| undefined;
@@ -97,7 +97,7 @@ export function createProviderKitHost(dependencies: Partial<ProviderKitDependenc
 			readyPromise = undefined;
 		};
 
-		const unsubscribeBridge = pi.events.on(PROVIDER_KIT_STARTUP_BRIDGE_EVENT, (value) => {
+		const unsubscribeBridge = pi.events.on(PI_PROVIDER_STARTUP_BRIDGE_EVENT, (value) => {
 			if (value === null || typeof value !== "object") return;
 			const request = value as StartupBridgeRequest;
 			request.bridge ??= bridge;
@@ -136,7 +136,7 @@ export function createProviderKitHost(dependencies: Partial<ProviderKitDependenc
 			if (previous === undefined) invalidateRuntime();
 		};
 
-		const unsubscribeRegistrations = pi.events.on(PROVIDER_KIT_ADAPTER_EVENT, receiveRegistration);
+		const unsubscribeRegistrations = pi.events.on(PI_PROVIDER_ADAPTER_EVENT, receiveRegistration);
 
 		const groupedWithoutConflicts = <T>(items: T[], key: (item: T) => string, label: string): T[] => {
 			const groups = new Map<string, T[]>();
@@ -148,10 +148,11 @@ export function createProviderKitHost(dependencies: Partial<ProviderKitDependenc
 			const result: T[] = [];
 			for (const [id, group] of groups) {
 				if (group.length > 1) {
-					warnAdapterIssue(`excluded ${group.length} colliding ${label} entries for ${JSON.stringify(id)}`);
-					continue;
+					warnAdapterIssue(
+						`resolved ${group.length} colliding ${label} entries for ${JSON.stringify(id)} to the latest registration`,
+					);
 				}
-				result.push(group[0]!);
+				result.push(group[group.length - 1]!);
 			}
 			return result;
 		};
@@ -173,7 +174,7 @@ export function createProviderKitHost(dependencies: Partial<ProviderKitDependenc
 		const buildDefinition = async (
 			ctx?: ExtensionContext,
 		): Promise<{
-			definition: ProviderKitDefinition;
+			definition: PiProviderDefinition;
 			providerDrafts: Map<ProviderAdapter, ProviderModelDraft[]>;
 			pricing: Record<string, OfficialModelMeta>;
 		}> => {
@@ -358,15 +359,15 @@ export function createProviderKitHost(dependencies: Partial<ProviderKitDependenc
 				preflights: preflightBindings,
 				tuners: tuners.sort(compareAdapterIds),
 			};
-			validateProviderKitDefinition(definition);
+			validatePiProviderDefinition(definition);
 			return { definition, providerDrafts, pricing };
 		};
 
-		const ensureReady = (ctx?: ExtensionContext): Promise<ProviderKitRuntimeController | undefined> => {
+		const ensureReady = (ctx?: ExtensionContext): Promise<PiProviderRuntimeController | undefined> => {
 			if (active) return Promise.resolve(active);
 			if (readyPromise) return readyPromise;
 			const generation = lifecycleGeneration;
-			const pending = (async (): Promise<ProviderKitRuntimeController | undefined> => {
+			const pending = (async (): Promise<PiProviderRuntimeController | undefined> => {
 				if (disposed || generation !== lifecycleGeneration) return undefined;
 				const { definition, providerDrafts, pricing } = await buildDefinition(ctx);
 				if (disposed || generation !== lifecycleGeneration) return undefined;
@@ -382,7 +383,7 @@ export function createProviderKitHost(dependencies: Partial<ProviderKitDependenc
 					for (const providerId of providerIds) pi.unregisterProvider(providerId);
 				}
 				if (disposed || generation !== lifecycleGeneration) return undefined;
-				const controller = installProviderKitRuntime(pi, runtime, definition, pricing, {
+				const controller = installPiProviderRuntime(pi, runtime, definition, pricing, {
 					registerHandlers: false,
 					providerDrafts,
 				});
@@ -442,7 +443,7 @@ export function createProviderKitHost(dependencies: Partial<ProviderKitDependenc
 }
 
 function fetchOfficialPricingForHost(
-	runtime: ProviderKitDependencies,
+	runtime: PiProviderDependencies,
 	onBackgroundRefresh?: (snapshot: Record<string, OfficialModelMeta>) => void,
 ) {
 	return fetchOfficialPricing(