ai 3.4.17 → 3.4.18

package/dist/index.mjs

@@ -846,33 +846,16 @@ async function convertToLanguageModelPrompt({
   modelSupportsImageUrls = true,
   downloadImplementation = download
 }) {
+  const downloadedAssets = modelSupportsImageUrls || prompt.messages == null ? null : await downloadAssets(prompt.messages, downloadImplementation);
   const languageModelMessages = [];
   if (prompt.system != null) {
     languageModelMessages.push({ role: "system", content: prompt.system });
   }
-  const downloadedAssets = modelSupportsImageUrls || prompt.messages == null ? null : await downloadAssets(prompt.messages, downloadImplementation);
-  const promptType = prompt.type;
-  switch (promptType) {
-    case "prompt": {
-      languageModelMessages.push({
-        role: "user",
-        content: [{ type: "text", text: prompt.prompt }]
-      });
-      break;
-    }
-    case "messages": {
-      languageModelMessages.push(
-        ...prompt.messages.map(
-          (message) => convertToLanguageModelMessage(message, downloadedAssets)
-        )
-      );
-      break;
-    }
-    default: {
-      const _exhaustiveCheck = promptType;
-      throw new Error(`Unsupported prompt type: ${_exhaustiveCheck}`);
-    }
-  }
+  languageModelMessages.push(
+    ...prompt.messages.map(
+      (message) => convertToLanguageModelMessage(message, downloadedAssets)
+    )
+  );
   return languageModelMessages;
 }
 function convertToLanguageModelMessage(message, downloadedAssets) {
@@ -1286,7 +1269,7 @@ function prepareCallSettings({
   };
 }
 
-// core/prompt/validate-prompt.ts
+// core/prompt/standardize-prompt.ts
 import { InvalidPromptError } from "@ai-sdk/provider";
 import { safeValidateTypes } from "@ai-sdk/provider-utils";
 import { z as z6 } from "zod";
@@ -1384,8 +1367,8 @@ var coreMessageSchema = z5.union([
   coreToolMessageSchema
 ]);
 
-// core/prompt/validate-prompt.ts
-function validatePrompt(prompt) {
+// core/prompt/standardize-prompt.ts
+function standardizePrompt(prompt) {
   if (prompt.prompt == null && prompt.messages == null) {
     throw new InvalidPromptError({
       prompt,
@@ -1413,9 +1396,13 @@ function validatePrompt(prompt) {
     }
     return {
       type: "prompt",
-      prompt: prompt.prompt,
-      messages: void 0,
-      system: prompt.system
+      system: prompt.system,
+      messages: [
+        {
+          role: "user",
+          content: prompt.prompt
+        }
+      ]
     };
   }
   if (prompt.messages != null) {
@@ -1432,7 +1419,6 @@ function validatePrompt(prompt) {
     }
     return {
       type: "messages",
-      prompt: void 0,
       messages: prompt.messages,
       // only possible case bc of checks above
       system: prompt.system
@@ -1971,7 +1957,7 @@ async function generateObject({
       let resultProviderMetadata;
       switch (mode) {
         case "json": {
-          const validatedPrompt = validatePrompt({
+          const standardPrompt = standardizePrompt({
             system: outputStrategy.jsonSchema == null ? injectJsonInstruction({ prompt: system }) : model.supportsStructuredOutputs ? system : injectJsonInstruction({
               prompt: system,
               schema: outputStrategy.jsonSchema
@@ -1980,10 +1966,9 @@ async function generateObject({
             messages
           });
           const promptMessages = await convertToLanguageModelPrompt({
-            prompt: validatedPrompt,
+            prompt: standardPrompt,
             modelSupportsImageUrls: model.supportsImageUrls
           });
-          const inputFormat = validatedPrompt.type;
           const generateResult = await retry(
             () => recordSpan({
               name: "ai.generateObject.doGenerate",
@@ -1996,7 +1981,7 @@ async function generateObject({
                   }),
                   ...baseTelemetryAttributes,
                   "ai.prompt.format": {
-                    input: () => inputFormat
+                    input: () => standardPrompt.type
                   },
                   "ai.prompt.messages": {
                     input: () => JSON.stringify(promptMessages)
@@ -2024,7 +2009,7 @@ async function generateObject({
                     description: schemaDescription
                   },
                   ...prepareCallSettings(settings),
-                  inputFormat,
+                  inputFormat: standardPrompt.type,
                   prompt: promptMessages,
                   providerMetadata,
                   abortSignal,
@@ -2076,7 +2061,7 @@ async function generateObject({
           break;
         }
         case "tool": {
-          const validatedPrompt = validatePrompt({
+          const validatedPrompt = standardizePrompt({
             system,
             prompt,
             messages
@@ -2447,7 +2432,7 @@ async function streamObject({
       let transformer;
       switch (mode) {
         case "json": {
-          const validatedPrompt = validatePrompt({
+          const standardPrompt = standardizePrompt({
             system: outputStrategy.jsonSchema == null ? injectJsonInstruction({ prompt: system }) : model.supportsStructuredOutputs ? system : injectJsonInstruction({
               prompt: system,
               schema: outputStrategy.jsonSchema
@@ -2463,9 +2448,9 @@ async function streamObject({
               description: schemaDescription
             },
             ...prepareCallSettings(settings),
-            inputFormat: validatedPrompt.type,
+            inputFormat: standardPrompt.type,
             prompt: await convertToLanguageModelPrompt({
-              prompt: validatedPrompt,
+              prompt: standardPrompt,
               modelSupportsImageUrls: model.supportsImageUrls
             }),
             providerMetadata,
@@ -2489,7 +2474,7 @@ async function streamObject({
           break;
         }
         case "tool": {
-          const validatedPrompt = validatePrompt({
+          const validatedPrompt = standardizePrompt({
             system,
             prompt,
             messages
@@ -3169,20 +3154,12 @@ async function generateText({
     fn: async (span) => {
       var _a11, _b, _c, _d, _e;
       const retry = retryWithExponentialBackoff({ maxRetries });
-      const validatedPrompt = validatePrompt({
-        system,
-        prompt,
-        messages
-      });
+      const currentPrompt = standardizePrompt({ system, prompt, messages });
       const mode = {
         type: "regular",
         ...prepareToolsAndToolChoice({ tools, toolChoice, activeTools })
       };
       const callSettings = prepareCallSettings(settings);
-      const promptMessages = await convertToLanguageModelPrompt({
-        prompt: validatedPrompt,
-        modelSupportsImageUrls: model.supportsImageUrls
-      });
       let currentModelResponse;
       let currentToolCalls = [];
       let currentToolResults = [];
@@ -3197,7 +3174,13 @@ async function generateText({
       };
       let stepType = "initial";
       do {
-        const currentInputFormat = stepCount === 0 ? validatedPrompt.type : "messages";
+        if (stepCount === 1) {
+          currentPrompt.type = "messages";
+        }
+        const promptMessages = await convertToLanguageModelPrompt({
+          prompt: currentPrompt,
+          modelSupportsImageUrls: model.supportsImageUrls
+        });
         currentModelResponse = await retry(
           () => recordSpan({
             name: "ai.generateText.doGenerate",
@@ -3209,7 +3192,7 @@ async function generateText({
                   telemetry
                 }),
                 ...baseTelemetryAttributes,
-                "ai.prompt.format": { input: () => currentInputFormat },
+                "ai.prompt.format": { input: () => currentPrompt.type },
                 "ai.prompt.messages": {
                   input: () => JSON.stringify(promptMessages)
                 },
@@ -3231,7 +3214,7 @@ async function generateText({
               const result = await model.doGenerate({
                 mode,
                 ...callSettings,
-                inputFormat: currentInputFormat,
+                inputFormat: currentPrompt.type,
                 prompt: promptMessages,
                 providerMetadata,
                 abortSignal,
@@ -3329,44 +3312,25 @@ async function generateText({
         steps.push(currentStep);
         await (onStepFinish == null ? void 0 : onStepFinish(currentStep));
         if (stepType === "continue") {
-          const lastResponseMessage = responseMessages.pop();
-          promptMessages.pop();
-          if (typeof lastResponseMessage.content === "string") {
-            lastResponseMessage.content = text;
+          const lastMessage = currentPrompt.messages[currentPrompt.messages.length - 1];
+          if (typeof lastMessage.content === "string") {
+            lastMessage.content = text;
           } else {
-            lastResponseMessage.content.push({
+            lastMessage.content.push({
               text: stepText,
               type: "text"
             });
           }
-          responseMessages.push(lastResponseMessage);
-          promptMessages.push(
-            convertToLanguageModelMessage(lastResponseMessage, null)
-          );
-        } else if (nextStepType === "continue") {
-          const newResponseMessages = toResponseMessages({
-            text,
-            toolCalls: currentToolCalls,
-            toolResults: currentToolResults
-          });
-          responseMessages.push(...newResponseMessages);
-          promptMessages.push(
-            ...newResponseMessages.map(
-              (message) => convertToLanguageModelMessage(message, null)
-            )
-          );
+          responseMessages[responseMessages.length - 1] = lastMessage;
+          currentPrompt.messages[currentPrompt.messages.length - 1] = lastMessage;
         } else {
           const newResponseMessages = toResponseMessages({
-            text: currentModelResponse.text,
+            text,
             toolCalls: currentToolCalls,
             toolResults: currentToolResults
           });
           responseMessages.push(...newResponseMessages);
-          promptMessages.push(
-            ...newResponseMessages.map(
-              (message) => convertToLanguageModelMessage(message, null)
-            )
-          );
+          currentPrompt.messages.push(...newResponseMessages);
         }
         stepType = nextStepType;
       } while (stepType !== "done");
@@ -3899,9 +3863,12 @@ async function streamText({
     fn: async (rootSpan) => {
       const retry = retryWithExponentialBackoff({ maxRetries });
       const startStep = async ({
-        promptMessages: promptMessages2,
-        promptType
+        currentPrompt: currentPrompt2
       }) => {
+        const promptMessages = await convertToLanguageModelPrompt({
+          prompt: currentPrompt2,
+          modelSupportsImageUrls: model.supportsImageUrls
+        });
         const {
           result: { stream: stream2, warnings: warnings2, rawResponse: rawResponse2 },
           doStreamSpan: doStreamSpan2,
@@ -3918,10 +3885,10 @@ async function streamText({
                 }),
                 ...baseTelemetryAttributes,
                 "ai.prompt.format": {
-                  input: () => promptType
+                  input: () => currentPrompt2.type
                 },
                 "ai.prompt.messages": {
-                  input: () => JSON.stringify(promptMessages2)
+                  input: () => JSON.stringify(promptMessages)
                 },
                 // standardized gen-ai llm span attributes:
                 "gen_ai.system": model.provider,
@@ -3951,8 +3918,8 @@ async function streamText({
                   })
                 },
                 ...prepareCallSettings(settings),
-                inputFormat: promptType,
-                prompt: promptMessages2,
+                inputFormat: currentPrompt2.type,
+                prompt: promptMessages,
                 providerMetadata,
                 abortSignal,
                 headers
@@ -3977,18 +3944,12 @@ async function streamText({
           startTimestampMs: startTimestampMs2
         };
       };
-      const promptMessages = await convertToLanguageModelPrompt({
-        prompt: validatePrompt({ system, prompt, messages }),
-        modelSupportsImageUrls: model.supportsImageUrls
-      });
+      const currentPrompt = standardizePrompt({ system, prompt, messages });
       const {
         result: { stream, warnings, rawResponse },
         doStreamSpan,
         startTimestampMs
-      } = await startStep({
-        promptType: validatePrompt({ system, prompt, messages }).type,
-        promptMessages
-      });
+      } = await startStep({ currentPrompt });
       return new DefaultStreamTextResult({
         stream,
         warnings,
@@ -4003,7 +3964,7 @@ async function streamText({
         maxSteps,
         continueSteps,
         startStep,
-        promptMessages,
+        currentPrompt,
         modelId: model.modelId,
         now: now2,
         currentDate,
@@ -4027,7 +3988,7 @@ var DefaultStreamTextResult = class {
     maxSteps,
     continueSteps,
     startStep,
-    promptMessages,
+    currentPrompt,
     modelId,
     now: now2,
     currentDate,
@@ -4072,7 +4033,7 @@ var DefaultStreamTextResult = class {
       startTimestamp,
       doStreamSpan: doStreamSpan2,
       currentStep,
-      promptMessages: promptMessages2,
+      currentPrompt: currentPrompt2,
       usage = {
         promptTokens: 0,
         completionTokens: 0,
@@ -4297,29 +4258,34 @@ var DefaultStreamTextResult = class {
               };
               if (nextStepType !== "done") {
                 if (stepType === "continue") {
-                  const lastPromptMessage = promptMessages2[promptMessages2.length - 1];
-                  lastPromptMessage.content.push({
+                  const lastMessage = currentPrompt2.messages[currentPrompt2.messages.length - 1];
+                  if (typeof lastMessage.content === "string") {
+                    lastMessage.content = stepText;
+                  } else {
+                    lastMessage.content.push({
+                      text: stepText,
+                      type: "text"
+                    });
+                  }
+                  currentPrompt2.messages[currentPrompt2.messages.length - 1] = lastMessage;
+                } else {
+                  const newResponseMessages = toResponseMessages({
                     text: stepText,
-                    type: "text"
+                    toolCalls: stepToolCalls,
+                    toolResults: stepToolResults
                   });
-                } else {
-                  promptMessages2.push(
-                    ...toResponseMessages({
-                      text: stepText,
-                      toolCalls: stepToolCalls,
-                      toolResults: stepToolResults
-                    }).map(
-                      (message) => convertToLanguageModelMessage(message, null)
-                    )
-                  );
+                  currentPrompt2.messages.push(...newResponseMessages);
                 }
                 const {
                   result,
                   doStreamSpan: doStreamSpan3,
                   startTimestampMs: startTimestamp2
                 } = await startStep({
-                  promptType: "messages",
-                  promptMessages: promptMessages2
+                  currentPrompt: {
+                    type: "messages",
+                    system: currentPrompt2.system,
+                    messages: currentPrompt2.messages
+                  }
                 });
                 self.warnings = result.warnings;
                 self.rawResponse = result.rawResponse;
@@ -4328,7 +4294,7 @@ var DefaultStreamTextResult = class {
                   startTimestamp: startTimestamp2,
                   doStreamSpan: doStreamSpan3,
                   currentStep: currentStep + 1,
-                  promptMessages: promptMessages2,
+                  currentPrompt: currentPrompt2,
                   usage: combinedUsage,
                   stepType: nextStepType,
                   previousStepText: fullStepText
@@ -4435,7 +4401,7 @@ var DefaultStreamTextResult = class {
       startTimestamp: startTimestampMs,
       doStreamSpan,
       currentStep: 0,
-      promptMessages,
+      currentPrompt,
       usage: void 0,
       stepType: "initial"
     });
@@ -4809,7 +4775,7 @@ function convertToCoreMessages(messages) {
           role: "assistant",
           content: [
             { type: "text", text: content },
-            ...toolInvocations.map(({ toolCallId, toolName, args }) => ({
+            ...toolInvocations.filter((invocation) => invocation.state !== "partial-call").map(({ toolCallId, toolName, args }) => ({
               type: "tool-call",
               toolCallId,
               toolName,
@@ -4817,25 +4783,19 @@ function convertToCoreMessages(messages) {
             }))
           ]
         });
-        coreMessages.push({
-          role: "tool",
-          content: toolInvocations.map((ToolInvocation) => {
-            if (!("result" in ToolInvocation)) {
-              throw new MessageConversionError({
-                originalMessage: message,
-                message: "ToolInvocation must have a result: " + JSON.stringify(ToolInvocation)
-              });
-            }
-            const { toolCallId, toolName, args, result } = ToolInvocation;
-            return {
-              type: "tool-result",
-              toolCallId,
-              toolName,
-              args,
-              result
-            };
-          })
-        });
+        const toolResults = toolInvocations.filter((invocation) => invocation.state === "result").map(({ toolCallId, toolName, args, result }) => ({
+          type: "tool-result",
+          toolCallId,
+          toolName,
+          args,
+          result
+        }));
+        if (toolResults.length > 0) {
+          coreMessages.push({
+            role: "tool",
+            content: toolResults
+          });
+        }
         break;
       }
       case "function":