@jsonstudio/llms 0.6.1892 → 0.6.2172

package/dist/conversion/shared/text-markup-normalizer/normalize.js

@@ -0,0 +1,76 @@
+import { extractApplyPatchCallsFromText, extractBareExecCommandFromText, extractExecuteBlocksFromText, extractExploredListDirectoryCallsFromText, extractInvokeToolsFromText, extractJsonToolCallsFromText, extractParameterXmlToolsFromText, extractQwenToolCallTokensFromText, extractSimpleXmlToolsFromText, extractToolNamespaceXmlBlocksFromText, extractXMLToolCallsFromText } from './extractors.js';
+function enabled() {
+    try {
+        return String(process?.env?.RCC_TEXT_MARKUP_COMPAT ?? '1').trim() !== '0';
+    }
+    catch {
+        return true;
+    }
+}
+export function normalizeAssistantTextToToolCalls(message, options) {
+    if (!enabled())
+        return message;
+    try {
+        if (!message || typeof message !== 'object')
+            return message;
+        if (Array.isArray(message.tool_calls) && message.tool_calls.length)
+            return message;
+        const content = message.content;
+        const candidates = [];
+        if (typeof content === 'string') {
+            candidates.push(content);
+        }
+        else if (Array.isArray(content)) {
+            for (const part of content) {
+                if (!part || typeof part !== 'object')
+                    continue;
+                const p = part;
+                if (typeof p.text === 'string' && p.text.trim()) {
+                    candidates.push(p.text);
+                    continue;
+                }
+                if (typeof p.content === 'string' && p.content.trim()) {
+                    candidates.push(p.content);
+                    continue;
+                }
+            }
+        }
+        if (typeof message.reasoning === 'string' && message.reasoning.trim()) {
+            candidates.push(String(message.reasoning));
+        }
+        if (typeof message.thinking === 'string' && message.thinking.trim()) {
+            candidates.push(String(message.thinking));
+        }
+        if (!candidates.length)
+            return message;
+        let calls = null;
+        for (const text of candidates) {
+            // Order: xml-like <tool_call> -> apply_patch -> execute blocks -> simple XML tools -> bare command salvage
+            calls =
+                extractQwenToolCallTokensFromText(text) ||
+                    extractJsonToolCallsFromText(text, options) ||
+                    extractToolNamespaceXmlBlocksFromText(text) ||
+                    extractParameterXmlToolsFromText(text) ||
+                    extractInvokeToolsFromText(text) ||
+                    extractXMLToolCallsFromText(text) ||
+                    extractApplyPatchCallsFromText(text) ||
+                    extractExecuteBlocksFromText(text) ||
+                    extractSimpleXmlToolsFromText(text) ||
+                    extractExploredListDirectoryCallsFromText(text) ||
+                    extractBareExecCommandFromText(text);
+            if (calls && calls.length)
+                break;
+        }
+        if (calls && calls.length) {
+            const toolCalls = calls.map((c) => ({ id: c.id, type: 'function', function: { name: c.name, arguments: c.args } }));
+            const copy = { ...message };
+            copy.tool_calls = toolCalls;
+            copy.content = '';
+            return copy;
+        }
+    }
+    catch {
+        // ignore normalization failures
+    }
+    return message;
+}

package/dist/conversion/shared/text-markup-normalizer.d.ts

@@ -1,25 +1,3 @@
-export type ToolCallLite = {
-    id?: string;
-    name: string;
-    args: string;
-};
-export declare function extractToolNamespaceXmlBlocksFromText(text: string): ToolCallLite[] | null;
-export declare function extractParameterXmlToolsFromText(text: string): ToolCallLite[] | null;
-export declare function extractInvokeToolsFromText(text: string): ToolCallLite[] | null;
-export declare function extractBareExecCommandFromText(text: string): ToolCallLite[] | null;
-export declare function extractApplyPatchCallsFromText(text: string): ToolCallLite[] | null;
-export declare function extractExecuteBlocksFromText(text: string): ToolCallLite[] | null;
-export declare function extractXMLToolCallsFromText(text: string): ToolCallLite[] | null;
-/**
- * 提取简单 XML 形式的工具调用块，例如：
- *
- *   <list_directory>
- *     <path>/path/to/dir</path>
- *     <recursive>false</recursive>
- *   </list_directory>
- *
- * 仅针对已知工具名（目前为 list_directory），避免误伤普通 XML 文本。
- */
-export declare function extractSimpleXmlToolsFromText(text: string): ToolCallLite[] | null;
-export declare function extractQwenToolCallTokensFromText(text: string): ToolCallLite[] | null;
-export declare function normalizeAssistantTextToToolCalls(message: Record<string, any>): Record<string, any>;
+export type { JsonToolRepairConfig, TextMarkupNormalizeOptions, ToolCallLite } from './text-markup-normalizer/extractors.js';
+export { extractApplyPatchCallsFromText, extractBareExecCommandFromText, extractExecuteBlocksFromText, extractExploredListDirectoryCallsFromText, extractInvokeToolsFromText, extractJsonToolCallsFromText, extractParameterXmlToolsFromText, extractQwenToolCallTokensFromText, extractSimpleXmlToolsFromText, extractToolNamespaceXmlBlocksFromText, extractXMLToolCallsFromText } from './text-markup-normalizer/extractors.js';
+export { normalizeAssistantTextToToolCalls } from './text-markup-normalizer/normalize.js';