ai 6.0.301 → 6.0.302

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # ai
 
+## 6.0.302
+
+### Patch Changes
+
+- 5430af1: fix(ai): preserve V2 provider-reported total tokens in raw usage
+- f8d8324: fix(ai): publish the latest error after repeated failed stream resume attempts
+- 5df41a7: fix(ai): prevent unavailable tools, including tools named after Object.prototype properties, from exposing persisted output to models
+- 6a12ead: fix(ai): avoid duplicate slashes in chat reconnect URLs
+- Updated dependencies [bedd5bb]
+- Updated dependencies [6dd6693]
+- Updated dependencies [5607cb2]
+- Updated dependencies [fca8a28]
+  - @ai-sdk/gateway@3.0.211
+
 ## 6.0.301
 
 ### Patch Changes

package/dist/index.d.mts

@@ -1836,6 +1836,13 @@ type ToolUIPart<TOOLS extends UITools = UITools> = ValueOf<{
 }>;
 type DynamicToolUIPart = {
     type: 'dynamic-tool';
+    /**
+     * `false` when a static tool part was normalized to a dynamic tool part
+     * because its current tool schema was unavailable or incompatible.
+     *
+     * This preserves its static origin across persistence boundaries.
+     */
+    dynamic?: false;
     /**
      * Name of the tool that is being called.
      */

package/dist/index.d.ts

@@ -1836,6 +1836,13 @@ type ToolUIPart<TOOLS extends UITools = UITools> = ValueOf<{
 }>;
 type DynamicToolUIPart = {
     type: 'dynamic-tool';
+    /**
+     * `false` when a static tool part was normalized to a dynamic tool part
+     * because its current tool schema was unavailable or incompatible.
+     *
+     * This preserves its static origin across persistence boundaries.
+     */
+    dynamic?: false;
     /**
      * Name of the tool that is being called.
      */

package/dist/index.js

@@ -895,7 +895,8 @@ function convertV2UsageToV3(usage) {
       total: usage.outputTokens,
       text: void 0,
       reasoning: usage.reasoningTokens
-    }
+    },
+    raw: usage.totalTokens == null ? void 0 : { totalTokens: usage.totalTokens }
   };
 }
 
