@jsonstudio/llms 0.6.2172 → 0.6.2979

package/dist/conversion/shared/jsonish.js

@@ -1,4 +1,5 @@
 // Shared JSON-ish parsing helpers
+import { parseLenientJsonishWithNative, repairArgumentsToStringWithNative } from '../../router/virtual-router/engine-selection/native-shared-conversion-semantics.js';
 export function tryParseJson(s) {
     if (typeof s !== 'string')
         return s;
@@ -11,167 +12,9 @@ export function tryParseJson(s) {
 }
 // Lenient parsing for function.arguments often produced by models
 export function parseLenient(value) {
-    if (value === undefined || value === null)
-        return {};
-    if (typeof value === 'object')
-        return value;
-    if (typeof value !== 'string')
-        return { _raw: String(value) };
-    const s0 = value.trim();
-    if (!s0)
-        return {};
-    // 1) strict JSON
-    try {
-        return JSON.parse(s0);
-    }
-    catch { /* continue */ }
-    // 2) fenced ```json ... ``` or ``` ... ```
-    const fence = s0.match(/```(?:json)?\s*([\s\S]*?)\s*```/i);
-    const candidate = fence ? fence[1] : s0;
-    // 3) object substring
-    const objMatch = candidate.match(/\{[\s\S]*\}/);
-    if (objMatch) {
-        try {
-            return JSON.parse(objMatch[0]);
-        }
-        catch { /* ignore */ }
-    }
-    // 4) array substring
-    const arrMatch = candidate.match(/\[[\s\S]*\]/);
-    if (arrMatch) {
-        try {
-            return JSON.parse(arrMatch[0]);
-        }
-        catch { /* ignore */ }
-    }
-    // 5) single quotes → double; unquoted keys → quoted
-    let t = candidate.replace(/'([^']*)'/g, '"$1"');
-    t = t.replace(/([{,\s])([A-Za-z_][A-Za-z0-9_-]*)\s*:/g, '$1"$2":');
-    try {
-        return JSON.parse(t);
-    }
-    catch { /* ignore */ }
-    // 6) key=value fallback across lines/commas
-    const obj = {};
-    const parts = candidate.split(/[\n,]+/).map(p => p.trim()).filter(Boolean);
-    for (const p of parts) {
-        const m = p.match(/^([A-Za-z_][A-Za-z0-9_-]*)\s*[:=]\s*(.+)$/);
-        if (!m)
-            continue;
-        const k = m[1];
-        let v = m[2].trim();
-        if ((v.startsWith('"') && v.endsWith('"')) || (v.startsWith("'") && v.endsWith("'")))
-            v = v.slice(1, -1);
-        try {
-            const pv = JSON.parse(v);
-            obj[k] = pv;
-            continue;
-        }
-        catch { /* fallthrough */ }
-        if (/^(true|false)$/i.test(v)) {
-            obj[k] = /^true$/i.test(v);
-            continue;
-        }
-        if (/^-?\d+(?:\.\d+)?$/.test(v)) {
-            obj[k] = Number(v);
-            continue;
-        }
-        obj[k] = v;
-    }
-    return obj;
+    return parseLenientJsonishWithNative(value);
 }
 // CCR-style repair: JSON -> JSON5-like cleanup -> safe fallback
 export function repairArgumentsToString(value) {
-    try {
-        if (value === undefined || value === null)
-            return '{}';
-        if (typeof value === 'object') {
-            try {
-                return JSON.stringify(value);
-            }
-            catch {
-                return '{}';
-            }
-        }
-        if (typeof value !== 'string') {
-            try {
-                return JSON.stringify({ _raw: String(value) });
-            }
-            catch {
-                return '{}';
-            }
-        }
-        let s = value.trim();
-        if (!s)
-            return '{}';
-        // 1) strict JSON
-        try {
-            JSON.parse(s);
-            return s;
-        }
-        catch { /* continue */ }
-        // 2) fenced ```json ... ``` or ``` ... ```
-        const fence = s.match(/```(?:json)?\s*([\s\S]*?)\s*```/i);
-        if (fence && fence[1])
-            s = fence[1].trim();
-        // 3) strip comments (// and /* */)
-        try {
-            s = s.replace(/\/\/.*$/gm, '');
-            s = s.replace(/\/\*[\s\S]*?\*\//g, '');
-        }
-        catch { /* ignore */ }
-        // 4) remove trailing commas before } or ]
-        try {
-            s = s.replace(/,\s*(?=[}\]])/g, '');
-        }
-        catch { /* ignore */ }
-        // 5) single quotes to double
-        try {
-            s = s.replace(/'([^'\\]*(?:\\.[^'\\]*)*)'/g, '"$1"');
-        }
-        catch { /* ignore */ }
-        // 6) quote unquoted keys
-        try {
-            s = s.replace(/([{,\s])([A-Za-z_][A-Za-z0-9_-]*)\s*:/g, '$1"$2":');
-        }
-        catch { /* ignore */ }
-        // 7) try parse after cleanup
-        try {
-            const obj = JSON.parse(s);
-            try {
-                if (obj && typeof obj === 'object' && Object.prototype.hasOwnProperty.call(obj, 'command')) {
-                    const cmd = obj.command;
-                    if (Array.isArray(cmd)) {
-                        obj.command = cmd.map((t) => String(t)).join(' ');
-                    }
-                }
-            }
-            catch { /* ignore */ }
-            return JSON.stringify(obj);
-        }
-        catch { /* continue */ }
-        // 8) extract first {...} or [...] substring and try again
-        try {
-            const m = s.match(/\{[\s\S]*\}|\[[\s\S]*\]/);
-            if (m) {
-                const obj = JSON.parse(m[0]);
-                try {
-                    if (obj && typeof obj === 'object' && Object.prototype.hasOwnProperty.call(obj, 'command')) {
-                        const cmd = obj.command;
-                        if (Array.isArray(cmd)) {
-                            obj.command = cmd.map((t) => String(t)).join(' ');
-                        }
-                    }
-                }
-                catch { /* ignore */ }
-                return JSON.stringify(obj);
-            }
-        }
-        catch { /* ignore */ }
-        // 9) final fallback
-        return '{}';
-    }
-    catch {
-        return '{}';
-    }
+    return repairArgumentsToStringWithNative(value);
 }

package/dist/conversion/shared/mcp-injection.js

@@ -1,173 +1,7 @@
-// Shared MCP tool exposure logic (two-step), aligned with claude-code-router
-const obj = (props, req = []) => {
-    const schema = {
-        type: 'object',
-        properties: props,
-        additionalProperties: false
-    };
-    if (Array.isArray(req) && req.length > 0) {
-        schema.required = req;
-    }
-    return schema;
-};
-function uniq(arr) { return Array.from(new Set(arr)); }
-function buildKnownServersLine(discoveredServers) {
-    if (!Array.isArray(discoveredServers) || discoveredServers.length === 0)
-        return '';
-    const list = uniq(discoveredServers).slice(0, 8);
-    const suffix = discoveredServers.length > list.length ? ` (+${discoveredServers.length - list.length} more)` : '';
-    return `Known MCP servers: ${list.join(', ')}${suffix}.`;
-}
-function buildMcpServerReminder() {
-    return 'Note: arguments.server is an MCP server label (NOT a tool name like shell/exec_command/apply_patch).';
-}
-function buildListResourcesDescription(discoveredServers) {
-    return [
-        'List resources exposed by MCP servers.',
-        'Only use this for MCP resources (not MCP tools). Many MCP servers expose tools only; if the result is empty, do not retry.',
-        'If you do not know the MCP server name yet, call this tool with {} once; then reuse the returned server names for subsequent calls.',
-        buildMcpServerReminder(),
-        buildKnownServersLine(discoveredServers)
-    ].filter(Boolean).join('\n');
-}
-function buildListTemplatesDescription(discoveredServers) {
-    return [
-        'List resource templates exposed by MCP servers.',
-        'Only use this for MCP resources (not MCP tools). If list_mcp_resources returns empty, do not retry.',
-        'If you do not know the MCP server name yet, call list_mcp_resources({}) once first.',
-        buildMcpServerReminder(),
-        buildKnownServersLine(discoveredServers)
-    ].filter(Boolean).join('\n');
-}
-function buildReadResourceDescription(discoveredServers) {
-    return [
-        'Read a specific MCP resource by { server, uri }.',
-        'Only use this for MCP resources (not MCP tools). If list_mcp_resources returns empty, do not retry.',
-        'If you do not know the MCP server name yet, call list_mcp_resources({}) once first.',
-        buildMcpServerReminder(),
-        buildKnownServersLine(discoveredServers)
-    ].filter(Boolean).join('\n');
-}
+import { injectMcpToolsForChatWithNative, injectMcpToolsForResponsesWithNative } from '../../router/virtual-router/engine-selection/native-shared-conversion-semantics.js';
 export function injectMcpToolsForChat(tools, discoveredServers) {
-    const out = [];
-    const keep = new Set();
-    const listServers = discoveredServers && discoveredServers.length ? { type: 'string', enum: uniq(discoveredServers), minLength: 1 } : { type: 'string', minLength: 1 };
-    const templateServer = discoveredServers && discoveredServers.length ? { type: 'string', enum: uniq(discoveredServers), minLength: 1 } : { type: 'string', minLength: 1 };
-    const ensure = (name, def) => { if (!keep.has(name)) {
-        out.push(def);
-        keep.add(name);
-    } };
-    const current = Array.isArray(tools) ? tools : [];
-    for (const t of current) {
-        const name = t && t.function && typeof t.function.name === 'string' ? String(t.function.name) : '';
-        const lower = name.toLowerCase();
-        if (!name) {
-            out.push(t);
-            continue;
-        }
-        if (lower === 'list_mcp_resources') {
-            ensure('list_mcp_resources', { type: 'function', function: { name: 'list_mcp_resources', description: (t.function?.description && String(t.function.description).trim()) ? t.function.description : buildListResourcesDescription(discoveredServers), parameters: obj({ server: listServers, filter: { type: 'string' }, root: { type: 'string' } }) } });
-            continue;
-        }
-        if (lower === 'list_mcp_resource_templates') {
-            ensure('list_mcp_resource_templates', {
-                type: 'function',
-                function: {
-                    name: 'list_mcp_resource_templates',
-                    description: (t.function?.description && String(t.function.description).trim()) ? t.function.description : buildListTemplatesDescription(discoveredServers),
-                    parameters: obj({ server: templateServer, cursor: { type: 'string' } })
-                }
-            });
-            continue;
-        }
-        if (lower === 'read_mcp_resource') {
-            // Phase gating: do not expose read until we have known server labels.
-            if (discoveredServers.length > 0) {
-                const srv = { type: 'string', enum: uniq(discoveredServers) };
-                ensure('read_mcp_resource', {
-                    type: 'function',
-                    function: {
-                        name: 'read_mcp_resource',
-                        description: (t.function?.description && String(t.function.description).trim()) ? t.function.description : buildReadResourceDescription(discoveredServers),
-                        parameters: obj({ server: srv, uri: { type: 'string' } }, ['server', 'uri'])
-                    }
-                });
-            }
-            continue;
-        }
-        out.push(t);
-        keep.add(lower);
-    }
-    // Ensure list exists when user did not provide it
-    if (!keep.has('list_mcp_resources')) {
-        out.push({ type: 'function', function: { name: 'list_mcp_resources', description: buildListResourcesDescription(discoveredServers), parameters: obj({ server: listServers, filter: { type: 'string' }, root: { type: 'string' } }) } });
-    }
-    // Ensure templates exists (safe to call after list_mcp_resources)
-    if (!keep.has('list_mcp_resource_templates')) {
-        out.push({
-            type: 'function',
-            function: {
-                name: 'list_mcp_resource_templates',
-                description: buildListTemplatesDescription(discoveredServers),
-                parameters: obj({ server: templateServer, cursor: { type: 'string' } })
-            }
-        });
-    }
-    return out;
+    return injectMcpToolsForChatWithNative(tools, discoveredServers);
 }
 export function injectMcpToolsForResponses(tools, discoveredServers) {
-    const out = [];
-    const keep = new Set();
-    const listServers = { type: 'string', minLength: 1 };
-    const templateServer = discoveredServers && discoveredServers.length ? { type: 'string', enum: uniq(discoveredServers), minLength: 1 } : { type: 'string', minLength: 1 };
-    const ensure = (name, def) => { if (!keep.has(name)) {
-        out.push(def);
-        keep.add(name);
-    } };
-    const current = Array.isArray(tools) ? tools : [];
-    for (const t of current) {
-        const name = t && t.function && typeof t.function.name === 'string' ? String(t.function.name) : '';
-        const lower = name.toLowerCase();
-        if (!name) {
-            out.push(t);
-            continue;
-        }
-        if (lower === 'list_mcp_resources') {
-            ensure('list_mcp_resources', { type: 'function', function: { name: 'list_mcp_resources', description: (t.function?.description && String(t.function.description).trim()) ? t.function.description : buildListResourcesDescription(discoveredServers), parameters: obj({ server: listServers, filter: { type: 'string' }, root: { type: 'string' } }) } });
-            continue;
-        }
-        if (lower === 'list_mcp_resource_templates') {
-            ensure('list_mcp_resource_templates', {
-                type: 'function',
-                function: {
-                    name: 'list_mcp_resource_templates',
-                    description: (t.function?.description && String(t.function.description).trim()) ? t.function.description : buildListTemplatesDescription(discoveredServers),
-                    parameters: obj({ server: templateServer, cursor: { type: 'string' } })
-                }
-            });
-            continue;
-        }
-        if (lower === 'read_mcp_resource' && discoveredServers.length > 0) {
-            const srv = { type: 'string', enum: uniq(discoveredServers) };
-            ensure('read_mcp_resource', { type: 'function', function: { name: 'read_mcp_resource', description: (t.function?.description && String(t.function.description).trim()) ? t.function.description : buildReadResourceDescription(discoveredServers), parameters: obj({ server: srv, uri: { type: 'string' } }, ['server', 'uri']) } });
-            continue;
-        }
-        out.push(t);
-        keep.add(lower);
-    }
-    if (!keep.has('list_mcp_resources')) {
-        out.push({ type: 'function', function: { name: 'list_mcp_resources', description: buildListResourcesDescription(discoveredServers), parameters: obj({ server: listServers, filter: { type: 'string' }, root: { type: 'string' } }) } });
-        keep.add('list_mcp_resources');
-    }
-    if (!keep.has('list_mcp_resource_templates')) {
-        out.push({
-            type: 'function',
-            function: {
-                name: 'list_mcp_resource_templates',
-                description: buildListTemplatesDescription(discoveredServers),
-                parameters: obj({ server: templateServer, cursor: { type: 'string' } })
-            }
-        });
-    }
-    return out;
+    return injectMcpToolsForResponsesWithNative(tools, discoveredServers);
 }

package/dist/conversion/shared/media.js

@@ -1,9 +1,4 @@
+import { isImagePathWithNative } from '../../router/virtual-router/engine-selection/native-shared-conversion-semantics.js';
 export function isImagePath(p) {
-    try {
-        const s = String(p || '').toLowerCase();
-        return /\.(png|jpg|jpeg|gif|webp|bmp|svg|tiff?|ico|heic|jxl)$/.test(s);
-    }
-    catch {
-        return false;
-    }
+    return isImagePathWithNative(p);
 }

package/dist/conversion/shared/metadata-passthrough.js

@@ -1,57 +1,20 @@
 import { isJsonObject, jsonClone } from '../hub/types/json.js';
-function isValidKey(value) {
-    return typeof value === 'string' && value.trim().length > 0;
-}
+import { encodeMetadataPassthroughWithNative, extractMetadataPassthroughWithNative } from '../../router/virtual-router/engine-selection/native-shared-conversion-semantics.js';
 export function encodeMetadataPassthrough(parameters, options) {
-    if (!parameters)
-        return undefined;
-    const encoded = {};
-    const { prefix, keys } = options;
-    for (const key of keys) {
-        if (!isValidKey(key))
-            continue;
-        const value = parameters[key];
-        if (value === undefined)
-            continue;
-        try {
-            encoded[`${prefix}${key}`] = JSON.stringify(value);
-        }
-        catch {
-            continue;
-        }
-    }
-    return Object.keys(encoded).length ? encoded : undefined;
+    return encodeMetadataPassthroughWithNative(parameters, options.prefix, options.keys);
 }
 export function extractMetadataPassthrough(metadataField, options) {
     if (!metadataField || !isJsonObject(metadataField)) {
         return {};
     }
     const cloned = jsonClone(metadataField);
-    const passthrough = {};
-    const { prefix, keys } = options;
-    const allowedKeys = new Set(keys.filter(isValidKey));
-    let mutated = false;
-    for (const rawKey of Object.keys(cloned)) {
-        if (!rawKey.startsWith(prefix))
-            continue;
-        const suffix = rawKey.slice(prefix.length);
-        if (!allowedKeys.has(suffix))
-            continue;
-        const rawValue = cloned[rawKey];
-        if (typeof rawValue !== 'string')
-            continue;
-        try {
-            const parsed = rawValue ? JSON.parse(rawValue) : undefined;
-            passthrough[suffix] = parsed;
-            delete cloned[rawKey];
-            mutated = true;
-        }
-        catch {
-            continue;
-        }
-    }
+    const native = extractMetadataPassthroughWithNative(cloned, options.prefix, options.keys);
+    const metadata = native.metadata && isJsonObject(native.metadata) ? native.metadata : undefined;
+    const passthrough = native.passthrough && isJsonObject(native.passthrough)
+        ? native.passthrough
+        : undefined;
     return {
-        metadata: mutated ? (Object.keys(cloned).length ? cloned : undefined) : cloned,
-        passthrough: Object.keys(passthrough).length ? passthrough : undefined
+        metadata,
+        passthrough
     };
 }

package/dist/conversion/shared/openai-finalizer.js

@@ -1,6 +1,7 @@
 // OpenAI Chat finalizer: enforce canonical shapes without the legacy hook system.
 // - Ensures tool_calls use stringified JSON arguments and sets finish_reason='tool_calls' when applicable
 // - Normalizes potential tool messages (role:'tool') content to strict strings (JSON-stringify for objects)
+import { sanitizeReasoningTaggedTextWithNative } from '../../router/virtual-router/engine-selection/native-shared-conversion-semantics.js';
 function asObject(v) {
     return v && typeof v === 'object' && !Array.isArray(v) ? v : null;
 }
@@ -135,7 +136,7 @@ function applyChatReasoningPolicy(target, mode) {
 function normalizeReasoningField(container, mode) {
     const bag = container;
     const rawValue = typeof bag.reasoning_content === 'string' ? bag.reasoning_content : '';
-    const trimmed = rawValue.trim();
+    const trimmed = sanitizeReasoningTaggedTextWithNative(rawValue).trim();
     if (!trimmed && Object.prototype.hasOwnProperty.call(bag, 'reasoning_content')) {
         delete bag.reasoning_content;
         return;