@jsonstudio/llms 0.6.1892 → 0.6.2172

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

@@ -1,1386 +1,2 @@
-// Normalize textual markup into OpenAI tool_calls shape.
-// Gated by RCC_TEXT_MARKUP_COMPAT=1 to avoid overreach.
-import { isImagePath } from './media.js';
-import { isStructuredApplyPatchPayload } from '../../tools/apply-patch-structured.js';
-// Strict allowlist for tool names and their argument keys to avoid picking up
-// stray markup or free-form text as JSON keys (reduces false positives).
-const KNOWN_TOOLS = new Set([
-    'shell',
-    'exec_command',
-    'write_stdin',
-    'apply_patch',
-    'update_plan',
-    'view_image',
-    'list_mcp_resources',
-    'read_mcp_resource',
-    'list_mcp_resource_templates',
-    // 文件/目录类工具（CLI 侧已有约定；此处只做文本→tool_calls 收割）
-    'list_directory'
-]);
-const ALLOWED_KEYS = {
-    shell: new Set(['command', 'justification', 'timeout_ms', 'with_escalated_permissions', 'workdir']),
-    exec_command: new Set([
-        'cmd',
-        'command',
-        'workdir',
-        'justification',
-        'login',
-        'tty',
-        'shell',
-        'yield_time_ms',
-        'max_output_tokens',
-        'sandbox_permissions',
-        'timeout_ms'
-    ]),
-    write_stdin: new Set(['session_id', 'chars', 'text', 'yield_time_ms', 'max_output_tokens']),
-    // apply_patch supports both freeform patch text (patch/input/instructions/text) and structured payloads (file/changes)
-    apply_patch: new Set(['patch', 'input', 'instructions', 'text', 'file', 'changes']),
-    update_plan: new Set(['explanation', 'plan']),
-    view_image: new Set(['path']),
-    list_mcp_resources: new Set(['server', 'cursor', 'filter', 'root']),
-    read_mcp_resource: new Set(['server', 'uri', 'cursor']),
-    list_mcp_resource_templates: new Set(['server', 'cursor']),
-    list_directory: new Set(['path', 'recursive'])
-};
-function normalizeKey(raw) {
-    try {
-        const t = String(raw || '').trim();
-        if (!t)
-            return '';
-        // Pick the last alphanumeric/underscore token (e.g., '空的\n<tool_call>command' -> 'command')
-        const m = t.match(/([A-Za-z_][A-Za-z0-9_]*)$/);
-        return m ? m[1] : t;
-    }
-    catch {
-        return String(raw || '');
-    }
-}
-function readDefaultWorkdirFromEnv() {
-    try {
-        const env = String(process?.env?.ROUTECODEX_WORKDIR || '').trim() ||
-            String(process?.env?.RCC_WORKDIR || '').trim() ||
-            String(process?.env?.CLAUDE_WORKDIR || '').trim();
-        return env ? env : undefined;
-    }
-    catch {
-        return undefined;
-    }
-}
-function filterArgsForTool(name, args) {
-    try {
-        const nm = String(name || '').toLowerCase();
-        const allow = ALLOWED_KEYS[nm];
-        if (!allow) {
-            // Unknown tool; be conservative: keep only simple safe keys if present
-            const safe = new Set([
-                'cmd',
-                'command',
-                'workdir',
-                'patch',
-                'input',
-                'instructions',
-                'text',
-                'plan',
-                'explanation',
-                'path',
-                'server',
-                'uri',
-                'cursor',
-                'filter',
-                'root'
-            ]);
-            const out = {};
-            for (const [k, v] of Object.entries(args || {})) {
-                const key = normalizeKey(k);
-                if (safe.has(key))
-                    out[key] = v;
-            }
-            return out;
-        }
-        const out = {};
-        for (const [k, v] of Object.entries(args || {})) {
-            const key = normalizeKey(k);
-            if (allow.has(key))
-                out[key] = v;
-        }
-        return out;
-    }
-    catch {
-        return args;
-    }
-}
-function enabled() {
-    try {
-        return String(process?.env?.RCC_TEXT_MARKUP_COMPAT ?? '1').trim() !== '0';
-    }
-    catch {
-        return true;
-    }
-}
-function escapeControlCharsInsideJsonStrings(raw) {
-    try {
-        if (typeof raw !== 'string' || !raw)
-            return null;
-        let out = '';
-        let changed = false;
-        let inString = false;
-        let escaped = false;
-        for (let i = 0; i < raw.length; i++) {
-            const ch = raw[i];
-            if (inString) {
-                if (!escaped && ch === '"') {
-                    inString = false;
-                    out += ch;
-                    continue;
-                }
-                if (!escaped && ch === '\\') {
-                    escaped = true;
-                    out += ch;
-                    continue;
-                }
-                // JSON disallows unescaped control chars inside strings; models sometimes emit raw newlines/tabs.
-                if (!escaped) {
-                    if (ch === '\n') {
-                        out += '\\n';
-                        changed = true;
-                        continue;
-                    }
-                    if (ch === '\r') {
-                        if (raw[i + 1] === '\n') {
-                            i++;
-                        }
-                        out += '\\n';
-                        changed = true;
-                        continue;
-                    }
-                    if (ch === '\t') {
-                        out += '\\t';
-                        changed = true;
-                        continue;
-                    }
-                    const code = ch.charCodeAt(0);
-                    if (code >= 0 && code < 0x20) {
-                        out += `\\u${code.toString(16).padStart(4, '0')}`;
-                        changed = true;
-                        continue;
-                    }
-                }
-                // fallthrough: normal character inside string
-                out += ch;
-                escaped = false;
-                continue;
-            }
-            if (ch === '"') {
-                inString = true;
-                out += ch;
-                continue;
-            }
-            out += ch;
-        }
-        return changed ? out : null;
-    }
-    catch {
-        return null;
-    }
-}
-function tryParseJsonWithModelRepairs(raw) {
-    try {
-        if (typeof raw !== 'string')
-            return null;
-        const text = raw.trim();
-        if (!text)
-            return null;
-        try {
-            return JSON.parse(text);
-        }
-        catch {
-            const repaired = escapeControlCharsInsideJsonStrings(text);
-            if (!repaired)
-                return null;
-            try {
-                return JSON.parse(repaired);
-            }
-            catch {
-                return null;
-            }
-        }
-    }
-    catch {
-        return null;
-    }
-}
-function salvageToolArgsFromRawText(toolName, rawArgs) {
-    try {
-        const lname = String(toolName || '').toLowerCase();
-        const text = String(rawArgs || '');
-        const out = {};
-        const pickString = (re) => {
-            const m = text.match(re);
-            if (!m)
-                return undefined;
-            return String(m[1] ?? '');
-        };
-        const pickNumber = (re) => {
-            const m = text.match(re);
-            if (!m)
-                return undefined;
-            const n = Number.parseInt(String(m[1] ?? ''), 10);
-            return Number.isFinite(n) ? n : undefined;
-        };
-        if (lname === 'exec_command') {
-            const cmd = pickString(/"(?:cmd|command)"\s*:\s*"([\s\S]*?)"\s*(?:,|})/i);
-            const workdir = pickString(/"(?:workdir|cwd)"\s*:\s*"([\s\S]*?)"\s*(?:,|})/i);
-            const timeout = pickNumber(/"(?:timeout_ms|timeout)"\s*:\s*(\d+)\s*(?:,|})/i);
-            if (cmd !== undefined)
-                out.cmd = cmd;
-            if (cmd !== undefined)
-                out.command = cmd;
-            if (workdir !== undefined)
-                out.workdir = workdir;
-            if (timeout !== undefined)
-                out.timeout_ms = timeout;
-            return Object.keys(out).length ? out : null;
-        }
-        if (lname === 'write_stdin') {
-            const sessionId = pickNumber(/"(?:session_id|sessionId)"\s*:\s*(\d+)\s*(?:,|})/i);
-            const chars = pickString(/"(?:chars|text|input|data)"\s*:\s*"([\s\S]*?)"\s*(?:,|})/i);
-            if (sessionId !== undefined)
-                out.session_id = sessionId;
-            if (chars !== undefined)
-                out.chars = chars;
-            return Object.keys(out).length ? out : null;
-        }
-        if (lname === 'apply_patch') {
-            const patch = pickString(/"(?:patch|text|input|instructions)"\s*:\s*"([\s\S]*?)"\s*(?:,|})/i);
-            if (patch !== undefined)
-                out.patch = patch;
-            return Object.keys(out).length ? out : null;
-        }
-        return null;
-    }
-    catch {
-        return null;
-    }
-}
-// 已移除所有 rcc.tool.v1 相关处理：不再识别或剥离 rcc 封装
-// Extract <tool:NAME>...</tool:NAME> blocks used by some tool-mode outputs.
-// Example:
-//   <tool:exec_command>
-//     <command>cd /repo && npm test</command>
-//     <timeout_ms>120000</timeout_ms>
-//     <requires_approval>false</requires_approval>
-//   </tool:exec_command>
-export function extractToolNamespaceXmlBlocksFromText(text) {
-    try {
-        if (typeof text !== 'string' || !text)
-            return null;
-        const hasOpenTag = text.includes('<tool:');
-        const hasCloseTag = /<\/\s*tool:\s*[A-Za-z0-9_]+\s*>/i.test(text);
-        const hasToolPrefix = /(?:^|\n)\s*(?:[•*+-]\s*)?tool:[A-Za-z0-9_]+/i.test(text);
-        if (!hasOpenTag && !(hasCloseTag && hasToolPrefix)) {
-            return null;
-        }
-        const out = [];
-        const blockRe = /<\s*tool:([A-Za-z0-9_]+)\s*>([\s\S]*?)<\/\s*tool:\s*\1\s*>/gi;
-        let bm;
-        while ((bm = blockRe.exec(text)) !== null) {
-            const rawName = String(bm[1] || '').trim();
-            const lname = rawName.toLowerCase();
-            if (!lname || !KNOWN_TOOLS.has(lname))
-                continue;
-            const inner = String(bm[2] || '');
-            const argsObj = {};
-            const kvRe = /<\s*([A-Za-z_][A-Za-z0-9_]*)\s*>([\s\S]*?)<\/\s*\1\s*>/g;
-            let km;
-            while ((km = kvRe.exec(inner)) !== null) {
-                const rawKey = String(km[1] || '').trim();
-                const key = normalizeKey(rawKey).toLowerCase();
-                if (!key)
-                    continue;
-                if (key === 'requires_approval')
-                    continue;
-                const rawVal = String(km[2] ?? '');
-                const value = tryParsePrimitiveValue(rawVal);
-                if (lname === 'exec_command' && (key === 'command' || key === 'cmd')) {
-                    const cmd = coerceCommandValueToString(value);
-                    if (cmd.trim().length) {
-                        argsObj.cmd = cmd;
-                        argsObj.command = cmd;
-                    }
-                    continue;
-                }
-                if (lname === 'exec_command' && (key === 'cwd' || key === 'workdir')) {
-                    const wd = String(value ?? rawVal).trim();
-                    if (wd)
-                        argsObj.workdir = wd;
-                    continue;
-                }
-                if (lname === 'write_stdin') {
-                    if (key === 'input' || key === 'data' || key === 'chars' || key === 'text') {
-                        argsObj.chars = rawVal;
-                        continue;
-                    }
-                    if (key === 'session_id') {
-                        const n = Number.parseInt(String(value), 10);
-                        argsObj.session_id = Number.isFinite(n) ? n : value;
-                        continue;
-                    }
-                }
-                if (lname === 'apply_patch' && (key === 'patch' || key === 'input' || key === 'text' || key === 'instructions')) {
-                    const patchText = typeof value === 'string' ? value : rawVal;
-                    if (typeof patchText === 'string' && patchText.trim().length) {
-                        argsObj.patch = patchText;
-                    }
-                    continue;
-                }
-                argsObj[key] = value;
-            }
-            const filtered = filterArgsForTool(lname, argsObj);
-            if (lname === 'exec_command') {
-                const cmd = typeof filtered?.cmd === 'string' ? String(filtered.cmd).trim() : '';
-                if (!cmd)
-                    continue;
-            }
-            if (lname === 'write_stdin') {
-                const sid = filtered?.session_id;
-                if (sid === undefined || sid === null || String(sid).trim().length === 0)
-                    continue;
-            }
-            if (lname === 'apply_patch') {
-                const patchText = typeof filtered?.patch === 'string' ? String(filtered.patch).trim() : '';
-                if (!patchText)
-                    continue;
-            }
-            let argsStr = '{}';
-            try {
-                argsStr = JSON.stringify(filtered);
-            }
-            catch {
-                argsStr = '{}';
-            }
-            out.push({ id: `call_${Math.random().toString(36).slice(2, 10)}`, name: lname, args: argsStr });
-        }
-        // Broken variant (seen in the wild):
-        //   tool:exec_command (tool:exec_command)
-        //     <command>...</command>
-        //   </tool:exec_command>
-        //
-        // Best-effort: treat it as an implicit <tool:NAME> open tag.
-        const prefixBlockRe = /(?:^|\n)\s*(?:[•*+-]\s*)?tool:([A-Za-z0-9_]+)[^\n]*\n([\s\S]*?)<\/\s*tool:\s*\1\s*>/gi;
-        let pm;
-        while ((pm = prefixBlockRe.exec(text)) !== null) {
-            const rawName = String(pm[1] || '').trim();
-            const lname = rawName.toLowerCase();
-            if (!lname || !KNOWN_TOOLS.has(lname))
-                continue;
-            const inner = String(pm[2] || '');
-            const argsObj = {};
-            const kvRe = /<\s*([A-Za-z_][A-Za-z0-9_]*)\s*>([\s\S]*?)<\/\s*\1\s*>/g;
-            let km;
-            while ((km = kvRe.exec(inner)) !== null) {
-                const rawKey = String(km[1] || '').trim();
-                const key = normalizeKey(rawKey).toLowerCase();
-                if (!key)
-                    continue;
-                if (key === 'requires_approval')
-                    continue;
-                const rawVal = String(km[2] ?? '');
-                const value = tryParsePrimitiveValue(rawVal);
-                if (lname === 'exec_command' && (key === 'command' || key === 'cmd')) {
-                    const cmd = coerceCommandValueToString(value);
-                    if (cmd.trim().length) {
-                        argsObj.cmd = cmd;
-                        argsObj.command = cmd;
-                    }
-                    continue;
-                }
-                if (lname === 'exec_command' && (key === 'cwd' || key === 'workdir')) {
-                    const wd = String(value ?? rawVal).trim();
-                    if (wd)
-                        argsObj.workdir = wd;
-                    continue;
-                }
-                if (lname === 'write_stdin') {
-                    if (key === 'input' || key === 'data' || key === 'chars' || key === 'text') {
-                        argsObj.chars = rawVal;
-                        continue;
-                    }
-                    if (key === 'session_id') {
-                        const n = Number.parseInt(String(value), 10);
-                        argsObj.session_id = Number.isFinite(n) ? n : value;
-                        continue;
-                    }
-                }
-                if (lname === 'apply_patch' && (key === 'patch' || key === 'input' || key === 'text' || key === 'instructions')) {
-                    const patchText = typeof value === 'string' ? value : rawVal;
-                    if (typeof patchText === 'string' && patchText.trim().length) {
-                        argsObj.patch = patchText;
-                    }
-                    continue;
-                }
-                argsObj[key] = value;
-            }
-            const filtered = filterArgsForTool(lname, argsObj);
-            if (lname === 'exec_command') {
-                const cmd = typeof filtered?.cmd === 'string' ? String(filtered.cmd).trim() : '';
-                if (!cmd)
-                    continue;
-            }
-            if (lname === 'write_stdin') {
-                const sid = filtered?.session_id;
-                if (sid === undefined || sid === null || String(sid).trim().length === 0)
-                    continue;
-            }
-            if (lname === 'apply_patch') {
-                const patchText = typeof filtered?.patch === 'string' ? String(filtered.patch).trim() : '';
-                if (!patchText)
-                    continue;
-            }
-            let argsStr = '{}';
-            try {
-                argsStr = JSON.stringify(filtered);
-            }
-            catch {
-                argsStr = '{}';
-            }
-            out.push({ id: `call_${Math.random().toString(36).slice(2, 10)}`, name: lname, args: argsStr });
-        }
-        return out.length ? out : null;
-    }
-    catch {
-        return null;
-    }
-}
-function extractStructuredApplyPatchPayloads(text) {
-    const payloads = [];
-    try {
-        const fenceRe = /```(?:json|apply_patch|toon)?\s*([\s\S]*?)\s*```/gi;
-        let fm;
-        while ((fm = fenceRe.exec(text)) !== null) {
-            const body = fm[1] || '';
-            try {
-                const parsed = JSON.parse(body);
-                if (isStructuredApplyPatchPayload(parsed)) {
-                    payloads.push(parsed);
-                }
-            }
-            catch { /* ignore invalid JSON */ }
-        }
-        if (!payloads.length && typeof text === 'string' && text.includes('"changes"')) {
-            try {
-                const parsed = JSON.parse(text);
-                if (isStructuredApplyPatchPayload(parsed)) {
-                    payloads.push(parsed);
-                }
-            }
-            catch { /* ignore */ }
-        }
-    }
-    catch { /* ignore */ }
-    return payloads;
-}
-function tryParseJsonValue(text) {
-    try {
-        const trimmed = String(text || '').trim();
-        if (!trimmed)
-            return null;
-        if (!(trimmed.startsWith('{') || trimmed.startsWith('[') || trimmed.startsWith('"'))) {
-            return null;
-        }
-        return JSON.parse(trimmed);
-    }
-    catch {
-        return null;
-    }
-}
-function tryParsePrimitiveValue(text) {
-    try {
-        const trimmed = String(text ?? '').trim();
-        if (trimmed.length === 0)
-            return '';
-        const parsed = tryParseJsonValue(trimmed);
-        if (parsed !== null)
-            return parsed;
-        if (trimmed === 'true' || trimmed === 'false')
-            return trimmed === 'true';
-        if (/^-?\d+(?:\.\d+)?$/.test(trimmed)) {
-            const n = Number(trimmed);
-            if (Number.isFinite(n))
-                return n;
-        }
-        return trimmed;
-    }
-    catch {
-        return String(text ?? '');
-    }
-}
-function coerceCommandValueToString(value) {
-    try {
-        if (value === null || value === undefined)
-            return '';
-        if (typeof value === 'string')
-            return value.trim();
-        if (Array.isArray(value)) {
-            return value.map((v) => String(v)).join(' ').trim();
-        }
-        if (typeof value === 'object') {
-            const rec = value;
-            const direct = typeof rec.cmd === 'string'
-                ? String(rec.cmd)
-                : typeof rec.command === 'string'
-                    ? String(rec.command)
-                    : '';
-            if (direct.trim().length)
-                return direct.trim();
-            try {
-                return JSON.stringify(value);
-            }
-            catch {
-                return String(value);
-            }
-        }
-        return String(value).trim();
-    }
-    catch {
-        return '';
-    }
-}
-function looksLikeBrokenToolMarkup(text) {
-    try {
-        const t = String(text || '');
-        if (!t)
-            return false;
-        return (t.includes('<exec_command') ||
-            t.includes('<invoke') ||
-            t.includes('<function_calls') ||
-            t.includes('<parameter') ||
-            t.includes('<tool_call') ||
-            t.includes('</tool_call') ||
-            t.includes('<arg_value') ||
-            t.includes('</arg_value') ||
-            t.includes('</func_call') ||
-            /\bRan\b\s+\[/.test(t));
-    }
-    catch {
-        return false;
-    }
-}
-function stripTrailingXmlGarbage(line) {
-    try {
-        const idx = line.indexOf('<');
-        if (idx >= 0) {
-            return line.slice(0, idx).trim();
-        }
-        return line.trim();
-    }
-    catch {
-        return String(line || '').trim();
-    }
-}
-function normalizePossibleCommandLine(raw) {
-    try {
-        let line = String(raw || '');
-        line = line.replace(/^\s*(?:[•*+-]\s*)?/, '');
-        line = line.replace(/^\s*\$\s*/, '');
-        return stripTrailingXmlGarbage(line);
-    }
-    catch {
-        return '';
-    }
-}
-function looksLikeShellCommand(line) {
-    try {
-        const t = String(line || '').trim();
-        if (!t)
-            return false;
-        if (t.startsWith('```') || t.startsWith('>'))
-            return false;
-        if (t.startsWith('zsh:') || t.startsWith('bash:'))
-            return false;
-        // Conservative allowlist: commands commonly emitted by Codex/Claude in tool-mode.
-        return /^(?:rg|ls|cat|node|npm|pnpm|yarn|git|find|sed|head|tail|wc|mkdir|rm|cp|mv|pwd)\b/.test(t);
-    }
-    catch {
-        return false;
-    }
-}
-// Extract Anthropic/GLM-style XML tool tags that use <parameter name="...">...</parameter>, e.g.:
-//   <exec_command>
-//     <parameter name="command">["cd","/repo","&&","npm","run","build"]</parameter>
-//     <parameter name="workdir">/repo</parameter>
-//   </exec_command>
-export function extractParameterXmlToolsFromText(text) {
-    try {
-        if (typeof text !== 'string' || !text)
-            return null;
-        const out = [];
-        // Some providers/models emit mismatched closing tags like </func_call>; accept a small set of known variants.
-        const toolRe = /<\s*(exec_command)\s*>([\s\S]*?)<\/\s*(?:\1|func_call|tool_call)\s*>/gi;
-        let tm;
-        while ((tm = toolRe.exec(text)) !== null) {
-            const rawName = (tm[1] || '').trim();
-            const inner = (tm[2] || '').trim();
-            if (!rawName || !inner)
-                continue;
-            const lname = rawName.toLowerCase();
-            const argsObj = {};
-            const paramRe = /<\s*parameter\s+name\s*=\s*"([^"]+)"\s*>([\s\S]*?)<\/\s*parameter\s*>/gi;
-            let pm;
-            while ((pm = paramRe.exec(inner)) !== null) {
-                const rawKey = (pm[1] || '').trim();
-                const key = normalizeKey(rawKey);
-                if (!key)
-                    continue;
-                const rawVal = (pm[2] || '').trim();
-                if (!rawVal)
-                    continue;
-                const parsed = tryParseJsonValue(rawVal);
-                if (key.toLowerCase() === 'command' || key.toLowerCase() === 'cmd') {
-                    const cmd = coerceCommandValueToString(parsed ?? rawVal);
-                    if (cmd.trim().length) {
-                        argsObj.cmd = cmd;
-                        argsObj.command = cmd;
-                    }
-                    continue;
-                }
-                if (key.toLowerCase() === 'workdir') {
-                    argsObj.workdir = rawVal;
-                    continue;
-                }
-                argsObj[key] = parsed ?? rawVal;
-            }
-            const filtered = filterArgsForTool(lname, argsObj);
-            if (!filtered || typeof filtered !== 'object' || Array.isArray(filtered))
-                continue;
-            const cmd = typeof filtered.cmd === 'string' ? String(filtered.cmd).trim() : '';
-            if (!cmd)
-                continue;
-            // If caller didn't provide workdir, fallback to a conservative env-derived workdir.
-            try {
-                if (!filtered.workdir) {
-                    const envWorkdir = readDefaultWorkdirFromEnv();
-                    if (envWorkdir)
-                        filtered.workdir = envWorkdir;
-                }
-            }
-            catch {
-                /* ignore */
-            }
-            let argsStr = '{}';
-            try {
-                argsStr = JSON.stringify(filtered);
-            }
-            catch {
-                argsStr = '{}';
-            }
-            out.push({
-                id: `call_${Math.random().toString(36).slice(2, 10)}`,
-                name: lname,
-                args: argsStr
-            });
-        }
-        return out.length ? out : null;
-    }
-    catch {
-        return null;
-    }
-}
-function applyInvokeParameterAliases(toolName, argsObj) {
-    try {
-        const lname = String(toolName || '').toLowerCase();
-        if (lname === 'write_stdin') {
-            // Some models emit `data` / `wait` instead of our canonical `chars` / `yield_time_ms`.
-            if (Object.prototype.hasOwnProperty.call(argsObj, 'data')) {
-                const data = argsObj.data;
-                if (!Object.prototype.hasOwnProperty.call(argsObj, 'chars') && !Object.prototype.hasOwnProperty.call(argsObj, 'text')) {
-                    argsObj.chars = data == null ? '' : String(data);
-                }
-                delete argsObj.data;
-            }
-            if (Object.prototype.hasOwnProperty.call(argsObj, 'wait') && !Object.prototype.hasOwnProperty.call(argsObj, 'yield_time_ms')) {
-                const wait = argsObj.wait;
-                let ms;
-                if (typeof wait === 'number' && Number.isFinite(wait)) {
-                    // Heuristic: small values are usually seconds; large values are likely already ms.
-                    ms = wait <= 1000 ? Math.round(wait * 1000) : Math.round(wait);
-                }
-                else if (typeof wait === 'string' && wait.trim().length) {
-                    const num = Number(wait.trim());
-                    if (Number.isFinite(num)) {
-                        ms = num <= 1000 ? Math.round(num * 1000) : Math.round(num);
-                    }
-                }
-                if (typeof ms === 'number' && Number.isFinite(ms) && ms >= 0) {
-                    argsObj.yield_time_ms = ms;
-                }
-                delete argsObj.wait;
-            }
-        }
-    }
-    catch {
-        // ignore
-    }
-}
-// Extract <function_calls><invoke name="..."><parameter name="...">...</parameter>...</invoke> blocks.
-// Example seen in Gemini CLI / antigravity compact output:
-//   <function_calls>
-//     <invoke name="write_stdin">
-//       <parameter name="session_id">91806</parameter>
-//       <parameter name="data"></parameter>
-//       <parameter name="wait">10</parameter>
-//     </invoke>
-//   </function_calls>
-export function extractInvokeToolsFromText(text) {
-    try {
-        if (typeof text !== 'string' || !text)
-            return null;
-        const out = [];
-        const invokeRe = /<\s*invoke\s+name\s*=\s*"([^">]+)"\s*>([\s\S]*?)<\/\s*invoke\s*>/gi;
-        let im;
-        while ((im = invokeRe.exec(text)) !== null) {
-            const rawName = (im[1] || '').trim();
-            const inner = (im[2] || '').trim();
-            if (!rawName || !inner)
-                continue;
-            const lname = rawName.toLowerCase();
-            const argsObj = {};
-            const paramRe = /<\s*parameter\s+name\s*=\s*"([^">]+)"\s*>([\s\S]*?)<\/\s*parameter\s*>/gi;
-            let pm;
-            while ((pm = paramRe.exec(inner)) !== null) {
-                const rawKey = (pm[1] || '').trim();
-                const key = normalizeKey(rawKey);
-                if (!key)
-                    continue;
-                const rawVal = (pm[2] ?? '').toString();
-                const value = tryParsePrimitiveValue(rawVal);
-                if (lname === 'exec_command' && (key.toLowerCase() === 'command' || key.toLowerCase() === 'cmd')) {
-                    const cmd = coerceCommandValueToString(value);
-                    if (cmd.trim().length) {
-                        argsObj.cmd = cmd;
-                        argsObj.command = cmd;
-                    }
-                    continue;
-                }
-                argsObj[key] = value;
-            }
-            applyInvokeParameterAliases(lname, argsObj);
-            const filtered = filterArgsForTool(lname, argsObj);
-            let argsStr = '{}';
-            try {
-                argsStr = JSON.stringify(filtered);
-            }
-            catch {
-                argsStr = '{}';
-            }
-            out.push({ id: `call_${Math.random().toString(36).slice(2, 10)}`, name: lname, args: argsStr });
-        }
-        // Some Gemini CLI / antigravity variants emit a looser XML shape:
-        // <function_calls>
-        //   <invoke>
-        //     <tool_name>exec_command</tool_name>
-        //     <parameters>
-        //       <command>echo hi</command>
-        //     </parameters>
-        //   </invoke>
-        // </function_calls>
-        //
-        // Best-effort: only accept known tools, and only read simple <parameters><k>v</k></parameters>.
-        if (out.length === 0) {
-            const invokeBareRe = /<\s*invoke\s*>([\s\S]*?)<\/\s*invoke\s*>/gi;
-            let bm;
-            while ((bm = invokeBareRe.exec(text)) !== null) {
-                const inner = (bm[1] || '').trim();
-                if (!inner)
-                    continue;
-                const toolNameMatch = /<\s*(?:tool_name|toolname|tool)\s*>\s*([\s\S]*?)\s*<\/\s*(?:tool_name|toolname|tool)\s*>/i.exec(inner);
-                const rawName = (toolNameMatch?.[1] || '').trim();
-                if (!rawName)
-                    continue;
-                const lname = rawName.toLowerCase();
-                if (!KNOWN_TOOLS.has(lname))
-                    continue;
-                const argsObj = {};
-                const paramsMatch = /<\s*parameters\s*>([\s\S]*?)<\/\s*parameters\s*>/i.exec(inner);
-                if (paramsMatch && paramsMatch[1]) {
-                    const paramsInner = String(paramsMatch[1] || '');
-                    const kvRe = /<\s*([A-Za-z_][A-Za-z0-9_]*)\s*>([\s\S]*?)<\/\s*\1\s*>/g;
-                    let km;
-                    while ((km = kvRe.exec(paramsInner)) !== null) {
-                        const rawKey = (km[1] || '').trim();
-                        const key = normalizeKey(rawKey);
-                        if (!key)
-                            continue;
-                        const rawVal = (km[2] ?? '').toString();
-                        const value = tryParsePrimitiveValue(rawVal);
-                        if (lname === 'exec_command' && (key.toLowerCase() === 'command' || key.toLowerCase() === 'cmd')) {
-                            const cmd = coerceCommandValueToString(value);
-                            if (cmd.trim().length) {
-                                argsObj.cmd = cmd;
-                                argsObj.command = cmd;
-                            }
-                            continue;
-                        }
-                        argsObj[key] = value;
-                    }
-                }
-                applyInvokeParameterAliases(lname, argsObj);
-                const filtered = filterArgsForTool(lname, argsObj);
-                let argsStr = '{}';
-                try {
-                    argsStr = JSON.stringify(filtered);
-                }
-                catch {
-                    argsStr = '{}';
-                }
-                out.push({ id: `call_${Math.random().toString(36).slice(2, 10)}`, name: lname, args: argsStr });
-            }
-        }
-        return out.length ? out : null;
-    }
-    catch {
-        return null;
-    }
-}
-function tryParseJsonArrayOnLine(line) {
-    try {
-        const trimmed = String(line || '').trim();
-        if (!trimmed.startsWith('[') || !trimmed.endsWith(']'))
-            return null;
-        const parsed = JSON.parse(trimmed);
-        if (!Array.isArray(parsed))
-            return null;
-        const out = [];
-        for (const entry of parsed) {
-            if (entry == null)
-                continue;
-            out.push(String(entry));
-        }
-        return out.length ? out : null;
-    }
-    catch {
-        return null;
-    }
-}
-export function extractBareExecCommandFromText(text) {
-    try {
-        if (typeof text !== 'string' || !text)
-            return null;
-        // Only attempt this when we see clear evidence of a broken tool markup (avoid turning examples into tool calls).
-        if (!looksLikeBrokenToolMarkup(text))
-            return null;
-        const candidates = [];
-        const lines = text.split(/\r?\n/);
-        for (let i = 0; i < lines.length; i += 1) {
-            const raw = String(lines[i] || '');
-            const line = normalizePossibleCommandLine(raw);
-            if (!line)
-                continue;
-            // Pattern A: "Ran [\"ls\", \"-l\", ...]"
-            const ran = line.match(/\bRan\b\s+(\[[\s\S]*\])\s*$/i);
-            if (ran && ran[1]) {
-                const arr = tryParseJsonArrayOnLine(ran[1]);
-                if (arr) {
-                    candidates.push({ cmd: arr.join(' ').trim() });
-                    continue;
-                }
-            }
-            // Pattern B: a single-line shell command (rg/ls/node/...)
-            if (looksLikeShellCommand(line)) {
-                candidates.push({ cmd: line.trim() });
-                continue;
-            }
-        }
-        if (!candidates.length)
-            return null;
-        const picked = candidates[candidates.length - 1];
-        const argsObj = { cmd: picked.cmd };
-        const envWorkdir = readDefaultWorkdirFromEnv();
-        if (envWorkdir) {
-            argsObj.workdir = envWorkdir;
-        }
-        const filtered = filterArgsForTool('exec_command', argsObj);
-        let argsStr = '{}';
-        try {
-            argsStr = JSON.stringify(filtered);
-        }
-        catch {
-            argsStr = '{}';
-        }
-        return [
-            {
-                id: `call_${Math.random().toString(36).slice(2, 10)}`,
-                name: 'exec_command',
-                args: argsStr
-            }
-        ];
-    }
-    catch {
-        return null;
-    }
-}
-export function extractApplyPatchCallsFromText(text) {
-    try {
-        if (typeof text !== 'string' || !text)
-            return null;
-        const payloads = extractStructuredApplyPatchPayloads(text);
-        if (!payloads.length)
-            return null;
-        const out = [];
-        const genId = () => `call_${Math.random().toString(36).slice(2, 10)}`;
-        for (const payload of payloads) {
-            let argsStr = '{}';
-            try {
-                argsStr = JSON.stringify(payload);
-            }
-            catch {
-                argsStr = '{"changes":[]}';
-            }
-            out.push({ id: genId(), name: 'apply_patch', args: argsStr });
-        }
-        return out;
-    }
-    catch {
-        return null;
-    }
-}
-export function extractExecuteBlocksFromText(text) {
-    try {
-        if (typeof text !== 'string' || !text)
-            return null;
-        const re = /<function=execute>\s*<parameter=command>([\s\S]*?)<\/parameter>\s*<\/function>/gi;
-        const out = [];
-        let m;
-        while ((m = re.exec(text)) !== null) {
-            const commandRaw = (m[1] || '').trim();
-            if (!commandRaw)
-                continue;
-            let args = '{}';
-            try {
-                args = JSON.stringify({ command: commandRaw });
-            }
-            catch {
-                args = '{"command":""}';
-            }
-            out.push({ id: `call_${Math.random().toString(36).slice(2, 10)}`, name: 'shell', args });
-        }
-        return out.length ? out : null;
-    }
-    catch {
-        return null;
-    }
-}
-// Extract XML-like <tool_call> blocks used by some agents:
-// Example:
-//   <tool_call>
-//     shell
-//     <arg_key>command</arg_key>
-//     <arg_value>["cat","codex-protocol/README.md"]</arg_value>
-//   </tool_call>
-export function extractXMLToolCallsFromText(text) {
-    try {
-        if (typeof text !== 'string' || !text)
-            return null;
-        const out = [];
-        const blockRe = /<tool_call[\s\S]*?>([\s\S]*?)<\/tool_call>/gi;
-        let bm;
-        while ((bm = blockRe.exec(text)) !== null) {
-            const inner = (bm[1] || '').trim();
-            if (!inner)
-                continue;
-            // 1) try function/name tags
-            let name = '';
-            const fnTag = inner.match(/<\s*(?:function|name)\s*>\s*([a-zA-Z0-9_.-]+)\s*<\/(?:function|name)\s*>/i);
-            if (fnTag && fnTag[1]) {
-                name = String(fnTag[1]).trim();
-            }
-            else {
-                // 2) else pick the first non-empty line without tags as the name
-                const lines = inner.split(/\r?\n/).map(s => s.trim()).filter(Boolean);
-                const candidate = lines.find(l => !l.startsWith('<') && /^[a-zA-Z0-9_.-]+$/.test(l));
-                if (candidate)
-                    name = candidate;
-            }
-            if (!name)
-                continue;
-            // Guard unknown tool names early if clearly invalid
-            const lname = String(name).toLowerCase();
-            if (!KNOWN_TOOLS.has(lname)) {
-                // still allow through, but later key filtering will drastically reduce noise
-            }
-            // Collect arg_key/arg_value pairs
-            const argRe = /<\s*arg_key\s*>\s*([^<]+?)\s*<\/(?:arg_key)\s*>\s*<\s*arg_value\s*>\s*([\s\S]*?)\s*<\/(?:arg_value)\s*>/gi;
-            let am;
-            const argsObj = {};
-            while ((am = argRe.exec(inner)) !== null) {
-                const k = normalizeKey((am[1] || '').trim());
-                let vRaw = (am[2] || '').trim();
-                if (!k)
-                    continue;
-                // If value looks like JSON array/object, parse; else keep as string
-                let v = vRaw;
-                if ((vRaw.startsWith('[') && vRaw.endsWith(']')) || (vRaw.startsWith('{') && vRaw.endsWith('}'))) {
-                    try {
-                        v = JSON.parse(vRaw);
-                    }
-                    catch {
-                        v = vRaw;
-                    }
-                }
-                argsObj[k] = v;
-            }
-            // If no args collected but inner contains JSON object, try as whole arguments
-            const hasAnyArg = Object.keys(argsObj).length > 0;
-            if (!hasAnyArg) {
-                const jsonMatch = inner.match(/\{[\s\S]*\}|\[[\s\S]*\]/);
-                if (jsonMatch) {
-                    try {
-                        const val = JSON.parse(jsonMatch[0]);
-                        argsObj.arguments = val;
-                    }
-                    catch { /* ignore */ }
-                }
-            }
-            // Drop keys not allowed for this tool to prevent noise (e.g., '空的<tool_call>command')
-            const filtered = filterArgsForTool(lname, argsObj);
-            // Guard: view_image must have a valid image path
-            try {
-                if (lname === 'view_image') {
-                    const p = (filtered && typeof filtered === 'object') ? filtered.path : undefined;
-                    if (!isImagePath(p)) {
-                        continue;
-                    }
-                }
-            }
-            catch { /* ignore guard errors */ }
-            let argsStr = '{}';
-            try {
-                argsStr = JSON.stringify(filtered);
-            }
-            catch {
-                argsStr = '{}';
-            }
-            out.push({ id: `call_${Math.random().toString(36).slice(2, 10)}`, name, args: argsStr });
-        }
-        // Fallback: loose XML variant (missing <tool_call> start), e.g.:
-        //   shell\n<arg_key>command</arg_key>\n<arg_value>["ls","-la"]</arg_value>\n</tool_call>
-        try {
-            const pairRe = /<\s*arg_key\s*>\s*([^<]+?)\s*<\/\s*arg_key\s*>\s*<\s*arg_value\s*>\s*([\s\S]*?)\s*<\/\s*arg_value\s*>/gi;
-            let pm;
-            while ((pm = pairRe.exec(text)) !== null) {
-                const start = pm.index;
-                // find a likely function name on the immediately preceding non-empty line
-                let name = '';
-                try {
-                    const before = text.slice(0, start);
-                    const lines = before.split(/\r?\n/).map(s => s.trim()).filter(Boolean);
-                    const cand = lines.length ? lines[lines.length - 1] : '';
-                    if (/^[a-zA-Z0-9_.-]{2,}$/.test(cand))
-                        name = cand;
-                }
-                catch { /* ignore */ }
-                // 如果前一行抽不到合法函数名，但 arg_key 明显是 toon/command，
-                // 视为 CLI 通路下的 exec_command 工具，避免把半截 <tool_call> 当成纯文本丢弃。
-                const rawKey = (pm[1] || '').trim();
-                const normalizedKey = normalizeKey(rawKey).toLowerCase();
-                if (!name && (normalizedKey === 'toon' || normalizedKey === 'command')) {
-                    name = 'exec_command';
-                }
-                if (!name)
-                    continue;
-                const k = normalizeKey(rawKey);
-                let vRaw = (pm[2] || '').trim();
-                const argsObj = {};
-                if (k) {
-                    let v = vRaw;
-                    if ((vRaw.startsWith('[') && vRaw.endsWith(']')) || (vRaw.startsWith('{') && vRaw.endsWith('}'))) {
-                        try {
-                            v = JSON.parse(vRaw);
-                        }
-                        catch {
-                            v = vRaw;
-                        }
-                    }
-                    argsObj[k] = v;
-                }
-                const lname2 = String(name || '').toLowerCase();
-                const filtered2 = filterArgsForTool(lname2, argsObj);
-                // Guard: view_image must have a valid image path
-                try {
-                    if (lname2 === 'view_image') {
-                        const p = (filtered2 && typeof filtered2 === 'object') ? filtered2.path : undefined;
-                        if (!isImagePath(p)) {
-                            continue;
-                        }
-                    }
-                }
-                catch { /* ignore guard errors */ }
-                let argsStr = '{}';
-                try {
-                    argsStr = JSON.stringify(filtered2);
-                }
-                catch {
-                    argsStr = '{}';
-                }
-                out.push({ id: `call_${Math.random().toString(36).slice(2, 10)}`, name, args: argsStr });
-            }
-        }
-        catch { /* ignore */ }
-        return out.length ? out : null;
-    }
-    catch {
-        return null;
-    }
-}
-/**
- * 提取简单 XML 形式的工具调用块，例如：
- *
- *   <list_directory>
- *     <path>/path/to/dir</path>
- *     <recursive>false</recursive>
- *   </list_directory>
- *
- * 仅针对已知工具名（目前为 list_directory），避免误伤普通 XML 文本。
- */
-export function extractSimpleXmlToolsFromText(text) {
-    try {
-        if (typeof text !== 'string' || !text)
-            return null;
-        const out = [];
-        const blockRe = /<\s*([A-Za-z0-9_.-]+)\s*>([\s\S]*?)<\/\s*\1\s*>/gi;
-        let bm;
-        while ((bm = blockRe.exec(text)) !== null) {
-            const rawName = (bm[1] || '').trim();
-            const lname = rawName.toLowerCase();
-            if (!lname || lname === 'tool_call')
-                continue;
-            // 目前仅支持 list_directory，后续按需扩展
-            if (lname !== 'list_directory')
-                continue;
-            const inner = bm[2] || '';
-            const args = {};
-            const argRe = /<\s*([A-Za-z0-9_]+)\s*>([\s\S]*?)<\/\s*\1\s*>/gi;
-            let am;
-            while ((am = argRe.exec(inner)) !== null) {
-                const key = normalizeKey((am[1] || '').trim());
-                if (!key)
-                    continue;
-                let rawVal = (am[2] || '').trim();
-                let v = rawVal;
-                if ((rawVal.startsWith('[') && rawVal.endsWith(']')) || (rawVal.startsWith('{') && rawVal.endsWith('}'))) {
-                    try {
-                        v = JSON.parse(rawVal);
-                    }
-                    catch {
-                        v = rawVal;
-                    }
-                }
-                else if (rawVal === 'true' || rawVal === 'false') {
-                    v = rawVal === 'true';
-                }
-                args[key] = v;
-            }
-            const filtered = filterArgsForTool(lname, args);
-            let argsStr = '{}';
-            try {
-                argsStr = JSON.stringify(filtered);
-            }
-            catch {
-                argsStr = '{}';
-            }
-            out.push({
-                id: `call_${Math.random().toString(36).slice(2, 10)}`,
-                name: lname,
-                args: argsStr
-            });
-        }
-        return out.length ? out : null;
-    }
-    catch {
-        return null;
-    }
-}
-// Extract Qwen-style tool call tokens that appear in plain text, e.g.:
-//   <|tool_calls_section_begin|>
-//   <|tool_call_begin|> functions.exec_command:66 <|tool_call_argument_begin|> {"cmd":"pwd"} <|tool_call_end|>
-//   <|tool_calls_section_end|>
-// Some upstreams emit this even when OpenAI tool_calls are supported; we harvest it into tool_calls.
-export function extractQwenToolCallTokensFromText(text) {
-    try {
-        if (typeof text !== 'string' || !text)
-            return null;
-        // Upstreams (notably Qwen-family models behind OpenAI-compatible shells) may insert
-        // whitespace/newlines inside token markers, e.g. "<|  tool_call_begin|>".
-        // Avoid brittle substring checks; do a cheap regex presence test instead.
-        if (!/<\|\s*tool_call_begin\s*\|>/i.test(text) && !/<\|\s*tool_call_argument_begin\s*\|>/i.test(text)) {
-            return null;
-        }
-        const out = [];
-        // tolerate whitespace/newlines and missing argument_end token
-        const re = /<\|\s*tool_call_begin\s*\|>\s*([A-Za-z0-9_.-]+)(?::(\d+))?\s*(?:<\|\s*tool_call_argument_begin\s*\|>\s*([\s\S]*?)\s*)?<\|\s*tool_call_end\s*\|>/gi;
-        let m;
-        while ((m = re.exec(text)) !== null) {
-            const rawName = String(m[1] || '').trim();
-            const numericId = typeof m[2] === 'string' && m[2].trim().length ? m[2].trim() : undefined;
-            const rawArgs = typeof m[3] === 'string' ? String(m[3]).trim() : '';
-            if (!rawName)
-                continue;
-            let name = rawName;
-            if (name.startsWith('functions.')) {
-                name = name.slice('functions.'.length);
-            }
-            const lname = name.toLowerCase();
-            if (!lname)
-                continue;
-            let parsedArgs = null;
-            if (!rawArgs) {
-                parsedArgs = {};
-            }
-            else {
-                parsedArgs = tryParseJsonWithModelRepairs(rawArgs);
-                if (parsedArgs === null) {
-                    parsedArgs = salvageToolArgsFromRawText(lname, rawArgs) ?? { _raw: rawArgs };
-                }
-            }
-            const argsObj = parsedArgs && typeof parsedArgs === 'object' && !Array.isArray(parsedArgs)
-                ? parsedArgs
-                : { value: parsedArgs };
-            // Alias normalization (models often use "command" instead of "cmd", etc.)
-            if (lname === 'exec_command') {
-                const cmd = typeof argsObj.cmd === 'string' ? String(argsObj.cmd) : '';
-                const command = typeof argsObj.command === 'string' ? String(argsObj.command) : '';
-                if (!cmd && command) {
-                    argsObj.cmd = command;
-                }
-                const cwd = typeof argsObj.cwd === 'string' ? String(argsObj.cwd) : '';
-                const workdir = typeof argsObj.workdir === 'string' ? String(argsObj.workdir) : '';
-                if (!workdir && cwd) {
-                    argsObj.workdir = cwd;
-                }
-            }
-            if (lname === 'write_stdin') {
-                const chars = typeof argsObj.chars === 'string' ? String(argsObj.chars) : '';
-                const textVal = typeof argsObj.text === 'string' ? String(argsObj.text) : '';
-                const input = typeof argsObj.input === 'string' ? String(argsObj.input) : '';
-                if (!chars && (textVal || input)) {
-                    argsObj.chars = textVal || input;
-                }
-                const sid = argsObj.session_id;
-                const sidAlt = argsObj.sessionId;
-                if ((sid === undefined || sid === null || String(sid).trim() === '') && (sidAlt !== undefined && sidAlt !== null)) {
-                    argsObj.session_id = sidAlt;
-                }
-            }
-            if (lname === 'apply_patch') {
-                const patch = typeof argsObj.patch === 'string' ? String(argsObj.patch) : '';
-                const textPatch = typeof argsObj.text === 'string' ? String(argsObj.text) : '';
-                const inputPatch = typeof argsObj.input === 'string' ? String(argsObj.input) : '';
-                const instructions = typeof argsObj.instructions === 'string' ? String(argsObj.instructions) : '';
-                if (!patch && (textPatch || inputPatch || instructions)) {
-                    argsObj.patch = textPatch || inputPatch || instructions;
-                }
-            }
-            const filtered = filterArgsForTool(lname, argsObj);
-            // Basic guards for known tools
-            if (lname === 'exec_command') {
-                const cmd = typeof filtered?.cmd === 'string' ? String(filtered.cmd).trim() : '';
-                if (!cmd)
-                    continue;
-            }
-            if (lname === 'write_stdin') {
-                // Allow empty args: our servertool schema may inject session_id automatically when a session is active.
-                // Some models emit polling writes as `{}`.
-            }
-            if (lname === 'apply_patch') {
-                const patchText = typeof filtered?.patch === 'string' ? String(filtered.patch).trim() : '';
-                if (!patchText)
-                    continue;
-            }
-            let argsStr = '{}';
-            try {
-                argsStr = JSON.stringify(filtered);
-            }
-            catch {
-                argsStr = '{}';
-            }
-            const stableId = (() => {
-                if (numericId && /^[0-9]{1,10}$/.test(numericId)) {
-                    const namePart = lname.replace(/[^A-Za-z0-9_-]/g, '_');
-                    const id = `call_${namePart}_${numericId}`
-                        .replace(/_{2,}/g, '_')
-                        .replace(/^_+/, '')
-                        .replace(/_+$/, '');
-                    return id || undefined;
-                }
-                return undefined;
-            })();
-            out.push({ id: stableId ?? `call_${Math.random().toString(36).slice(2, 10)}`, name: lname, args: argsStr });
-        }
-        return out.length ? out : null;
-    }
-    catch {
-        return null;
-    }
-}
-export function normalizeAssistantTextToToolCalls(message) {
-    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 → 简单 XML 工具（list_directory 等） → bare command salvage
-            calls =
-                extractQwenToolCallTokensFromText(text) ||
-                    extractToolNamespaceXmlBlocksFromText(text) ||
-                    extractParameterXmlToolsFromText(text) ||
-                    extractInvokeToolsFromText(text) ||
-                    extractXMLToolCallsFromText(text) ||
-                    extractApplyPatchCallsFromText(text) ||
-                    extractExecuteBlocksFromText(text) ||
-                    extractSimpleXmlToolsFromText(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 */ }
-    return message;
-}
+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';