@jsonstudio/rcc 0.89.3 → 0.89.164

package/node_modules/@jsonstudio/llms/dist/filters/special/request-tools-normalize.js

@@ -73,7 +73,7 @@ export class RequestOpenAIToolsNormalizeFilter {
                             delete dst.function.strict;
                     }
                     catch { /* ignore */ }
-                    // Switch schema for 'shell' at unified shaping point
+                    // Switch schema for specific built-in tools at unified shaping point
                     try {
                         const name = String(dst.function.name || '').toLowerCase();
                         if (name === 'shell') {
@@ -101,6 +101,25 @@ export class RequestOpenAIToolsNormalizeFilter {
                                 };
                             }
                         }
+                        else if (name === 'apply_patch') {
+                            dst.function.parameters = {
+                                type: 'object',
+                                properties: {
+                                    input: {
+                                        type: 'string',
+                                        description: 'Unified diff patch body between *** Begin Patch/*** End Patch.'
+                                    },
+                                    patch: {
+                                        type: 'string',
+                                        description: 'Alias of input for backwards compatibility.'
+                                    }
+                                },
+                                required: ['input'],
+                                additionalProperties: false
+                            };
+                            dst.function.description =
+                                'Use apply_patch to edit files. Provide the diff via the input field (*** Begin Patch ... *** End Patch).';
+                        }
                     }
                     catch { /* ignore */ }
                     finalTools.push(dst);

package/node_modules/@jsonstudio/llms/dist/guidance/index.js

