@jsonstudio/llms 0.6.2172 → 0.6.2979

package/dist/conversion/shared/openai-message-normalize.js

@@ -1,4 +1,5 @@
 import { injectMcpToolsForChat } from './mcp-injection.js';
+import { normalizeOpenaiChatMessagesWithNative, normalizeOpenaiMessageWithNative, normalizeOpenaiToolCallWithNative, normalizeOpenaiToolWithNative } from '../../router/virtual-router/engine-selection/native-shared-conversion-semantics.js';
 // Message normalization utilities for OpenAI chat payloads (renamed to avoid confusion
 // with the deprecated "openai-normalizer" module entry). This file contains the
 // previously-implemented logic from openai-normalize.ts.
@@ -131,204 +132,14 @@ export function normalizeChatRequest(request) {
         }
         catch { /* ignore MCP injection */ }
     }
-    // Normalize assistant.tool_calls arguments (stringify only; do NOT reshape)
-    try {
-        const msgs = Array.isArray(normalized.messages) ? normalized.messages : [];
-        for (const m of msgs) {
-            if (!m || m.role !== 'assistant' || !Array.isArray(m.tool_calls))
-                continue;
-            m.tool_calls = m.tool_calls.map((tc) => {
-                if (!tc || typeof tc !== 'object')
-                    return tc;
-                const fn = tc.function || {};
-                // Only ensure arguments is a JSON string; do NOT reshape user-provided content
-                if (fn && typeof fn === 'object' && fn.arguments !== undefined && typeof fn.arguments !== 'string') {
-                    try {
-                        fn.arguments = JSON.stringify(fn.arguments);
-                    }
-                    catch {
-                        fn.arguments = '""';
-                    }
-                }
-                return { ...tc, function: fn };
-            });
-        }
-        normalized.messages = msgs;
-    }
-    catch { /* ignore shell fixups */ }
-    // 删除“工具结果嵌回 assistant 文本”的逻辑，避免污染 assistant.content（统一在 role:'tool' 保留结构化结果）
-    // 始终对所有 role:'tool' 的消息做最小文本化（不截断/不添加提示），避免影响模型判断
+    // 工具消息文本化 + 最后一轮 call 结果一致化 + 空 assistant 回合清理（native）
     try {
         const msgs = Array.isArray(normalized.messages) ? normalized.messages : [];
         if (msgs.length) {
-            const withTruncationNotice = (text) => {
-                // Do not truncate or annotate; return as-is
-                try {
-                    return String(text ?? '');
-                }
-                catch {
-                    return String(text ?? '');
-                }
-            };
-            const extractPlain = (raw) => {
-                try {
-                    const s = String(raw ?? '');
-                    if (s.trim().length === 0) {
-                        return '执行成功（无输出）';
-                    }
-                    let obj = null;
-                    try {
-                        obj = JSON.parse(s);
-                    }
-                    catch {
-                        obj = null;
-                    }
-                    return withTruncationNotice(s);
-                }
-                catch {
-                    return String(raw ?? '');
-                }
-            };
-            for (const m of msgs) {
-                if (!m || typeof m !== 'object')
-                    continue;
-                if (String(m.role || '').toLowerCase() !== 'tool')
-                    continue;
-                const c = m.content;
-                if (typeof c === 'string') {
-                    m.content = extractPlain(c);
-                }
-                else if (c && typeof c === 'object') {
-                    try {
-                        m.content = String(JSON.stringify(c));
-                    }
-                    catch {
-                        m.content = String(c);
-                    }
-                }
-                else if (c != null) {
-                    m.content = withTruncationNotice(String(c));
-                }
-                else {
-                    m.content = '执行成功（无输出）';
-                }
-            }
-            normalized.messages = msgs;
+            normalized.messages = normalizeOpenaiChatMessagesWithNative(msgs);
         }
     }
