@jsonstudio/llms 0.6.2172 → 0.6.3214

package/dist/conversion/shared/chat-envelope-validator.js

@@ -1,128 +1,4 @@
-import { isJsonObject } from '../hub/types/json.js';
-const ALLOWED_ROLES = new Set(['system', 'user', 'assistant', 'tool']);
-const RESERVED_EXACT_KEYS = new Set(['stages', 'stageExpectations']);
-const RESERVED_PREFIXES = ['__rcc_'];
+import { validateChatEnvelopeWithNative } from '../../router/virtual-router/engine-selection/native-hub-pipeline-edge-stage-semantics.js';
 export function validateChatEnvelope(chat, options) {
-    if (!chat || typeof chat !== 'object') {
-        throw buildError('chatEnvelope_missing', 'Chat envelope must be an object', options);
-    }
-    assertNoReservedKeys(chat, 'chatEnvelope', options);
-    if (!Array.isArray(chat.messages) || chat.messages.length === 0) {
-        throw buildError('messages_missing', 'Chat envelope must include at least one message', options);
-    }
-    chat.messages.forEach((message, index) => {
-        if (!message || typeof message !== 'object') {
-            throw buildError('message_shape', `messages[${index}] must be an object`, options);
-        }
-        assertNoReservedKeys(message, `messages[${index}]`, options);
-        if (typeof message.role !== 'string' || !ALLOWED_ROLES.has(message.role)) {
-            throw buildError('message_role', `messages[${index}].role must be one of ${Array.from(ALLOWED_ROLES).join(', ')}`, options);
-        }
-        validateToolCalls(message, index, options);
-    });
-    if (!isJsonObject(chat.parameters) || typeof chat.parameters.model !== 'string' || !chat.parameters.model.trim()) {
-        throw buildError('parameters_model', 'Chat envelope parameters.model must be a string', options);
-    }
-    assertNoReservedKeys(chat.parameters, 'parameters', options);
-    validateTools(chat.tools, options);
-    validateToolOutputs(chat.toolOutputs, options);
-    validateMetadata(chat.metadata, options);
-}
-function validateToolCalls(message, messageIndex, options) {
-    if (!Array.isArray(message.tool_calls)) {
-        return;
-    }
-    message.tool_calls.forEach((entry, callIndex) => {
-        if (!entry || typeof entry !== 'object') {
-            throw buildError('tool_call_shape', `messages[${messageIndex}].tool_calls[${callIndex}] must be an object`, options);
-        }
-        if (entry.type !== 'function') {
-            throw buildError('tool_call_type', `messages[${messageIndex}].tool_calls[${callIndex}].type must equal "function"`, options);
-        }
-        const fnNode = entry.function;
-        if (!fnNode || typeof fnNode !== 'object') {
-            throw buildError('tool_call_function', `messages[${messageIndex}].tool_calls[${callIndex}].function must be an object`, options);
-        }
-        const fnRecord = fnNode;
-        if (typeof fnRecord.name !== 'string' || !fnRecord.name.trim()) {
-            throw buildError('tool_call_name', `messages[${messageIndex}].tool_calls[${callIndex}].function.name must be a string`, options);
-        }
-        if (typeof fnRecord.arguments !== 'string') {
-            throw buildError('tool_call_arguments', `messages[${messageIndex}].tool_calls[${callIndex}].function.arguments must be a JSON string`, options);
-        }
-    });
-}
-function validateTools(tools, options) {
-    if (tools === undefined) {
-        return;
-    }
-    if (!Array.isArray(tools)) {
-        throw buildError('tools_shape', 'Chat envelope tools must be an array when provided', options);
-    }
-    tools.forEach((tool, index) => {
-        if (!tool || typeof tool !== 'object') {
-            throw buildError('tools_shape', `tools[${index}] must be an object`, options);
-        }
-        if (tool.type !== 'function') {
-            throw buildError('tools_type', `tools[${index}].type must equal "function"`, options);
-        }
-        const fnNode = tool.function;
-        if (!fnNode || typeof fnNode !== 'object' || typeof fnNode.name !== 'string' || !fnNode.name.trim()) {
-            throw buildError('tools_function', `tools[${index}].function.name must be a string`, options);
-        }
-    });
-}
-function validateToolOutputs(outputs, options) {
-    if (outputs === undefined) {
-        return;
-    }
-    if (!Array.isArray(outputs)) {
-        throw buildError('tool_outputs_shape', 'toolOutputs must be an array when provided', options);
-    }
-    outputs.forEach((entry, index) => {
-        if (!entry || typeof entry !== 'object') {
-            throw buildError('tool_outputs_shape', `toolOutputs[${index}] must be an object`, options);
-        }
-        if (typeof entry.tool_call_id !== 'string' || !entry.tool_call_id.trim()) {
-            throw buildError('tool_outputs_id', `toolOutputs[${index}].tool_call_id must be a string`, options);
-        }
-        if (typeof entry.content !== 'string') {
-            throw buildError('tool_outputs_content', `toolOutputs[${index}].content must be a string`, options);
-        }
-    });
-}
-function validateMetadata(metadata, options) {
-    if (!isJsonObject(metadata)) {
-        throw buildError('metadata_shape', 'Chat envelope metadata must be an object', options);
-    }
-    assertNoReservedKeys(metadata, 'metadata', options);
-    if (!isJsonObject(metadata.context)) {
-        throw buildError('metadata_context', 'metadata.context must be an object', options);
-    }
-    if (metadata.extraFields !== undefined) {
-        if (!isJsonObject(metadata.extraFields)) {
-            throw buildError('metadata_extra_fields', 'metadata.extraFields must be an object when provided', options);
-        }
-        assertNoReservedKeys(metadata.extraFields, 'metadata.extraFields', options, true);
-    }
-    if (metadata.providerMetadata !== undefined && !isJsonObject(metadata.providerMetadata)) {
-        throw buildError('metadata_provider', 'metadata.providerMetadata must be an object when provided', options);
-    }
-}
-function assertNoReservedKeys(target, path, options, allowStageKeys = false) {
-    if (!target || typeof target !== 'object') {
-        return;
-    }
-    for (const key of Object.keys(target)) {
-        if (!allowStageKeys && RESERVED_EXACT_KEYS.has(key)) {
-            throw buildError('reserved_key', `${path} contains reserved field "${key}"`, options);
-        }
-        if (RESERVED_PREFIXES.some((prefix) => key.startsWith(prefix))) {
-            throw buildError('reserved_key', `${path} contains reserved field "${key}"`, options);
-        }
-    }
-}
-function buildError(code, detail, options) {
-    const source = options.source ? ` source=${options.source}` : '';
-    return new Error(`ChatEnvelopeValidationError(${options.stage}/${options.direction})[${code}] ${detail}${source}`);
+    validateChatEnvelopeWithNative(chat, options);
 }

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

