ai 7.0.114 → 7.0.116

package/dist/internal/index.js

@@ -10,17 +10,16 @@ function asAsyncIterableStream(stream) {
     const reader = this.getReader();
     let finished = false;
     async function cleanup(cancelStream) {
-      var _a12;
       if (finished) return;
       finished = true;
       try {
         if (cancelStream) {
-          await ((_a12 = reader.cancel) == null ? void 0 : _a12.call(reader));
+          await reader.cancel?.();
         }
       } finally {
         try {
           reader.releaseLock();
-        } catch (e) {
+        } catch {
         }
       }
     }
@@ -85,13 +84,13 @@ import {
   DownloadError,
   readResponseWithSizeLimit,
   DEFAULT_MAX_DOWNLOAD_SIZE,
-  fetchWithValidatedRedirects,
+  fetchUntrustedUrl,
   withUserAgentSuffix,
   getRuntimeEnvironmentUserAgent
 } from "@ai-sdk/provider-utils";
 
 // src/version.ts
-var VERSION = true ? "7.0.114" : "0.0.0-test";
+var VERSION = true ? "7.0.116" : "0.0.0-test";
 
 // src/util/download/download.ts
 var download = async ({
@@ -99,7 +98,6 @@ var download = async ({
   maxBytes,
   abortSignal
 }) => {
-  var _a12;
   const urlText = url.toString();
   try {
     const headers = withUserAgentSuffix(
@@ -107,7 +105,7 @@ var download = async ({
       `ai-sdk/${VERSION}`,
       getRuntimeEnvironmentUserAgent()
     );
-    const response = await fetchWithValidatedRedirects({
+    const response = await fetchUntrustedUrl({
       url: urlText,
       headers,
       abortSignal
@@ -123,11 +121,11 @@ var download = async ({
     const data = await readResponseWithSizeLimit({
       response,
       url: urlText,
-      maxBytes: maxBytes != null ? maxBytes : DEFAULT_MAX_DOWNLOAD_SIZE
+      maxBytes: maxBytes ?? DEFAULT_MAX_DOWNLOAD_SIZE
     });
     return {
       data,
-      mediaType: (_a12 = response.headers.get("content-type")) != null ? _a12 : void 0
+      mediaType: response.headers.get("content-type") ?? void 0
     };
   } catch (error) {
     if (DownloadError.isInstance(error)) {
@@ -214,7 +212,7 @@ function splitDataUrl(dataUrl) {
       mediaType: header.split(";")[0].split(":")[1],
       base64Content
     };
-  } catch (e) {
+  } catch {
     return {
       mediaType: void 0,
       base64Content: void 0
@@ -228,7 +226,7 @@ function isTaggedFileData(value) {
   const type = value.type;
   return type === "data" || type === "url" || type === "reference" || type === "text";
 }
-function convertUrlToFilePartData(url) {
+function convertUrlToFilePartData(url, originalUrl) {
   if (url.protocol === "data:") {
     const { mediaType, base64Content } = splitDataUrl(url.toString());
     if (mediaType == null || base64Content == null) {
@@ -239,7 +237,10 @@ function convertUrlToFilePartData(url) {
     }
     return { data: { type: "data", data: base64Content }, mediaType };
   }
-  return { data: { type: "url", url }, mediaType: void 0 };
+  return {
+    data: { type: "url", url, ...originalUrl != null ? { originalUrl } : {} },
+    mediaType: void 0
+  };
 }
 function convertUrlStringToFilePartData(content) {
   const result = convertUrlToFilePartData(new URL(content));
@@ -281,7 +282,7 @@ function convertToLanguageModelV4FilePart(content) {
         }
         return convertInlineDataToFilePartData(content.data);
       case "url":
-        return convertUrlToFilePartData(content.url);
+        return convertUrlToFilePartData(content.url, content.originalUrl);
       case "reference":
         return {
           data: { type: "reference", reference: content.reference },
@@ -300,7 +301,7 @@ function convertToLanguageModelV4FilePart(content) {
   if (typeof content === "string") {
     try {
       return convertUrlStringToFilePartData(content);
-    } catch (e) {
+    } catch {
       return convertInlineDataToFilePartData(content);
     }
   }
@@ -445,7 +446,7 @@ async function convertToLanguageModelPrompt({
 }) {
   const downloadedAssets = await downloadAssets(
     prompt.messages,
-    download2 != null ? download2 : createDefaultDownloadFunction(void 0, abortSignal),
+    download2 ?? createDefaultDownloadFunction(void 0, abortSignal),
     supportedUrls
   );
   const approvalIdToToolCallId = /* @__PURE__ */ new Map();
@@ -491,7 +492,7 @@ async function convertToLanguageModelPrompt({
       continue;
     }
     const lastCombinedMessage = combinedMessages.at(-1);
-    if ((lastCombinedMessage == null ? void 0 : lastCombinedMessage.role) === "tool") {
+    if (lastCombinedMessage?.role === "tool") {
       const lastContentPart = lastCombinedMessage.content.at(-1);
       if (lastContentPart != null && lastCombinedMessage.providerOptions != null) {
         lastContentPart.providerOptions = mergeObjects(
@@ -628,7 +629,7 @@ function convertToLanguageModelMessage({
                 type: "file",
                 data,
                 filename: part.filename,
-                mediaType: mediaType != null ? mediaType : part.mediaType,
+                mediaType: mediaType ?? part.mediaType,
                 providerOptions
               };
             }
@@ -651,7 +652,7 @@ function convertToLanguageModelMessage({
               return {
                 type: "reasoning-file",
                 data,
-                mediaType: mediaType != null ? mediaType : part.mediaType,
+                mediaType: mediaType ?? part.mediaType,
                 providerOptions
               };
             }
@@ -741,14 +742,13 @@ function convertToLanguageModelMessage({
   }
 }
 function convertImagePartToFilePart(part) {
-  var _a12;
   if (part.type !== "image") {
     return part;
   }
   return {
     type: "file",
     data: part.image,
-    mediaType: (_a12 = part.mediaType) != null ? _a12 : "image",
+    mediaType: part.mediaType ?? "image",
     providerOptions: part.providerOptions
   };
 }
@@ -825,7 +825,7 @@ function convertPartToLanguageModelPart(part, downloadedAssets) {
     };
   }
   const { data: normalizedData, mediaType: dataUrlMediaType } = convertToLanguageModelV4FilePart(part.data);
-  let mediaType = dataUrlMediaType != null ? dataUrlMediaType : part.mediaType;
+  let mediaType = dataUrlMediaType ?? part.mediaType;
   let data = normalizedData;
   if (data.type === "url") {
     const downloadedFile = downloadedAssets[data.url.toString()];
@@ -870,7 +870,6 @@ function mapToolResultOutput({
   return {
     type: "content",
     value: output.value.map((item) => {
-      var _a12;
       switch (item.type) {
         case "file": {
           const convertedPart = convertPartToLanguageModelPart(
@@ -899,7 +898,7 @@ function mapToolResultOutput({
           };
         }
         case "file-url": {
-          const mediaType = (_a12 = item.mediaType) != null ? _a12 : getMediaTypeFromUrl(item.url);
+          const mediaType = item.mediaType ?? getMediaTypeFromUrl(item.url);
           const url = new URL(item.url);
           let message = `The "file-url" type for tool result content is deprecated. Use the "file" type with mediaType and { type: 'url', url } instead.`;
           if (!item.mediaType) {
@@ -1065,14 +1064,13 @@ var URL_EXTENSION_TO_MEDIA_TYPE = {
   ogg: "audio/ogg"
 };
 function getMediaTypeFromUrl(url, fallbackMediaType = "application/octet-stream") {
-  var _a12;
   try {
     const pathname = new URL(url).pathname;
-    const fileExtension = (_a12 = pathname.split(".").pop()) == null ? void 0 : _a12.toLowerCase();
+    const fileExtension = pathname.split(".").pop()?.toLowerCase();
     if (fileExtension && Object.hasOwn(URL_EXTENSION_TO_MEDIA_TYPE, fileExtension)) {
       return URL_EXTENSION_TO_MEDIA_TYPE[fileExtension];
     }
-  } catch (e) {
+  } catch {
   }
   return fallbackMediaType;
 }
@@ -1091,7 +1089,7 @@ async function createToolModelOutput({
   } else if (errorMode === "json") {
     return { type: "error-json", value: toJSONValue(output) };
   }
-  if (tool2 == null ? void 0 : tool2.toModelOutput) {
+  if (tool2?.toModelOutput) {
     return await tool2.toModelOutput({ toolCallId, input, output });
   }
   return typeof output === "string" ? { type: "text", value: output } : { type: "json", value: toJSONValue(output) };
@@ -1804,7 +1802,7 @@ function prepareRetries({
       });
     }
   }
-  const maxRetriesResult = maxRetries != null ? maxRetries : defaultMaxRetries;
+  const maxRetriesResult = maxRetries ?? defaultMaxRetries;
   return {
     maxRetries: maxRetriesResult,
     retry: retryWithExponentialBackoffRespectingRetryHeaders({
@@ -1854,39 +1852,38 @@ function createNullLanguageModelUsage() {
   };
 }
 function addLanguageModelUsage(usage1, usage2) {
-  var _a12, _b12, _c, _d, _e, _f, _g, _h, _i, _j;
   return {
     inputTokens: addTokenCounts(usage1.inputTokens, usage2.inputTokens),
     inputTokenDetails: {
       noCacheTokens: addTokenCounts(
-        (_a12 = usage1.inputTokenDetails) == null ? void 0 : _a12.noCacheTokens,
-        (_b12 = usage2.inputTokenDetails) == null ? void 0 : _b12.noCacheTokens
+        usage1.inputTokenDetails?.noCacheTokens,
+        usage2.inputTokenDetails?.noCacheTokens
       ),
       cacheReadTokens: addTokenCounts(
-        (_c = usage1.inputTokenDetails) == null ? void 0 : _c.cacheReadTokens,
-        (_d = usage2.inputTokenDetails) == null ? void 0 : _d.cacheReadTokens
+        usage1.inputTokenDetails?.cacheReadTokens,
+        usage2.inputTokenDetails?.cacheReadTokens
       ),
       cacheWriteTokens: addTokenCounts(
-        (_e = usage1.inputTokenDetails) == null ? void 0 : _e.cacheWriteTokens,
-        (_f = usage2.inputTokenDetails) == null ? void 0 : _f.cacheWriteTokens
+        usage1.inputTokenDetails?.cacheWriteTokens,
+        usage2.inputTokenDetails?.cacheWriteTokens
       )
     },
     outputTokens: addTokenCounts(usage1.outputTokens, usage2.outputTokens),
     outputTokenDetails: {
       textTokens: addTokenCounts(
-        (_g = usage1.outputTokenDetails) == null ? void 0 : _g.textTokens,
-        (_h = usage2.outputTokenDetails) == null ? void 0 : _h.textTokens
+        usage1.outputTokenDetails?.textTokens,
+        usage2.outputTokenDetails?.textTokens
       ),
       reasoningTokens: addTokenCounts(
-        (_i = usage1.outputTokenDetails) == null ? void 0 : _i.reasoningTokens,
-        (_j = usage2.outputTokenDetails) == null ? void 0 : _j.reasoningTokens
+        usage1.outputTokenDetails?.reasoningTokens,
+        usage2.outputTokenDetails?.reasoningTokens
       )
     },
     totalTokens: addTokenCounts(usage1.totalTokens, usage2.totalTokens)
   };
 }
 function addTokenCounts(tokenCount1, tokenCount2) {
-  return tokenCount1 == null && tokenCount2 == null ? void 0 : (tokenCount1 != null ? tokenCount1 : 0) + (tokenCount2 != null ? tokenCount2 : 0);
+  return tokenCount1 == null && tokenCount2 == null ? void 0 : (tokenCount1 ?? 0) + (tokenCount2 ?? 0);
 }
 
 // src/model/resolve-model.ts
@@ -2488,8 +2485,7 @@ function resolveLanguageModel(model) {
   return asLanguageModelV4(model);
 }
 function getGlobalProvider() {
-  var _a12;
-  const provider = (_a12 = globalThis.AI_SDK_DEFAULT_PROVIDER) != null ? _a12 : gateway;
+  const provider = globalThis.AI_SDK_DEFAULT_PROVIDER ?? gateway;
   return asProviderV4(provider);
 }
 
@@ -2507,7 +2503,7 @@ function mergeCallbacks(...callbacks) {
   return async (event) => {
     await Promise.allSettled(
       callbacks.map(async (callback) => {
-        await (callback == null ? void 0 : callback(event));
+        await callback?.(event);
       })
     );
   };
@@ -2526,7 +2522,7 @@ function filterIncludedContext({
   }
   return Object.fromEntries(
     Object.entries(context).filter(
-      ([key]) => (includeContext == null ? void 0 : includeContext[key]) === true
+      ([key]) => includeContext?.[key] === true
     )
   );
 }
@@ -2553,7 +2549,7 @@ function filterToolContext({
   toolContext,
   includeToolsContext
 }) {
-  const includeToolContext = includeToolsContext == null ? void 0 : includeToolsContext[toolName];
+  const includeToolContext = includeToolsContext?.[toolName];
   return filterIncludedContext({
     context: toolContext,
     includeContext: includeToolContext
@@ -2565,8 +2561,7 @@ var AI_SDK_TELEMETRY_TRACING_CHANNEL = "ai:telemetry";
 
 // src/util/is-node-runtime.ts
 function isNodeRuntime() {
-  var _a12;
-  return typeof process !== "undefined" && ((_a12 = process.release) == null ? void 0 : _a12.name) === "node";
+  return typeof process !== "undefined" && process.release?.name === "node";
 }
 
 // src/telemetry/tracing-channel-publisher.ts
@@ -2583,19 +2578,16 @@ async function loadDiagnosticsChannel() {
   return diagnosticsChannelPromise;
 }
 function loadBuiltinModule(id) {
-  var _a12;
   const processWithBuiltins = globalThis.process;
   try {
-    return (_a12 = processWithBuiltins == null ? void 0 : processWithBuiltins.getBuiltinModule) == null ? void 0 : _a12.call(processWithBuiltins, id);
-  } catch (e) {
+    return processWithBuiltins?.getBuiltinModule?.(id);
+  } catch {
     return void 0;
   }
 }
 async function runWithTracingChannelSpan(message, execute) {
-  var _a12;
   const diagnosticsChannel = await loadDiagnosticsChannel();
-  const tracingChannel = (_a12 = diagnosticsChannel == null ? void 0 : diagnosticsChannel.tracingChannel) == null ? void 0 : _a12.call(
-    diagnosticsChannel,
+  const tracingChannel = diagnosticsChannel?.tracingChannel?.(
     AI_SDK_TELEMETRY_TRACING_CHANNEL
   );
   if (tracingChannel == null || tracingChannel.hasSubscribers === false) {
@@ -2628,7 +2620,7 @@ async function runWithTracingChannelSpan(message, execute) {
   };
   try {
     return await tracingChannel.tracePromise(tracedExecute, message);
-  } catch (e) {
+  } catch {
     if (hasExecutionError) {
       throw executionError;
     }
@@ -2645,7 +2637,6 @@ function openTelemetryChannelSpanContext({
   message,
   completion
 }) {
-  var _a12;
   if (!isNodeRuntime()) {
     return void 0;
   }
@@ -2653,8 +2644,7 @@ function openTelemetryChannelSpanContext({
     "node:diagnostics_channel"
   );
   const asyncHooks = loadBuiltinModule("node:async_hooks");
-  const tracingChannel = (_a12 = diagnosticsChannel == null ? void 0 : diagnosticsChannel.tracingChannel) == null ? void 0 : _a12.call(
-    diagnosticsChannel,
+  const tracingChannel = diagnosticsChannel?.tracingChannel?.(
     AI_SDK_TELEMETRY_TRACING_CHANNEL
   );
   if (tracingChannel == null || tracingChannel.hasSubscribers === false || asyncHooks == null) {
@@ -2668,7 +2658,7 @@ function openTelemetryChannelSpanContext({
   const safePublish = (publish) => {
     try {
       publish();
-    } catch (e) {
+    } catch {
     }
   };
   const publishAsyncEnd = ({
@@ -2705,8 +2695,7 @@ function openTelemetryChannelSpanContext({
 
 // src/telemetry/telemetry-registry.ts
 function getGlobalTelemetryIntegrations() {
-  var _a12;
-  return (_a12 = globalThis.AI_SDK_TELEMETRY_INTEGRATIONS) != null ? _a12 : [];
+  return globalThis.AI_SDK_TELEMETRY_INTEGRATIONS ?? [];
 }
 
 // src/telemetry/create-telemetry-dispatcher.ts
@@ -2745,23 +2734,20 @@ function augmentEvent(event, telemetry, filterContext = false) {
 function createTelemetryDispatcher({
   telemetry
 }) {
-  if ((telemetry == null ? void 0 : telemetry.isEnabled) === false) {
+  if (telemetry?.isEnabled === false) {
     return {};
   }
-  const localIntegrations = telemetry == null ? void 0 : telemetry.integrations;
+  const localIntegrations = telemetry?.integrations;
   const integrations = localIntegrations != null ? asArray3(localIntegrations) : getGlobalTelemetryIntegrations();
   const telemetryMetadata = {
-    recordInputs: telemetry == null ? void 0 : telemetry.recordInputs,
-    recordOutputs: telemetry == null ? void 0 : telemetry.recordOutputs,
-    functionId: telemetry == null ? void 0 : telemetry.functionId,
-    includeRuntimeContext: telemetry == null ? void 0 : telemetry.includeRuntimeContext,
-    includeToolsContext: telemetry == null ? void 0 : telemetry.includeToolsContext
+    recordInputs: telemetry?.recordInputs,
+    recordOutputs: telemetry?.recordOutputs,
+    functionId: telemetry?.functionId,
+    includeRuntimeContext: telemetry?.includeRuntimeContext,
+    includeToolsContext: telemetry?.includeToolsContext
   };
   const mergeTelemetryCallback = (key) => {
-    const integrationCallbacks = integrations.map((integration) => {
-      var _a12;
-      return (_a12 = integration[key]) == null ? void 0 : _a12.bind(integration);
-    }).filter(Boolean).map(
+    const integrationCallbacks = integrations.map((integration) => integration[key]?.bind(integration)).filter(Boolean).map(
       (callback) => ((event) => callback(augmentEvent(event, telemetryMetadata)))
     );
     const mergedIntegrationCallback = mergeCallbacks(...integrationCallbacks);
@@ -2769,14 +2755,8 @@ function createTelemetryDispatcher({
       await mergedIntegrationCallback(event);
     };
   };
-  const executeLanguageModelCallWrappers = integrations.map((integration) => {
-    var _a12;
-    return (_a12 = integration.executeLanguageModelCall) == null ? void 0 : _a12.bind(integration);
-  }).filter(Boolean);
-  const executeToolWrappers = integrations.map((integration) => {
-    var _a12;
-    return (_a12 = integration.executeTool) == null ? void 0 : _a12.bind(integration);
-  }).filter(Boolean);
+  const executeLanguageModelCallWrappers = integrations.map((integration) => integration.executeLanguageModelCall?.bind(integration)).filter(Boolean);
+  const executeToolWrappers = integrations.map((integration) => integration.executeTool?.bind(integration)).filter(Boolean);
   return {
     runInTracingChannelSpan: async ({ type, event, execute }) => await runWithTracingChannelSpan(
       {
@@ -3007,127 +2987,100 @@ function createRestrictedTelemetryDispatcher({
   const telemetryDispatcher = createTelemetryDispatcher({ telemetry });
   return {
     ...telemetryDispatcher,
-    onStart: (event) => {
-      var _a12;
-      return (_a12 = telemetryDispatcher.onStart) == null ? void 0 : _a12.call(telemetryDispatcher, {
-        ...event,
-        runtimeContext: filterIncludedContext({
-          context: event.runtimeContext,
-          includeContext: includeRuntimeContext
-        }),
-        toolsContext: filterToolsContext({
-          toolsContext: event.toolsContext,
+    onStart: (event) => telemetryDispatcher.onStart?.({
+      ...event,
+      runtimeContext: filterIncludedContext({
+        context: event.runtimeContext,
+        includeContext: includeRuntimeContext
+      }),
+      toolsContext: filterToolsContext({
+        toolsContext: event.toolsContext,
+        includeToolsContext
+      })
+    }),
+    onStepStart: (event) => telemetryDispatcher.onStepStart?.({
+      ...event,
+      runtimeContext: filterIncludedContext({
+        context: event.runtimeContext,
+        includeContext: includeRuntimeContext
+      }),
+      steps: event.steps.map(
+        (step) => restrictStepResult({
+          step,
+          includeRuntimeContext,
           includeToolsContext
         })
-      });
-    },
-    onStepStart: (event) => {
-      var _a12;
-      return (_a12 = telemetryDispatcher.onStepStart) == null ? void 0 : _a12.call(telemetryDispatcher, {
-        ...event,
-        runtimeContext: filterIncludedContext({
-          context: event.runtimeContext,
-          includeContext: includeRuntimeContext
-        }),
-        steps: event.steps.map(
-          (step) => restrictStepResult({
-            step,
-            includeRuntimeContext,
+      ),
+      toolsContext: filterToolsContext({
+        toolsContext: event.toolsContext,
+        includeToolsContext
+      })
+    }),
+    onStepEnd: (event) => telemetryDispatcher.onStepEnd?.(
+      restrictStepResult({
+        step: event,
+        includeRuntimeContext,
+        includeToolsContext
+      })
+    ),
+    onStepFinish: (event) => telemetryDispatcher.onStepEnd?.(
+      restrictStepResult({
+        step: event,
+        includeRuntimeContext,
+        includeToolsContext
+      })
+    ),
+    onEnd: (event) => telemetryDispatcher.onEnd?.(
+      ((restrictedSteps) => {
+        return {
+          ...event,
+          runtimeContext: filterIncludedContext({
+            context: event.runtimeContext,
+            includeContext: includeRuntimeContext
+          }),
+          steps: restrictedSteps,
+          finalStep: restrictedSteps.at(-1),
+          toolsContext: filterToolsContext({
+            toolsContext: event.toolsContext,
             includeToolsContext
           })
-        ),
-        toolsContext: filterToolsContext({
-          toolsContext: event.toolsContext,
-          includeToolsContext
-        })
-      });
-    },
-    onStepEnd: (event) => {
-      var _a12;
-      return (_a12 = telemetryDispatcher.onStepEnd) == null ? void 0 : _a12.call(
-        telemetryDispatcher,
-        restrictStepResult({
-          step: event,
-          includeRuntimeContext,
-          includeToolsContext
-        })
-      );
-    },
-    onStepFinish: (event) => {
-      var _a12;
-      return (_a12 = telemetryDispatcher.onStepEnd) == null ? void 0 : _a12.call(
-        telemetryDispatcher,
-        restrictStepResult({
-          step: event,
-          includeRuntimeContext,
-          includeToolsContext
-        })
-      );
-    },
-    onEnd: (event) => {
-      var _a12;
-      return (_a12 = telemetryDispatcher.onEnd) == null ? void 0 : _a12.call(
-        telemetryDispatcher,
-        ((restrictedSteps) => {
-          return {
-            ...event,
-            runtimeContext: filterIncludedContext({
-              context: event.runtimeContext,
-              includeContext: includeRuntimeContext
-            }),
-            steps: restrictedSteps,
-            finalStep: restrictedSteps.at(-1),
-            toolsContext: filterToolsContext({
-              toolsContext: event.toolsContext,
-              includeToolsContext
-            })
-          };
-        })(
-          event.steps.map(
-            (step) => restrictStepResult({
-              step,
-              includeRuntimeContext,
-              includeToolsContext
-            })
-          )
-        )
-      );
-    },
-    onAbort: (event) => {
-      var _a12;
-      return (_a12 = telemetryDispatcher.onAbort) == null ? void 0 : _a12.call(telemetryDispatcher, {
-        ...event,
-        steps: event.steps.map(
+        };
+      })(
+        event.steps.map(
           (step) => restrictStepResult({
             step,
             includeRuntimeContext,
             includeToolsContext
           })
         )
-      });
-    },
-    onToolExecutionStart: (event) => {
-      var _a12;
-      return (_a12 = telemetryDispatcher.onToolExecutionStart) == null ? void 0 : _a12.call(telemetryDispatcher, {
-        ...event,
-        toolContext: filterToolContext({
-          toolName: event.toolCall.toolName,
-          toolContext: event.toolContext,
-          includeToolsContext
-        })
-      });
-    },
-    onToolExecutionEnd: (event) => {
-      var _a12;
-      return (_a12 = telemetryDispatcher.onToolExecutionEnd) == null ? void 0 : _a12.call(telemetryDispatcher, {
-        ...event,
-        toolContext: filterToolContext({
-          toolName: event.toolCall.toolName,
-          toolContext: event.toolContext,
+      )
+    ),
+    onAbort: (event) => telemetryDispatcher.onAbort?.({
+      ...event,
+      steps: event.steps.map(
+        (step) => restrictStepResult({
+          step,
+          includeRuntimeContext,
           includeToolsContext
         })
-      });
-    }
+      )
+    }),
+    onToolExecutionStart: (event) => telemetryDispatcher.onToolExecutionStart?.({
+      ...event,
+      toolContext: filterToolContext({
+        toolName: event.toolCall.toolName,
+        toolContext: event.toolContext,
+        includeToolsContext
+      })
+    }),
+    onToolExecutionEnd: (event) => telemetryDispatcher.onToolExecutionEnd?.({
+      ...event,
+      toolContext: filterToolContext({
+        toolName: event.toolCall.toolName,
+        toolContext: event.toolContext,
+        includeToolsContext
+      })
+    })
   };
 }
 
@@ -3188,14 +3141,13 @@ async function parseToolCall({
       }
       let repairedToolCall = null;
       try {
-        abortSignal == null ? void 0 : abortSignal.throwIfAborted();
+        abortSignal?.throwIfAborted();
         repairedToolCall = await waitForPromiseWithAbortSignal({
           promise: repairToolCall({
             toolCall,
             tools,
             inputSchema: async ({ toolName }) => {
-              var _a12;
-              const inputSchema = (_a12 = getOwn(tools, toolName)) == null ? void 0 : _a12.inputSchema;
+              const inputSchema = getOwn(tools, toolName)?.inputSchema;
               return await asSchema2(inputSchema).jsonSchema;
             },
             instructions,
@@ -3207,7 +3159,7 @@ async function parseToolCall({
           abortSignal
         });
       } catch (repairError) {
-        abortSignal == null ? void 0 : abortSignal.throwIfAborted();
+        abortSignal?.throwIfAborted();
         throw new ToolCallRepairError({
           cause: repairError,
           originalError: error
@@ -3220,11 +3172,11 @@ async function parseToolCall({
         toolCall: await doParseToolCall({ toolCall: repairedToolCall, tools }),
         refineToolInput
       });
-      abortSignal == null ? void 0 : abortSignal.throwIfAborted();
+      abortSignal?.throwIfAborted();
       return parsedRepairedToolCall;
     }
   } catch (error) {
-    abortSignal == null ? void 0 : abortSignal.throwIfAborted();
+    abortSignal?.throwIfAborted();
     const parsedInput = await safeParseJSON({ text: toolCall.input });
     const input = parsedInput.success ? parsedInput.value : toolCall.input;
     const tool2 = getOwn(tools, toolCall.toolName);
@@ -3236,10 +3188,10 @@ async function parseToolCall({
       dynamic: true,
       invalid: true,
       error,
-      title: tool2 == null ? void 0 : tool2.title,
+      title: tool2?.title,
       providerExecuted: toolCall.providerExecuted,
       providerMetadata: toolCall.providerMetadata,
-      ...(tool2 == null ? void 0 : tool2.metadata) != null ? { toolMetadata: tool2.metadata } : {}
+      ...tool2?.metadata != null ? { toolMetadata: tool2.metadata } : {}
     };
   }
 }
@@ -3397,25 +3349,22 @@ function createToolSearchState({
   tools,
   toolCallers
 }) {
-  const searchTools = Object.entries(tools != null ? tools : {}).filter(
+  const searchTools = Object.entries(tools ?? {}).filter(
     ([, tool2]) => tool2.deferLoading || isToolSearch(tool2)
   );
   if (searchTools.length === 0) {
     return (activeTools) => activeTools;
   }
   const discovered = /* @__PURE__ */ new Set();
-  const getCallers = (name12) => {
-    var _a12;
-    return (_a12 = getOwn(toolCallers, name12)) != null ? _a12 : [DIRECT_TOOL_CALL];
-  };
+  const getCallers = (name12) => getOwn(toolCallers, name12) ?? [DIRECT_TOOL_CALL];
   for (const [name12, tool2] of searchTools) {
     const callers = getCallers(name12);
     if (callers.some((name13) => {
       if (name13 === DIRECT_TOOL_CALL) {
         return false;
       }
-      const caller = experimental_getToolCaller2(tools == null ? void 0 : tools[name13]);
-      return (caller == null ? void 0 : caller.type) !== "local" || caller.prepareModelMessage == null;
+      const caller = experimental_getToolCaller2(tools?.[name13]);
+      return caller?.type !== "local" || caller.prepareModelMessage == null;
     }) || isToolSearch(tool2) && tool2.deferLoading) {
       throw new InvalidArgumentError({
         parameter: "tools",
@@ -3454,7 +3403,7 @@ function createToolSearchState({
                   experimental_sandbox
                 });
                 const nameTerms = tokenize(name12);
-                const descriptionTerms = tokenize(description != null ? description : "");
+                const descriptionTerms = tokenize(description ?? "");
                 const score = terms.reduce(
                   (score2, term) => score2 + (nameTerms.includes(term) ? 2 : 0) + (descriptionTerms.includes(term) ? 1 : 0),
                   0
@@ -3478,8 +3427,7 @@ function createToolSearchState({
   };
 }
 function tokenize(text) {
-  var _a12;
-  return (_a12 = text.replace(/([a-z\d])([A-Z])/g, "$1 $2").toLowerCase().match(/[\p{L}\p{N}]+/gu)) != null ? _a12 : [];
+  return text.replace(/([a-z\d])([A-Z])/g, "$1 $2").toLowerCase().match(/[\p{L}\p{N}]+/gu) ?? [];
 }
 
 // src/generate-text/collect-tool-approvals.ts
@@ -3487,7 +3435,7 @@ function collectToolApprovals({
   messages
 }) {
   const lastMessage = messages.at(-1);
-  if ((lastMessage == null ? void 0 : lastMessage.role) != "tool") {
+  if (lastMessage?.role != "tool") {
     return {
       approvedToolApprovals: [],
       deniedToolApprovals: []
@@ -3731,13 +3679,13 @@ async function resolveToolApproval({
       toolContext: await validateToolContext({
         toolName,
         context: getOwn(toolsContext, toolName),
-        contextSchema: tool2 == null ? void 0 : tool2.contextSchema
+        contextSchema: tool2?.contextSchema
       }),
       runtimeContext
     }) : userDefinedToolApprovalStatus;
     return normalizeToolApprovalStatus(approvalStatus);
   }
-  if ((tool2 == null ? void 0 : tool2.needsApproval) == null) {
+  if (tool2?.needsApproval == null) {
     return { type: "not-applicable" };
   }
   const needsApproval = typeof tool2.needsApproval === "function" ? await tool2.needsApproval(input, {
@@ -3746,7 +3694,7 @@ async function resolveToolApproval({
     context: await validateToolContext({
       toolName,
       context: getOwn(toolsContext, toolName),
-      contextSchema: tool2 == null ? void 0 : tool2.contextSchema
+      contextSchema: tool2?.contextSchema
     })
   }) : tool2.needsApproval;
   return needsApproval ? { type: "user-approval" } : { type: "not-applicable" };
@@ -3766,7 +3714,6 @@ async function validateApprovedToolApprovals({
   toolApprovalSecret,
   refineToolInput
 }) {
-  var _a12;
   const approved = [];
   const denied = [];
   const invalid = [];
@@ -3853,7 +3800,7 @@ async function validateApprovedToolApprovals({
         approvalResponse: {
           ...approval.approvalResponse,
           approved: false,
-          reason: (_a12 = approvalStatus.reason) != null ? _a12 : approval.approvalResponse.reason
+          reason: approvalStatus.reason ?? approval.approvalResponse.reason
         }
       });
     } else {