@jsonstudio/llms 0.6.2172 → 0.6.2979

package/dist/conversion/hub/standardized-bridge.js

@@ -1,293 +1,16 @@
-import { isJsonObject, jsonClone } from './types/json.js';
-import { cloneRuntimeMetadata } from '../shared/runtime-metadata.js';
-const HUB_CAPTURE_KEY = '__hub_capture';
+import { chatEnvelopeToStandardizedWithNative } from '../../router/virtual-router/engine-selection/native-hub-pipeline-req-inbound-semantics.js';
+import { standardizedToChatEnvelopeWithNative } from '../../router/virtual-router/engine-selection/native-hub-pipeline-req-outbound-semantics.js';
 export function chatEnvelopeToStandardized(chat, options) {
-    const parameters = { ...(chat.parameters ?? {}) };
-    const model = extractModel(parameters);
-    const messages = chat.messages.map((message) => normalizeChatMessage(message));
-    const tools = normalizeTools(chat.tools);
-    const semantics = cloneSemantics(chat.semantics);
-    const metadataCaptured = {};
-    const hubState = {};
-    if (Array.isArray(chat.metadata?.missingFields) && chat.metadata?.missingFields.length) {
-        hubState.missingFields = chat.metadata.missingFields;
-    }
-    if (isJsonObject(chat.metadata?.providerMetadata)) {
-        hubState.providerMetadata = chat.metadata?.providerMetadata;
-    }
-    if (isJsonObject(chat.metadata?.protocolState)) {
-        hubState.protocolState = chat.metadata?.protocolState;
-    }
-    hubState.context = options.adapterContext;
-    if (hubStateContextPopulated(hubState)) {
-        metadataCaptured[HUB_CAPTURE_KEY] = hubState;
-    }
-    const standardized = {
-        model,
-        messages,
-        tools,
-        parameters: {
-            ...parameters
-        },
-        metadata: {
-            originalEndpoint: options.endpoint,
-            capturedContext: metadataCaptured,
-            requestId: options.requestId,
-            stream: parameters.stream === true
-        },
-        semantics
-    };
-    return standardized;
-}
-export function standardizedToChatEnvelope(request, options) {
-    const adapterContext = options.adapterContext;
-    const hubState = extractHubCapture(request);
-    const messages = request.messages.map((message) => {
-        const restoredContent = restoreMessageContent(message.content);
-        return {
-            role: message.role,
-            content: restoredContent,
-            tool_calls: mapToolCalls(message.tool_calls),
-            tool_call_id: message.tool_call_id,
-            name: message.name
-        };
+    return chatEnvelopeToStandardizedWithNative({
+        chatEnvelope: chat,
+        adapterContext: options.adapterContext,
+        endpoint: options.endpoint,
+        requestId: options.requestId
     });
-    const tools = mapStandardizedTools(request.tools);
-    const parameters = {
-        ...(request.parameters ?? {}),
-        model: request.model
-    };
-    const metadata = {
-        context: adapterContext
-    };
-    const sourceMeta = (request.metadata && typeof request.metadata === 'object'
-        ? request.metadata
-        : undefined);
-    // E1: internal runtime metadata must live under the __rt carrier (never as top-level metadata keys).
-    // Merge runtime hints from AdapterContext + StandardizedRequest.metadata (legacy/compat).
-    try {
-        const merged = {
-            ...(cloneRuntimeMetadata(adapterContext) ?? {}),
-            ...(cloneRuntimeMetadata(sourceMeta ?? null) ?? {})
-        };
-        if (sourceMeta && typeof sourceMeta === 'object') {
-            if (sourceMeta.webSearch && typeof sourceMeta.webSearch === 'object' && merged.webSearch === undefined) {
-                merged.webSearch = sourceMeta.webSearch;
-            }
-            if (sourceMeta.forceWebSearch === true && merged.forceWebSearch === undefined) {
-                merged.forceWebSearch = true;
-            }
-            if (sourceMeta.forceVision === true && merged.forceVision === undefined) {
-                merged.forceVision = true;
-            }
-        }
-        if (Object.keys(merged).length) {
-            metadata.__rt = merged;
-        }
-    }
-    catch {
-        // best-effort
-    }
-    if (typeof adapterContext.toolCallIdStyle === 'string' && adapterContext.toolCallIdStyle.length) {
-        metadata.toolCallIdStyle = adapterContext.toolCallIdStyle;
-    }
-    if (hubState?.missingFields) {
-        metadata.missingFields = hubState.missingFields;
-    }
-    if (hubState?.providerMetadata) {
-        metadata.providerMetadata = hubState.providerMetadata;
-    }
-    if (hubState?.protocolState) {
-        metadata.protocolState = hubState.protocolState;
-    }
-    return {
-        messages,
-        tools,
-        parameters,
-        metadata,
-        semantics: cloneSemantics(request.semantics)
-    };
-}
-function extractModel(parameters) {
-    const candidate = parameters.model;
-    if (typeof candidate === 'string' && candidate.trim()) {
-        return candidate.trim();
-    }
-    throw new Error('ChatEnvelope parameters must include model string');
-}
-function cloneSemantics(value) {
-    if (!value) {
-        return value;
-    }
-    return jsonClone(value);
 }
-function normalizeChatMessage(message) {
-    const normalized = {
-        role: message.role,
-        content: cloneMessageContent(message.content)
-    };
-    if (Array.isArray(message.tool_calls) && message.tool_calls.length) {
-        normalized.tool_calls = message.tool_calls
-            .map((tool) => normalizeToolCall(tool))
-            .filter((tool) => Boolean(tool));
-    }
-    if (typeof message.tool_call_id === 'string') {
-        normalized.tool_call_id = message.tool_call_id.trim();
-    }
-    if (typeof message.name === 'string' && message.name.trim()) {
-        normalized.name = message.name.trim();
-    }
-    return normalized;
-}
-function cloneMessageContent(content) {
-    if (content === undefined || content === null) {
-        return null;
-    }
-    if (typeof content === 'string') {
-        return content;
-    }
-    if (Array.isArray(content)) {
-        return cloneContentArray(content);
-    }
-    return String(content);
-}
-function restoreMessageContent(content) {
-    if (content === undefined) {
-        return undefined;
-    }
-    if (content === null) {
-        return null;
-    }
-    if (typeof content === 'string') {
-        return content;
-    }
-    return cloneContentArray(content);
-}
-function cloneContentArray(parts) {
-    return parts.map((part) => {
-        if (part && typeof part === 'object') {
-            return jsonClone(part);
-        }
-        const text = typeof part === 'string' ? part : String(part ?? '');
-        const fallback = {
-            type: 'text',
-            text
-        };
-        return fallback;
+export function standardizedToChatEnvelope(request, options) {
+    return standardizedToChatEnvelopeWithNative({
+        request: request,
+        adapterContext: options.adapterContext
     });
 }
-function normalizeToolCall(toolCall) {
-    if (!toolCall || typeof toolCall !== 'object') {
-        return null;
-    }
-    const { id, type, function: fn } = toolCall;
-    if (typeof id !== 'string' || !id.trim()) {
-        return null;
-    }
-    if (type !== 'function') {
-        return null;
-    }
-    const fnRecord = fn && typeof fn === 'object' ? fn : undefined;
-    const rawName = typeof fnRecord?.name === 'string' ? fnRecord.name : '';
-    const normalizedName = rawName.trim();
-    const args = fnRecord?.arguments;
-    const serializedArgs = typeof args === 'string' ? args : safeStringify(args ?? {});
-    return {
-        id: id.trim(),
-        type: 'function',
-        function: {
-            name: normalizedName.length ? normalizedName : rawName,
-            arguments: serializedArgs
-        }
-    };
-}
-function mapToolCalls(toolCalls) {
-    if (!Array.isArray(toolCalls) || !toolCalls.length) {
-        return undefined;
-    }
-    return toolCalls.map((tool) => ({
-        id: tool.id,
-        type: 'function',
-        function: {
-            name: tool.function.name,
-            arguments: tool.function.arguments
-        }
-    }));
-}
-function mapStandardizedTools(tools) {
-    if (!Array.isArray(tools) || !tools.length) {
-        return undefined;
-    }
-    return tools.map((tool) => ({
-        type: tool.type,
-        function: {
-            name: tool.function.name,
-            description: tool.function.description,
-            parameters: tool.function.parameters,
-            strict: tool.function.strict
-        }
-    }));
-}
-function normalizeTools(tools) {
-    if (!Array.isArray(tools) || !tools.length) {
-        return [];
-    }
-    const normalized = [];
-    for (const tool of tools) {
-        if (!tool || typeof tool !== 'object')
-            continue;
-        if (tool.type !== 'function')
-            continue;
-        const fn = tool.function;
-        if (!fn || typeof fn !== 'object')
-            continue;
-        const name = fn.name;
-        if (typeof name !== 'string' || !name.trim())
-            continue;
-        const parametersCast = fn.parameters;
-        normalized.push({
-            type: 'function',
-            function: {
-                name: name.trim(),
-                description: typeof fn.description === 'string'
-                    ? fn.description
-                    : undefined,
-                parameters: parametersCast ?? {
-                    type: 'object',
-                    properties: {}
-                },
-                strict: typeof fn.strict === 'boolean'
-                    ? fn.strict
-                    : undefined
-            }
-        });
-    }
-    return normalized;
-}
-function extractHubCapture(request) {
-    const captured = request.metadata?.capturedContext;
-    if (!captured || typeof captured !== 'object') {
-        return undefined;
-    }
-    const state = captured[HUB_CAPTURE_KEY];
-    if (!state || typeof state !== 'object') {
-        return undefined;
-    }
-    return state;
-}
-function safeStringify(value) {
-    if (typeof value === 'string')
-        return value;
-    try {
-        return JSON.stringify(value ?? {});
-    }
-    catch {
-        return String(value);
-    }
-}
-function hubStateContextPopulated(state) {
-    return Boolean(state.context ||
-        (state.missingFields && state.missingFields.length) ||
-        state.providerMetadata ||
-        (state.protocolState && Object.keys(state.protocolState).length));
-}

package/dist/conversion/hub/tool-governance/engine.js

@@ -1,4 +1,5 @@
 import { DEFAULT_TOOL_GOVERNANCE_RULES } from './rules.js';
+import { sanitizeResponsesFunctionNameWithNative } from '../../../router/virtual-router/engine-selection/native-hub-pipeline-resp-semantics.js';
 export class ToolGovernanceError extends Error {
     protocol;
     direction;
@@ -188,6 +189,10 @@ function createStats(protocol, direction) {
 function sanitizeName(rawName, rules, stats, field) {
     const defaultName = rules.defaultName ?? 'tool';
     let next = typeof rawName === 'string' ? rawName : '';
+    const nativeSanitized = sanitizeResponsesFunctionNameWithNative(next);
+    if (typeof nativeSanitized === 'string' && nativeSanitized.trim().length) {
+        next = nativeSanitized;
+    }
     let changed = false;
     if (rules.trimWhitespace !== false) {
         next = next.trim();

package/dist/conversion/hub/tool-governance/rules.js

@@ -1,24 +1,24 @@
+import { sanitizeResponsesFunctionNameWithNative } from '../../../router/virtual-router/engine-selection/native-hub-pipeline-resp-semantics.js';
 const ALPHA_NUMERIC = /[A-Za-z0-9_-]/;
 const LOWER_SNAKE = /[a-z0-9_-]/;
 function clonePattern(pattern) {
-    if (!pattern)
-        return undefined;
     const flags = pattern.flags.replace(/g/g, '');
     return new RegExp(pattern.source, flags);
 }
+const DEFAULT_TOOL_NAME = sanitizeResponsesFunctionNameWithNative('tool') ?? 'tool';
 export const DEFAULT_TOOL_GOVERNANCE_RULES = {
     'openai-chat': {
         request: {
             maxNameLength: 64,
             allowedCharacters: clonePattern(ALPHA_NUMERIC),
-            defaultName: 'tool',
+            defaultName: DEFAULT_TOOL_NAME,
             trimWhitespace: true,
             onViolation: 'truncate'
         },
         response: {
             maxNameLength: 64,
             allowedCharacters: clonePattern(ALPHA_NUMERIC),
-            defaultName: 'tool',
+            defaultName: DEFAULT_TOOL_NAME,
             trimWhitespace: true,
             onViolation: 'truncate'
         }
@@ -27,14 +27,14 @@ export const DEFAULT_TOOL_GOVERNANCE_RULES = {
         request: {
             maxNameLength: 64,
             allowedCharacters: clonePattern(ALPHA_NUMERIC),
-            defaultName: 'tool',
+            defaultName: DEFAULT_TOOL_NAME,
             trimWhitespace: true,
             onViolation: 'truncate'
         },
         response: {
             maxNameLength: 64,
             allowedCharacters: clonePattern(ALPHA_NUMERIC),
-            defaultName: 'tool',
+            defaultName: DEFAULT_TOOL_NAME,
             trimWhitespace: true,
             onViolation: 'truncate'
         }
@@ -44,7 +44,7 @@ export const DEFAULT_TOOL_GOVERNANCE_RULES = {
             maxNameLength: 64,
             allowedCharacters: clonePattern(LOWER_SNAKE),
             forceCase: 'lower',
-            defaultName: 'tool',
+            defaultName: DEFAULT_TOOL_NAME,
             trimWhitespace: true,
             onViolation: 'truncate'
         },
@@ -52,7 +52,7 @@ export const DEFAULT_TOOL_GOVERNANCE_RULES = {
             maxNameLength: 64,
             allowedCharacters: clonePattern(LOWER_SNAKE),
             forceCase: 'lower',
-            defaultName: 'tool',
+            defaultName: DEFAULT_TOOL_NAME,
             trimWhitespace: true,
             onViolation: 'truncate'
         }
@@ -61,14 +61,14 @@ export const DEFAULT_TOOL_GOVERNANCE_RULES = {
         request: {
             maxNameLength: 64,
             allowedCharacters: clonePattern(ALPHA_NUMERIC),
-            defaultName: 'tool',
+            defaultName: DEFAULT_TOOL_NAME,
             trimWhitespace: true,
             onViolation: 'truncate'
         },
         response: {
             maxNameLength: 64,
             allowedCharacters: clonePattern(ALPHA_NUMERIC),
-            defaultName: 'tool',
+            defaultName: DEFAULT_TOOL_NAME,
             trimWhitespace: true,
             onViolation: 'truncate'
         }

package/dist/conversion/hub/tool-session-compat.d.ts

@@ -3,11 +3,11 @@ import type { AdapterContext } from './types/chat-envelope.js';
 type ToolHistoryStatus = 'ok' | 'error' | 'unknown';
 export interface ToolHistoryMessageRecord {
     role: 'user' | 'assistant' | 'tool';
-    tool_use?: {
+    toolUse?: {
         id: string;
         name?: string;
     };
-    tool_result?: {
+    toolResult?: {
         id: string;
         name?: string;
         status: ToolHistoryStatus;

package/dist/conversion/hub/tool-session-compat.js

@@ -3,132 +3,8 @@ import fsSync from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
 import { extractSessionIdentifiersFromMetadata } from './pipeline/session-identifiers.js';
+import { normalizeToolSessionMessagesWithNative, updateToolSessionHistoryWithNative } from '../../router/virtual-router/engine-selection/native-hub-pipeline-req-outbound-semantics.js';
 const TOOL_HISTORY_ROOT = path.join(os.homedir(), '.routecodex', 'tool-history');
-const TOOL_UNKNOWN_PREFIX = '[RouteCodex] Tool call result unknown';
-function ensureArray(value) {
-    return Array.isArray(value) ? value : [];
-}
-function normalizeToolCallId(call) {
-    if (!call || typeof call !== 'object') {
-        return undefined;
-    }
-    const raw = call.id ??
-        call.tool_call_id ??
-        call.call_id;
-    if (typeof raw !== 'string') {
-        return undefined;
-    }
-    const trimmed = raw.trim();
-    return trimmed.length ? trimmed : undefined;
-}
-function normalizeToolMessageId(message) {
-    if (!message || typeof message !== 'object') {
-        return undefined;
-    }
-    const raw = message.tool_call_id ??
-        message.call_id ??
-        message.id;
-    if (typeof raw !== 'string') {
-        return undefined;
-    }
-    const trimmed = raw.trim();
-    return trimmed.length ? trimmed : undefined;
-}
-function findFirstNonToolIndex(messages, startIndex) {
-    let index = startIndex;
-    while (index < messages.length) {
-        const msg = messages[index];
-        if (!msg || typeof msg !== 'object') {
-            break;
-        }
-        const role = String(msg.role || '').toLowerCase();
-        if (role !== 'tool') {
-            break;
-        }
-        index += 1;
-    }
-    return index;
-}
-function findToolMessageIndex(messages, startIndex, callId) {
-    for (let i = startIndex; i < messages.length; i += 1) {
-        const msg = messages[i];
-        if (!msg || typeof msg !== 'object') {
-            continue;
-        }
-        const role = String(msg.role || '').toLowerCase();
-        if (role !== 'tool') {
-            continue;
-        }
-        const id = normalizeToolMessageId(msg);
-        if (id === callId) {
-            return i;
-        }
-    }
-    return -1;
-}
-function createUnknownToolMessage(callId, call) {
-    let name;
-    const fn = call && typeof call === 'object' ? call.function : undefined;
-    if (fn && typeof fn.name === 'string' && fn.name.trim().length) {
-        name = fn.name.trim();
-    }
-    const description = name ? `tool "${name}"` : 'tool call';
-    const content = `${TOOL_UNKNOWN_PREFIX}: ${description} (${callId}) did not produce a result in this session. Treat this tool as failed with unknown status.`;
-    const msg = {
-        role: 'tool',
-        tool_call_id: callId,
-        content
-    };
-    if (name) {
-        msg.name = name;
-    }
-    return msg;
-}
-function normalizeToolCallOrdering(messages) {
-    let index = 0;
-    while (index < messages.length) {
-        const message = messages[index];
-        if (!message || typeof message !== 'object') {
-            index += 1;
-            continue;
-        }
-        const role = String(message.role || '').toLowerCase();
-        if (role !== 'assistant') {
-            index += 1;
-            continue;
-        }
-        const toolCalls = ensureArray(message.tool_calls);
-        if (!toolCalls.length) {
-            index += 1;
-            continue;
-        }
-        let insertionIndex = index + 1;
-        for (const call of toolCalls) {
-            if (!call || typeof call !== 'object') {
-                continue;
-            }
-            const callId = normalizeToolCallId(call);
-            if (!callId) {
-                continue;
-            }
-            const existingIndex = findToolMessageIndex(messages, insertionIndex, callId);
-            if (existingIndex >= 0) {
-                if (existingIndex === insertionIndex) {
-                    insertionIndex += 1;
-                    continue;
-                }
-                const [relocated] = messages.splice(existingIndex, 1);
-                messages.splice(insertionIndex, 0, relocated);
-                insertionIndex += 1;
-                continue;
-            }
-            const placeholder = createUnknownToolMessage(callId, call);
-            messages.splice(insertionIndex, 0, placeholder);
-            insertionIndex += 1;
-        }
-        index = Math.max(index + 1, insertionIndex);
-    }
-}
 function sanitizeSessionId(raw) {
     const trimmed = raw.trim();
     if (!trimmed) {
@@ -173,116 +49,24 @@ async function persistSessionHistory(sessionId, history) {
         // history persistence must never block the main flow
     }
 }
-function collectToolHistoryRecords(messages) {
-    const now = new Date().toISOString();
-    const records = [];
-    for (const msg of messages) {
-        if (!msg || typeof msg !== 'object') {
-            continue;
-        }
-        const role = String(msg.role || '').toLowerCase();
-        if (role === 'assistant') {
-            const toolCalls = ensureArray(msg.tool_calls);
-            for (const call of toolCalls) {
-                const id = normalizeToolCallId(call);
-                if (!id) {
-                    continue;
-                }
-                const fn = call.function;
-                const name = fn && typeof fn.name === 'string' && fn.name.trim().length
-                    ? fn.name.trim()
-                    : undefined;
-                records.push({
-                    role: 'assistant',
-                    tool_use: { id, name },
-                    ts: now
-                });
-            }
-            continue;
-        }
-        if (role === 'tool') {
-            const id = normalizeToolMessageId(msg);
-            if (!id) {
-                continue;
-            }
-            const rawName = msg.name;
-            const name = typeof rawName === 'string' && rawName.trim().length ? rawName.trim() : undefined;
-            const content = msg.content;
-            const status = typeof content === 'string' && content.startsWith(TOOL_UNKNOWN_PREFIX) ? 'unknown' : 'ok';
-            records.push({
-                role: 'tool',
-                tool_result: { id, name, status },
-                ts: now
-            });
-        }
-    }
-    return records;
-}
-function buildUpdatedHistory(existing, delta) {
-    const prevMessages = existing?.lastMessages ?? [];
-    const combined = [...prevMessages, ...delta];
-    const trimmed = combined.slice(-10);
-    const pending = {};
-    for (const entry of trimmed) {
-        if (entry.tool_use) {
-            pending[entry.tool_use.id] = {
-                name: entry.tool_use.name,
-                ts: entry.ts
-            };
-        }
-        if (entry.tool_result) {
-            delete pending[entry.tool_result.id];
-        }
-    }
-    return {
-        lastMessages: trimmed,
-        pendingToolUses: pending,
-        updatedAt: new Date().toISOString()
-    };
-}
 export async function applyToolSessionCompat(chat, ctx) {
     if (!chat || !Array.isArray(chat.messages) || chat.messages.length === 0) {
         return;
     }
+    const normalized = normalizeToolSessionMessagesWithNative({
+        messages: chat.messages,
+        ...(Array.isArray(chat.toolOutputs) && chat.toolOutputs.length
+            ? { toolOutputs: chat.toolOutputs }
+            : {})
+    });
+    chat.messages = normalized.messages;
+    chat.toolOutputs = Array.isArray(normalized.toolOutputs) && normalized.toolOutputs.length
+        ? normalized.toolOutputs
+        : undefined;
     const entry = (ctx.entryEndpoint || '').toLowerCase();
     if (!entry.includes('/v1/messages')) {
-        normalizeToolCallOrdering(chat.messages);
         return;
     }
-    normalizeToolCallOrdering(chat.messages);
-    const validCallIds = new Set();
-    for (const msg of chat.messages) {
-        if (!msg || typeof msg !== 'object') {
-            continue;
-        }
-        const role = String(msg.role || '').toLowerCase();
-        if (role !== 'assistant') {
-            continue;
-        }
-        const toolCalls = ensureArray(msg.tool_calls);
-        for (const call of toolCalls) {
-            const id = normalizeToolCallId(call);
-            if (id) {
-                validCallIds.add(id);
-            }
-        }
-    }
-    if (Array.isArray(chat.toolOutputs) && chat.toolOutputs.length) {
-        const filtered = chat.toolOutputs.filter((entry) => {
-            if (!entry || typeof entry !== 'object') {
-                return false;
-            }
-            const rawId = entry.tool_call_id ??
-                entry.call_id ??
-                entry.id;
-            if (typeof rawId !== 'string') {
-                return false;
-            }
-            const trimmed = rawId.trim();
-            return trimmed.length > 0 && validCallIds.has(trimmed);
-        });
-        chat.toolOutputs = filtered.length ? filtered : undefined;
-    }
     const metadata = (chat.metadata || {});
     const identifiers = extractSessionIdentifiersFromMetadata(metadata);
     const sessionId = identifiers.sessionId;
@@ -290,10 +74,12 @@ export async function applyToolSessionCompat(chat, ctx) {
         return;
     }
     const history = await loadSessionHistory(sessionId);
-    const records = collectToolHistoryRecords(chat.messages);
-    if (!records.length && !history) {
+    const updated = updateToolSessionHistoryWithNative({
+        messages: chat.messages,
+        ...(history ? { existingHistory: history } : {})
+    });
+    if (!updated.history) {
         return;
     }
-    const updated = buildUpdatedHistory(history, records);
-    await persistSessionHistory(sessionId, updated);
+    await persistSessionHistory(sessionId, updated.history);
 }