ai 6.0.21 → 6.0.23

package/dist/index.js

@@ -96,6 +96,7 @@ __export(src_exports, {
   generateObject: () => generateObject,
   generateText: () => generateText,
   getStaticToolName: () => getStaticToolName,
+  getStepTimeoutMs: () => getStepTimeoutMs,
   getTextFromDataUrl: () => getTextFromDataUrl,
   getToolName: () => getToolName,
   getToolOrDynamicToolName: () => getToolOrDynamicToolName,
@@ -819,6 +820,12 @@ function getTotalTimeoutMs(timeout) {
   }
   return timeout.totalMs;
 }
+function getStepTimeoutMs(timeout) {
+  if (timeout == null || typeof timeout === "number") {
+    return void 0;
+  }
+  return timeout.stepMs;
+}
 
 // src/prompt/convert-to-language-model-prompt.ts
 var import_provider_utils6 = require("@ai-sdk/provider-utils");
@@ -1013,7 +1020,7 @@ var import_provider_utils3 = require("@ai-sdk/provider-utils");
 var import_provider_utils4 = require("@ai-sdk/provider-utils");
 
 // src/version.ts
-var VERSION = true ? "6.0.21" : "0.0.0-test";
+var VERSION = true ? "6.0.23" : "0.0.0-test";
 
 // src/util/download/download.ts
 var download = async ({ url }) => {
@@ -3667,9 +3674,12 @@ async function generateText({
   const model = resolveLanguageModel(modelArg);
   const stopConditions = asArray(stopWhen);
   const totalTimeoutMs = getTotalTimeoutMs(timeout);
+  const stepTimeoutMs = getStepTimeoutMs(timeout);
+  const stepAbortController = stepTimeoutMs != null ? new AbortController() : void 0;
   const mergedAbortSignal = mergeAbortSignals(
     abortSignal,
-    totalTimeoutMs != null ? AbortSignal.timeout(totalTimeoutMs) : void 0
+    totalTimeoutMs != null ? AbortSignal.timeout(totalTimeoutMs) : void 0,
+    stepAbortController == null ? void 0 : stepAbortController.signal
   );
   const { maxRetries, retry } = prepareRetries({
     maxRetries: maxRetriesArg,
@@ -3798,263 +3808,270 @@ async function generateText({
         const steps = [];
         const pendingDeferredToolCalls = /* @__PURE__ */ new Map();
         do {
-          const stepInputMessages = [...initialMessages, ...responseMessages];
-          const prepareStepResult = await (prepareStep == null ? void 0 : prepareStep({
-            model,
-            steps,
-            stepNumber: steps.length,
-            messages: stepInputMessages,
-            experimental_context
-          }));
-          const stepModel = resolveLanguageModel(
-            (_a16 = prepareStepResult == null ? void 0 : prepareStepResult.model) != null ? _a16 : model
-          );
-          const promptMessages = await convertToLanguageModelPrompt({
-            prompt: {
-              system: (_b = prepareStepResult == null ? void 0 : prepareStepResult.system) != null ? _b : initialPrompt.system,
-              messages: (_c = prepareStepResult == null ? void 0 : prepareStepResult.messages) != null ? _c : stepInputMessages
-            },
-            supportedUrls: await stepModel.supportedUrls,
-            download: download2
-          });
-          experimental_context = (_d = prepareStepResult == null ? void 0 : prepareStepResult.experimental_context) != null ? _d : experimental_context;
-          const { toolChoice: stepToolChoice, tools: stepTools } = await prepareToolsAndToolChoice({
-            tools,
-            toolChoice: (_e = prepareStepResult == null ? void 0 : prepareStepResult.toolChoice) != null ? _e : toolChoice,
-            activeTools: (_f = prepareStepResult == null ? void 0 : prepareStepResult.activeTools) != null ? _f : activeTools
-          });
-          currentModelResponse = await retry(
-            () => {
-              var _a17;
-              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": (_a17 = settings.temperature) != null ? _a17 : void 0,
-                    "gen_ai.request.top_k": settings.topK,
-                    "gen_ai.request.top_p": settings.topP
+          const stepTimeoutId = stepTimeoutMs != null ? setTimeout(() => stepAbortController.abort(), stepTimeoutMs) : void 0;
+          try {
+            const stepInputMessages = [...initialMessages, ...responseMessages];
+            const prepareStepResult = await (prepareStep == null ? void 0 : prepareStep({
+              model,
+              steps,
+              stepNumber: steps.length,
+              messages: stepInputMessages,
+              experimental_context
+            }));
+            const stepModel = resolveLanguageModel(
+              (_a16 = prepareStepResult == null ? void 0 : prepareStepResult.model) != null ? _a16 : model
+            );
+            const promptMessages = await convertToLanguageModelPrompt({
+              prompt: {
+                system: (_b = prepareStepResult == null ? void 0 : prepareStepResult.system) != null ? _b : initialPrompt.system,
+                messages: (_c = prepareStepResult == null ? void 0 : prepareStepResult.messages) != null ? _c : stepInputMessages
+              },
+              supportedUrls: await stepModel.supportedUrls,
+              download: download2
+            });
+            experimental_context = (_d = prepareStepResult == null ? void 0 : prepareStepResult.experimental_context) != null ? _d : experimental_context;
+            const { toolChoice: stepToolChoice, tools: stepTools } = await prepareToolsAndToolChoice({
+              tools,
+              toolChoice: (_e = prepareStepResult == null ? void 0 : prepareStepResult.toolChoice) != null ? _e : toolChoice,
+              activeTools: (_f = prepareStepResult == null ? void 0 : prepareStepResult.activeTools) != null ? _f : activeTools
+            });
+            currentModelResponse = await retry(
+              () => {
+                var _a17;
+                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": (_a17 = settings.temperature) != null ? _a17 : void 0,
+                      "gen_ai.request.top_k": settings.topK,
+                      "gen_ai.request.top_p": settings.topP
+                    }
+                  }),
+                  tracer,
+                  fn: async (span2) => {
+                    var _a18, _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: stepProviderOptions,
+                      abortSignal: mergedAbortSignal,
+                      headers: headersWithUserAgent
+                    });
+                    const responseData = {
+                      id: (_b2 = (_a18 = result.response) == null ? void 0 : _a18.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
+                    };
+                    span2.setAttributes(
+                      await selectTelemetryAttributes({
+                        telemetry,
+                        attributes: {
+                          "ai.response.finishReason": result.finishReason.unified,
+                          "ai.response.text": {
+                            output: () => extractTextContent(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
+                          ),
+                          // TODO rename telemetry attributes to inputTokens and outputTokens
+                          "ai.usage.promptTokens": result.usage.inputTokens.total,
+                          "ai.usage.completionTokens": result.usage.outputTokens.total,
+                          // 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 };
                   }
-                }),
-                tracer,
-                fn: async (span2) => {
-                  var _a18, _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: stepProviderOptions,
-                    abortSignal: mergedAbortSignal,
-                    headers: headersWithUserAgent
-                  });
-                  const responseData = {
-                    id: (_b2 = (_a18 = result.response) == null ? void 0 : _a18.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
-                  };
-                  span2.setAttributes(
-                    await selectTelemetryAttributes({
-                      telemetry,
-                      attributes: {
-                        "ai.response.finishReason": result.finishReason.unified,
-                        "ai.response.text": {
-                          output: () => extractTextContent(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
-                        ),
-                        // TODO rename telemetry attributes to inputTokens and outputTokens
-                        "ai.usage.promptTokens": result.usage.inputTokens.total,
-                        "ai.usage.completionTokens": result.usage.outputTokens.total,
-                        // 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(
-              (part) => part.type === "tool-call"
-            ).map(
-              (toolCall) => parseToolCall({
+                });
+              }
+            );
+            const stepToolCalls = await Promise.all(
+              currentModelResponse.content.filter(
+                (part) => part.type === "tool-call"
+              ).map(
+                (toolCall) => parseToolCall({
+                  toolCall,
+                  tools,
+                  repairToolCall,
+                  system,
+                  messages: stepInputMessages
+                })
+              )
+            );
+            const toolApprovalRequests = {};
+            for (const toolCall of stepToolCalls) {
+              if (toolCall.invalid) {
+                continue;
+              }
+              const tool2 = tools == null ? void 0 : tools[toolCall.toolName];
+              if (tool2 == null) {
+                continue;
+              }
+              if ((tool2 == null ? void 0 : tool2.onInputAvailable) != null) {
+                await tool2.onInputAvailable({
+                  input: toolCall.input,
+                  toolCallId: toolCall.toolCallId,
+                  messages: stepInputMessages,
+                  abortSignal: mergedAbortSignal,
+                  experimental_context
+                });
+              }
+              if (await isApprovalNeeded({
+                tool: tool2,
                 toolCall,
-                tools,
-                repairToolCall,
-                system,
-                messages: stepInputMessages
-              })
-            )
-          );
-          const toolApprovalRequests = {};
-          for (const toolCall of stepToolCalls) {
-            if (toolCall.invalid) {
-              continue;
-            }
-            const tool2 = tools == null ? void 0 : tools[toolCall.toolName];
-            if (tool2 == null) {
-              continue;
-            }
-            if ((tool2 == null ? void 0 : tool2.onInputAvailable) != null) {
-              await tool2.onInputAvailable({
-                input: toolCall.input,
-                toolCallId: toolCall.toolCallId,
                 messages: stepInputMessages,
-                abortSignal: mergedAbortSignal,
                 experimental_context
-              });
+              })) {
+                toolApprovalRequests[toolCall.toolCallId] = {
+                  type: "tool-approval-request",
+                  approvalId: generateId2(),
+                  toolCall
+                };
+              }
             }
-            if (await isApprovalNeeded({
-              tool: tool2,
-              toolCall,
-              messages: stepInputMessages,
-              experimental_context
-            })) {
-              toolApprovalRequests[toolCall.toolCallId] = {
-                type: "tool-approval-request",
-                approvalId: generateId2(),
-                toolCall
-              };
+            const invalidToolCalls = stepToolCalls.filter(
+              (toolCall) => toolCall.invalid && toolCall.dynamic
+            );
+            clientToolOutputs = [];
+            for (const toolCall of invalidToolCalls) {
+              clientToolOutputs.push({
+                type: "tool-error",
+                toolCallId: toolCall.toolCallId,
+                toolName: toolCall.toolName,
+                input: toolCall.input,
+                error: (0, import_provider_utils15.getErrorMessage)(toolCall.error),
+                dynamic: true
+              });
             }
-          }
-          const invalidToolCalls = stepToolCalls.filter(
-            (toolCall) => toolCall.invalid && toolCall.dynamic
-          );
-          clientToolOutputs = [];
-          for (const toolCall of invalidToolCalls) {
-            clientToolOutputs.push({
-              type: "tool-error",
-              toolCallId: toolCall.toolCallId,
-              toolName: toolCall.toolName,
-              input: toolCall.input,
-              error: (0, import_provider_utils15.getErrorMessage)(toolCall.error),
-              dynamic: true
-            });
-          }
-          clientToolCalls = stepToolCalls.filter(
-            (toolCall) => !toolCall.providerExecuted
-          );
-          if (tools != null) {
-            clientToolOutputs.push(
-              ...await executeTools({
-                toolCalls: clientToolCalls.filter(
-                  (toolCall) => !toolCall.invalid && toolApprovalRequests[toolCall.toolCallId] == null
-                ),
-                tools,
-                tracer,
-                telemetry,
-                messages: stepInputMessages,
-                abortSignal: mergedAbortSignal,
-                experimental_context
-              })
+            clientToolCalls = stepToolCalls.filter(
+              (toolCall) => !toolCall.providerExecuted
             );
-          }
-          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 (tools != null) {
+              clientToolOutputs.push(
+                ...await executeTools({
+                  toolCalls: clientToolCalls.filter(
+                    (toolCall) => !toolCall.invalid && toolApprovalRequests[toolCall.toolCallId] == null
+                  ),
+                  tools,
+                  tracer,
+                  telemetry,
+                  messages: stepInputMessages,
+                  abortSignal: mergedAbortSignal,
+                  experimental_context
+                })
               );
-              if (!hasResultInResponse) {
-                pendingDeferredToolCalls.set(toolCall.toolCallId, {
-                  toolName: toolCall.toolName
-                });
+            }
+            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);
+            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),
-            tools
-          });
-          responseMessages.push(
-            ...await toResponseMessages({
-              content: stepContent,
+            const stepContent = asContent({
+              content: currentModelResponse.content,
+              toolCalls: stepToolCalls,
+              toolOutputs: clientToolOutputs,
+              toolApprovalRequests: Object.values(toolApprovalRequests),
               tools
-            })
-          );
-          const currentStepResult = new DefaultStepResult({
-            content: stepContent,
-            finishReason: currentModelResponse.finishReason.unified,
-            rawFinishReason: currentModelResponse.finishReason.raw,
-            usage: asLanguageModelUsage(currentModelResponse.usage),
-            warnings: currentModelResponse.warnings,
-            providerMetadata: currentModelResponse.providerMetadata,
-            request: (_g = currentModelResponse.request) != null ? _g : {},
-            response: {
-              ...currentModelResponse.response,
-              // deep clone msgs to avoid mutating past messages in multi-step:
-              messages: structuredClone(responseMessages)
+            });
+            responseMessages.push(
+              ...await toResponseMessages({
+                content: stepContent,
+                tools
+              })
+            );
+            const currentStepResult = new DefaultStepResult({
+              content: stepContent,
+              finishReason: currentModelResponse.finishReason.unified,
+              rawFinishReason: currentModelResponse.finishReason.raw,
+              usage: asLanguageModelUsage(currentModelResponse.usage),
+              warnings: currentModelResponse.warnings,
+              providerMetadata: currentModelResponse.providerMetadata,
+              request: (_g = currentModelResponse.request) != null ? _g : {},
+              response: {
+                ...currentModelResponse.response,
+                // deep clone msgs to avoid mutating past messages in multi-step:
+                messages: structuredClone(responseMessages)
+              }
+            });
+            logWarnings({
+              warnings: (_h = currentModelResponse.warnings) != null ? _h : [],
+              provider: stepModel.provider,
+              model: stepModel.modelId
+            });
+            steps.push(currentStepResult);
+            await (onStepFinish == null ? void 0 : onStepFinish(currentStepResult));
+          } finally {
+            if (stepTimeoutId != null) {
+              clearTimeout(stepTimeoutId);
             }
-          });
-          logWarnings({
-            warnings: (_h = currentModelResponse.warnings) != null ? _h : [],
-            provider: stepModel.provider,
-            model: stepModel.modelId
-          });
-          steps.push(currentStepResult);
-          await (onStepFinish == null ? void 0 : onStepFinish(currentStepResult));
+          }
         } while (
           // Continue if:
           // 1. There are client tool calls that have all been executed, OR
@@ -5749,14 +5766,12 @@ function streamText({
   onAbort,
   onStepFinish,
   experimental_context,
-  _internal: {
-    now: now2 = now,
-    generateId: generateId2 = originalGenerateId2,
-    currentDate = () => /* @__PURE__ */ new Date()
-  } = {},
+  _internal: { now: now2 = now, generateId: generateId2 = originalGenerateId2 } = {},
   ...settings
 }) {
   const totalTimeoutMs = getTotalTimeoutMs(timeout);
+  const stepTimeoutMs = getStepTimeoutMs(timeout);
+  const stepAbortController = stepTimeoutMs != null ? new AbortController() : void 0;
   return new DefaultStreamTextResult({
     model: resolveLanguageModel(model),
     telemetry,
@@ -5765,8 +5780,11 @@ function streamText({
     maxRetries,
     abortSignal: mergeAbortSignals(
       abortSignal,
-      totalTimeoutMs != null ? AbortSignal.timeout(totalTimeoutMs) : void 0
+      totalTimeoutMs != null ? AbortSignal.timeout(totalTimeoutMs) : void 0,
+      stepAbortController == null ? void 0 : stepAbortController.signal
     ),
+    stepTimeoutMs,
+    stepAbortController,
     system,
     prompt,
     messages,
@@ -5786,7 +5804,6 @@ function streamText({
     onAbort,
     onStepFinish,
     now: now2,
-    currentDate,
     generateId: generateId2,
     experimental_context,
     download: download2
@@ -5862,6 +5879,8 @@ var DefaultStreamTextResult = class {
     settings,
     maxRetries: maxRetriesArg,
     abortSignal,
+    stepTimeoutMs,
+    stepAbortController,
     system,
     prompt,
     messages,
@@ -5876,7 +5895,6 @@ var DefaultStreamTextResult = class {
     prepareStep,
     includeRawChunks,
     now: now2,
-    currentDate,
     generateId: generateId2,
     onChunk,
     onError,
@@ -6328,6 +6346,7 @@ var DefaultStreamTextResult = class {
         }) {
           var _a16, _b, _c, _d, _e, _f;
           const includeRawChunks2 = self.includeRawChunks;
+          const stepTimeoutId = stepTimeoutMs != null ? setTimeout(() => stepAbortController.abort(), stepTimeoutMs) : void 0;
           stepFinish = new import_provider_utils19.DelayedPromise();
           const stepInputMessages = [...initialMessages, ...responseMessages];
           const prepareStepResult = await (prepareStep == null ? void 0 : prepareStep({
@@ -6443,7 +6462,7 @@ var DefaultStreamTextResult = class {
           let stepFirstChunk = true;
           let stepResponse = {
             id: generateId2(),
-            timestamp: currentDate(),
+            timestamp: /* @__PURE__ */ new Date(),
             modelId: model.modelId
           };
           let activeText = "";
@@ -6682,6 +6701,9 @@ var DefaultStreamTextResult = class {
                       pendingDeferredToolCalls.delete(output2.toolCallId);
                     }
                   }
+                  if (stepTimeoutId != null) {
+                    clearTimeout(stepTimeoutId);
+                  }
                   if (
                     // Continue if:
                     // 1. There are client tool calls that have all been executed, OR
@@ -10239,7 +10261,16 @@ function smoothStream({
   _internal: { delay: delay2 = import_provider_utils32.delay } = {}
 } = {}) {
   let detectChunk;
-  if (typeof chunking === "function") {
+  if (chunking != null && typeof chunking === "object" && "segment" in chunking && typeof chunking.segment === "function") {
+    const segmenter = chunking;
+    detectChunk = (buffer) => {
+      if (buffer.length === 0)
+        return null;
+      const iterator = segmenter.segment(buffer)[Symbol.iterator]();
+      const first = iterator.next().value;
+      return (first == null ? void 0 : first.segment) || null;
+    };
+  } else if (typeof chunking === "function") {
     detectChunk = (buffer) => {
       const match = chunking(buffer);
       if (match == null) {
@@ -10256,11 +10287,11 @@ function smoothStream({
       return match;
     };
   } else {
-    const chunkingRegex = typeof chunking === "string" ? CHUNKING_REGEXPS[chunking] : chunking;
+    const chunkingRegex = typeof chunking === "string" ? CHUNKING_REGEXPS[chunking] : chunking instanceof RegExp ? chunking : void 0;
     if (chunkingRegex == null) {
       throw new import_provider28.InvalidArgumentError({
         argument: "chunking",
-        message: `Chunking must be "word" or "line" or a RegExp. Received: ${chunking}`
+        message: `Chunking must be "word", "line", a RegExp, an Intl.Segmenter, or a ChunkDetector function. Received: ${chunking}`
       });
     }
     detectChunk = (buffer) => {
@@ -12123,6 +12154,7 @@ var TextStreamChatTransport = class extends HttpChatTransport {
   generateObject,
   generateText,
   getStaticToolName,
+  getStepTimeoutMs,
   getTextFromDataUrl,
   getToolName,
   getToolOrDynamicToolName,