@@ -1334,7 +1335,7 @@ function detectMediaType({
 var import_provider_utils3 = require("@ai-sdk/provider-utils");
 
 // src/version.ts
-var VERSION = true ? "6.0.301" : "0.0.0-test";
+var VERSION = true ? "6.0.302" : "0.0.0-test";
 
 // src/util/download/download.ts
 var download = async ({
@@ -2806,6 +2807,7 @@ function createNullLanguageModelUsage() {
 }
 function addLanguageModelUsage(usage1, usage2) {
   var _a23, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+  const raw = isNullLanguageModelUsage(usage1) ? usage2.raw : isNullLanguageModelUsage(usage2) ? usage1.raw : void 0;
   return {
     inputTokens: addTokenCounts(usage1.inputTokens, usage2.inputTokens),
     inputTokenDetails: {
@@ -2841,9 +2843,14 @@ function addLanguageModelUsage(usage1, usage2) {
     cachedInputTokens: addTokenCounts(
       usage1.cachedInputTokens,
       usage2.cachedInputTokens
-    )
+    ),
+    ...raw == null ? {} : { raw }
   };
 }
+function isNullLanguageModelUsage(usage) {
+  var _a23, _b, _c, _d, _e;
+  return usage.inputTokens == null && ((_a23 = usage.inputTokenDetails) == null ? void 0 : _a23.noCacheTokens) == null && ((_b = usage.inputTokenDetails) == null ? void 0 : _b.cacheReadTokens) == null && ((_c = usage.inputTokenDetails) == null ? void 0 : _c.cacheWriteTokens) == null && usage.outputTokens == null && ((_d = usage.outputTokenDetails) == null ? void 0 : _d.textTokens) == null && ((_e = usage.outputTokenDetails) == null ? void 0 : _e.reasoningTokens) == null && usage.totalTokens == null && usage.raw == null;
+}
 function addTokenCounts(tokenCount1, tokenCount2) {
   return tokenCount1 == null && tokenCount2 == null ? void 0 : (tokenCount1 != null ? tokenCount1 : 0) + (tokenCount2 != null ? tokenCount2 : 0);
 }
@@ -9708,6 +9715,22 @@ function readUIMessageStream({
 
 // src/ui/convert-to-model-messages.ts
 var import_provider_utils23 = require("@ai-sdk/provider-utils");
+
+// src/util/get-own.ts
+function getOwn(obj, key) {
+  return obj != null && Object.hasOwn(obj, key) ? obj[key] : void 0;
+}
+
+// src/ui/unavailable-tool.ts
+function markToolPartAsUnavailable(part) {
+  part.dynamic = false;
+  return part;
+}
+function isToolPartFromUnavailableTool(part) {
+  return part.type === "dynamic-tool" && part.dynamic === false;
+}
+
+// src/ui/convert-to-model-messages.ts
 async function convertToModelMessages(messages, options) {
   const modelMessages = [];
   if (options == null ? void 0 : options.ignoreIncompleteToolCalls) {
@@ -9718,6 +9741,27 @@ async function convertToModelMessages(messages, options) {
       )
     }));
   }
+  async function createModelOutput({
+    toolPart,
+    toolName,
+    output,
+    errorMode
+  }) {
+    const tool2 = getOwn(options == null ? void 0 : options.tools, toolName);
+    if (errorMode === "none" && tool2 == null && isToolPartFromUnavailableTool(toolPart)) {
+      return {
+        type: "text",
+        value: "Tool output omitted because the tool is no longer available."
+      };
+    }
+    return createToolModelOutput({
+      toolCallId: toolPart.toolCallId,
+      input: toolPart.input,
+      output,
+      tool: tool2,
+      errorMode
+    });
+  }
   for (const message of messages) {
     switch (message.role) {
       case "system": {
@@ -9772,7 +9816,7 @@ async function convertToModelMessages(messages, options) {
         if (message.parts != null) {
           let block = [];
           async function processBlock() {
-            var _a23, _b, _c, _d, _e, _f, _g, _h, _i;
+            var _a23, _b, _c, _d, _e, _f, _g;
             if (block.length === 0) {
               return;
             }
@@ -9830,11 +9874,10 @@ async function convertToModelMessages(messages, options) {
                       type: "tool-result",
                       toolCallId: part.toolCallId,
                       toolName,
-                      output: await createToolModelOutput({
-                        toolCallId: part.toolCallId,
-                        input: part.input,
+                      output: await createModelOutput({
+                        toolPart: part,
+                        toolName,
                         output: part.state === "output-error" ? part.errorText : part.output,
-                        tool: (_d = options == null ? void 0 : options.tools) == null ? void 0 : _d[toolName],
                         errorMode: part.state === "output-error" ? "json" : "none"
                       }),
                       ...resultProviderMetadata != null ? { providerOptions: resultProviderMetadata } : {}
@@ -9842,7 +9885,7 @@ async function convertToModelMessages(messages, options) {
                   }
                 }
               } else if (isDataUIPart(part)) {
-                const dataPart = (_e = options == null ? void 0 : options.convertDataPart) == null ? void 0 : _e.call(
+                const dataPart = (_d = options == null ? void 0 : options.convertDataPart) == null ? void 0 : _d.call(
                   options,
                   part
                 );
@@ -9870,7 +9913,7 @@ async function convertToModelMessages(messages, options) {
               {
                 const content2 = [];
                 for (const toolPart of toolParts) {
-                  if (((_f = toolPart.approval) == null ? void 0 : _f.approved) != null) {
+                  if (((_e = toolPart.approval) == null ? void 0 : _e.approved) != null) {
                     content2.push({
                       type: "tool-approval-response",
                       approvalId: toolPart.approval.id,
@@ -9890,7 +9933,7 @@ async function convertToModelMessages(messages, options) {
                         toolName: getToolName(toolPart),
                         output: {
                           type: "error-text",
-                          value: (_h = (_g = toolPart.approval) == null ? void 0 : _g.reason) != null ? _h : "Tool call execution denied."
+                          value: (_g = (_f = toolPart.approval) == null ? void 0 : _f.reason) != null ? _g : "Tool call execution denied."
                         },
                         ...toolPart.callProviderMetadata != null ? { providerOptions: toolPart.callProviderMetadata } : {}
                       });
@@ -9903,11 +9946,10 @@ async function convertToModelMessages(messages, options) {
                         type: "tool-result",
                         toolCallId: toolPart.toolCallId,
                         toolName,
-                        output: await createToolModelOutput({
-                          toolCallId: toolPart.toolCallId,
-                          input: toolPart.input,
+                        output: await createModelOutput({
+                          toolPart,
+                          toolName,
                           output: toolPart.state === "output-error" ? toolPart.errorText : toolPart.output,
-                          tool: (_i = options == null ? void 0 : options.tools) == null ? void 0 : _i[toolName],
                           errorMode: toolPart.state === "output-error" ? "text" : "none"
                         }),
                         ...toolPart.callProviderMetadata != null ? { providerOptions: toolPart.callProviderMetadata } : {}
@@ -9963,11 +10005,11 @@ function isEmptyObject(value) {
 }
 function asDynamicToolPart(toolPart) {
   const { type, ...part } = toolPart;
-  return {
+  return markToolPartAsUnavailable({
     ...part,
     type: "dynamic-tool",
     toolName: type.slice(5)
-  };
+  });
 }
 function getToolPartInputSchemaInput(toolPart) {
   return toolPart.approval != null && Object.prototype.hasOwnProperty.call(toolPart.approval, "inputSchemaInput") ? { value: toolPart.approval.inputSchemaInput } : void 0;
@@ -10044,6 +10086,7 @@ var uiMessagesSchema = (0, import_provider_utils24.lazySchema)(() => {
             }),
             import_v48.z.object({
               type: import_v48.z.literal("dynamic-tool"),
+              dynamic: import_v48.z.literal(false).optional(),
               toolName: import_v48.z.string(),
               toolCallId: import_v48.z.string(),
               toolMetadata: toolMetadataSchema2.optional(),
@@ -10058,6 +10101,7 @@ var uiMessagesSchema = (0, import_provider_utils24.lazySchema)(() => {
             }),
             import_v48.z.object({
               type: import_v48.z.literal("dynamic-tool"),
+              dynamic: import_v48.z.literal(false).optional(),
               toolName: import_v48.z.string(),
               toolCallId: import_v48.z.string(),
               toolMetadata: toolMetadataSchema2.optional(),
@@ -10071,6 +10115,7 @@ var uiMessagesSchema = (0, import_provider_utils24.lazySchema)(() => {
             }),
             import_v48.z.object({
               type: import_v48.z.literal("dynamic-tool"),
+              dynamic: import_v48.z.literal(false).optional(),
               toolName: import_v48.z.string(),
               toolCallId: import_v48.z.string(),
               toolMetadata: toolMetadataSchema2.optional(),
@@ -10084,6 +10129,7 @@ var uiMessagesSchema = (0, import_provider_utils24.lazySchema)(() => {
             }),
             import_v48.z.object({
               type: import_v48.z.literal("dynamic-tool"),
+              dynamic: import_v48.z.literal(false).optional(),
               toolName: import_v48.z.string(),
               toolCallId: import_v48.z.string(),
               toolMetadata: toolMetadataSchema2.optional(),
@@ -10097,6 +10143,7 @@ var uiMessagesSchema = (0, import_provider_utils24.lazySchema)(() => {
             }),
             import_v48.z.object({
               type: import_v48.z.literal("dynamic-tool"),
+              dynamic: import_v48.z.literal(false).optional(),
               toolName: import_v48.z.string(),
               toolCallId: import_v48.z.string(),
               toolMetadata: toolMetadataSchema2.optional(),
@@ -10112,6 +10159,7 @@ var uiMessagesSchema = (0, import_provider_utils24.lazySchema)(() => {
             }),
             import_v48.z.object({
               type: import_v48.z.literal("dynamic-tool"),
+              dynamic: import_v48.z.literal(false).optional(),
               toolName: import_v48.z.string(),
               toolCallId: import_v48.z.string(),
               toolMetadata: toolMetadataSchema2.optional(),
@@ -10127,6 +10175,7 @@ var uiMessagesSchema = (0, import_provider_utils24.lazySchema)(() => {
             }),
             import_v48.z.object({
               type: import_v48.z.literal("dynamic-tool"),
+              dynamic: import_v48.z.literal(false).optional(),
               toolName: import_v48.z.string(),
               toolCallId: import_v48.z.string(),
               toolMetadata: toolMetadataSchema2.optional(),
@@ -10315,7 +10364,7 @@ async function safeValidateUIMessagesInternal({
           if (shouldValidateToolParts && part.type.startsWith("tool-")) {
             const toolPart = part;
             const toolName = toolPart.type.slice(5);
-            const tool2 = tools == null ? void 0 : tools[toolName];
+            const tool2 = getOwn(tools, toolName);
             const isTerminal = toolPart.state === "output-available" || toolPart.state === "output-error" || toolPart.state === "output-denied";
             if (!tool2 && isTerminal) {
               if (tools != null || convertMissingTerminalToolsToDynamic) {
@@ -10632,11 +10681,6 @@ var DefaultEmbedResult = class {
   }
 };
 
-// src/util/get-own.ts
-function getOwn(obj, key) {
-  return obj != null && Object.hasOwn(obj, key) ? obj[key] : void 0;
-}
-
 // src/util/set-own.ts
 function setOwn(object2, key, value) {
   Object.defineProperty(object2, key, {
@@ -14440,7 +14484,9 @@ var import_provider_utils42 = require("@ai-sdk/provider-utils");
 var import_provider_utils41 = require("@ai-sdk/provider-utils");
 function appendPathToUrl(url, path) {
   const queryOrFragmentStart = url.search(/[?#]/);
-  return queryOrFragmentStart === -1 ? `${url}${path}` : `${url.slice(0, queryOrFragmentStart)}${path}${url.slice(queryOrFragmentStart)}`;
+  const urlPath = queryOrFragmentStart === -1 ? url : url.slice(0, queryOrFragmentStart);
+  const suffix = queryOrFragmentStart === -1 ? "" : url.slice(queryOrFragmentStart);
+  return `${urlPath.endsWith("/") && path.startsWith("/") ? urlPath.slice(0, -1) : urlPath}${path}${suffix}`;
 }
 var HttpChatTransport = class {
   constructor({
@@ -14834,8 +14880,12 @@ var AbstractChat = class {
     status,
     error
   }) {
-    if (this.status === status)
+    if (this.status === status) {
+      if (this.error !== error) {
+        this.state.error = error;
+      }
       return;
+    }
     this.state.status = status;
     this.state.error = error;
   }