@@ -1,56 +1,4 @@
-import { extractReasoningSegments, sanitizeReasoningTaggedText } from './reasoning-utils.js';
-function collectText(value, collector) {
-    if (value == null) {
-        return;
-    }
-    if (typeof value === 'string') {
-        const cleaned = extractReasoningSegments(value, collector.reasoningParts);
-        if (cleaned.length) {
-            collector.textParts.push(cleaned);
-        }
-        return;
-    }
-    if (Array.isArray(value)) {
-        for (const entry of value) {
-            collectText(entry, collector);
-        }
-        return;
-    }
-    if (typeof value === 'object') {
-        const record = value;
-        if (typeof record.text === 'string') {
-            collectText(record.text, collector);
-            return;
-        }
-        if (typeof record.content === 'string') {
-            collectText(record.content, collector);
-            return;
-        }
-        if (Array.isArray(record.content)) {
-            collectText(record.content, collector);
-            return;
-        }
-        if (record.type === 'image_url' && typeof record.image_url === 'string') {
-            collector.textParts.push(`[image:${record.image_url}]`);
-            return;
-        }
-        try {
-            collector.textParts.push(sanitizeReasoningTaggedText(JSON.stringify(record)));
-        }
-        catch {
-            collector.textParts.push(String(record));
-        }
-        return;
-    }
-    collector.textParts.push(sanitizeReasoningTaggedText(String(value)));
-}
+import { normalizeChatMessageContentWithNative } from '../../router/virtual-router/engine-selection/native-shared-conversion-semantics.js';
 export function normalizeChatMessageContent(content) {
-    const collector = { textParts: [], reasoningParts: [] };
-    collectText(content, collector);
-    const text = collector.textParts.join('');
-    const reasoning = collector.reasoningParts.join('\n');
-    return {
-        contentText: text.length ? text : undefined,
-        reasoningText: reasoning.length ? reasoning : undefined
-    };
+    return normalizeChatMessageContentWithNative(content);
 }

