@jsonstudio/llms 0.6.3214 → 0.6.3271

package/dist/conversion/hub/operation-table/semantic-mappers/chat-mapper.js

@@ -1,82 +1,4 @@
-import { isJsonObject, jsonClone } from '../../types/json.js';
-import { normalizeChatMessageContentWithNative, normalizeOpenaiChatMessagesWithNative } from '../../../../router/virtual-router/engine-selection/native-shared-conversion-semantics.js';
-import { ensureProtocolState } from '../../../protocol-state.js';
-import { mapReqInboundBridgeToolsToChatWithNative } from '../../../../router/virtual-router/engine-selection/native-hub-pipeline-req-inbound-semantics.js';
-const CHAT_PARAMETER_KEYS = [
-    'model',
-    'temperature',
-    'top_p',
-    'top_k',
-    'max_tokens',
-    'frequency_penalty',
-    'presence_penalty',
-    'logit_bias',
-    'response_format',
-    'parallel_tool_calls',
-    'tool_choice',
-    'seed',
-    'user',
-    'metadata',
-    'stop',
-    'stop_sequences',
-    'stream'
-];
-const KNOWN_TOP_LEVEL_FIELDS = new Set([
-    'messages',
-    'tools',
-    'tool_outputs',
-    ...CHAT_PARAMETER_KEYS,
-    'stageExpectations',
-    'stages'
-]);
-function flattenSystemContent(content) {
-    if (typeof content === 'string')
-        return content;
-    if (Array.isArray(content)) {
-        return content.map(flattenSystemContent).filter(Boolean).join('\n');
-    }
-    if (content && typeof content === 'object') {
-        const obj = content;
-        if (typeof obj.text === 'string')
-            return obj.text;
-        if (typeof obj.content === 'string')
-            return obj.content;
-        if (Array.isArray(obj.content))
-            return obj.content.map(flattenSystemContent).join('\n');
-    }
-    return '';
-}
-function normalizeToolContent(content) {
-    if (typeof content === 'string')
-        return content;
-    if (content === null || content === undefined)
-        return '';
-    try {
-        return JSON.stringify(content);
-    }
-    catch {
-        return String(content ?? '');
-    }
-}
-function maybeAugmentRouteCodexApplyPatchPrecheck(content) {
-    if (!content || typeof content !== 'string') {
-        return content;
-    }
-    if (content.includes('[RouteCodex precheck]')) {
-        return content;
-    }
-    const lower = content.toLowerCase();
-    if (!lower.includes('failed to parse function arguments')) {
-        return content;
-    }
-    if (content.includes('missing field `input`')) {
-        return `${content}\n\n[RouteCodex precheck] apply_patch 参数解析失败：缺少字段 "input"。当前 RouteCodex 期望 { input, patch } 形态，并且两个字段都应包含完整统一 diff 文本。`;
-    }
-    if (content.includes('invalid type: map, expected a string')) {
-        return `${content}\n\n[RouteCodex precheck] apply_patch 参数类型错误：检测到 JSON 对象（map），但客户端期望字符串。请先对参数做 JSON.stringify 再写入 arguments，或直接提供 { patch: "<统一 diff>" } 形式。`;
-    }
-    return content;
-}
+import { mapOpenaiChatFromChatWithNative, mapOpenaiChatToChatWithNative } from '../../../../router/virtual-router/engine-selection/native-hub-pipeline-semantic-mappers.js';
 export function maybeAugmentApplyPatchErrorContent(content, toolName) {
     if (!content)
         return content;
@@ -86,319 +8,18 @@ export function maybeAugmentApplyPatchErrorContent(content, toolName) {
     if (!isApplyPatch) {
         return content;
     }
-    // 避免重复追加提示。
+    // Avoid duplicate hints.
     if (content.includes('[apply_patch hint]')) {
         return content;
     }
-    const hint = '\n\n[apply_patch hint] 在使用 apply_patch 之前，请先读取目标文件的最新内容，并基于该内容生成补丁；同时确保补丁格式符合工具规范（统一补丁格式或结构化参数），避免上下文不匹配或语法错误。';
+    const hint = '\n\n[apply_patch hint] \u5728\u4f7f\u7528 apply_patch \u4e4b\u524d\uff0c\u8bf7\u5148\u8bfb\u53d6\u76ee\u6807\u6587\u4ef6\u7684\u6700\u65b0\u5185\u5bb9\uff0c\u5e76\u57fa\u4e8e\u8be5\u5185\u5bb9\u751f\u6210\u8865\u4e01\uff1b\u540c\u65f6\u786e\u4fdd\u8865\u4e01\u683c\u5f0f\u7b26\u5408\u5de5\u5177\u89c4\u8303\uff08\u7edf\u4e00\u8865\u4e01\u683c\u5f0f\u6216\u7ed3\u6784\u5316\u53c2\u6570\uff09\uff0c\u907f\u514d\u4e0a\u4e0b\u6587\u4e0d\u5339\u914d\u6216\u8bed\u6cd5\u9519\u8bef\u3002';
     return content + hint;
 }
-function recordToolCallIssues(message, messageIndex, missing) {
-    const toolCalls = Array.isArray(message.tool_calls) ? message.tool_calls : undefined;
-    if (!toolCalls?.length)
-        return;
-    toolCalls.forEach((entry, callIndex) => {
-        if (!isJsonObject(entry)) {
-            missing.push({
-                path: `messages[${messageIndex}].tool_calls[${callIndex}]`,
-                reason: 'invalid_tool_call_entry',
-                originalValue: jsonClone(entry)
-            });
-            return;
-        }
-        const fnBlock = entry.function;
-        if (!isJsonObject(fnBlock)) {
-            missing.push({
-                path: `messages[${messageIndex}].tool_calls[${callIndex}].function`,
-                reason: 'missing_tool_function',
-                originalValue: jsonClone(fnBlock)
-            });
-            return;
-        }
-        const fnName = fnBlock.name;
-        if (typeof fnName !== 'string' || !fnName.trim().length) {
-            missing.push({
-                path: `messages[${messageIndex}].tool_calls[${callIndex}].function.name`,
-                reason: 'missing_tool_name'
-            });
-        }
-    });
-}
-function collectSystemRawBlocks(raw) {
-    if (!Array.isArray(raw))
-        return undefined;
-    const blocks = [];
-    raw.forEach((entry) => {
-        if (!isJsonObject(entry))
-            return;
-        if (String(entry.role ?? '').toLowerCase() !== 'system')
-            return;
-        blocks.push(jsonClone(entry));
-    });
-    return blocks.length ? blocks : undefined;
-}
-function normalizeChatMessages(raw) {
-    const norm = {
-        messages: [],
-        systemSegments: [],
-        toolOutputs: [],
-        missingFields: []
-    };
-    if (raw === undefined) {
-        norm.missingFields.push({ path: 'messages', reason: 'absent' });
-        return norm;
-    }
-    const normalizedRaw = Array.isArray(raw)
-        ? normalizeOpenaiChatMessagesWithNative(raw)
-        : raw;
-    if (!Array.isArray(normalizedRaw)) {
-        norm.missingFields.push({ path: 'messages', reason: 'invalid_type', originalValue: jsonClone(raw) });
-        return norm;
-    }
-    normalizedRaw.forEach((value, index) => {
-        if (!isJsonObject(value)) {
-            norm.missingFields.push({ path: `messages[${index}]`, reason: 'invalid_entry', originalValue: jsonClone(value) });
-            return;
-        }
-        const roleValue = value.role;
-        if (typeof roleValue !== 'string') {
-            norm.missingFields.push({ path: `messages[${index}].role`, reason: 'missing_role' });
-            return;
-        }
-        const chatMessage = value;
-        if (roleValue !== 'system' && roleValue !== 'tool') {
-            const normalizedContent = normalizeChatMessageContentWithNative(chatMessage.content);
-            const shouldOverwriteContent = !Array.isArray(chatMessage.content);
-            if (shouldOverwriteContent && normalizedContent.contentText !== undefined) {
-                chatMessage.content = normalizedContent.contentText;
-            }
-            if (typeof normalizedContent.reasoningText === 'string' && normalizedContent.reasoningText.trim().length) {
-                chatMessage.reasoning_content = normalizedContent.reasoningText.trim();
-            }
-        }
-        norm.messages.push(chatMessage);
-        const toolCallCandidate = value.tool_calls;
-        if (Array.isArray(toolCallCandidate) && toolCallCandidate.length) {
-            recordToolCallIssues(value, index, norm.missingFields);
-        }
-        if (roleValue === 'system') {
-            const segment = flattenSystemContent(chatMessage.content);
-            if (segment.trim().length) {
-                norm.systemSegments.push(segment);
-            }
-            return;
-        }
-        if (roleValue === 'tool') {
-            const rawCallId = (value.tool_call_id ?? value.call_id ?? value.id);
-            const toolCallId = typeof rawCallId === 'string' && rawCallId.trim().length ? rawCallId.trim() : undefined;
-            if (!toolCallId) {
-                norm.missingFields.push({ path: `messages[${index}].tool_call_id`, reason: 'missing_tool_call_id' });
-                return;
-            }
-            const nameValue = typeof value.name === 'string' && value.name.trim().length ? value.name : undefined;
-            const normalizedToolOutput = normalizeToolContent(value.content ?? value.output);
-            const routeCodexPrechecked = maybeAugmentRouteCodexApplyPatchPrecheck(normalizedToolOutput);
-            if (routeCodexPrechecked !== normalizedToolOutput) {
-                // Keep tool role message content aligned with outbound provider requests (e.g. Chat→Responses),
-                // while avoiding double-injection.
-                if (typeof chatMessage.content === 'string' || chatMessage.content === undefined || chatMessage.content === null) {
-                    chatMessage.content = routeCodexPrechecked;
-                }
-                else if (typeof chatMessage.output === 'string') {
-                    chatMessage.output = routeCodexPrechecked;
-                }
-            }
-            const outputEntry = {
-                tool_call_id: toolCallId,
-                content: routeCodexPrechecked,
-                name: nameValue
-            };
-            outputEntry.content = maybeAugmentApplyPatchErrorContent(outputEntry.content, outputEntry.name);
-            norm.toolOutputs.push(outputEntry);
-        }
-    });
-    return norm;
-}
-function normalizeStandaloneToolOutputs(raw, missing) {
-    if (!Array.isArray(raw) || raw.length === 0)
-        return [];
-    const outputs = [];
-    raw.forEach((entry, index) => {
-        if (!isJsonObject(entry)) {
-            missing.push({ path: `tool_outputs[${index}]`, reason: 'invalid_entry', originalValue: jsonClone(entry) });
-            return;
-        }
-        const rawCallId = entry.tool_call_id ?? entry.call_id ?? entry.id;
-        const toolCallId = typeof rawCallId === 'string' && rawCallId.trim().length ? rawCallId.trim() : undefined;
-        if (!toolCallId) {
-            missing.push({ path: `tool_outputs[${index}].tool_call_id`, reason: 'missing_tool_call_id' });
-            return;
-        }
-        const nameValue = typeof entry.name === 'string' && entry.name.trim().length ? entry.name : undefined;
-        const rawContent = normalizeToolContent(entry.content ?? entry.output);
-        const content = maybeAugmentApplyPatchErrorContent(rawContent, nameValue);
-        outputs.push({
-            tool_call_id: toolCallId,
-            content,
-            name: nameValue
-        });
-    });
-    return outputs;
-}
-function normalizeTools(raw, missing) {
-    if (!Array.isArray(raw) || raw.length === 0) {
-        return undefined;
-    }
-    const tools = mapReqInboundBridgeToolsToChatWithNative(raw);
-    if (tools.length === 0) {
-        raw.forEach((entry, index) => {
-            missing.push({ path: `tools[${index}]`, reason: 'invalid_entry', originalValue: jsonClone(entry) });
-        });
-    }
-    return tools.length ? tools : undefined;
-}
-function extractParameters(body) {
-    const params = {};
-    for (const key of CHAT_PARAMETER_KEYS) {
-        if (body[key] !== undefined) {
-            params[key] = body[key];
-        }
-    }
-    return Object.keys(params).length ? params : undefined;
-}
-function collectExtraFields(body) {
-    const extras = {};
-    for (const [key, value] of Object.entries(body)) {
-        if (KNOWN_TOP_LEVEL_FIELDS.has(key)) {
-            continue;
-        }
-        if (value !== undefined) {
-            extras[key] = jsonClone(value);
-        }
-    }
-    return Object.keys(extras).length ? extras : undefined;
-}
-function extractOpenAIExtraFieldsFromSemantics(semantics) {
-    if (!semantics || !semantics.providerExtras || !isJsonObject(semantics.providerExtras)) {
-        return undefined;
-    }
-    const openaiExtras = semantics.providerExtras.openaiChat;
-    if (!openaiExtras || !isJsonObject(openaiExtras)) {
-        return undefined;
-    }
-    const stored = openaiExtras.extraFields;
-    if (!stored || !isJsonObject(stored)) {
-        return undefined;
-    }
-    return stored;
-}
-function hasExplicitEmptyToolsSemantics(semantics) {
-    if (!semantics || !semantics.tools || !isJsonObject(semantics.tools)) {
-        return false;
-    }
-    const flag = semantics.tools.explicitEmpty;
-    return flag === true;
-}
-function buildOpenAISemantics(options) {
-    const semantics = {};
-    if (options.systemSegments && options.systemSegments.length) {
-        semantics.system = {
-            textBlocks: options.systemSegments.map((segment) => segment)
-        };
-    }
-    if (options.extraFields && Object.keys(options.extraFields).length) {
-        semantics.providerExtras = {
-            openaiChat: {
-                extraFields: jsonClone(options.extraFields)
-            }
-        };
-    }
-    if (options.explicitEmptyTools) {
-        semantics.tools = {
-            explicitEmpty: true
-        };
-    }
-    return Object.keys(semantics).length ? semantics : undefined;
-}
-function applyExtraFields(body, metadata, semantics) {
-    const sources = [];
-    const semanticsExtras = extractOpenAIExtraFieldsFromSemantics(semantics);
-    if (semanticsExtras) {
-        sources.push(semanticsExtras);
-    }
-    if (!sources.length) {
-        return;
-    }
-    for (const source of sources) {
-        for (const [key, value] of Object.entries(source)) {
-            if (body[key] !== undefined) {
-                continue;
-            }
-            body[key] = jsonClone(value);
-        }
-    }
-}
 export class ChatSemanticMapper {
     async toChat(format, ctx) {
-        const payload = (format.payload ?? {});
-        const normalized = normalizeChatMessages(payload.messages);
-        const topLevelOutputs = normalizeStandaloneToolOutputs(payload.tool_outputs, normalized.missingFields);
-        const toolOutputs = [...normalized.toolOutputs];
-        for (const entry of topLevelOutputs) {
-            if (!toolOutputs.find(item => item.tool_call_id === entry.tool_call_id)) {
-                toolOutputs.push(entry);
-            }
-        }
-        const metadata = { context: ctx };
-        const rawSystemBlocks = collectSystemRawBlocks(payload.messages);
-        if (rawSystemBlocks) {
-            const protocolState = ensureProtocolState(metadata, 'openai');
-            protocolState.systemMessages = jsonClone(rawSystemBlocks);
-        }
-        if (normalized.missingFields.length) {
-            metadata.missingFields = normalized.missingFields;
-        }
-        const extraFields = collectExtraFields(payload);
-        const explicitEmptyTools = Array.isArray(payload.tools) && payload.tools.length === 0;
-        const semantics = buildOpenAISemantics({
-            systemSegments: normalized.systemSegments,
-            extraFields,
-            explicitEmptyTools
-        });
-        return {
-            messages: normalized.messages,
-            tools: normalizeTools(payload.tools, normalized.missingFields),
-            toolOutputs: toolOutputs.length ? toolOutputs : undefined,
-            parameters: extractParameters(payload),
-            semantics,
-            metadata
-        };
+        return mapOpenaiChatToChatWithNative((format.payload ?? {}), ctx);
     }
     async fromChat(chat, ctx) {
-        const shouldEmitEmptyTools = hasExplicitEmptyToolsSemantics(chat.semantics);
-        const payload = {
-            messages: chat.messages,
-            tools: chat.tools ?? (shouldEmitEmptyTools ? [] : undefined),
-            ...(chat.parameters || {})
-        };
-        applyExtraFields(payload, chat.metadata, chat.semantics);
-        // Do not forward tool_outputs to provider wire formats. OpenAI Chat
-        // endpoints expect tool results to appear as tool role messages, and
-        // sending the legacy top-level field causes upstream HTTP 400 responses.
-        // Concrete translation happens earlier when responses input is unfolded
-        // into ChatEnvelope.messages, so the provider request only needs the
-        // canonical message list.
-        if (payload.max_tokens === undefined && typeof payload.max_output_tokens === 'number') {
-            payload.max_tokens = payload.max_output_tokens;
-            delete payload.max_output_tokens;
-        }
-        return {
-            protocol: 'openai-chat',
-            direction: 'response',
-            payload,
-            meta: {
-                context: ctx
-            }
-        };
+        return mapOpenaiChatFromChatWithNative(chat, ctx);
     }
 }

package/dist/conversion/hub/response/response-runtime.d.ts

@@ -2,6 +2,7 @@ import type { JsonObject } from '../types/json.js';
 type ToolAliasMap = Record<string, string>;
 interface AnthropicResponseOptions {
     aliasMap?: ToolAliasMap;
+    includeToolCallIds?: boolean;
 }
 export declare function buildOpenAIChatFromAnthropicMessage(payload: JsonObject, options?: AnthropicResponseOptions): JsonObject;
 export declare function buildAnthropicResponseFromChat(chatResponse: JsonObject, options?: AnthropicResponseOptions): JsonObject;

package/dist/conversion/hub/response/response-runtime.js

@@ -221,8 +221,10 @@ export function buildOpenAIChatFromAnthropicMessage(payload, options) {
             default: return 'stop';
         }
     };
