@jsonstudio/llms 0.6.203 → 0.6.230

package/dist/conversion/shared/tool-mapping.js

@@ -56,6 +56,19 @@ function enforceBuiltinToolSchema(name, candidate) {
         const base = asSchema(candidate);
         return ensureApplyPatchSchema(base);
     }
+    if (normalizedName === 'web_search') {
+        // For web_search we currently accept any incoming schema and fall back to a
+        // minimal object definition. Server-side web_search execution only relies
+        // on the function name + JSON arguments, so tool schema is best-effort.
+        const base = asSchema(candidate) ?? {};
+        if (!base.type) {
+            base.type = 'object';
+        }
+        if (!Object.prototype.hasOwnProperty.call(base, 'properties')) {
+            base.properties = {};
+        }
+        return base;
+    }
     return asSchema(candidate);
 }
 const DEFAULT_SANITIZER = (value) => {
@@ -111,10 +124,20 @@ export function bridgeToolToChatDefinition(rawTool, options) {
     }
     const tool = rawTool;
     const fnNode = tool.function && typeof tool.function === 'object' ? tool.function : undefined;
-    const name = pickToolName([fnNode?.name, tool.name], options);
+    let name = pickToolName([fnNode?.name, tool.name], options);
+    // Special case for Responses builtin web_search tools:
+    // Codex / Claude‑code may send tools shaped as `{ type: "web_search", ... }`
+    // without a nested `function` node. Treat these as a canonical `web_search`
+    // function tool so downstream Chat / Standardized layers can reason over a
+    // single function-style web_search surface.
     if (!name) {
-        return null;
+        const rawType = typeof tool.type === 'string' ? tool.type.trim().toLowerCase() : '';
+        if (rawType === 'web_search' || rawType.startsWith('web_search')) {
+            name = 'web_search';
+        }
     }
+    if (!name)
+        return null;
     const description = resolveToolDescription(fnNode?.description ?? tool.description);
     const parameters = enforceBuiltinToolSchema(name, resolveToolParameters(fnNode, tool));
     const strict = resolveToolStrict(fnNode, tool);

package/dist/index.d.ts

@@ -7,4 +7,5 @@
 export * from './conversion/index.js';
 export * from './router/virtual-router/bootstrap.js';
 export * from './router/virtual-router/types.js';
+export * from './telemetry/stats-center.js';
 export declare const VERSION = "0.4.0";

package/dist/index.js

@@ -7,4 +7,5 @@
 export * from './conversion/index.js';
 export * from './router/virtual-router/bootstrap.js';
 export * from './router/virtual-router/types.js';
+export * from './telemetry/stats-center.js';
 export const VERSION = '0.4.0';

package/dist/router/virtual-router/bootstrap.js

@@ -11,8 +11,7 @@ const DEFAULT_LOAD_BALANCING = { strategy: 'round-robin' };
 const DEFAULT_HEALTH = { failureThreshold: 3, cooldownMs: 30_000, fatalCooldownMs: 300_000 };
 const DEFAULT_CONTEXT_ROUTING = {
     warnRatio: 0.9,
-    hardLimit: false,
-    fallbackRoute: 'longcontext'
+    hardLimit: false
 };
 /**
  * 将用户提供的 Virtual Router 配置（或包含 virtualrouter 字段的整体配置）
@@ -28,6 +27,8 @@ export function bootstrapVirtualRouterConfig(input) {
     if (!Object.keys(routingSource).length) {
         throw new VirtualRouterError('Virtual Router routing table cannot be empty', VirtualRouterErrorCode.CONFIG_ERROR);
     }
+    const webSearch = normalizeWebSearch(section.webSearch);
+    validateWebSearchRouting(webSearch, routingSource);
     const { runtimeEntries, aliasIndex } = buildProviderRuntimeEntries(providersSource);
     const { routing, targetKeys } = expandRoutingTable(routingSource, aliasIndex);
     if (!routing.default || routing.default.length === 0) {
@@ -44,7 +45,8 @@ export function bootstrapVirtualRouterConfig(input) {
         classifier,
         loadBalancing,
         health,
-        contextRouting
+        contextRouting,
+        ...(webSearch ? { webSearch } : {})
     };
     return {
         config,
@@ -65,7 +67,8 @@ function extractVirtualRouterSection(input) {
     const loadBalancing = normalizeLoadBalancing(section.loadBalancing ?? root.loadBalancing);
     const health = normalizeHealth(section.health ?? root.health);
     const contextRouting = normalizeContextRouting(section.contextRouting ?? root.contextRouting);
-    return { providers, routing, classifier, loadBalancing, health, contextRouting };
+    const webSearch = section.webSearch ?? root.webSearch;
+    return { providers, routing, classifier, loadBalancing, health, contextRouting, webSearch };
 }
 function buildProviderRuntimeEntries(providers) {
     const runtimeEntries = {};
@@ -95,6 +98,11 @@ function buildProviderRuntimeEntries(providers) {
                 userInfoUrl: entry.auth.userInfoUrl,
                 refreshUrl: entry.auth.refreshUrl
             };
+            // 为 OAuth 类型的 auth 设置 tokenFile 为 alias（如果没有显式配置 tokenFile）
+            // 这允许 oauth-lifecycle.ts 的 resolveTokenFilePath 函数正确解析并匹配现有文件
+            if (!runtimeAuth.tokenFile && (runtimeAuth.rawType?.includes('oauth') || runtimeAuth.type === 'oauth')) {
+                runtimeAuth.tokenFile = entry.keyAlias;
+            }
             if (runtimeAuth.type === 'apiKey' && !runtimeAuth.secretRef) {
                 runtimeAuth.secretRef = `${providerId}.${entry.keyAlias}`;
             }
@@ -122,28 +130,39 @@ function buildProviderRuntimeEntries(providers) {
 function expandRoutingTable(routingSource, aliasIndex) {
     const routing = {};
     const targetKeys = new Set();
-    for (const [routeName, entries] of Object.entries(routingSource)) {
-        const expanded = [];
-        for (const entry of entries) {
-            const parsed = parseRouteEntry(entry, aliasIndex);
-            if (!parsed) {
-                continue;
-            }
-            if (!aliasIndex.has(parsed.providerId)) {
-                throw new VirtualRouterError(`Route "${routeName}" references unknown provider "${parsed.providerId}"`, VirtualRouterErrorCode.CONFIG_ERROR);
+    for (const [routeName, pools] of Object.entries(routingSource)) {
+        const expandedPools = [];
+        for (const pool of pools) {
+            const expandedTargets = [];
+            for (const entry of pool.targets) {
+                const parsed = parseRouteEntry(entry, aliasIndex);
+                if (!parsed) {
+                    continue;
+                }
+                if (!aliasIndex.has(parsed.providerId)) {
+                    throw new VirtualRouterError(`Route "${routeName}" references unknown provider "${parsed.providerId}"`, VirtualRouterErrorCode.CONFIG_ERROR);
+                }
+                const aliases = parsed.keyAlias ? [parsed.keyAlias] : aliasIndex.get(parsed.providerId);
+                if (!aliases.length) {
+                    throw new VirtualRouterError(`Provider ${parsed.providerId} has no auth aliases but is referenced in routing`, VirtualRouterErrorCode.CONFIG_ERROR);
+                }
+                for (const alias of aliases) {
+                    const runtimeKey = buildRuntimeKey(parsed.providerId, alias);
+                    const targetKey = `${runtimeKey}.${parsed.modelId}`;
+                    pushUnique(expandedTargets, targetKey);
+                    targetKeys.add(targetKey);
+                }
             }
-            const aliases = parsed.keyAlias ? [parsed.keyAlias] : aliasIndex.get(parsed.providerId);
-            if (!aliases.length) {
-                throw new VirtualRouterError(`Provider ${parsed.providerId} has no auth aliases but is referenced in routing`, VirtualRouterErrorCode.CONFIG_ERROR);
-            }
-            for (const alias of aliases) {
-                const runtimeKey = buildRuntimeKey(parsed.providerId, alias);
-                const targetKey = `${runtimeKey}.${parsed.modelId}`;
-                pushUnique(expanded, targetKey);
-                targetKeys.add(targetKey);
+            if (expandedTargets.length) {
+                expandedPools.push({
+                    id: pool.id,
+                    priority: pool.priority,
+                    backup: pool.backup,
+                    targets: expandedTargets
+                });
             }
         }
-        routing[routeName] = expanded;
+        routing[routeName] = expandedPools;
     }
     return { routing, targetKeys };
 }
@@ -200,15 +219,135 @@ function resolveContextTokens(runtime, modelId) {
 function normalizeRouting(source) {
     const routing = {};
     for (const [routeName, entries] of Object.entries(source)) {
-        if (!Array.isArray(entries))
+        if (!Array.isArray(entries) || !entries.length) {
+            routing[routeName] = [];
             continue;
-        const normalized = entries
-            .map((entry) => (typeof entry === 'string' ? entry.trim() : ''))
-            .filter(Boolean);
-        routing[routeName] = Array.from(new Set(normalized));
+        }
+        const allStrings = entries.every((entry) => typeof entry === 'string' || entry === null || entry === undefined);
+        if (allStrings) {
+            const targets = normalizeTargetList(entries);
+            routing[routeName] = targets.length ? [buildLegacyRoutePool(routeName, targets)] : [];
+            continue;
+        }
+        const normalized = [];
+        const total = entries.length || 1;
+        for (let index = 0; index < entries.length; index += 1) {
+            const entry = entries[index];
+            const pool = normalizeRoutePoolEntry(routeName, entry, index, total);
+            if (pool && pool.targets.length) {
+                normalized.push(pool);
+            }
+        }
+        routing[routeName] = normalized;
     }
     return routing;
 }
+function buildLegacyRoutePool(routeName, targets) {
+    return {
+        id: `${routeName}:pool0`,
+        priority: targets.length,
+        backup: false,
+        targets
+    };
+}
+function normalizeRoutePoolEntry(routeName, entry, index, total) {
+    if (typeof entry === 'string') {
+        const targets = normalizeTargetList(entry);
+        return targets.length
+            ? {
+                id: `${routeName}:pool${index + 1}`,
+                priority: total - index,
+                backup: false,
+                targets
+            }
+            : null;
+    }
+    if (!entry || typeof entry !== 'object') {
+        return null;
+    }
+    const record = entry;
+    const id = readOptionalString(record.id) ??
+        readOptionalString(record?.poolId) ??
+        `${routeName}:pool${index + 1}`;
+    const backup = record.backup === true ||
+        record.isBackup === true ||
+        (typeof record.type === 'string' && record.type.toLowerCase() === 'backup');
+    const priority = normalizePriorityValue(record.priority, total - index);
+    const targets = normalizeRouteTargets(record);
+    return targets.length
+        ? {
+            id,
+            priority,
+            backup,
+            targets
+        }
+        : null;
+}
+function normalizeRouteTargets(record) {
+    const buckets = [
+        record.targets,
+        record.providers,
+        record.pool,
+        record.entries,
+        record.items,
+        record.routes
+    ];
+    const normalized = [];
+    for (const bucket of buckets) {
+        for (const target of normalizeTargetList(bucket)) {
+            if (!normalized.includes(target)) {
+                normalized.push(target);
+            }
+        }
+    }
+    const singular = [record.target, record.provider];
+    for (const candidate of singular) {
+        for (const target of normalizeTargetList(candidate)) {
+            if (!normalized.includes(target)) {
+                normalized.push(target);
+            }
+        }
+    }
+    return normalized;
+}
+function normalizeTargetList(value) {
+    if (Array.isArray(value)) {
+        const normalized = [];
+        for (const entry of value) {
+            if (typeof entry === 'string') {
+                const trimmed = entry.trim();
+                if (trimmed && !normalized.includes(trimmed)) {
+                    normalized.push(trimmed);
+                }
+            }
+        }
+        return normalized;
+    }
+    if (typeof value === 'string') {
+        const trimmed = value.trim();
+        return trimmed ? [trimmed] : [];
+    }
+    if (typeof value === 'number') {
+        const str = String(value).trim();
+        return str ? [str] : [];
+    }
+    return [];
+}
+function normalizePriorityValue(value, fallback) {
+    if (typeof value === 'number' && Number.isFinite(value)) {
+        return value;
+    }
+    if (typeof value === 'string') {
+        const trimmed = value.trim();
+        if (trimmed) {
+            const parsed = Number(trimmed);
+            if (Number.isFinite(parsed)) {
+                return parsed;
+            }
+        }
+    }
+    return fallback;
+}
 function normalizeClassifier(input) {
     const normalized = asRecord(input);
     const result = {
@@ -389,15 +528,91 @@ function normalizeContextRouting(input) {
         coerceRatio(record?.warn_ratio);
     const hardLimitCandidate = coerceBoolean(record.hardLimit) ??
         coerceBoolean(record?.hard_limit);
-    const fallbackCandidate = readOptionalString(record.fallbackRoute) ??
-        readOptionalString(record?.fallback_route);
     const warnRatio = clampWarnRatio(warnCandidate ?? DEFAULT_CONTEXT_ROUTING.warnRatio);
     const hardLimit = typeof hardLimitCandidate === 'boolean' ? hardLimitCandidate : DEFAULT_CONTEXT_ROUTING.hardLimit;
-    const fallbackRoute = fallbackCandidate ?? DEFAULT_CONTEXT_ROUTING.fallbackRoute;
     return {
         warnRatio,
-        hardLimit,
-        fallbackRoute
+        hardLimit
+    };
+}
+function validateWebSearchRouting(webSearch, routingSource) {
+    if (!webSearch) {
+        return;
+    }
+    const routePools = routingSource['web_search'];
+    if (!Array.isArray(routePools) || !routePools.length) {
+        throw new VirtualRouterError('Virtual Router webSearch.engines configured but routing.web_search route is missing or empty', VirtualRouterErrorCode.CONFIG_ERROR);
+    }
+    const targets = new Set();
+    for (const pool of routePools) {
+        if (!pool || !Array.isArray(pool.targets)) {
+            continue;
+        }
+        for (const target of pool.targets) {
+            if (typeof target === 'string' && target.trim()) {
+                targets.add(target.trim());
+            }
+        }
+    }
+    for (const engine of webSearch.engines) {
+        if (!targets.has(engine.providerKey)) {
+            throw new VirtualRouterError(`Virtual Router webSearch engine "${engine.id}" references providerKey "${engine.providerKey}" which is not present in routing.web_search`, VirtualRouterErrorCode.CONFIG_ERROR);
+        }
+    }
+}
+function normalizeWebSearch(input) {
+    if (!input || typeof input !== 'object') {
+        return undefined;
+    }
+    const record = input;
+    const enginesNode = Array.isArray(record.engines) ? record.engines : [];
+    const engines = [];
+    for (const raw of enginesNode) {
+        if (!raw || typeof raw !== 'object') {
+            continue;
+        }
+        const node = raw;
+        const idRaw = node.id;
+        const providerKeyRaw = node.providerKey ?? node.provider ?? node.target;
+        const id = typeof idRaw === 'string' && idRaw.trim()
+            ? idRaw.trim()
+            : undefined;
+        const providerKey = typeof providerKeyRaw === 'string' && providerKeyRaw.trim()
+            ? providerKeyRaw.trim()
+            : undefined;
+        if (!id || !providerKey) {
+            continue;
+        }
+        const description = typeof node.description === 'string' && node.description.trim()
+            ? node.description.trim()
+            : undefined;
+        const isDefault = node.default === true ||
+            (typeof node.default === 'string' && node.default.trim().toLowerCase() === 'true');
+        // Deduplicate by id; first wins, subsequent are ignored.
+        if (engines.some((engine) => engine.id === id)) {
+            continue;
+        }
+        engines.push({
+            id,
+            providerKey,
+            description,
+            default: isDefault
+        });
+    }
+    if (!engines.length) {
+        return undefined;
+    }
+    let injectPolicy;
+    const rawPolicy = record.injectPolicy ?? record?.inject_policy;
+    if (typeof rawPolicy === 'string') {
+        const normalized = rawPolicy.trim().toLowerCase();
+        if (normalized === 'always' || normalized === 'selective') {
+            injectPolicy = normalized;
+        }
+    }
+    return {
+        engines,
+        injectPolicy: injectPolicy ?? 'selective'
     };
 }
 function extractProviderAuthEntries(providerId, raw) {
@@ -531,19 +746,37 @@ function extractProviderAuthEntries(providerId, raw) {
         pushEntry(undefined, buildAuthCandidate(baseTypeSource, { value: apiKeyField.trim() }));
     }
     // 自动多 token 扫描：仅在未显式声明多 key、且为受支持的 OAuth 提供方时触发
-    if (!entries.length && baseType === 'oauth') {
-        const oauthProviderId = baseTypeInfo.oauthProviderId;
-        if (oauthProviderId && MULTI_TOKEN_OAUTH_PROVIDERS.has(oauthProviderId)) {
-            const tokenFiles = scanOAuthTokenFiles(oauthProviderId);
+    if (baseType === 'oauth') {
+        const scanCandidates = new Set();
+        const pushCandidate = (value) => {
+            if (typeof value === 'string' && value.trim()) {
+                scanCandidates.add(value.trim().toLowerCase());
+            }
+        };
+        pushCandidate(auth?.oauthProviderId);
+        pushCandidate(baseTypeInfo.oauthProviderId);
+        pushCandidate(providerId);
+        for (const candidate of scanCandidates) {
+            if (!MULTI_TOKEN_OAUTH_PROVIDERS.has(candidate)) {
+                continue;
+            }
+            const tokenFiles = scanOAuthTokenFiles(candidate);
+            if (!tokenFiles.length) {
+                continue;
+            }
+            const baseTypeAlias = baseTypeInfo.oauthProviderId?.toLowerCase();
             for (const match of tokenFiles) {
                 const alias = match.alias && match.alias !== 'default'
                     ? `${match.sequence}-${match.alias}`
                     : String(match.sequence);
+                const typeHint = baseTypeSource && baseTypeAlias === candidate
+                    ? baseTypeSource
+                    : `${candidate}-oauth`;
                 const authConfig = {
                     ...defaults,
-                    type: baseTypeSource ?? `${oauthProviderId}-oauth`,
+                    type: typeHint,
                     tokenFile: match.filePath,
-                    oauthProviderId
+                    oauthProviderId: candidate
                 };
                 pushEntry(alias, authConfig);
             }
@@ -712,7 +945,7 @@ function mergeScopes(primary, fallback) {
     }
     return merged.size ? Array.from(merged) : undefined;
 }
-const MULTI_TOKEN_OAUTH_PROVIDERS = new Set(['iflow']);
+const MULTI_TOKEN_OAUTH_PROVIDERS = new Set(['iflow', 'qwen', 'gemini-cli', 'antigravity']);
 function interpretAuthType(value) {
     if (typeof value !== 'string') {
         return { type: 'apiKey' };

package/dist/router/virtual-router/context-advisor.d.ts

@@ -16,6 +16,4 @@ export declare class ContextAdvisor {
     private hardLimit;
     configure(config?: VirtualRouterContextRoutingConfig | null): void;
     classify(pool: string[], estimatedTokens: number, resolveProfile: (key: string) => ProviderProfile): ContextAdvisorResult;
-    prefersFallback(result: ContextAdvisorResult): boolean;
-    allowsOverflow(): boolean;
 }

package/dist/router/virtual-router/context-advisor.js

@@ -55,18 +55,6 @@ export class ContextAdvisor {
             allOverflow: safe.length === 0 && risky.length === 0 && overflow.length > 0
         };
     }
-    prefersFallback(result) {
-        if (result.safe.length > 0) {
-            return false;
-        }
-        if (result.risky.length > 0) {
-            return true;
-        }
-        return result.allOverflow;
-    }
-    allowsOverflow() {
-        return !this.hardLimit;
-    }
 }
 function clampWarnRatio(value) {
     if (!Number.isFinite(value)) {

package/dist/router/virtual-router/engine.d.ts

@@ -11,6 +11,7 @@ export declare class VirtualRouterEngine {
     private routeStats;
     private readonly debug;
     private healthConfig;
+    private readonly statsCenter;
     initialize(config: VirtualRouterConfig): void;
     route(request: StandardizedRequest | ProcessedRequest, metadata: RouterMetadataInput): {
         target: TargetMetadata;
@@ -29,11 +30,10 @@ export declare class VirtualRouterEngine {
     };
     private validateConfig;
     private selectProvider;
+    private trySelectFromTier;
     private incrementRouteStat;
     private providerHealthConfig;
     private initializeRouteQueue;
-    private resolveFallbackRoute;
-    private maybeDeferToFallback;
     private buildContextCandidatePools;
     private describeAttempt;
     private resolveStickyKey;
@@ -42,9 +42,15 @@ export declare class VirtualRouterEngine {
     private buildRouteCandidates;
     private sortByPriority;
     private routeWeight;
+    private routeHasTargets;
+    private hasPrimaryPool;
+    private sortRoutePools;
+    private flattenPoolTargets;
     private buildHitReason;
     private decorateWithDetail;
     private formatVirtualRouterHit;
     private resolveRouteColor;
     private describeContextUsage;
+    private describeTargetProvider;
+    private parseProviderKey;
 }