@ai-sdk/openai-compatible 2.0.57 → 2.0.58

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @ai-sdk/openai-compatible
 
+## 2.0.58
+
+### Patch Changes
+
+- 4d4e176: fix(openai-compatible): buffer tool call deltas until function.name arrives
+- bef93ae: fix(security): prevent streaming tool calls from finalizing on parsable partial JSON
+
+  Streaming tool call arguments were finalized using `isParsableJson()` as a heuristic for completion. If partial accumulated JSON happened to be valid JSON before all chunks arrived, the tool call would be executed with incomplete arguments. Tool call finalization now only occurs in `flush()` after the stream is fully consumed.
+
+- 327642b: fix: more precise default message for tool execution denial
+- Updated dependencies [d559de9]
+  - @ai-sdk/provider-utils@4.0.37
+
 ## 2.0.57
 
 ### Patch Changes

package/dist/index.js

@@ -276,7 +276,7 @@ function convertToOpenAICompatibleChatMessages(prompt) {
               contentValue = output.value;
               break;
             case "execution-denied":
-              contentValue = (_c = output.reason) != null ? _c : "Tool execution denied.";
+              contentValue = (_c = output.reason) != null ? _c : "Tool call execution denied.";
               break;
             case "content":
             case "json":
@@ -670,6 +670,7 @@ var OpenAICompatibleChatLanguageModel = class {
       fetch: this.config.fetch
     });
     const toolCalls = [];
