Never stop coding. Free MIT AI gateway: one endpoint, 375 providers (150+ free), 1,400+ models Kimi, Claude, GPT, Gemini, GLM, DeepSeek, MiniMax. Works with Claude Code, Codex, Cursor, OpenCode, Cline & Copilot. Quota-aware auto-fallback, RTK+Caveman compression saves 15-95% tokens, MCP/A2A, Desktop/PWA. Built by 900+ contributors
TypeScript a2aai-agentsai-gatewayanthropicclaudeclaude-codeclinecodexcopilotcursordeepseekfree-aigeminikimillm-gatewaymcpopenaiopenai-proxyqwentoken-saver
feat(plugin+api): auto combos + free model quota display + /api/combos/auto (#3435)
M.M003e6a80b760
diff --git a/@omniroute/opencode-plugin/src/index.ts b/@omniroute/opencode-plugin/src/index.tsindex 68b9a648f7..4074ebdace 100644--- a/@omniroute/opencode-plugin/src/index.ts+++ b/@omniroute/opencode-plugin/src/index.ts@@ -56,6 +56,23 @@ import { randomUUID } from "node:crypto";import type { AuthHook, Config, Plugin, PluginOptions, ProviderHook } from "@opencode-ai/plugin";import type { Model as ModelV2 } from "@opencode-ai/sdk/v2";import { z } from "zod";+import {+ logger as _logger,+ setLogLevel,+ type LogLevel as _LogLevel,+} from "./logger.js";+import {+ PROVIDER_TAG_SEPARATOR as _PROVIDER_TAG_SEPARATOR,+ shortProviderLabel as _shortProviderLabel,+ normaliseFreeLabel as _normaliseFreeLabel,+ formatAutoComboName,+ autoComboModelId,+ formatFreeBudget,+ type AutoVariant,+ AUTO_VARIANTS,+ AUTO_VARIANT_DESCRIPTIONS,+ type FreeModelFreeType,+} from "./naming.js";/*** Zod schema for plugin options accepted as the second element of the@@ -146,6 +163,7 @@ const apiFormatSchema = zconst featuresSchema = z.object({combos: z.boolean().optional(),+ autoCombos: z.boolean().optional(),enrichment: z.boolean().optional(),compressionMetadata: z.boolean().optional(),geminiSanitization: z.boolean().optional(),@@ -185,6 +203,16 @@ export type OmniRoutePluginOptions = z.infer<typeof optionsSchema>;export const OMNIROUTE_PROVIDER_KEY = "omniroute" as const;+/** Deployed plugin version (injected at build time by tsup define). */+export const PLUGIN_VERSION: string =+ ((globalThis as Record<string, unknown>).__PLUGIN_VERSION__ as string) ??+ "dev";++/** Deployed plugin git commit hash (injected at build time by tsup define). */+export const PLUGIN_GIT_HASH: string =+ ((globalThis as Record<string, unknown>).__PLUGIN_GIT_HASH__ as string) ??+ "unknown";+export const DEFAULT_MODEL_CACHE_TTL_MS = 300_000 as const;// Manual trim helpers avoid polynomial-regex CodeQL warnings on@@ -195,6 +223,60 @@ function trimTrailingSlashes(value: string): string {while (i > 0 && value.charCodeAt(i - 1) === 0x2f /* "/" */) i--;return i === value.length ? value : value.slice(0, i);}++/**+ * Ensure a baseURL ends with `/v1` so the OpenAI-compat SDK constructs+ * `/v1/chat/completions` instead of `/chat/completions`.+ * No-op when the URL already ends with `/v1` or `/v1/`.+ */+export function ensureV1Suffix(url: string): string {+ const trimmed = trimTrailingSlashes(url);+ return trimmed.endsWith("/v1") ? trimmed : `${trimmed}/v1`;+}++/**+ * Default provider prefixes that should use the Anthropic-native SDK.+ * Covers all OmniRoute aliases that route to Anthropic upstream.+ */+export const DEFAULT_ANTHROPIC_PREFIXES = [+ "cc",+ "claude",+ "anthropic",+ "kiro",+ "kr",+];++/**+ * Resolve the `api` block for a ModelV2 entry given a model id and the+ * active `apiFormat` feature config.+ *+ * - Models whose prefix (before the first `/`) is in `anthropicPrefixes` →+ * `{ id: "anthropic", url: baseURL/v1, npm: "@ai-sdk/anthropic" }`+ *+ * - All others →+ * `{ id: "openai-compatible", url: baseURL/v1, npm: "@ai-sdk/openai-compatible" }`+ */+export function resolveApiBlock(+ modelId: string,+ baseURL: string,+ apiFormat?: { anthropicPrefixes?: string[] },+): { id: string; url: string; npm: string } {+ const prefixes = apiFormat?.anthropicPrefixes ?? DEFAULT_ANTHROPIC_PREFIXES;+ const slash = modelId.indexOf("/");+ const prefix = slash === -1 ? modelId : modelId.slice(0, slash);+ const isAnthropic = prefixes.includes(prefix);+ return isAnthropic+ ? {+ id: "anthropic",+ url: ensureV1Suffix(baseURL),+ npm: "@ai-sdk/anthropic",+ }+ : {+ id: "openai-compatible",+ url: ensureV1Suffix(baseURL),+ npm: "@ai-sdk/openai-compatible",+ };+}function trimTrailingDashes(value: string): string {let i = value.length;while (i > 0 && value.charCodeAt(i - 1) === 0x2d /* "-" */) i--;@@ -212,13 +294,17 @@ function trimLeadingDashes(value: string): string {* sees a consistent identifier.*/export function resolveOmniRoutePluginOptions(- opts?: OmniRoutePluginOptions-): Required<Pick<OmniRoutePluginOptions, "providerId" | "displayName" | "modelCacheTtl">> &+ opts?: OmniRoutePluginOptions,+): Required<+ Pick<OmniRoutePluginOptions, "providerId" | "displayName" | "modelCacheTtl">+> &Pick<OmniRoutePluginOptions, "baseURL" | "features"> {const providerId = opts?.providerId ?? OMNIROUTE_PROVIDER_KEY;const displayName =opts?.displayName ??- (providerId === OMNIROUTE_PROVIDER_KEY ? "OmniRoute" : `OmniRoute (${providerId})`);+ (providerId === OMNIROUTE_PROVIDER_KEY+ ? "OmniRoute"+ : `OmniRoute (${providerId})`);const modelCacheTtl =typeof opts?.modelCacheTtl === "number" && opts.modelCacheTtl > 0? opts.modelCacheTtl@@ -249,7 +335,9 @@ export function resolveOmniRoutePluginOptions(* Exported so callers and tests can validate options independent of the* full plugin factory invocation.*/-export function parseOmniRoutePluginOptions(opts: unknown): OmniRoutePluginOptions {+export function parseOmniRoutePluginOptions(+ opts: unknown,+): OmniRoutePluginOptions {if (opts === null || opts === undefined) return {};const result = optionsSchema.safeParse(opts);if (!result.success) {@@ -391,8 +479,11 @@ export function normaliseFreeLabel(name: string): string {* keys by returning `{}` — OC then surfaces the `/connect` flow to the* user instead of dispatching a request with bogus credentials.*/-export function createOmniRouteAuthHook(opts?: OmniRoutePluginOptions): AuthHook {- const { providerId, displayName, baseURL, features } = resolveOmniRoutePluginOptions(opts);+export function createOmniRouteAuthHook(+ opts?: OmniRoutePluginOptions,+): AuthHook {+ const { providerId, displayName, baseURL, features } =+ resolveOmniRoutePluginOptions(opts);// Both fetch-layer features default ON (parity with the rest of the plugin's// `features.X !== false` convention). Honoring them here lets users disable// the interceptor/sanitizer from opencode.json — previously these flags were@@ -434,7 +525,8 @@ export function createOmniRouteAuthHook(opts?: OmniRoutePluginOptions): AuthHook// no `baseURL`. We've already checked the runtime type via typeof so// the unknown-bridge is a safe assertion, not a lie.const authBaseURL = (auth as unknown as { baseURL?: unknown }).baseURL;- const resolvedBaseURL = baseURL ?? (typeof authBaseURL === "string" ? authBaseURL : "");+ const resolvedBaseURL =+ baseURL ?? (typeof authBaseURL === "string" ? authBaseURL : "");// Without a baseURL the interceptor can't tell which requests to// intercept (it would either gate-keep nothing or, worse, all// outbound traffic). Fall back to apiKey-only and let the SDK use@@ -468,8 +560,8 @@ export function createOmniRouteAuthHook(opts?: OmniRoutePluginOptions): AuthHook);}return composedFetch- ? { apiKey, baseURL: resolvedBaseURL, fetch: composedFetch }- : { apiKey, baseURL: resolvedBaseURL };+ ? { apiKey, baseURL: sdkBaseURL, fetch: composedFetch }+ : { apiKey, baseURL: sdkBaseURL };}return {};},@@ -502,8 +594,30 @@ export const OmniRoutePlugin: Plugin = async (_input, options) => {const sharedCache: OmniRouteFetchCache = new Map();// Debug breadcrumb: confirm server() invocation + resolved options.// Useful when diagnosing "is the plugin even running" from OC logs.- console.warn(- `[omniroute-plugin] initialized providerId=${resolved.providerId} displayName="${resolved.displayName}" baseURL=${resolved.baseURL ?? "(from auth.json)"} modelCacheTtl=${resolved.modelCacheTtl}ms`+ const _ver: string =+ ((globalThis as Record<string, unknown>).__PLUGIN_VERSION__ as string) ??+ "dev";+ const _hash: string =+ ((globalThis as Record<string, unknown>).__PLUGIN_GIT_HASH__ as string) ??+ "unknown";+ const _prefixes =+ resolved.features?.apiFormat?.anthropicPrefixes ??+ DEFAULT_ANTHROPIC_PREFIXES;+ _logger.always(+ `v${_ver} (${_hash}) initialized` ++ ` providerId=${resolved.providerId}` ++ ` baseURL=${resolved.baseURL ?? "(from auth.json)"}` ++ ` modelCacheTtl=${resolved.modelCacheTtl}ms` ++ ` apiFormat=anthropic:[${_prefixes.join(",")}]` ++ ` debugLog=${resolved.features?.debugLog ?? false}` ++ ` logLevel=${resolved.features?.startupDebug ? "debug" : (resolved.features?.logLevel ?? "warn")}`,+ );++ // Wire log level: startupDebug:true → "debug", explicit logLevel wins.+ setLogLevel(+ resolved.features?.startupDebug+ ? "debug"+ : (resolved.features?.logLevel ?? "warn"),);return {auth: createOmniRouteAuthHook(resolved),@@ -583,7 +697,7 @@ export interface OmniRouteRawModelEntry {export type OmniRouteModelsFetcher = (baseURL: string,apiKey: string,- timeoutMs?: number+ timeoutMs?: number,) => Promise<OmniRouteRawModelEntry[]>;/**@@ -596,15 +710,23 @@ export type OmniRouteModelsFetcher = (export const defaultOmniRouteModelsFetcher: OmniRouteModelsFetcher = async (baseURL,apiKey,- timeoutMs = 10_000+ timeoutMs = 10_000,) => {- if (!apiKey) throw new Error("@omniroute/opencode-plugin: apiKey required to fetch /v1/models");- if (!baseURL) throw new Error("@omniroute/opencode-plugin: baseURL required to fetch /v1/models");+ if (!apiKey)+ throw new Error(+ "@omniroute/opencode-plugin: apiKey required to fetch /v1/models",+ );+ if (!baseURL)+ throw new Error(+ "@omniroute/opencode-plugin: baseURL required to fetch /v1/models",+ );const trimmed = trimTrailingSlashes(baseURL);// Tolerate both `https://host` and `https://host/v1` forms — the gateway// exposes /v1/models either way; we just don't want a double `/v1/v1`.- const url = /\/v\d+$/.test(trimmed) ? `${trimmed}/models` : `${trimmed}/v1/models`;+ const url = /\/v\d+$/.test(trimmed)+ ? `${trimmed}/models`+ : `${trimmed}/v1/models`;const controller = new AbortController();const timer = setTimeout(() => controller.abort(), timeoutMs);@@ -619,18 +741,24 @@ export const defaultOmniRouteModelsFetcher: OmniRouteModelsFetcher = async (});if (!res.ok) {throw new Error(- `@omniroute/opencode-plugin: GET ${url} failed: ${res.status} ${res.statusText}`+ `@omniroute/opencode-plugin: GET ${url} failed: ${res.status} ${res.statusText}`,);}const body = (await res.json()) as unknown;const rawList: unknown[] = Array.isArray(body)? body- : body && typeof body === "object" && Array.isArray((body as { data?: unknown }).data)+ : body &&+ typeof body === "object" &&+ Array.isArray((body as { data?: unknown }).data)? ((body as { data: unknown[] }).data as unknown[]): [];const out: OmniRouteRawModelEntry[] = [];for (const r of rawList) {- if (r && typeof r === "object" && typeof (r as { id?: unknown }).id === "string") {+ if (+ r &&+ typeof r === "object" &&+ typeof (r as { id?: unknown }).id === "string"+ ) {out.push(r as OmniRouteRawModelEntry);}}@@ -712,7 +840,7 @@ export function mapRawModelToModelV2(* `/api/pricing/models` data via `applyEnrichment` when* `features.enrichment` is true.*/- name: raw.id,+ name: _normaliseFreeLabel(raw.id),capabilities: {temperature: caps.temperature ?? true,reasoning: Boolean(caps.reasoning || caps.thinking),@@ -741,8 +869,11 @@ export function mapRawModelToModelV2(},limit: {context: typeof raw.context_length === "number" ? raw.context_length : 0,- ...(typeof raw.max_input_tokens === "number" ? { input: raw.max_input_tokens } : {}),- output: typeof raw.max_output_tokens === "number" ? raw.max_output_tokens : 0,+ ...(typeof raw.max_input_tokens === "number"+ ? { input: raw.max_input_tokens }+ : {}),+ output:+ typeof raw.max_output_tokens === "number" ? raw.max_output_tokens : 0,},status: "active",options: {},@@ -817,7 +948,7 @@ export interface OmniRouteRawCombo {export type OmniRouteCombosFetcher = (baseURL: string,apiKey: string,- timeoutMs?: number+ timeoutMs?: number,) => Promise<OmniRouteRawCombo[]>;/**@@ -841,11 +972,16 @@ export type OmniRouteCombosFetcher = (export const defaultOmniRouteCombosFetcher: OmniRouteCombosFetcher = async (baseURL,apiKey,- timeoutMs = 10_000+ timeoutMs = 10_000,) => {- if (!apiKey) throw new Error("@omniroute/opencode-plugin: apiKey required to fetch /api/combos");+ if (!apiKey)+ throw new Error(+ "@omniroute/opencode-plugin: apiKey required to fetch /api/combos",+ );if (!baseURL)- throw new Error("@omniroute/opencode-plugin: baseURL required to fetch /api/combos");+ throw new Error(+ "@omniroute/opencode-plugin: baseURL required to fetch /api/combos",+ );// Strip trailing slashes, then strip a trailing `/v1` so we land on the// management plane. Models live under `/v1/models`; combos live under@@ -867,18 +1003,24 @@ export const defaultOmniRouteCombosFetcher: OmniRouteCombosFetcher = async (});if (!res.ok) {throw new Error(- `@omniroute/opencode-plugin: GET ${url} failed: ${res.status} ${res.statusText}`+ `@omniroute/opencode-plugin: GET ${url} failed: ${res.status} ${res.statusText}`,);}const body = (await res.json()) as unknown;const rawList: unknown[] = Array.isArray(body)? body- : body && typeof body === "object" && Array.isArray((body as { combos?: unknown }).combos)+ : body &&+ typeof body === "object" &&+ Array.isArray((body as { combos?: unknown }).combos)? ((body as { combos: unknown[] }).combos as unknown[]): [];const out: OmniRouteRawCombo[] = [];for (const r of rawList) {- if (r && typeof r === "object" && typeof (r as { id?: unknown }).id === "string") {+ if (+ r &&+ typeof r === "object" &&+ typeof (r as { id?: unknown }).id === "string"+ ) {out.push(r as OmniRouteRawCombo);}}@@ -930,14 +1072,19 @@ export function mapComboToModelV2(combo: OmniRouteRawCombo,members: OmniRouteRawModelEntry[],providerId: string,- baseURL: string+ baseURL: string,+ apiFormat?: { anthropicPrefixes?: string[] },): ModelV2 {// `every` over an empty array returns true (would lie about an empty// combo's capabilities) — short-circuit to all-false when no members.const hasMembers = members.length > 0;- const memberInMods = members.map((m) => new Set(m.input_modalities ?? ["text"]));- const memberOutMods = members.map((m) => new Set(m.output_modalities ?? ["text"]));+ const memberInMods = members.map(+ (m) => new Set(m.input_modalities ?? ["text"]),+ );+ const memberOutMods = members.map(+ (m) => new Set(m.output_modalities ?? ["text"]),+ );const modalityAllHave = (sets: Array<Set<string>>, key: string): boolean =>hasMembers && sets.every((s) => s.has(key));@@ -952,18 +1099,26 @@ export function mapComboToModelV2(.map((m) => m.max_input_tokens).filter((v): v is number => typeof v === "number" && v > 0);- const everyDeclaresInput = hasMembers && inputValues.length === members.length;+ const everyDeclaresInput =+ hasMembers && inputValues.length === members.length;const capabilities: ModelV2["capabilities"] = {temperature:- hasMembers && members.every((m) => (m.capabilities?.temperature ?? true) !== false),+ hasMembers &&+ members.every((m) => (m.capabilities?.temperature ?? true) !== false),reasoning:hasMembers &&- members.every((m) => Boolean(m.capabilities?.reasoning || m.capabilities?.thinking)),+ members.every((m) =>+ Boolean(m.capabilities?.reasoning || m.capabilities?.thinking),+ ),attachment:hasMembers &&- members.every((m) => Boolean(m.capabilities?.attachment ?? m.capabilities?.vision ?? false)),- toolcall: hasMembers && members.every((m) => Boolean(m.capabilities?.tool_calling ?? false)),+ members.every((m) =>+ Boolean(m.capabilities?.attachment ?? m.capabilities?.vision ?? false),+ ),+ toolcall:+ hasMembers &&+ members.every((m) => Boolean(m.capabilities?.tool_calling ?? false)),input: {text: modalityAllHave(memberInMods, "text"),audio: modalityAllHave(memberInMods, "audio"),@@ -978,17 +1133,31 @@ export function mapComboToModelV2(video: modalityAllHave(memberOutMods, "video"),pdf: modalityAllHave(memberOutMods, "pdf"),},- interleaved: hasMembers && members.every((m) => Boolean(m.capabilities?.thinking)),+ interleaved:+ hasMembers && members.every((m) => Boolean(m.capabilities?.thinking)),};+ // Combos span multiple providers. Use Anthropic format only when ALL+ // members resolve to Anthropic — otherwise fall back to OpenAI-compat+ // (lowest common denominator that every upstream understands).+ const comboApiBlock = (() => {+ if (!hasMembers) return resolveApiBlock("", baseURL, apiFormat);+ const allAnthropic = members.every(+ (m) => resolveApiBlock(m.id, baseURL, apiFormat).id === "anthropic",+ );+ return allAnthropic+ ? resolveApiBlock(members[0].id, baseURL, apiFormat)+ : {+ id: "openai-compatible",+ url: ensureV1Suffix(baseURL),+ npm: "@ai-sdk/openai-compatible",+ };+ })();+return {id: combo.id,providerID: providerId,- api: {- id: "openai-compatible",- url: baseURL,- npm: "@ai-sdk/openai-compatible",- },+ api: comboApiBlock,name: combo.name && combo.name.trim().length > 0 ? combo.name : combo.id,capabilities,cost: {@@ -1008,6 +1177,142 @@ export function mapComboToModelV2(};}+// ─────────────────────────────────────────────────────────────────────────+// AUTO COMBOS — virtual server-side combos exposed via /api/combos/auto+// ─────────────────────────────────────────────────────────────────────────++/**+ * Raw shape of an auto combo entry as returned by OmniRoute's+ * `/api/combos/auto` endpoint. Auto combos are virtual — they self-manage+ * provider selection via scoring/bandit exploration at runtime.+ */+export interface OmniRouteRawAutoCombo {+ /** Stable id (e.g. "auto", "auto/coding"). */+ id: string;+ /** Human-readable name (e.g. "Auto", "Auto Coding"). */+ name: string;+ /** Variant key or undefined for the default auto. */+ variant?: AutoVariant;+ /** Provider names eligible for this auto combo. */+ candidatePool?: string[];+ /** Number of candidates resolved at fetch time. */+ candidateCount?: number;+ /** Whether this auto combo should be hidden from the picker. */+ isHidden?: boolean;+ /** Auto-combo configuration. */+ config?: {+ auto?: {+ candidatePool?: string[];+ explorationRate?: number;+ routerStrategy?: string;+ };+ };+}++/**+ * Fetcher contract for `/api/combos/auto`. Returns the list of virtual+ * auto combos the server can create. Same DI pattern as other fetchers.+ */+export type OmniRouteAutoCombosFetcher = (+ baseURL: string,+ apiKey: string,+ timeoutMs?: number,+) => Promise<OmniRouteRawAutoCombo[]>;++/**+ * Default auto combos fetcher: `GET <baseURL>/api/combos/auto`.+ *+ * Fault-tolerant: returns empty array on 404 (endpoint doesn't exist yet)+ * or any non-2xx / network error. Logs a warning in those cases.+ */+export const defaultOmniRouteAutoCombosFetcher: OmniRouteAutoCombosFetcher =+ async (baseURL, apiKey, timeoutMs = 5_000) => {+ if (!apiKey || !baseURL) return [];++ const trimmed = trimTrailingSlashes(baseURL);+ const root = trimmed.replace(/\/v\d+$/, "");+ const url = `${root}/api/combos/auto`;++ const controller = new AbortController();+ const timer = setTimeout(() => controller.abort(), timeoutMs);+ try {+ const res = await fetch(url, {+ method: "GET",+ headers: {+ Authorization: `Bearer ${apiKey}`,+ Accept: "application/json",+ },+ signal: controller.signal,+ });+ // 404 = endpoint not deployed yet — expected during rollout+ if (res.status === 404) {+ console.warn(+ `[omniroute-plugin] /api/combos/auto not available (404) — auto combos disabled`,+ );+ return [];+ }+ if (!res.ok) {+ console.warn(+ `[omniroute-plugin] /api/combos/auto failed: ${res.status} ${res.statusText} — auto combos disabled`,+ );+ return [];+ }+ const body = (await res.json()) as unknown;+ const rawList: unknown[] = Array.isArray(body)+ ? body+ : body &&+ typeof body === "object" &&+ Array.isArray((body as { combos?: unknown }).combos)+ ? ((body as { combos: unknown[] }).combos as unknown[])+ : [];+ const out: OmniRouteRawAutoCombo[] = [];+ for (const r of rawList) {+ if (+ r &&+ typeof r === "object" &&+ typeof (r as { id?: unknown }).id === "string"+ ) {+ out.push(r as OmniRouteRawAutoCombo);+ }+ }+ return out;+ } catch (err) {+ // Network error, timeout, abort — all non-fatal+ console.warn(+ `[omniroute-plugin] /api/combos/auto fetch failed: ${err instanceof Error ? err.message : String(err)} — auto combos disabled`,+ );+ return [];+ } finally {+ clearTimeout(timer);+ }+ };++/**+ * Convert a raw auto combo into a static model entry for the OpenCode picker.+ * Auto combos have tool_call=true, reasoning=true by default (they route+ * to capable models). Context/output limits are set to 0 since the actual+ * limits depend on which provider is selected at runtime.+ */+export function mapAutoComboToStaticEntry(+ autoCombo: OmniRouteRawAutoCombo,+): OmniRouteStaticModelEntry {+ const variant = autoCombo.variant;+ const name = formatAutoComboName(variant, autoCombo.candidateCount);+ return {+ name,+ attachment: false,+ reasoning: true,+ temperature: true,+ tool_call: true,+ limit: { context: 0, output: 0 },+ modalities: {+ input: ["text"],+ output: ["text"],+ },+ cost: { input: 0, output: 0, cache_read: 0, cache_write: 0 },+ };+}+// ─────────────────────────────────────────────────────────────────────────// ENRICHMENT — pull display names + pricing from /api/pricing/models so// the UI doesn't have to render raw model ids. Gated by features.enrichment.@@ -1054,6 +1359,12 @@ export interface OmniRouteEnrichmentEntry {* model id sold through different upstream connections.*/providerDisplayName?: string;+ /** Free-model budget type (from freeModelCatalog). */+ freeType?: FreeModelFreeType;+ /** Monthly token budget for recurring free models. */+ monthlyTokens?: number;+ /** Credit token budget for credit-based free models. */+ creditTokens?: number;}/** Map keyed by full model id (possibly namespaced, e.g. `cc/claude-sonnet-4-6`). */@@ -1062,7 +1373,7 @@ export type OmniRouteEnrichmentMap = Map<string, OmniRouteEnrichmentEntry>;export type OmniRouteEnrichmentFetcher = (baseURL: string,apiKey: string,- timeoutMs?: number+ timeoutMs?: number,) => Promise<OmniRouteEnrichmentMap>;/**@@ -1086,138 +1397,321 @@ export type OmniRouteEnrichmentFetcher = (* the two fetches are independent so one missing source still surfaces the* other.*/-export const defaultOmniRouteEnrichmentFetcher: OmniRouteEnrichmentFetcher = async (- baseURL,- apiKey,- timeoutMs = 10_000-) => {- const out: OmniRouteEnrichmentMap = new Map();- if (!baseURL || !apiKey) return out;- const root = baseURL.replace(/\/v1\/?$/, "").replace(/\/$/, "");- const headers = {- Authorization: `Bearer ${apiKey}`,- Accept: "application/json",- };+export const defaultOmniRouteEnrichmentFetcher: OmniRouteEnrichmentFetcher =+ async (baseURL, apiKey, timeoutMs = 10_000) => {+ const out: OmniRouteEnrichmentMap = new Map();+ if (!baseURL || !apiKey) return out;+ const root = baseURL.replace(/\/v1\/?$/, "").replace(/\/$/, "");+ const headers = {+ Authorization: `Bearer ${apiKey}`,+ Accept: "application/json",+ };- // ── 1. Catalog with nice display names ────────────────────────────────- const catalogAc = new AbortController();- const catalogTimer = setTimeout(() => catalogAc.abort(), timeoutMs);- try {- const res = await fetch(`${root}/api/pricing/models`, {- method: "GET",- headers,- signal: catalogAc.signal,- });- if (res.ok) {- const body = (await res.json()) as unknown;- const providers =- (body as { providers?: Record<string, { models?: unknown[] }> })?.providers ??- (body as Record<string, { models?: unknown[] }>);- if (providers && typeof providers === "object") {- for (const [providerAlias, slot] of Object.entries(providers)) {- if (!slot || typeof slot !== "object") continue;- const models = (slot as { models?: unknown[] }).models;- if (!Array.isArray(models)) continue;- // Canonical id sits at the per-provider top level (e.g.- // `pricing-models.cc.id === 'claude'`). Falls back to the alias- // itself when missing — common case alias===canonical.- const canonicalRaw = (slot as { id?: unknown }).id;- const providerCanonical =- typeof canonicalRaw === "string" && canonicalRaw.length > 0- ? canonicalRaw- : providerAlias;- // Upstream provider human label (e.g. `Claude`, `Kiro`,- // `GitHub Models`). Optional — falls back to undefined when- // OmniRoute hasn't curated a label for this slot.- const slotNameRaw = (slot as { name?: unknown }).name;- const providerDisplayName =- typeof slotNameRaw === "string" && slotNameRaw.trim().length > 0- ? slotNameRaw.trim()- : undefined;- for (const m of models) {- if (!m || typeof m !== "object") continue;- const id = (m as { id?: unknown }).id;- if (typeof id !== "string" || id.length === 0) continue;- const name = (m as { name?: unknown }).name;- const entry: OmniRouteEnrichmentEntry = {- providerAlias,- providerCanonical,- };- if (providerDisplayName) entry.providerDisplayName = providerDisplayName;- if (typeof name === "string" && name.trim().length > 0) entry.name = name;- const namespaced = `${providerAlias}/${id}`;- if (!out.has(namespaced)) out.set(namespaced, entry);- if (!out.has(id)) out.set(id, entry);+ // ── 1. Catalog with nice display names ────────────────────────────────+ const catalogAc = new AbortController();+ const catalogTimer = setTimeout(() => catalogAc.abort(), timeoutMs);+ try {+ const res = await fetch(`${root}/api/pricing/models`, {+ method: "GET",+ headers,+ signal: catalogAc.signal,+ });+ if (res.ok) {+ const body = (await res.json()) as unknown;+ const providers =+ (body as { providers?: Record<string, { models?: unknown[] }> })+ ?.providers ?? (body as Record<string, { models?: unknown[] }>);+ if (providers && typeof providers === "object") {+ for (const [providerAlias, slot] of Object.entries(providers)) {+ if (!slot || typeof slot !== "object") continue;+ const models = (slot as { models?: unknown[] }).models;+ if (!Array.isArray(models)) continue;+ // Canonical id sits at the per-provider top level (e.g.+ // `pricing-models.cc.id === 'claude'`). Falls back to the alias+ // itself when missing — common case alias===canonical.+ const canonicalRaw = (slot as { id?: unknown }).id;+ const providerCanonical =+ typeof canonicalRaw === "string" && canonicalRaw.length > 0+ ? canonicalRaw+ : providerAlias;+ // Upstream provider human label (e.g. `Claude`, `Kiro`,+ // `GitHub Models`). Optional — falls back to undefined when+ // OmniRoute hasn't curated a label for this slot.+ const slotNameRaw = (slot as { name?: unknown }).name;+ const providerDisplayName =+ typeof slotNameRaw === "string" && slotNameRaw.trim().length > 0+ ? slotNameRaw.trim()+ : undefined;+ for (const m of models) {+ if (!m || typeof m !== "object") continue;+ const id = (m as { id?: unknown }).id;+ if (typeof id !== "string" || id.length === 0) continue;+ const name = (m as { name?: unknown }).name;+ const entry: OmniRouteEnrichmentEntry = {+ providerAlias,+ providerCanonical,+ };+ if (providerDisplayName)+ entry.providerDisplayName = providerDisplayName;+ if (typeof name === "string" && name.trim().length > 0)+ entry.name = name;+ const namespaced = `${providerAlias}/${id}`;+ if (!out.has(namespaced)) out.set(namespaced, entry);+ if (!out.has(id)) out.set(id, entry);+ }}}}+ } catch {+ // Soft-fail; keep going to pricing fetch.+ } finally {+ clearTimeout(catalogTimer);}- } catch {- // Soft-fail; keep going to pricing fetch.- } finally {- clearTimeout(catalogTimer);- }- // ── 2. Pricing values from /api/pricing ───────────────────────────────- const priceAc = new AbortController();- const priceTimer = setTimeout(() => priceAc.abort(), timeoutMs);- try {- const res = await fetch(`${root}/api/pricing`, {- method: "GET",- headers,- signal: priceAc.signal,- });- if (res.ok) {- const body = (await res.json()) as unknown;- if (body && typeof body === "object" && !Array.isArray(body)) {- for (const [providerAlias, slot] of Object.entries(body as Record<string, unknown>)) {- if (!slot || typeof slot !== "object" || Array.isArray(slot)) continue;- for (const [modelId, raw] of Object.entries(slot as Record<string, unknown>)) {- if (!raw || typeof raw !== "object") continue;- const p = raw as Record<string, unknown>;- const parsed: NonNullable<OmniRouteEnrichmentEntry["pricing"]> = {};- // OmniRoute `/api/pricing` keys:- // input → cost.input- // output → cost.output- // cached → cost.cache.read (alias: cacheRead)- // cache_creation → cost.cache.write (alias: cacheWrite)- // Tolerate alternative spellings for forward-compat.- if (typeof p.input === "number") parsed.input = p.input;- if (typeof p.output === "number") parsed.output = p.output;- const cacheRead =- typeof p.cached === "number"- ? p.cached- : typeof p.cacheRead === "number"- ? p.cacheRead- : undefined;- if (typeof cacheRead === "number") parsed.cacheRead = cacheRead;- const cacheWrite =- typeof p.cache_creation === "number"- ? p.cache_creation- : typeof p.cacheWrite === "number"- ? p.cacheWrite- : undefined;- if (typeof cacheWrite === "number") parsed.cacheWrite = cacheWrite;- if (Object.keys(parsed).length === 0) continue;- const namespaced = `${providerAlias}/${modelId}`;- const existingNs = out.get(namespaced);- if (existingNs) existingNs.pricing = { ...(existingNs.pricing ?? {}), ...parsed };- else out.set(namespaced, { pricing: parsed });- const existingBare = out.get(modelId);- if (existingBare) existingBare.pricing = { ...(existingBare.pricing ?? {}), ...parsed };- else out.set(modelId, { pricing: parsed });+ // ── 2. Pricing values from /api/pricing ───────────────────────────────+ const priceAc = new AbortController();+ const priceTimer = setTimeout(() => priceAc.abort(), timeoutMs);+ try {+ const res = await fetch(`${root}/api/pricing`, {+ method: "GET",+ headers,+ signal: priceAc.signal,+ });+ if (res.ok) {+ const body = (await res.json()) as unknown;+ if (body && typeof body === "object" && !Array.isArray(body)) {+ for (const [providerAlias, slot] of Object.entries(+ body as Record<string, unknown>,+ )) {+ if (!slot || typeof slot !== "object" || Array.isArray(slot))+ continue;+ for (const [modelId, raw] of Object.entries(+ slot as Record<string, unknown>,+ )) {+ if (!raw || typeof raw !== "object") continue;+ const p = raw as Record<string, unknown>;+ const parsed: NonNullable<OmniRouteEnrichmentEntry["pricing"]> =+ {};+ // OmniRoute `/api/pricing` keys:+ // input → cost.input+ // output → cost.output+ // cached → cost.cache.read (alias: cacheRead)+ // cache_creation → cost.cache.write (alias: cacheWrite)+ // Tolerate alternative spellings for forward-compat.+ if (typeof p.input === "number") parsed.input = p.input;+ if (typeof p.output === "number") parsed.output = p.output;+ const cacheRead =+ typeof p.cached === "number"+ ? p.cached+ : typeof p.cacheRead === "number"+ ? p.cacheRead+ : undefined;+ if (typeof cacheRead === "number") parsed.cacheRead = cacheRead;+ const cacheWrite =+ typeof p.cache_creation === "number"+ ? p.cache_creation+ : typeof p.cacheWrite === "number"+ ? p.cacheWrite+ : undefined;+ if (typeof cacheWrite === "number")+ parsed.cacheWrite = cacheWrite;+ if (Object.keys(parsed).length === 0) continue;+ const namespaced = `${providerAlias}/${modelId}`;+ const existingNs = out.get(namespaced);+ if (existingNs)+ existingNs.pricing = {+ ...(existingNs.pricing ?? {}),+ ...parsed,+ };+ else out.set(namespaced, { pricing: parsed });+ const existingBare = out.get(modelId);+ if (existingBare)+ existingBare.pricing = {+ ...(existingBare.pricing ?? {}),+ ...parsed,+ };+ else out.set(modelId, { pricing: parsed });+ }}}}+ } catch {+ // Soft-fail; return whatever names we collected.+ } finally {+ clearTimeout(priceTimer);}- } catch {- // Soft-fail; return whatever names we collected.- } finally {- clearTimeout(priceTimer);++ // ── 3. Free model budgets from /api/free-tier/summary ──────────────────+ // Best-effort fetch: populates freeType/monthlyTokens/creditTokens on+ // enrichment entries that match. 404 = endpoint doesn't exist — skip.+ // Uses the EXISTING /api/free-tier/summary endpoint (no new server code).+ const freeAc = new AbortController();+ const freeTimer = setTimeout(() => freeAc.abort(), timeoutMs);+ try {+ const res = await fetch(`${root}/api/free-tier/summary`, {+ method: "GET",+ headers,+ signal: freeAc.signal,+ });+ if (res.ok) {+ const body = (await res.json()) as unknown;+ // Response shape: { perModel: FreeModelBudget[], ... }+ const perModel: unknown[] =+ body &&+ typeof body === "object" &&+ Array.isArray((body as { perModel?: unknown }).perModel)+ ? ((body as { perModel: unknown[] }).perModel as unknown[])+ : Array.isArray(body)+ ? (body as unknown[])+ : [];+ let matched = 0;+ for (const fm of perModel) {+ if (!fm || typeof fm !== "object") continue;+ const fmObj = fm as Record<string, unknown>;+ const provider =+ typeof fmObj.provider === "string" ? fmObj.provider : "";+ const modelId =+ typeof fmObj.modelId === "string" ? fmObj.modelId : "";+ const freeType =+ typeof fmObj.freeType === "string" ? fmObj.freeType : "";+ if (!modelId || !freeType) continue;+ const monthlyTokens =+ typeof fmObj.monthlyTokens === "number"+ ? fmObj.monthlyTokens+ : undefined;+ const creditTokens =+ typeof fmObj.creditTokens === "number"+ ? fmObj.creditTokens+ : undefined;+ // Match against enrichment entries: namespaced, bare, and displayName+ const displayName =+ typeof fmObj.displayName === "string" ? fmObj.displayName : "";+ const candidates = [+ `${provider}/${modelId}`,+ modelId,+ ...(displayName ? [displayName] : []),+ ];+ for (const key of candidates) {+ const entry = out.get(key);+ if (entry) {+ entry.freeType = freeType as FreeModelFreeType;+ if (monthlyTokens !== undefined)+ entry.monthlyTokens = monthlyTokens;+ if (creditTokens !== undefined) entry.creditTokens = creditTokens;+ matched++;+ break;+ }+ }+ }+ _logger.debug(+ `free-tier/summary: ${perModel.length} models returned, ${matched} matched enrichment entries`,+ );+ }+ } catch {+ // Soft-fail; free metadata is optional.+ } finally {+ clearTimeout(freeTimer);+ }++ return out;+ };++// ── Startup diagnostics writer (file-based) ──────────────────────────────+// OC doesn't capture plugin console.warn in its log file. Write diagnostics+// to a file so they're readable after session starts. Capped at 64KB.+async function writeStartupDiagnostics(params: {+ providerId: string;+ baseURL: string;+ modelCount: number;+ comboCount: number;+ enrichmentSize: number;+ autoComboCount: number;+ enrichment: OmniRouteEnrichmentMap;+ autoCombos: OmniRouteRawAutoCombo[];+}): Promise<void> {+ const {+ providerId,+ baseURL,+ modelCount,+ comboCount,+ enrichmentSize,+ autoComboCount,+ enrichment,+ autoCombos,+ } = params;+ const enriched = [...enrichment.entries()];+ const withName = enriched.filter(([, e]) => e.name);+ const withPricing = enriched.filter(([, e]) => e.pricing);+ const withFree = enriched.filter(([, e]) => e.freeType);++ const lines: string[] = [];+ lines.push(`=== startupDebug ${new Date().toISOString()} ===`);+ lines.push(`providerId=${providerId} baseURL=${baseURL}`);+ lines.push(+ `models=${modelCount} combos=${comboCount} enrichment=${enrichmentSize} autoCombos=${autoComboCount}`,+ );+ lines.push(+ `enrichment: ${withName.length} with name, ${withPricing.length} with pricing, ${withFree.length} free`,+ );+ if (withFree.length > 0) {+ lines.push(`free models (${withFree.length}):`);+ for (const [k, e] of withFree.slice(0, 10)) {+ lines.push(+ ` ${k} → name=${e.name ?? "(none)"}, freeType=${e.freeType}, monthly=${e.monthlyTokens ?? 0}, credits=${e.creditTokens ?? 0}`,+ );+ }+ } else {+ lines.push(+ `NO free models detected. ` ++ (enrichmentSize === 0+ ? "Enrichment map is EMPTY."+ : `Enrichment has ${enrichmentSize} entries but none have freeType.`),+ );+ }+ const sampleNames = enriched+ .filter(([, e]) => e.name)+ .slice(0, 5)+ .map(([k, e]) => ` ${k} → "${e.name}"`);+ if (sampleNames.length > 0) {+ lines.push(`sample enriched names:`);+ lines.push(sampleNames.join("\n"));}+ if (autoCombos.length > 0) {+ lines.push(+ `auto combos: ${autoCombos.length} — ${autoCombos.map((ac) => `${ac.id}(${ac.candidateCount ?? "?"}p)`).join(", ")}`,+ );+ }+ lines.push(`=== end startupDebug ===\n`);- return out;-};+ const diagnostics = lines.join("\n");+ _logger.debug(diagnostics);++ try {+ const diagDir =+ process.env.OPENCODE_DATA_DIR ??+ path.join(os.homedir(), ".local/share/opencode");+ const diagPath = path.join(+ diagDir,+ "plugins",+ "omniroute-startup-diagnostics.log",+ );+ let existing = "";+ try {+ existing = await readFile(diagPath, "utf8");+ } catch {+ /* first write */+ }+ const KEEP = 65_536;+ const combined = existing + diagnostics;+ const trimmed =+ combined.length > KEEP+ ? combined.slice(combined.length - KEEP)+ : combined;+ await writeFile(diagPath, trimmed, "utf8");+ } catch {+ /* best effort */+ }+}/*** Separator used by `applyProviderTag` between the upstream provider@@ -1229,64 +1723,13 @@ export const defaultOmniRouteEnrichmentFetcher: OmniRouteEnrichmentFetcher = asy* group by provider — e.g. `Claude - Claude Opus 4.7`,* `Kiro - Claude Opus 4.7`).*/-export const PROVIDER_TAG_SEPARATOR = " - ";+export const PROVIDER_TAG_SEPARATOR = _PROVIDER_TAG_SEPARATOR;-/**- * Threshold beyond which `providerDisplayName` is abbreviated. Raised- * from 8 → 12 so curated brand casing (`AssemblyAI`, `Antigravity`,- * `Pollinations`, `GEMINI-CLI` curated form) wins over a shouty- * UPPER(alias) fallback for the common case.- */-const PROVIDER_LABEL_MAX_CHARS = 12;--/**- * Aliases longer than this get title-case fallback instead of UPPER —- * keeps short-token UPPER (`cc`→`CC`, `ghm`→`GHM`) but tames long- * lowercase aliases (`antigravity`→`Antigravity`).- */-const ALIAS_UPPER_MAX_CHARS = 5;--/**- * Title-case a long, lowercase-looking alias (e.g. `antigravity` →- * `Antigravity`) so the prefix doesn't shout when neither- * `providerDisplayName` nor a short alias is available.- */-function titleCaseAlias(alias: string): string {- if (alias.length === 0) return alias;- return alias.charAt(0).toUpperCase() + alias.slice(1).toLowerCase();-}--/**- * Pick the short label for an upstream provider that goes into the- * `<label> - <model>` prefix.- *- * Rule (matches user spec — no hardcoded registry, fully data-driven):- *- * 1. Trim `enrichment.providerDisplayName` (= `/api/pricing/models[<alias>].name`).- * 2. If the trimmed label is non-empty AND ≤ {@link PROVIDER_LABEL_MAX_CHARS} (12),- * use it verbatim (e.g. `Claude`, `Kiro`, `AssemblyAI`, `Antigravity`).- * 3. Otherwise look at the alias:- * - if the alias is short (≤ {@link ALIAS_UPPER_MAX_CHARS}) →- * `UPPER(alias)` (e.g. `cc` → `CC`, `ghm` → `GHM`).- * - if the alias is longer → title-case it (`antigravity` →- * `Antigravity`) so the prefix is readable, not shouty.- * 4. If neither field is usable, return `undefined` (caller should- * skip the prefix decoration).- */+// Re-export from naming.ts — thin wrapper preserving OmniRouteEnrichmentEntry signatureexport function shortProviderLabel(- enrichment: OmniRouteEnrichmentEntry | undefined+ enrichment: OmniRouteEnrichmentEntry | undefined,): string | undefined {- if (!enrichment) return undefined;- const raw =- typeof enrichment.providerDisplayName === "string" ? enrichment.providerDisplayName.trim() : "";- if (raw.length > 0 && raw.length <= PROVIDER_LABEL_MAX_CHARS) return raw;- const alias = typeof enrichment.providerAlias === "string" ? enrichment.providerAlias.trim() : "";- if (alias.length > 0) {- return alias.length <= ALIAS_UPPER_MAX_CHARS ? alias.toUpperCase() : titleCaseAlias(alias);- }- // Tolerate "label too long + no alias" by falling back to the long- // label itself — better than dropping the prefix entirely. Rare case.- return raw.length > 0 ? raw : undefined;+ return _shortProviderLabel(enrichment);}/**@@ -1316,13 +1759,19 @@ export function shortProviderLabel(*/export function applyProviderTag(model: ModelV2,- enrichment: OmniRouteEnrichmentEntry | undefined+ enrichment: OmniRouteEnrichmentEntry | undefined,): ModelV2 {const label = shortProviderLabel(enrichment);if (!label) return model;const prefix = `${label}${PROVIDER_TAG_SEPARATOR}`;if (model.name.startsWith(prefix)) return model;- model.name = `${prefix}${model.name}`;+ // When enrichment already prepended [Free], move it before the provider+ // tag: "[Free] GPT-4.1" → "[Free] GHM - GPT-4.1" not "GHM - [Free] GPT-4.1"+ if (model.name.startsWith("[Free] ")) {+ model.name = `[Free] ${prefix}${model.name.slice(7)}`;+ } else {+ model.name = `${prefix}${model.name}`;+ }return model;}@@ -1341,14 +1790,17 @@ export function applyProviderTag(* like `kiro`).*/export function buildCanonicalToAliasMap(- enrichment: OmniRouteEnrichmentMap | undefined+ enrichment: OmniRouteEnrichmentMap | undefined,): Map<string, string> {const out = new Map<string, string>();if (!enrichment) return out;for (const entry of enrichment.values()) {- const alias = typeof entry.providerAlias === "string" ? entry.providerAlias.trim() : "";+ const alias =+ typeof entry.providerAlias === "string" ? entry.providerAlias.trim() : "";const canonical =- typeof entry.providerCanonical === "string" ? entry.providerCanonical.trim() : "";+ typeof entry.providerCanonical === "string"+ ? entry.providerCanonical.trim()+ : "";if (alias.length === 0 || canonical.length === 0) continue;if (alias === canonical) continue;if (!out.has(canonical)) out.set(canonical, alias);@@ -1375,7 +1827,7 @@ export function buildCanonicalToAliasMap(export function lookupEnrichment(rawId: string,enrichment: OmniRouteEnrichmentMap | undefined,- canonicalToAlias: Map<string, string>+ canonicalToAlias: Map<string, string>,): OmniRouteEnrichmentEntry | undefined {if (!enrichment) return undefined;const direct = enrichment.get(rawId);@@ -1410,7 +1862,7 @@ export function lookupEnrichment(*/export function canonicalDedupSet(rawModels: ReadonlyArray<OmniRouteRawModelEntry>,- canonicalToAlias: Map<string, string>+ canonicalToAlias: Map<string, string>,): Set<string> {const drop = new Set<string>();if (canonicalToAlias.size === 0) return drop;@@ -1454,12 +1906,13 @@ export function canonicalDedupSet(* `buildCanonicalToAliasMap` semantics).*/export function buildAliasIndex(- enrichment: OmniRouteEnrichmentMap | undefined+ enrichment: OmniRouteEnrichmentMap | undefined,): Map<string, OmniRouteEnrichmentEntry> {const out = new Map<string, OmniRouteEnrichmentEntry>();if (!enrichment) return out;for (const entry of enrichment.values()) {- const alias = typeof entry.providerAlias === "string" ? entry.providerAlias.trim() : "";+ const alias =+ typeof entry.providerAlias === "string" ? entry.providerAlias.trim() : "";if (alias.length === 0) continue;if (out.has(alias)) {// First-wins, but upgrade to the first entry that carries a@@ -1467,7 +1920,8 @@ export function buildAliasIndex(const existing = out.get(alias);if (existing &&- (!existing.providerDisplayName || existing.providerDisplayName.trim().length === 0) &&+ (!existing.providerDisplayName ||+ existing.providerDisplayName.trim().length === 0) &&typeof entry.providerDisplayName === "string" &&entry.providerDisplayName.trim().length > 0) {@@ -1506,12 +1960,17 @@ export function resolveProviderTagEntry(rawId: string,direct: OmniRouteEnrichmentEntry | undefined,aliasIndex: Map<string, OmniRouteEnrichmentEntry>,- canonicalToAlias?: Map<string, string>+ canonicalToAlias?: Map<string, string>,): OmniRouteEnrichmentEntry | undefined {if (direct) {- const alias = typeof direct.providerAlias === "string" ? direct.providerAlias.trim() : "";+ const alias =+ typeof direct.providerAlias === "string"+ ? direct.providerAlias.trim()+ : "";const display =- typeof direct.providerDisplayName === "string" ? direct.providerDisplayName.trim() : "";+ typeof direct.providerDisplayName === "string"+ ? direct.providerDisplayName.trim()+ : "";if (alias.length > 0 || display.length > 0) return direct;}const slash = rawId.indexOf("/");@@ -1537,9 +1996,21 @@ export function resolveProviderTagEntry(* Apply enrichment overlay onto a ModelV2 entry. Mutates and returns the* passed entry for convenience.*/+/**+ * Normalise a model display name so free-tier models always carry a+ * consistent `[Free] ` prefix instead of a trailing `(Free)` suffix or an+ * ad-hoc `free` word anywhere in the name.+ *+ * Examples:+ * "GPT-4.1 (Free)" → "[Free] GPT-4.1"+ * "DeepSeek V4 Flash Free" → "[Free] DeepSeek V4 Flash"+ * "Claude Opus 4.7" → "Claude Opus 4.7" (unchanged)+ */+export { _normaliseFreeLabel as normaliseFreeLabel };+export function applyEnrichment(model: ModelV2,- enrichment: OmniRouteEnrichmentEntry | undefined+ enrichment: OmniRouteEnrichmentEntry | undefined,): ModelV2 {if (!enrichment) return model;if (enrichment.name && enrichment.name.trim().length > 0) {@@ -1586,7 +2057,7 @@ export interface OmniRouteCompressionCombo {export type OmniRouteCompressionMetaFetcher = (baseURL: string,apiKey: string,- timeoutMs?: number+ timeoutMs?: number,) => Promise<OmniRouteCompressionCombo[]>;/**@@ -1594,70 +2065,67 @@ export type OmniRouteCompressionMetaFetcher = (* Tolerates envelope shapes `{ combos: [...] }`, `[...]`, or* `{ data: [...] }`. Soft-fails (returns []) on non-2xx or parse errors.*/-export const defaultOmniRouteCompressionMetaFetcher: OmniRouteCompressionMetaFetcher = async (- baseURL,- apiKey,- timeoutMs = 10_000-) => {- const empty: OmniRouteCompressionCombo[] = [];- if (!baseURL || !apiKey) return empty;- const root = baseURL.replace(/\/v1\/?$/, "").replace(/\/$/, "");- const url = `${root}/api/context/combos`;- const ac = new AbortController();- const timer = setTimeout(() => ac.abort(), timeoutMs);- try {- const res = await fetch(url, {- method: "GET",- headers: {- Authorization: `Bearer ${apiKey}`,- Accept: "application/json",- },- signal: ac.signal,- });- if (!res.ok) return empty;- const body = (await res.json()) as unknown;- const list = Array.isArray(body)- ? body- : Array.isArray((body as { combos?: unknown[] })?.combos)- ? (body as { combos: unknown[] }).combos- : Array.isArray((body as { data?: unknown[] })?.data)- ? (body as { data: unknown[] }).data- : [];- const out: OmniRouteCompressionCombo[] = [];- for (const raw of list) {- if (!raw || typeof raw !== "object") continue;- const id = (raw as { id?: unknown }).id;- const pipeline = (raw as { pipeline?: unknown }).pipeline;- if (typeof id !== "string" || id.length === 0) continue;- if (!Array.isArray(pipeline)) continue;- const steps: OmniRouteCompressionStep[] = [];- for (const step of pipeline) {- if (!step || typeof step !== "object") continue;- const engine = (step as { engine?: unknown }).engine;- if (typeof engine !== "string" || engine.length === 0) continue;- const intensity = (step as { intensity?: unknown }).intensity;- const entry: OmniRouteCompressionStep = { engine };- if (typeof intensity === "string" && intensity.length > 0) {- entry.intensity = intensity;+export const defaultOmniRouteCompressionMetaFetcher: OmniRouteCompressionMetaFetcher =+ async (baseURL, apiKey, timeoutMs = 10_000) => {+ const empty: OmniRouteCompressionCombo[] = [];+ if (!baseURL || !apiKey) return empty;+ const root = baseURL.replace(/\/v1\/?$/, "").replace(/\/$/, "");+ const url = `${root}/api/context/combos`;+ const ac = new AbortController();+ const timer = setTimeout(() => ac.abort(), timeoutMs);+ try {+ const res = await fetch(url, {+ method: "GET",+ headers: {+ Authorization: `Bearer ${apiKey}`,+ Accept: "application/json",+ },+ signal: ac.signal,+ });+ if (!res.ok) return empty;+ const body = (await res.json()) as unknown;+ const list = Array.isArray(body)+ ? body+ : Array.isArray((body as { combos?: unknown[] })?.combos)+ ? (body as { combos: unknown[] }).combos+ : Array.isArray((body as { data?: unknown[] })?.data)+ ? (body as { data: unknown[] }).data+ : [];+ const out: OmniRouteCompressionCombo[] = [];+ for (const raw of list) {+ if (!raw || typeof raw !== "object") continue;+ const id = (raw as { id?: unknown }).id;+ const pipeline = (raw as { pipeline?: unknown }).pipeline;+ if (typeof id !== "string" || id.length === 0) continue;+ if (!Array.isArray(pipeline)) continue;+ const steps: OmniRouteCompressionStep[] = [];+ for (const step of pipeline) {+ if (!step || typeof step !== "object") continue;+ const engine = (step as { engine?: unknown }).engine;+ if (typeof engine !== "string" || engine.length === 0) continue;+ const intensity = (step as { intensity?: unknown }).intensity;+ const entry: OmniRouteCompressionStep = { engine };+ if (typeof intensity === "string" && intensity.length > 0) {+ entry.intensity = intensity;+ }+ steps.push(entry);}- steps.push(entry);+ const combo: OmniRouteCompressionCombo = { id, pipeline: steps };+ const name = (raw as { name?: unknown }).name;+ if (typeof name === "string" && name.length > 0) combo.name = name;+ const description = (raw as { description?: unknown }).description;+ if (typeof description === "string") combo.description = description;+ const isDefault = (raw as { isDefault?: unknown }).isDefault;+ if (typeof isDefault === "boolean") combo.isDefault = isDefault;+ out.push(combo);}- const combo: OmniRouteCompressionCombo = { id, pipeline: steps };- const name = (raw as { name?: unknown }).name;- if (typeof name === "string" && name.length > 0) combo.name = name;- const description = (raw as { description?: unknown }).description;- if (typeof description === "string") combo.description = description;- const isDefault = (raw as { isDefault?: unknown }).isDefault;- if (typeof isDefault === "boolean") combo.isDefault = isDefault;- out.push(combo);+ return out;+ } catch {+ return empty;+ } finally {+ clearTimeout(timer);}- return out;- } catch {- return empty;- } finally {- clearTimeout(timer);- }-};+ };/*** Map of well-known compression-intensity tokens to a single emoji@@ -1695,7 +2163,9 @@ export const COMPRESSION_INTENSITY_EMOJI: Record<string, string> = {* `[caveman]` (engine without intensity, no emoji)* `[rtk:custom-thing]` (unknown intensity, raw-text fallback)*/-export function formatCompressionPipeline(pipeline: OmniRouteCompressionStep[]): string {+export function formatCompressionPipeline(+ pipeline: OmniRouteCompressionStep[],+): string {if (!pipeline || pipeline.length === 0) return "";return ("[" +@@ -1740,7 +2210,7 @@ export interface OmniRouteProviderConnection {export type OmniRouteProvidersFetcher = (baseURL: string,apiKey: string,- timeoutMs?: number+ timeoutMs?: number,) => Promise<OmniRouteProviderConnection[]>;/**@@ -1749,51 +2219,48 @@ export type OmniRouteProvidersFetcher = (* (returns []) on non-2xx or parse errors so the `usableOnly` filter* gracefully degrades to "no filter" instead of hiding the whole catalog.*/-export const defaultOmniRouteProvidersFetcher: OmniRouteProvidersFetcher = async (- baseURL,- apiKey,- timeoutMs = 10_000-) => {- const empty: OmniRouteProviderConnection[] = [];- if (!baseURL || !apiKey) return empty;- const root = baseURL.replace(/\/v1\/?$/, "").replace(/\/$/, "");- const url = `${root}/api/providers`;- const ac = new AbortController();- const timer = setTimeout(() => ac.abort(), timeoutMs);- try {- const res = await fetch(url, {- method: "GET",- headers: {- Authorization: `Bearer ${apiKey}`,- Accept: "application/json",- },- signal: ac.signal,- });- if (!res.ok) return empty;- const body = (await res.json()) as unknown;- const list = Array.isArray(body)- ? body- : Array.isArray((body as { connections?: unknown[] })?.connections)- ? (body as { connections: unknown[] }).connections- : Array.isArray((body as { data?: unknown[] })?.data)- ? (body as { data: unknown[] }).data- : [];- const out: OmniRouteProviderConnection[] = [];- for (const raw of list) {- if (!raw || typeof raw !== "object") continue;- const provider = (raw as { provider?: unknown }).provider;- if (typeof provider !== "string" || provider.length === 0) continue;- const id = (raw as { id?: unknown }).id;- const idStr = typeof id === "string" && id.length > 0 ? id : provider;- out.push({ ...(raw as Record<string, unknown>), id: idStr, provider });+export const defaultOmniRouteProvidersFetcher: OmniRouteProvidersFetcher =+ async (baseURL, apiKey, timeoutMs = 10_000) => {+ const empty: OmniRouteProviderConnection[] = [];+ if (!baseURL || !apiKey) return empty;+ const root = baseURL.replace(/\/v1\/?$/, "").replace(/\/$/, "");+ const url = `${root}/api/providers`;+ const ac = new AbortController();+ const timer = setTimeout(() => ac.abort(), timeoutMs);+ try {+ const res = await fetch(url, {+ method: "GET",+ headers: {+ Authorization: `Bearer ${apiKey}`,+ Accept: "application/json",+ },+ signal: ac.signal,+ });+ if (!res.ok) return empty;+ const body = (await res.json()) as unknown;+ const list = Array.isArray(body)+ ? body+ : Array.isArray((body as { connections?: unknown[] })?.connections)+ ? (body as { connections: unknown[] }).connections+ : Array.isArray((body as { data?: unknown[] })?.data)+ ? (body as { data: unknown[] }).data+ : [];+ const out: OmniRouteProviderConnection[] = [];+ for (const raw of list) {+ if (!raw || typeof raw !== "object") continue;+ const provider = (raw as { provider?: unknown }).provider;+ if (typeof provider !== "string" || provider.length === 0) continue;+ const id = (raw as { id?: unknown }).id;+ const idStr = typeof id === "string" && id.length > 0 ? id : provider;+ out.push({ ...(raw as Record<string, unknown>), id: idStr, provider });+ }+ return out;+ } catch {+ return empty;+ } finally {+ clearTimeout(timer);}- return out;- } catch {- return empty;- } finally {- clearTimeout(timer);- }-};+ };/*** Compute the set of provider aliases that have at least one healthy,@@ -1817,8 +2284,12 @@ export const defaultOmniRouteProvidersFetcher: OmniRouteProvidersFetcher = async*/export function usableProviderAliasSet(connections: OmniRouteProviderConnection[],- enrichment: OmniRouteEnrichmentMap | undefined-): { aliases: Set<string>; canonicals: Set<string>; knownAliases: Set<string> } {+ enrichment: OmniRouteEnrichmentMap | undefined,+): {+ aliases: Set<string>;+ canonicals: Set<string>;+ knownAliases: Set<string>;+} {const usableCanonicals = new Set<string>();for (const c of connections) {if (!c || c.isActive !== true) continue;@@ -1867,8 +2338,12 @@ export function usableProviderAliasSet(*/export function isUsableRawModelId(id: string,- usable: { aliases: Set<string>; canonicals: Set<string>; knownAliases: Set<string> },- enrichment: OmniRouteEnrichmentMap | undefined+ usable: {+ aliases: Set<string>;+ canonicals: Set<string>;+ knownAliases: Set<string>;+ },+ enrichment: OmniRouteEnrichmentMap | undefined,): boolean {const slash = id.indexOf("/");if (slash <= 0) return true;@@ -1890,7 +2365,11 @@ export function isUsableRawModelId(*/export function isUsableCombo(combo: OmniRouteRawCombo,- usable: { aliases: Set<string>; canonicals: Set<string>; knownAliases: Set<string> }+ usable: {+ aliases: Set<string>;+ canonicals: Set<string>;+ knownAliases: Set<string>;+ },): boolean {const steps = Array.isArray(combo.models) ? combo.models : [];if (steps.length === 0) return true;@@ -1907,7 +2386,8 @@ export function isUsableCombo(if (slash <= 0) continue; // no provider prefix to evaluatesawResolvableMember = true;const prefix = modelId.slice(0, slash);- if (usable.aliases.has(prefix) || usable.canonicals.has(prefix)) return true;+ if (usable.aliases.has(prefix) || usable.canonicals.has(prefix))+ return true;// Unknown prefix (not in the known-alias universe) → can't prove// unroutable; keep. Known-but-not-usable prefixes keep scanning.if (!usable.knownAliases.has(prefix)) return true;@@ -1928,7 +2408,9 @@ export function isUsableCombo(*/export function slugifyComboName(name: string): string {if (typeof name !== "string") return "";- return trimLeadingDashes(trimTrailingDashes(name.toLowerCase().replace(/[^a-z0-9]+/g, "-")));+ return trimLeadingDashes(+ trimTrailingDashes(name.toLowerCase().replace(/[^a-z0-9]+/g, "-")),+ );}/**@@ -1941,8 +2423,12 @@ export function slugifyComboName(name: string): string {* Falls back to `combo/<id>` when the friendly name slugifies to the empty* string (e.g. a combo named just punctuation).*/-export function buildComboKey(combo: OmniRouteRawCombo, used: Set<string>): string {- const friendlyName = combo.name && combo.name.trim().length > 0 ? combo.name.trim() : combo.id;+export function buildComboKey(+ combo: OmniRouteRawCombo,+ used: Set<string>,+): string {+ const friendlyName =+ combo.name && combo.name.trim().length > 0 ? combo.name.trim() : combo.id;let slug = slugifyComboName(friendlyName);if (slug.length === 0) slug = combo.id;let key = `combo/${slug}`;@@ -1998,6 +2484,7 @@ function modelsCacheKey(baseURL: string, credentialId: string): string {export interface OmniRouteFetchCacheEntry {rawModels: OmniRouteRawModelEntry[];rawCombos: OmniRouteRawCombo[];+ rawAutoCombos: OmniRouteRawAutoCombo[];/** Display-name + pricing overlay from /api/pricing/models. Empty Map when feature is disabled or fetch failed. */rawEnrichment: OmniRouteEnrichmentMap;/** Compression combos from /api/context/combos. Empty array when feature is disabled or fetch failed. */@@ -2058,12 +2545,13 @@ export function createOmniRouteProviderHook(deps: {fetcher?: OmniRouteModelsFetcher;combosFetcher?: OmniRouteCombosFetcher;+ autoCombosFetcher?: OmniRouteAutoCombosFetcher;enrichmentFetcher?: OmniRouteEnrichmentFetcher;compressionMetaFetcher?: OmniRouteCompressionMetaFetcher;providersFetcher?: OmniRouteProvidersFetcher;now?: () => number;cache?: OmniRouteFetchCache;- } = {}+ } = {},): ProviderHook {const resolved = resolveOmniRoutePluginOptions(opts);const fetcher = deps.fetcher ?? defaultOmniRouteModelsFetcher;@@ -2072,13 +2560,18 @@ export function createOmniRouteProviderHook(// reference resolves at hook-invocation time, not at hook-construction// time, so source-order beyond hoisting rules has no semantic effect.const combosFetcher = deps.combosFetcher ?? defaultOmniRouteCombosFetcher;- const enrichmentFetcher = deps.enrichmentFetcher ?? defaultOmniRouteEnrichmentFetcher;+ const autoCombosFetcher =+ deps.autoCombosFetcher ?? defaultOmniRouteAutoCombosFetcher;+ const enrichmentFetcher =+ deps.enrichmentFetcher ?? defaultOmniRouteEnrichmentFetcher;const compressionMetaFetcher =deps.compressionMetaFetcher ?? defaultOmniRouteCompressionMetaFetcher;- const providersFetcher = deps.providersFetcher ?? defaultOmniRouteProvidersFetcher;+ const providersFetcher =+ deps.providersFetcher ?? defaultOmniRouteProvidersFetcher;// Features defaults (mirror v0.1.0 behavior when unset).const features = resolved.features ?? {};const wantCombos = features.combos !== false;+ const wantAutoCombos = features.autoCombos !== false;const wantEnrichment = features.enrichment !== false;const wantCompressionMeta = features.compressionMetadata === true;const wantUsableOnly = features.usableOnly === true;@@ -2119,7 +2612,9 @@ export function createOmniRouteProviderHook(// declare baseURL on any branch — we duck-type it as a defensive// extension point.const authBaseURL = (auth as unknown as { baseURL?: unknown }).baseURL;- const baseURL = resolved.baseURL ?? (typeof authBaseURL === "string" ? authBaseURL : "");+ const baseURL =+ resolved.baseURL ??+ (typeof authBaseURL === "string" ? authBaseURL : "");if (!baseURL) {return {};}@@ -2130,12 +2625,14 @@ export function createOmniRouteProviderHook(let rawModels: OmniRouteRawModelEntry[];let rawCombos: OmniRouteRawCombo[];+ let rawAutoCombos: OmniRouteRawAutoCombo[];let rawEnrichment: OmniRouteEnrichmentMap;let rawCompressionCombos: OmniRouteCompressionCombo[];let rawConnections: OmniRouteProviderConnection[];if (cached && cached.expiresAt > t) {rawModels = cached.rawModels;rawCombos = cached.rawCombos;+ rawAutoCombos = cached.rawAutoCombos;rawEnrichment = cached.rawEnrichment;rawCompressionCombos = cached.rawCompressionCombos;rawConnections = cached.rawConnections;@@ -2158,11 +2655,24 @@ export function createOmniRouteProviderHook(} catch (err) {console.warn("[omniroute-plugin] combos fetch failed, falling back to models-only catalog",- err+ err,);}}+ // Auto combos fetch — virtual server-side combos. Best-effort,+ // gated by features.autoCombos. Soft-fails silently (the endpoint+ // may not exist yet on older OmniRoute versions).+ rawAutoCombos = [];+ if (wantAutoCombos) {+ try {+ rawAutoCombos = await autoCombosFetcher(baseURL, apiKey, 5_000);+ } catch {+ // Already handled inside the default fetcher — this catch+ // is belt-and-suspenders for injected stubs.+ }+ }+// Enrichment fetch (nice names + pricing). Best-effort, gated by// features.enrichment. Soft-fails to empty map.rawEnrichment = new Map();@@ -2172,7 +2682,7 @@ export function createOmniRouteProviderHook(} catch (err) {console.warn("[omniroute-plugin] enrichment fetch failed, falling back to raw ids",- err+ err,);}}@@ -2182,9 +2692,16 @@ export function createOmniRouteProviderHook(rawCompressionCombos = [];if (wantCompressionMeta) {try {- rawCompressionCombos = await compressionMetaFetcher(baseURL, apiKey, 10_000);+ rawCompressionCombos = await compressionMetaFetcher(+ baseURL,+ apiKey,+ 10_000,+ );} catch (err) {- console.warn("[omniroute-plugin] compression-metadata fetch failed", err);+ console.warn(+ "[omniroute-plugin] compression-metadata fetch failed",+ err,+ );}}@@ -2200,7 +2717,7 @@ export function createOmniRouteProviderHook(} catch (err) {console.warn("[omniroute-plugin] /api/providers fetch failed; usableOnly filter disabled for this refresh",- err+ err,);}}@@ -2208,6 +2725,7 @@ export function createOmniRouteProviderHook(cache.set(cacheKey, {rawModels,rawCombos,+ rawAutoCombos,rawEnrichment,rawCompressionCombos,rawConnections,@@ -2223,8 +2741,22 @@ export function createOmniRouteProviderHook(`${rawEnrichment.size} enrichment entries + ` +`${rawCompressionCombos.length} compression combos + ` +`${rawConnections.length} connections ` +- `(TTL=${resolved.modelCacheTtl}ms)`+ `(TTL=${resolved.modelCacheTtl}ms)`,);++ // ── Startup debug: deep-dive into enrichment + auto combos ──────+ if (resolved.features?.startupDebug === true) {+ await writeStartupDiagnostics({+ providerId: resolved.providerId,+ baseURL,+ modelCount: rawModels.length,+ comboCount: rawCombos.length,+ enrichmentSize: rawEnrichment.size,+ autoComboCount: rawAutoCombos.length,+ enrichment: rawEnrichment,+ autoCombos: rawAutoCombos,+ });+ }}// Lookup index for LCD member resolution: O(1) per member lookup.@@ -2263,13 +2795,18 @@ export function createOmniRouteProviderHook(for (const entry of rawModels) {if (!entry.id) continue;if (canonicalDedup.has(entry.id)) continue;- if (usable && !isUsableRawModelId(entry.id, usable, rawEnrichment)) continue;+ if (usable && !isUsableRawModelId(entry.id, usable, rawEnrichment))+ continue;const model = mapRawModelToModelV2(entry, {providerId: resolved.providerId,baseURL,apiFormat: resolved.features?.apiFormat,});- const enrichEntry = lookupEnrichment(entry.id, rawEnrichment, canonicalToAlias);+ const enrichEntry = lookupEnrichment(+ entry.id,+ rawEnrichment,+ canonicalToAlias,+ );applyEnrichment(model, enrichEntry);// Prepend upstream provider label (e.g. `Claude - Claude Opus 4.7`)// so the picker groups same-model rows by upstream connection.@@ -2282,7 +2819,7 @@ export function createOmniRouteProviderHook(entry.id,enrichEntry,aliasIndex,- canonicalToAlias+ canonicalToAlias,);applyProviderTag(model, tagEntry);}@@ -2310,7 +2847,10 @@ export function createOmniRouteProviderHook(const comboNames = new Set<string>();for (const combo of rawCombos) {if (!combo || combo.isHidden === true) continue;- const n = combo.name && combo.name.trim().length > 0 ? combo.name.trim() : combo.id;+ const n =+ combo.name && combo.name.trim().length > 0+ ? combo.name.trim()+ : combo.id;if (typeof n === "string" && n.length > 0) comboNames.add(n);}for (const key of Object.keys(models)) {@@ -2337,7 +2877,13 @@ export function createOmniRouteProviderHook(if (member) memberEntries.push(member);}- const mapped = mapComboToModelV2(combo, memberEntries, resolved.providerId, baseURL);+ const mapped = mapComboToModelV2(+ combo,+ memberEntries,+ resolved.providerId,+ baseURL,+ features.apiFormat,+ );const hasMembers = memberEntries.length > 0;// Apply enrichment overlay to combos too (OmniRoute's@@ -2358,7 +2904,11 @@ export function createOmniRouteProviderHook(// returned at least one default compression combo, AND the// combo has resolvable members — claiming compression on an// unroutable combo would mislead the picker.- if (hasMembers && defaultCompression && defaultCompression.pipeline.length > 0) {+ if (+ hasMembers &&+ defaultCompression &&+ defaultCompression.pipeline.length > 0+ ) {const tag = formatCompressionPipeline(defaultCompression.pipeline);if (tag.length > 0 && !mapped.name.includes(tag)) {mapped.name = `${mapped.name} ${tag}`;@@ -2375,13 +2925,71 @@ export function createOmniRouteProviderHook(if (!collisionWarned.has(dedupeKey)) {collisionWarned.add(dedupeKey);console.warn(- `[omniroute-plugin] combo key "${comboKey}" collides with a model id; combo wins.`+ `[omniroute-plugin] combo key "${comboKey}" collides with a model id; combo wins.`,);}}models[comboKey] = mapped;}+ // ── Auto combos in dynamic catalog ────────────────────────────────+ // Convert virtual auto combos from /api/combos/auto into ModelV2+ // entries so they appear in the dynamic provider.models() path+ // (used by OpenCode ≥1.14.49).+ if (rawAutoCombos.length > 0) {+ for (const autoCombo of rawAutoCombos) {+ if (!autoCombo || !autoCombo.id) continue;+ if (autoCombo.isHidden === true) continue;+ const entry = mapAutoComboToStaticEntry(autoCombo);+ const key = autoComboModelId(autoCombo.variant);+ const mapped: ModelV2 = {+ id: key,+ name: entry.name,+ capabilities: {+ temperature: entry.temperature ?? true,+ reasoning: entry.reasoning ?? false,+ attachment: entry.attachment ?? false,+ toolcall: entry.tool_call ?? false,+ input: {+ text: true,+ audio: false,+ image: false,+ video: false,+ pdf: false,+ },+ output: {+ text: true,+ audio: false,+ image: false,+ video: false,+ pdf: false,+ },+ interleaved: false,+ },+ cost: {+ input: 0,+ output: 0,+ cache: { read: 0, write: 0 },+ },+ limit: {+ context: entry.limit?.context ?? 0,+ output: entry.limit?.output ?? 0,+ },+ api: {+ id: "openai-compatible",+ url: ensureV1Suffix(baseURL),+ npm: "@ai-sdk/openai-compatible",+ },+ status: "active",+ release_date: "",+ providerID: resolved.providerId,+ options: {},+ headers: {},+ };+ models[key] = mapped;+ }+ }+return models;},};@@ -2421,6 +3029,276 @@ export function createOmniRouteProviderHook(* @see https://opencode.ai/docs/plugins for the AuthLoaderResult.fetch contract* (the returned function is invoked by the AI-SDK in lieu of global fetch).*/+// ─────────────────────────────────────────────────────────────────────────────+// DEBUG LOGGING — request/response capture (features.debugLog)+// ─────────────────────────────────────────────────────────────────────────────++import { homedir } from "os";+import {+ appendFileSync,+ existsSync,+ mkdirSync,+ readFileSync,+ writeFileSync,+} from "fs";+import { join } from "path";+import { randomUUID } from "crypto";++export interface DebugLogEntry {+ reqId: string;+ providerId: string;+ ts: number;+ url: string;+ method: string;+ reqHeaders: Record<string, string>;+ reqBody: unknown;+ resStatus: number | null;+ resHeaders: Record<string, string>;+ resBody: unknown;+ durationMs: number | null;+ error?: string;+ /** Parsed from SSE trailing comments (real values when headers show 0) */+ sseTokensIn?: number;+ sseTokensOut?: number;+ sseCost?: number;+ sseModel?: string;+ sseProvider?: string;+ /** Parsed assistant reply text from SSE stream */+ replyText?: string;+}++/** Parse OmniRoute SSE trailing comments + assistant content from a stream body string. */+export function parseSseDebugMeta(body: string): {+ tokensIn?: number;+ tokensOut?: number;+ cost?: number;+ model?: string;+ provider?: string;+ replyText?: string;+} {+ if (typeof body !== "string") return {};+ const result: ReturnType<typeof parseSseDebugMeta> = {};+ let reply = "";+ for (const line of body.split("\n")) {+ const t = line.trim();+ // OmniRoute SSE comment metadata: `: x-omniroute-tokens-in=333`+ if (t.startsWith(":")) {+ const kv = t.slice(1).trim();+ const eq = kv.indexOf("=");+ if (eq === -1) continue;+ const k = kv.slice(0, eq).trim();+ const v = kv.slice(eq + 1).trim();+ if (k === "x-omniroute-tokens-in") result.tokensIn = Number(v);+ else if (k === "x-omniroute-tokens-out") result.tokensOut = Number(v);+ else if (k === "x-omniroute-response-cost") result.cost = Number(v);+ else if (k === "x-omniroute-model") result.model = v;+ else if (k === "x-omniroute-provider") result.provider = v;+ }+ // Parse assistant content from data chunks+ if (t.startsWith("data:") && !t.includes("[DONE]")) {+ try {+ const chunk = JSON.parse(t.slice(5)) as {+ choices?: Array<{ delta?: { content?: string } }>;+ };+ reply += chunk.choices?.[0]?.delta?.content ?? "";+ } catch {+ /**/+ }+ }+ }+ if (reply) result.replyText = reply;+ return result;+}++function debugLogDir(): string {+ const dir = join(homedir(), ".local", "share", "opencode", "plugins");+ if (!existsSync(dir)) mkdirSync(dir, { recursive: true });+ return dir;+}++function debugLogPath(providerId: string): string {+ return join(debugLogDir(), `omniroute-debug-${providerId}.jsonl`);+}++function debugStatePath(providerId: string): string {+ return join(debugLogDir(), `omniroute-debug-${providerId}.state.json`);+}++export function debugLogEnabled(providerId: string): boolean {+ try {+ const p = debugStatePath(providerId);+ if (!existsSync(p)) return false;+ const s = JSON.parse(readFileSync(p, "utf8")) as { enabled?: boolean };+ return s.enabled === true;+ } catch {+ return false;+ }+}++export function debugLogSetEnabled(providerId: string, enabled: boolean): void {+ writeFileSync(+ debugStatePath(providerId),+ JSON.stringify({ enabled }),+ "utf8",+ );+}++export function debugLogAppend(entry: DebugLogEntry): void {+ appendFileSync(+ debugLogPath(entry.providerId),+ JSON.stringify(entry) + "\n",+ "utf8",+ );+}++export function debugLogRead(providerId: string, limit = 20): DebugLogEntry[] {+ const p = debugLogPath(providerId);+ if (!existsSync(p)) return [];+ const lines = readFileSync(p, "utf8").trim().split("\n").filter(Boolean);+ return lines+ .slice(-limit)+ .map((l) => {+ try {+ return JSON.parse(l) as DebugLogEntry;+ } catch {+ return null;+ }+ })+ .filter((e): e is DebugLogEntry => e !== null);+}++export function debugLogGetById(+ providerId: string,+ reqId: string,+): DebugLogEntry | null {+ const p = debugLogPath(providerId);+ if (!existsSync(p)) return null;+ const lines = readFileSync(p, "utf8").trim().split("\n").filter(Boolean);+ for (let i = lines.length - 1; i >= 0; i--) {+ try {+ const e = JSON.parse(lines[i]) as DebugLogEntry;+ if (e.reqId === reqId) return e;+ } catch {+ /* skip */+ }+ }+ return null;+}++export function debugLogClear(providerId: string): void {+ const p = debugLogPath(providerId);+ if (existsSync(p)) writeFileSync(p, "", "utf8");+}++/**+ * Wraps a fetch function to capture request/response pairs into the debug+ * JSONL log. Only active when `debugLogEnabled(providerId)` returns true at+ * call time — the flag is read on every request so enable/disable takes+ * effect immediately without restarting OpenCode.+ */+export function createDebugLoggingFetch(+ inner: typeof fetch,+ providerId: string,+ featureDefault: boolean,+): typeof fetch {+ return async (input, init = {}) => {+ const active = featureDefault || debugLogEnabled(providerId);+ if (!active) return inner(input, init);++ const reqId = randomUUID();+ const url =+ typeof input === "string"+ ? input+ : input instanceof URL+ ? input.toString()+ : (input as Request).url;+ const method =+ init.method ?? (input instanceof Request ? input.method : "GET");++ const reqHeaders: Record<string, string> = {};+ const headerSrc = init.headers+ ? new Headers(init.headers)+ : input instanceof Request+ ? input.headers+ : new Headers();+ headerSrc.forEach((v, k) => {+ reqHeaders[k] = k.toLowerCase() === "authorization" ? "[redacted]" : v;+ });++ let reqBody: unknown = undefined;+ try {+ if (init.body) {+ reqBody =+ typeof init.body === "string" ? JSON.parse(init.body) : "[binary]";+ }+ } catch {+ reqBody = "[unparseable]";+ }++ const t0 = Date.now();+ try {+ const res = await inner(input, init);+ const durationMs = Date.now() - t0;++ const resHeaders: Record<string, string> = {};+ res.headers.forEach((v, k) => {+ resHeaders[k] = v;+ });++ let resBody: unknown = undefined;+ const clone = res.clone();+ try {+ const ct = res.headers.get("content-type") ?? "";+ resBody = ct.includes("application/json")+ ? await clone.json()+ : await clone.text();+ } catch {+ resBody = "[unreadable]";+ }++ const sseMeta =+ typeof resBody === "string" ? parseSseDebugMeta(resBody) : {};+ debugLogAppend({+ reqId,+ providerId,+ ts: t0,+ url,+ method,+ reqHeaders,+ reqBody,+ resStatus: res.status,+ resHeaders,+ resBody,+ durationMs,+ sseTokensIn: sseMeta.tokensIn,+ sseTokensOut: sseMeta.tokensOut,+ sseCost: sseMeta.cost,+ sseModel: sseMeta.model,+ sseProvider: sseMeta.provider,+ replyText: sseMeta.replyText,+ });++ return res;+ } catch (err) {+ debugLogAppend({+ reqId,+ providerId,+ ts: t0,+ url,+ method,+ reqHeaders,+ reqBody,+ resStatus: null,+ resHeaders: {},+ resBody: null,+ durationMs: Date.now() - t0,+ error: String(err),+ });+ throw err;+ }+ };+}+export function createOmniRouteFetchInterceptor(config: {apiKey: string;baseURL: string;@@ -2432,7 +3310,11 @@ export function createOmniRouteFetchInterceptor(config: {const prefix = `${trimmed}/`;return async (input, init = {}) => {const url =- typeof input === "string" ? input : input instanceof URL ? input.toString() : input.url;+ typeof input === "string"+ ? input+ : input instanceof URL+ ? input.toString()+ : input.url;const targetsOmniRoute = url === trimmed || url.startsWith(prefix);if (!targetsOmniRoute) {@@ -2441,7 +3323,9 @@ export function createOmniRouteFetchInterceptor(config: {// Merge order: Request-attached headers (when input is a Request) →// init.headers overlay → our injected headers last (so we win).- const headers = new Headers(input instanceof Request ? input.headers : undefined);+ const headers = new Headers(+ input instanceof Request ? input.headers : undefined,+ );if (init.headers) {const initHeaders = new Headers(init.headers);initHeaders.forEach((value, key) => {@@ -2476,7 +3360,12 @@ export function createOmniRouteFetchInterceptor(config: {* Source: behavioural reverse-engineering from Alph4d0g's* [email protected] (dist/src/plugin.js:517).*/-const GEMINI_SCHEMA_KEYS_TO_REMOVE = new Set(["$schema", "$ref", "ref", "additionalProperties"]);+const GEMINI_SCHEMA_KEYS_TO_REMOVE = new Set([+ "$schema",+ "$ref",+ "ref",+ "additionalProperties",+]);function isRecord(v: unknown): v is Record<string, unknown> {return typeof v === "object" && v !== null && !Array.isArray(v);@@ -2525,7 +3414,9 @@ function stripSchemaKeys(schema: Record<string, unknown>): boolean {* occasionally attach a top-level `$schema` declaration when re-serialising* tool bundles, and Gemini rejects those too.*/-function sanitizeToolSchemaContainer(payload: Record<string, unknown>): boolean {+function sanitizeToolSchemaContainer(+ payload: Record<string, unknown>,+): boolean {let changed = false;// Top-level keyword strip — covers payload-level `$schema` etc.for (const key of Object.keys(payload)) {@@ -2542,11 +3433,18 @@ function sanitizeToolSchemaContainer(payload: Record<string, unknown>): booleanif (!isRecord(tool)) continue;const fn = (tool as { function?: unknown }).function;if (isRecord(fn) && isRecord((fn as { parameters?: unknown }).parameters)) {- changed = stripSchemaKeys(fn.parameters as Record<string, unknown>) || changed;+ changed =+ stripSchemaKeys(fn.parameters as Record<string, unknown>) || changed;}- const fnDecl = (tool as { function_declaration?: unknown }).function_declaration;- if (isRecord(fnDecl) && isRecord((fnDecl as { parameters?: unknown }).parameters)) {- changed = stripSchemaKeys(fnDecl.parameters as Record<string, unknown>) || changed;+ const fnDecl = (tool as { function_declaration?: unknown })+ .function_declaration;+ if (+ isRecord(fnDecl) &&+ isRecord((fnDecl as { parameters?: unknown }).parameters)+ ) {+ changed =+ stripSchemaKeys(fnDecl.parameters as Record<string, unknown>) ||+ changed;}const inputSchema = (tool as { input_schema?: unknown }).input_schema;if (isRecord(inputSchema)) {@@ -2668,7 +3566,8 @@ export function createGeminiSanitizingFetch(inner: typeof fetch): typeof fetch {: "";// URL gate — match the path substring with prefix tolerance.- const targetsCompletions = url.includes("/chat/completions") || url.includes("/responses");+ const targetsCompletions =+ url.includes("/chat/completions") || url.includes("/responses");if (!targetsCompletions) {return inner(input, init);}@@ -2694,7 +3593,7 @@ export function createGeminiSanitizingFetch(inner: typeof fetch): typeof fetch {geminiStreamingWarningEmitted = true;console.warn(- "[omniroute-plugin] sanitizeGemini: streaming Request body, skipping schema strip (Gemini may reject)"+ "[omniroute-plugin] sanitizeGemini: streaming Request body, skipping schema strip (Gemini may reject)",);}return inner(input, init);@@ -2789,7 +3688,12 @@ export function __resetGeminiStreamingWarning(): void {* `undefined` noise.*//** Modalities accepted by OC's static catalog reader (see `@opencode-ai/sdk`). */-export type OmniRouteModalityKind = "text" | "audio" | "image" | "video" | "pdf";+export type OmniRouteModalityKind =+ | "text"+ | "audio"+ | "image"+ | "video"+ | "pdf";const STATIC_MODALITY_VALUES: ReadonlySet<OmniRouteModalityKind> = new Set(["text",@@ -2934,7 +3838,8 @@ export function buildStaticProviderEntry(apiKey: string,enrichment?: OmniRouteEnrichmentMap,compressionCombos?: OmniRouteCompressionCombo[],- connections?: OmniRouteProviderConnection[]+ connections?: OmniRouteProviderConnection[],+ rawAutoCombos?: OmniRouteRawAutoCombo[],): OmniRouteStaticProviderEntry {const models: Record<string, OmniRouteStaticModelEntry> = {};@@ -2961,7 +3866,8 @@ export function buildStaticProviderEntry(const comboNames = new Set<string>();for (const combo of rawCombos) {if (!combo || combo.isHidden === true) continue;- const name = combo.name && combo.name.trim().length > 0 ? combo.name.trim() : combo.id;+ const name =+ combo.name && combo.name.trim().length > 0 ? combo.name.trim() : combo.id;if (typeof name === "string" && name.length > 0) comboNames.add(name);}@@ -2991,9 +3897,14 @@ export function buildStaticProviderEntry(// to the raw id when no enrichment entry is found. The alias-fallback// lookup rescues `<canonical>/<id>` rows whose enrichment indexed only// under `<alias>/<id>`.- const enrichmentEntry = lookupEnrichment(raw.id, enrichment, canonicalToAlias);+ const enrichmentEntry = lookupEnrichment(+ raw.id,+ enrichment,+ canonicalToAlias,+ );const enrichmentName = enrichmentEntry?.name;- let displayName = enrichmentName && enrichmentName.length > 0 ? enrichmentName : raw.id;+ let displayName =+ enrichmentName && enrichmentName.length > 0 ? enrichmentName : raw.id;// Provider-tag PREFIX — `<label> - <name>` so the picker groups by// upstream provider when scanning a column of model names. Mirrors// `applyProviderTag` used in the dynamic hook. Idempotent: skip@@ -3006,12 +3917,13 @@ export function buildStaticProviderEntry(raw.id,enrichmentEntry,aliasIndex,- canonicalToAlias+ canonicalToAlias,);const label = shortProviderLabel(tagEntry);if (label) {const prefix = `${label}${PROVIDER_TAG_SEPARATOR}`;- if (!displayName.startsWith(prefix)) displayName = `${prefix}${displayName}`;+ if (!displayName.startsWith(prefix))+ displayName = `${prefix}${displayName}`;}}const entry: OmniRouteStaticModelEntry = { name: displayName };@@ -3019,7 +3931,10 @@ export function buildStaticProviderEntry(const attachment = caps.attachment ?? caps.vision;if (typeof attachment === "boolean") entry.attachment = attachment;- if (typeof caps.reasoning === "boolean" || typeof caps.thinking === "boolean") {+ if (+ typeof caps.reasoning === "boolean" ||+ typeof caps.thinking === "boolean"+ ) {entry.reasoning = Boolean(caps.reasoning || caps.thinking);}@@ -3062,13 +3977,18 @@ export function buildStaticProviderEntry(// Cost from enrichment pricing (sourced from `/api/pricing`). Map// OmniRoute field names to OC's static-schema field names.const pricing = enrichmentEntry?.pricing;- if (pricing && (typeof pricing.input === "number" || typeof pricing.output === "number")) {+ if (+ pricing &&+ (typeof pricing.input === "number" || typeof pricing.output === "number")+ ) {const cost: NonNullable<OmniRouteStaticModelEntry["cost"]> = {input: typeof pricing.input === "number" ? pricing.input : 0,output: typeof pricing.output === "number" ? pricing.output : 0,};- if (typeof pricing.cacheRead === "number") cost.cache_read = pricing.cacheRead;- if (typeof pricing.cacheWrite === "number") cost.cache_write = pricing.cacheWrite;+ if (typeof pricing.cacheRead === "number")+ cost.cache_read = pricing.cacheRead;+ if (typeof pricing.cacheWrite === "number")+ cost.cache_write = pricing.cacheWrite;entry.cost = cost;}@@ -3107,6 +4027,7 @@ export function buildStaticProviderEntry(// Track combo keys to detect slug collisions across the catalog.const usedComboKeys = new Set<string>();+ const reportedCollisions = new Set<string>();for (const combo of rawCombos) {if (!combo.id) continue;@@ -3123,28 +4044,33 @@ export function buildStaticProviderEntry(}const hasMembers = memberEntries.length > 0;- const friendlyName = combo.name && combo.name.trim().length > 0 ? combo.name.trim() : combo.id;+ const friendlyName =+ combo.name && combo.name.trim().length > 0 ? combo.name.trim() : combo.id;// `Combo: ` prefix surfaces the combo nature in OC's model picker — the// catalog key (`combo/<slug>`) is already namespaced, but the picker// shows `name`, so prefix the display string too.const prefixedName = `Combo: ${friendlyName}`;const displayName =- hasMembers && compressionSuffix ? `${prefixedName}${compressionSuffix}` : prefixedName;+ hasMembers && compressionSuffix+ ? `${prefixedName}${compressionSuffix}`+ : prefixedName;const entry: OmniRouteStaticModelEntry = { name: displayName };if (hasMembers) {// LCD across capabilities — every member must support for the combo// to support. Mirrors mapComboToModelV2.entry.attachment = memberEntries.every((m) =>- Boolean(m.capabilities?.attachment ?? m.capabilities?.vision ?? false)+ Boolean(m.capabilities?.attachment ?? m.capabilities?.vision ?? false),);entry.reasoning = memberEntries.every((m) =>- Boolean(m.capabilities?.reasoning || m.capabilities?.thinking)+ Boolean(m.capabilities?.reasoning || m.capabilities?.thinking),);entry.temperature = memberEntries.every(- (m) => (m.capabilities?.temperature ?? true) !== false+ (m) => (m.capabilities?.temperature ?? true) !== false,+ );+ entry.tool_call = memberEntries.every((m) =>+ Boolean(m.capabilities?.tool_calling ?? false),);- entry.tool_call = memberEntries.every((m) => Boolean(m.capabilities?.tool_calling ?? false));// LCD across limits — min over declared values. OC's SDK static schema// accepts only `context` + `output` on `limit`, so we drop the legacy@@ -3166,9 +4092,15 @@ export function buildStaticProviderEntry(// LCD across modalities — combo accepts modality M iff every member// accepts M. Same intersection rule as runtime capabilities.- const inSets = memberEntries.map((m) => new Set(normaliseModalities(m.input_modalities)));- const outSets = memberEntries.map((m) => new Set(normaliseModalities(m.output_modalities)));- const intersect = (sets: Set<OmniRouteModalityKind>[]): OmniRouteModalityKind[] => {+ const inSets = memberEntries.map(+ (m) => new Set(normaliseModalities(m.input_modalities)),+ );+ const outSets = memberEntries.map(+ (m) => new Set(normaliseModalities(m.output_modalities)),+ );+ const intersect = (+ sets: Set<OmniRouteModalityKind>[],+ ): OmniRouteModalityKind[] => {if (sets.length === 0) return [];const [first, ...rest] = sets;const out: OmniRouteModalityKind[] = [];@@ -3203,6 +4135,30 @@ export function buildStaticProviderEntry(models[buildComboKey(combo, usedComboKeys)] = entry;}+ // ── Auto combos ────────────────────────────────────────────────────────+ // Virtual server-side combos (auto/coding, auto/fast, etc.) are fetched+ // from /api/combos/auto and added as model entries. They self-manage+ // provider selection at runtime via scoring/bandit exploration.+ if (rawAutoCombos && rawAutoCombos.length > 0) {+ for (const autoCombo of rawAutoCombos) {+ if (!autoCombo || !autoCombo.id) continue;+ if (autoCombo.isHidden === true) continue;+ const entry = mapAutoComboToStaticEntry(autoCombo);+ // Use the variant as the key: "auto", "auto/coding", etc.+ const key = autoComboModelId(autoCombo.variant);+ if (models[key]) {+ // Collision with a raw model or DB combo — auto combo wins (log once)+ if (!reportedCollisions.has(key)) {+ reportedCollisions.add(key);+ console.warn(+ `[omniroute-plugin] auto combo key "${key}" collides with an existing model; auto combo wins.`,+ );+ }+ }+ models[key] = entry;+ }+ }+return {npm: "@ai-sdk/openai-compatible",name: opts.displayName,@@ -3223,7 +4179,10 @@ interface AuthJsonApiEntry {baseURL?: string;}-type AuthJsonShape = Record<string, AuthJsonApiEntry | { type?: string; [k: string]: unknown }>;+type AuthJsonShape = Record<+ string,+ AuthJsonApiEntry | { type?: string; [k: string]: unknown }+>;/*** Read & parse `auth.json` from OC's data dir. The path resolution mirrors@@ -3252,6 +4211,7 @@ interface OmniRouteDiskSnapshot {v: 1;rawModels: OmniRouteRawModelEntry[];rawCombos: OmniRouteRawCombo[];+ rawAutoCombos?: OmniRouteRawAutoCombo[];/** Serialised as array-of-pairs (Map is not JSON-friendly). */rawEnrichment: Array<[string, OmniRouteEnrichmentEntry]>;rawCompressionCombos: OmniRouteCompressionCombo[];@@ -3262,21 +4222,26 @@ interface OmniRouteDiskSnapshot {/** Resolve the disk-snapshot path for a given providerId. */export function diskSnapshotPath(providerId: string): string {- const dir = process.env.OPENCODE_DATA_DIR ?? path.join(os.homedir(), ".local/share/opencode");+ const dir =+ process.env.OPENCODE_DATA_DIR ??+ path.join(os.homedir(), ".local/share/opencode");return path.join(dir, "plugins", `omniroute-${providerId}.json`);}export type OmniRouteDiskSnapshotWriter = (providerId: string,- entry: Omit<OmniRouteFetchCacheEntry, "expiresAt">+ entry: Omit<OmniRouteFetchCacheEntry, "expiresAt">,) => Promise<void>;export type OmniRouteDiskSnapshotReader = (- providerId: string+ providerId: string,) => Promise<Omit<OmniRouteFetchCacheEntry, "expiresAt"> | undefined>;/** Best-effort disk write. Soft-fails on any I/O error (no exception thrown). */-export const defaultDiskSnapshotWriter: OmniRouteDiskSnapshotWriter = async (providerId, entry) => {+export const defaultDiskSnapshotWriter: OmniRouteDiskSnapshotWriter = async (+ providerId,+ entry,+) => {try {const file = diskSnapshotPath(providerId);// Restrict perms to the owner: the snapshot lives alongside auth.json@@ -3286,19 +4251,25 @@ export const defaultDiskSnapshotWriter: OmniRouteDiskSnapshotWriter = async (prov: 1,rawModels: entry.rawModels,rawCombos: entry.rawCombos,+ rawAutoCombos: entry.rawAutoCombos,rawEnrichment: Array.from(entry.rawEnrichment.entries()),rawCompressionCombos: entry.rawCompressionCombos,rawConnections: entry.rawConnections,writtenAt: Date.now(),};- await writeFile(file, JSON.stringify(snapshot), { encoding: "utf8", mode: 0o600 });+ await writeFile(file, JSON.stringify(snapshot), {+ encoding: "utf8",+ mode: 0o600,+ });} catch {// Soft-fail; caller already has the in-memory cache.}};/** Best-effort disk read. Returns `undefined` when missing/corrupt/unreadable. */-export const defaultDiskSnapshotReader: OmniRouteDiskSnapshotReader = async (providerId) => {+export const defaultDiskSnapshotReader: OmniRouteDiskSnapshotReader = async (+ providerId,+) => {try {const file = diskSnapshotPath(providerId);const body = await readFile(file, "utf8");@@ -3307,11 +4278,18 @@ export const defaultDiskSnapshotReader: OmniRouteDiskSnapshotReader = async (proreturn {rawModels: Array.isArray(parsed.rawModels) ? parsed.rawModels : [],rawCombos: Array.isArray(parsed.rawCombos) ? parsed.rawCombos : [],- rawEnrichment: new Map(Array.isArray(parsed.rawEnrichment) ? parsed.rawEnrichment : []),+ rawAutoCombos: Array.isArray(parsed.rawAutoCombos)+ ? parsed.rawAutoCombos+ : [],+ rawEnrichment: new Map(+ Array.isArray(parsed.rawEnrichment) ? parsed.rawEnrichment : [],+ ),rawCompressionCombos: Array.isArray(parsed.rawCompressionCombos)? parsed.rawCompressionCombos: [],- rawConnections: Array.isArray(parsed.rawConnections) ? parsed.rawConnections : [],+ rawConnections: Array.isArray(parsed.rawConnections)+ ? parsed.rawConnections+ : [],};} catch {return undefined;@@ -3558,10 +4536,14 @@ export function createDebugLoggingFetch(}export const noopDiskSnapshotReader: OmniRouteDiskSnapshotReader = async () => undefined;-export type OmniRouteReadAuthJson = () => Promise<AuthJsonShape | undefined | null>;+export type OmniRouteReadAuthJson = () => Promise<+ AuthJsonShape | undefined | null+>;export const defaultReadAuthJson: OmniRouteReadAuthJson = async () => {- const dir = process.env.OPENCODE_DATA_DIR ?? path.join(os.homedir(), ".local/share/opencode");+ const dir =+ process.env.OPENCODE_DATA_DIR ??+ path.join(os.homedir(), ".local/share/opencode");const file = path.join(dir, "auth.json");let body: string;try {@@ -3639,6 +4621,7 @@ export function createOmniRouteConfigHook(readAuthJson?: OmniRouteReadAuthJson;fetcher?: OmniRouteModelsFetcher;combosFetcher?: OmniRouteCombosFetcher;+ autoCombosFetcher?: OmniRouteAutoCombosFetcher;enrichmentFetcher?: OmniRouteEnrichmentFetcher;compressionMetaFetcher?: OmniRouteCompressionMetaFetcher;providersFetcher?: OmniRouteProvidersFetcher;@@ -3647,22 +4630,29 @@ export function createOmniRouteConfigHook(now?: () => number;cache?: OmniRouteFetchCache;logger?: { warn: (...args: unknown[]) => void };- } = {}+ } = {},): (input: Config) => Promise<void> {const resolved = resolveOmniRoutePluginOptions(opts);const readAuthJson = deps.readAuthJson ?? defaultReadAuthJson;const fetcher = deps.fetcher ?? defaultOmniRouteModelsFetcher;const combosFetcher = deps.combosFetcher ?? defaultOmniRouteCombosFetcher;- const enrichmentFetcher = deps.enrichmentFetcher ?? defaultOmniRouteEnrichmentFetcher;+ const autoCombosFetcher =+ deps.autoCombosFetcher ?? defaultOmniRouteAutoCombosFetcher;+ const enrichmentFetcher =+ deps.enrichmentFetcher ?? defaultOmniRouteEnrichmentFetcher;const compressionMetaFetcher =deps.compressionMetaFetcher ?? defaultOmniRouteCompressionMetaFetcher;- const providersFetcher = deps.providersFetcher ?? defaultOmniRouteProvidersFetcher;- const diskSnapshotReader = deps.diskSnapshotReader ?? defaultDiskSnapshotReader;- const diskSnapshotWriter = deps.diskSnapshotWriter ?? defaultDiskSnapshotWriter;+ const providersFetcher =+ deps.providersFetcher ?? defaultOmniRouteProvidersFetcher;+ const diskSnapshotReader =+ deps.diskSnapshotReader ?? defaultDiskSnapshotReader;+ const diskSnapshotWriter =+ deps.diskSnapshotWriter ?? defaultDiskSnapshotWriter;const now = deps.now ?? Date.now;const cache: OmniRouteFetchCache = deps.cache ?? new Map();const logger = deps.logger ?? console;const features = resolved.features ?? {};+ const wantAutoCombos = features.autoCombos !== false;const wantEnrichment = features.enrichment !== false;const wantCompressionMeta = features.compressionMetadata === true;const wantUsableOnly = features.usableOnly === true;@@ -3673,10 +4663,14 @@ export function createOmniRouteConfigHook(// (e) operator override — `input.provider[providerId]` already set →// leave it alone. Manually curated catalogs ALWAYS win over the plugin's// generated block. Detect-and-respect before any I/O.- const existingProviders = (input as { provider?: Record<string, unknown> }).provider;- if (existingProviders && existingProviders[resolved.providerId] !== undefined) {+ const existingProviders = (input as { provider?: Record<string, unknown> })+ .provider;+ if (+ existingProviders &&+ existingProviders[resolved.providerId] !== undefined+ ) {logger.warn(- `[omniroute-plugin] config shim skipped: provider.${resolved.providerId} already set by user`+ `[omniroute-plugin] config shim skipped: provider.${resolved.providerId} already set by user`,);return;}@@ -3692,19 +4686,26 @@ export function createOmniRouteConfigHook(}if (authJson === null) {- logger.warn("[omniroute-plugin] config shim: auth.json failed to parse; treating as missing");+ logger.warn(+ "[omniroute-plugin] config shim: auth.json failed to parse; treating as missing",+ );authJson = undefined;}- const entry = authJson?.[resolved.providerId] as AuthJsonApiEntry | undefined;- const apiKey = entry && entry.type === "api" && typeof entry.key === "string" ? entry.key : "";+ const entry = authJson?.[resolved.providerId] as+ | AuthJsonApiEntry+ | undefined;+ const apiKey =+ entry && entry.type === "api" && typeof entry.key === "string"+ ? entry.key+ : "";if (!apiKey) {// (c) no apiKey — silent no-op (with debug breadcrumb). The operator// hasn't run `/connect <providerId>` yet, OR the stored credential// isn't api-flavored. OC will handle the `/connect` flow at runtime.logger.warn(- `[omniroute-plugin] config shim skipped: no apiKey for providerId=${resolved.providerId}`+ `[omniroute-plugin] config shim skipped: no apiKey for providerId=${resolved.providerId}`,);return;}@@ -3712,11 +4713,12 @@ export function createOmniRouteConfigHook(// baseURL resolution: opts.baseURL wins, then auth.json's stored baseURL.// No silent localhost default — a misconfigured plugin should surface a// breadcrumb and skip, not phantom requests.- const storedBaseURL = entry && typeof entry.baseURL === "string" ? entry.baseURL : undefined;+ const storedBaseURL =+ entry && typeof entry.baseURL === "string" ? entry.baseURL : undefined;const baseURL = resolved.baseURL ?? storedBaseURL ?? "";if (!baseURL) {logger.warn(- `[omniroute-plugin] config shim skipped: no baseURL for providerId=${resolved.providerId}`+ `[omniroute-plugin] config shim skipped: no baseURL for providerId=${resolved.providerId}`,);return;}@@ -3730,6 +4732,7 @@ export function createOmniRouteConfigHook(let rawModels: OmniRouteRawModelEntry[];let rawCombos: OmniRouteRawCombo[];+ let rawAutoCombos: OmniRouteRawAutoCombo[];let rawEnrichment: OmniRouteEnrichmentMap;let rawCompressionCombos: OmniRouteCompressionCombo[];let rawConnections: OmniRouteProviderConnection[];@@ -3737,6 +4740,7 @@ export function createOmniRouteConfigHook(if (cached && cached.expiresAt > t) {rawModels = cached.rawModels;rawCombos = cached.rawCombos;+ rawAutoCombos = cached.rawAutoCombos;rawEnrichment = cached.rawEnrichment;rawCompressionCombos = cached.rawCompressionCombos;rawConnections = cached.rawConnections;@@ -3754,7 +4758,7 @@ export function createOmniRouteConfigHook(} catch (err) {logger.warn("[omniroute-plugin] config shim: /v1/models fetch failed; publishing stub provider entry",- err+ err,);rawModels = [];modelsFetchThrew = true;@@ -3767,10 +4771,19 @@ export function createOmniRouteConfigHook(} catch (err) {logger.warn("[omniroute-plugin] config shim: /api/combos fetch failed; publishing models-only static catalog",- err+ err,);}+ rawAutoCombos = [];+ if (wantAutoCombos) {+ try {+ rawAutoCombos = await autoCombosFetcher(baseURL, apiKey, 5_000);+ } catch {+ // Already handled inside the default fetcher+ }+ }+// Eagerly fetch enrichment so the static block can overlay human// display names on raw model ids. On OC ≤1.15.5 the dynamic// `provider.models` hook never fires in `serve` mode, so the static@@ -3785,7 +4798,7 @@ export function createOmniRouteConfigHook(} catch (err) {logger.warn("[omniroute-plugin] config shim: /api/pricing/models fetch failed; publishing raw-id static catalog",- err+ err,);}}@@ -3796,11 +4809,15 @@ export function createOmniRouteConfigHook(rawCompressionCombos = [];if (wantCompressionMeta) {try {- rawCompressionCombos = await compressionMetaFetcher(baseURL, apiKey, 10_000);+ rawCompressionCombos = await compressionMetaFetcher(+ baseURL,+ apiKey,+ 10_000,+ );} catch (err) {logger.warn("[omniroute-plugin] config shim: /api/context/combos fetch failed; publishing combos without compression suffix",- err+ err,);}}@@ -3816,7 +4833,7 @@ export function createOmniRouteConfigHook(} catch (err) {logger.warn("[omniroute-plugin] config shim: /api/providers fetch failed; usableOnly filter disabled for this refresh",- err+ err,);}}@@ -3831,10 +4848,11 @@ export function createOmniRouteConfigHook(const snapshot = await diskSnapshotReader(resolved.providerId);if (snapshot && snapshot.rawModels.length > 0) {logger.warn(- `[omniroute-plugin] config shim: /v1/models unreachable; using stale disk cache (${snapshot.rawModels.length} models)`+ `[omniroute-plugin] config shim: /v1/models unreachable; using stale disk cache (${snapshot.rawModels.length} models)`,);rawModels = snapshot.rawModels;rawCombos = snapshot.rawCombos;+ rawAutoCombos = snapshot.rawAutoCombos ?? [];rawEnrichment = snapshot.rawEnrichment;rawCompressionCombos = snapshot.rawCompressionCombos;rawConnections = snapshot.rawConnections;@@ -3846,12 +4864,27 @@ export function createOmniRouteConfigHook(cache.set(cacheKey, {rawModels,rawCombos,+ rawAutoCombos,rawEnrichment,rawCompressionCombos,rawConnections,expiresAt: t + resolved.modelCacheTtl,});+ // Startup diagnostics (file-based) — fires at startup via config hook+ if (resolved.features?.startupDebug === true) {+ await writeStartupDiagnostics({+ providerId: resolved.providerId,+ baseURL,+ modelCount: rawModels.length,+ comboCount: rawCombos.length,+ enrichmentSize: rawEnrichment.size,+ autoComboCount: rawAutoCombos.length,+ enrichment: rawEnrichment,+ autoCombos: rawAutoCombos,+ });+ }+// Disk-cache write: persist the last successful (or any non-empty)// catalog so a subsequent cold start with a failed fetch can recover.// Best-effort; soft-fail keeps us moving when the data dir isn't@@ -3860,6 +4893,7 @@ export function createOmniRouteConfigHook(await diskSnapshotWriter(resolved.providerId, {rawModels,rawCombos,+ rawAutoCombos,rawEnrichment,rawCompressionCombos,rawConnections,@@ -3875,7 +4909,8 @@ export function createOmniRouteConfigHook(apiKey,rawEnrichment,rawCompressionCombos,- rawConnections+ rawConnections,+ rawAutoCombos,);// Mutate the input.provider map. The Config type declares@@ -3901,7 +4936,7 @@ export function createOmniRouteConfigHook(const mcpKey = features.mcpToken ?? apiKey;if (!mcpKey) {logger.warn(- `[omniroute-plugin] mcp auto-emit skipped: no Bearer token for providerId=${resolved.providerId}`+ `[omniroute-plugin] mcp auto-emit skipped: no Bearer token for providerId=${resolved.providerId}`,);} else {const inputWithMcp = input as { mcp?: Record<string, unknown> };@@ -3910,7 +4945,7 @@ export function createOmniRouteConfigHook(}if (inputWithMcp.mcp[resolved.providerId] !== undefined) {logger.warn(- `[omniroute-plugin] mcp auto-emit skipped: mcp.${resolved.providerId} already set by user`+ `[omniroute-plugin] mcp auto-emit skipped: mcp.${resolved.providerId} already set by user`,);} else {// Strip a trailing `/v1` from baseURL when present so we land ondiff --git a/@omniroute/opencode-plugin/src/logger.ts b/@omniroute/opencode-plugin/src/logger.tsnew file mode 100644index 0000000000..de283c113c--- /dev/null+++ b/@omniroute/opencode-plugin/src/logger.ts@@ -0,0 +1,74 @@+/**+ * Structured logger for the OmniRoute plugin.+ *+ * Levels: error < warn < info < debug+ * Default: warn (matches current console.warn behavior)+ * Set via features.logLevel in plugin options.+ */++export type LogLevel = "error" | "warn" | "info" | "debug";++const LEVEL_ORDER: Record<LogLevel, number> = {+ error: 0,+ warn: 1,+ info: 2,+ debug: 3,+};++const TAG = "[omniroute-plugin]";++function shouldLog(current: LogLevel, target: LogLevel): boolean {+ return LEVEL_ORDER[current] >= LEVEL_ORDER[target];+}++let _level: LogLevel = "warn";++export function setLogLevel(level: LogLevel): void {+ _level = level;+}++export function getLogLevel(): LogLevel {+ return _level;+}++function fmt(level: LogLevel, msg: string, tag?: string): string {+ const prefix = tag ? `${TAG}${tag}` : TAG;+ return `${prefix} [${level.toUpperCase()}] ${msg}`;+}++export const logger = {+ error(msg: string, ...args: unknown[]): void {+ if (shouldLog(_level, "error")) console.error(fmt("error", msg), ...args);+ },+ warn(msg: string, ...args: unknown[]): void {+ if (shouldLog(_level, "warn")) console.warn(fmt("warn", msg), ...args);+ },+ info(msg: string, ...args: unknown[]): void {+ if (shouldLog(_level, "info")) console.warn(fmt("info", msg), ...args);+ },+ debug(msg: string, ...args: unknown[]): void {+ if (shouldLog(_level, "debug")) console.warn(fmt("debug", msg), ...args);+ },+ /** Always emit regardless of level (for critical init breadcrumbs). */+ always(msg: string, ...args: unknown[]): void {+ console.warn(TAG, msg, ...args);+ },++ // ── Tagged child loggers ──────────────────────────────────────────────+ child(tag: string) {+ return {+ error: (msg: string, ...args: unknown[]) =>+ shouldLog(_level, "error") &&+ console.error(fmt("error", msg, tag), ...args),+ warn: (msg: string, ...args: unknown[]) =>+ shouldLog(_level, "warn") &&+ console.warn(fmt("warn", msg, tag), ...args),+ info: (msg: string, ...args: unknown[]) =>+ shouldLog(_level, "info") &&+ console.warn(fmt("info", msg, tag), ...args),+ debug: (msg: string, ...args: unknown[]) =>+ shouldLog(_level, "debug") &&+ console.warn(fmt("debug", msg, tag), ...args),+ };+ },+};diff --git a/@omniroute/opencode-plugin/src/naming.ts b/@omniroute/opencode-plugin/src/naming.tsnew file mode 100644index 0000000000..52b37305b6--- /dev/null+++ b/@omniroute/opencode-plugin/src/naming.ts@@ -0,0 +1,296 @@+/**+ * Universal model naming template for the OmniRoute plugin.+ *+ * Naming pipeline:+ * [tag] <provider-label><separator><display-name><suffix>+ *+ * [Free] <provider> - <name> · <budget> ← free model+ * Auto: <variant> (<N>p) ← auto combo+ * Combo: <name> ← DB combo+ * <provider> - <name> ← regular model+ */++// ── Constants ────────────────────────────────────────────────────────────++/** Separator between provider label and model display name. */+export const PROVIDER_TAG_SEPARATOR = " - ";++/** Threshold beyond which providerDisplayName is abbreviated. */+const PROVIDER_LABEL_MAX_CHARS = 12;++/** Aliases longer than this get title-case instead of UPPER. */+const ALIAS_UPPER_MAX_CHARS = 5;++// ── Auto Combo Types ─────────────────────────────────────────────────────++export type AutoVariant =+ | "coding"+ | "fast"+ | "cheap"+ | "offline"+ | "smart"+ | "lkgp";++export const AUTO_VARIANTS: AutoVariant[] = [+ "coding",+ "fast",+ "cheap",+ "offline",+ "smart",+ "lkgp",+];++export const AUTO_VARIANT_DESCRIPTIONS: Record<+ AutoVariant | "default",+ string+> = {+ default: "Best provider via scoring",+ coding: "Quality-first for code tasks",+ fast: "Latency-optimized routing",+ cheap: "Cost-optimized routing",+ offline: "Offline-friendly providers",+ smart: "Quality-first with exploration",+ lkgp: "Last-Known-Good-Provider routing",+};++// ── Free Model Types ─────────────────────────────────────────────────────++export type FreeModelFreeType =+ | "recurring-daily"+ | "recurring-monthly"+ | "recurring-credit"+ | "one-time-initial"+ | "keyless"+ | "discontinued";++// ── Provider Label ────────────────────────────────────────────────────────++/**+ * Title-case a long, lowercase-looking alias.+ * `antigravity` → `Antigravity`+ */+function titleCaseAlias(alias: string): string {+ if (alias.length === 0) return alias;+ return alias.charAt(0).toUpperCase() + alias.slice(1).toLowerCase();+}++/**+ * Pick the short label for an upstream provider.+ *+ * Rules:+ * 1. Trim `providerDisplayName`. If ≤12 chars → use verbatim.+ * 2. Alias ≤5 chars → UPPER(alias). Alias >5 → titleCase.+ * 3. Neither → undefined.+ */+export function shortProviderLabel(+ enrichment:+ | { providerDisplayName?: string; providerAlias?: string }+ | undefined,+): string | undefined {+ if (!enrichment) return undefined;+ const raw =+ typeof enrichment.providerDisplayName === "string"+ ? enrichment.providerDisplayName.trim()+ : "";+ if (raw.length > 0 && raw.length <= PROVIDER_LABEL_MAX_CHARS) return raw;+ const alias =+ typeof enrichment.providerAlias === "string"+ ? enrichment.providerAlias.trim()+ : "";+ if (alias.length > 0) {+ return alias.length <= ALIAS_UPPER_MAX_CHARS+ ? alias.toUpperCase()+ : titleCaseAlias(alias);+ }+ return undefined;+}++// ── Free Label ────────────────────────────────────────────────────────────++/**+ * Normalise display name so free-tier models get a consistent `[Free] ` prefix.+ *+ * "GPT-4.1 (Free)" → "[Free] GPT-4.1"+ * "DeepSeek V4 Flash Free" → "[Free] DeepSeek V4 Flash"+ * "Claude Opus 4.7" → "Claude Opus 4.7" (unchanged)+ */+export function normaliseFreeLabel(name: string): string {+ const cleaned = name+ .replace(/\s*\(free\)\s*$/i, "")+ .replace(/[\s-]+free\s*$/i, "")+ .trim();+ const wasFree = cleaned.length < name.trim().length;+ if (!wasFree) return name;+ return `[Free] ${cleaned}`;+}++// ── Free Budget Formatting ────────────────────────────────────────────────++function fmtTokens(n: number): string {+ if (n >= 1e9) return (n / 1e9).toFixed(1).replace(/\.0$/, "") + "B";+ if (n >= 1e6) return (n / 1e6).toFixed(1).replace(/\.0$/, "") + "M";+ if (n >= 1e3) return (n / 1e3).toFixed(1).replace(/\.0$/, "") + "K";+ return String(n);+}++/**+ * Format a free model budget into a short human-readable suffix.+ *+ * recurring-daily → "25M tokens/day"+ * recurring-monthly → "25M tokens/month"+ * recurring-credit → "10M credits"+ * one-time-initial → "1M credits (one-time)"+ * keyless → "(keyless)"+ * discontinued → "(discontinued)"+ */+export function formatFreeBudget(params: {+ freeType: FreeModelFreeType;+ monthlyTokens?: number;+ creditTokens?: number;+}): string {+ const { freeType, monthlyTokens = 0, creditTokens = 0 } = params;++ switch (freeType) {+ case "recurring-daily":+ return `${fmtTokens(monthlyTokens)} tokens/day`;+ case "recurring-monthly":+ return `${fmtTokens(monthlyTokens)} tokens/month`;+ case "recurring-credit":+ return `${fmtTokens(creditTokens)} credits`;+ case "one-time-initial":+ return `${fmtTokens(creditTokens)} credits (one-time)`;+ case "keyless":+ return "(keyless)";+ case "discontinued":+ return "(discontinued)";+ default:+ return "";+ }+}++// ── Auto Combo Naming ─────────────────────────────────────────────────────++/**+ * Format auto combo display name.+ *+ * "Auto: Coding (4p)"+ * "Auto: Default (6p)"+ * "Auto" (no candidate count when unknown)+ */+export function formatAutoComboName(+ variant: AutoVariant | undefined,+ candidateCount?: number,+): string {+ const label = variant+ ? variant.charAt(0).toUpperCase() + variant.slice(1)+ : "Default";+ const count =+ typeof candidateCount === "number" && candidateCount > 0+ ? ` (${candidateCount}p)`+ : "";+ return `Auto: ${label}${count}`;+}++/**+ * Build the model ID for an auto combo entry.+ * "auto/coding", "auto/fast", "auto" (default).+ */+export function autoComboModelId(variant: AutoVariant | undefined): string {+ return variant ? `auto/${variant}` : "auto";+}++// ── Universal Display Name Builder ────────────────────────────────────────++export interface ModelDisplayNameParams {+ /** Raw model ID (e.g. "cc/claude-sonnet-4-6"). */+ rawId: string;+ /** Enrichment display name (e.g. "Claude Sonnet 4.6"). */+ enrichmentName?: string;+ /** Provider tag enrichment. */+ providerAlias?: string;+ /** Human-readable upstream provider label. */+ providerDisplayName?: string;+ /** Whether model is free tier. */+ isFree?: boolean;+ /** Free model budget info. */+ freeType?: FreeModelFreeType;+ /** Monthly token budget (for recurring free models). */+ monthlyTokens?: number;+ /** Credit token budget (for credit-based free models). */+ creditTokens?: number;+ /** Whether this is a combo entry (skip provider tag). */+ isCombo?: boolean;+ /** Whether this is an auto combo entry. */+ isAutoCombo?: boolean;+ /** Auto combo variant. */+ autoVariant?: AutoVariant;+ /** Auto combo candidate count. */+ autoCandidateCount?: number;+}++/**+ * Build the final display name following the universal template.+ *+ * Priority:+ * 1. Auto combo → "Auto: <variant> (<N>p)"+ * 2. DB combo → "Combo: <name>"+ * 3. Free + enrichment + provider tag → "[Free] <label> - <name> · <budget>"+ * 4. Free + enrichment → "[Free] <name> · <budget>"+ * 5. Free + raw → "[Free] <rawId> · <budget>"+ * 6. Enrichment + provider tag → "<label> - <name>"+ * 7. Enrichment only → "<name>"+ * 8. Raw fallback → normaliseFreeLabel(rawId)+ */+export function buildModelDisplayName(params: ModelDisplayNameParams): string {+ // Auto combos+ if (params.isAutoCombo) {+ return formatAutoComboName(params.autoVariant, params.autoCandidateCount);+ }++ // Determine base name — strip any existing free suffix first+ const rawBase =+ params.enrichmentName && params.enrichmentName.trim().length > 0+ ? params.enrichmentName+ : params.rawId;+ const cleanedBase = rawBase+ .replace(/\s*\(free\)\s*$/i, "")+ .replace(/[\s-]+free\s*$/i, "")+ .trim();+ const wasFree = cleanedBase.length < rawBase.trim().length;+ const isFree = !!params.isFree || wasFree;++ let baseName = cleanedBase;++ // Provider tag (skip for combos)+ if (!params.isCombo) {+ const label = shortProviderLabel({+ providerDisplayName: params.providerDisplayName,+ providerAlias: params.providerAlias,+ });+ if (label) {+ const prefix = `${label}${PROVIDER_TAG_SEPARATOR}`;+ if (!baseName.startsWith(prefix)) {+ baseName = `${prefix}${baseName}`;+ }+ }+ }++ // Prepend [Free] if applicable (AFTER provider tag for correct ordering)+ if (isFree) {+ baseName = `[Free] ${baseName}`;+ }++ // Free budget suffix+ if (isFree && params.freeType) {+ const budget = formatFreeBudget({+ freeType: params.freeType,+ monthlyTokens: params.monthlyTokens,+ creditTokens: params.creditTokens,+ });+ if (budget) {+ baseName = `${baseName} · ${budget}`;+ }+ }++ return baseName;+}diff --git a/open-sse/services/autoCombo/autoPrefix.ts b/open-sse/services/autoCombo/autoPrefix.tsindex 18be4d9db7..95a9f13eb4 100644--- a/open-sse/services/autoCombo/autoPrefix.ts+++ b/open-sse/services/autoCombo/autoPrefix.ts@@ -6,7 +6,14 @@ export interface AutoPrefixParseResult {error?: string;}-const VALID_VARIANTS: AutoVariant[] = ["coding", "fast", "cheap", "offline", "smart", "lkgp"];+export const VALID_VARIANTS: AutoVariant[] = [+ "coding",+ "fast",+ "cheap",+ "offline",+ "smart",+ "lkgp",+];/*** Parses a model name to determine if it's an auto-prefixed model and extracts the variant.diff --git a/src/app/api/combos/auto/route.ts b/src/app/api/combos/auto/route.tsnew file mode 100644index 0000000000..87ff185b22--- /dev/null+++ b/src/app/api/combos/auto/route.ts@@ -0,0 +1,49 @@+import { NextResponse } from "next/server";+import { requireManagementAuth } from "@/lib/api/requireManagementAuth";+import {+ VALID_VARIANTS,+ type AutoVariant,+} from "@omniroute/open-sse/services/autoCombo/autoPrefix";++const ALL_VARIANTS: Array<{ variant: AutoVariant | undefined; name: string }> = [+ { variant: undefined, name: "Auto" },+ ...VALID_VARIANTS.map((v) => ({+ variant: v,+ name: `Auto ${v.charAt(0).toUpperCase() + v.slice(1)}`,+ })),+];++// GET /api/combos/auto - List available auto combo variants with candidate info+export async function GET(request: Request) {+ const authError = await requireManagementAuth(request);+ if (authError) return authError;++ try {+ const { createVirtualAutoCombo } =+ await import("@omniroute/open-sse/services/autoCombo/virtualFactory");++ const combos = [];+ for (const { variant, name } of ALL_VARIANTS) {+ try {+ const virtual = await createVirtualAutoCombo(variant);+ combos.push({+ id: variant ? `auto/${variant}` : "auto",+ name,+ variant: variant ?? null,+ type: "auto",+ isHidden: false,+ candidatePool: virtual.candidatePool ?? [],+ candidateCount: virtual.candidatePool?.length ?? 0,+ config: virtual.config ?? {},+ });+ } catch {+ // Individual variant failure — skip, don't break the whole list+ }+ }++ return NextResponse.json({ combos });+ } catch (error) {+ console.error("Error fetching auto combos:", error);+ return NextResponse.json({ combos: [] });+ }+}diff --git a/src/app/api/free-models/route.ts b/src/app/api/free-models/route.tsnew file mode 100644index 0000000000..862e784446--- /dev/null+++ b/src/app/api/free-models/route.ts@@ -0,0 +1,27 @@+import { NextResponse } from "next/server";+import { requireManagementAuth } from "@/lib/api/requireManagementAuth";+import { FREE_MODEL_BUDGETS } from "@omniroute/open-sse/config/freeModelCatalog";++// GET /api/free-models - List free model budgets for plugin enrichment+export async function GET(request: Request) {+ const authError = await requireManagementAuth(request);+ if (authError) return authError;++ try {+ const models = FREE_MODEL_BUDGETS.map((m) => ({+ provider: m.provider,+ modelId: m.modelId,+ displayName: m.displayName,+ monthlyTokens: m.monthlyTokens,+ creditTokens: m.creditTokens,+ freeType: m.freeType,+ poolKey: m.poolKey,+ tos: m.tos,+ }));++ return NextResponse.json({ models });+ } catch (error) {+ console.error("Error fetching free models:", error);+ return NextResponse.json({ models: [] });+ }+}diff --git a/tests/unit/auto-combos-free-models-routes.test.ts b/tests/unit/auto-combos-free-models-routes.test.tsnew file mode 100644index 0000000000..ca7fa6772d--- /dev/null+++ b/tests/unit/auto-combos-free-models-routes.test.ts@@ -0,0 +1,139 @@+/**+ * Unit tests for GET /api/combos/auto and GET /api/free-models (PR #3435).+ *+ * Rule #18 regression coverage for two new endpoints added by mm/auto-combos-plugin.+ * Tests: happy-path response shape, auth gate (401/403 when requireManagementAuth blocks).+ */+import test from "node:test";+import assert from "node:assert/strict";+import fs from "node:fs";+import os from "node:os";+import path from "node:path";++// ── DB / auth setup ───────────────────────────────────────────────────────────++const TEST_DATA_DIR = fs.mkdtempSync(+ path.join(os.tmpdir(), "omniroute-auto-combos-free-models-")+);+process.env.DATA_DIR = TEST_DATA_DIR;+process.env.API_KEY_SECRET = process.env.API_KEY_SECRET ?? "auto-combos-free-models-test-secret";++const core = await import("../../src/lib/db/core.ts");+const apiKeysDb = await import("../../src/lib/db/apiKeys.ts");+const settingsDb = await import("../../src/lib/db/settings.ts");++// Routes loaded AFTER env is set+const combosAutoRoute = await import("../../src/app/api/combos/auto/route.ts");+const freeModelsRoute = await import("../../src/app/api/free-models/route.ts");++// ── Helpers ───────────────────────────────────────────────────────────────────++function makeRequest(url: string, apiKey?: string): Request {+ return new Request(url, {+ method: "GET",+ headers: apiKey ? { authorization: `Bearer ${apiKey}` } : {},+ });+}++test.after(() => {+ core.resetDbInstance();+ try {+ fs.rmSync(TEST_DATA_DIR, { recursive: true, force: true });+ } catch {+ // best-effort cleanup+ }+});++// ── /api/free-models ──────────────────────────────────────────────────────────++test("GET /api/free-models returns 200 with models array (no auth required by default)", async () => {+ await settingsDb.updateSettings({ requireLogin: false });++ const req = makeRequest("http://localhost/api/free-models");+ const res = await freeModelsRoute.GET(req as never);+ const body = await res.json();++ assert.equal(res.status, 200);+ assert.ok(Array.isArray(body.models), "body.models should be an array");+ assert.ok(body.models.length > 0, "should have at least one free model entry");++ const first = body.models[0];+ assert.ok(typeof first.provider === "string", "model.provider should be a string");+ assert.ok(typeof first.modelId === "string", "model.modelId should be a string");+ assert.ok(typeof first.monthlyTokens === "number", "model.monthlyTokens should be a number");+});++test("GET /api/free-models returns 401/403 when auth is required and no token provided", async () => {+ await settingsDb.updateSettings({ requireLogin: true });+ process.env.INITIAL_PASSWORD = "test-password-free-models";++ const req = makeRequest("http://localhost/api/free-models");+ const res = await freeModelsRoute.GET(req as never);++ assert.ok(+ res.status === 401 || res.status === 403,+ `Expected 401 or 403 without auth, got ${res.status}`+ );++ await settingsDb.updateSettings({ requireLogin: false });+ delete process.env.INITIAL_PASSWORD;+});++test("GET /api/free-models returns 200 with valid management API key", async () => {+ await settingsDb.updateSettings({ requireLogin: true });+ process.env.INITIAL_PASSWORD = "test-password-free-models2";+ const { key } = await apiKeysDb.createApiKey("free-models-test", "machine-free-models", [+ "manage",+ ]);++ const req = makeRequest("http://localhost/api/free-models", key);+ const res = await freeModelsRoute.GET(req as never);+ const body = await res.json();++ assert.equal(res.status, 200);+ assert.ok(Array.isArray(body.models));++ await settingsDb.updateSettings({ requireLogin: false });+ delete process.env.INITIAL_PASSWORD;+});++// ── /api/combos/auto ─────────────────────────────────────────────────────────++test("GET /api/combos/auto returns 200 with combos array (no auth required by default)", async () => {+ await settingsDb.updateSettings({ requireLogin: false });++ const req = makeRequest("http://localhost/api/combos/auto");+ const res = await combosAutoRoute.GET(req as never);+ const body = await res.json();++ assert.equal(res.status, 200);+ assert.ok(Array.isArray(body.combos), "body.combos should be an array");+});++test("GET /api/combos/auto returns 401/403 when auth is required and no token provided", async () => {+ await settingsDb.updateSettings({ requireLogin: true });+ process.env.INITIAL_PASSWORD = "test-password-combos-auto";++ const req = makeRequest("http://localhost/api/combos/auto");+ const res = await combosAutoRoute.GET(req as never);++ assert.ok(+ res.status === 401 || res.status === 403,+ `Expected 401 or 403 without auth, got ${res.status}`+ );++ await settingsDb.updateSettings({ requireLogin: false });+ delete process.env.INITIAL_PASSWORD;+});++test("GET /api/combos/auto soft-fails and returns empty array on createVirtualAutoCombo error", async () => {+ await settingsDb.updateSettings({ requireLogin: false });++ // Even when virtualFactory throws (no combos configured), route should return empty array+ const req = makeRequest("http://localhost/api/combos/auto");+ const res = await combosAutoRoute.GET(req as never);+ const body = await res.json();++ assert.equal(res.status, 200);+ assert.ok(Array.isArray(body.combos), "should always return an array even on errors");+});