-    catch { /* ignore tool message sanitization errors */ }
-    // 对所有工具结果做最小文本化（不裁剪）；同时对“最后一轮”做一致化处理。
-    try {
-        const msgs = Array.isArray(normalized.messages) ? normalized.messages : [];
-        const withTruncationNotice = (text) => {
-            // No truncation / annotation; pass-through
-            try {
-                return typeof text === 'string' ? text : String(text ?? '');
-            }
-            catch {
-                return String(text ?? '');
-            }
-        };
-        const extractPlain = (raw) => {
-            try {
-                const s = String(raw ?? '');
-                if (s.trim().length === 0) {
-                    return '执行成功（无输出）';
-                }
-                let obj = null;
-                try {
-                    obj = JSON.parse(s);
-                }
-                catch {
-                    obj = null;
-                }
-                return withTruncationNotice(s);
-            }
-            catch {
-                return String(raw ?? '');
-            }
-        };
-        // 先对所有历史 tool 消息统一最小化+截断
-        for (const m of msgs) {
-            if (!m || typeof m !== 'object')
-                continue;
-            if (String(m.role || '').toLowerCase() !== 'tool')
-                continue;
-            const c = m.content;
-            if (typeof c === 'string') {
-                m.content = extractPlain(c);
-            }
-            else if (c && typeof c === 'object') {
-                try {
-                    m.content = String(JSON.stringify(c));
-                }
-                catch {
-                    m.content = String(c);
-                }
-            }
-            else if (c != null) {
-                m.content = withTruncationNotice(String(c));
-            }
-            else {
-                m.content = '执行成功（无输出）';
-            }
-        }
-        const lastAssistantIdx = (() => {
-            for (let i = msgs.length - 1; i >= 0; i--) {
-                const m = msgs[i];
-                if (m && m.role === 'assistant' && Array.isArray(m.tool_calls) && m.tool_calls.length)
-                    return i;
-            }
-            return -1;
-        })();
-        if (lastAssistantIdx >= 0) {
-            const callIds = new Set();
-            try {
-                for (const tc of msgs[lastAssistantIdx].tool_calls) {
-                    const id = typeof tc?.id === 'string' ? tc.id : undefined;
-                    if (id)
-                        callIds.add(id);
-                }
-            }
-            catch { /* ignore */ }
-            for (let i = lastAssistantIdx + 1; i < msgs.length; i++) {
-                const m = msgs[i];
-                if (!m || m.role !== 'tool')
-                    continue;
-                const cid = typeof m.tool_call_id === 'string' ? m.tool_call_id : undefined;
-                if (!cid || !callIds.has(cid))
-                    continue;
-                const plain = extractPlain(m.content);
-                m.content = withTruncationNotice(plain);
-            }
-        }
-    }
-    catch { /* ignore sanitize errors */ }
-    // 删除“无 tool_calls 且内容为空/仅空白”的 assistant 回合（降噪，避免部分上游对空 turn 敏感）
-    try {
-        const msgs = Array.isArray(normalized.messages) ? normalized.messages : [];
-        const isEmptyContent = (c) => {
-            if (c === null || c === undefined)
-                return true;
-            if (typeof c === 'string')
-                return c.trim().length === 0;
-            if (Array.isArray(c)) {
-                const txt = c.map((p) => (p && typeof p.text === 'string') ? p.text : '').filter(Boolean).join('').trim();
-                return txt.length === 0;
-            }
-            return false;
-        };
-        const filtered = msgs.filter((m) => {
-            if (!m || m.role !== 'assistant')
-                return true;
-            const hasTools = Array.isArray(m.tool_calls) && m.tool_calls.length > 0;
-            if (hasTools)
-                return true;
-            return !isEmptyContent(m.content);
-        });
-        normalized.messages = filtered;
-    }
-    catch { /* ignore */ }
+    catch { /* ignore message normalization */ }
     // 注意：不合并/删除多条 system（与 统一标准，避免高风险修改）。
     // 基于“载荷预算”（配置驱动）进行分层裁剪，避免整体载荷超限导致上游 500。
     try {
@@ -386,99 +197,16 @@ function normalizeChatResponse(res) {
     }
 }
 function normalizeMessage(message) {
-    if (!message || typeof message !== 'object')
-        return message;
-    const normalizedMessage = { ...message };
-    // 保持 null/undefined 为原样，避免将其强制为 ''。
-    // 多数 OpenAI 兼容实现允许 assistant 在包含 tool_calls 时使用 content=null。
-    if (normalizedMessage.content === undefined || normalizedMessage.content === null) {
-        // do not coerce to empty string
-    }
-    else if (typeof normalizedMessage.content === 'string') {
-        // keep as-is
-    }
-    else if (Array.isArray(normalizedMessage.content)) {
-        // keep structured array
-    }
-    else if (typeof normalizedMessage.content === 'object') {
-        // keep structured object
-    }
-    else {
-        normalizedMessage.content = String(normalizedMessage.content);
-    }
-    if (normalizedMessage.role === 'assistant' && Array.isArray(normalizedMessage.tool_calls)) {
-        normalizedMessage.tool_calls = normalizedMessage.tool_calls.map((toolCall) => normalizeToolCall(toolCall));
-    }
-    return normalizedMessage;
+    const disableShellCoerce = String(process?.env?.RCC_DISABLE_SHELL_COERCE ?? process?.env?.ROUTECODEX_DISABLE_SHELL_COERCE ?? '').toLowerCase();
+    const isDisabled = disableShellCoerce === '1' || disableShellCoerce === 'true';
+    return normalizeOpenaiMessageWithNative(message, isDisabled);
 }
 function normalizeTool(tool) {
-    if (!tool || typeof tool !== 'object')
-        return tool;
-    const normalizedTool = { ...tool };
-    if (normalizedTool.type === 'function' && normalizedTool.function) {
-        const fn = { ...normalizedTool.function };
-        if (fn.parameters && typeof fn.parameters !== 'object') {
-            try {
-                fn.parameters = JSON.parse(String(fn.parameters));
-            }
-            catch {
-                fn.parameters = {};
-            }
-        }
-        normalizedTool.function = fn;
-    }
-    return normalizedTool;
+    return normalizeOpenaiToolWithNative(tool);
 }
 function normalizeToolCall(tc) {
-    if (!tc || typeof tc !== 'object')
-        return tc;
-    const t = { ...tc };
-    if (t.function && typeof t.function === 'object') {
-        const fn = { ...t.function };
-        const argStrIn = typeof fn.arguments === 'string' ? fn.arguments : (fn.arguments != null ? JSON.stringify(fn.arguments) : '{}');
-        let argsObj = {};
-        try {
-            argsObj = JSON.parse(argStrIn);
-        }
-        catch {
-            argsObj = {};
-        }
-        // Drop dotted-name prefix unconditionally; keep only base function name
-        if (typeof fn.name === 'string' && fn.name.includes('.')) {
-            const dot = fn.name.indexOf('.');
-            fn.name = fn.name.slice(dot + 1).trim();
-        }
-        // Shell command coercion (can be disabled via env)
-        const disableShellCoerce = String(process?.env?.RCC_DISABLE_SHELL_COERCE ?? process?.env?.ROUTECODEX_DISABLE_SHELL_COERCE ?? '').toLowerCase();
-        const isDisabled = disableShellCoerce === '1' || disableShellCoerce === 'true';
-        if (!isDisabled && String(fn.name || '').toLowerCase() === 'shell') {
-            const cmdVal = argsObj?.command;
-            if (typeof cmdVal === 'string' && cmdVal.trim().length > 0) {
-                const s = cmdVal.trim();
-                const hasMeta = /[<>|;&]/.test(s) || s.includes('&&') || s.includes('||') || s.includes('<<');
-                if (hasMeta) {
-                    argsObj.command = ['bash', '-lc', s];
-                }
-                else {
-                    argsObj.command = splitCommandString(s);
-                }
-            }
-            else if (Array.isArray(cmdVal)) {
-                const toks = cmdVal.map((x) => String(x));
-                if (toks.length > 3 && toks[0] === 'bash' && toks[1] === '-lc') {
-                    argsObj.command = ['bash', '-lc', toks.slice(2).join(' ')];
-                }
-            }
-        }
-        try {
-            fn.arguments = JSON.stringify(argsObj);
-        }
-        catch {
-            fn.arguments = argStrIn;
-        }
-        t.function = fn;
-    }
-    return t;
+    const disableShellCoerce = String(process?.env?.RCC_DISABLE_SHELL_COERCE ?? process?.env?.ROUTECODEX_DISABLE_SHELL_COERCE ?? '').toLowerCase();
+    const isDisabled = disableShellCoerce === '1' || disableShellCoerce === 'true';
+    return normalizeOpenaiToolCallWithNative(tc, isDisabled);
 }
