@oh-my-pi/pi-catalog 18.1.14 → 18.1.15

package/dist/types/compat/types.d.ts

@@ -180,6 +180,8 @@ export interface CompiledRule {
     source: string;
     class?: string;
     providers?: string[];
+    /** Request adapter identifiers matched by an `on-api` selector. */
+    apis?: string[];
     family?: string;
     revision?: CompiledRevisionTerm[];
     models?: CompiledSelector[];
@@ -549,6 +551,8 @@ export interface ModelIdentity {
 export interface ResolveTarget {
     /** Deployment provider hosting the model. */
     provider: string;
+    /** Request adapter used to serialize the model. */
+    api: string;
     /** Centrally classified vendor lineage. */
     class: string;
     /** Classified product family within the class, when known. */

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@oh-my-pi/pi-catalog",
-	"version": "18.1.14",
+	"version": "18.1.15",
 	"description": "Model catalog for omp: bundled model database, provider discovery descriptors, model identity, classification, and equivalence",
 	"homepage": "https://omp.sh",
 	"author": "Stencil Labs, Inc.",
@@ -35,12 +35,12 @@
 		"gen:proto": "bun scripts/generate-protocols.ts"
 	},
 	"dependencies": {
-		"@oh-my-pi/omptype": "18.1.14",
-		"@oh-my-pi/pi-utils": "18.1.14"
+		"@oh-my-pi/omptype": "18.1.15",
+		"@oh-my-pi/pi-utils": "18.1.15"
 	},
 	"devDependencies": {
 		"@bgotink/kdl": "0.4.0",
-		"@oh-my-pi/pi-ai": "18.1.14",
+		"@oh-my-pi/pi-ai": "18.1.15",
 		"@types/bun": "^1.3.14"
 	},
 	"engines": {

package/src/compat/cascade.ts

@@ -3,7 +3,7 @@
  * for one structured model target from the compiled rule tree.
  *
  * Faithful port of the o2 reference resolver (`cascade.rs`): rules are
- * conjunctions over `(class, provider, family, revision, models)`; per axis
+ * conjunctions over `(class, provider, api, family, revision, models)`; per axis
  * the matching rule with the greatest `(model-selector exactness,
  * constrained-dimension count, priority)` tuple wins, and an equal-tuple
  * same-axis contest throws {@link AmbiguousOverlapError}. Declaration and
@@ -74,6 +74,7 @@ function buildRuleIndex(cascade: CompiledCascade): IndexedRule[] {
 		const dimensions =
 			Number(compiled.class !== undefined) +
 			Number(compiled.providers !== undefined) +
+			Number(compiled.apis !== undefined) +
 			Number(compiled.family !== undefined) +
 			Number(compiled.revision !== undefined) +
 			Number(compiled.models !== undefined);
@@ -117,6 +118,7 @@ function rankRule(
 	const { compiled } = rule;
 	if (compiled.class !== undefined && compiled.class !== target.class) return undefined;
 	if (compiled.providers !== undefined && !compiled.providers.includes(target.provider)) return undefined;
+	if (compiled.apis !== undefined && !compiled.apis.includes(target.api)) return undefined;
 	if (compiled.family !== undefined && compiled.family !== target.family) return undefined;
 	if (rule.revision !== undefined && (!revision || !revisionSatisfies(revision, rule.revision))) return undefined;
 	let exactness = 0;

package/src/compat/delegation.ts

@@ -27,6 +27,7 @@ export function resolveDelegationBias(model: Model): DelegationBias {
 	const { identity } = model;
 	const bias = resolveCascade({
 		provider: model.provider,
+		api: model.api,
 		class: identity.class,
 		model: model.id,
 		reasoning: Boolean(model.reasoning),

package/src/compat/resolve.ts

@@ -1173,6 +1173,7 @@ function fillExplicitThinking<TApi extends Api>(
 function buildResolveTarget<TApi extends Api>(spec: ModelSpec<TApi>, identity: ModelIdentity): ResolveTarget {
 	const target: ResolveTarget = {
 		provider: spec.provider,
+		api: spec.api,
 		class: identity.class,
 		model: spec.id,
 		reasoning: Boolean(spec.reasoning),

package/src/compat/rules/README.md

@@ -5,7 +5,7 @@ This tree is the checked-in source of model identity and compatibility policy. A
 There are three ownership strata:
 
 - `taxonomy/*.kdl` defines identity: class membership, product families, revision extraction, reviewed exact corrections, and suffix collapse.
-- `classes/*.kdl` defines model-lineage truths: behavior inherent to a model line, optionally scoped to the providers where the census established it.
+- `classes/*.kdl` defines model-lineage truths: behavior inherent to a model line, optionally scoped to the providers or request adapters where the census established it.
 - `providers/*.kdl` defines deployment contracts: behavior imposed by a host, plus documented per-model residue that taxonomy cannot express exactly.
 - `runtime/behavior.kdl` defines heuristics used before or outside exact model lookup: responses routing, API routes, quota tiers, plan requirements, model limits, roster exclusions, hosted defaults, pricing peers.
 - `auth/<provider>.kdl` defines the provider's auth contract: display name, env-var fallback, credential storage/format, and the declarative login / refresh flow that `@oh-my-pi/pi-ai`'s registry engines interpret (see [Auth grammar](#auth-grammar)).
@@ -151,10 +151,15 @@ discovery {
 
 ## Cascade grammar
 
-A cascade document starts with `class` or `provider`. Every selector adds a conjunct to the current rule. Axis directives may appear directly in any permitted scope, and nested selector blocks may appear alongside them.
+A cascade document starts with `class` or `provider`. Every selector adds a conjunct to the current rule. `on` scopes by deployment provider; `on-api` scopes by request adapter, including custom provider names. Axis directives may appear directly in any permitted scope, and nested selector blocks may appear alongside them.
 
 ```kdl
 class "gemini" {
+    on-api "google-generative-ai" {
+        revision ">=3" {
+            requires-skip-thought-signature #true
+        }
+    }
     on "google" "google-vertex" "openrouter" {
         family "flash" {
             revision ">=2.5 <3.8" {
@@ -175,14 +180,15 @@ provider "openrouter" {
 
 | Selector | Form | Matching semantics |
 | --- | --- | --- |
-| `class` | `class "id" { ... }` | Exact class ID. At document root it may contain `on`, `family`, `revision`, and `models`. Under `provider` it may contain `family`, `revision`, and `models`. |
+| `class` | `class "id" { ... }` | Exact class ID. At document root it may contain `on`, `on-api`, `family`, `revision`, and `models`. Under `provider` it may contain `family`, `revision`, and `models`. |
 | `provider` | `provider "id" { ... }` | Exact provider ID. It is root-only and may contain `class` and `models`. |
 | `on` | `on "provider-a" "provider-b" { ... }` | One or more provider IDs, combined as OR. It is allowed only under a root `class`, and may contain `family`, `revision`, and `models`. |
+| `on-api` | `on-api "adapter-a" "adapter-b" { ... }` | One or more request adapter IDs, combined as OR. It is allowed only under a root `class`, and may contain `family`, `revision`, and `models`. |
 | `family` | `family "id" { ... }` | Exact classified family ID. It may contain `revision` and `models`. A target with no family does not match. |
 | `revision` | `revision ">=2.5 <4" { ... }` | A non-empty, whitespace-separated conjunction of comparisons. It may contain `models`. A target with no revision does not match. |
 | `models` | `models "id" "vendor/*" { ... }` | One or more alternatives, combined as OR. It cannot contain another selector. `token="name"` matches an ASCII-case-insensitive token bounded by non-alphanumerics. |
 
-Class, provider/`on`, and family selector values are compared exactly and case-sensitively to the structured resolve target. Revision operators are `>=`, `>`, `<=`, `<`, and `=`; operands have one to three dot-separated unsigned 8-bit components, omitted components zero.
+Class, provider/`on`, `on-api`, and family selector values are compared exactly and case-sensitively to the structured resolve target. Revision operators are `>=`, `>`, `<=`, `<`, and `=`; operands have one to three dot-separated unsigned 8-bit components, omitted components zero.
 
 A `models` string without `*` is an exact, case-sensitive match against the provider-relative model identifier. A string containing `*` is an anchored, ASCII-case-insensitive wildcard match. Prefer taxonomy ranks; retain exact/glob lists only when they isolate the census member set exactly, and keep a `// residue:` comment explaining why ranks do not.
 
@@ -212,7 +218,7 @@ Rules resolve independently per axis. A matching rule is ranked by:
 The tuple is compared lexicographically, greatest first:
 
 - model exactness is `2` when any matching `models` selector is exact, `1` when the best matching selector is a glob or token, and `0` when the rule has no `models` selector;
-- dimension count is the number of present dimensions among class, provider/`on`, family, revision, and models;
+- dimension count is the number of present dimensions among class, provider/`on`, API/`on-api`, family, revision, and models;
 - priority is the local block's `priority`, defaulting to `0`.
 
 The highest-ranked matching assignment wins for that axis. Two distinct rules that tie on all three components and assign the same axis are an ambiguity error even if their values are equal. File and declaration order never resolve the tie; add an explicit priority only after confirming the overlap is intentional.

package/src/compat/rules/classes/gemini.kdl

@@ -88,9 +88,11 @@ class "gemini" {
 		// Replaces the Gemini 3+ mandatory-reasoning fallback.
 		thinking-requires-effort #true
 	}
-	// Public Gemini requires the bypass sentinel on every unsigned call. The
-	// Cloud Code Assist first-call variant is a host contract in providers/.
-	on "google" "opencode-zen" {
+	// Public Gemini requires the bypass sentinel on every unsigned call and
+	// supports function-part ids. Scope by adapter so custom providers using
+	// the same wire protocol inherit both contracts. The Cloud Code Assist
+	// first-call variant is a host contract in providers/.
+	on-api "google-generative-ai" {
 		revision ">=3" {
 			requires-skip-thought-signature #true
 			supports-function-part-id #true

package/src/compat/rules.json

@@ -4822,11 +4822,10 @@
 				}
 			},
 			{
-				"source": "classes/gemini.kdl:94",
+				"source": "classes/gemini.kdl:96",
 				"class": "gemini",
-				"providers": [
-					"google",
-					"opencode-zen"
+				"apis": [
+					"google-generative-ai"
 				],
 				"revision": [
 					{
@@ -4840,7 +4839,7 @@
 				}
 			},
 			{
-				"source": "classes/gemini.kdl:100",
+				"source": "classes/gemini.kdl:102",
 				"class": "gemini",
 				"providers": [
 					"google-antigravity",

package/src/compat/types.ts

@@ -198,6 +198,8 @@ export interface CompiledRule {
 	source: string;
 	class?: string;
 	providers?: string[];
+	/** Request adapter identifiers matched by an `on-api` selector. */
+	apis?: string[];
 	family?: string;
 	revision?: CompiledRevisionTerm[];
 	models?: CompiledSelector[];
@@ -568,6 +570,8 @@ export interface ModelIdentity {
 export interface ResolveTarget {
 	/** Deployment provider hosting the model. */
 	provider: string;
+	/** Request adapter used to serialize the model. */
+	api: string;
 	/** Centrally classified vendor lineage. */
 	class: string;
 	/** Classified product family within the class, when known. */