+    const pendingToolCalls = /* @__PURE__ */ new Map();
     let finishReason = {
       unified: "other",
       raw: void 0
@@ -687,7 +688,7 @@ var OpenAICompatibleChatLanguageModel = class {
             controller.enqueue({ type: "stream-start", warnings });
           },
           transform(chunk, controller) {
-            var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r;
+            var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v;
             if (options.includeRawChunks) {
               controller.enqueue({ type: "raw", rawValue: chunk.rawValue });
             }
@@ -771,35 +772,84 @@ var OpenAICompatibleChatLanguageModel = class {
               for (const toolCallDelta of delta.tool_calls) {
                 const index = (_c = toolCallDelta.index) != null ? _c : toolCalls.length;
                 if (toolCalls[index] == null) {
-                  if (toolCallDelta.id == null) {
-                    throw new import_provider3.InvalidResponseDataError({
-                      data: toolCallDelta,
-                      message: `Expected 'id' to be a string.`
+                  if (toolCallDelta.index != null) {
+                    let pending = pendingToolCalls.get(index);
+                    if (pending == null) {
+                      pending = {
+                        id: (_d = toolCallDelta.id) != null ? _d : null,
+                        bufferedArguments: "",
+                        thoughtSignature: (_g = (_f = (_e = toolCallDelta.extra_content) == null ? void 0 : _e.google) == null ? void 0 : _f.thought_signature) != null ? _g : void 0
+                      };
+                      pendingToolCalls.set(index, pending);
+                    } else {
+                      if (pending.id == null && toolCallDelta.id != null) {
+                        pending.id = toolCallDelta.id;
+                      }
+                      if (pending.thoughtSignature == null && ((_i = (_h = toolCallDelta.extra_content) == null ? void 0 : _h.google) == null ? void 0 : _i.thought_signature) != null) {
+                        pending.thoughtSignature = toolCallDelta.extra_content.google.thought_signature;
+                      }
+                    }
+                    const argumentsDelta = (_j = toolCallDelta.function) == null ? void 0 : _j.arguments;
+                    if (argumentsDelta != null) {
+                      pending.bufferedArguments += argumentsDelta;
+                    }
+                    const name = (_k = toolCallDelta.function) == null ? void 0 : _k.name;
+                    if (name == null) {
+                      continue;
+                    }
+                    pendingToolCalls.delete(index);
+                    if (pending.id == null) {
+                      throw new import_provider3.InvalidResponseDataError({
+                        data: toolCallDelta,
+                        message: `Expected 'id' to be a string.`
+                      });
+                    }
+                    controller.enqueue({
+                      type: "tool-input-start",
+                      id: pending.id,
+                      toolName: name
                     });
-                  }
-                  if (((_d = toolCallDelta.function) == null ? void 0 : _d.name) == null) {
-                    throw new import_provider3.InvalidResponseDataError({
-                      data: toolCallDelta,
-                      message: `Expected 'function.name' to be a string.`
+                    toolCalls[index] = {
+                      id: pending.id,
+                      type: "function",
+                      function: {
+                        name,
+                        arguments: pending.bufferedArguments
+                      },
+                      hasFinished: false,
+                      thoughtSignature: pending.thoughtSignature
+                    };
+                  } else {
+                    if (toolCallDelta.id == null) {
+                      throw new import_provider3.InvalidResponseDataError({
+                        data: toolCallDelta,
+                        message: `Expected 'id' to be a string.`
+                      });
+                    }
+                    if (((_l = toolCallDelta.function) == null ? void 0 : _l.name) == null) {
+                      throw new import_provider3.InvalidResponseDataError({
+                        data: toolCallDelta,
+                        message: `Expected 'function.name' to be a string.`
+                      });
+                    }
+                    controller.enqueue({
+                      type: "tool-input-start",
+                      id: toolCallDelta.id,
+                      toolName: toolCallDelta.function.name
                     });
+                    toolCalls[index] = {
+                      id: toolCallDelta.id,
+                      type: "function",
+                      function: {
+                        name: toolCallDelta.function.name,
+                        arguments: (_m = toolCallDelta.function.arguments) != null ? _m : ""
+                      },
+                      hasFinished: false,
+                      thoughtSignature: (_p = (_o = (_n = toolCallDelta.extra_content) == null ? void 0 : _n.google) == null ? void 0 : _o.thought_signature) != null ? _p : void 0
+                    };
                   }
-                  controller.enqueue({
-                    type: "tool-input-start",
-                    id: toolCallDelta.id,
-                    toolName: toolCallDelta.function.name
-                  });
-                  toolCalls[index] = {
-                    id: toolCallDelta.id,
-                    type: "function",
-                    function: {
-                      name: toolCallDelta.function.name,
-                      arguments: (_e = toolCallDelta.function.arguments) != null ? _e : ""
-                    },
-                    hasFinished: false,
-                    thoughtSignature: (_h = (_g = (_f = toolCallDelta.extra_content) == null ? void 0 : _f.google) == null ? void 0 : _g.thought_signature) != null ? _h : void 0
-                  };
                   const toolCall2 = toolCalls[index];
-                  if (((_i = toolCall2.function) == null ? void 0 : _i.name) != null && ((_j = toolCall2.function) == null ? void 0 : _j.arguments) != null) {
+                  if (((_q = toolCall2.function) == null ? void 0 : _q.name) != null && ((_r = toolCall2.function) == null ? void 0 : _r.arguments) != null) {
                     if (toolCall2.function.arguments.length > 0) {
                       controller.enqueue({
                         type: "tool-input-delta",
@@ -807,26 +857,6 @@ var OpenAICompatibleChatLanguageModel = class {
                         delta: toolCall2.function.arguments
                       });
                     }
-                    if ((0, import_provider_utils2.isParsableJson)(toolCall2.function.arguments)) {
-                      controller.enqueue({
-                        type: "tool-input-end",
-                        id: toolCall2.id
-                      });
-                      controller.enqueue({
-                        type: "tool-call",
-                        toolCallId: (_k = toolCall2.id) != null ? _k : (0, import_provider_utils2.generateId)(),
-                        toolName: toolCall2.function.name,
-                        input: toolCall2.function.arguments,
-                        ...toolCall2.thoughtSignature ? {
-                          providerMetadata: {
-                            [providerOptionsName]: {
-                              thoughtSignature: toolCall2.thoughtSignature
-                            }
-                          }
-                        } : {}
-                      });
-                      toolCall2.hasFinished = true;
-                    }
                   }
                   continue;
                 }
@@ -834,34 +864,14 @@ var OpenAICompatibleChatLanguageModel = class {
                 if (toolCall.hasFinished) {
                   continue;
                 }
-                if (((_l = toolCallDelta.function) == null ? void 0 : _l.arguments) != null) {
-                  toolCall.function.arguments += (_n = (_m = toolCallDelta.function) == null ? void 0 : _m.arguments) != null ? _n : "";
+                if (((_s = toolCallDelta.function) == null ? void 0 : _s.arguments) != null) {
+                  toolCall.function.arguments += (_u = (_t = toolCallDelta.function) == null ? void 0 : _t.arguments) != null ? _u : "";
                 }
                 controller.enqueue({
                   type: "tool-input-delta",
                   id: toolCall.id,
-                  delta: (_o = toolCallDelta.function.arguments) != null ? _o : ""
+                  delta: (_v = toolCallDelta.function.arguments) != null ? _v : ""
                 });
-                if (((_p = toolCall.function) == null ? void 0 : _p.name) != null && ((_q = toolCall.function) == null ? void 0 : _q.arguments) != null && (0, import_provider_utils2.isParsableJson)(toolCall.function.arguments)) {
-                  controller.enqueue({
-                    type: "tool-input-end",
-                    id: toolCall.id
-                  });
-                  controller.enqueue({
-                    type: "tool-call",
-                    toolCallId: (_r = toolCall.id) != null ? _r : (0, import_provider_utils2.generateId)(),
-                    toolName: toolCall.function.name,
-                    input: toolCall.function.arguments,
-                    ...toolCall.thoughtSignature ? {
-                      providerMetadata: {
-                        [providerOptionsName]: {
-                          thoughtSignature: toolCall.thoughtSignature
-                        }
-                      }
-                    } : {}
-                  });
-                  toolCall.hasFinished = true;
-                }
               }
             }
           },
@@ -873,6 +883,16 @@ var OpenAICompatibleChatLanguageModel = class {
             if (isActiveText) {
               controller.enqueue({ type: "text-end", id: "txt-0" });
             }
+            for (const [index, pending] of pendingToolCalls) {
+              throw new import_provider3.InvalidResponseDataError({
+                data: {
+                  index,
+                  id: pending.id,
+                  function: { arguments: pending.bufferedArguments }
+                },
+                message: `Expected 'function.name' to be a string.`
+              });
+            }
             for (const toolCall of toolCalls.filter(
               (toolCall2) => !toolCall2.hasFinished
             )) {
@@ -1698,7 +1718,7 @@ async function fileToBlob(file) {
 var import_provider_utils6 = require("@ai-sdk/provider-utils");
 
 // src/version.ts
-var VERSION = true ? "2.0.57" : "0.0.0-test";
+var VERSION = true ? "2.0.58" : "0.0.0-test";
 
 // src/openai-compatible-provider.ts
 function createOpenAICompatible(options) {