ai 5.0.0-canary.15 → 5.0.0-canary.16

package/dist/index.mjs

@@ -29,6 +29,21 @@ function calculateLanguageModelUsage({
   };
 }
 
+// core/ui/get-tool-invocations.ts
+function getToolInvocations(message) {
+  return message.parts.filter(
+    (part) => part.type === "tool-invocation"
+  ).map((part) => part.toolInvocation);
+}
+
+// core/util/extract-max-tool-invocation-step.ts
+function extractMaxToolInvocationStep(toolInvocations) {
+  return toolInvocations == null ? void 0 : toolInvocations.reduce((max, toolInvocation) => {
+    var _a17;
+    return Math.max(max, (_a17 = toolInvocation.step) != null ? _a17 : 0);
+  }, 0);
+}
+
 // core/util/parse-partial-json.ts
 import { safeParseJSON } from "@ai-sdk/provider-utils";
 
@@ -751,13 +766,9 @@ async function processChatResponse({
   getCurrentDate = () => /* @__PURE__ */ new Date(),
   lastMessage
 }) {
-  var _a17, _b;
+  var _a17;
   const replaceLastMessage = (lastMessage == null ? void 0 : lastMessage.role) === "assistant";
-  let step = replaceLastMessage ? 1 + // find max step in existing tool invocations:
-  ((_b = (_a17 = lastMessage.toolInvocations) == null ? void 0 : _a17.reduce((max, toolInvocation) => {
-    var _a18;
-    return Math.max(max, (_a18 = toolInvocation.step) != null ? _a18 : 0);
-  }, 0)) != null ? _b : 0) : 0;
+  let step = replaceLastMessage ? 1 + ((_a17 = extractMaxToolInvocationStep(getToolInvocations(lastMessage))) != null ? _a17 : 0) : 0;
   const message = replaceLastMessage ? structuredClone(lastMessage) : {
     id: generateId3(),
     createdAt: getCurrentDate(),
@@ -830,12 +841,12 @@ async function processChatResponse({
       if (currentReasoningPart == null) {
         currentReasoningPart = {
           type: "reasoning",
-          reasoning: value.text,
+          text: value.text,
           providerMetadata: value.providerMetadata
         };
         message.parts.push(currentReasoningPart);
       } else {
-        currentReasoningPart.reasoning += value.text;
+        currentReasoningPart.text += value.text;
         currentReasoningPart.providerMetadata = value.providerMetadata;
       }
       execUpdate();
@@ -861,24 +872,20 @@ async function processChatResponse({
       execUpdate();
     },
     onToolCallStreamingStartPart(value) {
-      if (message.toolInvocations == null) {
-        message.toolInvocations = [];
-      }
+      const toolInvocations = getToolInvocations(message);
       partialToolCalls[value.toolCallId] = {
         text: "",
         step,
         toolName: value.toolName,
-        index: message.toolInvocations.length
+        index: toolInvocations.length
       };
-      const invocation = {
+      updateToolInvocationPart(value.toolCallId, {
         state: "partial-call",
         step,
         toolCallId: value.toolCallId,
         toolName: value.toolName,
         args: void 0
-      };
-      message.toolInvocations.push(invocation);
-      updateToolInvocationPart(value.toolCallId, invocation);
+      });
       execUpdate();
     },
     async onToolCallDeltaPart(value) {
@@ -887,68 +894,53 @@ async function processChatResponse({
       const { value: partialArgs } = await parsePartialJson(
         partialToolCall.text
       );
-      const invocation = {
+      updateToolInvocationPart(value.toolCallId, {
         state: "partial-call",
         step: partialToolCall.step,
         toolCallId: value.toolCallId,
         toolName: partialToolCall.toolName,
         args: partialArgs
-      };
-      message.toolInvocations[partialToolCall.index] = invocation;
-      updateToolInvocationPart(value.toolCallId, invocation);
+      });
       execUpdate();
     },
     async onToolCallPart(value) {
-      const invocation = {
+      updateToolInvocationPart(value.toolCallId, {
         state: "call",
         step,
         ...value
-      };
-      if (partialToolCalls[value.toolCallId] != null) {
-        message.toolInvocations[partialToolCalls[value.toolCallId].index] = invocation;
-      } else {
-        if (message.toolInvocations == null) {
-          message.toolInvocations = [];
-        }
-        message.toolInvocations.push(invocation);
-      }
-      updateToolInvocationPart(value.toolCallId, invocation);
+      });
       execUpdate();
       if (onToolCall) {
         const result = await onToolCall({ toolCall: value });
         if (result != null) {
-          const invocation2 = {
+          updateToolInvocationPart(value.toolCallId, {
             state: "result",
             step,
             ...value,
             result
-          };
-          message.toolInvocations[message.toolInvocations.length - 1] = invocation2;
-          updateToolInvocationPart(value.toolCallId, invocation2);
+          });
           execUpdate();
         }
       }
     },
     onToolResultPart(value) {
-      const toolInvocations = message.toolInvocations;
+      const toolInvocations = getToolInvocations(message);
       if (toolInvocations == null) {
         throw new Error("tool_result must be preceded by a tool_call");
       }
       const toolInvocationIndex = toolInvocations.findIndex(
-        (invocation2) => invocation2.toolCallId === value.toolCallId
+        (invocation) => invocation.toolCallId === value.toolCallId
       );
       if (toolInvocationIndex === -1) {
         throw new Error(
           "tool_result must be preceded by a tool_call with the same toolCallId"
         );
       }
-      const invocation = {
+      updateToolInvocationPart(value.toolCallId, {
         ...toolInvocations[toolInvocationIndex],
         state: "result",
         ...value
-      };
-      toolInvocations[toolInvocationIndex] = invocation;
-      updateToolInvocationPart(value.toolCallId, invocation);
+      });
       execUpdate();
     },
     onDataPart(value) {
@@ -1244,34 +1236,6 @@ function getTextFromDataUrl(dataUrl) {
   }
 }
 
-// core/util/extract-max-tool-invocation-step.ts
-function extractMaxToolInvocationStep(toolInvocations) {
-  return toolInvocations == null ? void 0 : toolInvocations.reduce((max, toolInvocation) => {
-    var _a17;
-    return Math.max(max, (_a17 = toolInvocation.step) != null ? _a17 : 0);
-  }, 0);
-}
-
-// core/util/get-message-parts.ts
-function getMessageParts(message) {
-  var _a17;
-  return (_a17 = message.parts) != null ? _a17 : [
-    ...message.toolInvocations ? message.toolInvocations.map((toolInvocation) => ({
-      type: "tool-invocation",
-      toolInvocation
-    })) : [],
-    ...message.content ? [{ type: "text", text: message.content }] : []
-  ];
-}
-
-// core/util/fill-message-parts.ts
-function fillMessageParts(messages) {
-  return messages.map((message) => ({
-    ...message,
-    parts: getMessageParts(message)
-  }));
-}
-
 // core/util/is-deep-equal-data.ts
 function isDeepEqualData(obj1, obj2) {
   if (obj1 === obj2)
@@ -1312,7 +1276,7 @@ async function prepareAttachmentsForRequest(attachmentsFromOptions) {
   if (!attachmentsFromOptions) {
     return [];
   }
-  if (attachmentsFromOptions instanceof FileList) {
+  if (globalThis.FileList && attachmentsFromOptions instanceof globalThis.FileList) {
     return Promise.all(
       Array.from(attachmentsFromOptions).map(async (attachment) => {
         const { name: name17, type } = attachment;
@@ -1345,7 +1309,6 @@ function updateToolCallResult({
   toolCallId,
   toolResult: result
 }) {
-  var _a17;
   const lastMessage = messages[messages.length - 1];
   const invocationPart = lastMessage.parts.find(
     (part) => part.type === "tool-invocation" && part.toolInvocation.toolCallId === toolCallId
@@ -1353,15 +1316,11 @@ function updateToolCallResult({
   if (invocationPart == null) {
     return;
   }
-  const toolResult = {
+  invocationPart.toolInvocation = {
     ...invocationPart.toolInvocation,
     state: "result",
     result
   };
-  invocationPart.toolInvocation = toolResult;
-  lastMessage.toolInvocations = (_a17 = lastMessage.toolInvocations) == null ? void 0 : _a17.map(
-    (toolInvocation) => toolInvocation.toolCallId === toolCallId ? toolResult : toolInvocation
-  );
 }
 
 // core/util/should-resubmit-messages.ts
@@ -1377,9 +1336,9 @@ function shouldResubmitMessages({
     // check if the feature is enabled:
     maxSteps > 1 && // ensure there is a last message:
     lastMessage != null && // ensure we actually have new steps (to prevent infinite loops in case of errors):
-    (messages.length > originalMessageCount || extractMaxToolInvocationStep(lastMessage.toolInvocations) !== originalMaxToolInvocationStep) && // check that next step is possible:
+    (messages.length > originalMessageCount || extractMaxToolInvocationStep(getToolInvocations(lastMessage)) !== originalMaxToolInvocationStep) && // check that next step is possible:
     isAssistantMessageWithCompletedToolCalls(lastMessage) && // limit the number of automatic steps:
-    ((_a17 = extractMaxToolInvocationStep(lastMessage.toolInvocations)) != null ? _a17 : 0) < maxSteps
+    ((_a17 = extractMaxToolInvocationStep(getToolInvocations(lastMessage))) != null ? _a17 : 0) < maxSteps
   );
 }
 function isAssistantMessageWithCompletedToolCalls(message) {
@@ -3190,7 +3149,7 @@ function convertToCoreMessages(messages, options) {
                 case "reasoning": {
                   content2.push({
                     type: "reasoning",
-                    text: part.reasoning,
+                    text: part.text,
                     providerOptions: part.providerMetadata
                   });
                   break;
@@ -3280,73 +3239,11 @@ function convertToCoreMessages(messages, options) {
           processBlock2();
           break;
         }
-        const toolInvocations = message.toolInvocations;
-        if (toolInvocations == null || toolInvocations.length === 0) {
-          coreMessages.push({ role: "assistant", content });
-          break;
-        }
-        const maxStep = toolInvocations.reduce((max, toolInvocation) => {
-          var _a18;
-          return Math.max(max, (_a18 = toolInvocation.step) != null ? _a18 : 0);
-        }, 0);
-        for (let i2 = 0; i2 <= maxStep; i2++) {
-          const stepInvocations = toolInvocations.filter(
-            (toolInvocation) => {
-              var _a18;
-              return ((_a18 = toolInvocation.step) != null ? _a18 : 0) === i2;
-            }
-          );
-          if (stepInvocations.length === 0) {
-            continue;
-          }
-          coreMessages.push({
-            role: "assistant",
-            content: [
-              ...isLastMessage && content && i2 === 0 ? [{ type: "text", text: content }] : [],
-              ...stepInvocations.map(
-                ({ toolCallId, toolName, args }) => ({
-                  type: "tool-call",
-                  toolCallId,
-                  toolName,
-                  args
-                })
-              )
-            ]
-          });
-          coreMessages.push({
-            role: "tool",
-            content: stepInvocations.map((toolInvocation) => {
-              if (!("result" in toolInvocation)) {
-                throw new MessageConversionError({
-                  originalMessage: message,
-                  message: "ToolInvocation must have a result: " + JSON.stringify(toolInvocation)
-                });
-              }
-              const { toolCallId, toolName, result } = toolInvocation;
-              const tool2 = tools[toolName];
-              return (tool2 == null ? void 0 : tool2.experimental_toToolResultContent) != null ? {
-                type: "tool-result",
-                toolCallId,
-                toolName,
-                result: tool2.experimental_toToolResultContent(result),
-                experimental_content: tool2.experimental_toToolResultContent(result)
-              } : {
-                type: "tool-result",
-                toolCallId,
-                toolName,
-                result
-              };
-            })
-          });
-        }
         if (content && !isLastMessage) {
           coreMessages.push({ role: "assistant", content });
         }
         break;
       }
-      case "data": {
-        break;
-      }
       default: {
         const _exhaustiveCheck = role;
         throw new MessageConversionError({
@@ -3836,10 +3733,36 @@ var enumOutputStrategy = (enumValues) => {
         })
       };
     },
-    validatePartialResult() {
-      throw new UnsupportedFunctionalityError({
-        functionality: "partial results in enum mode"
-      });
+    async validatePartialResult({ value, textDelta }) {
+      if (!isJSONObject(value) || typeof value.result !== "string") {
+        return {
+          success: false,
+          error: new TypeValidationError({
+            value,
+            cause: 'value must be an object that contains a string in the "result" property.'
+          })
+        };
+      }
+      const result = value.result;
+      const possibleEnumValues = enumValues.filter(
+        (enumValue) => enumValue.startsWith(result)
+      );
+      if (value.result.length === 0 || possibleEnumValues.length === 0) {
+        return {
+          success: false,
+          error: new TypeValidationError({
+            value,
+            cause: "value must be a string in the enum"
+          })
+        };
+      }
+      return {
+        success: true,
+        value: {
+          partial: possibleEnumValues.length > 1 ? result : possibleEnumValues[0],
+          textDelta
+        }
+      };
     },
     createElementStream() {
       throw new UnsupportedFunctionalityError({
@@ -4425,6 +4348,7 @@ function streamObject(options) {
     } = {},
     ...settings
   } = options;
+  const enumValues = "enum" in options && options.enum ? options.enum : void 0;
   const {
     schema: inputSchema,
     schemaDescription,
@@ -4434,9 +4358,14 @@ function streamObject(options) {
     output,
     schema: inputSchema,
     schemaName,
-    schemaDescription
+    schemaDescription,
+    enumValues
+  });
+  const outputStrategy = getOutputStrategy({
+    output,
+    schema: inputSchema,
+    enumValues
   });
-  const outputStrategy = getOutputStrategy({ output, schema: inputSchema });
   return new DefaultStreamObjectResult({
     model,
     telemetry,
@@ -7864,7 +7793,7 @@ function appendResponseMessages({
   responseMessages,
   _internal: { currentDate = () => /* @__PURE__ */ new Date() } = {}
 }) {
-  var _a17, _b, _c, _d, _e;
+  var _a17, _b, _c;
   const clonedMessages = structuredClone(messages);
   for (const message of responseMessages) {
     const role = message.role;
@@ -7872,7 +7801,7 @@ function appendResponseMessages({
     const isLastMessageAssistant = lastMessage.role === "assistant";
     switch (role) {
       case "assistant": {
-        let getToolInvocations2 = function(step) {
+        let getToolInvocationsForStep2 = function(step) {
           return (typeof message.content === "string" ? [] : message.content.filter((part) => part.type === "tool-call")).map((call) => ({
             state: "call",
             step,
@@ -7881,7 +7810,7 @@ function appendResponseMessages({
             toolName: call.toolName
           }));
         };
-        var getToolInvocations = getToolInvocations2;
+        var getToolInvocationsForStep = getToolInvocationsForStep2;
         const parts = [{ type: "step-start" }];
         let textContent = "";
         let reasoningTextContent = void 0;
@@ -7908,12 +7837,12 @@ function appendResponseMessages({
                 if (reasoningPart == null) {
                   reasoningPart = {
                     type: "reasoning",
-                    reasoning: ""
+                    text: ""
                   };
                   parts.push(reasoningPart);
                 }
                 reasoningTextContent = (reasoningTextContent != null ? reasoningTextContent : "") + part.text;
-                reasoningPart.reasoning += part.text;
+                reasoningPart.text += part.text;
                 reasoningPart.providerMetadata = part.providerOptions;
                 break;
               }
@@ -7937,16 +7866,13 @@ function appendResponseMessages({
         }
         if (isLastMessageAssistant) {
           const maxStep = extractMaxToolInvocationStep(
-            lastMessage.toolInvocations
+            getToolInvocations(lastMessage)
+            // TODO remove once Message is removed
           );
           (_b = lastMessage.parts) != null ? _b : lastMessage.parts = [];
           lastMessage.content = textContent;
           lastMessage.parts.push(...parts);
-          lastMessage.toolInvocations = [
-            ...(_c = lastMessage.toolInvocations) != null ? _c : [],
-            ...getToolInvocations2(maxStep === void 0 ? 0 : maxStep + 1)
-          ];
-          getToolInvocations2(maxStep === void 0 ? 0 : maxStep + 1).map((call) => ({
+          getToolInvocationsForStep2(maxStep === void 0 ? 0 : maxStep + 1).map((call) => ({
             type: "tool-invocation",
             toolInvocation: call
           })).forEach((part) => {
@@ -7959,10 +7885,9 @@ function appendResponseMessages({
             createdAt: currentDate(),
             // generate a createdAt date for the message, will be overridden by the client
             content: textContent,
-            toolInvocations: getToolInvocations2(0),
             parts: [
               ...parts,
-              ...getToolInvocations2(0).map((call) => ({
+              ...getToolInvocationsForStep2(0).map((call) => ({
                 type: "tool-invocation",
                 toolInvocation: call
               }))
@@ -7972,17 +7897,17 @@ function appendResponseMessages({
         break;
       }
       case "tool": {
-        (_d = lastMessage.toolInvocations) != null ? _d : lastMessage.toolInvocations = [];
         if (lastMessage.role !== "assistant") {
           throw new Error(
             `Tool result must follow an assistant message: ${lastMessage.role}`
           );
         }
-        (_e = lastMessage.parts) != null ? _e : lastMessage.parts = [];
+        (_c = lastMessage.parts) != null ? _c : lastMessage.parts = [];
         for (const contentPart of message.content) {
-          const toolCall = lastMessage.toolInvocations.find(
-            (call) => call.toolCallId === contentPart.toolCallId
-          );
+          const toolCall = getToolInvocations(
+            lastMessage
+            // TODO remove once Message is removed
+          ).find((call) => call.toolCallId === contentPart.toolCallId);
           const toolCallPart = lastMessage.parts.find(
             (part) => part.type === "tool-invocation" && part.toolInvocation.toolCallId === contentPart.toolCallId
           );
@@ -8535,6 +8460,24 @@ var MCPClient = class {
     await ((_a17 = this.transport) == null ? void 0 : _a17.close());
     this.onClose();
   }
+  assertCapability(method) {
+    switch (method) {
+      case "initialize":
+        break;
+      case "tools/list":
+      case "tools/call":
+        if (!this.serverCapabilities.tools) {
+          throw new MCPClientError({
+            message: `Server does not support tools`
+          });
+        }
+        break;
+      default:
+        throw new MCPClientError({
+          message: `Unsupported method: ${method}`
+        });
+    }
+  }
   async request({
     request,
     resultSchema,
@@ -8548,6 +8491,7 @@ var MCPClient = class {
           })
         );
       }
+      this.assertCapability(request.method);
       const signal = options == null ? void 0 : options.signal;
       signal == null ? void 0 : signal.throwIfAborted();
       const messageId = this.requestMessageId++;
@@ -8576,7 +8520,7 @@ var MCPClient = class {
           resolve(result);
         } catch (error) {
           const parseError = new MCPClientError({
-            message: "Failed to parse server initialization result",
+            message: "Failed to parse server response",
             cause: error
           });
           reject(parseError);
@@ -8592,11 +8536,6 @@ var MCPClient = class {
     params,
     options
   } = {}) {
-    if (!this.serverCapabilities.tools) {
-      throw new MCPClientError({
-        message: `Server does not support tools`
-      });
-    }
     try {
       return this.request({
         request: { method: "tools/list", params },
@@ -8612,11 +8551,6 @@ var MCPClient = class {
     args,
     options
   }) {
-    if (!this.serverCapabilities.tools) {
-      throw new MCPClientError({
-        message: `Server does not support tools`
-      });
-    }
     try {
       return this.request({
         request: { method: "tools/call", params: { name: name17, arguments: args } },
@@ -8886,13 +8820,12 @@ export {
   transcribe as experimental_transcribe,
   extractMaxToolInvocationStep,
   extractReasoningMiddleware,
-  fillMessageParts,
   formatDataStreamPart,
   generateId2 as generateId,
   generateObject,
   generateText,
-  getMessageParts,
   getTextFromDataUrl,
+  getToolInvocations,
   isAssistantMessageWithCompletedToolCalls,
   isDeepEqualData,
   jsonSchema,