@jsonstudio/llms 0.6.375 → 0.6.473

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

@@ -4,6 +4,7 @@ import { normalizeChatMessageContent } from '../shared/chat-output-normalizer.js
 import { mapBridgeToolsToChat } from '../shared/tool-mapping.js';
 import { prepareGeminiToolsForBridge } from '../shared/gemini-tool-utils.js';
 import { registerResponsesReasoning, consumeResponsesReasoning, registerResponsesOutputTextMeta, consumeResponsesOutputTextMeta, consumeResponsesPayloadSnapshot, registerResponsesPayloadSnapshot, consumeResponsesPassthrough, registerResponsesPassthrough } from '../shared/responses-reasoning-registry.js';
+import { ProviderProtocolError } from '../shared/errors.js';
 const DUMMY_THOUGHT_SIGNATURE = 'skip_thought_signature_validator';
 function isObject(v) {
     return !!v && typeof v === 'object' && !Array.isArray(v);
@@ -179,6 +180,8 @@ export function buildOpenAIChatFromGeminiResponse(payload) {
     const primary = candidates[0] && typeof candidates[0] === 'object' ? candidates[0] : {};
     const content = primary?.content || {};
     const role = mapGeminiRoleToChat(content.role);
+    const rawFinishReason = primary?.finishReason;
+    const finishReasonUpper = typeof rawFinishReason === 'string' ? rawFinishReason.trim().toUpperCase() : '';
     const parts = Array.isArray(content.parts) ? content.parts : [];
     const textParts = [];
     const reasoningParts = [];
@@ -318,12 +321,23 @@ export function buildOpenAIChatFromGeminiResponse(payload) {
         }
     }
     const hasToolCalls = toolCalls.length > 0;
+    // 如果 Gemini 返回 UNEXPECTED_TOOL_CALL，且当前没有有效的工具调用可继续，
+    // 说明上游工具协议/声明与模型期望不一致，应视为 Provider 级错误而不是正常 stop，
+    // 由上层通过 ProviderErrorCenter / HTTP 4xx/5xx 显式反馈给客户端。
+    if (!hasToolCalls && finishReasonUpper === 'UNEXPECTED_TOOL_CALL') {
+        throw new ProviderProtocolError('Gemini returned finishReason=UNEXPECTED_TOOL_CALL; this usually indicates an incompatible or unexpected tool invocation.', {
+            code: 'TOOL_PROTOCOL_ERROR',
+            protocol: 'gemini-chat',
+            providerType: 'gemini',
+            details: { finishReason: rawFinishReason }
+        });
+    }
     const finish_reason = (() => {
         // If the model is emitting tool calls, treat this turn as a tool_calls
         // completion so downstream tool governance can continue the loop.
         if (hasToolCalls)
             return 'tool_calls';
-        const fr = String(primary?.finishReason || '').toUpperCase();
+        const fr = finishReasonUpper;
         if (fr === 'MAX_TOKENS')
             return 'length';
         if (fr === 'STOP')

package/dist/conversion/compat/actions/iflow-web-search.d.ts

@@ -0,0 +1,18 @@
+import type { JsonObject } from '../../hub/types/json.js';
+import type { AdapterContext } from '../../hub/types/chat-envelope.js';
+/**
+ * IFlow web_search 请求适配（作用于 openai-chat 兼容 payload）：
+ *
+ * - 仅在 routeId 以 `web_search` 开头时生效（来自 AdapterContext.routeId）；
+ * - 读取顶层的 `web_search` helper 对象 `{ query, recency, count, engine }`；
+ * - 当 query 为空或无效时：删除 helper，原样透传；
+ * - 当 query 有效时：构造一个标准的 OpenAI function tool：
+ *   - name 固定为 `web_search`；
+ *   - parameters 包含 query/recency/count 三个字段；
+ * - 将生成的 function tool 写入 `tools` 数组，并删除顶层 `web_search`。
+ *
+ * 注意：
+ * - 顶层 `web_search` 只在 servertool 的二跳请求中出现，用于驱动后端搜索；
+ * - 用户侧的工具调用仍然使用统一的 `web_search` function tool schema。
+ */
+export declare function applyIflowWebSearchRequestTransform(payload: JsonObject, adapterContext?: AdapterContext): JsonObject;

package/dist/conversion/compat/actions/iflow-web-search.js

@@ -0,0 +1,87 @@
+const isRecord = (value) => typeof value === 'object' && value !== null && !Array.isArray(value);
+const DEBUG_IFLOW_WEB_SEARCH = (process.env.ROUTECODEX_DEBUG_IFLOW_WEB_SEARCH || '').trim() === '1';
+/**
+ * IFlow web_search 请求适配（作用于 openai-chat 兼容 payload）：
+ *
+ * - 仅在 routeId 以 `web_search` 开头时生效（来自 AdapterContext.routeId）；
+ * - 读取顶层的 `web_search` helper 对象 `{ query, recency, count, engine }`；
+ * - 当 query 为空或无效时：删除 helper，原样透传；
+ * - 当 query 有效时：构造一个标准的 OpenAI function tool：
+ *   - name 固定为 `web_search`；
+ *   - parameters 包含 query/recency/count 三个字段；
+ * - 将生成的 function tool 写入 `tools` 数组，并删除顶层 `web_search`。
+ *
+ * 注意：
+ * - 顶层 `web_search` 只在 servertool 的二跳请求中出现，用于驱动后端搜索；
+ * - 用户侧的工具调用仍然使用统一的 `web_search` function tool schema。
+ */
+export function applyIflowWebSearchRequestTransform(payload, adapterContext) {
+    const routeId = typeof adapterContext?.routeId === 'string' ? adapterContext.routeId : '';
+    if (!routeId || !routeId.toLowerCase().startsWith('web_search')) {
+        return payload;
+    }
+    const root = structuredClone(payload);
+    const webSearchRaw = root.web_search;
+    if (!isRecord(webSearchRaw)) {
+        return root;
+    }
+    const webSearch = webSearchRaw;
+    const queryValue = webSearch.query;
+    const recencyValue = webSearch.recency;
+    const countValue = webSearch.count;
+    const query = typeof queryValue === 'string' ? queryValue.trim() : '';
+    const recency = typeof recencyValue === 'string' ? recencyValue.trim() : undefined;
+    let count;
+    if (typeof countValue === 'number' && Number.isFinite(countValue)) {
+        const normalized = Math.floor(countValue);
+        if (normalized >= 1 && normalized <= 50) {
+            count = normalized;
+        }
+    }
+    if (!query) {
+        // No meaningful search query, drop the helper object and passthrough.
+        delete root.web_search;
+        return root;
+    }
+    const tool = {
+        type: 'function',
+        function: {
+            name: 'web_search',
+            description: 'Perform web search over the public internet and return up-to-date results.',
+            parameters: {
+                type: 'object',
+                properties: {
+                    query: {
+                        type: 'string',
+                        description: 'Search query string.'
+                    },
+                    recency: {
+                        type: 'string',
+                        description: 'Optional recency filter such as "day", "week", or "month".'
+                    },
+                    count: {
+                        type: 'integer',
+                        minimum: 1,
+                        maximum: 50,
+                        description: 'Maximum number of search results to retrieve (1-50).'
+                    }
+                },
+                required: ['query']
+            }
+        }
+    };
+    root.tools = [tool];
+    delete root.web_search;
+    if (DEBUG_IFLOW_WEB_SEARCH) {
+        try {
+            // eslint-disable-next-line no-console
+            console.log('\x1b[38;5;27m[compat][iflow_web_search_request] applied web_search transform ' +
+                `query=${JSON.stringify(query).slice(0, 200)} ` +
+                `recency=${String(recency ?? '')}\x1b[0m`);
+        }
+        catch {
+            // logging best-effort
+        }
+    }
+    return root;
+}

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

@@ -1,17 +1,16 @@
 {
-  "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": "gemini_web_search_request"
+            },
+            { "action": "snapshot", "phase": "compat-post" }
+        ]
+    },
+    "response": {
+        "mappings": []
+    }
 }
