@mastra/ai-sdk 1.6.2 → 1.6.3-alpha.1

package/dist/index.js

@@ -10,7 +10,7 @@ import { TripWire, MessageList, aiV5ModelMessageToV2PromptMessage } from '@mastr
 import { RequestContext } from '@mastra/core/di';
 import { WorkingMemory, MessageHistory, SemanticRecall } from '@mastra/core/processors';
 
-// ../../packages/_vendored/ai_v5/dist/chunk-ZMFCHGXT.js
+// ../../packages/_vendored/ai_v5/dist/chunk-NFYQIWQU.js
 var marker = "vercel.ai.error";
 var symbol = Symbol.for(marker);
 var _a;
@@ -565,7 +565,7 @@ function withUserAgentSuffix(headers, ...userAgentSuffixParts) {
   );
   return Object.fromEntries(normalizedHeaders.entries());
 }
-var VERSION = "3.0.28";
+var VERSION = "3.0.29";
 var getOriginalFetch = () => globalThis.fetch;
 var getFromApi = async ({
   url,
@@ -714,7 +714,7 @@ function lazyValidator(createValidator) {
   };
 }
 function asValidator(value) {
-  return isValidator(value) ? value : typeof value === "function" ? value() : standardSchemaValidator(value);
+  return isValidator(value) ? value : "~standard" in value ? standardSchemaValidator(value) : value();
 }
 function standardSchemaValidator(standardSchema2) {
   return validator(async (value) => {
@@ -2339,18 +2339,27 @@ Run 'npx vercel link' to link your project, then 'vc env pull' to fetch the toke
 var name22 = "GatewayForbiddenError";
 var marker32 = `vercel.ai.gateway.error.${name22}`;
 var symbol32 = Symbol.for(marker32);
+var forbiddenParamSchema = lazyValidator(
+  () => zodSchema(
+    z.object({
+      ruleId: z.string()
+    })
+  )
+);
 var _a32;
 var _b32;
 var GatewayForbiddenError = class extends (_b32 = GatewayError, _a32 = symbol32, _b32) {
   constructor({
     message = "Forbidden",
     statusCode = 403,
-    cause
+    cause,
+    ruleId
   } = {}) {
     super({ message, statusCode, cause });
     this[_a32] = true;
     this.name = name22;
     this.type = "forbidden";
+    this.ruleId = ruleId;
   }
   static isInstance(error) {
     return GatewayError.hasMarker(error) && symbol32 in error;
@@ -2518,8 +2527,18 @@ async function createGatewayErrorFromResponse({
     }
     case "internal_server_error":
       return new GatewayInternalServerError({ message, statusCode, cause });
-    case "forbidden":
-      return new GatewayForbiddenError({ message, statusCode, cause });
+    case "forbidden": {
+      const ruleResult = await safeValidateTypes({
+        value: validatedResponse.error.param,
+        schema: forbiddenParamSchema
+      });
+      return new GatewayForbiddenError({
+        message,
+        statusCode,
+        cause,
+        ruleId: ruleResult.success ? ruleResult.value.ruleId : void 0
+      });
+    }
     default:
       return new GatewayInternalServerError({ message, statusCode, cause });
   }
@@ -3421,7 +3440,7 @@ async function getVercelRequestId() {
   var _a1032;
   return (_a1032 = getContext().headers) == null ? void 0 : _a1032["x-vercel-id"];
 }
-var VERSION2 = "2.0.109";
+var VERSION2 = "2.0.113";
 var AI_GATEWAY_PROTOCOL_VERSION = "0.0.1";
 function createGatewayProvider(options = {}) {
   var _a1032, _b103;
@@ -7028,11 +7047,18 @@ function asSchema2(schema) {
 }
 function standardSchema(standardSchema2) {
   return jsonSchema2(
-    () => addAdditionalPropertiesToJsonSchema2(
-      standardSchema2["~standard"].jsonSchema.input({
-        target: "draft-07"
-      })
-    ),
+    () => {
+      if (!hasStandardJsonSchema(standardSchema2)) {
+        throw new Error(
+          `Standard schema vendor '${standardSchema2["~standard"].vendor}' does not support JSON Schema conversion.`
+        );
+      }
+      return addAdditionalPropertiesToJsonSchema2(
+        standardSchema2["~standard"].jsonSchema.input({
+          target: "draft-07"
+        })
+      );
+    },
     {
       validate: async (value) => {
         const result = await standardSchema2["~standard"].validate(value);
@@ -7047,6 +7073,9 @@ function standardSchema(standardSchema2) {
     }
   );
 }
+function hasStandardJsonSchema(schema) {
+  return schema["~standard"].jsonSchema != null;
+}
 function zod3Schema2(zodSchema22, options) {
   var _a223;
   const useReferences = (_a223 = void 0 ) != null ? _a223 : false;
@@ -9810,13 +9839,14 @@ function convertMastraChunkToAISDKBase({
         // Preserve messageId from the payload so it can be sent to useChat
         ...chunk.payload?.messageId ? { messageId: chunk.payload.messageId } : {}
       };
-    case "step-start":
-      const { messageId: _messageId, ...rest } = chunk.payload;
+    case "step-start": {
+      const { messageId: _messageId, ...rest } = chunk.payload ?? {};
       return {
         type: "start-step",
         request: rest.request,
         warnings: normalizeWarnings(rest.warnings)
       };
+    }
     case "raw":
       return {
         type: "raw",
@@ -9964,14 +9994,14 @@ function convertMastraChunkToAISDKBase({
         providerMetadata: chunk.payload.providerMetadata
       };
     case "step-finish": {
-      const { request: _request, providerMetadata, ...rest2 } = chunk.payload.metadata;
+      const { request: _request, providerMetadata, ...rest } = chunk.payload.metadata;
       return {
         type: "finish-step",
         response: {
           id: chunk.payload.id || "",
           timestamp: /* @__PURE__ */ new Date(),
-          modelId: rest2.modelId || "",
-          ...rest2
+          modelId: rest.modelId || "",
+          ...rest
         },
         usage: normalizeUsage(chunk.payload.output.usage),
         finishReason: normalizeFinishReason(chunk.payload.stepResult.reason),
@@ -11589,28 +11619,95 @@ function toAISdkStream(stream, options = {
 }
 
 // src/chat-route.ts
-function extractV6NativeApproval(messages) {
-  const lastAssistantMsg = messages.at(-1);
-  if (!lastAssistantMsg || lastAssistantMsg.role !== "assistant") return null;
-  const parts = lastAssistantMsg.parts ?? [];
-  for (let i = parts.length - 1; i >= 0; i--) {
-    const part = parts[i];
-    if (!isToolUIPart2(part) || part.state !== "approval-responded") continue;
-    const lastSep = part.approval.id.lastIndexOf(APPROVAL_ID_SEPARATOR);
-    if (lastSep === -1) continue;
-    const runId = part.approval.id.slice(0, lastSep);
-    const toolCallId = part.approval.id.slice(lastSep + APPROVAL_ID_SEPARATOR.length);
-    if (!runId || !toolCallId) continue;
-    return {
-      resumeData: {
-        approved: part.approval.approved,
-        ...part.approval.reason != null ? { reason: part.approval.reason } : {}
-      },
-      runId,
-      toolCallId
-    };
+function extractV6NativeApprovals(messages) {
+  const byTarget = /* @__PURE__ */ new Map();
+  const separator = APPROVAL_ID_SEPARATOR;
+  for (const message of messages) {
+    if (message.role !== "assistant") continue;
+    for (const part of message.parts ?? []) {
+      if (!isToolUIPart2(part) || part.state !== "approval-responded") continue;
+      const lastSep = part.approval.id.lastIndexOf(separator);
+      if (lastSep === -1) continue;
+      const runId = part.approval.id.slice(0, lastSep);
+      const toolCallId = part.approval.id.slice(lastSep + separator.length);
+      if (!runId || !toolCallId) continue;
+      if (toolCallId !== part.toolCallId) continue;
+      byTarget.set(`${runId}${separator}${toolCallId}`, {
+        resumeData: {
+          approved: part.approval.approved,
+          ...part.approval.reason != null ? { reason: part.approval.reason } : {}
+        },
+        runId,
+        toolCallId
+      });
+    }
   }
-  return null;
+  return [...byTarget.values()];
+}
+function streamV6ApprovalResumes(args) {
+  const { agent, approvals, baseOptions, structuredOutput, messages, lastMessageId } = args;
+  const { sendStart, sendFinish, sendReasoning, sendSources, onError, messageMetadata } = args;
+  return createUIMessageStream2({
+    originalMessages: messages,
+    onError,
+    execute: async ({ writer }) => {
+      let startWritten = false;
+      let successfulLegs = 0;
+      let firstResolvedTargetError;
+      let finalFinish;
+      for (const approval of approvals) {
+        try {
+          const result = await agent.resumeStream(approval.resumeData, {
+            ...baseOptions,
+            runId: approval.runId,
+            toolCallId: approval.toolCallId,
+            ...structuredOutput ? { structuredOutput } : {}
+          });
+          for await (const part of toAISdkStream(result, {
+            from: "agent",
+            version: "v6",
+            lastMessageId,
+            sendStart,
+            sendFinish,
+            sendReasoning,
+            sendSources,
+            onError,
+            messageMetadata
+          })) {
+            if (part.type === "start") {
+              if (startWritten) continue;
+              startWritten = true;
+              writer.write(part);
+              continue;
+            }
+            if (!startWritten && sendStart) {
+              writer.write({ type: "start", ...lastMessageId ? { messageId: lastMessageId } : {} });
+              startWritten = true;
+            }
+            if (part.type === "finish") {
+              finalFinish = part;
+              continue;
+            }
+            writer.write(part);
+          }
+          successfulLegs++;
+        } catch (error) {
+          const id = error?.id;
+          if (id !== "AGENT_RESUME_TOOL_CALL_NOT_SUSPENDED" && id !== "AGENT_RESUME_NO_SNAPSHOT_FOUND") {
+            throw error;
+          }
+          firstResolvedTargetError ??= error;
+        }
+      }
+      if (successfulLegs === 0 && firstResolvedTargetError) throw firstResolvedTargetError;
+      if (!startWritten && sendStart) {
+        writer.write({ type: "start", ...lastMessageId ? { messageId: lastMessageId } : {} });
+      }
+      if (sendFinish) {
+        writer.write(finalFinish ?? { type: "finish" });
+      }
+    }
+  });
 }
 async function handleChatStream({
   mastra,
@@ -11648,9 +11745,6 @@ async function handleChatStream({
   if (!Array.isArray(messages)) {
     throw new Error("Messages must be an array of UIMessage objects");
   }
-  const nativeApproval = version === "v6" && !resumeData ? extractV6NativeApproval(messages) : null;
-  const effectiveResumeData = nativeApproval?.resumeData ?? resumeData;
-  const effectiveRunId = nativeApproval?.runId ?? runId;
   let lastMessageId;
   let messagesToSend = messages;
   if (messages.length > 0) {
@@ -11672,12 +11766,30 @@ async function handleChatStream({
   const baseOptions = {
     ...defaultOptionsRest,
     ...restOptions,
-    ...effectiveRunId && { runId: effectiveRunId },
-    ...nativeApproval?.toolCallId && { toolCallId: nativeApproval.toolCallId },
+    ...runId && { runId },
     requestContext: requestContext || defaultOptions3?.requestContext,
     ...Object.keys(mergedProviderOptions).length > 0 && { providerOptions: mergedProviderOptions }
   };
-  const result = effectiveResumeData ? structuredOutput ? await agentObj.resumeStream(effectiveResumeData, { ...baseOptions, structuredOutput }) : await agentObj.resumeStream(effectiveResumeData, baseOptions) : structuredOutput ? await agentObj.stream(messagesToSend, { ...baseOptions, structuredOutput }) : await agentObj.stream(messagesToSend, baseOptions);
+  if (version === "v6" && !resumeData && trigger !== "regenerate-message" && messages.at(-1)?.role === "assistant") {
+    const approvals = extractV6NativeApprovals(messages);
+    if (approvals.length > 0) {
+      return streamV6ApprovalResumes({
+        agent: agentObj,
+        approvals,
+        baseOptions,
+        structuredOutput,
+        messages,
+        lastMessageId,
+        sendStart,
+        sendFinish,
+        sendReasoning,
+        sendSources,
+        onError,
+        messageMetadata
+      });
+    }
+  }
+  const result = resumeData ? structuredOutput ? await agentObj.resumeStream(resumeData, { ...baseOptions, structuredOutput }) : await agentObj.resumeStream(resumeData, baseOptions) : structuredOutput ? await agentObj.stream(messagesToSend, { ...baseOptions, structuredOutput }) : await agentObj.stream(messagesToSend, baseOptions);
   if (version === "v6") {
     return createUIMessageStream2({
       originalMessages: messages,