@@ -63,6 +63,8 @@ function augmentApplyPatch(fn) {
     const guidance = [
         marker,
         'Edit files by applying a unified diff patch. Return ONLY the patch text with *** Begin Patch/*** End Patch blocks.',
+        'Paths resolve relative to the active workspace root. Use forward-slash paths (e.g., packages/foo/file.ts) and switch to absolute paths only if you truly need to edit outside the workspace.',
+        '路径一律相对于当前工作区根目录解析；请写 packages/foo/... 这样的相对路径，跨工作区时再使用绝对路径。',
         'Example:',
         '*** Begin Patch',
         '*** Update File: path/to/file.ts',
@@ -181,7 +183,9 @@ export function augmentAnthropicTools(tools) {
                     const marker = '[Codex ApplyPatch Guidance]';
                     const guidance = [
                         marker,
-                        'Use unified diff patch with *** Begin Patch/End Patch. Return only the patch text.'
+                        'Use unified diff patch with *** Begin Patch/End Patch. Return only the patch text.',
+                        'All file paths must stay relative to the workspace root; never emit leading \'/\' or drive letters.',
+                        '所有文件路径都必须相对当前工作区根目录，禁止输出以 / 或盘符开头的绝对路径。'
                     ].join('\n');
                     copy.description = appendOnce(desc, guidance, marker);
                 }
@@ -216,7 +220,7 @@ export function buildSystemToolGuidance() {
     lines.push(bullet('function.arguments must be a single JSON string. / arguments 必须是单个 JSON 字符串。'));
     lines.push(bullet('shell: Place ALL intent into the command argv array only; do not invent extra keys. / shell 所有意图写入 command 数组，不要添加额外键名。'));
     lines.push(bullet('File writes are FORBIDDEN via shell (no redirection, no here-doc, no sed -i, no ed -s, no tee). Use apply_patch ONLY. / 通过 shell 写文件一律禁止（不得使用重定向、heredoc、sed -i、ed -s、tee）；必须使用 apply_patch。'));
-    lines.push(bullet('apply_patch: Provide a unified diff patch with *** Begin Patch/*** End Patch only. / 仅输出统一 diff 补丁。'));
+    lines.push(bullet('apply_patch: Provide a unified diff patch with *** Begin Patch/*** End Patch only, and keep file paths relative to the workspace (no leading / or drive letters). / 仅输出统一 diff 补丁，且文件路径必须是相对路径（禁止以 / 或盘符开头）。'));
     lines.push(bullet('apply_patch example / 示例：\n*** Begin Patch\n*** Update File: path/to/file.ts\n@@\n- old line\n+ new line\n*** End Patch'));
     lines.push(bullet('update_plan: Keep exactly one step in_progress; others pending/completed. / 仅一个 in_progress 步骤。'));
     lines.push(bullet('view_image: Path must be an image file (.png .jpg .jpeg .gif .webp .bmp .svg). / 仅图片路径。'));

package/node_modules/@jsonstudio/llms/dist/router/virtual-router/bootstrap.js

@@ -1,6 +1,6 @@
 import { VirtualRouterError, VirtualRouterErrorCode } from './types.js';
 const DEFAULT_CLASSIFIER = {
-    longContextThresholdTokens: 60000,
+    longContextThresholdTokens: 180000,
     thinkingKeywords: ['think step', 'analysis', 'reasoning', '仔细分析', '深度思考'],
     codingKeywords: ['apply_patch', 'write_file', 'create_file', 'shell', '修改文件', '写入文件'],
     backgroundKeywords: ['background', 'context dump', '上下文'],
@@ -208,7 +208,7 @@ function normalizeProvider(providerId, raw) {
                 ? provider.baseUrl.trim()
                 : '';
     const headers = normalizeHeaders(provider.headers);
-    const compatibilityProfile = resolveCompatibilityProfile(provider);
+    const compatibilityProfile = resolveCompatibilityProfile(providerId, provider);
     const responsesConfig = normalizeResponsesConfig(provider);
     const processMode = normalizeProcessMode(provider.process);
     return {
@@ -233,12 +233,21 @@ function normalizeResponsesConfig(provider) {
     }
     return undefined;
 }
-function resolveCompatibilityProfile(provider) {
-    const compat = provider.compat;
-    if (typeof compat === 'string' && compat.trim().length > 0) {
-        return compat.trim();
+function resolveCompatibilityProfile(providerId, provider) {
+    if (typeof provider.compatibilityProfile === 'string' && provider.compatibilityProfile.trim()) {
+        return provider.compatibilityProfile.trim();
     }
-    return 'default';
+    const legacyFields = [];
+    if (typeof provider.compat === 'string') {
+        legacyFields.push('compat');
+    }
+    if (typeof provider.compatibility_profile === 'string') {
+        legacyFields.push('compatibility_profile');
+    }
+    if (legacyFields.length > 0) {
+        throw new VirtualRouterError(`Provider "${providerId}" uses legacy compatibility field(s): ${legacyFields.join(', ')}. Rename to "compatibilityProfile".`, VirtualRouterErrorCode.CONFIG_ERROR);
+    }
+    return 'compat:passthrough';
 }
 function normalizeProcessMode(value) {
     if (typeof value !== 'string') {

package/node_modules/@jsonstudio/llms/dist/router/virtual-router/classifier.js

@@ -1,5 +1,5 @@
 import { DEFAULT_ROUTE, ROUTE_PRIORITY } from './types.js';
-const DEFAULT_LONG_CONTEXT_THRESHOLD = 60000;
+const DEFAULT_LONG_CONTEXT_THRESHOLD = 180000;
 export class RoutingClassifier {
     config;
     constructor(config) {
@@ -10,55 +10,58 @@ export class RoutingClassifier {
         };
     }
     classify(features) {
-        const evaluations = [
-            {
-                route: 'vision',
+        const lastToolCategory = features.lastAssistantToolCategory;
+        const reachedLongContext = features.estimatedTokens >= (this.config.longContextThresholdTokens ?? DEFAULT_LONG_CONTEXT_THRESHOLD);
+        const thinkingKeywordHit = features.hasThinkingKeyword ||
+            containsKeywords(features.userTextSample, this.config.thinkingKeywords ?? []);
+        const codingContinuation = lastToolCategory === 'write';
+        const thinkingContinuation = lastToolCategory === 'read';
+        const searchContinuation = lastToolCategory === 'search';
+        const toolsContinuation = lastToolCategory === 'other';
+        const evaluationMap = {
+            vision: {
                 triggered: features.hasVisionTool && features.hasImageAttachment,
                 reason: 'vision:requires-tool+image'
             },
-            {
-                route: 'websearch',
-                triggered: features.hasWebTool,
-                reason: 'websearch:web-tools-detected'
+            longcontext: {
+                triggered: reachedLongContext,
+                reason: 'longcontext:token-threshold'
             },
-            {
-                route: 'coding',
-                triggered: features.hasCodingTool,
-                reason: 'coding:coding-tools-detected'
+            websearch: {
+                triggered: features.hasWebTool || searchContinuation,
+                reason: searchContinuation ? 'websearch:last-tool-search' : 'websearch:web-tools-detected'
             },
-            {
-                route: 'tools',
-                triggered: features.hasTools || features.hasToolCallResponses,
-                reason: 'tools:tool-request-detected'
+            coding: {
+                triggered: codingContinuation,
+                reason: 'coding:last-tool-write'
             },
-            {
-                route: 'longcontext',
-                triggered: features.estimatedTokens >= (this.config.longContextThresholdTokens ?? DEFAULT_LONG_CONTEXT_THRESHOLD),
-                reason: 'longcontext:token-threshold'
+            thinking: {
+                triggered: thinkingContinuation || thinkingKeywordHit,
+                reason: thinkingContinuation ? 'thinking:last-tool-read' : 'thinking:keywords'
             },
-            {
-                route: 'thinking',
-                triggered: features.hasThinkingKeyword ||
-                    containsKeywords(features.userTextSample, this.config.thinkingKeywords ?? []),
-                reason: 'thinking:keywords'
+            tools: {
+                triggered: toolsContinuation || features.hasTools || features.hasToolCallResponses,
+                reason: toolsContinuation ? 'tools:last-tool-other' : 'tools:tool-request-detected'
             },
-            {
-                route: 'background',
+            background: {
                 triggered: containsKeywords(features.userTextSample, this.config.backgroundKeywords ?? []),
                 reason: 'background:keywords'
             }
-        ];
-        const triggeredEvaluations = evaluations.filter((evaluation) => evaluation.triggered);
-        const orderedRoutes = this.orderRoutes(triggeredEvaluations.map((entry) => entry.route));
-        const chosenRoute = orderedRoutes.length ? orderedRoutes[0] : DEFAULT_ROUTE;
-        const chosenReason = triggeredEvaluations.find((entry) => entry.route === chosenRoute)?.reason || 'fallback:default';
-        const candidates = this.ensureDefaultCandidate(orderedRoutes);
-        return this.buildResult(chosenRoute, chosenReason, evaluations, candidates);
+        };
+        for (const routeName of ROUTE_PRIORITY) {
+            const evaluation = evaluationMap[routeName];
+            if (evaluation && evaluation.triggered) {
+                const candidates = this.ensureDefaultCandidate([routeName]);
+                return this.buildResult(routeName, evaluation.reason, evaluationMap, candidates);
+            }
+        }
+        const candidates = this.ensureDefaultCandidate([DEFAULT_ROUTE]);
+        return this.buildResult(DEFAULT_ROUTE, 'fallback:default', evaluationMap, candidates);
     }
     buildResult(routeName, chosenReason, evaluations, candidates) {
-        const diagnostics = evaluations
-            .filter((evaluation) => evaluation.triggered)
-            .map((evaluation) => evaluation.reason);
+        const diagnostics = Object.entries(evaluations)
+            .filter(([_, evaluation]) => evaluation.triggered)
+            .map(([_, evaluation]) => evaluation.reason);
         const reasoningParts = [chosenReason, ...diagnostics.filter((reason) => reason !== chosenReason)];
         return {
             routeName,

package/node_modules/@jsonstudio/llms/dist/router/virtual-router/default-thinking-keywords.d.ts

@@ -0,0 +1 @@
+export declare const DEFAULT_THINKING_KEYWORDS: string[];

package/node_modules/@jsonstudio/llms/dist/router/virtual-router/default-thinking-keywords.js

@@ -0,0 +1,13 @@
+export const DEFAULT_THINKING_KEYWORDS = [
+    '思考',
+    '深度思考',
+    '分析',
+    '推理',
+    '思路',
+    '一步一步',
+    '慢慢',
+    'think',
+    'thinking',
+    'step by step',
+    'reason'
+];

package/node_modules/@jsonstudio/llms/dist/router/virtual-router/engine.d.ts

@@ -0,0 +1,39 @@
+import { type RoutingDecision, type RoutingDiagnostics, type RouterMetadataInput, type VirtualRouterConfig, type TargetMetadata, type ProviderFailureEvent, type ProviderErrorEvent } from './types.js';
+import type { ProcessedRequest, StandardizedRequest } from '../../conversion/hub/types/standardized.js';
+export declare class VirtualRouterEngine {
+    private routing;
+    private readonly providerRegistry;
+    private readonly healthManager;
+    private loadBalancer;
+    private classifier;
+    private routeStats;
+    private readonly debug;
+    private healthConfig;
+    initialize(config: VirtualRouterConfig): void;
+    route(request: StandardizedRequest | ProcessedRequest, metadata: RouterMetadataInput): {
+        target: TargetMetadata;
+        decision: RoutingDecision;
+        diagnostics: RoutingDiagnostics;
+    };
+    handleProviderFailure(event: ProviderFailureEvent): void;
+    handleProviderError(event: ProviderErrorEvent): void;
+    getStatus(): {
+        routes: Record<string, {
+            providers: string[];
+            hits: number;
+            lastUsedProvider?: string;
+        }>;
+        health: import("./types.js").ProviderHealthState[];
+    };
+    private validateConfig;
+    private selectProvider;
+    private incrementRouteStat;
+    private providerHealthConfig;
+    private resolveStickyKey;
+    private mapProviderError;
+    private deriveReason;
+    private buildRouteCandidates;
+    private sortByPriority;
+    private routeWeight;
+    private buildHitReason;
+}

package/node_modules/@jsonstudio/llms/dist/router/virtual-router/engine.js

@@ -11,11 +11,14 @@ export class VirtualRouterEngine {
     loadBalancer = new RouteLoadBalancer();
     classifier = new RoutingClassifier({});
     routeStats = new Map();
+    debug = console; // thin hook; host may monkey-patch for colored logging
+    healthConfig = null;
     initialize(config) {
         this.validateConfig(config);
         this.routing = config.routing;
         this.providerRegistry.load(config.providers);
         this.healthManager.configure(config.health);
+        this.healthConfig = config.health ?? null;
         this.healthManager.registerProviders(Object.keys(config.providers));
         this.loadBalancer = new RouteLoadBalancer(config.loadBalancing);
         this.classifier = new RoutingClassifier(config.classifier);
@@ -32,6 +35,8 @@ export class VirtualRouterEngine {
         const target = this.providerRegistry.buildTarget(selection.providerKey);
         this.healthManager.recordSuccess(selection.providerKey);
         this.incrementRouteStat(selection.routeUsed, selection.providerKey);
+        const hitReason = this.buildHitReason(selection.routeUsed, classification, features);
+        this.debug?.log?.('[virtual-router-hit]', selection.routeUsed, selection.providerKey, target.modelId || '', hitReason ? `reason=${hitReason}` : '');
         const didFallback = selection.routeUsed !== routeName || classification.fallback;
         return {
             target,
@@ -117,7 +122,7 @@ export class VirtualRouterEngine {
     }
     selectProvider(requestedRoute, metadata, classification) {
         const candidates = this.buildRouteCandidates(requestedRoute, classification.candidates);
-        const stickyKey = metadata.requestId;
+        const stickyKey = this.resolveStickyKey(metadata);
         const attempted = [];
         for (const routeName of candidates) {
             const pool = this.routing[routeName];
@@ -147,7 +152,20 @@ export class VirtualRouterEngine {
         stats.hits += 1;
         stats.lastProvider = providerKey;
     }
+    providerHealthConfig() {
+        return this.healthManager.getConfig();
+    }
+    resolveStickyKey(metadata) {
+        const resume = metadata.responsesResume;
+        if (resume && typeof resume.previousRequestId === 'string' && resume.previousRequestId.trim()) {
+            return resume.previousRequestId.trim();
+        }
+        return metadata.requestId;
+    }
     mapProviderError(event) {
+        // NOTE: mapProviderError is the only place where VirtualRouter translates providerErrorCenter
+        // events into health signals. Classification is intentionally coarse; upstream providers
+        // are expected to set event.recoverable explicitly when they know an error is safe to retry.
         if (!event || !event.runtime) {
             return null;
         }
@@ -162,19 +180,23 @@ export class VirtualRouterEngine {
         const code = event.code?.toUpperCase() ?? 'ERR_UNKNOWN';
         const stage = event.stage?.toLowerCase() ?? 'unknown';
         const recoverable = event.recoverable === true;
+        // 默认策略：只有显式可恢复的错误才视为非致命；其余一律按致命处理。
+        // 注意：provider 层已经对 429 做了「连续 4 次升级为不可恢复」的判断，这里不再把所有 429 强行当作可恢复。
         let fatal = !recoverable;
         let reason = this.deriveReason(code, stage, statusCode);
         let cooldownOverrideMs;
-        if (statusCode === 429 || code.includes('429') || recoverable) {
-            fatal = false;
-            cooldownOverrideMs = Math.max(30_000, this.providerHealthConfig().cooldownMs);
-            reason = 'rate_limit';
-        }
-        else if (statusCode === 401 || statusCode === 403 || code.includes('AUTH')) {
+        // 401 / 402 / 500 / 524 以及所有未被标记为可恢复的错误一律视为不可恢复
+        if (statusCode === 401 || statusCode === 402 || statusCode === 403 || code.includes('AUTH')) {
             fatal = true;
             cooldownOverrideMs = Math.max(10 * 60_000, this.providerHealthConfig().fatalCooldownMs ?? 10 * 60_000);
             reason = 'auth';
         }
+        else if (statusCode === 429 && !recoverable) {
+            // 连续 429 已在 provider 层被升级为不可恢复：这里按致命限流处理（长冷却，等同熔断）
+            fatal = true;
+            cooldownOverrideMs = Math.max(10 * 60_000, this.providerHealthConfig().fatalCooldownMs ?? 10 * 60_000);
+            reason = 'rate_limit';
+        }
         else if (statusCode && statusCode >= 500) {
             fatal = true;
             cooldownOverrideMs = Math.max(5 * 60_000, this.providerHealthConfig().fatalCooldownMs ?? 5 * 60_000);
@@ -193,7 +215,8 @@ export class VirtualRouterEngine {
             statusCode,
             errorCode: code,
             retryable: recoverable,
-            affectsHealth: true,
+            // 是否影响健康由 provider 层决定；这里仅在 event.affectsHealth !== false 时才计入健康状态
+            affectsHealth: event.affectsHealth !== false,
             cooldownOverrideMs,
             metadata: {
                 ...event.runtime,
@@ -221,9 +244,6 @@ export class VirtualRouterEngine {
             return 'client_error';
         return 'unknown';
     }
-    providerHealthConfig() {
-        return this.healthManager.getConfig();
-    }
     buildRouteCandidates(requestedRoute, classificationCandidates) {
         const normalized = requestedRoute || DEFAULT_ROUTE;
         const baseList = classificationCandidates && classificationCandidates.length
@@ -257,4 +277,25 @@ export class VirtualRouterEngine {
         const idx = ROUTE_PRIORITY.indexOf(routeName);
         return idx >= 0 ? idx : ROUTE_PRIORITY.length;
     }
+    buildHitReason(routeUsed, classification, features) {
+        const reasoning = classification.reasoning || '';
+        const primary = reasoning.split('|')[0] || '';
+        const lastToolName = features.lastAssistantToolName;
+        if (routeUsed === 'tools') {
+            if (lastToolName) {
+                return primary ? `${primary}(${lastToolName})` : `tools(${lastToolName})`;
+            }
+            return primary || 'tools';
+        }
+        if (routeUsed === 'thinking') {
+            return primary || 'thinking';
+        }
+        if (routeUsed === DEFAULT_ROUTE && classification.fallback) {
+            return primary || 'fallback:default';
+        }
+        if (primary) {
+            return primary;
+        }
+        return routeUsed ? `route:${routeUsed}` : 'route:unknown';
+    }
 }