@jsonstudio/llms 0.6.2172 → 0.6.3214

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

@@ -1,4 +1,5 @@
-import { injectMcpToolsForChat } from './mcp-injection.js';
+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';
+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/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));
@@ -41,6 +42,9 @@ function normalizeChatChoice(choice) {
     containers.forEach(container => applyNormalizedChatContent(container));
 }
 function applyNormalizedChatContent(container) {
+    const existingReasoning = typeof container.reasoning_content === 'string' && container.reasoning_content.trim().length
+        ? container.reasoning_content.trim()
+        : undefined;
     const normalized = normalizeChatMessageContent(container.content);
     const role = typeof container.role === 'string' ? container.role : undefined;
     if (normalized.contentText !== undefined && normalized.contentText.trim().length) {
@@ -55,6 +59,9 @@ function applyNormalizedChatContent(container) {
     if (normalized.reasoningText && normalized.reasoningText.trim().length) {
         container.reasoning_content = normalized.reasoningText.trim();
     }
+    else if (existingReasoning) {
+        container.reasoning_content = existingReasoning;
+    }
     else if ('reasoning_content' in container) {
         delete container.reasoning_content;
     }
@@ -253,7 +260,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 = [];

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

@@ -1,141 +1,29 @@
-import { extractToolCallsFromReasoningText } from './reasoning-tool-parser.js';
-import { mergeToolCalls } from './tool-call-utils.js';
-const THINK_TAG_PATTERN = /<\/?think[^>]*>/gi;
-const REFLECTION_TAG_PATTERN = /<\/?reflection[^>]*>/gi;
-function flattenReasoning(value, depth = 0) {
-    if (depth > 4 || value == null) {
-        return '';
+import { normalizeChatResponseReasoningToolsWithNative, normalizeMessageReasoningToolsWithNative } from '../../router/virtual-router/engine-selection/native-hub-bridge-action-semantics.js';
+function overwriteRecordInPlace(target, source) {
+    for (const key of Object.keys(target)) {
+        delete target[key];
     }
-    if (typeof value === 'string') {
-        return value;
+    for (const [key, value] of Object.entries(source)) {
+        target[key] = value;
     }
-    if (Array.isArray(value)) {
-        return value
-            .map((item) => flattenReasoning(item, depth + 1))
-            .filter(Boolean)
-            .join('\n');
-    }
-    if (typeof value === 'object') {
-        const record = value;
-        if (typeof record.text === 'string') {
-            return record.text;
-        }
-        if (typeof record.content === 'string') {
-            return record.content;
-        }
-        if (Array.isArray(record.content) || typeof record.content === 'object') {
-            return flattenReasoning(record.content, depth + 1);
-        }
-    }
-    return '';
-}
-function collectReasoningFragments(message) {
-    const fragments = [];
-    if ('reasoning_content' in message) {
-        const text = flattenReasoning(message.reasoning_content);
-        if (text) {
-            fragments.push(text);
-        }
-    }
-    if ('reasoning' in message) {
-        const text = flattenReasoning(message.reasoning);
-        if (text) {
-            fragments.push(text);
-        }
-    }
-    return fragments;
-}
-function writeReasoningContent(message, text) {
-    const trimmed = text.trim();
-    if (trimmed.length) {
-        message.reasoning_content = trimmed;
-    }
-    else if (Object.prototype.hasOwnProperty.call(message, 'reasoning_content')) {
-        delete message.reasoning_content;
-    }
-    if (typeof message.reasoning === 'string') {
-        if (trimmed.length) {
-            message.reasoning = trimmed;
-        }
-        else {
-            delete message.reasoning;
-        }
-    }
-}
-function stripReasoningTags(text) {
-    if (!text) {
-        return '';
-    }
-    return text.replace(THINK_TAG_PATTERN, '').replace(REFLECTION_TAG_PATTERN, '').trim();
 }
 export function normalizeMessageReasoningTools(message, options) {
     if (!message || typeof message !== 'object') {
         return { toolCallsAdded: 0 };
     }
-    const fragments = collectReasoningFragments(message);
-    if (!fragments.length) {
-        const existing = typeof message.reasoning_content === 'string'
-            ? message.reasoning_content.trim()
-            : '';
-        if (!existing && Object.prototype.hasOwnProperty.call(message, 'reasoning_content')) {
-            delete message.reasoning_content;
-        }
-        return { toolCallsAdded: 0 };
-    }
-    const combined = fragments.join('\n').trim();
-    if (!combined.length) {
-        writeReasoningContent(message, '');
-        return { toolCallsAdded: 0 };
-    }
-    const sanitized = stripReasoningTags(combined);
-    if (!sanitized.length) {
-        writeReasoningContent(message, '');
-        return { toolCallsAdded: 0 };
-    }
-    const idPrefix = options?.idPrefix ?? 'reasoning';
-    const { cleanedText, toolCalls } = extractToolCallsFromReasoningText(sanitized, { idPrefix });
-    const trimmed = (cleanedText || '').trim();
-    writeReasoningContent(message, trimmed);
-    // Chat 统一行为：如果 message 本身没有正文内容，但存在非空 reasoning_content，
-    // 则将思考内容提升到正文，前后包裹 [思考] 标记，避免客户端只看到"空回答"。
-    const rawContent = message.content;
-    if ((typeof rawContent !== 'string' || rawContent.trim().length === 0) &&
-        trimmed.length > 0) {
-        // 检查是否已经包含 [思考] 标签，避免重复嵌套
-        const hasThinkingTags = trimmed.includes('[思考]') && trimmed.includes('[/思考]');
-        message.content = hasThinkingTags ? trimmed : `[思考]\n${trimmed}\n[/思考]`;
-    }
-    if (!Array.isArray(toolCalls) || toolCalls.length === 0) {
-        return { toolCallsAdded: 0, cleanedReasoning: trimmed };
-    }
-    const current = Array.isArray(message.tool_calls)
-        ? message.tool_calls
-        : undefined;
-    const merged = mergeToolCalls(current, toolCalls);
-    message.tool_calls = merged;
+    const normalized = normalizeMessageReasoningToolsWithNative(message, typeof options?.idPrefix === 'string' ? options.idPrefix : undefined);
+    overwriteRecordInPlace(message, normalized.message);
     return {
-        toolCallsAdded: merged.length - (current?.length ?? 0),
-        cleanedReasoning: trimmed
+        toolCallsAdded: normalized.toolCallsAdded,
+        ...(typeof normalized.cleanedReasoning === 'string'
+            ? { cleanedReasoning: normalized.cleanedReasoning }
+            : {})
     };
 }
 export function normalizeChatResponseReasoningTools(response, options) {
     if (!response || typeof response !== 'object') {
         return;
     }
-    const choices = Array.isArray(response.choices)
-        ? response.choices
-        : [];
-    for (let i = 0; i < choices.length; i++) {
-        const choice = choices[i];
-        if (!choice || typeof choice !== 'object') {
-            continue;
-        }
-        const message = choice.message;
-        if (!message || typeof message !== 'object') {
-            continue;
-        }
-        normalizeMessageReasoningTools(message, {
-            idPrefix: `${options?.idPrefixBase ?? 'reasoning_choice'}_${i + 1}`
-        });
-    }
+    const normalized = normalizeChatResponseReasoningToolsWithNative(response, typeof options?.idPrefixBase === 'string' ? options.idPrefixBase : undefined);
+    overwriteRecordInPlace(response, normalized);
 }