-

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

@@ -1,200 +1,204 @@
 {
-  "id": "chat:glm",
-  "protocol": "openai-chat",
-  "request": {
-    "mappings": [
-      { "action": "snapshot", "phase": "compat-pre" },
-      { "action": "dto_unwrap" },
-      {
-        "action": "glm_image_content"
-      },
-      {
-        "action": "glm_vision_prompt"
-      },
-      {
-        "action": "rename",
-        "from": "response_format",
-        "to": "metadata.generation.response_format"
-      },
-      {
-        "action": "remove",
-        "path": "metadata.clientModelId"
-      },
-      {
-        "action": "shape_filter",
-        "target": "request",
-        "config": {
-          "request": {
-            "allowTopLevel": [
-              "model", "messages", "stream", "thinking", "do_sample", "temperature", "top_p",
-              "max_tokens", "tools", "tool_choice", "stop", "response_format", "web_search"
-            ],
-            "messages": {
-              "allowedRoles": ["system", "user", "assistant", "tool"],
-              "assistantWithToolCallsContentNull": true,
-              "toolContentStringify": false
+    "id": "chat:glm",
+    "protocol": "openai-chat",
+    "request": {
+        "mappings": [
+            { "action": "snapshot", "phase": "compat-pre" },
+            { "action": "dto_unwrap" },
+            {
+                "action": "remove",
+                "path": "parallel_tool_calls"
             },
-            "messagesRules": [],
-            "tools": {
-              "normalize": false,
-              "forceToolChoiceAuto": true
+            {
+                "action": "glm_image_content"
             },
-            "assistantToolCalls": { "functionArgumentsType": "string" }
-          },
-          "response": {
-            "allowTopLevel": [
-              "id", "request_id", "created", "model",
-              "choices", "usage", "video_result", "web_search", "content_filter",
-              "required_action", "output", "output_text", "status"
-            ],
-            "choices": {
-              "required": true,
-              "message": {
-                "allow": ["role", "content", "reasoning_content", "audio", "tool_calls"],
-                "roleDefault": "assistant",
-                "contentNullWhenToolCalls": true,
-                "tool_calls": { "function": { "nameRequired": true, "argumentsType": "string" } }
-              },
-              "finish_reason": ["stop", "tool_calls", "length", "sensitive", "network_error"]
+            {
+                "action": "glm_vision_prompt"
             },
-            "usage": { "allow": ["prompt_tokens", "completion_tokens", "prompt_tokens_details", "total_tokens"] }
-          }
-        }
-      },
-      {
-        "action": "apply_rules",
-        "config": {
-          "tools": {
-            "function": {
-              "removeKeys": ["strict", "json_schema"]
-            }
-          },
-          "messages": {
-            "assistantToolCalls": {
-              "function": {
-                "removeKeys": ["strict"]
-              }
-            }
-          },
-          "topLevel": {
-            "conditional": [
-              { "when": { "tools": "empty" }, "remove": ["tool_choice"] }
-            ]
-          }
-        }
-      },
-      {
-        "action": "field_map",
-        "direction": "incoming",
-        "config": [
-          { "sourcePath": "usage.prompt_tokens", "targetPath": "usage.input_tokens", "type": "number" },
-          { "sourcePath": "usage.completion_tokens", "targetPath": "usage.output_tokens", "type": "number" },
-          { "sourcePath": "created", "targetPath": "created_at", "type": "number" },
-          { "sourcePath": "request_id", "targetPath": "request_id", "type": "string" },
-          { "sourcePath": "model", "targetPath": "model", "type": "string", "transform": "normalizeModelName" },
-          {
-            "sourcePath": "choices[*].message.tool_calls[*].function.arguments",
-            "targetPath": "choices[*].message.tool_calls[*].function.arguments",
-            "type": "string"
-          }
+            {
+                "action": "rename",
+                "from": "response_format",
+                "to": "metadata.generation.response_format"
+            },
+            {
+                "action": "remove",
+                "path": "metadata.clientModelId"
+            },
+            {
+                "action": "shape_filter",
+                "target": "request",
+                "config": {
+                    "request": {
+                        "allowTopLevel": [
+                            "model", "messages", "stream", "thinking", "do_sample", "temperature", "top_p",
+                            "max_tokens", "tools", "tool_choice", "stop", "response_format", "web_search"
+                        ],
+                        "messages": {
+                            "allowedRoles": ["system", "user", "assistant", "tool"],
+                            "assistantWithToolCallsContentNull": true,
+                            "toolContentStringify": false
+                        },
+                        "messagesRules": [],
+                        "tools": {
+                            "normalize": false,
+                            "forceToolChoiceAuto": true
+                        },
+                        "assistantToolCalls": { "functionArgumentsType": "string" }
+                    },
+                    "response": {
+                        "allowTopLevel": [
+                            "id", "request_id", "created", "model",
+                            "choices", "usage", "video_result", "web_search", "content_filter",
+                            "required_action", "output", "output_text", "status"
+                        ],
+                        "choices": {
+                            "required": true,
+                            "message": {
+                                "allow": ["role", "content", "reasoning_content", "audio", "tool_calls"],
+                                "roleDefault": "assistant",
+                                "contentNullWhenToolCalls": true,
+                                "tool_calls": { "function": { "nameRequired": true, "argumentsType": "string" } }
+                            },
+                            "finish_reason": ["stop", "tool_calls", "length", "sensitive", "network_error"]
+                        },
+                        "usage": { "allow": ["prompt_tokens", "completion_tokens", "prompt_tokens_details", "total_tokens"] }
+                    }
+                }
+            },
+            {
+                "action": "apply_rules",
+                "config": {
+                    "tools": {
+                        "function": {
+                            "removeKeys": ["strict", "json_schema"]
+                        }
+                    },
+                    "messages": {
+                        "assistantToolCalls": {
+                            "function": {
+                                "removeKeys": ["strict"]
+                            }
+                        }
+                    },
+                    "topLevel": {
+                        "conditional": [
+                            { "when": { "tools": "empty" }, "remove": ["tool_choice"] }
+                        ]
+                    }
+                }
+            },
+            {
+                "action": "field_map",
+                "direction": "incoming",
+                "config": [
+                    { "sourcePath": "usage.prompt_tokens", "targetPath": "usage.input_tokens", "type": "number" },
+                    { "sourcePath": "usage.completion_tokens", "targetPath": "usage.output_tokens", "type": "number" },
+                    { "sourcePath": "created", "targetPath": "created_at", "type": "number" },
+                    { "sourcePath": "request_id", "targetPath": "request_id", "type": "string" },
+                    { "sourcePath": "model", "targetPath": "model", "type": "string", "transform": "normalizeModelName" },
+                    {
+                        "sourcePath": "choices[*].message.tool_calls[*].function.arguments",
+                        "targetPath": "choices[*].message.tool_calls[*].function.arguments",
+                        "type": "string"
+                    }
+                ]
+            },
+            { "action": "tool_schema_sanitize", "mode": "glm_shell" },
+            {
+                "action": "glm_web_search_request"
+            },
+            {
+                "action": "auto_thinking",
+                "config": {
+                    "modelPrefixes": ["glm-4.7", "glm-4.6", "glm-4.5", "glm-z1"],
+                    "excludePrefixes": ["glm-4.6v"]
+                }
+            },
+            { "action": "snapshot", "phase": "compat-post" },
+            { "action": "dto_rewrap" }
         ]
-      },
-      { "action": "tool_schema_sanitize", "mode": "glm_shell" },
-      {
-        "action": "glm_web_search_request"
-      },
-      {
-        "action": "auto_thinking",
-        "config": {
-          "modelPrefixes": ["glm-4.7", "glm-4.6", "glm-4.5", "glm-z1"],
-          "excludePrefixes": ["glm-4.6v"]
-        }
-      },
-      { "action": "snapshot", "phase": "compat-post" },
-      { "action": "dto_rewrap" }
-    ]
-  },
-  "response": {
-    "mappings": [
-      { "action": "snapshot", "phase": "compat-pre" },
-      { "action": "dto_unwrap" },
-      {
-        "action": "resp_blacklist",
-        "config": {
-          "paths": ["usage.prompt_tokens_details.cached_tokens"],
-          "keepCritical": true
-        }
-      },
-      {
-        "action": "shape_filter",
-        "target": "response",
-        "config": {
-          "request": {
-            "allowTopLevel": [
-              "model", "messages", "stream", "thinking", "do_sample", "temperature", "top_p",
-              "max_tokens", "tools", "tool_choice", "stop", "response_format"
-            ],
-            "messages": {
-              "allowedRoles": ["system", "user", "assistant", "tool"],
-              "assistantWithToolCallsContentNull": true,
-              "toolContentStringify": false
+    },
+    "response": {
+        "mappings": [
+            { "action": "snapshot", "phase": "compat-pre" },
+            { "action": "dto_unwrap" },
+            {
+                "action": "resp_blacklist",
+                "config": {
+                    "paths": ["usage.prompt_tokens_details.cached_tokens"],
+                    "keepCritical": true
+                }
             },
-            "messagesRules": [],
-            "tools": {
-              "normalize": false,
-              "forceToolChoiceAuto": true
+            {
+                "action": "shape_filter",
+                "target": "response",
+                "config": {
+                    "request": {
+                        "allowTopLevel": [
+                            "model", "messages", "stream", "thinking", "do_sample", "temperature", "top_p",
+                            "max_tokens", "tools", "tool_choice", "stop", "response_format"
+                        ],
+                        "messages": {
+                            "allowedRoles": ["system", "user", "assistant", "tool"],
+                            "assistantWithToolCallsContentNull": true,
+                            "toolContentStringify": false
+                        },
+                        "messagesRules": [],
+                        "tools": {
+                            "normalize": false,
+                            "forceToolChoiceAuto": true
+                        },
+                        "assistantToolCalls": { "functionArgumentsType": "string" }
+                    },
+                    "response": {
+                        "allowTopLevel": [
+                            "id", "request_id", "created", "model",
+                            "choices", "usage", "video_result", "web_search", "content_filter",
+                            "required_action", "output", "output_text", "status"
+                        ],
+                        "choices": {
+                            "required": true,
+                            "message": {
+                                "allow": ["role", "content", "reasoning_content", "audio", "tool_calls"],
+                                "roleDefault": "assistant",
+                                "contentNullWhenToolCalls": true,
+                                "tool_calls": { "function": { "nameRequired": true, "argumentsType": "string" } }
+                            },
+                            "finish_reason": ["stop", "tool_calls", "length", "sensitive", "network_error"]
+                        },
+                        "usage": { "allow": ["prompt_tokens", "completion_tokens", "prompt_tokens_details", "total_tokens"] }
+                    }
+                }
             },
-            "assistantToolCalls": { "functionArgumentsType": "string" }
-          },
-          "response": {
-            "allowTopLevel": [
-              "id", "request_id", "created", "model",
-              "choices", "usage", "video_result", "web_search", "content_filter",
-              "required_action", "output", "output_text", "status"
-            ],
-            "choices": {
-              "required": true,
-              "message": {
-                "allow": ["role", "content", "reasoning_content", "audio", "tool_calls"],
-                "roleDefault": "assistant",
-                "contentNullWhenToolCalls": true,
-                "tool_calls": { "function": { "nameRequired": true, "argumentsType": "string" } }
-              },
-              "finish_reason": ["stop", "tool_calls", "length", "sensitive", "network_error"]
+            {
+                "action": "field_map",
+                "direction": "outgoing",
+                "config": [
+                    { "sourcePath": "usage.input_tokens", "targetPath": "usage.prompt_tokens", "type": "number" },
+                    { "sourcePath": "usage.output_tokens", "targetPath": "usage.completion_tokens", "type": "number" },
+                    { "sourcePath": "usage.total_input_tokens", "targetPath": "usage.prompt_tokens", "type": "number" },
+                    { "sourcePath": "usage.total_output_tokens", "targetPath": "usage.completion_tokens", "type": "number" },
+                    { "sourcePath": "created_at", "targetPath": "created", "type": "number" },
+                    { "sourcePath": "request_id", "targetPath": "request_id", "type": "string" },
+                    {
+                        "sourcePath": "choices[*].finish_reason",
+                        "targetPath": "choices[*].finish_reason",
+                        "type": "string",
+                        "transform": "normalizeFinishReason"
+                    },
+                    {
+                        "sourcePath": "choices[*].message.tool_calls[*].function.arguments",
+                        "targetPath": "choices[*].message.tool_calls[*].function.arguments",
+                        "type": "string"
+                    }
+                ]
             },
-            "usage": { "allow": ["prompt_tokens", "completion_tokens", "prompt_tokens_details", "total_tokens"] }
-          }
-        }
-      },
-      {
-        "action": "field_map",
-        "direction": "outgoing",
-        "config": [
-          { "sourcePath": "usage.input_tokens", "targetPath": "usage.prompt_tokens", "type": "number" },
-          { "sourcePath": "usage.output_tokens", "targetPath": "usage.completion_tokens", "type": "number" },
-          { "sourcePath": "usage.total_input_tokens", "targetPath": "usage.prompt_tokens", "type": "number" },
-          { "sourcePath": "usage.total_output_tokens", "targetPath": "usage.completion_tokens", "type": "number" },
-          { "sourcePath": "created_at", "targetPath": "created", "type": "number" },
-          { "sourcePath": "request_id", "targetPath": "request_id", "type": "string" },
-          {
-            "sourcePath": "choices[*].finish_reason",
-            "targetPath": "choices[*].finish_reason",
-            "type": "string",
-            "transform": "normalizeFinishReason"
-          },
-          {
-            "sourcePath": "choices[*].message.tool_calls[*].function.arguments",
-            "targetPath": "choices[*].message.tool_calls[*].function.arguments",
-            "type": "string"
-          }
+            { "action": "tool_schema_sanitize", "mode": "glm_shell" },
+            { "action": "response_normalize" },
+            { "action": "extract_glm_tool_markup" },
+            { "action": "response_validate" },
+            { "action": "snapshot", "phase": "compat-post" },
+            { "action": "dto_rewrap" }
         ]
-      },
-      { "action": "tool_schema_sanitize", "mode": "glm_shell" },
-      { "action": "response_normalize" },
-      { "action": "extract_glm_tool_markup" },
-      { "action": "response_validate" },
-      { "action": "snapshot", "phase": "compat-post" },
-      { "action": "dto_rewrap" }
-    ]
-  }
+    }
 }