+    const includeToolCallIds = options?.includeToolCallIds === true;
     const canonicalToolCalls = toolCalls.map((tc) => ({
         id: tc.id,
+        ...(includeToolCallIds ? { call_id: tc.id, tool_call_id: tc.id } : {}),
         type: 'function',
         function: { name: tc.name, arguments: tc.args }
     }));
@@ -237,11 +239,35 @@ export function buildOpenAIChatFromAnthropicMessage(payload, options) {
             const key = deriveToolCallKey(inferred);
             if (key && seen.has(key))
                 continue;
+            if (includeToolCallIds && typeof inferred.id === 'string') {
+                const inferredId = String(inferred.id);
+                if (!("call_id" in inferred))
+                    inferred.call_id = inferredId;
+                if (!("tool_call_id" in inferred))
+                    inferred.tool_call_id = inferredId;
+            }
             canonicalToolCalls.push(inferred);
             if (key)
                 seen.add(key);
         }
     }
+    for (const call of canonicalToolCalls) {
+        const cid = typeof call.id === 'string' ? String(call.id) : '';
+        if (includeToolCallIds) {
+            if (cid) {
+                if (!("call_id" in call))
+                    call.call_id = cid;
+                if (!("tool_call_id" in call))
+                    call.tool_call_id = cid;
+            }
+        }
+        else {
+            if ("call_id" in call)
+                delete call.call_id;
+            if ("tool_call_id" in call)
+                delete call.tool_call_id;
+        }
+    }
     const message = {
         role: typeof payload.role === 'string' ? payload.role : 'assistant',
         content: textParts.join('\n')

package/dist/conversion/hub/snapshot-recorder.js

@@ -1,6 +1,5 @@
 import { createSnapshotWriter } from '../snapshot-utils.js';
-import { jsonClone } from './types/json.js';
-import { parseLenientJsonishWithNative } from '../../router/virtual-router/engine-selection/native-shared-conversion-semantics.js';
+import { normalizeSnapshotStagePayloadWithNative } from '../../router/virtual-router/engine-selection/native-snapshot-hooks.js';
 export class SnapshotStageRecorder {
     options;
     writer;
@@ -22,7 +21,7 @@ export class SnapshotStageRecorder {
         if (!this.writer) {
             return;
         }
-        const normalized = normalizeStagePayload(stage, payload);
+        const normalized = normalizeSnapshotStagePayloadWithNative(stage, payload);
         if (!normalized) {
             return;
         }
@@ -37,91 +36,3 @@ export class SnapshotStageRecorder {
 export function createSnapshotRecorder(context, endpoint) {
     return new SnapshotStageRecorder({ context, endpoint });
 }
-const STAGE_KIND_MAP = {
-    req_inbound_stage2_semantic_map: 'request_inbound',
-    'chat_process.req.stage2.semantic_map': 'request_inbound',
-    req_outbound_stage1_semantic_map: 'request_outbound',
-    'chat_process.req.stage6.outbound.semantic_map': 'request_outbound',
-    resp_inbound_stage3_semantic_map: 'response_inbound',
-    'chat_process.resp.stage4.semantic_map_to_chat': 'response_inbound',
-    resp_outbound_stage1_client_remap: 'response_outbound',
-    'chat_process.resp.stage9.client_remap': 'response_outbound'
-};
-function normalizeStagePayload(stage, payload) {
-    const kind = STAGE_KIND_MAP[stage];
-    if (!kind) {
-        return payload;
-    }
-    if ((kind === 'request_inbound' || kind === 'request_outbound') && isChatEnvelope(payload)) {
-        return buildOpenAIChatSnapshot(payload);
-    }
-    if (kind === 'response_inbound' || kind === 'response_outbound') {
-        return cloneJson(payload);
-    }
-    return payload;
-}
-function isChatEnvelope(value) {
-    return Boolean(value &&
-        typeof value === 'object' &&
-        Array.isArray(value.messages) &&
-        value.metadata &&
-        typeof value.metadata === 'object');
-}
-function buildOpenAIChatSnapshot(envelope) {
-    const snapshot = {};
-    if (envelope.parameters && Object.keys(envelope.parameters).length) {
-        Object.assign(snapshot, jsonClone(envelope.parameters));
-    }
-    snapshot.messages = jsonClone(envelope.messages);
-    if (envelope.tools && envelope.tools.length) {
-        snapshot.tools = jsonClone(envelope.tools);
-    }
-    if (envelope.toolOutputs && envelope.toolOutputs.length) {
-        snapshot.tool_outputs = jsonClone(envelope.toolOutputs);
-    }
-    const meta = buildMetaSnapshot(envelope.metadata);
-    if (meta) {
-        snapshot.meta = meta;
-    }
-    return snapshot;
-}
-function buildMetaSnapshot(metadata) {
-    const meta = {};
-    if (metadata.context) {
-        meta.context = jsonClone(metadata.context);
-    }
-    if (Array.isArray(metadata.missingFields) && metadata.missingFields.length) {
-        meta.missing_fields = jsonClone(metadata.missingFields);
-    }
-    const extraKeys = Object.keys(metadata).filter((key) => key !== 'context' && key !== 'missingFields');
-    if (extraKeys.length) {
-        const extras = {};
-        for (const key of extraKeys) {
-            const value = metadata[key];
-            if (value !== undefined) {
-                extras[key] = jsonClone(value);
-            }
-        }
-        if (Object.keys(extras).length) {
-            meta.extra = extras;
-        }
-    }
-    return Object.keys(meta).length ? meta : undefined;
-}
-function cloneJson(payload) {
-    try {
-        const nativeCloned = parseLenientJsonishWithNative(payload);
-        if (nativeCloned && typeof nativeCloned === 'object' && !Array.isArray(nativeCloned)) {
-            return nativeCloned;
-        }
-    }
-    catch {
-        // native clone is best-effort
-    }
-    try {
-        return JSON.parse(JSON.stringify(payload));
-    }
-    catch {
-        return payload;
-    }
-}

package/dist/conversion/hub/tool-governance/engine.d.ts

@@ -4,7 +4,7 @@ import type { GovernedChatCompletionPayload, GovernedStandardizedRequest, ToolGo
 /**
  * Hybrid governance engine:
  * - request path: native-primary
- * - response path: legacy TS rules (until native response-governance export is available)
+ * - response path: native-primary
  *
  * Legacy-only snapshot retained at:
  * - src/conversion/hub/tool-governance/archive/engine.legacy.ts