package/dist/conversion/shared/chat-request-filters.d.ts

@@ -1,9 +1,8 @@
 import type { ConversionContext, ConversionProfile } from '../types.js';
 /**
- * 统一的 Chat 请求侧过滤链路。
+ * Native-primary Chat request filters.
  *
- * 目标：
- * - 所有进入 Provider 的 Chat 形状请求（无论入口为 /v1/chat、/v1/responses 还是 /v1/messages），
- *   都在这里走同一套工具治理与参数标准化逻辑。
+ * Historical TS FilterEngine implementation archived at:
+ * - src/conversion/shared/archive/chat-request-filters.ts
  */
 export declare function runStandardChatRequestFilters(chatRequest: any, profile: ConversionProfile, context: ConversionContext): Promise<any>;

package/dist/conversion/shared/chat-request-filters.js

@@ -1,13 +1,11 @@
-import { FilterEngine, RequestToolCallsStringifyFilter, RequestToolChoicePolicyFilter } from '../../filters/index.js';
 import { normalizeChatRequest } from '../index.js';
-import { loadFieldMapConfig } from '../../filters/utils/fieldmap-loader.js';
-import { createSnapshotWriter } from './snapshot-utils.js';
+import { createSnapshotWriter } from '../snapshot-utils.js';
+import { buildGovernedFilterPayloadWithNativeFallback } from '../../router/virtual-router/engine-selection/native-chat-request-filter-semantics.js';
 /**
- * 统一的 Chat 请求侧过滤链路。
+ * Native-primary Chat request filters.
  *
- * 目标：
- * - 所有进入 Provider 的 Chat 形状请求（无论入口为 /v1/chat、/v1/responses 还是 /v1/messages），
- *   都在这里走同一套工具治理与参数标准化逻辑。
+ * Historical TS FilterEngine implementation archived at:
+ * - src/conversion/shared/archive/chat-request-filters.ts
  */
 export async function runStandardChatRequestFilters(chatRequest, profile, context) {
     const existingMetadata = context.metadata ?? {};
@@ -15,18 +13,13 @@ export async function runStandardChatRequestFilters(chatRequest, profile, contex
         context.metadata = existingMetadata;
     }
     const inboundStreamFromContext = typeof existingMetadata.inboundStream === 'boolean' ? existingMetadata.inboundStream : undefined;
-    const inboundStreamDetected = chatRequest && typeof chatRequest === 'object' && chatRequest.stream === true;
-    const normalizedInboundStream = inboundStreamFromContext ?? inboundStreamDetected ?? undefined;
+    const inboundStreamDetected = chatRequest && typeof chatRequest === 'object' && chatRequest.stream === true ? true : undefined;
+    const normalizedInboundStream = inboundStreamFromContext ?? inboundStreamDetected;
     if (typeof normalizedInboundStream === 'boolean') {
         existingMetadata.inboundStream = normalizedInboundStream;
     }
     const requestId = context.requestId ?? `req_${Date.now()}`;
-    const modelId = (chatRequest && typeof chatRequest === 'object' && typeof chatRequest.model === 'string')
-        ? String(chatRequest.model)
-        : 'unknown';
-    const endpoint = context.entryEndpoint ||
-        context.endpoint ||
-        '/v1/chat/completions';
+    const endpoint = context.entryEndpoint || context.endpoint || '/v1/chat/completions';
     const snapshot = createSnapshotWriter({
         requestId,
         endpoint,
@@ -38,78 +31,29 @@ export async function runStandardChatRequestFilters(chatRequest, profile, contex
         snapshot(stage, payload);
     };
     snapshotStage('req_process_filters_input', chatRequest);
-    const reqCtxBase = {
-        requestId,
-        model: modelId,
-        endpoint,
-        profile: profile.outgoingProtocol,
-        debug: { emit: () => { } }
-    };
-    const engine = new FilterEngine();
     const incomingProtocol = (profile.incomingProtocol || '').toLowerCase();
-    const entryEndpointLower = (endpoint || '').toLowerCase();
-    const originalToolCount = (chatRequest && typeof chatRequest === 'object' && Array.isArray(chatRequest.tools))
+    const entryEndpointLower = endpoint.toLowerCase();
+    const originalToolCount = chatRequest && typeof chatRequest === 'object' && Array.isArray(chatRequest.tools)
         ? chatRequest.tools.length
         : 0;
     const isAnthropicProfile = incomingProtocol === 'anthropic-messages' ||
         entryEndpointLower.includes('/v1/messages');
     const skipAutoToolInjection = isAnthropicProfile && originalToolCount === 0;
-    // Request-side initial filters（与 openai-openai-codec 保持一致）
-    if (!skipAutoToolInjection) {
-        try {
-            const { RequestToolListFilter } = await import('../../filters/index.js');
-            engine.registerFilter(new RequestToolListFilter());
-        }
-        catch {
-            // 可选过滤器，失败时保持向后兼容
-        }
-    }
-    engine.registerFilter(new RequestToolCallsStringifyFilter());
-    engine.registerFilter(new RequestToolChoicePolicyFilter());
-    // FieldMap：保持与 Chat 入口一致，使用 openai-openai.fieldmap.json
-    try {
-        const cfg = await loadFieldMapConfig('openai-openai.fieldmap.json');
-        if (cfg)
-            engine.setFieldMap(cfg);
-        engine.registerTransform('stringifyJson', (v) => (typeof v === 'string'
-            ? v
-            : (() => {
-                try {
-                    return JSON.stringify(v ?? {});
-                }
-                catch {
-                    return '{}';
-                }
-            })()));
-    }
-    catch {
-        // best-effort：缺少 fieldmap 时保持原样
-    }
-    let staged = await engine.run('request_pre', chatRequest, reqCtxBase);
-    snapshotStage('req_process_filters_request_pre', staged);
-    staged = await engine.run('request_map', staged, reqCtxBase);
-    snapshotStage('req_process_filters_request_map', staged);
-    staged = await engine.run('request_post', staged, reqCtxBase);
-    snapshotStage('req_process_filters_request_post', staged);
-    if (skipAutoToolInjection && staged && typeof staged === 'object') {
-        if (!Array.isArray(staged.tools)) {
-            staged.tools = [];
+    const nativeGovernedPayload = buildGovernedFilterPayloadWithNativeFallback(chatRequest);
+    if (skipAutoToolInjection && nativeGovernedPayload && typeof nativeGovernedPayload === 'object') {
+        if (!Array.isArray(nativeGovernedPayload.tools)) {
+            nativeGovernedPayload.tools = [];
         }
-        staged.__rcc_disable_mcp_tools = true;
+        nativeGovernedPayload.__rcc_disable_mcp_tools = true;
     }
-    // 归一化 Chat 请求后再做最终工具治理
-    let normalized = normalizeChatRequest(staged);
+    snapshotStage('req_process_filters_native_payload', nativeGovernedPayload);
+    let normalized = normalizeChatRequest(nativeGovernedPayload);
     snapshotStage('req_process_filters_normalized', normalized);
-    try {
-        const { RequestOpenAIToolsNormalizeFilter, ToolPostConstraintsFilter } = await import('../../filters/index.js');
-        engine.registerFilter(new RequestOpenAIToolsNormalizeFilter());
-        // 工具治理后的最后约束层：默认配置为空，由宿主/配置系统按 profile/provider/modelId 决定是否启用具体规则。
-        engine.registerFilter(new ToolPostConstraintsFilter('request_finalize'));
-        normalized = await engine.run('request_finalize', normalized, reqCtxBase);
-        snapshotStage('req_process_filters_request_finalize', normalized);
-    }
-    catch {
-        // 可选工具归一过滤器，失败时保持已归一化结果
+    if (skipAutoToolInjection && normalized && typeof normalized === 'object') {
+        if (!Array.isArray(normalized.tools)) {
+            normalized.tools = [];
+        }
+        normalized.__rcc_disable_mcp_tools = true;
     }
     const preserveStreamField = profile.incomingProtocol === 'openai-chat' && profile.outgoingProtocol === 'openai-chat';
     const pruned = pruneChatRequestPayload(normalized, { preserveStreamField });

package/dist/conversion/shared/gemini-tool-utils.d.ts

@@ -1,4 +1,4 @@
-import type { BridgeToolDefinition } from './bridge-message-types.js';
+import type { BridgeToolDefinition } from '../types/bridge-message-types.js';
 import type { MissingField } from '../hub/types/chat-envelope.js';
 import type { JsonValue, JsonObject } from '../hub/types/json.js';
 export declare function prepareGeminiToolsForBridge(rawTools: JsonValue | undefined, missing?: MissingField[]): BridgeToolDefinition[] | undefined;