@jsonstudio/llms 0.6.568 → 0.6.626

package/dist/router/virtual-router/tool-signals.js

@@ -8,14 +8,7 @@ const READ_TOOL_EXACT = new Set([
     'open_file',
     'get_file',
     'download_file',
-    'describe_current_request',
-    'list_dir',
-    'list_directory',
-    'list_files',
-    'list_documents',
-    'list_resources',
-    'search_files',
-    'find_files'
+    'describe_current_request'
 ]);
 const WRITE_TOOL_EXACT = new Set([
     'apply_patch',
@@ -26,101 +19,61 @@ const WRITE_TOOL_EXACT = new Set([
     'update_file',
     'save_file',
     'append_file',
-    'replace_file',
-    'delete_file',
-    'remove_file',
-    'rename_file',
-    'move_file',
-    'copy_file',
-    'mkdir',
-    'rmdir'
+    'replace_file'
+]);
+const SEARCH_TOOL_EXACT = new Set([
+    'search_files',
+    'find_files',
+    'search_documents',
+    'search_repo',
+    'glob_search',
+    'grep_files',
+    'code_search',
+    'lookup_symbol'
 ]);
-const SEARCH_TOOL_EXACT = new Set(['websearch', 'web_search', 'search_web', 'internet_search', 'webfetch', 'web_fetch']);
-const READ_TOOL_KEYWORDS = ['read', 'list', 'view', 'download', 'open', 'show', 'fetch', 'inspect'];
-const WRITE_TOOL_KEYWORDS = ['write', 'patch', 'modify', 'edit', 'create', 'update', 'append', 'replace', 'delete', 'remove'];
-const SEARCH_TOOL_KEYWORDS = ['search', 'websearch', 'web_fetch', 'webfetch', 'web-request', 'web_request', 'internet'];
+const READ_TOOL_KEYWORDS = ['read', 'view', 'download', 'open', 'show', 'fetch', 'inspect'];
+const WRITE_TOOL_KEYWORDS = ['write', 'patch', 'modify', 'edit', 'create', 'update', 'append', 'replace', 'save'];
+const SEARCH_TOOL_KEYWORDS = ['find', 'grep', 'glob', 'lookup', 'locate'];
 const SHELL_TOOL_NAMES = new Set(['shell_command', 'shell', 'bash']);
 const DECLARED_TOOL_IGNORE = new Set(['exec_command']);
 const SHELL_HEREDOC_PATTERN = /<<\s*['"]?[a-z0-9_-]+/i;
-const SHELL_WRITE_PATTERNS = [
-    'apply_patch',
-    'sed -i',
-    'perl -pi',
-    'tee ',
-    'cat <<',
-    'cat >',
-    'printf >',
-    'touch ',
-    'truncate',
-    'mkdir',
-    'mktemp',
-    'rmdir',
-    'rm ',
-    'rm-',
-    'unlink',
-    'mv ',
-    'cp ',
-    'ln -',
-    'chmod',
-    'chown',
-    'chgrp',
-    'tar ',
-    'git add',
-    'git commit',
-    'git apply',
-    'git am',
-    'git rebase',
-    'git checkout',
-    'git merge',
-    'patch <<',
-    'npm install',
-    'pnpm install',
-    'yarn add',
-    'yarn install',
-    'pip install',
-    'pip3 install',
-    'brew install',
-    'cargo add',
-    'cargo install',
-    'go install',
-    'make install'
-];
-const SHELL_READ_PATTERNS = [
-    'ls',
-    'dir ',
-    'pwd',
-    'cat ',
-    'type ',
-    'head ',
-    'tail ',
-    'stat',
-    'tree',
-    'wc ',
-    'du ',
-    'printf "',
-    'python - <<',
-    'python -c',
-    'node - <<',
-    'node -e',
-    'sed -n',
-    'sed --quiet',
-    'sed ',
-    'rg ',
-    ' ripgrep',
-    'grep ',
-    'egrep ',
-    'fgrep ',
-    'ag ',
-    'ack ',
-    'find ',
-    'nl ',
-    'less',
-    'more',
-    'awk ',
-    'perl -ne',
-    'perl -pe',
-    'strings '
-];
+const SHELL_WRITE_COMMANDS = new Set(['apply_patch', 'tee', 'touch', 'truncate', 'patch']);
+const SHELL_READ_COMMANDS = new Set(['cat', 'head', 'tail', 'awk', 'strings', 'less', 'more', 'nl']);
+const SHELL_SEARCH_COMMANDS = new Set([
+    'rg',
+    'ripgrep',
+    'grep',
+    'egrep',
+    'fgrep',
+    'ag',
+    'ack',
+    'find',
+    'fd',
+    'locate',
+    'codesearch'
+]);
+const SHELL_REDIRECT_WRITE_BINARIES = new Set(['cat', 'printf', 'python', 'node', 'perl', 'ruby', 'php', 'bash', 'sh', 'zsh', 'echo']);
+const SHELL_WRAPPER_COMMANDS = new Set(['sudo', 'env', 'time', 'nice', 'nohup', 'command', 'stdbuf']);
+const COMMAND_ALIASES = new Map([
+    ['python3', 'python'],
+    ['pip3', 'pip'],
+    ['ripgrep', 'rg'],
+    ['perl5', 'perl']
+]);
+const GIT_WRITE_SUBCOMMANDS = new Set(['add', 'commit', 'apply', 'am', 'rebase', 'checkout', 'merge']);
+const PACKAGE_MANAGER_COMMANDS = new Map([
+    ['npm', new Set(['install'])],
+    ['pnpm', new Set(['install'])],
+    ['yarn', new Set(['add', 'install'])],
+    ['pip', new Set(['install'])],
+    ['pip3', new Set(['install'])],
+    ['brew', new Set(['install'])],
+    ['cargo', new Set(['add', 'install'])],
+    ['go', new Set(['install'])],
+    ['make', new Set(['install'])]
+]);
+const ENV_ASSIGNMENT_PATTERN = /^[A-Za-z_][A-Za-z0-9_]*=.*/;
+const OUTPUT_REDIRECT_PATTERN = /(?:^|[\s;|&])>>?\s*(?!&)[^\s]+/;
 export function detectVisionTool(request) {
     if (!Array.isArray(request.tools)) {
         return false;
@@ -178,31 +131,46 @@ export function extractMeaningfulDeclaredToolNames(tools) {
     }
     return names;
 }
+const TOOL_CATEGORY_PRIORITY = {
+    websearch: 4,
+    read: 3,
+    write: 2,
+    search: 1,
+    other: 0
+};
 export function detectLastAssistantToolCategory(messages) {
     for (let idx = messages.length - 1; idx >= 0; idx -= 1) {
         const msg = messages[idx];
         if (!msg || !Array.isArray(msg.tool_calls) || msg.tool_calls.length === 0) {
             continue;
         }
-        let fallback;
+        const candidates = [];
         for (const call of msg.tool_calls) {
             const classification = classifyToolCall(call);
-            if (!classification) {
-                continue;
-            }
-            if (!fallback) {
-                fallback = classification;
-            }
-            if (classification.category !== 'other') {
-                return classification;
+            if (classification) {
+                candidates.push(classification);
             }
         }
-        if (fallback) {
-            return fallback;
+        if (!candidates.length) {
+            continue;
+        }
+        let best = candidates[0];
+        let bestScore = TOOL_CATEGORY_PRIORITY[best.category] ?? 0;
+        for (let i = 1; i < candidates.length; i += 1) {
+            const candidate = candidates[i];
+            const score = TOOL_CATEGORY_PRIORITY[candidate.category] ?? 0;
+            if (score > bestScore) {
+                best = candidate;
+                bestScore = score;
+            }
         }
+        return best;
     }
     return undefined;
 }
+export function classifyToolCallForReport(call) {
+    return classifyToolCall(call);
+}
 function classifyToolCall(call) {
     if (!call || typeof call !== 'object') {
         return undefined;
@@ -218,9 +186,8 @@ function classifyToolCall(call) {
     const snippet = buildCommandSnippet(commandText);
     const normalizedName = functionName.toLowerCase();
     const normalizedCmd = commandText.toLowerCase();
-    // 1) Web search 优先：函数名或命令文本中命中 web 搜索关键字时，一律归类为 search，优先级最高。
-    const isWebSearch = WEB_TOOL_KEYWORDS.some((keyword) => normalizedName.includes(keyword)) ||
-        WEB_TOOL_KEYWORDS.some((keyword) => normalizedCmd.includes(keyword));
+    // 1) Web search 优先：函数名命中 web 搜索关键字时，一律归类为 websearch，优先级最高。
+    const isWebSearch = WEB_TOOL_KEYWORDS.some((keyword) => normalizedName.includes(keyword));
     // 2) 基于工具名的初步分类（read / write / search / other）
     const nameCategory = categorizeToolName(functionName);
     // 3) shell_command / exec_command 根据内部命令判断读写性质
@@ -236,7 +203,7 @@ function classifyToolCall(call) {
     //   5. 其它工具
     // Priority 1: Web search
     if (isWebSearch) {
-        return { category: 'search', name: functionName, commandSnippet: snippet };
+        return { category: 'websearch', name: functionName, commandSnippet: snippet };
     }
     // Priority 2: Write (写文件) — 名称或内部命令任一判断为写，都按写处理
     if (nameCategory === 'write' || shellCategory === 'write') {
@@ -247,13 +214,13 @@ function classifyToolCall(call) {
         return { category: 'read', name: functionName, commandSnippet: snippet };
     }
     // Priority 4: 其他 search 类工具（非 web search）
-    if (nameCategory === 'search') {
+    if (nameCategory === 'search' || shellCategory === 'search') {
         return { category: 'search', name: functionName, commandSnippet: snippet };
     }
-    // Priority 5: 兜底用命令文本再判断一次 shell 风格读写（非 shell/exec_command 的工具）
+    // Priority 5: 兜底用命令文本再判断一次 shell 风格读写/搜索（非 shell/exec_command 的工具）
     if (!SHELL_TOOL_NAMES.has(functionName) && functionName !== 'exec_command' && commandText) {
         const derivedCategory = classifyShellCommand(commandText);
-        if (derivedCategory === 'write' || derivedCategory === 'read') {
+        if (derivedCategory === 'write' || derivedCategory === 'read' || derivedCategory === 'search') {
             return { category: derivedCategory, name: functionName, commandSnippet: snippet };
         }
     }
@@ -371,12 +338,10 @@ function categorizeToolName(name) {
         SEARCH_TOOL_KEYWORDS.some((keyword) => normalized.includes(keyword.toLowerCase()))) {
         return 'search';
     }
-    if (READ_TOOL_EXACT.has(normalized) ||
-        READ_TOOL_KEYWORDS.some((keyword) => normalized.includes(keyword.toLowerCase()))) {
+    if (READ_TOOL_EXACT.has(normalized)) {
         return 'read';
     }
-    if (WRITE_TOOL_EXACT.has(normalized) ||
-        WRITE_TOOL_KEYWORDS.some((keyword) => normalized.includes(keyword.toLowerCase()))) {
+    if (WRITE_TOOL_EXACT.has(normalized)) {
         return 'write';
     }
     return 'other';
@@ -388,28 +353,225 @@ function classifyShellCommand(command) {
     if (SHELL_HEREDOC_PATTERN.test(command)) {
         return 'write';
     }
-    const segments = splitCommandSegments(command).map(stripShellWrapper);
-    if (segments.some((segment) => matchesAnyPattern(segment, SHELL_WRITE_PATTERNS))) {
-        return 'write';
+    const segments = splitCommandSegments(command);
+    let sawRead = false;
+    let sawSearch = false;
+    for (const segment of segments) {
+        const normalized = normalizeShellSegment(segment);
+        if (!normalized) {
+            continue;
+        }
+        for (const args of normalized.commands) {
+            if (!args.length) {
+                continue;
+            }
+            const [binary, ...rest] = args;
+            const normalizedBinary = normalizeBinaryName(binary);
+            const alias = COMMAND_ALIASES.get(normalizedBinary) || normalizedBinary;
+            if (isWriteBinary(alias, rest, normalized.raw)) {
+                return 'write';
+            }
+            if (isReadBinary(alias, rest)) {
+                sawRead = true;
+                continue;
+            }
+            if (isSearchBinary(alias, rest)) {
+                sawSearch = true;
+            }
+        }
     }
-    if (segments.some((segment) => matchesAnyPattern(segment, SHELL_READ_PATTERNS))) {
+    if (sawRead) {
         return 'read';
     }
-    const stripped = stripShellWrapper(command);
-    if (matchesAnyPattern(stripped, SHELL_WRITE_PATTERNS)) {
-        return 'write';
-    }
-    if (matchesAnyPattern(stripped, SHELL_READ_PATTERNS)) {
-        return 'read';
+    if (sawSearch) {
+        return 'search';
     }
     return 'other';
 }
+function normalizeShellSegment(segment) {
+    const trimmed = stripShellWrapper(segment);
+    if (!trimmed) {
+        return undefined;
+    }
+    const tokens = splitShellTokens(trimmed);
+    if (!tokens.length) {
+        return undefined;
+    }
+    const commands = [];
+    let current = [];
+    for (const token of tokens) {
+        if (token === '|') {
+            const cleaned = cleanCommandTokens(current);
+            if (cleaned.length) {
+                commands.push(cleaned);
+            }
+            current = [];
+            continue;
+        }
+        current.push(token);
+    }
+    const cleaned = cleanCommandTokens(current);
+    if (cleaned.length) {
+        commands.push(cleaned);
+    }
+    if (!commands.length) {
+        return undefined;
+    }
+    return { raw: trimmed, commands };
+}
+function splitShellTokens(cmd) {
+    const tokens = [];
+    let current = '';
+    let quote = null;
+    for (let i = 0; i < cmd.length; i += 1) {
+        const ch = cmd[i];
+        if (quote) {
+            if (ch === quote) {
+                quote = null;
+            }
+            else if (ch === '\\' && quote === '"' && i + 1 < cmd.length) {
+                current += cmd[i + 1];
+                i += 1;
+            }
+            else {
+                current += ch;
+            }
+            continue;
+        }
+        if (ch === '"' || ch === "'") {
+            quote = ch;
+            continue;
+        }
+        if (/[\s\t]/.test(ch)) {
+            if (current) {
+                tokens.push(current);
+                current = '';
+            }
+            continue;
+        }
+        if (ch === '|') {
+            if (current) {
+                tokens.push(current);
+                current = '';
+            }
+            tokens.push('|');
+            continue;
+        }
+        if ((ch === '|' || ch === '&') && i + 1 < cmd.length && cmd[i + 1] === ch) {
+            if (current) {
+                tokens.push(current);
+                current = '';
+            }
+            tokens.push(cmd.slice(i, i + 2));
+            i += 1;
+            continue;
+        }
+        current += ch;
+    }
+    if (current) {
+        tokens.push(current);
+    }
+    return tokens;
+}
+function cleanCommandTokens(tokens) {
+    if (!tokens.length) {
+        return [];
+    }
+    const cleaned = [];
+    for (const token of tokens) {
+        if (!cleaned.length) {
+            if (ENV_ASSIGNMENT_PATTERN.test(token)) {
+                continue;
+            }
+            if (SHELL_WRAPPER_COMMANDS.has(token)) {
+                continue;
+            }
+        }
+        cleaned.push(token);
+    }
+    return cleaned;
+}
+function isWriteBinary(binary, args, rawSegment) {
+    const normalized = binary.toLowerCase();
+    if (SHELL_WRITE_COMMANDS.has(normalized)) {
+        return true;
+    }
+    if (normalized === 'git' && args.length > 0) {
+        const sub = args[0].toLowerCase();
+        if (GIT_WRITE_SUBCOMMANDS.has(sub)) {
+            return true;
+        }
+    }
+    if (PACKAGE_MANAGER_COMMANDS.has(normalized)) {
+        const allowed = PACKAGE_MANAGER_COMMANDS.get(normalized);
+        if (args.length > 0 && allowed.has(args[0].toLowerCase())) {
+            return true;
+        }
+    }
+    if (normalized === 'sed') {
+        const joined = args.join(' ').toLowerCase();
+        if (joined.includes('-i')) {
+            return true;
+        }
+    }
+    if (normalized === 'perl') {
+        const joined = args.join(' ').toLowerCase();
+        if (joined.includes('-pi')) {
+            return true;
+        }
+    }
+    if (normalized === 'printf' && OUTPUT_REDIRECT_PATTERN.test(rawSegment)) {
+        return true;
+    }
+    if (SHELL_REDIRECT_WRITE_BINARIES.has(normalized) && OUTPUT_REDIRECT_PATTERN.test(rawSegment)) {
+        return true;
+    }
+    return false;
+}
+function isReadBinary(binary, args) {
+    const normalized = binary.toLowerCase();
+    if (SHELL_READ_COMMANDS.has(normalized)) {
+        return true;
+    }
+    if (normalized === 'sed') {
+        const joined = args.join(' ').toLowerCase();
+        if (joined.includes('-i')) {
+            return false;
+        }
+        return true;
+    }
+    return false;
+}
+function isSearchBinary(binary, args) {
+    const normalized = binary.toLowerCase();
+    if (SHELL_SEARCH_COMMANDS.has(normalized)) {
+        return true;
+    }
+    if (normalized === 'git' && args.length > 0) {
+        const sub = args[0].toLowerCase();
+        if (sub === 'grep') {
+            return true;
+        }
+    }
+    return false;
+}
 function splitCommandSegments(command) {
     return command
         .split(/(?:\r?\n|&&|\|\||;)/)
         .map((segment) => segment.trim())
         .filter(Boolean);
 }
+function normalizeBinaryName(binary) {
+    if (!binary) {
+        return '';
+    }
+    const lowered = binary.toLowerCase();
+    const slashIndex = lowered.lastIndexOf('/');
+    if (slashIndex >= 0) {
+        return lowered.slice(slashIndex + 1);
+    }
+    return lowered;
+}
 function stripShellWrapper(command) {
     if (!command) {
         return '';
@@ -422,6 +584,3 @@ function stripShellWrapper(command) {
     }
     return command.trim();
 }
-function matchesAnyPattern(command, patterns) {
-    return patterns.some((pattern) => command.includes(pattern));
-}

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

@@ -233,7 +233,7 @@ export interface RoutingFeatures {
     hasCodingTool: boolean;
     hasThinkingKeyword: boolean;
     estimatedTokens: number;
-    lastAssistantToolCategory?: 'read' | 'write' | 'search' | 'other';
+    lastAssistantToolCategory?: 'read' | 'write' | 'search' | 'websearch' | 'other';
     lastAssistantToolSnippet?: string;
     lastAssistantToolLabel?: string;
     latestMessageFromUser?: boolean;

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

@@ -7,9 +7,9 @@ export const ROUTE_PRIORITY = [
     'vision',
     'longcontext',
     'web_search',
-    'search',
     'thinking',
     'coding',
+    'search',
     'tools',
     'background',
     DEFAULT_ROUTE

package/dist/servertool/handlers/gemini-empty-reply-continue.js

@@ -49,9 +49,7 @@ const handler = async (ctx) => {
         return null;
     }
     const contentRaw = message.content;
-    const contentText = typeof contentRaw === 'string'
-        ? contentRaw.trim()
-        : '';
+    const contentText = typeof contentRaw === 'string' ? contentRaw.trim() : '';
     if (contentText.length > 0) {
         return null;
     }
@@ -59,10 +57,35 @@ const handler = async (ctx) => {
     if (toolCalls.length > 0) {
         return null;
     }
+    // 统计连续空回复次数，超过上限后不再自动续写，而是返回一个可重试错误。
+    const previousCountRaw = adapterRecord.geminiEmptyReplyCount;
+    const previousCount = typeof previousCountRaw === 'number' && Number.isFinite(previousCountRaw) && previousCountRaw >= 0
+        ? previousCountRaw
+        : 0;
+    const nextCount = previousCount + 1;
     const captured = getCapturedRequest(ctx.adapterContext);
     if (!captured) {
         return null;
     }
+    // 超过最多 3 次空回复：返回一个 HTTP_HANDLER_ERROR 形状的错误，交由上层错误中心处理。
+    if (nextCount > 3) {
+        const errorChat = {
+            id: base.id,
+            object: base.object,
+            model: base.model,
+            error: {
+                message: 'fetch failed: gemini_empty_reply_continue exceeded max empty replies',
+                code: 'HTTP_HANDLER_ERROR',
+                type: 'servertool_empty_reply'
+            }
+        };
+        return {
+            chatResponse: errorChat,
+            execution: {
+                flowId: FLOW_ID
+            }
+        };
+    }
     const followupPayload = buildContinueFollowupPayload(captured);
     if (!followupPayload) {
         return null;
@@ -76,7 +99,8 @@ const handler = async (ctx) => {
                 payload: followupPayload,
                 metadata: {
                     serverToolFollowup: true,
-                    stream: false
+                    stream: false,
+                    geminiEmptyReplyCount: nextCount
                 }
             }
         }

package/dist/sse/json-to-sse/event-generators/responses.js

@@ -81,9 +81,16 @@ function normalizeUsage(usage) {
         return fallback;
     }
     const asAny = usage;
-    const inputRaw = Number((asAny.input_tokens ?? asAny.prompt_tokens));
+    const baseInputRaw = Number((asAny.input_tokens ?? asAny.prompt_tokens));
+    const baseInput = Number.isFinite(baseInputRaw) ? baseInputRaw : 0;
+    let cachedRaw = Number(asAny.cache_read_input_tokens);
+    if (!Number.isFinite(cachedRaw) && asAny.input_tokens_details && typeof asAny.input_tokens_details === 'object') {
+        const details = asAny.input_tokens_details;
+        cachedRaw = Number(details.cached_tokens);
+    }
+    const cached = Number.isFinite(cachedRaw) ? cachedRaw : 0;
+    const input = baseInput + cached;
     const outputRaw = Number((asAny.output_tokens ?? asAny.completion_tokens));
-    const input = Number.isFinite(inputRaw) ? inputRaw : 0;
     const output = Number.isFinite(outputRaw) ? outputRaw : 0;
     const totalRaw = Number(asAny.total_tokens);
     const total = Number.isFinite(totalRaw) ? totalRaw : input + output;

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

@@ -111,12 +111,16 @@ export function createAnthropicResponseBuilder(options) {
                     break;
                 }
                 case 'message_delta': {
-                    const delta = event.data?.delta;
+                    const data = event.data ?? {};
+                    const delta = data?.delta;
                     if (delta?.stop_reason) {
                         state.stopReason = delta.stop_reason;
                     }
-                    if (delta?.usage) {
-                        state.usage = delta.usage;
+                    // 部分实现将 usage 挂在 delta.usage，部分实现挂在顶层 event.data.usage，
+                    // 这里统一优先读取 delta.usage，缺失时回退到 data.usage。
+                    const usageNode = (delta && delta.usage) ?? data.usage;
+                    if (usageNode) {
+                        state.usage = usageNode;
                     }
                     break;
                 }

package/dist/tools/apply-patch-structured.js

@@ -216,11 +216,12 @@ export function buildStructuredPatch(payload) {
         else {
             lines.push(`*** Update File: ${file}`);
             for (const hunk of section.hunks) {
-                lines.push('@@');
+                // 每个 hunk 仅需一个开头的 "@@" 行，后面直接跟上下文/增删行。
                 for (const entry of hunk) {
-                    lines.push(entry);
+                    if (!entry.startsWith('@@')) {
+                        lines.push(entry);
+                    }
                 }
-                lines.push('@@');
             }
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsonstudio/llms",
-  "version": "0.6.568",
+  "version": "0.6.626",
   "type": "module",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -62,4 +62,4 @@
     "dist",
     "README.md"
   ]
-}
+}