@jsonstudio/llms 0.6.2172 → 0.6.3214

package/dist/conversion/shared/gemini-tool-utils.js

@@ -1,535 +1,20 @@
-import { jsonClone } from '../hub/types/json.js';
-function isPlainRecord(value) {
-    return !!value && typeof value === 'object' && !Array.isArray(value);
-}
-function normalizeSchemaMapEntries(value) {
-    if (!Array.isArray(value)) {
-        return undefined;
-    }
-    const out = {};
-    for (const entry of value) {
-        if (!isPlainRecord(entry)) {
-            return undefined;
-        }
-        const key = typeof entry.key === 'string' ? entry.key.trim() : '';
-        if (!key) {
-            return undefined;
-        }
-        if (!Object.prototype.hasOwnProperty.call(entry, 'value')) {
-            return undefined;
-        }
-        out[key] = entry.value;
-    }
-    return out;
-}
-function pickBestSchemaVariant(variants) {
-    if (!Array.isArray(variants) || variants.length === 0) {
-        return { type: 'object', properties: {} };
-    }
-    const score = (value) => {
-        if (!isPlainRecord(value)) {
-            return 0;
-        }
-        const type = typeof value.type === 'string' ? value.type.trim().toLowerCase() : '';
-        // Prefer 'string' to maximize compatibility (can carry arbitrary serialized content),
-        // then object/array, then primitives.
-        if (type === 'string')
-            return 100;
-        if (type === 'object')
-            return 80;
-        if (type === 'array')
-            return 60;
-        if (type === 'integer' || type === 'number' || type === 'boolean')
-            return 50;
-        return 10;
-    };
-    let best = variants[0];
-    let bestScore = score(best);
-    for (const candidate of variants.slice(1)) {
-        const candidateScore = score(candidate);
-        if (candidateScore > bestScore) {
-            best = candidate;
-            bestScore = candidateScore;
-        }
-    }
-    return best;
-}
-function normalizeSchemaTypes(value) {
-    if (!value || typeof value !== 'object') {
-        return value;
-    }
-    if (Array.isArray(value)) {
-        return value.map((entry) => normalizeSchemaTypes(entry));
-    }
-    const record = value;
-    const out = {};
-    for (const [key, val] of Object.entries(record)) {
-        if (key === 'type' && typeof val === 'string') {
-            // Antigravity-Manager alignment: keep JSON-Schema-like lowercase types.
-            out[key] = val.trim().toLowerCase();
-            continue;
-        }
-        if (key === 'type' && Array.isArray(val)) {
-            // Antigravity-Manager alignment: Gemini protobuf Schema.type is not repeating.
-            // JSON Schema may use union types like ["string","null"], which triggers:
-            // "Proto field is not repeating, cannot start list."
-            const candidates = val
-                .filter((entry) => typeof entry === 'string')
-                .map((entry) => String(entry).trim().toLowerCase())
-                .filter((entry) => entry && entry !== 'null');
-            const preferred = candidates.includes('string')
-                ? 'string'
-                : candidates.includes('object')
-                    ? 'object'
-                    : candidates.includes('array')
-                        ? 'array'
-                        : candidates.includes('integer')
-                            ? 'integer'
-                            : candidates.includes('number')
-                                ? 'number'
-                                : candidates.includes('boolean')
-                                    ? 'boolean'
-                                    : candidates[0];
-            if (preferred) {
-                out[key] = preferred;
-            }
-            continue;
-        }
-        if (key === 'properties') {
-            const normalizedMap = normalizeSchemaMapEntries(val);
-            if (normalizedMap) {
-                out[key] = normalizeSchemaTypes(normalizedMap);
-                continue;
-            }
-            if (val && typeof val === 'object') {
-                out[key] = normalizeSchemaTypes(val);
-                continue;
-            }
-        }
-        if (key === 'enum' && Array.isArray(val)) {
-            // Antigravity-Manager alignment: Gemini rejects non-string enum values in tool schemas.
-            out[key] = val.map((entry) => {
-                if (typeof entry === 'string')
-                    return entry;
-                if (entry === null)
-                    return 'null';
-                if (typeof entry === 'number' || typeof entry === 'boolean')
-                    return String(entry);
-                try {
-                    return JSON.stringify(entry);
-                }
-                catch {
-                    return String(entry);
-                }
-            });
-            continue;
-        }
-        if ((key === 'properties' || key === 'items') && val && typeof val === 'object') {
-            out[key] = normalizeSchemaTypes(val);
-            continue;
-        }
-        if ((key === 'anyOf' || key === 'oneOf' || key === 'allOf') && Array.isArray(val)) {
-            out[key] = val.map((entry) => normalizeSchemaTypes(entry));
-            continue;
-        }
-        out[key] = normalizeSchemaTypes(val);
-    }
-    return out;
-}
-function cloneParameters(value) {
-    if (value === null || typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean') {
-        return value;
-    }
-    if (Array.isArray(value)) {
-        return value.map((entry) => cloneParameters(entry));
-    }
-    if (isPlainRecord(value)) {
-        // Normalize JSON Schema const → enum to improve compatibility with functionDeclarations.parameters.
-        // Some upstreams reject `const` but accept `enum`.
-        if (Object.prototype.hasOwnProperty.call(value, 'const') && !Object.prototype.hasOwnProperty.call(value, 'enum')) {
-            const cloned = {};
-            for (const [key, entry] of Object.entries(value)) {
-                if (key === 'const') {
-                    cloned.enum = [cloneParameters(entry)];
-                    continue;
-                }
-                cloned[key] = cloneParameters(entry);
-            }
-            return cloned;
-        }
-        // Gemini function_declarations.parameters only support a subset of JSON Schema.
-        // Additionally, recent Antigravity/Gemini backends may produce MALFORMED_FUNCTION_CALL
-        // when schemas include combinators (oneOf/anyOf/allOf). Prefer a safe single-variant schema.
-        const combinator = Array.isArray(value.oneOf)
-            ? 'oneOf'
-            : Array.isArray(value.anyOf)
-                ? 'anyOf'
-                : Array.isArray(value.allOf)
-                    ? 'allOf'
-                    : undefined;
-        if (combinator) {
-            const variants = value[combinator];
-            const chosen = pickBestSchemaVariant(Array.isArray(variants) ? variants : []);
-            const simplified = cloneParameters(chosen);
-            // Preserve description if present on the wrapper node.
-            if (isPlainRecord(simplified) &&
-                typeof value.description === 'string' &&
-                typeof simplified.description !== 'string') {
-                simplified.description = String(value.description);
-            }
-            return simplified;
-        }
-        const cloned = {};
-        for (const [key, entry] of Object.entries(value)) {
-            // Antigravity-Manager alignment: some tool pipelines serialize schema maps as [{ key, value }, ...].
-            // Gemini expects `properties` to be an object/map, not a list.
-            if (key === 'properties') {
-                const normalizedMap = normalizeSchemaMapEntries(entry);
-                if (normalizedMap) {
-                    cloned.properties = cloneParameters(normalizedMap);
-                    continue;
-                }
-            }
-            // Antigravity-Manager alignment: Gemini protobuf Schema.type is not repeating.
-            // Drop union array types like ["string","null"] to a single stable type.
-            if (key === 'type' && Array.isArray(entry)) {
-                const candidates = entry
-                    .filter((v) => typeof v === 'string')
-                    .map((v) => String(v).trim().toLowerCase())
-                    .filter((v) => v && v !== 'null');
-                if (candidates.length) {
-                    // Prefer STRING to maximize compatibility.
-                    cloned.type = candidates.includes('string')
-                        ? 'string'
-                        : candidates.includes('object')
-                            ? 'object'
-                            : candidates.includes('array')
-                                ? 'array'
-                                : candidates.includes('integer')
-                                    ? 'integer'
-                                    : candidates.includes('number')
-                                        ? 'number'
-                                        : candidates.includes('boolean')
-                                            ? 'boolean'
-                                            : candidates[0];
-                }
-                continue;
-            }
-            // Gemini function_declarations.parameters only support a subset of JSON Schema.
-            // Drop meta/unsupported fields that cause INVALID_ARGUMENT, such as $schema/exclusiveMinimum/propertyNames.
-            if (typeof key === 'string') {
-                if (key.startsWith('$'))
-                    continue;
-                if (key === 'const')
-                    continue;
-                if (key === 'default' || key === 'examples' || key === 'example' || key === 'title')
-                    continue;
-                if (key === 'deprecated' || key === 'readOnly' || key === 'writeOnly')
-                    continue;
-                if (key === 'patternProperties' || key === 'dependentRequired' || key === 'dependentSchemas')
-                    continue;
-                if (key === 'unevaluatedProperties' || key === 'unevaluatedItems')
-                    continue;
-                if (key === 'contains' || key === 'minContains' || key === 'maxContains')
-                    continue;
-                if (key === 'contentEncoding' || key === 'contentMediaType' || key === 'contentSchema')
-                    continue;
-                if (key === 'if' || key === 'then' || key === 'else' || key === 'not')
-                    continue;
-                if (key === 'exclusiveMinimum' || key === 'exclusiveMaximum' || key === 'propertyNames')
-                    continue;
-                // Keep Gemini tool schemas mostly permissive to avoid upstream MALFORMED_FUNCTION_CALL on strict validation.
-                // Preserve `required` for Gemini validation (align with gcli2api), but still drop additionalProperties.
-                if (key === 'additionalProperties')
-                    continue;
-                if (key === 'external_web_access')
-                    continue;
-                // Combinators are handled at the node level above.
-                if (key === 'oneOf' || key === 'anyOf' || key === 'allOf')
-                    continue;
-            }
-            cloned[key] = cloneParameters(entry);
-        }
-        // Antigravity-Manager alignment: required must only reference keys present in properties.
-        const propNode = cloned.properties;
-        const reqNode = cloned.required;
-        if (isPlainRecord(propNode) && Array.isArray(reqNode)) {
-            const valid = new Set(Object.keys(propNode));
-            const filtered = reqNode.filter((v) => typeof v === 'string' && valid.has(v));
-            if (filtered.length) {
-                cloned.required = filtered;
-            }
-            else {
-                delete cloned.required;
-            }
-        }
-        return cloned;
-    }
-    return { type: 'object', properties: {} };
-}
-function declarationToBridge(declaration) {
-    if (!declaration || typeof declaration !== 'object') {
-        return null;
-    }
-    const def = declaration;
-    const name = typeof def.name === 'string' ? def.name : undefined;
-    if (!name) {
-        return null;
-    }
-    const description = typeof def.description === 'string' ? def.description : undefined;
-    const parameters = cloneParameters(def.parameters ?? { type: 'object', properties: {} });
-    return {
-        type: 'function',
-        function: {
-            name,
-            description,
-            parameters
-        }
-    };
-}
-function legacyToolToBridge(entry) {
-    const name = typeof entry.name === 'string' ? entry.name : undefined;
-    if (!name) {
-        return null;
-    }
-    const description = typeof entry.description === 'string' ? entry.description : undefined;
-    const parameters = cloneParameters(entry.parameters ?? { type: 'object', properties: {} });
-    return {
-        type: 'function',
-        function: {
-            name,
-            description,
-            parameters
-        }
-    };
-}
+import { buildGeminiToolsFromBridgeWithNative, prepareGeminiToolsForBridgeWithNative } from '../../router/virtual-router/engine-selection/native-shared-conversion-semantics.js';
 export function prepareGeminiToolsForBridge(rawTools, missing) {
     if (!rawTools) {
         return undefined;
     }
-    const arr = Array.isArray(rawTools) ? rawTools : [rawTools];
-    const defs = [];
-    arr.forEach((entry, index) => {
-        if (!entry || typeof entry !== 'object') {
-            missing?.push({
-                path: `tools[${index}]`,
-                reason: 'invalid_entry',
-                originalValue: jsonClone(entry)
-            });
-            return;
-        }
-        const obj = entry;
-        const declarations = Array.isArray(obj.functionDeclarations) ? obj.functionDeclarations : undefined;
-        if (declarations && declarations.length) {
-            declarations.forEach((decl, declIndex) => {
-                const converted = declarationToBridge(decl);
-                if (converted) {
-                    defs.push(converted);
-                }
-                else {
-                    missing?.push({ path: `tools[${index}].functionDeclarations[${declIndex}]`, reason: 'invalid_entry' });
-                }
-            });
-            return;
-        }
-        const converted = legacyToolToBridge(obj);
-        if (converted) {
-            defs.push(converted);
-            return;
-        }
-        missing?.push({ path: `tools[${index}]`, reason: 'invalid_entry' });
-    });
-    return defs.length ? defs : undefined;
+    const result = prepareGeminiToolsForBridgeWithNative(rawTools, Array.isArray(missing) ? missing : []);
+    if (Array.isArray(missing)) {
+        missing.splice(0, missing.length, ...result.missing);
+    }
+    const defs = result.defs;
+    return defs && defs.length ? defs : undefined;
 }
 export function buildGeminiToolsFromBridge(defs, options) {
     if (!defs || !defs.length) {
         return undefined;
     }
     const mode = options?.mode === 'antigravity' ? 'antigravity' : 'default';
-    // Cloud Code Assist / Gemini CLI is sensitive to tool array shape.
-    // Keep all function declarations in a single tool group to match gcli2api snapshots
-    // and avoid backend-specific limits on the number of tool groups.
-    const functionDeclarations = [];
-    const normalizeToolName = (name) => mode === 'antigravity' ? String(name || '').replace(/-/g, '_') : String(name || '');
-    const applyFixups = (name, parameters) => {
-        if (!parameters || typeof parameters !== 'object' || Array.isArray(parameters)) {
-            return parameters;
-        }
-        const params = parameters;
-        const propsRaw = params.properties;
-        const props = isPlainRecord(propsRaw) ? propsRaw : {};
-        const isAntigravity = mode === 'antigravity';
-        const lowered = String(name || '').trim().toLowerCase();
-        if (lowered === 'exec_command') {
-            // Keep Gemini tool schema aligned with both historical Codex and our runtime tool signature:
-            // - Codex CLI: { cmd, workdir }
-            // - Some history: { command, workdir }
-            // Strict Gemini validation (and/or tool selection) is sensitive to schema/arg drift.
-            // NOTE: Some upstream tool schemas encode cmd/command as `oneOf` (string|array),
-            // which Antigravity/Gemini can reject with MALFORMED_FUNCTION_CALL even when tool calling
-            // is disabled (toolConfig.mode=NONE). Force these fields to simple STRING.
-            // For Gemini wire, prefer `command` as the canonical key (gcli2api-style).
-            // The internal tool governor normalizes `command` → `cmd` before execution.
-            if (isAntigravity) {
-                try {
-                    if (Object.prototype.hasOwnProperty.call(props, 'cmd')) {
-                        delete props.cmd;
-                    }
-                }
-                catch {
-                    // ignore
-                }
-                props.command = {
-                    type: 'string',
-                    description: 'Shell command to execute.'
-                };
-                // Keep workdir simple (avoid anyOf string|null patterns).
-                props.workdir = { type: 'string', description: 'Working directory.' };
-            }
-            else {
-                if (!Object.prototype.hasOwnProperty.call(props, 'cmd') && Object.prototype.hasOwnProperty.call(props, 'command')) {
-                    props.cmd = props.command;
-                }
-                if (!Object.prototype.hasOwnProperty.call(props, 'command') && Object.prototype.hasOwnProperty.call(props, 'cmd')) {
-                    props.command = props.cmd;
-                }
-                if (!Object.prototype.hasOwnProperty.call(props, 'cmd')) {
-                    props.cmd = { type: 'string' };
-                }
-                if (!Object.prototype.hasOwnProperty.call(props, 'command')) {
-                    props.command = { type: 'string' };
-                }
-                if (!Object.prototype.hasOwnProperty.call(props, 'workdir')) {
-                    props.workdir = { type: 'string' };
-                }
-            }
-            params.properties = props;
-            // Avoid hard required keys for Gemini: the model may emit either alias (cmd/command),
-            // and "required" mismatch surfaces as MALFORMED_FUNCTION_CALL (empty reply) upstream.
-            try {
-                delete params.required;
-            }
-            catch {
-                params.required = undefined;
-            }
-            return params;
-        }
-        if (lowered === 'write_stdin') {
-            // Keep both aliases to avoid strict validation failures when the model echoes history.
-            if (!Object.prototype.hasOwnProperty.call(props, 'chars') && Object.prototype.hasOwnProperty.call(props, 'text')) {
-                props.chars = props.text;
-            }
-            if (!Object.prototype.hasOwnProperty.call(props, 'text') && Object.prototype.hasOwnProperty.call(props, 'chars')) {
-                props.text = props.chars;
-            }
-            if (!Object.prototype.hasOwnProperty.call(props, 'session_id')) {
-                props.session_id = { type: 'number' };
-            }
-            if (!Object.prototype.hasOwnProperty.call(props, 'chars')) {
-                props.chars = { type: 'string' };
-            }
-            params.properties = props;
-            try {
-                delete params.required;
-            }
-            catch {
-                params.required = undefined;
-            }
-            return params;
-        }
-        if (lowered === 'apply_patch') {
-            // Gemini function calling needs JSON args, but Codex tool docs often describe apply_patch as "freeform".
-            // To prevent MALFORMED_FUNCTION_CALL, accept common aliases used by various bridge layers:
-            // - patch: canonical patch text
-            // - input/instructions/text: historical aliases containing patch text
-            if (!Object.prototype.hasOwnProperty.call(props, 'patch')) {
-                props.patch = {
-                    type: 'string',
-                    description: 'Patch text (*** Begin Patch / *** End Patch or GNU unified diff).'
-                };
-            }
-            if (!Object.prototype.hasOwnProperty.call(props, 'input')) {
-                props.input = {
-                    type: 'string',
-                    description: 'Alias of patch (patch text). Prefer patch.'
-                };
-            }
-            if (!Object.prototype.hasOwnProperty.call(props, 'instructions')) {
-                props.instructions = {
-                    type: 'string',
-                    description: 'Alias of patch (patch text). Prefer patch.'
-                };
-            }
-            if (!Object.prototype.hasOwnProperty.call(props, 'text')) {
-                props.text = {
-                    type: 'string',
-                    description: 'Alias of patch (patch text). Prefer patch.'
-                };
-            }
-            params.properties = props;
-            try {
-                delete params.required;
-            }
-            catch {
-                params.required = undefined;
-            }
-            return params;
-        }
-        return params;
-    };
-    const rewriteDescription = (name, description) => {
-        if (mode !== 'antigravity') {
-            return description;
-        }
-        const lowered = String(name || '').trim().toLowerCase();
-        if (lowered === 'apply_patch') {
-            return ('Edit files by providing patch text in `patch` (string). ' +
-                'Supports "*** Begin Patch" / "*** End Patch" or GNU unified diff. ' +
-                '`input`/`instructions`/`text` are accepted as aliases.');
-        }
-        if (lowered === 'exec_command') {
-            return ('Run a shell command. Provide `cmd` (string) (alias: `command`) and optional `workdir` (string).');
-        }
-        if (lowered === 'write_stdin') {
-            return 'Write to an existing exec session. Provide `session_id` (number) and optional `chars` (string).';
-        }
-        return description;
-    };
-    defs.forEach((def) => {
-        if (!def || typeof def !== 'object') {
-            return;
-        }
-        const fnNode = def.function && typeof def.function === 'object' ? def.function : undefined;
-        const name = typeof fnNode?.name === 'string'
-            ? fnNode.name
-            : typeof def.name === 'string'
-                ? def.name
-                : undefined;
-        if (!name) {
-            return;
-        }
-        const finalName = normalizeToolName(name);
-        const description = typeof fnNode?.description === 'string'
-            ? fnNode.description
-            : typeof def.description === 'string'
-                ? def.description
-                : undefined;
-        const parameters = applyFixups(finalName, cloneParameters(fnNode?.parameters ?? def.parameters ?? { type: 'object', properties: {} }));
-        const normalizedParameters = mode === 'antigravity'
-            ? normalizeSchemaTypes(parameters)
-            : parameters;
-        functionDeclarations.push({
-            name: finalName,
-            description: rewriteDescription(finalName, description),
-            parameters: normalizedParameters
-        });
-    });
-    if (!functionDeclarations.length) {
-        return undefined;
-    }
-    return [
-        {
-            functionDeclarations
-        }
-    ];
+    const out = buildGeminiToolsFromBridgeWithNative(defs, mode);
+    return out && out.length ? out : undefined;
 }

