ai 6.0.0-beta.160 → 6.0.0-beta.162

package/dist/index.mjs

@@ -24,68 +24,6 @@ import {
   withUserAgentSuffix as withUserAgentSuffix2
 } from "@ai-sdk/provider-utils";
 
-// src/logger/log-warnings.ts
-function formatWarning({
-  warning,
-  provider,
-  model
-}) {
-  const prefix = `AI SDK Warning (${provider} / ${model}):`;
-  switch (warning.type) {
-    case "unsupported": {
-      let message = `${prefix} The feature "${warning.feature}" is not supported.`;
-      if (warning.details) {
-        message += ` ${warning.details}`;
-      }
-      return message;
-    }
-    case "compatibility": {
-      let message = `${prefix} The feature "${warning.feature}" is used in a compatibility mode.`;
-      if (warning.details) {
-        message += ` ${warning.details}`;
-      }
-      return message;
-    }
-    case "other": {
-      return `${prefix} ${warning.message}`;
-    }
-    default: {
-      return `${prefix} ${JSON.stringify(warning, null, 2)}`;
-    }
-  }
-}
-var FIRST_WARNING_INFO_MESSAGE = "AI SDK Warning System: To turn off warning logging, set the AI_SDK_LOG_WARNINGS global to false.";
-var hasLoggedBefore = false;
-var logWarnings = (options) => {
-  if (options.warnings.length === 0) {
-    return;
-  }
-  const logger = globalThis.AI_SDK_LOG_WARNINGS;
-  if (logger === false) {
-    return;
-  }
-  if (typeof logger === "function") {
-    logger(options);
-    return;
-  }
-  if (!hasLoggedBefore) {
-    hasLoggedBefore = true;
-    console.info(FIRST_WARNING_INFO_MESSAGE);
-  }
-  for (const warning of options.warnings) {
-    console.warn(
-      formatWarning({
-        warning,
-        provider: options.provider,
-        model: options.model
-      })
-    );
-  }
-};
-
-// src/model/resolve-model.ts
-import { gateway } from "@ai-sdk/gateway";
-
 // src/error/index.ts
 import {
   AISDKError as AISDKError15,
@@ -407,6 +345,68 @@ var RetryError = class extends AISDKError14 {
 };
 _a12 = symbol12;
 
+// src/logger/log-warnings.ts
+function formatWarning({
+  warning,
+  provider,
+  model
+}) {
+  const prefix = `AI SDK Warning (${provider} / ${model}):`;
+  switch (warning.type) {
+    case "unsupported": {
+      let message = `${prefix} The feature "${warning.feature}" is not supported.`;
+      if (warning.details) {
+        message += ` ${warning.details}`;
+      }
+      return message;
+    }
+    case "compatibility": {
+      let message = `${prefix} The feature "${warning.feature}" is used in a compatibility mode.`;
+      if (warning.details) {
+        message += ` ${warning.details}`;
+      }
+      return message;
+    }
+    case "other": {
+      return `${prefix} ${warning.message}`;
+    }
+    default: {
+      return `${prefix} ${JSON.stringify(warning, null, 2)}`;
+    }
+  }
+}
+var FIRST_WARNING_INFO_MESSAGE = "AI SDK Warning System: To turn off warning logging, set the AI_SDK_LOG_WARNINGS global to false.";
+var hasLoggedBefore = false;
+var logWarnings = (options) => {
+  if (options.warnings.length === 0) {
+    return;
+  }
+  const logger = globalThis.AI_SDK_LOG_WARNINGS;
+  if (logger === false) {
+    return;
+  }
+  if (typeof logger === "function") {
+    logger(options);
+    return;
+  }
+  if (!hasLoggedBefore) {
+    hasLoggedBefore = true;
+    console.info(FIRST_WARNING_INFO_MESSAGE);
+  }
+  for (const warning of options.warnings) {
+    console.warn(
+      formatWarning({
+        warning,
+        provider: options.provider,
+        model: options.model
+      })
+    );
+  }
+};
+
+// src/model/resolve-model.ts
+import { gateway } from "@ai-sdk/gateway";
+
 // src/util/log-v2-compatibility-warning.ts
 function logV2CompatibilityWarning({
   provider,
@@ -844,7 +844,7 @@ import {
 } from "@ai-sdk/provider-utils";
 
 // src/version.ts
-var VERSION = true ? "6.0.0-beta.160" : "0.0.0-test";
+var VERSION = true ? "6.0.0-beta.162" : "0.0.0-test";
 
 // src/util/download/download.ts
 var download = async ({ url }) => {
@@ -2044,6 +2044,39 @@ function addImageModelUsage(usage1, usage2) {
   };
 }
 
+// src/util/merge-objects.ts
+function mergeObjects(base, overrides) {
+  if (base === void 0 && overrides === void 0) {
+    return void 0;
+  }
+  if (base === void 0) {
+    return overrides;
+  }
+  if (overrides === void 0) {
+    return base;
+  }
+  const result = { ...base };
+  for (const key in overrides) {
+    if (Object.prototype.hasOwnProperty.call(overrides, key)) {
+      const overridesValue = overrides[key];
+      if (overridesValue === void 0)
+        continue;
+      const baseValue = key in base ? base[key] : void 0;
+      const isSourceObject = overridesValue !== null && typeof overridesValue === "object" && !Array.isArray(overridesValue) && !(overridesValue instanceof Date) && !(overridesValue instanceof RegExp);
+      const isTargetObject = baseValue !== null && baseValue !== void 0 && typeof baseValue === "object" && !Array.isArray(baseValue) && !(baseValue instanceof Date) && !(baseValue instanceof RegExp);
+      if (isSourceObject && isTargetObject) {
+        result[key] = mergeObjects(
+          baseValue,
+          overridesValue
+        );
+      } else {
+        result[key] = overridesValue;
+      }
+    }
+  }
+  return result;
+}
+
 // src/util/retry-with-exponential-backoff.ts
 import { APICallError as APICallError2 } from "@ai-sdk/provider";
 import { delay, getErrorMessage as getErrorMessage4, isAbortError } from "@ai-sdk/provider-utils";
@@ -3507,6 +3540,7 @@ async function generateText({
         let clientToolCalls = [];
         let clientToolOutputs = [];
         const steps = [];
+        const pendingDeferredToolCalls = /* @__PURE__ */ new Map();
         do {
           const stepInputMessages = [...initialMessages, ...responseMessages];
           const prepareStepResult = await (prepareStep == null ? void 0 : prepareStep({
@@ -3575,13 +3609,17 @@ async function generateText({
                 tracer,
                 fn: async (span2) => {
                   var _a16, _b2, _c2, _d2, _e2, _f2, _g2, _h2;
+                  const stepProviderOptions = mergeObjects(
+                    providerOptions,
+                    prepareStepResult == null ? void 0 : prepareStepResult.providerOptions
+                  );
                   const result = await stepModel.doGenerate({
                     ...callSettings2,
                     tools: stepTools,
                     toolChoice: stepToolChoice,
                     responseFormat: await (output == null ? void 0 : output.responseFormat),
                     prompt: promptMessages,
-                    providerOptions,
+                    providerOptions: stepProviderOptions,
                     abortSignal,
                     headers: headersWithUserAgent
                   });
@@ -3705,11 +3743,32 @@ async function generateText({
               })
             );
           }
+          for (const toolCall of stepToolCalls) {
+            if (!toolCall.providerExecuted)
+              continue;
+            const tool2 = tools == null ? void 0 : tools[toolCall.toolName];
+            if ((tool2 == null ? void 0 : tool2.type) === "provider" && tool2.supportsDeferredResults) {
+              const hasResultInResponse = currentModelResponse.content.some(
+                (part) => part.type === "tool-result" && part.toolCallId === toolCall.toolCallId
+              );
+              if (!hasResultInResponse) {
+                pendingDeferredToolCalls.set(toolCall.toolCallId, {
+                  toolName: toolCall.toolName
+                });
+              }
+            }
+          }
+          for (const part of currentModelResponse.content) {
+            if (part.type === "tool-result") {
+              pendingDeferredToolCalls.delete(part.toolCallId);
+            }
+          }
           const stepContent = asContent({
             content: currentModelResponse.content,
             toolCalls: stepToolCalls,
             toolOutputs: clientToolOutputs,
-            toolApprovalRequests: Object.values(toolApprovalRequests)
+            toolApprovalRequests: Object.values(toolApprovalRequests),
+            tools
           });
           responseMessages.push(
             ...await toResponseMessages({
@@ -3738,9 +3797,10 @@ async function generateText({
           steps.push(currentStepResult);
           await (onStepFinish == null ? void 0 : onStepFinish(currentStepResult));
         } while (
-          // there are tool calls:
-          clientToolCalls.length > 0 && // all current tool calls have outputs (incl. execution errors):
-          clientToolOutputs.length === clientToolCalls.length && // continue until a stop condition is met:
+          // Continue if:
+          // 1. There are client tool calls that have all been executed, OR
+          // 2. There are pending deferred results from provider-executed tools
+          (clientToolCalls.length > 0 && clientToolOutputs.length === clientToolCalls.length || pendingDeferredToolCalls.size > 0) && // continue until a stop condition is met:
           !await isStopConditionMet({ stopConditions, steps })
         );
         span.setAttributes(
@@ -3941,7 +4001,8 @@ function asContent({
   content,
   toolCalls,
   toolOutputs,
-  toolApprovalRequests
+  toolApprovalRequests,
+  tools
 }) {
   return [
     ...content.map((part) => {
@@ -3967,7 +4028,31 @@ function asContent({
             (toolCall2) => toolCall2.toolCallId === part.toolCallId
           );
           if (toolCall == null) {
-            throw new Error(`Tool call ${part.toolCallId} not found.`);
+            const tool2 = tools == null ? void 0 : tools[part.toolName];
+            const supportsDeferredResults = (tool2 == null ? void 0 : tool2.type) === "provider" && tool2.supportsDeferredResults;
+            if (!supportsDeferredResults) {
+              throw new Error(`Tool call ${part.toolCallId} not found.`);
+            }
+            if (part.isError) {
+              return {
+                type: "tool-error",
+                toolCallId: part.toolCallId,
+                toolName: part.toolName,
+                input: void 0,
+                error: part.result,
+                providerExecuted: true,
+                dynamic: part.dynamic
+              };
+            }
+            return {
+              type: "tool-result",
+              toolCallId: part.toolCallId,
+              toolName: part.toolName,
+              input: void 0,
+              output: part.result,
+              providerExecuted: true,
+              dynamic: part.dynamic
+            };
           }
           if (part.isError) {
             return {
@@ -4322,39 +4407,6 @@ function isDataUIMessageChunk(chunk) {
   return chunk.type.startsWith("data-");
 }
 
-// src/util/merge-objects.ts
-function mergeObjects(base, overrides) {
-  if (base === void 0 && overrides === void 0) {
-    return void 0;
-  }
-  if (base === void 0) {
-    return overrides;
-  }
-  if (overrides === void 0) {
-    return base;
-  }
-  const result = { ...base };
-  for (const key in overrides) {
-    if (Object.prototype.hasOwnProperty.call(overrides, key)) {
-      const overridesValue = overrides[key];
-      if (overridesValue === void 0)
-        continue;
-      const baseValue = key in base ? base[key] : void 0;
-      const isSourceObject = overridesValue !== null && typeof overridesValue === "object" && !Array.isArray(overridesValue) && !(overridesValue instanceof Date) && !(overridesValue instanceof RegExp);
-      const isTargetObject = baseValue !== null && baseValue !== void 0 && typeof baseValue === "object" && !Array.isArray(baseValue) && !(baseValue instanceof Date) && !(baseValue instanceof RegExp);
-      if (isSourceObject && isTargetObject) {
-        result[key] = mergeObjects(
-          baseValue,
-          overridesValue
-        );
-      } else {
-        result[key] = overridesValue;
-      }
-    }
-  }
-  return result;
-}
-
 // src/ui/ui-messages.ts
 function isDataUIPart(part) {
   return part.type.startsWith("data-");
@@ -5538,6 +5590,7 @@ var DefaultStreamTextResult = class {
     let recordedRequest = {};
     let recordedWarnings = [];
     const recordedSteps = [];
+    const pendingDeferredToolCalls = /* @__PURE__ */ new Map();
     let rootSpan;
     let activeTextContent = {};
     let activeReasoningContent = {};
@@ -5946,6 +5999,10 @@ var DefaultStreamTextResult = class {
             activeTools: (_e = prepareStepResult == null ? void 0 : prepareStepResult.activeTools) != null ? _e : activeTools
           });
           experimental_context = (_f = prepareStepResult == null ? void 0 : prepareStepResult.experimental_context) != null ? _f : experimental_context;
+          const stepProviderOptions = mergeObjects(
+            providerOptions,
+            prepareStepResult == null ? void 0 : prepareStepResult.providerOptions
+          );
           const {
             result: { stream: stream2, response, request },
             doStreamSpan,
@@ -5999,7 +6056,7 @@ var DefaultStreamTextResult = class {
                   toolChoice: stepToolChoice,
                   responseFormat: await (output == null ? void 0 : output.responseFormat),
                   prompt: promptMessages,
-                  providerOptions,
+                  providerOptions: stepProviderOptions,
                   abortSignal,
                   headers,
                   includeRawChunks: includeRawChunks2
@@ -6247,12 +6304,36 @@ var DefaultStreamTextResult = class {
                   const clientToolOutputs = stepToolOutputs.filter(
                     (toolOutput) => toolOutput.providerExecuted !== true
                   );
-                  if (clientToolCalls.length > 0 && // all current tool calls have outputs (incl. execution errors):
-                  clientToolOutputs.length === clientToolCalls.length && // continue until a stop condition is met:
-                  !await isStopConditionMet({
-                    stopConditions,
-                    steps: recordedSteps
-                  })) {
+                  for (const toolCall of stepToolCalls) {
+                    if (toolCall.providerExecuted !== true)
+                      continue;
+                    const tool2 = tools == null ? void 0 : tools[toolCall.toolName];
+                    if ((tool2 == null ? void 0 : tool2.type) === "provider" && tool2.supportsDeferredResults) {
+                      const hasResultInStep = stepToolOutputs.some(
+                        (output2) => output2.type === "tool-result" && output2.toolCallId === toolCall.toolCallId
+                      );
+                      if (!hasResultInStep) {
+                        pendingDeferredToolCalls.set(toolCall.toolCallId, {
+                          toolName: toolCall.toolName
+                        });
+                      }
+                    }
+                  }
+                  for (const output2 of stepToolOutputs) {
+                    if (output2.type === "tool-result") {
+                      pendingDeferredToolCalls.delete(output2.toolCallId);
+                    }
+                  }
+                  if (
+                    // Continue if:
+                    // 1. There are client tool calls that have all been executed, OR
+                    // 2. There are pending deferred results from provider-executed tools
+                    (clientToolCalls.length > 0 && clientToolOutputs.length === clientToolCalls.length || pendingDeferredToolCalls.size > 0) && // continue until a stop condition is met:
+                    !await isStopConditionMet({
+                      stopConditions,
+                      steps: recordedSteps
+                    })
+                  ) {
                     responseMessages.push(
                       ...await toResponseMessages({
                         content: (