@oh-my-pi/pi-catalog 18.2.5 → 18.2.7

package/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 ## [Unreleased]
 
+## [18.2.7] - 2026-09-21
+
+### Added
+
+- Added model-kind and grounded-search capability metadata, along with catalogs for local inference and search-engine models.
+- Added OpenRouter image-model discovery and live TypeSafe judge-model discovery.
+- Added the `buildDiscoveredModel` helper for defining custom providers.
+- Added glob-based patterns for identity overrides.
+
+### Changed
+
+- Updated input cost for TypeSafe models to 0.042
+- Improved model routing and thinking-policy handling for llama.cpp Qwen models, Bonsai lineage aliases, and custom provider names.
+
 ## [18.2.5] - 2026-09-17
 
 ### Added

package/THIRD-PARTY-NOTICES.txt

@@ -335,43 +335,6 @@ This license allows the work and adaptations of it to be shared and used
 commercially, as long as it is attributed to Poppy Works. The font is bundled
 here (crates/pi-natives/src/fonts/Silver.ttf) as a CJK/Unicode bitmap fallback.
 
--------------------------------------------------------------------------------
-packages/utils/src/vendor/mermaid-ascii/NOTICE
-
-This directory contains an in-house Mermaid-diagram-to-ASCII renderer adapted
-from beautiful-mermaid (https://github.com/lukilabs/beautiful-mermaid), used
-under the MIT License.
-
-  Copyright (c) 2026 Craft Docs
-
-Only the ASCII rendering pipeline is ported (flowchart/state, sequence, class,
-ER, and xychart diagrams); the SVG renderer and its `elkjs` graph-layout
-dependency, the browser entry point, and the SVG theme/style modules were
-dropped. Terminal display width is reimplemented on `Bun.stringWidth`, and
-inline label formatting (HTML tags, markdown emphasis) is reduced to plain text
-for ASCII output. Layout and edge-routing logic is preserved faithfully so
-ASCII output matches the upstream package.
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
 -------------------------------------------------------------------------------
 packages/coding-agent/src/markit/NOTICE
 

package/dist/types/build.d.ts

@@ -6,7 +6,7 @@
  * Request handlers read fields — they never detect, parse ids, or allocate
  * compat per request.
  */
-import type { Api, Model, ModelSpec } from "./types.js";
+import { type Api, type Model, type ModelSpec } from "./types.js";
 /**
  * Applies reviewed catalog-data value corrections (`cost-patch`,
  * `limits-patch`, `long-context-cost`, `context-window-floor`,
@@ -16,6 +16,12 @@ import type { Api, Model, ModelSpec } from "./types.js";
  * limits and pricing still win.
  */
 export declare function applyCatalogCorrections(model: Pick<ModelSpec<Api>, "cost" | "contextWindow" | "maxTokens" | "input">, catalog: Record<string, unknown>): void;
+/**
+ * Build a discovered model using the backend's catalog-selected request API.
+ * The credential-bearing provider id remains unchanged while `providerType`
+ * persists the backend policy identity across cache and config round trips.
+ */
+export declare function buildDiscoveredModel(spec: ModelSpec<Api>, providerType: string): Model<Api>;
 /**
  * Build one model from an authored spec. Bundled models.json rows are fully
  * materialized by the generator and consumed directly (see `models.ts`), so

package/dist/types/compat/auth-ids.d.ts

@@ -1,4 +1,4 @@
 /** Every provider with an `auth/<id>.kdl` policy. */
-export type AuthProviderId = "abliteration" | "aiand" | "aimlapi" | "alibaba-coding-plan" | "alibaba-token-plan" | "amazon-bedrock" | "anthropic" | "azure" | "baseten" | "bedrock-mantle" | "cerebras" | "charm-hyper" | "cline-pass" | "cloudflare-ai-gateway" | "commandcode" | "coreweave" | "cursor" | "deepinfra" | "deepseek" | "devin" | "exa" | "firepass" | "fireworks" | "github-copilot" | "gitlab-duo" | "gitlab-duo-agent" | "gmi-cloud" | "google" | "google-antigravity" | "google-gemini-cli" | "google-vertex" | "groq" | "huggingface" | "kagi" | "kilo" | "kimi-code" | "litellm" | "llama.cpp" | "lm-studio" | "meta" | "minimax" | "minimax-code" | "minimax-code-cn" | "mistral" | "moonshot" | "muse-code" | "nanogpt" | "novita" | "nvidia" | "ollama" | "ollama-cloud" | "openai" | "openai-codex" | "openai-codex-device" | "opencode-go" | "opencode-zen" | "openrouter" | "parallel" | "perplexity" | "qianfan" | "qwen-portal" | "sakana" | "siliconflow" | "siliconflow-cn" | "stencil" | "synthetic" | "tavily" | "together" | "typesafe" | "umans" | "venice" | "vercel-ai-gateway" | "vllm" | "wafer-serverless" | "xai" | "xai-oauth" | "xiaomi" | "xiaomi-token-plan-ams" | "xiaomi-token-plan-cn" | "xiaomi-token-plan-sgp" | "yolo-auto" | "zai" | "zai-coding-plan" | "zenmux" | "zhipu-coding-plan";
+export type AuthProviderId = "abliteration" | "aiand" | "aimlapi" | "alibaba-coding-plan" | "alibaba-token-plan" | "amazon-bedrock" | "anthropic" | "azure" | "baseten" | "bedrock-mantle" | "cerebras" | "charm-hyper" | "cline-pass" | "cloudflare-ai-gateway" | "commandcode" | "coreweave" | "cursor" | "deepinfra" | "deepseek" | "devin" | "exa" | "firepass" | "fireworks" | "github-copilot" | "gitlab-duo" | "gitlab-duo-agent" | "gmi-cloud" | "google" | "google-antigravity" | "google-gemini-cli" | "google-vertex" | "groq" | "huggingface" | "kagi" | "kilo" | "kimi-code" | "litellm" | "llama.cpp" | "lm-studio" | "local" | "meta" | "minimax" | "minimax-code" | "minimax-code-cn" | "mistral" | "moonshot" | "muse-code" | "nanogpt" | "novita" | "nvidia" | "ollama" | "ollama-cloud" | "openai" | "openai-codex" | "openai-codex-device" | "opencode-go" | "opencode-zen" | "openrouter" | "parallel" | "perplexity" | "qianfan" | "qwen-portal" | "sakana" | "siliconflow" | "siliconflow-cn" | "stencil" | "synthetic" | "tavily" | "together" | "typesafe" | "umans" | "venice" | "vercel-ai-gateway" | "vllm" | "wafer-serverless" | "web" | "xai" | "xai-oauth" | "xiaomi" | "xiaomi-token-plan-ams" | "xiaomi-token-plan-cn" | "xiaomi-token-plan-sgp" | "yolo-auto" | "zai" | "zai-coding-plan" | "zenmux" | "zhipu-coding-plan";
 /** Providers whose policy declares a `login` flow (the `/login` roster). */
 export type LoginProviderId = "abliteration" | "aiand" | "alibaba-coding-plan" | "alibaba-token-plan" | "anthropic" | "baseten" | "cerebras" | "charm-hyper" | "cline-pass" | "cloudflare-ai-gateway" | "commandcode" | "coreweave" | "cursor" | "deepinfra" | "deepseek" | "devin" | "exa" | "firepass" | "fireworks" | "github-copilot" | "gitlab-duo" | "gitlab-duo-agent" | "gmi-cloud" | "google-antigravity" | "google-gemini-cli" | "huggingface" | "kagi" | "kilo" | "kimi-code" | "litellm" | "llama.cpp" | "lm-studio" | "meta" | "minimax-code" | "minimax-code-cn" | "moonshot" | "muse-code" | "nanogpt" | "novita" | "nvidia" | "ollama" | "ollama-cloud" | "openai-codex" | "openai-codex-device" | "opencode-go" | "opencode-zen" | "openrouter" | "parallel" | "perplexity" | "qianfan" | "qwen-portal" | "sakana" | "siliconflow" | "siliconflow-cn" | "stencil" | "synthetic" | "tavily" | "together" | "typesafe" | "umans" | "venice" | "vercel-ai-gateway" | "vllm" | "wafer-serverless" | "xai" | "xai-oauth" | "xiaomi" | "xiaomi-token-plan-ams" | "xiaomi-token-plan-cn" | "xiaomi-token-plan-sgp" | "yolo-auto" | "zai" | "zai-coding-plan" | "zenmux" | "zhipu-coding-plan";

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

@@ -10,7 +10,7 @@
  * one of the axis's declared records.
  */
 import type { Effort } from "../effort.js";
-import type { ThinkingControlMode } from "../types.js";
+import { type ThinkingControlMode } from "../types.js";
 /** Value shape a directive accepts (see `rules/README.md`). */
 export type AxisShape = "scalar" | "array" | "object";
 /** Axis namespace: request-wire compat, thinking control surface, or catalog metadata. */

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

@@ -15,8 +15,9 @@ export declare class AmbiguousOverlapError extends Error {
 export declare function globMatch(pattern: string, value: string): boolean;
 /**
  * Resolve wire, thinking, and catalog assignments for one structured target.
- * Exact model effort corrections can enable reasoning; absent family/revision
- * facts never satisfy selectors that require them. Returned axes are caller-owned.
+ * Exact model effort corrections and identity-scoped neutral-upgrade policies
+ * can enable reasoning; absent family/revision facts never satisfy selectors
+ * that require them. Returned axes are caller-owned.
  *
  * @throws AmbiguousOverlapError when equal-rank rules contest one axis.
  */

package/dist/types/compat/provider-ids.d.ts

@@ -1,2 +1,2 @@
 /** Every chat-model provider with a catalog entry (`default-model` in its provider rules). */
-export type KnownProvider = "abliteration" | "aiand" | "aimlapi" | "alibaba-coding-plan" | "alibaba-token-plan" | "amazon-bedrock" | "anthropic" | "azure" | "baseten" | "bedrock-mantle" | "cerebras" | "charm-hyper" | "cline-pass" | "cloudflare-ai-gateway" | "commandcode" | "coreweave" | "cursor" | "deepinfra" | "deepseek" | "devin" | "firepass" | "fireworks" | "github-copilot" | "gitlab-duo" | "gitlab-duo-agent" | "gmi-cloud" | "google" | "google-antigravity" | "google-gemini-cli" | "google-vertex" | "groq" | "huggingface" | "kilo" | "kimi-code" | "litellm" | "lm-studio" | "meta" | "minimax" | "minimax-code" | "minimax-code-cn" | "mistral" | "moonshot" | "muse-code" | "nanogpt" | "novita" | "nvidia" | "ollama" | "ollama-cloud" | "openai" | "openai-codex" | "opencode-go" | "opencode-zen" | "openrouter" | "qianfan" | "qwen-portal" | "sakana" | "siliconflow" | "siliconflow-cn" | "synthetic" | "together" | "umans" | "venice" | "vercel-ai-gateway" | "vllm" | "wafer-serverless" | "xai" | "xai-oauth" | "xiaomi" | "xiaomi-token-plan-ams" | "xiaomi-token-plan-cn" | "xiaomi-token-plan-sgp" | "yolo-auto" | "zai" | "zenmux" | "zhipu-coding-plan";
+export type KnownProvider = "abliteration" | "aiand" | "aimlapi" | "alibaba-coding-plan" | "alibaba-token-plan" | "amazon-bedrock" | "anthropic" | "azure" | "baseten" | "bedrock-mantle" | "cerebras" | "charm-hyper" | "cline-pass" | "cloudflare-ai-gateway" | "commandcode" | "coreweave" | "cursor" | "deepinfra" | "deepseek" | "devin" | "firepass" | "fireworks" | "github-copilot" | "gitlab-duo" | "gitlab-duo-agent" | "gmi-cloud" | "google" | "google-antigravity" | "google-gemini-cli" | "google-vertex" | "groq" | "huggingface" | "kilo" | "kimi-code" | "litellm" | "lm-studio" | "local" | "meta" | "minimax" | "minimax-code" | "minimax-code-cn" | "mistral" | "moonshot" | "muse-code" | "nanogpt" | "novita" | "nvidia" | "ollama" | "ollama-cloud" | "openai" | "openai-codex" | "opencode-go" | "opencode-zen" | "openrouter" | "qianfan" | "qwen-portal" | "sakana" | "siliconflow" | "siliconflow-cn" | "synthetic" | "together" | "typesafe" | "umans" | "venice" | "vercel-ai-gateway" | "vllm" | "wafer-serverless" | "web" | "xai" | "xai-oauth" | "xiaomi" | "xiaomi-token-plan-ams" | "xiaomi-token-plan-cn" | "xiaomi-token-plan-sgp" | "yolo-auto" | "zai" | "zenmux" | "zhipu-coding-plan";

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

@@ -8,6 +8,8 @@ export interface ResolvedModelPolicy<TApi extends Api = Api> {
     /** Catalog-data axis assignments (longContext, priority, …) for generation. */
     catalog: Record<string, unknown>;
 }
+/** Resolve the request adapter assigned to a discovery backend before materialization. */
+export declare function resolveDiscoveryApi(spec: ModelSpec<Api>, providerType: string): Api;
 /**
  * Resolves the full policy surface for one model spec: structured identity,
  * complete compat record, thinking metadata, and catalog-data corrections.

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

@@ -10,12 +10,12 @@
  */
 import type { Effort } from "../effort.js";
 import type { ModelIdentity } from "./types.js";
-/** Two classes (or two families) tie for one model id. */
+/** Two classes, families, or reviewed override patterns tie for one model id. */
 export declare class AmbiguousIdentityError extends Error {
     readonly model: string;
     readonly first: string;
     readonly second: string;
-    constructor(model: string, first: string, second: string, kind: "class" | "family");
+    constructor(model: string, first: string, second: string, kind: "class" | "family" | "override");
 }
 /** Options for {@link classifyModel}. */
 export interface ClassifyOptions {

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

@@ -5,7 +5,7 @@
  * `behavior.ts`, `resolve.ts`) exposes to consumers.
  */
 import type { Effort } from "../effort.js";
-import type { KnownApi, ThinkingControlMode, TokenCost } from "../types.js";
+import type { Api, ThinkingControlMode, TokenCost } from "../types.js";
 import type { RevisionOp } from "./revision.js";
 /** Class-membership matcher kinds, most to least specific. */
 export type MatcherKind = "exact" | "bounded" | "namespace" | "prefix" | "glob";
@@ -27,11 +27,9 @@ export interface CompiledRevisionPrefix {
     prefix: string;
     anywhere?: boolean;
 }
-/** One compiled reviewed identity correction. */
-export interface CompiledIdentityOverride {
+interface CompiledIdentityOverrideFields {
     id: string;
     provider?: string;
-    model: string;
     logical?: string;
     class?: string;
     family?: string;
@@ -43,6 +41,16 @@ export interface CompiledIdentityOverride {
     provenance: string;
     expiresAtMs?: number;
 }
+/** One compiled reviewed identity correction with exactly one bare-model selector. */
+export type CompiledIdentityOverride = CompiledIdentityOverrideFields & ({
+    /** Exact bare-model selector. */
+    model: string;
+    glob?: never;
+} | {
+    model?: never;
+    /** Anchored, case-insensitive bare-model glob. */
+    glob: string;
+});
 /** One compiled model class: matchers, families, revision rules, overrides. */
 export interface CompiledClass {
     id: string;
@@ -567,7 +575,7 @@ export interface CompiledProviderDiscovery {
 export interface CompiledSeedModel {
     id: string;
     name: string;
-    api: KnownApi;
+    api: Api;
     provider: string;
     baseUrl: string;
     reasoning: boolean;
@@ -592,8 +600,8 @@ export interface CompiledSeed {
     models: CompiledSeedModel[];
 }
 /**
- * One chat-model provider's catalog entry: the non-code half of what the
- * runtime and generator know about a provider. A `providers/<id>.kdl` file
+ * One model provider's catalog entry: the non-code half of what the runtime
+ * and generator know about a provider. A `providers/<id>.kdl` file
  * declares one by carrying `default-model`; files without it are wire-compat
  * only (custom provider ids such as `llama.cpp`).
  */
@@ -611,6 +619,8 @@ export interface CompiledProvider {
     skipCrossProviderReferenceFills?: boolean;
     /** Present only for providers enrolled in `generate-models.ts` discovery. */
     discovery?: CompiledProviderDiscovery;
+    /** Non-chat model kinds mapped to their runtime transport APIs. */
+    kindApis?: Partial<Record<"image" | "tts" | "stt", Api>>;
     /** Authored bundled rows, when the provider cannot be discovered at generation time. */
     seed?: CompiledSeed;
 }
@@ -673,3 +683,4 @@ export interface ResolvedAxes {
      */
     reasoning: boolean;
 }
+export {};

package/dist/types/discovery/index.d.ts

@@ -5,3 +5,4 @@ export * from "./gemini-cli.js";
 export * from "./gitlab-duo-workflow.js";
 export * from "./openai-compatible.js";
 export * from "./protobuf.js";
+export * from "./typesafe.js";

package/dist/types/discovery/openai-compatible.d.ts

@@ -59,6 +59,8 @@ export interface FetchOpenAICompatibleModelsOptions<TApi extends Api> {
     apiKey?: string;
     /** Additional request headers. */
     headers?: Record<string, string>;
+    /** Query parameters appended to the `/models` probe (e.g. OpenRouter's `output_modalities` roster filter). */
+    query?: Record<string, string>;
     /** Optional AbortSignal for request cancellation; caller owns its lifecycle. */
     signal?: AbortSignal;
     /**

package/dist/types/discovery/typesafe.d.ts

@@ -0,0 +1,26 @@
+import type { FetchImpl, ModelSpec } from "../types.js";
+/** Public TypeSafe API root shared by discovery and judgment requests. */
+export declare const TYPESAFE_DEFAULT_BASE_URL = "https://api.typesafe.ai";
+/** Wire card returned by TypeSafe's authenticated `GET /v1/models`. */
+export interface TypeSafeModelCard {
+    name: string;
+    description: string;
+    release_date: string;
+}
+/** Credentials and transport overrides for TypeSafe account model discovery. */
+export interface FetchTypeSafeModelsOptions {
+    apiKey: string;
+    baseUrl?: string;
+    fetch?: FetchImpl;
+    signal?: AbortSignal;
+}
+/** Validate and de-duplicate the official `{ models: [...] }` response. */
+export declare function parseTypeSafeModelCards(payload: unknown): TypeSafeModelCard[] | null;
+/**
+ * Fetch TypeSafe's account-visible judge models.
+ *
+ * Returns `null` for transport, HTTP, or envelope failures. A valid empty
+ * roster returns `[]`, allowing the model manager to distinguish it from an
+ * unavailable discovery endpoint.
+ */
+export declare function fetchTypeSafeModels(options: FetchTypeSafeModelsOptions): Promise<ModelSpec<"typesafe">[] | null>;

package/dist/types/model-manager.d.ts

@@ -1,4 +1,4 @@
-import type { Api, Model, ModelSpec, Provider } from "./types.js";
+import { type Api, type Model, type ModelSpec, type Provider } from "./types.js";
 /**
  * Controls when dynamic endpoint models should be fetched.
  */

package/dist/types/provider-models/openai-compat.d.ts

@@ -1,11 +1,12 @@
 import type { ModelManagerOptions, ModelsDevFallback } from "../model-manager.js";
 import { getBundledModels } from "../models.js";
-import type { Api, FetchImpl, ModelSpec, Provider } from "../types.js";
+import { type Api, type FetchImpl, type ModelSpec, type Provider } from "../types.js";
 import { ALIBABA_TOKEN_PLAN_BASE_URL } from "../wire/alibaba-token-plan.js";
 import type { ModelManagerConfig } from "./descriptor-types.js";
 export interface ModelsDevModel {
     id?: string;
     name?: string;
+    kind?: string;
     tool_call?: boolean;
     reasoning?: boolean;
     reasoning_options?: Array<{
@@ -26,6 +27,7 @@ export interface ModelsDevModel {
     };
     modalities?: {
         input?: string[];
+        output?: string[];
     };
     status?: string;
     provider?: {
@@ -167,8 +169,8 @@ export declare function applyXaiResponsesThinkingPolicy(model: ModelSpec<"openai
  * Render the xai-oauth KDL seed as the static runtime fallback consumed by
  * {@link xaiOAuthModelManagerOptions}.
  */
-export declare function buildXaiOAuthStaticSeed(baseUrl?: string): ModelSpec<"openai-responses">[];
-export declare function xaiOAuthModelManagerOptions(config?: XaiOAuthModelManagerConfig): ModelManagerOptions<"openai-responses">;
+export declare function buildXaiOAuthStaticSeed(baseUrl?: string): ModelSpec<Api>[];
+export declare function xaiOAuthModelManagerOptions(config?: XaiOAuthModelManagerConfig): ModelManagerOptions<Api>;
 export declare function isLikelyAimlApiChatModelId(id: string): boolean;
 export interface AimlApiModelManagerConfig {
     apiKey?: string;
@@ -322,7 +324,7 @@ export interface OpenRouterModelManagerConfig {
     baseUrl?: string;
     fetch?: FetchImpl;
 }
-export declare function openrouterModelManagerOptions(config?: OpenRouterModelManagerConfig): ModelManagerOptions<"openrouter">;
+export declare function openrouterModelManagerOptions(config?: OpenRouterModelManagerConfig): ModelManagerOptions<Api>;
 export interface ZenMuxModelManagerConfig {
     apiKey?: string;
     baseUrl?: string;

package/dist/types/provider-models/special.d.ts

@@ -55,6 +55,16 @@ export interface DevinModelManagerConfig {
     fetch?: DevinModelDiscoveryOptions["fetch"];
 }
 export declare function devinModelManagerOptions(config?: DevinModelManagerConfig): ModelManagerOptions<"devin-agent">;
+export declare function localModelManagerOptions(): ModelManagerOptions<"local-inference">;
+export declare function webModelManagerOptions(): ModelManagerOptions<"web-search">;
+/** Credentials and endpoint overrides for the TypeSafe catalog manager. */
+export interface TypeSafeModelManagerConfig {
+    apiKey?: string;
+    baseUrl?: string;
+    fetch?: FetchImpl;
+}
+/** Discover account-visible judge models while keeping the bundled offline seed. */
+export declare function typesafeModelManagerOptions(config?: TypeSafeModelManagerConfig): ModelManagerOptions<"typesafe">;
 export interface ZaiModelManagerConfig {
 }
 /** Creates model-manager options for Z.AI's mixed native and Anthropic transports. */

package/dist/types/types.d.ts

@@ -4,6 +4,16 @@ export type { FetchImpl } from "@oh-my-pi/pi-utils";
 export type { KnownProvider } from "./provider-models/descriptors.js";
 export type KnownApi = "openai-completions" | "openai-responses" | "openrouter" | "openai-codex-responses" | "azure-openai-responses" | "anthropic-messages" | "bedrock-converse-stream" | "google-generative-ai" | "google-gemini-cli" | "google-vertex" | "ollama-chat" | "cursor-agent" | "gitlab-duo-agent" | "devin-agent";
 export type Api = KnownApi | (string & {});
+/** Catalog kinds used to isolate role-specific runners from session chat models. */
+export declare const MODEL_KINDS: readonly ["chat", "tiny", "image", "tts", "stt", "search", "judge"];
+/** Technical capability of a catalog model; absent model kinds mean chat. */
+export type ModelKind = (typeof MODEL_KINDS)[number];
+/** Grounding transport available to chat models selected by the web role. */
+export type WebSearchGrounding = "gemini" | "anthropic" | "codex" | "xai" | "openrouter";
+/** Non-chat runner protocols accepted by catalog seeds, outside the chat dispatch union. */
+export declare const RUNNER_APIS: readonly ["local-inference", "web-search", "typesafe", "openrouter-decisions", "openai-images", "openrouter-images", "xai-tts", "openai-speech"];
+/** Resolve a model's kind while preserving chat semantics for existing catalog rows. */
+export declare function modelKind(model: Pick<Model, "kind">): ModelKind;
 /** Canonical thinking transport used by a model. */
 export type ThinkingControlMode = "effort" | "budget" | "google-level" | "anthropic-adaptive" | "anthropic-budget-effort";
 /** Per-model thinking capabilities used to clamp and map user-facing effort levels. */
@@ -942,6 +952,10 @@ export interface ModelCost extends TokenCost {
 export type ModelTokenizer = "claude-v3" | "claude-v47" | "claude-v5" | "claude-v5-sonnet" | "qwen3" | "deepseek-v3" | "kimi-k2" | "glm5";
 export interface Model<TApi extends Api = Api> {
     id: string;
+    /** Role-specific runner capability; omitted for ordinary chat models. */
+    kind?: ModelKind;
+    /** Grounding transport supported by this chat model. */
+    webSearch?: WebSearchGrounding;
     /**
      * Structured model identity resolved by the compat engine: vendor lineage
      * class, product family, and revision. Baked into models.json rows and
@@ -984,6 +998,12 @@ export interface Model<TApi extends Api = Api> {
     name: string;
     api: TApi;
     provider: Provider;
+    /**
+     * Discovery backend whose catalog policy applies when it differs from the
+     * credential-bearing provider id. Persisted so cached and rebuilt custom
+     * providers retain their transport backend's policy.
+     */
+    providerType?: string;
     baseUrl: string;
     reasoning: boolean;
     /**

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@oh-my-pi/pi-catalog",
-	"version": "18.2.5",
+	"version": "18.2.7",
 	"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.2.5",
-		"@oh-my-pi/pi-utils": "18.2.5"
+		"@oh-my-pi/omptype": "18.2.7",
+		"@oh-my-pi/pi-utils": "18.2.7"
 	},
 	"devDependencies": {
 		"@bgotink/kdl": "0.4.0",
-		"@oh-my-pi/pi-ai": "18.2.5",
+		"@oh-my-pi/pi-ai": "18.2.7",
 		"@types/bun": "^1.3.14"
 	},
 	"engines": {

package/src/build.ts

@@ -7,11 +7,11 @@
  * compat per request.
  */
 
-import { resolveModelPolicy } from "./compat/resolve";
+import { resolveDiscoveryApi, resolveModelPolicy } from "./compat/resolve";
 import type { ModelIdentity } from "./compat/types";
 import { resolveModelTokenizer } from "./model-tokenizer";
 import { materializeTimeBasedCost } from "./pricing";
-import type { Api, Model, ModelSpec } from "./types";
+import { type Api, MODEL_KINDS, type Model, type ModelSpec } from "./types";
 import { cleanModelName } from "./utils";
 
 function numberField(source: object, key: string): number | undefined {
@@ -74,6 +74,18 @@ function isInputModalities(value: unknown): value is ("text" | "image")[] {
  * only when the spec left it unset.
  */
 function applyCatalogAssignments<TApi extends Api>(model: Model<TApi>, catalog: Record<string, unknown>): void {
+	const kind = MODEL_KINDS.find(value => value === catalog.kind);
+	if (kind !== undefined) model.kind = kind;
+	const webSearch = catalog.webSearch;
+	if (
+		webSearch === "gemini" ||
+		webSearch === "anthropic" ||
+		webSearch === "codex" ||
+		webSearch === "xai" ||
+		webSearch === "openrouter"
+	) {
+		model.webSearch = webSearch;
+	}
 	const serviceTierCost = objectPayload(catalog.serviceTierCost);
 	if (serviceTierCost !== undefined) {
 		const flex = numberField(serviceTierCost, "flex");
@@ -273,6 +285,16 @@ function supportsOpenAIGAComputerUse(
 	return wireIdentity.class === "openai" && revisionAtLeast(wireIdentity, 5, 4);
 }
 
+/**
+ * Build a discovered model using the backend's catalog-selected request API.
+ * The credential-bearing provider id remains unchanged while `providerType`
+ * persists the backend policy identity across cache and config round trips.
+ */
+export function buildDiscoveredModel(spec: ModelSpec<Api>, providerType: string): Model<Api> {
+	const api = resolveDiscoveryApi(spec, providerType);
+	return buildModel({ ...spec, api, providerType });
+}
+
 /**
  * Build one model from an authored spec. Bundled models.json rows are fully
  * materialized by the generator and consumed directly (see `models.ts`), so
@@ -283,9 +305,9 @@ export function buildModel<TApi extends Api>(spec: ModelSpec<TApi>): Model<TApi>
 	const supportsComputerUseConfig = explicitComputerUseConfig(spec);
 	const model: Model<TApi> = {
 		...spec,
-		// An exact `thinking-efforts` rule upgrades a stale `reasoning: false`
-		// discovery default (see `resolveThinkingPolicy`); materialize the
-		// correction so transports and the picker see a reasoning-capable model.
+		// A reviewed `thinking-upgrade-neutral` policy can repair a stale
+		// `reasoning: false` discovery default (see `resolveThinkingPolicy`);
+		// materialize the correction for transports and the picker.
 		reasoning: spec.reasoning || policy.thinking !== undefined,
 		name: cleanModelName(spec.name),
 		identity: policy.identity,

package/src/compat/auth-ids.ts

@@ -41,6 +41,7 @@ export type AuthProviderId =
 	| "litellm"
 	| "llama.cpp"
 	| "lm-studio"
+	| "local"
 	| "meta"
 	| "minimax"
 	| "minimax-code"
@@ -76,6 +77,7 @@ export type AuthProviderId =
 	| "vercel-ai-gateway"
 	| "vllm"
 	| "wafer-serverless"
+	| "web"
 	| "xai"
 	| "xai-oauth"
 	| "xiaomi"

package/src/compat/axes.ts

@@ -10,7 +10,7 @@
  * one of the axis's declared records.
  */
 import type { Effort } from "../effort";
-import type { ThinkingControlMode } from "../types";
+import { MODEL_KINDS, type ThinkingControlMode } from "../types";
 
 /** Value shape a directive accepts (see `rules/README.md`). */
 export type AxisShape = "scalar" | "array" | "object";
@@ -290,9 +290,17 @@ export const AXES: Readonly<Record<string, AxisDef>> = {
 	"cost-patch": { key: "costPatch", set: "catalog", shape: "object" },
 	"cost-fallback": { key: "costFallback", set: "catalog", shape: "object" },
 	"delegation-bias": { key: "delegationBias", set: "catalog", shape: "scalar", values: DELEGATION_BIASES },
+	"discovery-api": { key: "discoveryApi", set: "catalog", shape: "scalar" },
 	"edit-prompt-variant": { key: "editPromptVariant", set: "catalog", shape: "scalar", values: ["full", "compact"] },
 	"edit-revision": { key: "editRevision", set: "catalog", shape: "scalar" },
 	"input-modalities": { key: "inputModalities", set: "catalog", shape: "array", values: ["text", "image"] },
+	kind: { key: "kind", set: "catalog", shape: "scalar", values: MODEL_KINDS },
+	"web-search": {
+		key: "webSearch",
+		set: "catalog",
+		shape: "scalar",
+		values: ["gemini", "anthropic", "codex", "xai", "openrouter"],
+	},
 	"limits-patch": { key: "limitsPatch", set: "catalog", shape: "object" },
 	"long-context-cost": { key: "longContext", set: "catalog", shape: "object" },
 	"long-usage-limit-fallback": { key: "longUsageLimitFallback", set: "catalog", shape: "scalar" },

package/src/compat/cascade.ts

@@ -239,6 +239,30 @@ function rankCompare(a: readonly [number, number, number], b: readonly [number,
 	return a[0] - b[0] || a[1] - b[1] || a[2] - b[2];
 }
 
+function contestAxis(
+	winners: WinnerTable,
+	axis: string,
+	rank: readonly [number, number, number],
+	rule: IndexedRule,
+	target: ResolveTarget,
+): void {
+	const held = winners[axis];
+	if (held) {
+		const order = rankCompare(held.rank, rank);
+		if (order === 0) {
+			throw new AmbiguousOverlapError(
+				target.provider,
+				target.model,
+				axis,
+				held.rule.compiled.source,
+				rule.compiled.source,
+			);
+		}
+		if (order > 0) return;
+	}
+	winners[axis] = { rank, rule };
+}
+
 function contest(
 	winners: WinnerTable,
 	axes: Record<string, unknown> | undefined,
@@ -247,23 +271,7 @@ function contest(
 	target: ResolveTarget,
 ): void {
 	if (!axes) return;
-	for (const axis in axes) {
-		const held = winners[axis];
-		if (held) {
-			const order = rankCompare(held.rank, rank);
-			if (order === 0) {
-				throw new AmbiguousOverlapError(
-					target.provider,
-					target.model,
-					axis,
-					held.rule.compiled.source,
-					rule.compiled.source,
-				);
-			}
-			if (order > 0) continue;
-		}
-		winners[axis] = { rank, rule };
-	}
+	for (const axis in axes) contestAxis(winners, axis, rank, rule, target);
 }
 
 function collect(winners: WinnerTable, pick: (rule: CompiledRule) => Record<string, unknown> | undefined) {
@@ -314,8 +322,9 @@ function cloneAxes(axes: ResolvedAxes): ResolvedAxes {
 
 /**
  * Resolve wire, thinking, and catalog assignments for one structured target.
- * Exact model effort corrections can enable reasoning; absent family/revision
- * facts never satisfy selectors that require them. Returned axes are caller-owned.
+ * Exact model effort corrections and identity-scoped neutral-upgrade policies
+ * can enable reasoning; absent family/revision facts never satisfy selectors
+ * that require them. Returned axes are caller-owned.
  *
  * @throws AmbiguousOverlapError when equal-rank rules contest one axis.
  */
@@ -368,11 +377,24 @@ function resolveOverIndex(index: RuleIndex, target: ResolveTarget): ResolvedAxes
 	const ranked = rankRelevantRules(index, prepareTarget(target));
 	let reasoning = target.reasoning === true;
 	if (!reasoning) {
+		const upgrade: WinnerTable = {};
+		let hasEfforts = false;
 		for (const { rule, rank } of ranked) {
-			if (rule.hasExactEffortsRule && rank[0] === 2) {
-				reasoning = true;
-				break;
-			}
+			const thinking = rule.compiled.thinking;
+			if (thinking === undefined) continue;
+			if ("upgradeNeutral" in thinking) contestAxis(upgrade, "upgradeNeutral", rank, rule, target);
+			if ("efforts" in thinking) hasEfforts = true;
+			if (rule.hasExactEffortsRule && rank[0] === 2) reasoning = true;
+		}
+		const upgradeRule = upgrade.upgradeNeutral?.rule.compiled;
+		const identityScoped =
+			upgradeRule !== undefined &&
+			((upgradeRule.class !== undefined && upgradeRule.class !== "unknown") ||
+				upgradeRule.family !== undefined ||
+				upgradeRule.revision !== undefined ||
+				upgradeRule.models !== undefined);
+		if (identityScoped && upgradeRule?.thinking?.upgradeNeutral === true && hasEfforts) {
+			reasoning = true;
 		}
 	}
 	const wire: WinnerTable = {};

package/src/compat/provider-ids.ts

@@ -38,6 +38,7 @@ export type KnownProvider =
 	| "kimi-code"
 	| "litellm"
 	| "lm-studio"
+	| "local"
 	| "meta"
 	| "minimax"
 	| "minimax-code"
@@ -62,11 +63,13 @@ export type KnownProvider =
 	| "siliconflow-cn"
 	| "synthetic"
 	| "together"
+	| "typesafe"
 	| "umans"
 	| "venice"
 	| "vercel-ai-gateway"
 	| "vllm"
 	| "wafer-serverless"
+	| "web"
 	| "xai"
 	| "xai-oauth"
 	| "xiaomi"