@jsonstudio/llms 0.6.1739 → 0.6.1890

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

@@ -11,6 +11,12 @@ export class RoutingClassifier {
     }
     classify(features) {
         const lastToolCategory = features.lastAssistantToolCategory;
+        const webSearchDeclared = features.hasWebSearchToolDeclared === true;
+        const webSearchIntent = detectWebSearchIntent(features.userTextSample);
+        const localToolContinuation = lastToolCategory === 'read' ||
+            lastToolCategory === 'write' ||
+            lastToolCategory === 'search' ||
+            lastToolCategory === 'other';
         const reachedLongContext = features.estimatedTokens >= (this.config.longContextThresholdTokens ?? DEFAULT_LONG_CONTEXT_THRESHOLD);
         const latestMessageFromUser = features.latestMessageFromUser === true;
         const thinkingContinuation = lastToolCategory === 'read';
@@ -21,6 +27,10 @@ export class RoutingClassifier {
         const toolsContinuation = lastToolCategory === 'other';
         const hasToolActivity = features.hasTools || features.hasToolCallResponses;
         const evaluationMap = {
+            multimodal: {
+                triggered: features.hasImageAttachment,
+                reason: 'multimodal:media-detected'
+            },
             vision: {
                 triggered: features.hasImageAttachment,
                 reason: 'vision:media-detected'
@@ -38,10 +48,16 @@ export class RoutingClassifier {
                 reason: 'coding:last-tool-write'
             },
             web_search: {
-                // web_search 路由不再基于上一轮工具分类或本轮是否声明 web_search 工具自动触发，
-                // 仅保留为显式路由指令/未来扩展的占位，默认不命中。
-                triggered: false,
-                reason: 'web_search:disabled'
+                // web_search 仅由“当前请求”触发：
+                // - 显式声明 web_search 工具；或
+                // - 用户输入命中联网搜索意图关键词。
+                // 不再使用上一轮 websearch 续写，避免连续轮次被粘住。
+                triggered: !localToolContinuation && (webSearchDeclared || webSearchIntent),
+                reason: webSearchDeclared && webSearchIntent
+                    ? 'web_search:tool+intent'
+                    : webSearchDeclared
+                        ? 'web_search:tool-declared'
+                        : 'web_search:intent-keyword'
             },
             search: {
                 // search 路由：仅在上一轮 assistant 使用 search 类工具时继续命中，
@@ -99,6 +115,45 @@ export class RoutingClassifier {
         return index >= 0 ? index : ROUTE_PRIORITY.length;
     }
 }
+function detectWebSearchIntent(text) {
+    if (!text || !text.trim()) {
+        return false;
+    }
+    const normalized = text.toLowerCase();
+    const directKeywords = [
+        'web search',
+        'web_search',
+        'websearch',
+        'search the web',
+        'internet search',
+        'search online',
+        '搜索网页',
+        '联网搜索',
+        '上网搜索',
+        '上网查',
+        '网上搜',
+        '谷歌搜索',
+        'google search'
+    ];
+    if (directKeywords.some((keyword) => normalized.includes(keyword))) {
+        return true;
+    }
+    const enVerb = ['search', 'find', 'lookup', 'look up', 'google'];
+    const enNoun = ['web', 'internet', 'online', 'news', 'latest', 'today'];
+    const hasEnVerb = enVerb.some((keyword) => normalized.includes(keyword));
+    const hasEnNoun = enNoun.some((keyword) => normalized.includes(keyword));
+    if (hasEnVerb && hasEnNoun) {
+        return true;
+    }
+    const zhVerb = ['搜索', '查找', '查询', '搜'];
+    const zhNoun = ['网络', '联网', '网页', '新闻', '资讯', '实时', '最新', '今天'];
+    const hasZhVerb = zhVerb.some((keyword) => text.includes(keyword));
+    const hasZhNoun = zhNoun.some((keyword) => text.includes(keyword));
+    if (text.includes('上网') || (hasZhVerb && hasZhNoun)) {
+        return true;
+    }
+    return false;
+}
 function normalizeList(source, fallback) {
     if (!source || source.length === 0) {
         return fallback;

package/dist/router/virtual-router/engine/health/index.js

@@ -66,17 +66,17 @@ function readEnvDuration(name, fallbackMs) {
 }
 /**
  * 对没有 quotaResetDelay 的 429 错误，在 VirtualRouter 内部维护一个简单的阶梯退避策略：
- * - 默认：第 1 次 5 分钟，第 2 次 1 小时，第 3 次 6 小时，第 4 次及以上 24 小时封顶；
- * - 可通过环境变量 ROUTECODEX_RL_SCHEDULE / RCC_RL_SCHEDULE 调整（例如 "5m,1h,6h,24h"）。
+ * - 默认：第 1 次 3 秒，第 2 次 10 秒，第 3 次 31 秒，第 4 次及以上 61 秒封顶；
+ * - 可通过环境变量 ROUTECODEX_RL_SCHEDULE / RCC_RL_SCHEDULE 调整（例如 "3s,10s,31s,61s"）。
  *
  * 这里的“次数”针对 providerKey 计数，并带有简单的时间窗口：若距离上次 429 超过 24 小时，则重置计数。
  * 该状态仅用于路由决策，不反映在 healthConfig 上，使 Host 与 VirtualRouter 对 429 处理职责清晰分层。
  */
 const NO_QUOTA_RATE_LIMIT_SCHEDULE_MS = readEnvSchedule('ROUTECODEX_RL_SCHEDULE', [
-    5 * 60_000,
-    60 * 60_000,
-    6 * 60 * 60_000,
-    24 * 60 * 60_000
+    3_000,
+    10_000,
+    31_000,
+    61_000
 ]);
 const rateLimitBackoffByProvider = new Map();
 const RATE_LIMIT_RESET_WINDOW_MS = readEnvDuration('ROUTECODEX_RL_RESET_WINDOW', 24 * 60 * 60_000);

package/dist/router/virtual-router/engine/routing-state/store.js

@@ -22,6 +22,11 @@ export function getRoutingInstructionState(stickyKey, routingInstructionState, r
             existing.stopMessageUsed = merged.stopMessageUsed;
             existing.stopMessageUpdatedAt = merged.stopMessageUpdatedAt;
             existing.stopMessageLastUsedAt = merged.stopMessageLastUsedAt;
+            if (persisted) {
+                existing.preCommandSource = persisted.preCommandSource;
+                existing.preCommandScriptPath = persisted.preCommandScriptPath;
+                existing.preCommandUpdatedAt = persisted.preCommandUpdatedAt;
+            }
         }
         catch {
             // 刷新失败不影响原有内存状态
@@ -46,7 +51,10 @@ export function getRoutingInstructionState(stickyKey, routingInstructionState, r
             stopMessageMaxRepeats: undefined,
             stopMessageUsed: undefined,
             stopMessageUpdatedAt: undefined,
-            stopMessageLastUsedAt: undefined
+            stopMessageLastUsedAt: undefined,
+            preCommandSource: undefined,
+            preCommandScriptPath: undefined,
+            preCommandUpdatedAt: undefined
         };
     }
     routingInstructionState.set(key, initial);
@@ -68,6 +76,8 @@ function isRoutingStateEmpty(state) {
         (typeof state.stopMessageUsed !== 'number' || !Number.isFinite(state.stopMessageUsed)) &&
         (typeof state.stopMessageUpdatedAt !== 'number' || !Number.isFinite(state.stopMessageUpdatedAt)) &&
         (typeof state.stopMessageLastUsedAt !== 'number' || !Number.isFinite(state.stopMessageLastUsedAt));
+    const noPreCommand = (!state.preCommandScriptPath || !state.preCommandScriptPath.trim()) &&
+        (typeof state.preCommandUpdatedAt !== 'number' || !Number.isFinite(state.preCommandUpdatedAt));
     return (noForced &&
         noSticky &&
         noPrefer &&
@@ -75,7 +85,8 @@ function isRoutingStateEmpty(state) {
         noDisabledProviders &&
         noDisabledKeys &&
         noDisabledModels &&
-        noStopMessage);
+        noStopMessage &&
+        noPreCommand);
 }
 export function persistRoutingInstructionState(key, state, routingStateStore) {
     if (!key || (!key.startsWith('session:') && !key.startsWith('conversation:'))) {
@@ -88,7 +99,9 @@ export function persistRoutingInstructionState(key, state, routingStateStore) {
             (typeof state.stopMessageMaxRepeats === 'number' && Number.isFinite(state.stopMessageMaxRepeats)) ||
             (typeof state.stopMessageUsed === 'number' && Number.isFinite(state.stopMessageUsed)) ||
             (typeof state.stopMessageUpdatedAt === 'number' && Number.isFinite(state.stopMessageUpdatedAt)) ||
-            (typeof state.stopMessageLastUsedAt === 'number' && Number.isFinite(state.stopMessageLastUsedAt)));
+            (typeof state.stopMessageLastUsedAt === 'number' && Number.isFinite(state.stopMessageLastUsedAt)) ||
+            Boolean(state.preCommandScriptPath && state.preCommandScriptPath.trim()) ||
+            (typeof state.preCommandUpdatedAt === 'number' && Number.isFinite(state.preCommandUpdatedAt)));
     if (isRoutingStateEmpty(state)) {
         if (prefersSync) {
             routingStateStore.saveSync(key, null);

package/dist/router/virtual-router/engine-logging.js

@@ -1,4 +1,46 @@
 import { DEFAULT_MODEL_CONTEXT_TOKENS, DEFAULT_ROUTE } from './types.js';
+function summarizeStopMessageRuntime(state) {
+    if (!state) {
+        return {
+            hasAny: false,
+            mode: 'unset',
+            maxRepeats: 0,
+            used: 0,
+            remaining: -1,
+            active: false
+        };
+    }
+    const text = typeof state.stopMessageText === 'string' ? state.stopMessageText.trim() : '';
+    const safeText = text ? (text.length > 24 ? `${text.slice(0, 21)}…` : text) : undefined;
+    const modeRaw = typeof state.stopMessageStageMode === 'string' ? state.stopMessageStageMode.trim().toLowerCase() : '';
+    const mode = modeRaw === 'on' || modeRaw === 'off' || modeRaw === 'auto' ? modeRaw : 'unset';
+    const maxRepeats = typeof state.stopMessageMaxRepeats === 'number' && Number.isFinite(state.stopMessageMaxRepeats)
+        ? Math.max(0, Math.floor(state.stopMessageMaxRepeats))
+        : 0;
+    const used = typeof state.stopMessageUsed === 'number' && Number.isFinite(state.stopMessageUsed)
+        ? Math.max(0, Math.floor(state.stopMessageUsed))
+        : 0;
+    const remaining = maxRepeats > 0 ? Math.max(0, maxRepeats - used) : -1;
+    const active = mode !== 'off' && maxRepeats > 0 && (Boolean(text) || mode === 'on' || mode === 'auto');
+    const updatedAt = typeof state.stopMessageUpdatedAt === 'number' && Number.isFinite(state.stopMessageUpdatedAt)
+        ? state.stopMessageUpdatedAt
+        : undefined;
+    const lastUsedAt = typeof state.stopMessageLastUsedAt === 'number' && Number.isFinite(state.stopMessageLastUsedAt)
+        ? state.stopMessageLastUsedAt
+        : undefined;
+    const hasAny = Boolean(text) || maxRepeats > 0 || mode !== 'unset' || used > 0;
+    return {
+        hasAny,
+        ...(safeText ? { safeText } : {}),
+        mode,
+        maxRepeats,
+        used,
+        remaining,
+        active,
+        ...(updatedAt ? { updatedAt } : {}),
+        ...(lastUsedAt ? { lastUsedAt } : {})
+    };
+}
 export function formatStickyScope(scope) {
     if (!scope || scope.trim().length === 0) {
         return undefined;
@@ -45,6 +87,7 @@ export function describeTargetProvider(providerKey, fallbackModelId) {
 }
 function resolveRouteColor(routeName) {
     const map = {
+        multimodal: '\x1b[38;5;45m',
         tools: '\x1b[38;5;214m',
         thinking: '\x1b[34m',
         coding: '\x1b[35m',
@@ -154,24 +197,20 @@ export function formatVirtualRouterHit(routeName, poolId, providerKey, modelId,
         const stickyLabel = stickyText ? ` ${stickyColor}[sticky:${stickyText}]${reset}` : '';
         const reasonLabel = hitReason ? ` reason=${hitReason}` : '';
         let stopLabel = '';
-        if (routingState?.stopMessageText && typeof routingState.stopMessageMaxRepeats === 'number') {
-            const text = routingState.stopMessageText;
-            const safeText = text.length > 24 ? `${text.slice(0, 21)}…` : text;
-            const used = typeof routingState.stopMessageUsed === 'number' && Number.isFinite(routingState.stopMessageUsed)
-                ? routingState.stopMessageUsed
-                : 0;
-            const updatedAt = typeof routingState.stopMessageUpdatedAt === 'number' && Number.isFinite(routingState.stopMessageUpdatedAt)
-                ? routingState.stopMessageUpdatedAt
-                : undefined;
-            const lastUsedAt = typeof routingState.stopMessageLastUsedAt === 'number' && Number.isFinite(routingState.stopMessageLastUsedAt)
-                ? routingState.stopMessageLastUsedAt
-                : undefined;
-            const parts = [`"${safeText}"`, `${used}/${Math.floor(routingState.stopMessageMaxRepeats)}`];
-            if (updatedAt) {
-                parts.push(`set=${new Date(updatedAt).toLocaleString(undefined, { hour12: false })}`);
+        const stop = summarizeStopMessageRuntime(routingState);
+        if (stop.hasAny) {
+            const parts = [
+                stop.safeText ? `"${stop.safeText}"` : '"(mode-only)"',
+                `mode=${stop.mode}`,
+                `round=${stop.maxRepeats > 0 ? `${stop.used}/${stop.maxRepeats}` : `${stop.used}/-`}`,
+                `active=${stop.active ? 'yes' : 'no'}`,
+                `left=${stop.remaining >= 0 ? stop.remaining : 'n/a'}`
+            ];
+            if (stop.updatedAt) {
+                parts.push(`set=${new Date(stop.updatedAt).toLocaleString(undefined, { hour12: false })}`);
             }
-            if (lastUsedAt) {
-                parts.push(`last=${new Date(lastUsedAt).toLocaleString(undefined, { hour12: false })}`);
+            if (stop.lastUsedAt) {
+                parts.push(`last=${new Date(stop.lastUsedAt).toLocaleString(undefined, { hour12: false })}`);
             }
             stopLabel = ` ${stopColor}[stopMessage:${parts.join(' ')}]${reset}`;
         }
@@ -184,13 +223,12 @@ export function formatVirtualRouterHit(routeName, poolId, providerKey, modelId,
         const stickyText = formatStickyScope(stickyScope);
         const stickyLabel = stickyText ? ` [sticky:${stickyText}]` : '';
         let stopLabel = '';
-        if (routingState?.stopMessageText && typeof routingState.stopMessageMaxRepeats === 'number') {
-            const text = routingState.stopMessageText;
-            const safeText = text.length > 24 ? `${text.slice(0, 21)}…` : text;
-            const used = typeof routingState.stopMessageUsed === 'number' && Number.isFinite(routingState.stopMessageUsed)
-                ? routingState.stopMessageUsed
-                : 0;
-            stopLabel = ` [stopMessage:"${safeText}" ${used}/${Math.floor(routingState.stopMessageMaxRepeats)}]`;
+        const stop = summarizeStopMessageRuntime(routingState);
+        if (stop.hasAny) {
+            const safeText = stop.safeText ? `"${stop.safeText}"` : '"(mode-only)"';
+            const rounds = stop.maxRepeats > 0 ? `${stop.used}/${stop.maxRepeats}` : `${stop.used}/-`;
+            const left = stop.remaining >= 0 ? String(stop.remaining) : 'n/a';
+            stopLabel = ` [stopMessage:${safeText} mode=${stop.mode} round=${rounds} active=${stop.active ? 'yes' : 'no'} left=${left}]`;
         }
         return `[virtual-router-hit] ${timestamp} ${routeLabel} -> ${providerKey}${modelId ? '.' + modelId : ''}${stickyLabel}${hitReason ? ` reason=${hitReason}` : ''}${stopLabel}`;
     }

package/dist/router/virtual-router/engine-selection/route-utils.js

@@ -41,6 +41,8 @@ export function sortRoutePools(pools) {
 }
 export function buildRouteCandidates(requestedRoute, classificationCandidates, features, routing, providerRegistry) {
     const forceVision = routeHasForceFlag('vision', routing);
+    const hasMultimodalTargets = routeHasTargets(routing.multimodal);
+    const hasVisionTargets = routeHasTargets(routing.vision);
     const normalized = normalizeRouteAlias(requestedRoute || DEFAULT_ROUTE);
     const baseList = [];
     if (classificationCandidates && classificationCandidates.length) {
@@ -51,35 +53,33 @@ export function buildRouteCandidates(requestedRoute, classificationCandidates, f
     else if (normalized) {
         baseList.push(normalized);
     }
-    if (features.hasImageAttachment && !forceVision) {
-        const visionAwareRoutes = [DEFAULT_ROUTE, 'thinking'];
-        for (const routeName of visionAwareRoutes) {
-            if (routeHasTargets(routing[routeName])) {
-                if (!baseList.includes(routeName)) {
-                    baseList.push(routeName);
-                }
-            }
-        }
-    }
     if (features.hasImageAttachment) {
-        const allRouteNames = Object.keys(routing);
-        for (const routeName of allRouteNames) {
-            if (!routeHasTargets(routing[routeName])) {
-                continue;
+        if (hasMultimodalTargets) {
+            if (!baseList.includes('multimodal')) {
+                baseList.unshift('multimodal');
             }
-            if (!routeSupportsModel(routeName, 'kimi-k2.5', routing, providerRegistry)) {
-                continue;
+        }
+        else if (hasVisionTargets) {
+            if (!baseList.includes('vision')) {
+                baseList.unshift('vision');
             }
-            if (!baseList.includes(routeName)) {
-                baseList.push(routeName);
+        }
+        if (!forceVision && hasMultimodalTargets) {
+            const visionAwareRoutes = [DEFAULT_ROUTE, 'thinking'];
+            for (const routeName of visionAwareRoutes) {
+                if (routeHasTargets(routing[routeName])) {
+                    if (!baseList.includes(routeName)) {
+                        baseList.push(routeName);
+                    }
+                }
             }
         }
     }
     let ordered = sortByPriority(baseList);
-    if (features.hasImageAttachment && !forceVision) {
+    if (features.hasImageAttachment && !forceVision && hasMultimodalTargets) {
         ordered = reorderForInlineVision(ordered, routing, providerRegistry);
     }
-    if (features.hasImageAttachment) {
+    if (features.hasImageAttachment && hasMultimodalTargets) {
         ordered = reorderForPreferredModel(ordered, 'kimi-k2.5', routing, providerRegistry);
     }
     const deduped = [];

package/dist/router/virtual-router/engine-selection/tier-selection.js

@@ -384,7 +384,7 @@ export function trySelectFromTier(routeName, tier, stickyKey, estimatedTokens, f
         }
         targets = filtered;
     }
-    if (features.hasImageAttachment) {
+    if (features.hasImageAttachment && routeName === 'multimodal') {
         const kimiTargets = targets.filter((key) => {
             const modelId = getProviderModelId(key, deps.providerRegistry) ?? '';
             return modelId.trim().toLowerCase() === 'kimi-k2.5';
@@ -392,7 +392,7 @@ export function trySelectFromTier(routeName, tier, stickyKey, estimatedTokens, f
         if (kimiTargets.length) {
             targets = kimiTargets;
         }
-        else if (routeName === DEFAULT_ROUTE || routeName === 'thinking') {
+        else {
             const prioritized = [];
             const fallthrough = [];
             for (const key of targets) {

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

@@ -1,4 +1,4 @@
-import { type RoutingDecision, type RoutingDiagnostics, type StopMessageStateSnapshot, type RouterMetadataInput, type VirtualRouterConfig, type TargetMetadata, type ProviderFailureEvent, type ProviderErrorEvent, type ProviderSuccessEvent, type VirtualRouterHealthStore } from './types.js';
+import { type RoutingDecision, type RoutingDiagnostics, type StopMessageStateSnapshot, type PreCommandStateSnapshot, type RouterMetadataInput, type VirtualRouterConfig, type TargetMetadata, type ProviderFailureEvent, type ProviderErrorEvent, type ProviderSuccessEvent, type VirtualRouterHealthStore } from './types.js';
 import type { ProcessedRequest, StandardizedRequest } from '../../conversion/hub/types/standardized.js';
 import { type RoutingInstructionState } from './routing-instructions.js';
 import type { ProviderQuotaView } from './types.js';
@@ -48,6 +48,7 @@ export declare class VirtualRouterEngine {
         diagnostics: RoutingDiagnostics;
     };
     getStopMessageState(metadata: RouterMetadataInput): StopMessageStateSnapshot | null;
+    getPreCommandState(metadata: RouterMetadataInput): PreCommandStateSnapshot | null;
     handleProviderFailure(event: ProviderFailureEvent): void;
     handleProviderError(event: ProviderErrorEvent): void;
     handleProviderSuccess(event: ProviderSuccessEvent): void;
@@ -70,6 +71,7 @@ export declare class VirtualRouterEngine {
     private providerHealthConfig;
     private resolveStickyKey;
     private resolveSessionScope;
+    private resolveInstructionProcessModeForSelection;
     private resolveInstructionTarget;
     private filterCandidatesByRoutingState;
     private selectFromCandidates;