@jsonstudio/llms 0.6.473 → 0.6.568

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

@@ -360,7 +360,9 @@ export function buildOpenAIChatFromGeminiResponse(payload) {
     if (Number.isFinite(totalTokens))
         usage.total_tokens = totalTokens;
     const combinedText = textParts.join('\n');
-    const normalized = combinedText.length ? normalizeChatMessageContent(combinedText) : { contentText: undefined, reasoningText: undefined };
+    const normalized = combinedText.length
+        ? normalizeChatMessageContent(combinedText)
+        : { contentText: undefined, reasoningText: undefined };
     const baseContent = normalized.contentText ?? combinedText ?? '';
     const toolResultBlock = toolResultTexts.length ? toolResultTexts.join('\n') : '';
     const finalContent = toolResultBlock && baseContent
@@ -525,16 +527,43 @@ export function buildGeminiFromOpenAIChat(chatResp) {
         let argsStruct;
         const rawArgs = fn.arguments;
         if (typeof rawArgs === 'string') {
+            const trimmed = rawArgs.trim();
+            if (trimmed.startsWith('{')) {
+                try {
+                    const parsed = JSON.parse(rawArgs);
+                    if (isObject(parsed)) {
+                        argsStruct = parsed;
+                    }
+                    else {
+                        argsStruct = { _raw: rawArgs };
+                    }
+                }
+                catch {
+                    argsStruct = { _raw: rawArgs };
+                }
+            }
+            else {
+                argsStruct = { _raw: rawArgs };
+            }
+        }
+        else if (isObject(rawArgs)) {
+            argsStruct = rawArgs;
+        }
+        else if (Array.isArray(rawArgs)) {
             try {
-                argsStruct = JSON.parse(rawArgs);
+                argsStruct = { _raw: JSON.stringify(rawArgs) };
             }
             catch {
-                argsStruct = { _raw: rawArgs };
+                argsStruct = { _raw: String(rawArgs) };
             }
         }
+        else if (rawArgs != null) {
+            argsStruct = { _raw: String(rawArgs) };
+        }
         else {
-            argsStruct = rawArgs ?? {};
+            argsStruct = {};
         }
+        // Gemini request/response wire uses `args` for functionCall payload.
         const functionCall = { name, args: argsStruct };
         const id = typeof tc.id === 'string' ? String(tc.id) : undefined;
         if (id)

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

@@ -89,8 +89,9 @@ export class OpenAIOpenAIConversionCodec {
         // Response-side filters (idempotent w.r.t existing logic)
         engine.registerFilter(new ResponseToolTextCanonicalizeFilter()); // response_pre
         try {
-            const { ResponseToolArgumentsToonDecodeFilter } = await import('../../filters/index.js');
+            const { ResponseToolArgumentsToonDecodeFilter, ResponseApplyPatchToonDecodeFilter } = await import('../../filters/index.js');
             engine.registerFilter(new ResponseToolArgumentsToonDecodeFilter()); // response_pre, runs before stringify
+            engine.registerFilter(new ResponseApplyPatchToonDecodeFilter()); // response_pre, runs before stringify
         }
         catch { /* optional */ }
         engine.registerFilter(new ResponseToolArgumentsStringifyFilter()); // response_post

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

@@ -147,11 +147,12 @@ export class ResponsesOpenAIConversionCodec {
             debug: { emit: () => { } }
         };
         const engine = new FilterEngine();
-        // Response-side filters：文本标准化 → TOON decode（可选）→ shell/basics → finish_reason 不变式
+        // Response-side filters：文本标准化 → TOON decode（可选）→ apply_patch 结构化补丁规范化 → shell/basics → finish_reason 不变式
         engine.registerFilter(new ResponseToolTextCanonicalizeFilter()); // response_pre
         try {
-            const { ResponseToolArgumentsToonDecodeFilter } = await import('../../filters/index.js');
+            const { ResponseToolArgumentsToonDecodeFilter, ResponseApplyPatchToonDecodeFilter } = await import('../../filters/index.js');
             engine.registerFilter(new ResponseToolArgumentsToonDecodeFilter()); // response_pre, runs before stringify
+            engine.registerFilter(new ResponseApplyPatchToonDecodeFilter()); // response_pre, runs before stringify
         }
         catch { /* optional */ }
         engine.registerFilter(new ResponseToolArgumentsStringifyFilter()); // response_post

package/dist/conversion/compat/actions/claude-thinking-tools.d.ts

@@ -0,0 +1,15 @@
+import type { JsonObject } from '../../hub/types/json.js';
+import type { AdapterContext } from '../../hub/types/chat-envelope.js';
+/**
+ * Compat for Claude models routed via antigravity on gemini-chat.
+ *
+ * Anthropic requires tools[*].custom.input_schema to be valid JSON Schema draft 2020-12.
+ * We currently send OpenAI-style parameters which may not fully conform, causing upstream
+ * invalid_request_error on tools.N.custom.input_schema.
+ *
+ * For safety, when we detect the antigravity.*.claude-* path over gemini-chat,
+ * we aggressively simplify Gemini functionDeclarations[*].parameters to a minimal
+ * but valid object schema, letting RouteCodex govern tool semantics while keeping
+ * Anthropic's schema validator happy.
+ */
+export declare function applyClaudeThinkingToolSchemaCompat(payload: JsonObject, adapterContext?: AdapterContext): JsonObject;

package/dist/conversion/compat/actions/claude-thinking-tools.js

@@ -0,0 +1,72 @@
+const isRecord = (value) => typeof value === 'object' && value !== null && !Array.isArray(value);
+/**
+ * Compat for Claude models routed via antigravity on gemini-chat.
+ *
+ * Anthropic requires tools[*].custom.input_schema to be valid JSON Schema draft 2020-12.
+ * We currently send OpenAI-style parameters which may not fully conform, causing upstream
+ * invalid_request_error on tools.N.custom.input_schema.
+ *
+ * For safety, when we detect the antigravity.*.claude-* path over gemini-chat,
+ * we aggressively simplify Gemini functionDeclarations[*].parameters to a minimal
+ * but valid object schema, letting RouteCodex govern tool semantics while keeping
+ * Anthropic's schema validator happy.
+ */
+export function applyClaudeThinkingToolSchemaCompat(payload, adapterContext) {
+    const modelRaw = payload.model;
+    const modelId = typeof modelRaw === 'string' ? modelRaw.trim() : '';
+    // Only apply on Claude models.
+    // Upstream Anthropic enforces strict JSON Schema 2020-12 on custom.input_schema for these models.
+    if (!modelId.startsWith('claude-')) {
+        return payload;
+    }
+    const root = structuredClone(payload);
+    // Support both shapes:
+    // - Provider envelope: { model, request: { tools, ... } }
+    // - Gemini mapper request: { model, tools, ... }
+    const requestNode = isRecord(root.request)
+        ? root.request
+        : root;
+    const toolsRaw = requestNode.tools;
+    if (!Array.isArray(toolsRaw)) {
+        return root;
+    }
+    const nextTools = [];
+    for (const entry of toolsRaw) {
+        if (!isRecord(entry)) {
+            nextTools.push(entry);
+            continue;
+        }
+        const decls = Array.isArray(entry.functionDeclarations)
+            ? entry.functionDeclarations
+            : undefined;
+        if (!decls || !decls.length) {
+            // Non functionDeclarations-based tools (e.g. googleSearch) are left as-is.
+            nextTools.push(entry);
+            continue;
+        }
+        const nextDecls = [];
+        for (const fn of decls) {
+            if (!isRecord(fn)) {
+                nextDecls.push(fn);
+                continue;
+            }
+            const fnCopy = { ...fn };
+            // Replace parameters with a minimal, always-valid object schema.
+            fnCopy.parameters = {
+                type: 'object',
+                properties: {},
+                additionalProperties: true
+            };
+            // Drop strict flag to avoid upstream schema incompatibilities.
+            if (Object.prototype.hasOwnProperty.call(fnCopy, 'strict')) {
+                delete fnCopy.strict;
+            }
+            nextDecls.push(fnCopy);
+        }
+        nextTools.push({
+            functionDeclarations: nextDecls
+        });
+    }
+    requestNode.tools = nextTools;
+    return root;
+}

package/dist/conversion/compat/actions/glm-history-image-trim.d.ts

@@ -0,0 +1,2 @@
+import type { JsonObject } from '../../hub/types/json.js';
+export declare function applyGlmHistoryImageTrim(payload: JsonObject): JsonObject;

package/dist/conversion/compat/actions/glm-history-image-trim.js

@@ -0,0 +1,88 @@
+const isRecord = (value) => typeof value === 'object' && value !== null && !Array.isArray(value);
+function shouldDropInlineImagePart(part) {
+    const rawType = typeof part.type === 'string' ? part.type.toLowerCase() : '';
+    if (rawType !== 'image' && rawType !== 'image_url' && rawType !== 'input_image') {
+        return false;
+    }
+    const imageUrlBlock = isRecord(part.image_url)
+        ? part.image_url
+        : part;
+    const urlRaw = typeof imageUrlBlock.url === 'string'
+        ? imageUrlBlock.url
+        : typeof imageUrlBlock.data === 'string'
+            ? imageUrlBlock.data
+            : '';
+    const url = urlRaw.trim();
+    if (!url) {
+        return false;
+    }
+    // GLM 4.7 在历史消息中携带 data:image/base64 时会返回 1210，
+    // 因此仅在历史中丢弃这类 inline image 片段。
+    return url.startsWith('data:image');
+}
+export function applyGlmHistoryImageTrim(payload) {
+    const root = structuredClone(payload);
+    const modelRaw = root.model;
+    const modelId = typeof modelRaw === 'string' ? modelRaw.trim().toLowerCase() : '';
+    if (!modelId || !modelId.startsWith('glm-4.7')) {
+        return root;
+    }
+    const messagesValue = root.messages;
+    if (!Array.isArray(messagesValue)) {
+        return root;
+    }
+    const messages = messagesValue.filter(msg => isRecord(msg));
+    if (!messages.length) {
+        return root;
+    }
+    // 仅在历史消息中进行裁剪：保留最后一条 user 完整内容。
+    let lastUserIdx = -1;
+    for (let i = messages.length - 1; i >= 0; i -= 1) {
+        const msg = messages[i];
+        const role = typeof msg.role === 'string' ? msg.role.toLowerCase() : '';
+        if (role === 'user') {
+            lastUserIdx = i;
+            break;
+        }
+    }
+    if (lastUserIdx === -1) {
+        return root;
+    }
+    const nextMessages = [];
+    for (let i = 0; i < messages.length; i += 1) {
+        const msg = messages[i];
+        const role = typeof msg.role === 'string' ? msg.role.toLowerCase() : '';
+        if (i < lastUserIdx && role === 'user') {
+            const contentValue = msg.content;
+            if (!Array.isArray(contentValue)) {
+                nextMessages.push(msg);
+                continue;
+            }
+            const newContent = [];
+            for (const part of contentValue) {
+                if (!isRecord(part)) {
+                    newContent.push(part);
+                    continue;
+                }
+                if (shouldDropInlineImagePart(part)) {
+                    // 丢弃历史中的 data:image/* 片段
+                    // eslint-disable-next-line no-continue
+                    continue;
+                }
+                newContent.push(part);
+            }
+            if (!newContent.length) {
+                // 历史消息只剩下 inline image 时，直接移除整条消息。
+                // 避免向 GLM 发送纯图片历史导致 1210。
+                // eslint-disable-next-line no-continue
+                continue;
+            }
+            const cloned = { ...msg, content: newContent };
+            nextMessages.push(cloned);
+            continue;
+        }
+        nextMessages.push(msg);
+    }
+    root.messages = nextMessages;
+    return root;
+}

package/dist/conversion/compat/profiles/chat-gemini.json

@@ -1,16 +1,17 @@
 {
-    "id": "chat:gemini",
-    "protocol": "gemini-chat",
-    "request": {
-        "mappings": [
-            { "action": "snapshot", "phase": "compat-pre" },
-            {
-                "action": "gemini_web_search_request"
-            },
-            { "action": "snapshot", "phase": "compat-post" }
-        ]
-    },
-    "response": {
-        "mappings": []
-    }
+  "id": "chat:gemini",
+  "protocol": "gemini-chat",
+  "request": {
+    "mappings": [
+      { "action": "snapshot", "phase": "compat-pre" },
+      { "action": "claude_thinking_tool_schema" },
+      {
+        "action": "gemini_web_search_request"
+      },
+      { "action": "snapshot", "phase": "compat-post" }
+    ]
+  },
+  "response": {
+    "mappings": []
+  }
 }