@jsonstudio/llms 0.6.568 → 0.6.626

package/dist/conversion/shared/tool-filter-pipeline.js

@@ -134,42 +134,67 @@ function applyLocalToolGovernance(chatRequest, rawPayload) {
     };
 }
 function detectImageHint(messages, rawPayload) {
-    const candidates = [];
-    const collect = (value) => {
-        if (typeof value === 'string' && value) {
-            candidates.push(value);
-        }
+    const patterns = ['.png', '.jpg', '.jpeg', '.gif', '.webp', '.bmp', '.svg'];
+    const hasImageExt = (value) => {
+        if (typeof value !== 'string' || !value)
+            return false;
+        const lower = value.toLowerCase();
+        return patterns.some(ext => lower.includes(ext));
     };
-    if (Array.isArray(messages)) {
-        for (const msg of messages) {
-            if (msg && typeof msg === 'object') {
-                const text = msg.content;
-                if (typeof text === 'string') {
-                    collect(text);
-                }
-                else if (Array.isArray(text)) {
-                    for (const part of text) {
-                        if (part && typeof part === 'object') {
-                            collect(part.text);
-                        }
-                    }
+    const hasImageInMessage = (msg) => {
+        if (!msg || typeof msg !== 'object')
+            return false;
+        const m = msg;
+        const content = m.content;
+        if (typeof content === 'string') {
+            if (hasImageExt(content))
+                return true;
+        }
+        else if (Array.isArray(content)) {
+            for (const part of content) {
+                if (!part || typeof part !== 'object')
+                    continue;
+                const p = part;
+                const t = String(p.type || '').toLowerCase();
+                if (t.includes('image')) {
+                    return true;
                 }
+                if (hasImageExt(p.text))
+                    return true;
+                const imageUrl = typeof p.image_url === 'string'
+                    ? p.image_url
+                    : p.image_url && typeof p.image_url.url === 'string'
+                        ? p.image_url.url
+                        : typeof p.url === 'string'
+                            ? p.url
+                            : undefined;
+                if (hasImageExt(imageUrl))
+                    return true;
+                if (hasImageExt(p.path))
+                    return true;
             }
         }
-    }
-    if (rawPayload && typeof rawPayload === 'object') {
-        collect(rawPayload.content);
-    }
-    if (!candidates.length) {
         return false;
-    }
-    const patterns = ['.png', '.jpg', '.jpeg', '.gif', '.webp', '.bmp', '.svg'];
-    for (const text of candidates) {
-        const lower = text.toLowerCase();
-        for (const ext of patterns) {
-            if (lower.includes(ext)) {
+    };
+    // 仅考虑“当前这一轮”的用户输入是否包含图片链接或图片负载，避免因为历史上下文中曾经出现过图片而在后续轮次持续暴露 view_image。
+    if (Array.isArray(messages)) {
+        for (let i = messages.length - 1; i >= 0; i -= 1) {
+            const msg = messages[i];
+            if (!msg || typeof msg !== 'object')
+                continue;
+            const role = String(msg.role || '').toLowerCase();
+            if (role !== 'user')
+                continue;
+            if (hasImageInMessage(msg)) {
                 return true;
             }
+            break;
+        }
+    }
+    if (rawPayload && typeof rawPayload === 'object') {
+        const text = rawPayload.content;
+        if (hasImageExt(text)) {
+            return true;
         }
     }
     return false;

package/dist/filters/index.d.ts

@@ -1,3 +1,4 @@
+export type { ToolFilterHints, ToolFilterDecision, ToolFilterAction } from './types.js';
 export * from './types.js';
 export * from './engine.js';
 export * from './builtin/whitelist-filter.js';

package/dist/filters/special/response-apply-patch-toon-decode.js

@@ -48,15 +48,23 @@ export class ResponseApplyPatchToonDecodeFilter {
                         if (typeof nameRaw !== 'string' || nameRaw.trim().toLowerCase() !== 'apply_patch') {
                             continue;
                         }
-                        const argStr = fn.arguments;
-                        if (typeof argStr !== 'string' || !argStr.trim())
-                            continue;
+                        const argIn = fn.arguments;
                         let parsed;
-                        try {
-                            parsed = JSON.parse(argStr);
+                        if (typeof argIn === 'string') {
+                            if (!argIn.trim())
+                                continue;
+                            try {
+                                parsed = JSON.parse(argIn);
+                            }
+                            catch {
+                                // 如果 arguments 不是 JSON 字符串，则保持原样交给下游处理
+                                continue;
+                            }
                         }
-                        catch {
-                            // 如果 arguments 不是 JSON 字符串，则保持原样交给下游处理
+                        else if (isObject(argIn)) {
+                            parsed = argIn;
+                        }
+                        else {
                             continue;
                         }
                         if (!isObject(parsed))

package/dist/filters/special/response-tool-arguments-toon-decode.js

@@ -1,3 +1,4 @@
+import { isShellToolName, normalizeToolName } from '../../tools/tool-description-utils.js';
 function envEnabled() {
     // Default ON. Allow disabling via env RCC_TOON_ENABLE/ROUTECODEX_TOON_ENABLE = 0|false|off
     const v = String(process?.env?.RCC_TOON_ENABLE || process?.env?.ROUTECODEX_TOON_ENABLE || '').toLowerCase();
@@ -46,6 +47,31 @@ function decodeToonPairs(toon) {
         return null;
     }
 }
+function coerceToPrimitive(value) {
+    const trimmed = value.trim();
+    if (!trimmed)
+        return '';
+    const lower = trimmed.toLowerCase();
+    if (lower === 'true')
+        return true;
+    if (lower === 'false')
+        return false;
+    if (/^[+-]?\d+(\.\d+)?$/.test(trimmed)) {
+        const num = Number(trimmed);
+        if (Number.isFinite(num))
+            return num;
+    }
+    if ((trimmed.startsWith('{') && trimmed.endsWith('}')) ||
+        (trimmed.startsWith('[') && trimmed.endsWith(']'))) {
+        try {
+            return JSON.parse(trimmed);
+        }
+        catch {
+            // fall through
+        }
+    }
+    return value;
+}
 /**
  * Decode arguments.toon to standard JSON ({command, workdir?}) and map tool name 'shell_toon' → 'shell'.
  * Stage: response_pre (before arguments stringify and invariants).
@@ -68,15 +94,23 @@ export class ResponseToolArgumentsToonDecodeFilter {
                         const fn = tc && tc.function ? tc.function : undefined;
                         if (!fn || typeof fn !== 'object')
                             continue;
-                        const argStr = fn.arguments;
-                        if (typeof argStr !== 'string')
-                            continue;
-                        let parsed;
-                        try {
-                            parsed = JSON.parse(argStr);
+                        const rawName = fn.name;
+                        const toolName = typeof rawName === 'string' ? rawName : '';
+                        const normalizedName = normalizeToolName(toolName);
+                        const isShellLike = isShellToolName(toolName);
+                        const isApplyPatch = normalizedName === 'apply_patch';
+                        const argIn = fn.arguments;
+                        let parsed = undefined;
+                        if (typeof argIn === 'string') {
+                            try {
+                                parsed = JSON.parse(argIn);
+                            }
+                            catch {
+                                parsed = undefined;
+                            }
                         }
-                        catch {
-                            continue;
+                        else if (isObject(argIn)) {
+                            parsed = argIn;
                         }
                         if (!isObject(parsed))
                             continue;
@@ -102,24 +136,76 @@ export class ResponseToolArgumentsToonDecodeFilter {
                             }
                             continue; // keep original if decode fails
                         }
-                        const command = typeof kv['command'] === 'string' && kv['command'].trim()
-                            ? kv['command']
-                            : (typeof kv['cmd'] === 'string' && kv['cmd'].trim() ? kv['cmd'] : undefined);
-                        const workdir = typeof kv['workdir'] === 'string' && kv['workdir'].trim()
-                            ? kv['workdir']
-                            : (typeof kv['cwd'] === 'string' && kv['cwd'].trim() ? kv['cwd'] : undefined);
-                        if (typeof command === 'string' && command.trim()) {
-                            const merged = { cmd: command };
-                            if (typeof workdir === 'string' && workdir.trim()) {
-                                merged.workdir = workdir;
+                        // apply_patch 的 toon 由专门的 ResponseApplyPatchToonDecodeFilter 处理，这里跳过，避免覆盖。
+                        if (isApplyPatch) {
+                            continue;
+                        }
+                        if (isShellLike) {
+                            const commandRaw = (typeof kv['command'] === 'string' && kv['command'].trim()
+                                ? kv['command']
+                                : typeof kv['cmd'] === 'string' && kv['cmd'].trim()
+                                    ? kv['cmd']
+                                    : undefined) ?? '';
+                            const workdirRaw = (typeof kv['workdir'] === 'string' && kv['workdir'].trim()
+                                ? kv['workdir']
+                                : typeof kv['cwd'] === 'string' && kv['cwd'].trim()
+                                    ? kv['cwd']
+                                    : undefined) ?? '';
+                            const timeoutRaw = typeof kv['timeout_ms'] === 'string' ? kv['timeout_ms'] : undefined;
+                            const escalatedRaw = typeof kv['with_escalated_permissions'] === 'string'
+                                ? kv['with_escalated_permissions']
+                                : undefined;
+                            const justificationRaw = typeof kv['justification'] === 'string' ? kv['justification'] : undefined;
+                            const command = commandRaw.trim();
+                            if (command) {
+                                const merged = {
+                                    cmd: command,
+                                    command
+                                };
+                                const workdir = workdirRaw.trim();
+                                if (workdir) {
+                                    merged.workdir = workdir;
+                                }
+                                if (timeoutRaw) {
+                                    const timeoutNum = Number(timeoutRaw);
+                                    if (Number.isFinite(timeoutNum)) {
+                                        merged.timeout_ms = timeoutNum;
+                                    }
+                                }
+                                if (escalatedRaw) {
+                                    const escLower = escalatedRaw.trim().toLowerCase();
+                                    if (escLower === 'true' || escLower === 'yes' || escLower === '1') {
+                                        merged.with_escalated_permissions = true;
+                                    }
+                                    else if (escLower === 'false' || escLower === 'no' || escLower === '0') {
+                                        merged.with_escalated_permissions = false;
+                                    }
+                                }
+                                if (justificationRaw && justificationRaw.trim()) {
+                                    merged.justification = justificationRaw;
+                                }
+                                try {
+                                    fn.arguments = JSON.stringify(merged);
+                                }
+                                catch {
+                                    /* keep original */
+                                }
+                                if (typeof fn.name === 'string' && fn.name === 'shell_toon') {
+                                    fn.name = 'shell';
+                                }
+                            }
+                        }
+                        else {
+                            // 通用 TOON → JSON 解码：除 shell / apply_patch 以外的工具，将 key: value 对映射为普通 JSON 字段。
+                            const merged = {};
+                            for (const [key, value] of Object.entries(kv)) {
+                                merged[key] = coerceToPrimitive(value);
                             }
-                            merged.command = command;
                             try {
                                 fn.arguments = JSON.stringify(merged);
                             }
-                            catch { /* keep original */ }
-                            if (typeof fn.name === 'string' && fn.name === 'shell_toon') {
-                                fn.name = 'shell';
+                            catch {
+                                // keep original on stringify failure
                             }
                         }
                     }

package/dist/guidance/index.js

@@ -227,6 +227,7 @@ export function augmentAnthropicTools(tools) {
                     const marker = '[Codex ApplyPatch Guidance]';
                     const guidance = [
                         marker,
+                        'Before using apply_patch, always read the latest content of the target file (via shell or another tool) and base your changes on that content.',
                         'Provide structured changes (insert_after / insert_before / replace / delete / create_file / delete_file) instead of raw patch text.',
                         'Each change must include the target file (relative path) plus anchor/target snippets and the replacement lines.',
                         '所有路径必须相对工作区根目录，禁止输出以 / 或盘符开头的绝对路径。'
@@ -264,6 +265,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: Before writing, always read the target file first and compute changes against the latest content using appropriate tools. / apply_patch 在写入前必须先通过合适的工具读取目标文件最新内容，并基于该内容生成变更。'));
     lines.push(bullet('apply_patch: Provide structured JSON arguments with a `changes` array (insert_after / insert_before / replace / delete / create_file / delete_file); omit "+/-" prefixes in `lines`; file paths必须是相对路径。 / apply_patch 仅接受结构化 JSON。'));
     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/dist/router/virtual-router/classifier.js

@@ -11,22 +11,23 @@ export class RoutingClassifier {
     }
     classify(features) {
         const lastToolCategory = features.lastAssistantToolCategory;
-        const userInterruptsToolContinuation = features.latestMessageFromUser === true && !features.hasTools && !features.hasToolCallResponses;
-        const allowContinuation = !userInterruptsToolContinuation;
         const reachedLongContext = features.estimatedTokens >= (this.config.longContextThresholdTokens ?? DEFAULT_LONG_CONTEXT_THRESHOLD);
         const latestMessageFromUser = features.latestMessageFromUser === true;
-        const codingContinuation = allowContinuation && lastToolCategory === 'write';
-        const thinkingContinuation = allowContinuation && lastToolCategory === 'read';
-        const searchContinuation = allowContinuation && lastToolCategory === 'search';
-        const toolsContinuation = allowContinuation && lastToolCategory === 'other';
+        const thinkingContinuation = lastToolCategory === 'read';
+        const thinkingFromUser = latestMessageFromUser;
+        const thinkingFromRead = !thinkingFromUser && thinkingContinuation;
+        const codingContinuation = lastToolCategory === 'write';
+        const searchContinuation = lastToolCategory === 'search';
+        const toolsContinuation = lastToolCategory === 'other';
+        const hasToolActivity = features.hasTools || features.hasToolCallResponses;
         const evaluationMap = {
             vision: {
                 triggered: features.hasImageAttachment,
                 reason: 'vision:image-detected'
             },
             thinking: {
-                triggered: latestMessageFromUser,
-                reason: 'thinking:user-input'
+                triggered: thinkingFromUser || thinkingFromRead,
+                reason: thinkingFromUser ? 'thinking:user-input' : 'thinking:last-tool-read'
             },
             longcontext: {
                 triggered: reachedLongContext,
@@ -36,9 +37,11 @@ export class RoutingClassifier {
                 triggered: codingContinuation,
                 reason: 'coding:last-tool-write'
             },
-            thinking_continuation: {
-                triggered: thinkingContinuation,
-                reason: 'thinking:last-tool-read'
+            web_search: {
+                // web_search 路由不再基于上一轮工具分类或本轮是否声明 web_search 工具自动触发，
+                // 仅保留为显式路由指令/未来扩展的占位，默认不命中。
+                triggered: false,
+                reason: 'web_search:disabled'
             },
             search: {
                 // search 路由：仅在上一轮 assistant 使用 search 类工具时继续命中，
@@ -48,7 +51,8 @@ export class RoutingClassifier {
             },
             tools: {
                 // tools 路由：通用工具分支，包括首次声明的 web/search 工具。
-                triggered: toolsContinuation || features.hasTools || features.hasToolCallResponses,
+                // 若上一轮已明确归类为 search，则优先命中 search 路由，tools 仅作为兜底。
+                triggered: toolsContinuation || (!searchContinuation && hasToolActivity),
                 reason: toolsContinuation ? 'tools:last-tool-other' : 'tools:tool-request-detected'
             },
             background: {

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

@@ -130,6 +130,37 @@ export class VirtualRouterEngine {
             this.debug?.log?.('[virtual-router-hit]', selection.routeUsed, selection.providerKey, target.modelId || '', hitReason ? `reason=${hitReason}` : '');
         }
         const didFallback = selection.routeUsed !== requestedRoute;
+        // 自动 sticky：对需要上下文 save/restore 的 Responses 会话，强制同一个 provider.key.model。
+        // 其它协议不启用粘滞，仅显式 routing 指令才会写入 stickyTarget。
+        const providerProtocol = metadata?.providerProtocol;
+        const serverToolRequired = metadata?.serverToolRequired === true;
+        const disableSticky = metadata &&
+            typeof metadata === 'object' &&
+            metadata.disableStickyRoutes === true;
+        const shouldAutoStickyForResponses = providerProtocol === 'openai-responses' && serverToolRequired && !disableSticky;
+        if (shouldAutoStickyForResponses) {
+            const stickyKeyForState = this.resolveStickyKey(metadata);
+            if (stickyKeyForState) {
+                const stateKey = stickyKeyForState;
+                const state = this.getRoutingInstructionState(stateKey);
+                if (!state.stickyTarget) {
+                    const providerId = this.extractProviderId(selection.providerKey);
+                    if (providerId) {
+                        const parts = selection.providerKey.split('.');
+                        const keyAlias = parts.length >= 3 ? parts[1] : undefined;
+                        const modelId = target.modelId;
+                        state.stickyTarget = {
+                            provider: providerId,
+                            keyAlias,
+                            model: modelId,
+                            // pathLength=3 表示 provider.key.model 形式，对应 alias 显式 sticky；
+                            // 若缺少别名或模型，则退化为更短 pathLength。
+                            pathLength: keyAlias && modelId ? 3 : keyAlias ? 2 : 1
+                        };
+                    }
+                }
+            }
+        }
         return {
             target,
             decision: {
@@ -263,14 +294,24 @@ export class VirtualRouterEngine {
         return this.healthManager.getConfig();
     }
     resolveStickyKey(metadata) {
+        const providerProtocol = metadata.providerProtocol;
+        // 对 Responses 协议的自动粘滞，仅在“单次会话链路”内生效：
+        // - Resume/submit 调用：stickyKey = previousRequestId（指向首轮请求）；
+        // - 普通 /v1/responses 调用：stickyKey = 本次 requestId；
+        // 这样不会把 Responses 的自动粘滞扩散到整个 session，仅在需要 save/restore
+        // 的请求链路中复用 provider.key.model。
+        if (providerProtocol === 'openai-responses') {
+            const resume = metadata.responsesResume;
+            if (resume && typeof resume.previousRequestId === 'string' && resume.previousRequestId.trim()) {
+                return resume.previousRequestId.trim();
+            }
+            return metadata.requestId;
+        }
+        // 其它协议沿用会话级 sticky 语义：sessionId / conversationId → requestId。
         const sessionScope = this.resolveSessionScope(metadata);
         if (sessionScope) {
             return sessionScope;
         }
-        const resume = metadata.responsesResume;
-        if (resume && typeof resume.previousRequestId === 'string' && resume.previousRequestId.trim()) {
-            return resume.previousRequestId.trim();
-        }
         return metadata.requestId;
     }
     resolveSessionScope(metadata) {

package/dist/router/virtual-router/tool-signals.d.ts

@@ -1,5 +1,5 @@
 import type { StandardizedMessage, StandardizedRequest } from '../../conversion/hub/types/standardized.js';
-export type ToolCategory = 'read' | 'write' | 'search' | 'other';
+export type ToolCategory = 'read' | 'write' | 'search' | 'websearch' | 'other';
 export type ToolClassification = {
     category: ToolCategory;
     name: string;
@@ -10,4 +10,5 @@ export declare function detectCodingTool(request: StandardizedRequest): boolean;
 export declare function detectWebTool(request: StandardizedRequest): boolean;
 export declare function extractMeaningfulDeclaredToolNames(tools: StandardizedRequest['tools'] | undefined): string[];
 export declare function detectLastAssistantToolCategory(messages: StandardizedMessage[]): ToolClassification | undefined;
+export declare function classifyToolCallForReport(call: StandardizedMessage['tool_calls'][number]): ToolClassification | undefined;
 export declare function canonicalizeToolName(rawName: string): string;