@jsonstudio/llms 0.6.3275 → 0.6.3405

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

@@ -4,6 +4,7 @@ import { parseRoutingInstructions } from './routing-instructions/parse.js';
 import { createVirtualRouterEngineProxy } from './engine-selection/native-virtual-router-engine-proxy.js';
 import { cleanRoutingInstructionMarkersWithNative, parseRoutingInstructionKindsWithNative } from './engine-selection/native-virtual-router-routing-instructions-semantics.js';
 import { getLatestUserTextFromResponsesContext, hasLatestUserRoutingInstructionMarker, hasRoutingInstructionMarkerInResponsesContext } from './engine-legacy/helpers.js';
+import { extractMessageText, getLatestUserMessage } from './message-utils.js';
 import { ProviderRegistry } from './provider-registry.js';
 import { resolveStopMessageScope } from './engine/routing-state/store.js';
 import { loadRoutingInstructionStateSync } from './sticky-session-store.js';
@@ -225,8 +226,8 @@ function buildRoutingInstructionParseLog(request, metadata) {
     if (!messages.length) {
         return null;
     }
-    const latest = messages[messages.length - 1];
-    const latestText = typeof latest?.content === 'string' ? latest.content.trim() : '';
+    const latest = getLatestUserMessage(messages);
+    const latestText = latest ? extractMessageText(latest).trim() : '';
     const parsedKinds = parseRoutingInstructionKindsWithNative(request);
     const stopMessageTypes = parsedKinds.filter((type) => type === 'stopMessageSet' || type === 'stopMessageMode' || type === 'stopMessageClear');
     const scopedTypes = parsedKinds.filter((type) => type === 'stopMessageSet' ||

package/dist/router/virtual-router/routing-instructions/parse.js

@@ -1,4 +1,4 @@
-import { extractMessageText } from '../message-utils.js';
+import { extractMessageText, getLatestUserMessage } from '../message-utils.js';
 import { parseStopMessageInstruction } from '../routing-stop-message-parser.js';
 import { parsePreCommandInstruction } from '../routing-pre-command-parser.js';
 import { stripCodeSegments } from './clean.js';
@@ -6,8 +6,8 @@ import { ROUTING_INSTRUCTION_MARKER_PATTERN } from './types.js';
 export function parseRoutingInstructions(messages) {
     const instructions = [];
     // 只解析“当前最新一条消息”中的 marker，避免历史 user marker 在后续轮次被重复回放。
-    const latestMessage = messages.length > 0 ? messages[messages.length - 1] : undefined;
-    if (!latestMessage || latestMessage.role !== 'user') {
+    const latestMessage = getLatestUserMessage(messages);
+    if (!latestMessage) {
         return instructions;
     }
     const content = extractMessageText(latestMessage);
@@ -87,6 +87,10 @@ function expandInstructionSegments(instruction) {
     if (/^precommand(?:\s*:|$)/i.test(normalizedLeading)) {
         return [normalizedLeading];
     }
+    const quotedStopMessage = normalizeQuotedStopMessageShorthand(normalizedLeading);
+    if (quotedStopMessage) {
+        return [normalizeStopMessageCommandPrefix(quotedStopMessage)];
+    }
     const prefix = trimmed[0];
     if (prefix === '!' || prefix === '#' || prefix === '@') {
         const tokens = splitInstructionTargets(trimmed.substring(1));
@@ -121,6 +125,29 @@ function normalizeSplitStopMessageHeadToken(token) {
         .replace(/^["']+|["']+$/g, '')
         .trim();
 }
+function normalizeQuotedStopMessageShorthand(content) {
+    const normalized = normalizeInstructionLeading(content);
+    const quote = normalized[0];
+    if (quote !== '"' && quote !== "'") {
+        return null;
+    }
+    let escaped = false;
+    for (let idx = 1; idx < normalized.length; idx += 1) {
+        const ch = normalized[idx];
+        if (escaped) {
+            escaped = false;
+            continue;
+        }
+        if (ch === '\\') {
+            escaped = true;
+            continue;
+        }
+        if (ch === quote) {
+            return `stopMessage:${normalized}`;
+        }
+    }
+    return null;
+}
 function recoverSplitStopMessageInstruction(tokens) {
     if (!Array.isArray(tokens) || tokens.length < 2) {
         return null;

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

@@ -215,11 +215,34 @@ export interface ProviderHealthConfig {
     cooldownMs: number;
     fatalCooldownMs?: number;
 }
+export type VirtualRouterWebSearchExecutionMode = 'servertool' | 'direct';
+export type VirtualRouterWebSearchDirectActivation = 'route' | 'builtin';
 export interface VirtualRouterWebSearchEngineConfig {
     id: string;
     providerKey: string;
     description?: string;
     default?: boolean;
+    /**
+     * Search execution mode:
+     * - servertool: expose canonical web_search tool and execute through servertool engine.
+     * - direct: route to a search-capable model/provider directly; servertool injection must skip it.
+     */
+    executionMode?: VirtualRouterWebSearchExecutionMode;
+    /**
+     * When executionMode=direct, controls how the upstream search capability is activated.
+     * - route: route selection itself enables native search behavior (e.g. deepseek-web search route).
+     * - builtin: upstream requires a provider-native builtin search tool/schema.
+     */
+    directActivation?: VirtualRouterWebSearchDirectActivation;
+    /**
+     * Optional target model id for direct-mode matching when request/compat layers need to detect
+     * which routed provider payload should receive native web search activation.
+     */
+    modelId?: string;
+    /**
+     * Optional builtin max-uses hint for providers that support builtin web search tools.
+     */
+    maxUses?: number;
     /**
      * When true, this engine will never be used by server-side tools
      * (e.g. web_search). It will also be omitted from injected tool

package/dist/servertool/handlers/web-search.js

@@ -118,6 +118,27 @@ function getWebSearchConfig(ctx) {
             : undefined;
         if (!id || !providerKey)
             continue;
+        const rawExecutionMode = typeof obj.executionMode === 'string'
+            ? obj.executionMode.trim().toLowerCase()
+            : typeof obj.mode === 'string'
+                ? obj.mode.trim().toLowerCase()
+                : '';
+        const executionMode = rawExecutionMode === 'direct' ? 'direct' : 'servertool';
+        const rawDirectActivation = typeof obj.directActivation === 'string'
+            ? obj.directActivation.trim().toLowerCase()
+            : typeof obj.activation === 'string'
+                ? obj.activation.trim().toLowerCase()
+                : '';
+        const directActivation = rawDirectActivation === 'builtin'
+            ? 'builtin'
+            : rawDirectActivation === 'route'
+                ? 'route'
+                : executionMode === 'direct'
+                    ? 'route'
+                    : undefined;
+        const modelId = typeof obj.modelId === 'string' && obj.modelId.trim() ? obj.modelId.trim() : undefined;
+        const rawMaxUses = typeof obj.maxUses === 'number' ? obj.maxUses : Number(obj.maxUses);
+        const maxUses = Number.isFinite(rawMaxUses) && rawMaxUses > 0 ? Math.floor(rawMaxUses) : undefined;
         const serverToolsDisabled = obj.serverToolsDisabled === true ||
             (typeof obj.serverToolsDisabled === 'string' &&
                 obj.serverToolsDisabled.trim().toLowerCase() === 'true') ||
@@ -142,6 +163,10 @@ function getWebSearchConfig(ctx) {
             providerKey,
             description: typeof obj.description === 'string' && obj.description.trim() ? obj.description.trim() : undefined,
             default: obj.default === true,
+            executionMode,
+            ...(directActivation ? { directActivation } : {}),
+            ...(modelId ? { modelId } : {}),
+            ...(maxUses ? { maxUses } : {}),
             ...(serverToolsDisabled ? { serverToolsDisabled: true } : {}),
             ...(searchEngineList ? { searchEngineList } : {})
         });
@@ -181,7 +206,7 @@ function resolveWebSearchEngine(config, engineId) {
     return undefined;
 }
 function buildEnginePriorityList(config, engineId) {
-    const engines = (Array.isArray(config.engines) ? config.engines : []).filter((engine) => !engine.serverToolsDisabled);
+    const engines = (Array.isArray(config.engines) ? config.engines : []).filter((engine) => !engine.serverToolsDisabled && (engine.executionMode ?? 'servertool') === 'servertool');
     if (!engines.length) {
         return [];
     }

package/dist/servertool/server-side-tools.js

@@ -100,7 +100,7 @@ function normalizeFilterTokenSet(values) {
     return normalized.size > 0 ? normalized : null;
 }
 function isNameIncluded(name, includeSet, excludeSet) {
-    const normalized = name.trim().toLowerCase();
+    const normalized = normalizeServerToolCallName(name);
     if (includeSet && !includeSet.has(normalized)) {
         return false;
     }
@@ -109,6 +109,13 @@ function isNameIncluded(name, includeSet, excludeSet) {
     }
     return true;
 }
+function normalizeServerToolCallName(name) {
+    const normalized = name.trim().toLowerCase();
+    if (normalized === 'websearch' || normalized === 'web-search') {
+        return 'web_search';
+    }
+    return normalized;
+}
 function extractToolCallsFromMessage(message) {
     const toolCalls = getArray(message.tool_calls);
     const out = [];
@@ -120,7 +127,9 @@ function extractToolCallsFromMessage(message) {
         const fn = asObject(tc.function) ??
             asObject(tc.functionCall) ??
             asObject(tc.function_call);
-        const name = fn && typeof fn.name === 'string' && String(fn.name).trim() ? String(fn.name).trim() : '';
+        const name = fn && typeof fn.name === 'string' && String(fn.name).trim()
+            ? normalizeServerToolCallName(String(fn.name))
+            : '';
         const rawArgs = (fn ? fn.arguments : undefined) ??
             (fn ? fn.args : undefined) ??
             (fn ? fn.input : undefined) ??

package/dist/servertool/types.d.ts

@@ -137,6 +137,10 @@ export type ServerToolBackendPlan = {
         providerKey: string;
         description?: string;
         default?: boolean;
+        executionMode?: 'servertool' | 'direct';
+        directActivation?: 'route' | 'builtin';
+        modelId?: string;
+        maxUses?: number;
         serverToolsDisabled?: boolean;
         searchEngineList?: string[];
     }[];

package/dist/sse/sse-to-json/builders/anthropic-response-builder.js

@@ -1,4 +1,23 @@
 import { dispatchReasoning } from '../../shared/reasoning-dispatcher.js';
+function mergeAnthropicUsage(current, incoming) {
+    if (!incoming || typeof incoming !== 'object') {
+        return current;
+    }
+    const incomingRecord = incoming;
+    const base = current && typeof current === 'object' ? { ...current } : {};
+    for (const [key, value] of Object.entries(incomingRecord)) {
+        if (value && typeof value === 'object' && !Array.isArray(value)) {
+            const prev = base[key];
+            base[key] = {
+                ...(prev && typeof prev === 'object' && !Array.isArray(prev) ? prev : {}),
+                ...value
+            };
+            continue;
+        }
+        base[key] = value;
+    }
+    return base;
+}
 export function createAnthropicResponseBuilder(options) {
     const state = {
         content: [],
@@ -58,6 +77,7 @@ export function createAnthropicResponseBuilder(options) {
                         state.id = payload.id || state.id;
                         state.model = payload.model || state.model;
                         state.role = payload.role || state.role;
+                        state.usage = mergeAnthropicUsage(state.usage, payload.usage);
                     }
                     break;
                 }
@@ -116,11 +136,14 @@ export function createAnthropicResponseBuilder(options) {
                     if (delta?.stop_reason) {
                         state.stopReason = delta.stop_reason;
                     }
+                    if (typeof delta?.stop_sequence === 'string' || delta?.stop_sequence === null) {
+                        state.stopSequence = delta.stop_sequence;
+                    }
                     // 部分实现将 usage 挂在 delta.usage，部分实现挂在顶层 event.data.usage，
                     // 这里统一优先读取 delta.usage，缺失时回退到 data.usage。
                     const usageNode = (delta && delta.usage) ?? data.usage;
                     if (usageNode) {
-                        state.usage = usageNode;
+                        state.usage = mergeAnthropicUsage(state.usage, usageNode);
                     }
                     break;
                 }
@@ -151,7 +174,8 @@ export function createAnthropicResponseBuilder(options) {
                             model: state.model || 'unknown',
                             content: state.content,
                             usage: state.usage,
-                            stop_reason: state.stopReason ?? 'end_turn'
+                            stop_reason: state.stopReason ?? 'end_turn',
+                            stop_sequence: state.stopSequence
                         }
                     };
                 }
@@ -166,7 +190,8 @@ export function createAnthropicResponseBuilder(options) {
                     model: state.model || 'unknown',
                     content: state.content,
                     usage: state.usage,
-                    stop_reason: state.stopReason ?? 'end_turn'
+                    stop_reason: state.stopReason ?? 'end_turn',
+                    stop_sequence: state.stopSequence
                 }
             };
         }

package/dist/sse/types/anthropic-types.d.ts

@@ -30,11 +30,12 @@ export interface AnthropicMessageResponse {
     role: 'assistant' | 'user';
     model: string;
     content: AnthropicContentBlock[];
-    usage?: {
+    usage?: Record<string, unknown> & {
         input_tokens?: number;
         output_tokens?: number;
     };
     stop_reason?: 'end_turn' | 'max_tokens' | 'stop_sequence' | 'tool_use';
+    stop_sequence?: string | null;
 }
 export interface AnthropicEventStats {
     totalEvents: number;
@@ -157,6 +158,7 @@ export interface AnthropicSseEventMessageDelta extends AnthropicSseEventBase<'me
         type: 'message_delta';
         delta?: {
             stop_reason?: AnthropicMessageResponse['stop_reason'];
+            stop_sequence?: string | null;
             usage?: AnthropicMessageResponse['usage'];
         };
     };

package/dist/tools/apply-patch/args-normalizer/extract-patch.js

@@ -4,11 +4,11 @@ export function extractNormalizedPatch(value) {
         return {};
     }
     const normalized = normalizeApplyPatchText(value);
-    const patchLike = looksLikePatch(value) || looksLikePatch(normalized) || normalized.includes('*** Begin Patch');
+    const patchLike = looksLikePatch(value) || looksLikePatch(normalized);
     if (!patchLike) {
         return {};
     }
-    if (!normalized.includes('*** Begin Patch')) {
+    if (!/^(?:\s*)\*\*\*\s*Begin Patch\b/m.test(normalized)) {
         return { failureReason: 'unsupported_patch_format' };
     }
     return { patchText: normalized };

package/dist/tools/apply-patch/patch-text/looks-like-patch.js

@@ -4,11 +4,8 @@ export const looksLikePatch = (text) => {
     const t = text.trim();
     if (!t)
         return false;
-    return (t.includes('*** Begin Patch') ||
-        t.includes('*** Update File:') ||
-        t.includes('*** Add File:') ||
-        t.includes('*** Create File:') ||
-        t.includes('*** Delete File:') ||
-        t.includes('diff --git') ||
+    return (/^(?:\s*)\*\*\*\s*Begin Patch\b/m.test(t) ||
+        /^(?:\s*)\*\*\*\s*(?:Update|Add|Create|Delete)\s+File:/m.test(t) ||
+        /^diff --git\s/m.test(t) ||
         /^(?:@@|\+\+\+\s|---\s)/m.test(t));
 };

package/dist/tools/apply-patch/patch-text/normalize.js

@@ -109,18 +109,29 @@ const convertStarHeaderDiffToApplyPatchIfPossible = (text) => {
         return null;
     }
 };
+const normalizeApplyPatchHeaderPath = (raw) => {
+    let out = String(raw ?? '').trim();
+    if (!out)
+        return out;
+    if ((out.startsWith('"') && out.endsWith('"')) ||
+        (out.startsWith("'") && out.endsWith("'")) ||
+        (out.startsWith('`') && out.endsWith('`'))) {
+        out = out.slice(1, -1).trim();
+    }
+    return out;
+};
 const normalizeApplyPatchFileHeader = (line) => {
     const addMatch = line.match(/^\*\*\* Add File:\s*(.+?)(?:\s+\*\*\*)?\s*$/);
     if (addMatch && addMatch[1]) {
-        return `*** Add File: ${addMatch[1].trim()}`;
+        return `*** Add File: ${normalizeApplyPatchHeaderPath(addMatch[1])}`;
     }
     const updateMatch = line.match(/^\*\*\* Update File:\s*(.+?)(?:\s+\*\*\*)?\s*$/);
     if (updateMatch && updateMatch[1]) {
-        return `*** Update File: ${updateMatch[1].trim()}`;
+        return `*** Update File: ${normalizeApplyPatchHeaderPath(updateMatch[1])}`;
     }
     const deleteMatch = line.match(/^\*\*\* Delete File:\s*(.+?)(?:\s+\*\*\*)?\s*$/);
     if (deleteMatch && deleteMatch[1]) {
-        return `*** Delete File: ${deleteMatch[1].trim()}`;
+        return `*** Delete File: ${normalizeApplyPatchHeaderPath(deleteMatch[1])}`;
     }
     return line;
 };

package/dist/tools/tool-registry.js

@@ -72,6 +72,8 @@ const isImagePath = (value) => {
 export function getAllowedToolNames() {
     return [
         'shell',
+        'shell_command',
+        'bash',
         'exec_command',
         'apply_patch',
         'update_plan',
@@ -108,6 +110,16 @@ export function validateToolCall(name, argsString, options) {
             }
             return { ok: true, normalizedArgs: validation.normalizedArgs };
         }
+        case 'shell_command':
+        case 'bash': {
+            const rawArgs = isRecord(rawArgsAny) ? rawArgsAny : {};
+            const command = asString(rawArgs.command) ??
+                asString(rawArgs.cmd);
+            if (!command) {
+                return { ok: false, reason: 'missing_command' };
+            }
+            return { ok: true, normalizedArgs: toJson(rawArgs) };
+        }
         case 'apply_patch': {
             const validation = validateApplyPatchArgs(argsString, rawArgsAny);
             if (!validation.ok) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsonstudio/llms",
-  "version": "0.6.3275",
+  "version": "0.6.3405",
   "type": "module",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -78,6 +78,7 @@
     "test:coverage:hub-resp-outbound-client-remap-switch": "npm run build:ci && node ./node_modules/c8/bin/c8.js --reporter=json-summary --reporter=text --report-dir=coverage/module-hub-resp-outbound-client-remap-switch --include=dist/conversion/hub/pipeline/stages/resp_outbound/resp_outbound_stage1_client_remap/client-remap-protocol-switch.js --exclude=scripts/** node scripts/tests/coverage-hub-resp-outbound-client-remap-protocol-switch.mjs",
     "test:coverage:virtual-router-tier-antigravity-session-lease": "npm run build:ci && node ./node_modules/c8/bin/c8.js --reporter=json-summary --reporter=text --report-dir=coverage/module-virtual-router-tier-antigravity-session-lease --include=dist/router/virtual-router/engine-selection/tier-selection-antigravity-session-lease.js --exclude=scripts/** node scripts/tests/coverage-virtual-router-tier-antigravity-session-lease.mjs",
     "test:coverage:virtual-router-tier-antigravity-target-split": "npm run build:ci && node ./node_modules/c8/bin/c8.js --reporter=json-summary --reporter=text --report-dir=coverage/module-virtual-router-tier-antigravity-target-split --include=dist/router/virtual-router/engine-selection/tier-selection-antigravity-target-split.js --exclude=scripts/** node scripts/tests/coverage-virtual-router-tier-antigravity-target-split.mjs",
+    "test:coverage:text-markup-normalizer": "npm run build:ci && C8_COVERAGE=1 node ./node_modules/c8/bin/c8.js --lines 95 --branches 95 --functions 95 --statements 95 --reporter=json-summary --reporter=text --report-dir=coverage/module-text-markup-normalizer --include=dist/conversion/shared/text-markup-normalizer.js --exclude=**/node_modules/** node scripts/tests/coverage-text-markup-normalizer.mjs",
     "test:coverage": "node scripts/run-ci-coverage.mjs",
     "verify:module-blackbox": "node scripts/tests/module-blackbox-gate.mjs",
     "verify:shadow-gate": "node scripts/check-shadow-coverage-gate.mjs",
@@ -141,6 +142,7 @@
     "verify:shadow-gate:hub-resp-outbound-sse-stream": "npm run test:coverage:hub-resp-outbound-sse-stream && node scripts/check-shadow-coverage-gate.mjs --summary coverage/module-hub-resp-outbound-sse-stream/coverage-summary.json --module hub.resp-outbound.sse-stream && node scripts/promote-shadow-module.mjs --module hub.resp-outbound.sse-stream",
     "verify:shadow-gate:hub-native-batch": "npm run test:coverage:hub-native-batch && node scripts/check-shadow-coverage-gate.mjs --summary coverage/module-hub-native-batch/coverage-summary.json --module hub.native-batch.adapters-snapshot-governance && node scripts/promote-shadow-module.mjs --module hub.native-batch.adapters-snapshot-governance",
     "test:coverage:hub-chat-request-filters": "npm run build:ci && node ./node_modules/c8/bin/c8.js --reporter=json-summary --reporter=text --report-dir=coverage/module-hub-chat-request-filters --include=dist/conversion/shared/chat-request-filters.js --include=dist/router/virtual-router/engine-selection/native-chat-request-filter-semantics.js --exclude=scripts/** node scripts/tests/coverage-chat-request-filters.mjs",
+    "test:coverage:router-hotpath-napi": "cd rust-core && cargo llvm-cov -p router-hotpath-napi --summary-only --json --output-path /tmp/router-hotpath-napi-cov.json && node -e \"const fs=require('fs');const data=JSON.parse(fs.readFileSync('/tmp/router-hotpath-napi-cov.json','utf8'));const files=(data.data&&data.data[0]&&data.data[0].files)||[];const target=files.find(f=>String(f.filename||'').endsWith('resp_process_stage1_tool_governance.rs'));if(!target){console.error('missing resp_process_stage1_tool_governance.rs in coverage');process.exit(1);}const sum=target.summary||{};const lines=sum.lines?sum.lines.percent:0;const funcs=sum.functions?sum.functions.percent:0;const regions=sum.regions?sum.regions.percent:0;const branches=sum.branches?sum.branches.percent:'n/a';const statements=sum.statements?sum.statements.percent:'n/a';console.log('[coverage router-hotpath-napi] lines',lines,'functions',funcs,'regions',regions,'branches',branches,'statements',statements);const min=95;if(lines<min||funcs<min||regions<min){process.exit(1);}\"",
     "verify:shadow-gate:hub-chat-request-filters": "npm run test:coverage:hub-chat-request-filters && node scripts/check-shadow-coverage-gate.mjs --summary coverage/module-hub-chat-request-filters/coverage-summary.json --module hub.shared.chat-request-filters && node scripts/promote-shadow-module.mjs --module hub.shared.chat-request-filters"
   },
   "dependencies": {
@@ -167,11 +169,14 @@
     }
   },
   "devDependencies": {
+    "@types/jest": "^29.5.14",
     "@types/node": "^20.11.25",
     "@typescript-eslint/eslint-plugin": "^8.56.1",
     "@typescript-eslint/parser": "^8.56.1",
     "c8": "^11.0.0",
     "eslint": "^8.50.0",
+    "jest": "^29.7.0",
+    "ts-jest": "^29.2.6",
     "tsx": "^4.21.0",
     "typescript": "^5.4.0"
   },