package/dist/conversion/shared/openai-finalizer.js

@@ -1,6 +1,7 @@
 // OpenAI Chat finalizer: enforce canonical shapes without the legacy hook system.
 // - Ensures tool_calls use stringified JSON arguments and sets finish_reason='tool_calls' when applicable
 // - Normalizes potential tool messages (role:'tool') content to strict strings (JSON-stringify for objects)
+import { sanitizeReasoningTaggedTextWithNative } from '../../router/virtual-router/engine-selection/native-shared-conversion-semantics.js';
 function asObject(v) {
     return v && typeof v === 'object' && !Array.isArray(v) ? v : null;
 }
@@ -135,7 +136,7 @@ function applyChatReasoningPolicy(target, mode) {
 function normalizeReasoningField(container, mode) {
     const bag = container;
     const rawValue = typeof bag.reasoning_content === 'string' ? bag.reasoning_content : '';
-    const trimmed = rawValue.trim();
+    const trimmed = sanitizeReasoningTaggedTextWithNative(rawValue).trim();
     if (!trimmed && Object.prototype.hasOwnProperty.call(bag, 'reasoning_content')) {
         delete bag.reasoning_content;
         return;
@@ -150,6 +151,7 @@ function normalizeReasoningField(container, mode) {
     if (mode === 'append_to_content') {
         appendReasoningToContent(bag, trimmed);
         delete bag.reasoning_content;
+        return;
     }
 }
 function appendReasoningToContent(container, reasoning) {