-import { splitCommandString } from './tooling.js';
 import { resolveBudgetForModelSync } from './payload-budget.js';

package/dist/conversion/shared/output-content-normalizer.js

@@ -1,119 +1,16 @@
-import { extractReasoningSegments, sanitizeReasoningTaggedText } from './reasoning-utils.js';
-function collectTextAndReasoning(blocks, collector) {
-    const pushText = (value) => {
-        if (typeof value === 'string' && value.trim().length) {
-            const cleaned = extractReasoningSegments(value, collector.reasoningParts);
-            if (cleaned.length) {
-                collector.textParts.push(cleaned);
-            }
-        }
-    };
-    if (typeof blocks === 'string') {
-        pushText(blocks);
-        return;
-    }
-    if (!Array.isArray(blocks))
-        return;
-    for (const block of blocks) {
-        if (!block || typeof block !== 'object')
-            continue;
-        const type = typeof block.type === 'string' ? String(block.type).toLowerCase() : '';
-        if (type === 'text' || type === 'input_text' || type === 'output_text' || type === 'commentary') {
-            pushText(block.text ?? block.content);
-            continue;
-        }
-        if (Array.isArray(block.content)) {
-            collectTextAndReasoning(block.content, collector);
-            continue;
-        }
-        if (typeof block.text === 'string') {
-            pushText(block.text);
-        }
-    }
-}
+import { extractOutputSegmentsWithNative, normalizeContentPartWithNative, normalizeMessageContentPartsWithNative } from '../../router/virtual-router/engine-selection/native-shared-conversion-semantics.js';
 export function extractOutputSegments(source, itemsKey = 'output') {
-    if (!source || typeof source !== 'object') {
-        return { textParts: [], reasoningParts: [] };
-    }
-    const outputItems = Array.isArray(source[itemsKey]) ? source[itemsKey] : [];
-    const result = { textParts: [], reasoningParts: [] };
-    for (const item of outputItems) {
-        if (!item || typeof item !== 'object')
-            continue;
-        const type = typeof item.type === 'string' ? String(item.type).toLowerCase() : '';
-        if (type === 'message') {
-            const message = item.message && typeof item.message === 'object'
-                ? item.message
-                : item;
-            const content = Array.isArray(message.content) ? message.content : [];
-            collectTextAndReasoning(content, result);
-            continue;
-        }
-        if (type === 'output_text' && typeof item.text === 'string') {
-            const cleaned = extractReasoningSegments(item.text, result.reasoningParts);
-            if (cleaned.length) {
-                result.textParts.push(cleaned);
-            }
-            continue;
-        }
-        if (type === 'reasoning') {
-            const content = Array.isArray(item.content) ? item.content : [];
-            for (const block of content) {
-                if (block && typeof block === 'object' && typeof block.text === 'string') {
-                    const sanitized = sanitizeReasoningTaggedText(block.text);
-                    if (sanitized.length)
-                        result.reasoningParts.push(sanitized);
-                }
-            }
-        }
-    }
-    return result;
+    return extractOutputSegmentsWithNative(source, itemsKey);
 }
 export function normalizeContentPart(part, reasoningCollector) {
-    if (part == null)
-        return null;
-    if (typeof part === 'string') {
-        const cleaned = extractReasoningSegments(part, reasoningCollector);
-        return { type: 'output_text', text: cleaned };
-    }
-    if (typeof part !== 'object') {
-        return { type: 'output_text', text: sanitizeReasoningTaggedText(String(part)) };
-    }
-    const clone = { ...part };
-    delete clone._initialText;
-    delete clone._hasDelta;
-    if (typeof clone.text === 'string') {
-        clone.text = extractReasoningSegments(clone.text, reasoningCollector);
-    }
-    if (clone.output_text && typeof clone.output_text === 'object' && typeof clone.output_text.text === 'string') {
-        clone.output_text = {
-            ...clone.output_text,
-            text: extractReasoningSegments(clone.output_text.text, reasoningCollector)
-        };
-    }
-    if (typeof clone.content === 'string') {
-        clone.content = extractReasoningSegments(clone.content, reasoningCollector);
-    }
-    if (!clone.type)
-        clone.type = 'output_text';
-    if (clone.type === 'output_text' && typeof clone.text !== 'string') {
-        clone.text = '';
-    }
-    return clone;
+    const normalized = normalizeContentPartWithNative(part, reasoningCollector);
+    reasoningCollector.splice(0, reasoningCollector.length, ...normalized.reasoningCollector);
+    return normalized.normalized;
 }
 export function normalizeMessageContentParts(parts, reasoningCollector) {
-    const reasoningChunks = reasoningCollector ?? [];
-    const normalizedParts = [];
-    if (!Array.isArray(parts)) {
-        const normalized = normalizeContentPart(parts, reasoningChunks);
-        if (normalized)
-            normalizedParts.push(normalized);
-        return { normalizedParts, reasoningChunks };
-    }
-    for (const part of parts) {
-        const normalized = normalizeContentPart(part, reasoningChunks);
-        if (normalized)
-            normalizedParts.push(normalized);
+    const normalized = normalizeMessageContentPartsWithNative(parts, reasoningCollector ?? []);
+    if (reasoningCollector) {
+        reasoningCollector.splice(0, reasoningCollector.length, ...normalized.reasoningChunks);
     }
-    return { normalizedParts, reasoningChunks };
+    return normalized;
 }

package/dist/conversion/shared/payload-budget.js

@@ -6,6 +6,7 @@
 //  4) default 200_000 bytes
 // Safety headroom: 10% (env RCC_CONTEXT_BUDGET_SAFETY to override; default 0.1)
 import { UnifiedConfig } from '../../config-unified/unified-config.js';
+import { enforceChatBudgetWithNative } from '../../router/virtual-router/engine-selection/native-shared-conversion-semantics.js';
 function isObject(v) { return !!v && typeof v === 'object' && !Array.isArray(v); }
 function listMergedConfigsSync(configDir) {
     try {
@@ -157,91 +158,7 @@ export function enforceChatBudget(chat, modelId) {
             const n = Number(raw);
             return Number.isFinite(n) && n >= 0 ? n : 8192;
         })();
-        const size = (obj) => {
-            try {
-                return Buffer.byteLength(JSON.stringify(obj), 'utf8');
-            }
-            catch {
-                return 0;
-            }
-        };
-        const clamp = (s, n) => {
-            if (typeof s !== 'string')
-                return s;
-            if (n === 0)
-                return '';
-            return s.length > n ? (s.slice(0, n) + '...(truncated)') : s;
-        };
-        // 1) System message truncation
-        try {
-            if (sysLimit >= 0 && messages.length) {
-                const first = messages[0];
-                if (first && String(first.role || '').toLowerCase() === 'system' && typeof first.content === 'string') {
-                    first.content = clamp(first.content, sysLimit);
-                }
-            }
-        }
-        catch { /* ignore */ }
-        // 2) Remove empty assistant without tool_calls
-        try {
-            const kept = [];
-            for (const m of messages) {
-                if (!m || typeof m !== 'object') {
-                    kept.push(m);
-                    continue;
-                }
-                const role = String(m.role || '').toLowerCase();
-                if (role === 'assistant' && (!Array.isArray(m.tool_calls) || m.tool_calls.length === 0)) {
-                    const text = typeof m.content === 'string' ? m.content.trim() : '';
-                    if (!text) {
-                        continue;
-                    }
-                }
-                kept.push(m);
-            }
-            chat.messages = kept;
-        }
-        catch { /* ignore */ }
-        if (size(chat) <= allowed)
-            return chat;
-        // 3) Clamp tool messages iteratively
-        const passes = [4000, 1500, 400, 100];
-        for (const limit of passes) {
-            for (const m of chat.messages) {
-                try {
-                    if (!m || typeof m !== 'object')
-                        continue;
-                    if (String(m.role || '').toLowerCase() !== 'tool')
-                        continue;
-                    if (typeof m.content === 'string')
-                        m.content = clamp(m.content, limit);
-                }
-                catch { /* ignore */ }
-            }
-            if (size(chat) <= allowed)
-                return chat;
-        }
-        // 4) Lightly clamp assistant text if still above budget
-        for (const limit of [8000, 4000, 1500]) {
-            for (const m of chat.messages) {
-                try {
-                    if (!m || typeof m !== 'object')
-                        continue;
-                    if (String(m.role || '').toLowerCase() !== 'assistant')
-                        continue;
-                    if (Array.isArray(m.tool_calls) && m.tool_calls.length > 0)
-                        continue; // do not clamp assistant with tools here
-                    if (typeof m.content === 'string')
-                        m.content = clamp(m.content, limit);
-                    else if (Array.isArray(m.content)) {
-                        m.content = m.content.map((p) => (p && typeof p.text === 'string') ? { ...p, text: clamp(p.text, limit) } : p);
-                    }
-                }
-                catch { /* ignore */ }
-            }
-            if (size(chat) <= allowed)
-                break;
-        }
+        return enforceChatBudgetWithNative(chat, allowed, sysLimit);
     }
     catch { /* ignore budget errors */ }
     return chat;

package/dist/conversion/shared/protocol-state.js

@@ -1,12 +1,20 @@
 import { isJsonObject } from '../hub/types/json.js';
+import { ensureProtocolStateWithNative, getProtocolStateWithNative } from '../../router/virtual-router/engine-selection/native-shared-conversion-semantics.js';
 const PROTOCOL_STATE_KEY = 'protocolState';
 export function ensureProtocolState(metadata, protocol) {
+    const native = ensureProtocolStateWithNative(metadata, protocol);
+    for (const key of Object.keys(metadata)) {
+        if (!Object.prototype.hasOwnProperty.call(native.metadata, key)) {
+            delete metadata[key];
+        }
+    }
+    Object.assign(metadata, native.metadata);
     if (!metadata[PROTOCOL_STATE_KEY] || !isJsonObject(metadata[PROTOCOL_STATE_KEY])) {
         metadata[PROTOCOL_STATE_KEY] = {};
     }
     const container = metadata[PROTOCOL_STATE_KEY];
     if (!isJsonObject(container[protocol])) {
-        container[protocol] = {};
+        container[protocol] = native.node;
     }
     return container[protocol];
 }
@@ -14,10 +22,6 @@ export function getProtocolState(metadata, protocol) {
     if (!metadata) {
         return undefined;
     }
-    const store = metadata[PROTOCOL_STATE_KEY];
-    if (!isJsonObject(store)) {
-        return undefined;
-    }
-    const node = store[protocol];
-    return isJsonObject(node) ? node : undefined;
+    const node = getProtocolStateWithNative(metadata, protocol);
+    return node && isJsonObject(node) ? node : undefined;
 }

package/dist/conversion/shared/reasoning-mapping.js

@@ -1,8 +1,4 @@
+import { mapReasoningContentToResponsesOutputWithNative } from '../../router/virtual-router/engine-selection/native-shared-conversion-semantics.js';
 export function mapReasoningContentToResponsesOutput(reasoningContent) {
-    if (!reasoningContent)
-        return [];
-    const text = Array.isArray(reasoningContent)
-        ? reasoningContent.map((r) => (typeof r?.text === 'string' ? r.text : '')).filter(Boolean).join('\n')
-        : (typeof reasoningContent?.text === 'string' ? reasoningContent.text : '');
-    return text ? [{ type: 'reasoning', content: text }] : [];
+    return mapReasoningContentToResponsesOutputWithNative(reasoningContent);
 }

package/dist/conversion/shared/reasoning-normalizer.js

@@ -1,6 +1,7 @@
 import { normalizeChatMessageContent } from './chat-output-normalizer.js';
 import { extractReasoningSegments } from './reasoning-utils.js';
 import { expandResponsesMessageItem } from '../../sse/shared/responses-output-normalizer.js';
+import { sanitizeReasoningTaggedTextWithNative } from '../../router/virtual-router/engine-selection/native-shared-conversion-semantics.js';
 export const RESPONSES_INSTRUCTIONS_REASONING_FIELD = '__rcc_reasoning_instructions';
 function isRecord(value) {
     return Boolean(value && typeof value === 'object' && !Array.isArray(value));
@@ -253,7 +254,9 @@ function stripReasoningFromString(value) {
     }
     const segments = [];
     const cleaned = extractReasoningSegments(value, segments);
-    return { cleaned, segments };
+    const cleanedNative = sanitizeReasoningTaggedTextWithNative(value);
+    const stableCleaned = typeof cleanedNative === 'string' ? cleanedNative : cleaned;
+    return { cleaned: stableCleaned, segments };
 }
 function mergeReasoningText(existing, segments) {
     const combined = [];