ai 6.0.236 → 6.0.238

package/dist/index.mjs

@@ -1193,7 +1193,7 @@ import {
 } from "@ai-sdk/provider-utils";
 
 // src/version.ts
-var VERSION = true ? "6.0.236" : "0.0.0-test";
+var VERSION = true ? "6.0.238" : "0.0.0-test";
 
 // src/util/download/download.ts
 var download = async ({
@@ -4108,6 +4108,24 @@ async function doParseToolCall({
   };
 }
 
+// src/generate-text/prepare-step-call-settings.ts
+function prepareStepCallSettings({
+  callSettings,
+  stepSettings
+}) {
+  var _a22, _b, _c, _d, _e, _f, _g, _h;
+  return prepareCallSettings({
+    maxOutputTokens: (_a22 = stepSettings == null ? void 0 : stepSettings.maxOutputTokens) != null ? _a22 : callSettings.maxOutputTokens,
+    temperature: (_b = stepSettings == null ? void 0 : stepSettings.temperature) != null ? _b : callSettings.temperature,
+    topP: (_c = stepSettings == null ? void 0 : stepSettings.topP) != null ? _c : callSettings.topP,
+    topK: (_d = stepSettings == null ? void 0 : stepSettings.topK) != null ? _d : callSettings.topK,
+    presencePenalty: (_e = stepSettings == null ? void 0 : stepSettings.presencePenalty) != null ? _e : callSettings.presencePenalty,
+    frequencyPenalty: (_f = stepSettings == null ? void 0 : stepSettings.frequencyPenalty) != null ? _f : callSettings.frequencyPenalty,
+    stopSequences: (_g = stepSettings == null ? void 0 : stepSettings.stopSequences) != null ? _g : callSettings.stopSequences,
+    seed: (_h = stepSettings == null ? void 0 : stepSettings.seed) != null ? _h : callSettings.seed
+  });
+}
+
 // src/generate-text/step-result.ts
 var DefaultStepResult = class {
   constructor({
@@ -4663,6 +4681,10 @@ async function generateText({
               providerOptions,
               prepareStepResult == null ? void 0 : prepareStepResult.providerOptions
             );
+            const stepCallSettings = prepareStepCallSettings({
+              callSettings: callSettings2,
+              stepSettings: prepareStepResult
+            });
             await notify({
               event: {
                 stepNumber: steps.length,
@@ -4690,113 +4712,110 @@ async function generateText({
               ]
             });
             currentModelResponse = await retry(
-              () => {
-                var _a23;
-                return recordSpan({
-                  name: "ai.generateText.doGenerate",
-                  attributes: selectTelemetryAttributes({
-                    telemetry,
-                    attributes: {
-                      ...assembleOperationName({
-                        operationId: "ai.generateText.doGenerate",
-                        telemetry
-                      }),
-                      ...baseTelemetryAttributes,
-                      // model:
-                      "ai.model.provider": stepModel.provider,
-                      "ai.model.id": stepModel.modelId,
-                      // prompt:
-                      "ai.prompt.messages": {
-                        input: () => stringifyForTelemetry(promptMessages)
-                      },
-                      "ai.prompt.tools": {
-                        // convert the language model level tools:
-                        input: () => stepTools == null ? void 0 : stepTools.map((tool2) => JSON.stringify(tool2))
-                      },
-                      "ai.prompt.toolChoice": {
-                        input: () => stepToolChoice != null ? JSON.stringify(stepToolChoice) : void 0
-                      },
-                      // standardized gen-ai llm span attributes:
-                      "gen_ai.system": stepModel.provider,
-                      "gen_ai.request.model": stepModel.modelId,
-                      "gen_ai.request.frequency_penalty": settings.frequencyPenalty,
-                      "gen_ai.request.max_tokens": settings.maxOutputTokens,
-                      "gen_ai.request.presence_penalty": settings.presencePenalty,
-                      "gen_ai.request.stop_sequences": settings.stopSequences,
-                      "gen_ai.request.temperature": (_a23 = settings.temperature) != null ? _a23 : void 0,
-                      "gen_ai.request.top_k": settings.topK,
-                      "gen_ai.request.top_p": settings.topP
-                    }
-                  }),
-                  tracer,
-                  fn: async (span2) => {
-                    var _a24, _b2, _c2, _d2, _e2, _f2, _g2, _h2;
-                    const result = await stepModel.doGenerate({
-                      ...callSettings2,
-                      tools: stepTools,
-                      toolChoice: stepToolChoice,
-                      responseFormat: await (output == null ? void 0 : output.responseFormat),
-                      prompt: promptMessages,
-                      providerOptions: stepProviderOptions,
-                      abortSignal: mergedAbortSignal,
-                      headers: headersWithUserAgent
-                    });
-                    const responseData = {
-                      id: (_b2 = (_a24 = result.response) == null ? void 0 : _a24.id) != null ? _b2 : generateId2(),
-                      timestamp: (_d2 = (_c2 = result.response) == null ? void 0 : _c2.timestamp) != null ? _d2 : /* @__PURE__ */ new Date(),
-                      modelId: (_f2 = (_e2 = result.response) == null ? void 0 : _e2.modelId) != null ? _f2 : stepModel.modelId,
-                      headers: (_g2 = result.response) == null ? void 0 : _g2.headers,
-                      body: (_h2 = result.response) == null ? void 0 : _h2.body
-                    };
-                    const usage = asLanguageModelUsage(result.usage);
-                    span2.setAttributes(
-                      await selectTelemetryAttributes({
-                        telemetry,
-                        attributes: {
-                          "ai.response.finishReason": result.finishReason.unified,
-                          "ai.response.text": {
-                            output: () => extractTextContent(result.content)
-                          },
-                          "ai.response.reasoning": {
-                            output: () => extractReasoningContent(result.content)
-                          },
-                          "ai.response.toolCalls": {
-                            output: () => {
-                              const toolCalls = asToolCalls(result.content);
-                              return toolCalls == null ? void 0 : JSON.stringify(toolCalls);
-                            }
-                          },
-                          "ai.response.id": responseData.id,
-                          "ai.response.model": responseData.modelId,
-                          "ai.response.timestamp": responseData.timestamp.toISOString(),
-                          "ai.response.providerMetadata": JSON.stringify(
-                            result.providerMetadata
-                          ),
-                          "ai.usage.inputTokens": result.usage.inputTokens.total,
-                          "ai.usage.inputTokenDetails.noCacheTokens": result.usage.inputTokens.noCache,
-                          "ai.usage.inputTokenDetails.cacheReadTokens": result.usage.inputTokens.cacheRead,
-                          "ai.usage.inputTokenDetails.cacheWriteTokens": result.usage.inputTokens.cacheWrite,
-                          "ai.usage.outputTokens": result.usage.outputTokens.total,
-                          "ai.usage.outputTokenDetails.textTokens": result.usage.outputTokens.text,
-                          "ai.usage.outputTokenDetails.reasoningTokens": result.usage.outputTokens.reasoning,
-                          "ai.usage.totalTokens": usage.totalTokens,
-                          "ai.usage.reasoningTokens": result.usage.outputTokens.reasoning,
-                          "ai.usage.cachedInputTokens": result.usage.inputTokens.cacheRead,
-                          // standardized gen-ai llm span attributes:
-                          "gen_ai.response.finish_reasons": [
-                            result.finishReason.unified
-                          ],
-                          "gen_ai.response.id": responseData.id,
-                          "gen_ai.response.model": responseData.modelId,
-                          "gen_ai.usage.input_tokens": result.usage.inputTokens.total,
-                          "gen_ai.usage.output_tokens": result.usage.outputTokens.total
-                        }
-                      })
-                    );
-                    return { ...result, response: responseData };
+              () => recordSpan({
+                name: "ai.generateText.doGenerate",
+                attributes: selectTelemetryAttributes({
+                  telemetry,
+                  attributes: {
+                    ...assembleOperationName({
+                      operationId: "ai.generateText.doGenerate",
+                      telemetry
+                    }),
+                    ...baseTelemetryAttributes,
+                    // model:
+                    "ai.model.provider": stepModel.provider,
+                    "ai.model.id": stepModel.modelId,
+                    // prompt:
+                    "ai.prompt.messages": {
+                      input: () => stringifyForTelemetry(promptMessages)
+                    },
+                    "ai.prompt.tools": {
+                      // convert the language model level tools:
+                      input: () => stepTools == null ? void 0 : stepTools.map((tool2) => JSON.stringify(tool2))
+                    },
+                    "ai.prompt.toolChoice": {
+                      input: () => stepToolChoice != null ? JSON.stringify(stepToolChoice) : void 0
+                    },
+                    // standardized gen-ai llm span attributes:
+                    "gen_ai.system": stepModel.provider,
+                    "gen_ai.request.model": stepModel.modelId,
+                    "gen_ai.request.frequency_penalty": stepCallSettings.frequencyPenalty,
+                    "gen_ai.request.max_tokens": stepCallSettings.maxOutputTokens,
+                    "gen_ai.request.presence_penalty": stepCallSettings.presencePenalty,
+                    "gen_ai.request.stop_sequences": stepCallSettings.stopSequences,
+                    "gen_ai.request.temperature": stepCallSettings.temperature,
+                    "gen_ai.request.top_k": stepCallSettings.topK,
+                    "gen_ai.request.top_p": stepCallSettings.topP
                   }
-                });
-              }
+                }),
+                tracer,
+                fn: async (span2) => {
+                  var _a23, _b2, _c2, _d2, _e2, _f2, _g2, _h2;
+                  const result = await stepModel.doGenerate({
+                    ...stepCallSettings,
+                    tools: stepTools,
+                    toolChoice: stepToolChoice,
+                    responseFormat: await (output == null ? void 0 : output.responseFormat),
+                    prompt: promptMessages,
+                    providerOptions: stepProviderOptions,
+                    abortSignal: mergedAbortSignal,
+                    headers: headersWithUserAgent
+                  });
+                  const responseData = {
+                    id: (_b2 = (_a23 = result.response) == null ? void 0 : _a23.id) != null ? _b2 : generateId2(),
+                    timestamp: (_d2 = (_c2 = result.response) == null ? void 0 : _c2.timestamp) != null ? _d2 : /* @__PURE__ */ new Date(),
+                    modelId: (_f2 = (_e2 = result.response) == null ? void 0 : _e2.modelId) != null ? _f2 : stepModel.modelId,
+                    headers: (_g2 = result.response) == null ? void 0 : _g2.headers,
+                    body: (_h2 = result.response) == null ? void 0 : _h2.body
+                  };
+                  const usage = asLanguageModelUsage(result.usage);
+                  span2.setAttributes(
+                    await selectTelemetryAttributes({
+                      telemetry,
+                      attributes: {
+                        "ai.response.finishReason": result.finishReason.unified,
+                        "ai.response.text": {
+                          output: () => extractTextContent(result.content)
+                        },
+                        "ai.response.reasoning": {
+                          output: () => extractReasoningContent(result.content)
+                        },
+                        "ai.response.toolCalls": {
+                          output: () => {
+                            const toolCalls = asToolCalls(result.content);
+                            return toolCalls == null ? void 0 : JSON.stringify(toolCalls);
+                          }
+                        },
+                        "ai.response.id": responseData.id,
+                        "ai.response.model": responseData.modelId,
+                        "ai.response.timestamp": responseData.timestamp.toISOString(),
+                        "ai.response.providerMetadata": JSON.stringify(
+                          result.providerMetadata
+                        ),
+                        "ai.usage.inputTokens": result.usage.inputTokens.total,
+                        "ai.usage.inputTokenDetails.noCacheTokens": result.usage.inputTokens.noCache,
+                        "ai.usage.inputTokenDetails.cacheReadTokens": result.usage.inputTokens.cacheRead,
+                        "ai.usage.inputTokenDetails.cacheWriteTokens": result.usage.inputTokens.cacheWrite,
+                        "ai.usage.outputTokens": result.usage.outputTokens.total,
+                        "ai.usage.outputTokenDetails.textTokens": result.usage.outputTokens.text,
+                        "ai.usage.outputTokenDetails.reasoningTokens": result.usage.outputTokens.reasoning,
+                        "ai.usage.totalTokens": usage.totalTokens,
+                        "ai.usage.reasoningTokens": result.usage.outputTokens.reasoning,
+                        "ai.usage.cachedInputTokens": result.usage.inputTokens.cacheRead,
+                        // standardized gen-ai llm span attributes:
+                        "gen_ai.response.finish_reasons": [
+                          result.finishReason.unified
+                        ],
+                        "gen_ai.response.id": responseData.id,
+                        "gen_ai.response.model": responseData.modelId,
+                        "gen_ai.usage.input_tokens": result.usage.inputTokens.total,
+                        "gen_ai.usage.output_tokens": result.usage.outputTokens.total
+                      }
+                    })
+                  );
+                  return { ...result, response: responseData };
+                }
+              })
             );
             const stepToolCalls = await Promise.all(
               currentModelResponse.content.filter(
@@ -4860,7 +4879,7 @@ async function generateText({
               }
             }
             const invalidToolCalls = stepToolCalls.filter(
-              (toolCall) => toolCall.invalid && toolCall.dynamic
+              (toolCall) => toolCall.invalid && toolCall.dynamic && !toolCall.providerExecuted
             );
             clientToolOutputs = [];
             for (const toolCall of invalidToolCalls) {
@@ -6746,16 +6765,18 @@ function runToolsTransformation({
             toolCallsByToolCallId.set(toolCall.toolCallId, toolCall);
             controller.enqueue(toolCall);
             if (toolCall.invalid) {
-              enqueueToolResult({
-                type: "tool-error",
-                toolCallId: toolCall.toolCallId,
-                toolName: toolCall.toolName,
-                input: toolCall.input,
-                error: getErrorMessage5(toolCall.error),
-                dynamic: true,
-                title: toolCall.title,
-                ...toolCall.toolMetadata != null ? { toolMetadata: toolCall.toolMetadata } : {}
-              });
+              if (!toolCall.providerExecuted) {
+                enqueueToolResult({
+                  type: "tool-error",
+                  toolCallId: toolCall.toolCallId,
+                  toolName: toolCall.toolName,
+                  input: toolCall.input,
+                  error: getErrorMessage5(toolCall.error),
+                  dynamic: true,
+                  title: toolCall.title,
+                  ...toolCall.toolMetadata != null ? { toolMetadata: toolCall.toolMetadata } : {}
+                });
+              }
               break;
             }
             const tool2 = tools == null ? void 0 : tools[toolCall.toolName];
@@ -7070,6 +7091,10 @@ function createOutputTransformStream(output) {
       text2 += chunk.text;
       textChunk += chunk.text;
       textProviderMetadata = (_a22 = chunk.providerMetadata) != null ? _a22 : textProviderMetadata;
+      if (chunk.text.length === 0 && chunk.providerMetadata != null) {
+        controller.enqueue({ part: chunk, partialOutput: void 0 });
+        return;
+      }
       const result = await output.parsePartialOutput({ text: text2 });
       if (result !== void 0) {
         const currentValue = typeof result.partial === "string" ? result.partial : JSON.stringify(result.partial);
@@ -7721,6 +7746,10 @@ var DefaultStreamTextResult = class {
               providerOptions,
               prepareStepResult == null ? void 0 : prepareStepResult.providerOptions
             );
+            const stepCallSettings = prepareStepCallSettings({
+              callSettings,
+              stepSettings: prepareStepResult
+            });
             await notify({
               event: {
                 stepNumber: recordedSteps.length,
@@ -7778,13 +7807,13 @@ var DefaultStreamTextResult = class {
                     // standardized gen-ai llm span attributes:
                     "gen_ai.system": stepModel.provider,
                     "gen_ai.request.model": stepModel.modelId,
-                    "gen_ai.request.frequency_penalty": callSettings.frequencyPenalty,
-                    "gen_ai.request.max_tokens": callSettings.maxOutputTokens,
-                    "gen_ai.request.presence_penalty": callSettings.presencePenalty,
-                    "gen_ai.request.stop_sequences": callSettings.stopSequences,
-                    "gen_ai.request.temperature": callSettings.temperature,
-                    "gen_ai.request.top_k": callSettings.topK,
-                    "gen_ai.request.top_p": callSettings.topP
+                    "gen_ai.request.frequency_penalty": stepCallSettings.frequencyPenalty,
+                    "gen_ai.request.max_tokens": stepCallSettings.maxOutputTokens,
+                    "gen_ai.request.presence_penalty": stepCallSettings.presencePenalty,
+                    "gen_ai.request.stop_sequences": stepCallSettings.stopSequences,
+                    "gen_ai.request.temperature": stepCallSettings.temperature,
+                    "gen_ai.request.top_k": stepCallSettings.topK,
+                    "gen_ai.request.top_p": stepCallSettings.topP
                   }
                 }),
                 tracer,
@@ -7794,7 +7823,7 @@ var DefaultStreamTextResult = class {
                   // get before the call
                   doStreamSpan: doStreamSpan2,
                   result: await stepModel.doStream({
-                    ...callSettings,
+                    ...stepCallSettings,
                     tools: stepTools,
                     toolChoice: stepToolChoice,
                     responseFormat: await (output == null ? void 0 : output.responseFormat),
@@ -7885,15 +7914,15 @@ var DefaultStreamTextResult = class {
                         break;
                       }
                       case "text-delta": {
-                        if (chunk.delta.length > 0) {
+                        if (chunk.delta.length > 0 || chunk.providerMetadata != null) {
                           controller.enqueue({
                             type: "text-delta",
                             id: chunk.id,
                             text: chunk.delta,
                             providerMetadata: chunk.providerMetadata
                           });
-                          activeText += chunk.delta;
                         }
+                        activeText += chunk.delta;
                         break;
                       }
                       case "reasoning-start":