@jsonstudio/llms 0.6.3238 → 0.6.3275

package/dist/conversion/bridge-actions.js

@@ -1,4 +1,4 @@
-import { applyBridgeCaptureToolResultsWithNative, applyBridgeEnsureToolPlaceholdersWithNative, applyBridgeNormalizeHistoryWithNative, applyBridgeNormalizeToolIdentifiersWithNative, applyBridgeEnsureSystemInstructionWithNative, applyBridgeInjectSystemInstructionWithNative, applyBridgeMetadataActionWithNative, applyBridgeReasoningExtractWithNative, applyBridgeResponsesOutputReasoningWithNative, ensureBridgeOutputFieldsWithNative } from '../router/virtual-router/engine-selection/native-hub-bridge-action-semantics.js';
+import { runBridgeActionPipelineWithNative } from '../router/virtual-router/engine-selection/native-hub-bridge-action-semantics.js';
 const registry = new Map();
 export function registerBridgeAction(name, action) {
     registry.set(name, action);
@@ -23,6 +23,42 @@ export function runBridgeActionPipeline(options) {
     const { stage, actions, protocol, moduleType, requestId, state } = options;
     if (!actions?.length)
         return;
+    const output = runBridgeActionPipelineWithNative({
+        stage,
+        actions: actions.map((entry) => ({
+            name: entry.name,
+            options: entry.options
+        })),
+        protocol,
+        moduleType,
+        requestId,
+        state: state
+    });
+    if (!output) {
+        return;
+    }
+    if (output && typeof output === 'object') {
+        const next = output;
+        const patch = {
+            messages: Array.isArray(next.messages) ? next.messages : state.messages,
+            ...(next.requiredAction && typeof next.requiredAction === 'object' && !Array.isArray(next.requiredAction)
+                ? { requiredAction: next.requiredAction }
+                : {}),
+            ...(Array.isArray(next.capturedToolResults)
+                ? { capturedToolResults: next.capturedToolResults }
+                : {}),
+            ...(next.rawRequest && typeof next.rawRequest === 'object' && !Array.isArray(next.rawRequest)
+                ? { rawRequest: next.rawRequest }
+                : {}),
+            ...(next.rawResponse && typeof next.rawResponse === 'object' && !Array.isArray(next.rawResponse)
+                ? { rawResponse: next.rawResponse }
+                : {}),
+            ...(next.metadata && typeof next.metadata === 'object' && !Array.isArray(next.metadata)
+                ? { metadata: next.metadata }
+                : {})
+        };
+        Object.assign(state, patch);
+    }
     for (const descriptor of actions) {
         if (!descriptor || typeof descriptor !== 'object')
             continue;
@@ -44,324 +80,3 @@ export function runBridgeActionPipeline(options) {
         }
     }
 }
-function ensureMessagesArray(state) {
-    if (!Array.isArray(state.messages)) {
-        state.messages = [];
-    }
-    return state.messages;
-}
-function ensureMetadataRecord(state) {
-    if (!state.metadata || typeof state.metadata !== 'object') {
-        state.metadata = {};
-    }
-    return state.metadata;
-}
-const injectSystemInstructionAction = (ctx) => {
-    const messages = ensureMessagesArray(ctx.state);
-    const normalized = applyBridgeInjectSystemInstructionWithNative({
-        stage: ctx.stage,
-        options: ctx.descriptor.options && typeof ctx.descriptor.options === 'object'
-            ? ctx.descriptor.options
-            : undefined,
-        messages,
-        rawRequest: ctx.state.rawRequest && typeof ctx.state.rawRequest === 'object'
-            ? ctx.state.rawRequest
-            : undefined
-    });
-    if (Array.isArray(normalized.messages)) {
-        applyMessagesInPlace(messages, normalized.messages);
-        ctx.state.messages = messages;
-    }
-};
-const ensureToolResponsePlaceholders = (ctx) => {
-    const messages = ensureMessagesArray(ctx.state);
-    if (!messages.length)
-        return;
-    const output = applyBridgeEnsureToolPlaceholdersWithNative({
-        stage: ctx.stage,
-        messages,
-        capturedToolResults: Array.isArray(ctx.state.capturedToolResults)
-            ? ctx.state.capturedToolResults
-            : undefined,
-        rawRequest: ctx.state.rawRequest && typeof ctx.state.rawRequest === 'object'
-            ? ctx.state.rawRequest
-            : undefined,
-        rawResponse: ctx.state.rawResponse && typeof ctx.state.rawResponse === 'object'
-            ? ctx.state.rawResponse
-            : undefined
-    });
-    if (Array.isArray(output.messages)) {
-        applyMessagesInPlace(messages, output.messages);
-        ctx.state.messages = messages;
-    }
-    ctx.state.capturedToolResults = applyCapturedToolResultsInPlace(ctx.state.capturedToolResults, output.toolOutputs);
-};
-const extractReasoningAction = (ctx) => {
-    const messages = ensureMessagesArray(ctx.state);
-    if (!messages.length)
-        return;
-    const dropFromContent = ctx.descriptor.options?.dropFromContent !== false;
-    const idPrefixBase = typeof ctx.descriptor.options?.idPrefix === 'string' && ctx.descriptor.options.idPrefix.trim().length
-        ? ctx.descriptor.options.idPrefix.trim()
-        : `${ctx.protocol ?? 'bridge'}_${ctx.stage}`;
-    const normalized = applyBridgeReasoningExtractWithNative({
-        messages,
-        dropFromContent,
-        idPrefixBase
-    });
-    if (Array.isArray(normalized.messages)) {
-        applyMessagesInPlace(messages, normalized.messages);
-        ctx.state.messages = messages;
-    }
-};
-registerBridgeAction('messages.inject-system-instruction', injectSystemInstructionAction);
-registerBridgeAction('reasoning.extract', extractReasoningAction);
-registerBridgeAction('tools.ensure-response-placeholders', ensureToolResponsePlaceholders);
-// (intentionally no-op: capture handled in responses-format normalization)
-const ensureSystemInstructionAction = (ctx) => {
-    const messages = ensureMessagesArray(ctx.state);
-    const normalized = applyBridgeEnsureSystemInstructionWithNative({
-        stage: ctx.stage,
-        messages,
-        metadata: ctx.state.metadata && typeof ctx.state.metadata === 'object'
-            ? ctx.state.metadata
-            : undefined
-    });
-    if (Array.isArray(normalized.messages)) {
-        applyMessagesInPlace(messages, normalized.messages);
-        ctx.state.messages = messages;
-    }
-    const metadata = applyObjectInPlace(ctx.state.metadata, normalized.metadata);
-    if (metadata) {
-        ctx.state.metadata = metadata;
-    }
-};
-const normalizeHistoryAction = (ctx) => {
-    if (ctx.stage !== 'request_outbound') {
-        return;
-    }
-    const messages = ensureMessagesArray(ctx.state);
-    if (!messages.length) {
-        return;
-    }
-    const toolsNode = ctx.state.rawRequest &&
-        typeof ctx.state.rawRequest === 'object' &&
-        Array.isArray(ctx.state.rawRequest.tools)
-        ? ctx.state.rawRequest.tools
-        : undefined;
-    const normalized = applyBridgeNormalizeHistoryWithNative({
-        messages,
-        tools: toolsNode
-    });
-    if (Array.isArray(normalized.messages)) {
-        applyMessagesInPlace(messages, normalized.messages);
-        ctx.state.messages = messages;
-    }
-    if (normalized.bridgeHistory && typeof normalized.bridgeHistory === 'object' && !Array.isArray(normalized.bridgeHistory)) {
-        const metadata = ensureMetadataRecord(ctx.state);
-        metadata.bridgeHistory = normalized.bridgeHistory;
-    }
-};
-const ensureOutputFieldsAction = (ctx) => {
-    if (ctx.stage !== 'request_outbound') {
-        return;
-    }
-    const messages = ensureMessagesArray(ctx.state);
-    if (!messages.length) {
-        return;
-    }
-    const fallback = typeof ctx.descriptor.options?.toolFallback === 'string' && ctx.descriptor.options.toolFallback.trim().length
-        ? ctx.descriptor.options.toolFallback.trim()
-        : 'Tool call completed (no output).';
-    const assistantFallback = typeof ctx.descriptor.options?.assistantFallback === 'string' && ctx.descriptor.options.assistantFallback.trim().length
-        ? ctx.descriptor.options.assistantFallback.trim()
-        : 'Assistant response unavailable.';
-    const normalized = ensureBridgeOutputFieldsWithNative({
-        messages,
-        toolFallback: fallback,
-        assistantFallback
-    });
-    if (Array.isArray(normalized.messages)) {
-        applyMessagesInPlace(messages, normalized.messages);
-        ctx.state.messages = messages;
-    }
-};
-const ensureToolPlaceholdersAction = (ctx) => {
-    ensureToolResponsePlaceholders(ctx);
-};
-const captureToolResultsAction = (ctx) => {
-    const output = applyBridgeCaptureToolResultsWithNative({
-        stage: ctx.stage,
-        capturedToolResults: Array.isArray(ctx.state.capturedToolResults)
-            ? ctx.state.capturedToolResults
-            : undefined,
-        rawRequest: ctx.state.rawRequest && typeof ctx.state.rawRequest === 'object'
-            ? ctx.state.rawRequest
-            : undefined,
-        rawResponse: ctx.state.rawResponse && typeof ctx.state.rawResponse === 'object'
-            ? ctx.state.rawResponse
-            : undefined,
-        metadata: ctx.state.metadata && typeof ctx.state.metadata === 'object'
-            ? ctx.state.metadata
-            : undefined
-    });
-    ctx.state.capturedToolResults = applyCapturedToolResultsInPlace(ctx.state.capturedToolResults, output.capturedToolResults);
-    const metadata = applyObjectInPlace(ctx.state.metadata, output.metadata);
-    if (metadata) {
-        ctx.state.metadata = metadata;
-    }
-};
-const attachReasoningOutputAction = (ctx) => {
-    responsesOutputReasoningAction(ctx);
-};
-registerBridgeAction('messages.ensure-system-instruction', ensureSystemInstructionAction);
-registerBridgeAction('messages.normalize-history', normalizeHistoryAction);
-registerBridgeAction('messages.ensure-output-fields', ensureOutputFieldsAction);
-registerBridgeAction('tools.ensure-placeholders', ensureToolPlaceholdersAction);
-registerBridgeAction('tools.capture-results', captureToolResultsAction);
-registerBridgeAction('reasoning.attach-output', attachReasoningOutputAction);
-function deriveToolIdPrefix(ctx) {
-    if (typeof ctx.descriptor.options?.idPrefix === 'string' && ctx.descriptor.options.idPrefix.trim().length) {
-        return ctx.descriptor.options.idPrefix.trim();
-    }
-    if (typeof ctx.requestId === 'string' && ctx.requestId.trim().length) {
-        const safe = ctx.requestId.trim().replace(/[^A-Za-z0-9]/g, '');
-        if (safe.length) {
-            return `${safe.slice(-24)}_tool`;
-        }
-    }
-    const base = ctx.protocol || 'bridge';
-    return `${base}_tool`;
-}
-function overwriteRecordInPlace(target, source) {
-    for (const key of Object.keys(target)) {
-        delete target[key];
-    }
-    for (const [key, value] of Object.entries(source)) {
-        target[key] = value;
-    }
-}
-function applyMessagesInPlace(current, next) {
-    const normalizedNext = next.filter((entry) => Boolean(entry) && typeof entry === 'object' && !Array.isArray(entry));
-    const nextLength = normalizedNext.length;
-    for (let i = 0; i < nextLength; i++) {
-        const nextEntry = normalizedNext[i];
-        const currentEntry = current[i];
-        if (currentEntry && typeof currentEntry === 'object' && !Array.isArray(currentEntry)) {
-            overwriteRecordInPlace(currentEntry, nextEntry);
-            continue;
-        }
-        current[i] = { ...nextEntry };
-    }
-    if (current.length > nextLength) {
-        current.splice(nextLength);
-    }
-}
-function applyObjectInPlace(current, next) {
-    if (!next || typeof next !== 'object' || Array.isArray(next)) {
-        return undefined;
-    }
-    const nextRecord = next;
-    if (current && typeof current === 'object' && !Array.isArray(current)) {
-        overwriteRecordInPlace(current, nextRecord);
-        return current;
-    }
-    return { ...nextRecord };
-}
-function applyCapturedToolResultsInPlace(current, next) {
-    if (!Array.isArray(next)) {
-        return current;
-    }
-    const normalizedNext = next
-        .filter((entry) => Boolean(entry) && typeof entry === 'object' && !Array.isArray(entry))
-        .map((entry) => ({ ...entry }));
-    if (!Array.isArray(current)) {
-        return normalizedNext;
-    }
-    current.splice(0, current.length, ...normalizedNext);
-    return current;
-}
-const normalizeToolIdentifiersAction = (ctx) => {
-    const messages = ensureMessagesArray(ctx.state);
-    const idPrefix = deriveToolIdPrefix(ctx);
-    const normalized = applyBridgeNormalizeToolIdentifiersWithNative({
-        stage: ctx.stage,
-        protocol: ctx.protocol,
-        moduleType: ctx.moduleType,
-        messages,
-        rawRequest: ctx.state.rawRequest,
-        capturedToolResults: Array.isArray(ctx.state.capturedToolResults)
-            ? ctx.state.capturedToolResults
-            : undefined,
-        idPrefix
-    });
-    if (Array.isArray(normalized.messages)) {
-        applyMessagesInPlace(messages, normalized.messages);
-        ctx.state.messages = messages;
-    }
-    const rawRequest = applyObjectInPlace(ctx.state.rawRequest, normalized.rawRequest);
-    if (rawRequest) {
-        ctx.state.rawRequest = rawRequest;
-    }
-    ctx.state.capturedToolResults = applyCapturedToolResultsInPlace(ctx.state.capturedToolResults, normalized.capturedToolResults);
-};
-registerBridgeAction('tools.normalize-call-ids', normalizeToolIdentifiersAction);
-const responsesOutputReasoningAction = (ctx) => {
-    if (ctx.stage !== 'response_inbound')
-        return;
-    const messages = ensureMessagesArray(ctx.state);
-    const normalized = applyBridgeResponsesOutputReasoningWithNative({
-        messages,
-        rawResponse: ctx.state.rawResponse && typeof ctx.state.rawResponse === 'object'
-            ? ctx.state.rawResponse
-            : undefined,
-        idPrefix: `${ctx.protocol ?? 'responses'}_${ctx.stage}_output`
-    });
-    if (Array.isArray(normalized.messages)) {
-        applyMessagesInPlace(messages, normalized.messages);
-        ctx.state.messages = messages;
-    }
-};
-registerBridgeAction('responses.output-reasoning', responsesOutputReasoningAction);
-function applyMetadataActionWithNative(ctx, actionName) {
-    const output = applyBridgeMetadataActionWithNative({
-        actionName,
-        stage: ctx.stage,
-        options: ctx.descriptor.options && typeof ctx.descriptor.options === 'object'
-            ? ctx.descriptor.options
-            : undefined,
-        rawRequest: ctx.state.rawRequest && typeof ctx.state.rawRequest === 'object'
-            ? ctx.state.rawRequest
-            : undefined,
-        rawResponse: ctx.state.rawResponse && typeof ctx.state.rawResponse === 'object'
-            ? ctx.state.rawResponse
-            : undefined,
-        metadata: ctx.state.metadata && typeof ctx.state.metadata === 'object'
-            ? ctx.state.metadata
-            : undefined
-    });
-    const rawRequest = applyObjectInPlace(ctx.state.rawRequest, output.rawRequest);
-    if (rawRequest) {
-        ctx.state.rawRequest = rawRequest;
-    }
-    const rawResponse = applyObjectInPlace(ctx.state.rawResponse, output.rawResponse);
-    if (rawResponse) {
-        ctx.state.rawResponse = rawResponse;
-    }
-    const metadata = applyObjectInPlace(ctx.state.metadata, output.metadata);
-    if (metadata) {
-        ctx.state.metadata = metadata;
-    }
-}
-const metadataExtraFieldsAction = (ctx) => {
-    applyMetadataActionWithNative(ctx, 'metadata.extra-fields');
-};
-const metadataProviderFieldAction = (ctx) => {
-    applyMetadataActionWithNative(ctx, 'metadata.provider-field');
-};
-const metadataProviderSentinelAction = (ctx) => {
-    applyMetadataActionWithNative(ctx, 'metadata.provider-sentinel');
-};
-registerBridgeAction('metadata.extra-fields', metadataExtraFieldsAction);
-registerBridgeAction('metadata.provider-field', metadataProviderFieldAction);
-registerBridgeAction('metadata.provider-sentinel', metadataProviderSentinelAction);

package/dist/conversion/bridge-instructions.js

@@ -1,114 +1,17 @@
-import { sanitizeReasoningTaggedTextWithNative } from '../router/virtual-router/engine-selection/native-shared-conversion-semantics.js';
-function collectTextFromBlocks(blocks) {
-    const parts = [];
-    for (const block of blocks) {
-        if (!block || typeof block !== 'object')
-            continue;
-        const type = typeof block.type === 'string' ? block.type.toLowerCase() : '';
-        if ((type === 'input_text' || type === 'output_text' || type === 'text' || type === 'commentary') && typeof block.text === 'string') {
-            const text = block.text.trim();
-            if (text)
-                parts.push(text);
-            continue;
-        }
-        if (type === 'message' && Array.isArray(block.content)) {
-            const nested = collectTextFromBlocks(block.content);
-            if (nested)
-                parts.push(nested);
-            continue;
-        }
-        if (typeof block.content === 'string') {
-            const text = block.content.trim();
-            if (text)
-                parts.push(text);
-            continue;
-        }
-        if (Array.isArray(block.content)) {
-            const nested = collectTextFromBlocks(block.content);
-            if (nested)
-                parts.push(nested);
-            continue;
-        }
-        if (typeof block.text === 'string') {
-            const text = block.text.trim();
-            if (text)
-                parts.push(text);
-        }
-    }
-    return parts.join('\n');
-}
-function extractSystemInstruction(entry) {
-    if (!entry || typeof entry !== 'object')
-        return null;
-    const roleSource = entry.role ?? entry.message?.role;
-    const role = typeof roleSource === 'string' ? roleSource.toLowerCase() : '';
-    if (role !== 'system')
-        return null;
-    const collected = [];
-    if (Array.isArray(entry.content)) {
-        const text = collectTextFromBlocks(entry.content);
-        if (text.trim())
-            collected.push(text.trim());
-    }
-    else if (typeof entry.content === 'string') {
-        const text = entry.content.trim();
-        if (text)
-            collected.push(text);
-    }
-    if (typeof entry.text === 'string') {
-        const text = entry.text.trim();
-        if (text)
-            collected.push(text);
-    }
-    const message = entry.message;
-    if (message && typeof message === 'object') {
-        if (Array.isArray(message.content)) {
-            const text = collectTextFromBlocks(message.content);
-            if (text.trim())
-                collected.push(text.trim());
-        }
-        else if (typeof message.content === 'string') {
-            const text = message.content.trim();
-            if (text)
-                collected.push(text);
+import { ensureBridgeInstructionsWithNative } from '../router/virtual-router/engine-selection/native-shared-conversion-semantics.js';
+export function ensureBridgeInstructions(payload) {
+    const normalized = ensureBridgeInstructionsWithNative(payload);
+    if (normalized && typeof normalized === 'object') {
+        if (Object.prototype.hasOwnProperty.call(normalized, 'input')) {
+            payload.input = normalized.input;
         }
-        if (typeof message.text === 'string') {
-            const text = String(message.text).trim();
-            if (text)
-                collected.push(text);
+        if (Object.prototype.hasOwnProperty.call(normalized, 'instructions')) {
+            payload.instructions = normalized.instructions;
         }
-    }
-    const merged = sanitizeReasoningTaggedTextWithNative(collected.join('\n')).trim();
-    return merged ? merged : null;
-}
-export function ensureBridgeInstructions(payload) {
-    let instructions = typeof payload.instructions === 'string' ? payload.instructions : '';
-    const hasClientInstruction = typeof payload.instructions === 'string' && payload.instructions.length > 0;
-    const input = Array.isArray(payload.input) ? payload.input : undefined;
-    if (input && input.length) {
-        for (let i = 0; i < input.length; i += 1) {
-            const entry = input[i];
-            const roleSource = entry?.role ?? entry?.message?.role;
-            const role = typeof roleSource === 'string' ? roleSource.toLowerCase() : '';
-            if (role === 'system') {
-                const text = extractSystemInstruction(entry);
-                input.splice(i, 1);
-                i -= 1;
-                if (text && text.trim()) {
-                    if (!hasClientInstruction && !instructions) {
-                        instructions = text.trim();
-                    }
-                }
-                continue;
-            }
+        else if (Object.prototype.hasOwnProperty.call(payload, 'instructions')) {
+            delete payload.instructions;
         }
     }
-    if (instructions) {
-        payload.instructions = instructions;
-        return instructions;
-    }
-    if (typeof payload.instructions !== 'undefined') {
-        delete payload.instructions;
-    }
-    return undefined;
+    const instructions = payload.instructions;
+    return typeof instructions === 'string' && instructions.length ? instructions : undefined;
 }

package/dist/conversion/codecs/anthropic-openai-codec.js

@@ -17,7 +17,7 @@ export class AnthropicOpenAIConversionCodec {
             await this.initialize();
         }
         const model = String(payload?.model || 'unknown');
-        const { messages } = buildOpenAIChatFromAnthropic(payload);
+        const { messages } = buildOpenAIChatFromAnthropic(payload, { includeToolCallIds: true });
         const out = { model, messages };
         const aliasMap = buildAnthropicToolAliasMap(payload?.tools);
         if (aliasMap) {

package/dist/conversion/compat/actions/anthropic-claude-code-system-prompt.js

@@ -16,6 +16,42 @@ function readTrimmedString(value) {
     const trimmed = value.trim();
     return trimmed.length ? trimmed : undefined;
 }
+function shouldInjectThinking(value) {
+    if (value === undefined || value === null) {
+        return true;
+    }
+    if (typeof value === 'boolean') {
+        return value !== false;
+    }
+    if (isRecord(value)) {
+        const type = readTrimmedString(value.type);
+        return !type;
+    }
+    if (typeof value === 'string') {
+        return value.trim().length === 0;
+    }
+    return true;
+}
+function resolveEffort(model) {
+    const modelId = readTrimmedString(model)?.toLowerCase() || '';
+    return modelId.startsWith('glm-5') ? 'high' : 'medium';
+}
+function ensureAdaptiveThinking(root) {
+    if (shouldInjectThinking(root.thinking)) {
+        root.thinking = { type: 'adaptive' };
+    }
+}
+function ensureOutputEffort(root) {
+    const effort = resolveEffort(root.model);
+    if (isRecord(root.output_config)) {
+        const outputConfig = root.output_config;
+        if (!readTrimmedString(outputConfig.effort)) {
+            outputConfig.effort = effort;
+        }
+        return;
+    }
+    root.output_config = { effort };
+}
 function isClaudeCodeUserId(value) {
     const trimmed = readTrimmedString(value);
     if (!trimmed)
@@ -209,6 +245,8 @@ export function applyAnthropicClaudeCodeSystemPromptCompat(payload, config, adap
         .filter((b) => b.text !== systemText);
     // Normalize: force system into a single text block.
     root.system = [{ type: 'text', text: systemText }];
+    ensureAdaptiveThinking(root);
+    ensureOutputEffort(root);
     if (preserveExisting && existingBlocks.length) {
         const messages = Array.isArray(root.messages) ? root.messages : [];
         if (messages.length || root.messages !== undefined) {