mirror of
https://github.com/diegosouzapw/OmniRoute.git
synced 2026-07-31 04:12:10 +03:00
* feat(plugins): WordPress-style plugin system backend * fix(plugins): address code review feedback - Path traversal guard: validate entryPoint stays within plugin dir - install() now handles direct plugin directories (not just parent dirs) - Non-null assertion replaced with explicit null check - require efficiency: allowedModules map moved outside function - Source wrapper: add newlines to prevent trailing comment issues - Config validation: validate values against configSchema on save - Dynamic import comment: clarify Node.js caching behavior Co-Authored-By: OpenClaude (mimo-v2.5-pro) <openclaude@gitlawb.com> * fix(plugins): replace vm with child_process, add auth to all routes Addresses all remaining code review feedback: 1. **Loader rewrite**: Replaced Node.js vm module with child_process.fork() for proper process-level isolation. Complies with Rule 3 (no eval). Each plugin runs in a separate Node.js process with IPC communication. 2. **Auth on all routes**: Added requireManagementAuth to all 6 plugin API route files (list, install, scan, details, activate, deactivate, config). 3. **Env filtering**: Only safe env vars passed to plugin processes unless "env" permission is granted. Co-Authored-By: OpenClaude (mimo-v2.5-pro) <openclaude@gitlawb.com> * fix(plugins): security + ESM fixes for loader and manager loader.ts: - Fix IPC: use process.send()/process.on("message") instead of worker_threads.parentPort - Fix ESM: write host script as .mjs (not .js) to force ESM execution - Add timeout: 10s default on callHook() with Promise.race - Add SIGKILL escalation: SIGTERM first, then SIGKILL after 3s grace - Fix env filtering: use allowlist (safeKeys) instead of passing all env vars - Clear timeout on successful IPC response (no timer leak) manager.ts: - Fix path traversal: use fs.realpath() instead of startsWith() - Fix imports: use registerHook/unregisterHooks from hooks.ts - Register hooks individually via registerHook(event, name, handler) hooks.ts: - Copied from feat/plugin-custom-hooks (canonical registry) * feat(discovery): add discovery tool stub service Phase 1 scaffold for automated provider discovery: - DiscoveryConfig, DiscoveryResult types - probeEndpoint() for URL availability checking - scanProvider() stub (Phase 2 will implement real scanning) - getDiscoveryResults() stub - Default config: disabled (opt-in) * chore(plugins): slop cleanup — pino logger, remove redundant sorts - index.ts: replace console.log/error with pino structured logging - hooks.ts: remove redundant .sort() in emitHookBlocking/runOnResponse (already sorted on registration) - manager.ts: add readFile import * test(plugins): add scanner, loader, manager unit tests - scanner: 9 tests (discovery, hidden dirs, validation, entry point, multiple) - loader: 5 tests (type contracts, Plugin/PluginContext/PluginResult interfaces) - manager: 6 tests (singleton, lifecycle methods, error on unknown) - Total: 20 tests, all passing * fix(settings): add missing home page pin keys to updateSettingsSchema * feat(plugins): add i18n keys to all 42 locales * fix(settings): add missing security keys to updateSettingsSchema and add tests * fix(usage): analytics route reads combo_name/requested_model from call_logs only The 3.8.6 variant of #2904 added SELECTs of combo_name/requested_model against usage_history, but those columns only exist in call_logs (no migration adds them to usage_history). This returned HTTP 500 on /api/usage/analytics. Restore the working query shape from the 3.8.7 variant. Fixes 18 failing usage-analytics-route tests. * fix(types,test): resolve noImplicitAny in progressiveAging + align semaphore test to #2903 gate pruning - progressiveAging: type compression results so messages[0].content is indexable (was TS7053 against {}); restores typecheck:noimplicit:core gate. - services-branch-hardening: #2903 (perf-ram) prunes idle rate-limit gates on zero; assert no-running/empty-queue without assuming the entry persists. * fix(analytics): address merged review regressions * fix(executor): normalize max effort for openai shape providers * Make zero-latency combo optimizations opt-in * Address zero-latency combo review feedback * chore(release): sync v3.8.7 touchpoints + credit contributors - llm.txt → 3.8.7 (Current version + Key Features header) - CHANGELOG: add Dmitry Kuznetsov & Nikolay Alafuzov to 3.8.6 Hall of Contributors - version already 3.8.7 across package.json/open-sse/electron/openapi (from #2909) * fix(cleanup): restore usage history cutoff boundary * docs(changelog): rank 3.8.6 contributors in a commits table with their PRs * fix(dashboard): theme ReactFlow Controls +/- buttons for dark mode * fix(settings): add missing home page pin keys to updateSettingsSchema * fix(settings): add missing security keys to updateSettingsSchema and add tests * fix(executor): normalize max effort for openai shape providers * Make zero-latency combo optimizations opt-in * Address zero-latency combo review feedback * fix(analytics): address merged review regressions * fix(cleanup): restore usage history cutoff boundary * feat(plugins): WordPress-style plugin system backend * fix(plugins): address code review feedback - Path traversal guard: validate entryPoint stays within plugin dir - install() now handles direct plugin directories (not just parent dirs) - Non-null assertion replaced with explicit null check - require efficiency: allowedModules map moved outside function - Source wrapper: add newlines to prevent trailing comment issues - Config validation: validate values against configSchema on save - Dynamic import comment: clarify Node.js caching behavior Co-Authored-By: OpenClaude (mimo-v2.5-pro) <openclaude@gitlawb.com> * fix(plugins): replace vm with child_process, add auth to all routes Addresses all remaining code review feedback: 1. **Loader rewrite**: Replaced Node.js vm module with child_process.fork() for proper process-level isolation. Complies with Rule 3 (no eval). Each plugin runs in a separate Node.js process with IPC communication. 2. **Auth on all routes**: Added requireManagementAuth to all 6 plugin API route files (list, install, scan, details, activate, deactivate, config). 3. **Env filtering**: Only safe env vars passed to plugin processes unless "env" permission is granted. Co-Authored-By: OpenClaude (mimo-v2.5-pro) <openclaude@gitlawb.com> * fix(plugins): security + ESM fixes for loader and manager loader.ts: - Fix IPC: use process.send()/process.on("message") instead of worker_threads.parentPort - Fix ESM: write host script as .mjs (not .js) to force ESM execution - Add timeout: 10s default on callHook() with Promise.race - Add SIGKILL escalation: SIGTERM first, then SIGKILL after 3s grace - Fix env filtering: use allowlist (safeKeys) instead of passing all env vars - Clear timeout on successful IPC response (no timer leak) manager.ts: - Fix path traversal: use fs.realpath() instead of startsWith() - Fix imports: use registerHook/unregisterHooks from hooks.ts - Register hooks individually via registerHook(event, name, handler) hooks.ts: - Copied from feat/plugin-custom-hooks (canonical registry) * feat(discovery): add discovery tool stub service Phase 1 scaffold for automated provider discovery: - DiscoveryConfig, DiscoveryResult types - probeEndpoint() for URL availability checking - scanProvider() stub (Phase 2 will implement real scanning) - getDiscoveryResults() stub - Default config: disabled (opt-in) * chore(plugins): slop cleanup — pino logger, remove redundant sorts - index.ts: replace console.log/error with pino structured logging - hooks.ts: remove redundant .sort() in emitHookBlocking/runOnResponse (already sorted on registration) - manager.ts: add readFile import * test(plugins): add scanner, loader, manager unit tests - scanner: 9 tests (discovery, hidden dirs, validation, entry point, multiple) - loader: 5 tests (type contracts, Plugin/PluginContext/PluginResult interfaces) - manager: 6 tests (singleton, lifecycle methods, error on unknown) - Total: 20 tests, all passing * feat(plugins): add i18n keys to all 42 locales * chore(plugins): remove duplicate migration 059_create_plugins.sql * chore(plugins): remove duplicate migration 059_create_plugins.sql (post-merge) * fix(sse): guard non-string error.code in proxyFetch + harden model parsing (#2463) (#2923) Integrated into release/v3.8.7 * fix(docker): add runner-web stage with Playwright Chromium (#2832) (#2846) Integrated into release/v3.8.7 * docs(changelog): document NVIDIA NIM and error code type-crash fix (#2463) * test: ignore NVIDIA_BASE_URL and NVIDIA_MODEL in env contract check --------- Co-authored-by: oyi77 <oyi77@users.noreply.github.com> Co-authored-by: OpenClaude (mimo-v2.5-pro) <openclaude@gitlawb.com> Co-authored-by: Apostol Apostolov <theapoapostolov@gmail.com> Co-authored-by: Halil Tezcan KARABULUT <info@hlltzcnkb.com> Co-authored-by: R.D. <rogerproself@gmail.com>
602 lines
21 KiB
TypeScript
602 lines
21 KiB
TypeScript
import { PROVIDER_ID_TO_ALIAS, PROVIDER_MODELS } from "../config/providerModels.ts";
|
|
import { ANTIGRAVITY_MODEL_ALIASES } from "../config/antigravityModelAliases.ts";
|
|
import { resolveWildcardAlias } from "./wildcardRouter.ts";
|
|
|
|
type ProviderModelAliasMap = Record<string, Record<string, string>>;
|
|
type ModelAliasValue = string | { provider?: string; model?: string };
|
|
type ModelAliasMap = Record<string, ModelAliasValue>;
|
|
type ParsedModel = {
|
|
provider: string | null;
|
|
model: string | null;
|
|
isAlias: boolean;
|
|
providerAlias: string | null;
|
|
extendedContext: boolean;
|
|
};
|
|
type ResolvedModelTarget = {
|
|
provider?: string | null;
|
|
model: string | null;
|
|
};
|
|
|
|
// Derive alias→provider mapping from the single source of truth (PROVIDER_ID_TO_ALIAS)
|
|
// This prevents the two maps from drifting out of sync
|
|
const ALIAS_TO_PROVIDER_ID: Record<string, string> = {};
|
|
for (const [id, alias] of Object.entries(PROVIDER_ID_TO_ALIAS)) {
|
|
if (ALIAS_TO_PROVIDER_ID[alias]) {
|
|
console.log(
|
|
`[MODEL] Warning: alias "${alias}" maps to both "${ALIAS_TO_PROVIDER_ID[alias]}" and "${id}". Using "${id}".`
|
|
);
|
|
}
|
|
ALIAS_TO_PROVIDER_ID[alias] = id;
|
|
}
|
|
// Manual alias overrides — maps slug-style prefixes to canonical provider IDs.
|
|
// These live outside the registry because they represent multiple providers
|
|
// or backward-compatible slug changes, not a single provider's display name.
|
|
// opencode/ → opencode-zen (the main free/open tier; opencode-go is a separate paid tier)
|
|
ALIAS_TO_PROVIDER_ID["opencode"] = "opencode-zen";
|
|
|
|
// Manual aliases for external compatibility not covered by PROVIDER_ID_TO_ALIAS.
|
|
// OpenCode's Zen provider now uses the "opencode" slug, but OmniRoute registers
|
|
// it as "opencode-zen". This alias ensures `opencode/<model>` resolves correctly.
|
|
ALIAS_TO_PROVIDER_ID["opencode"] = "opencode-zen";
|
|
|
|
// Provider-scoped legacy model aliases. Used to normalize provider/model inputs
|
|
// and keep backward compatibility when upstream IDs change.
|
|
const PROVIDER_MODEL_ALIASES: ProviderModelAliasMap = {
|
|
openai: {
|
|
"gpt-4o-mini": "gpt-4o-mini",
|
|
},
|
|
github: {
|
|
"claude-4.5-opus": "claude-opus-4-5-20251101",
|
|
"claude-opus-4.5": "claude-opus-4-5-20251101",
|
|
"gemini-3-pro": "gemini-3.1-pro-preview",
|
|
"gemini-3-pro-preview": "gemini-3.1-pro-preview",
|
|
"gemini-3-flash": "gemini-3-flash-preview",
|
|
"raptor-mini": "oswe-vscode-prime",
|
|
},
|
|
gemini: {
|
|
"gemini-3.1-pro": "gemini-3.1-pro-preview",
|
|
"gemini-3-1-pro": "gemini-3.1-pro-preview",
|
|
},
|
|
"gemini-cli": {
|
|
"gemini-3.1-pro": "gemini-3.1-pro-preview",
|
|
"gemini-3-1-pro": "gemini-3.1-pro-preview",
|
|
},
|
|
nvidia: {
|
|
"gpt-oss-120b": "openai/gpt-oss-120b",
|
|
"nvidia/gpt-oss-120b": "openai/gpt-oss-120b",
|
|
"gpt-oss-20b": "openai/gpt-oss-20b",
|
|
"nvidia/gpt-oss-20b": "openai/gpt-oss-20b",
|
|
},
|
|
antigravity: { ...ANTIGRAVITY_MODEL_ALIASES },
|
|
kiro: {
|
|
"claude-opus-4-7": "claude-opus-4.7",
|
|
"claude-opus-4-6": "claude-opus-4.6",
|
|
"claude-sonnet-4-6": "claude-sonnet-4.6",
|
|
"claude-sonnet-4-5": "claude-sonnet-4.5",
|
|
"claude-haiku-4-5": "claude-haiku-4.5",
|
|
},
|
|
};
|
|
|
|
const CROSS_PROXY_MODEL_ALIASES: Record<string, string> = {
|
|
"gpt-oss:120b": "gpt-oss-120b",
|
|
"deepseek-v3.2-chat": "deepseek-v3.2",
|
|
"deepseek-v3-2": "deepseek-v3.2",
|
|
"qwen3-coder:480b": "Qwen/Qwen3-Coder-480B-A35B-Instruct",
|
|
"claude-opus-4.5": "claude-opus-4-5-20251101",
|
|
"anthropic/claude-opus-4.5": "claude-opus-4-5-20251101",
|
|
};
|
|
|
|
const CROSS_PROXY_MODEL_ALIASES_LOWER = Object.fromEntries(
|
|
Object.entries(CROSS_PROXY_MODEL_ALIASES).map(([alias, canonical]) => [
|
|
alias.toLowerCase(),
|
|
canonical,
|
|
])
|
|
);
|
|
|
|
// Reverse index: modelId -> providerIds that expose this model
|
|
const MODEL_TO_PROVIDERS = new Map<string, string[]>();
|
|
for (const [aliasOrId, models] of Object.entries(PROVIDER_MODELS)) {
|
|
const providerId = ALIAS_TO_PROVIDER_ID[aliasOrId] || aliasOrId;
|
|
for (const modelEntry of models || []) {
|
|
const modelId = modelEntry?.id;
|
|
if (!modelId) continue;
|
|
const providers = MODEL_TO_PROVIDERS.get(modelId) || [];
|
|
if (!providers.includes(providerId)) {
|
|
providers.push(providerId);
|
|
MODEL_TO_PROVIDERS.set(modelId, providers);
|
|
}
|
|
}
|
|
}
|
|
const KNOWN_MODEL_IDS = new Set(MODEL_TO_PROVIDERS.keys());
|
|
const CODEX_PREFERRED_UNPREFIXED_MODELS = new Set(["gpt-5.5"]);
|
|
const CODEX_PREFERRED_UNPREFIXED_MODEL_ALIASES = new Map([["gpt-5.5", "gpt-5.5-medium"]]);
|
|
export const CODEX_NATIVE_UNPREFIXED_MODELS = new Set(["codex-auto-review"]);
|
|
|
|
interface ProviderConnectionLike {
|
|
provider?: unknown;
|
|
isActive?: unknown;
|
|
is_active?: unknown;
|
|
}
|
|
|
|
/**
|
|
* Resolve provider alias to provider ID
|
|
*/
|
|
export function resolveProviderAlias(aliasOrId: string | null | undefined): string | null {
|
|
if (typeof aliasOrId !== "string") return null;
|
|
return ALIAS_TO_PROVIDER_ID[aliasOrId] || aliasOrId;
|
|
}
|
|
|
|
function isCrossProxyModelCompatEnabled() {
|
|
const raw = process.env.MODEL_ALIAS_COMPAT_ENABLED;
|
|
return raw !== "false" && raw !== "0";
|
|
}
|
|
|
|
export function normalizeCrossProxyModelId(modelId: unknown): {
|
|
modelId: string | null;
|
|
applied: boolean;
|
|
original: string | null;
|
|
} {
|
|
if (!modelId || typeof modelId !== "string" || !isCrossProxyModelCompatEnabled()) {
|
|
return {
|
|
modelId: typeof modelId === "string" ? modelId : null,
|
|
applied: false,
|
|
original: null,
|
|
};
|
|
}
|
|
|
|
const normalized =
|
|
CROSS_PROXY_MODEL_ALIASES[modelId] || CROSS_PROXY_MODEL_ALIASES_LOWER[modelId.toLowerCase()];
|
|
|
|
if (!normalized || normalized === modelId) {
|
|
return { modelId, applied: false, original: null };
|
|
}
|
|
|
|
console.debug(`[MODEL] Cross-proxy alias applied: "${modelId}" → "${normalized}"`);
|
|
return { modelId: normalized, applied: true, original: modelId };
|
|
}
|
|
|
|
/**
|
|
* Resolve provider-specific legacy model alias to canonical model ID.
|
|
*/
|
|
function resolveProviderModelAlias(
|
|
providerOrAlias: string | null | undefined,
|
|
modelId: string | null | undefined
|
|
) {
|
|
if (!modelId || typeof modelId !== "string") return modelId;
|
|
const providerId = resolveProviderAlias(providerOrAlias);
|
|
if (typeof providerId !== "string") return modelId;
|
|
const aliases = PROVIDER_MODEL_ALIASES[providerId];
|
|
return aliases?.[modelId] || modelId;
|
|
}
|
|
|
|
function hasKnownProviderModel(providerOrAlias: string | null | undefined, modelId: string | null) {
|
|
if (!providerOrAlias || !modelId) return false;
|
|
|
|
const providerId = resolveProviderAlias(providerOrAlias);
|
|
if (typeof providerId !== "string") return false;
|
|
const providerAlias = PROVIDER_ID_TO_ALIAS[providerId] || providerId;
|
|
const models = PROVIDER_MODELS[providerAlias] || PROVIDER_MODELS[providerId] || [];
|
|
|
|
if (models.some((entry) => entry?.id === modelId)) return true;
|
|
|
|
const aliases = PROVIDER_MODEL_ALIASES[providerId];
|
|
if (aliases && Object.prototype.hasOwnProperty.call(aliases, modelId)) return true;
|
|
|
|
const canonicalModel = resolveProviderModelAlias(providerId, modelId);
|
|
if (canonicalModel === modelId) return false;
|
|
|
|
return true;
|
|
}
|
|
|
|
function hasCodexPreferredUnprefixedModel(modelId: string) {
|
|
const canonicalModel = CODEX_PREFERRED_UNPREFIXED_MODEL_ALIASES.get(modelId);
|
|
if (!canonicalModel) return false;
|
|
|
|
const providerAlias = PROVIDER_ID_TO_ALIAS.codex || "codex";
|
|
const models = PROVIDER_MODELS[providerAlias] || PROVIDER_MODELS.codex || [];
|
|
return models.some((entry) => entry?.id === canonicalModel);
|
|
}
|
|
|
|
function resolveInferredProviderModel(provider: string, modelId: string) {
|
|
const codexPreferredModel = CODEX_PREFERRED_UNPREFIXED_MODEL_ALIASES.get(modelId);
|
|
if (provider === "codex" && codexPreferredModel) {
|
|
return codexPreferredModel;
|
|
}
|
|
return resolveProviderModelAlias(provider, modelId);
|
|
}
|
|
|
|
function getInferredProvidersForModel(modelId: string) {
|
|
const providers = [...(MODEL_TO_PROVIDERS.get(modelId) || [])];
|
|
|
|
if (
|
|
CODEX_PREFERRED_UNPREFIXED_MODELS.has(modelId) &&
|
|
hasCodexPreferredUnprefixedModel(modelId) &&
|
|
!providers.includes("codex")
|
|
) {
|
|
providers.push("codex");
|
|
}
|
|
|
|
return providers;
|
|
}
|
|
|
|
function isProviderConnectionActive(connection: ProviderConnectionLike) {
|
|
if (connection.isActive !== undefined) {
|
|
return connection.isActive !== false && connection.isActive !== 0;
|
|
}
|
|
if (connection.is_active !== undefined) {
|
|
return connection.is_active !== false && connection.is_active !== 0;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
function getProviderIdFromConnection(connection: unknown) {
|
|
if (!connection || typeof connection !== "object") return null;
|
|
const record = connection as ProviderConnectionLike;
|
|
if (typeof record.provider !== "string" || !record.provider) return null;
|
|
if (!isProviderConnectionActive(record)) return null;
|
|
return resolveProviderAlias(record.provider);
|
|
}
|
|
|
|
async function getActiveProviderSet() {
|
|
try {
|
|
const { getProviderConnections } = await import("@/lib/localDb");
|
|
const conns = (await getProviderConnections()) as unknown[];
|
|
const providers = conns
|
|
.map(getProviderIdFromConnection)
|
|
.filter((provider): provider is string => Boolean(provider));
|
|
return new Set(providers);
|
|
} catch {
|
|
return null;
|
|
}
|
|
}
|
|
|
|
function shouldTreatAsExactModelId(modelStr: string | null) {
|
|
if (!modelStr || typeof modelStr !== "string" || !modelStr.includes("/")) return false;
|
|
if (!KNOWN_MODEL_IDS.has(modelStr)) return false;
|
|
|
|
const firstSlash = modelStr.indexOf("/");
|
|
const providerOrAlias = modelStr.slice(0, firstSlash).trim();
|
|
const providerScopedModel = modelStr.slice(firstSlash + 1).trim();
|
|
return !hasKnownProviderModel(providerOrAlias, providerScopedModel);
|
|
}
|
|
|
|
/**
|
|
* Resolve a provider/model pair into canonical provider ID + provider-scoped model ID.
|
|
* Keeps provider-specific legacy aliases out of downstream capability and budget lookups.
|
|
*/
|
|
export function resolveCanonicalProviderModel(
|
|
providerOrAlias: string | null | undefined,
|
|
modelId: string | null | undefined
|
|
) {
|
|
if (!modelId || typeof modelId !== "string") {
|
|
return {
|
|
provider: resolveProviderAlias(providerOrAlias),
|
|
model: modelId || null,
|
|
};
|
|
}
|
|
|
|
const provider = resolveProviderAlias(providerOrAlias);
|
|
return {
|
|
provider,
|
|
model: resolveProviderModelAlias(provider, modelId),
|
|
};
|
|
}
|
|
|
|
/**
|
|
* Parse model string: "alias/model" or "provider/model" or just alias
|
|
* Supports [1m] suffix for extended 1M context window (e.g. "claude-sonnet-4-6[1m]")
|
|
*/
|
|
export function parseModel(modelStr: string | null | undefined): ParsedModel {
|
|
// Guard truthy non-strings (object/number/array), not just falsy values — a
|
|
// malformed combo `modelStr` or providerSpecificData saved as an object would
|
|
// otherwise reach `cleanStr.endsWith("[1m]")` and crash with
|
|
// `endsWith is not a function`. Same class as #2359 / #2463.
|
|
if (!modelStr || typeof modelStr !== "string") {
|
|
return {
|
|
provider: null,
|
|
model: null,
|
|
isAlias: false,
|
|
providerAlias: null,
|
|
extendedContext: false,
|
|
};
|
|
}
|
|
|
|
// Sanitize: reject strings with path traversal or control characters
|
|
if (/\.\.[\/\\]/.test(modelStr) || /[\x00-\x1f]/.test(modelStr)) {
|
|
console.log(`[MODEL] Warning: rejected malformed model string: "${modelStr.substring(0, 50)}"`);
|
|
return {
|
|
provider: null,
|
|
model: null,
|
|
isAlias: false,
|
|
providerAlias: null,
|
|
extendedContext: false,
|
|
};
|
|
}
|
|
|
|
// Extract [1m] suffix before parsing provider/model
|
|
let extendedContext = false;
|
|
let cleanStr = modelStr;
|
|
if (cleanStr.endsWith("[1m]")) {
|
|
extendedContext = true;
|
|
cleanStr = cleanStr.slice(0, -4);
|
|
}
|
|
cleanStr = cleanStr.trim();
|
|
|
|
// Normalize known cross-proxy provider/model dialects before deciding whether
|
|
// the slash belongs to a provider prefix or to the model ID itself.
|
|
if (cleanStr.includes("/")) {
|
|
cleanStr = normalizeCrossProxyModelId(cleanStr).modelId || cleanStr;
|
|
}
|
|
|
|
if (shouldTreatAsExactModelId(cleanStr)) {
|
|
console.debug(`[MODEL] Treating "${cleanStr}" as an exact model id`);
|
|
return { provider: null, model: cleanStr, isAlias: true, providerAlias: null, extendedContext };
|
|
}
|
|
|
|
// Check if standard format: provider/model or alias/model
|
|
if (cleanStr.includes("/")) {
|
|
const firstSlash = cleanStr.indexOf("/");
|
|
const providerOrAlias = cleanStr.slice(0, firstSlash).trim();
|
|
const model = cleanStr.slice(firstSlash + 1).trim();
|
|
const provider = resolveProviderAlias(providerOrAlias);
|
|
return { provider, model, isAlias: false, providerAlias: providerOrAlias, extendedContext };
|
|
}
|
|
|
|
// Alias format (model alias, not provider alias)
|
|
return { provider: null, model: cleanStr, isAlias: true, providerAlias: null, extendedContext };
|
|
}
|
|
|
|
/**
|
|
* Resolve model alias from aliases object
|
|
* Format: { "alias": "provider/model" }
|
|
*/
|
|
export function resolveModelAliasFromMap(alias: string | null, aliases: ModelAliasMap | null) {
|
|
const resolved = resolveModelAliasTarget(alias, aliases);
|
|
if (!resolved?.provider) return null;
|
|
return {
|
|
provider: resolved.provider,
|
|
model: resolved.model,
|
|
};
|
|
}
|
|
|
|
function resolveModelAliasTarget(
|
|
alias: string | null,
|
|
aliases: ModelAliasMap | null
|
|
): ResolvedModelTarget | null {
|
|
if (!alias || !aliases) return null;
|
|
|
|
const resolved = aliases[alias];
|
|
if (!resolved) return null;
|
|
|
|
if (typeof resolved === "string") {
|
|
return parseAliasTarget(resolved);
|
|
}
|
|
|
|
if (
|
|
resolved &&
|
|
typeof resolved === "object" &&
|
|
typeof resolved.provider === "string" &&
|
|
typeof resolved.model === "string"
|
|
) {
|
|
const normalizedPair = normalizeCrossProxyModelId(
|
|
`${resolved.provider}/${resolved.model}`
|
|
).modelId;
|
|
if (normalizedPair && normalizedPair !== `${resolved.provider}/${resolved.model}`) {
|
|
return parseAliasTarget(normalizedPair);
|
|
}
|
|
|
|
return {
|
|
provider: resolveProviderAlias(resolved.provider),
|
|
model: normalizeCrossProxyModelId(resolved.model).modelId || resolved.model,
|
|
};
|
|
}
|
|
|
|
return null;
|
|
}
|
|
|
|
function parseAliasTarget(target: string): ResolvedModelTarget | null {
|
|
const normalizedTarget = normalizeCrossProxyModelId(target).modelId;
|
|
if (!normalizedTarget || typeof normalizedTarget !== "string") return null;
|
|
|
|
if (normalizedTarget.includes("/")) {
|
|
if (shouldTreatAsExactModelId(normalizedTarget)) {
|
|
return { model: normalizedTarget };
|
|
}
|
|
|
|
const firstSlash = normalizedTarget.indexOf("/");
|
|
return {
|
|
provider: resolveProviderAlias(normalizedTarget.slice(0, firstSlash)),
|
|
model: normalizedTarget.slice(firstSlash + 1),
|
|
};
|
|
}
|
|
|
|
return { model: normalizedTarget };
|
|
}
|
|
|
|
async function resolveModelByProviderInference(modelId: string, extendedContext: boolean) {
|
|
const providers = getInferredProvidersForModel(modelId);
|
|
|
|
const nonOpenAIProviders = providers.filter((p) => p !== "openai");
|
|
|
|
if (CODEX_NATIVE_UNPREFIXED_MODELS.has(modelId)) {
|
|
return {
|
|
provider: "codex",
|
|
model: modelId,
|
|
extendedContext,
|
|
};
|
|
}
|
|
|
|
const activeProviders = await getActiveProviderSet();
|
|
|
|
// Preserve historical behavior: OpenAI stays default when model exists there.
|
|
// Connection availability must not make unprefixed OpenAI models resolve to a
|
|
// different provider; callers can still force Codex with an explicit prefix.
|
|
if (providers.includes("openai")) {
|
|
return {
|
|
provider: "openai",
|
|
model: modelId,
|
|
extendedContext,
|
|
};
|
|
}
|
|
|
|
if (
|
|
activeProviders?.has("codex") &&
|
|
!activeProviders.has("openai") &&
|
|
providers.includes("codex") &&
|
|
CODEX_PREFERRED_UNPREFIXED_MODELS.has(modelId)
|
|
) {
|
|
return {
|
|
provider: "codex",
|
|
model: resolveInferredProviderModel("codex", modelId),
|
|
extendedContext,
|
|
};
|
|
}
|
|
|
|
// Fallback for newly released OpenAI-family model IDs that may not be in the local catalog yet.
|
|
if (/^gpt-/i.test(modelId) || /^o1/i.test(modelId) || /^o3/i.test(modelId)) {
|
|
return {
|
|
provider: "openai",
|
|
model: modelId,
|
|
extendedContext,
|
|
};
|
|
}
|
|
|
|
const candidatesToUse = nonOpenAIProviders;
|
|
|
|
if (candidatesToUse.length === 1) {
|
|
const provider = candidatesToUse[0];
|
|
const canonicalModel = resolveInferredProviderModel(provider, modelId);
|
|
return { provider, model: canonicalModel, extendedContext };
|
|
}
|
|
|
|
if (candidatesToUse.length > 1) {
|
|
const aliasesForHint = candidatesToUse.map((p) => PROVIDER_ID_TO_ALIAS[p] || p);
|
|
const hints = aliasesForHint.slice(0, 2).map((alias) => `${alias}/${modelId}`);
|
|
const message = `Ambiguous model '${modelId}'. Use provider/model prefix (ex: ${hints.join(" or ")}).`;
|
|
console.warn(`[MODEL] ${message} Candidates: ${aliasesForHint.join(", ")}`);
|
|
return {
|
|
provider: null,
|
|
model: modelId,
|
|
errorType: "ambiguous_model",
|
|
errorMessage: message,
|
|
candidateProviders: candidatesToUse,
|
|
candidateAliases: aliasesForHint,
|
|
};
|
|
}
|
|
|
|
// Fallback: infer provider from known model name prefixes before defaulting to openai
|
|
// FIX #73: Models like claude-haiku-4-5-20251001 sent without provider prefix
|
|
// would incorrectly route to OpenAI. Use heuristic prefix detection first.
|
|
if (/^claude-/i.test(modelId)) {
|
|
// Claude models → Anthropic provider (canonical source for Claude models)
|
|
return { provider: "anthropic", model: modelId, extendedContext };
|
|
}
|
|
if (/^gemini-/i.test(modelId) || /^gemma-/i.test(modelId)) {
|
|
// Gemini/Gemma models → Gemini provider
|
|
return { provider: "gemini", model: modelId, extendedContext };
|
|
}
|
|
|
|
// Last resort: no provider could be inferred — return a clear error instead
|
|
// of silently defaulting to "openai", which would produce a misleading
|
|
// "No credentials for provider: openai" response when the model name
|
|
// is unrecognised (e.g. a missing combo, a typo, or a bare model id
|
|
// that doesn't exist in any provider's catalog).
|
|
return {
|
|
provider: null,
|
|
model: modelId,
|
|
extendedContext,
|
|
errorType: "model_not_found",
|
|
errorMessage: `Unable to determine provider for model '${modelId}'. Use a provider/model prefix (e.g. openai/${modelId}) or ensure the model is added as a combo entry.`,
|
|
};
|
|
}
|
|
|
|
/**
|
|
* Get full model info (parse or resolve)
|
|
* @param {string} modelStr - Model string
|
|
* @param {object|function} aliasesOrGetter - Aliases object or async function to get aliases
|
|
*/
|
|
export async function getModelInfoCore(
|
|
modelStr: string,
|
|
aliasesOrGetter: ModelAliasMap | (() => Promise<ModelAliasMap>) | null
|
|
) {
|
|
const parsed = parseModel(modelStr);
|
|
const { extendedContext } = parsed;
|
|
|
|
if (!parsed.isAlias) {
|
|
const normalizedModel = normalizeCrossProxyModelId(parsed.model).modelId;
|
|
const canonicalModel = resolveProviderModelAlias(parsed.provider, normalizedModel);
|
|
return {
|
|
provider: parsed.provider,
|
|
model: canonicalModel,
|
|
extendedContext,
|
|
};
|
|
}
|
|
|
|
// Get aliases (from object or function)
|
|
const aliases = typeof aliasesOrGetter === "function" ? await aliasesOrGetter() : aliasesOrGetter;
|
|
|
|
// Local alias map (user-provided 2nd arg) wins over all cross-proxy /
|
|
// provider inference paths. When the alias target is a slashful string like
|
|
// "openai/gpt-4o", parse it directly as <provider>/<model> and return
|
|
// immediately — before shouldTreatAsExactModelId() or cross-proxy inference
|
|
// can misclassify the target (e.g. because bazaarlink catalogs it verbatim).
|
|
if (aliases && parsed.model) {
|
|
const directTarget = aliases[parsed.model];
|
|
if (typeof directTarget === "string") {
|
|
const slashIdx = directTarget.indexOf("/");
|
|
if (slashIdx !== -1) {
|
|
const providerPart = directTarget.slice(0, slashIdx);
|
|
const modelPart = directTarget.slice(slashIdx + 1);
|
|
const provider = resolveProviderAlias(providerPart);
|
|
const canonicalModel = resolveProviderModelAlias(provider, modelPart);
|
|
return { provider, model: canonicalModel, extendedContext };
|
|
}
|
|
}
|
|
}
|
|
|
|
// Resolve exact alias
|
|
const resolved = resolveModelAliasTarget(parsed.model, aliases);
|
|
if (resolved?.provider) {
|
|
const canonicalModel = resolveProviderModelAlias(resolved.provider, resolved.model);
|
|
return {
|
|
provider: resolved.provider,
|
|
model: canonicalModel,
|
|
extendedContext,
|
|
};
|
|
}
|
|
if (resolved?.model) {
|
|
return await resolveModelByProviderInference(resolved.model, extendedContext);
|
|
}
|
|
|
|
// T13: Try wildcard alias (glob patterns like "claude-sonnet-*" → "anthropic/claude-sonnet-4-...")
|
|
if (aliases && typeof aliases === "object") {
|
|
const aliasEntries = Object.entries(aliases).map(([pattern, target]) => ({
|
|
pattern,
|
|
target: typeof target === "string" ? target : "",
|
|
}));
|
|
const wildcardMatch = parsed.model ? resolveWildcardAlias(parsed.model, aliasEntries) : null;
|
|
if (wildcardMatch) {
|
|
const target = wildcardMatch.target as string;
|
|
if (target.includes("/")) {
|
|
const firstSlash = target.indexOf("/");
|
|
const providerOrAlias = target.slice(0, firstSlash);
|
|
const targetModel = target.slice(firstSlash + 1);
|
|
const provider = resolveProviderAlias(providerOrAlias);
|
|
const canonicalModel = resolveProviderModelAlias(provider, targetModel);
|
|
return {
|
|
provider,
|
|
model: canonicalModel,
|
|
extendedContext,
|
|
wildcardPattern: wildcardMatch.pattern,
|
|
};
|
|
}
|
|
}
|
|
}
|
|
|
|
const normalizedModelId = normalizeCrossProxyModelId(parsed.model).modelId;
|
|
if (!normalizedModelId) {
|
|
return { provider: null, model: null, extendedContext };
|
|
}
|
|
return await resolveModelByProviderInference(normalizedModelId, extendedContext);
|
|
}
|