ai 7.0.111 → 7.0.113

package/dist/internal/index.d.ts

@@ -2911,7 +2911,7 @@ declare function verifyToolApprovalSignature({ secret, signature, approvalId, to
  * message history before they are executed. Checks HMAC signature (when
  * configured), input schema, and approval policy.
  */
-declare function validateApprovedToolApprovals<TOOLS extends ToolSet, RUNTIME_CONTEXT extends Context | unknown | never>({ approvedToolApprovals, tools, toolApproval, messages, toolsContext, runtimeContext, toolApprovalSecret, }: {
+declare function validateApprovedToolApprovals<TOOLS extends ToolSet, RUNTIME_CONTEXT extends Context | unknown | never>({ approvedToolApprovals, tools, toolApproval, messages, toolsContext, runtimeContext, toolApprovalSecret, refineToolInput, }: {
     approvedToolApprovals: Array<CollectedToolApprovals<TOOLS>>;
     tools: TOOLS | undefined;
     toolApproval: ToolApprovalConfiguration<TOOLS, RUNTIME_CONTEXT> | undefined;
@@ -2919,6 +2919,7 @@ declare function validateApprovedToolApprovals<TOOLS extends ToolSet, RUNTIME_CO
     toolsContext: InferToolSetContext<TOOLS>;
     runtimeContext: RUNTIME_CONTEXT;
     toolApprovalSecret?: string | Uint8Array;
+    refineToolInput?: ToolInputRefinement<TOOLS>;
 }): Promise<{
     approvedToolApprovals: Array<CollectedToolApprovals<TOOLS>>;
     deniedToolApprovals: Array<CollectedToolApprovals<TOOLS>>;

package/dist/internal/index.js

@@ -91,7 +91,7 @@ import {
 } from "@ai-sdk/provider-utils";
 
 // src/version.ts
-var VERSION = true ? "7.0.111" : "0.0.0-test";
+var VERSION = true ? "7.0.113" : "0.0.0-test";
 
 // src/util/download/download.ts
 var download = async ({
@@ -241,6 +241,13 @@ function convertUrlToFilePartData(url) {
   }
   return { data: { type: "url", url }, mediaType: void 0 };
 }
+function convertUrlStringToFilePartData(content) {
+  const result = convertUrlToFilePartData(new URL(content));
+  if (result.data.type === "url" && result.data.url.toString() !== content) {
+    result.data.originalUrl = content;
+  }
+  return result;
+}
 function convertInlineDataToFilePartData(content) {
   if (content instanceof Uint8Array) {
     return { data: { type: "data", data: content }, mediaType: void 0 };
@@ -292,7 +299,7 @@ function convertToLanguageModelV4FilePart(content) {
   }
   if (typeof content === "string") {
     try {
-      return convertUrlToFilePartData(new URL(content));
+      return convertUrlStringToFilePartData(content);
     } catch (e) {
       return convertInlineDataToFilePartData(content);
     }
@@ -893,6 +900,7 @@ function mapToolResultOutput({
         }
         case "file-url": {
           const mediaType = (_a12 = item.mediaType) != null ? _a12 : 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) {
             const inferenceSuffix = mediaType === "application/octet-stream" ? `Unable to infer media type from URL. Defaulting to 'application/octet-stream'.` : `Inferred media type '${mediaType}' from URL.`;
@@ -905,7 +913,11 @@ function mapToolResultOutput({
           });
           return {
             type: "file",
-            data: { type: "url", url: new URL(item.url) },
+            data: {
+              type: "url",
+              url,
+              ...url.toString() !== item.url ? { originalUrl: item.url } : {}
+            },
             mediaType,
             providerOptions: item.providerOptions
           };
@@ -961,6 +973,7 @@ function mapToolResultOutput({
           };
         }
         case "image-url": {
+          const url = new URL(item.url);
           warnings.push({
             type: "deprecated",
             setting: '"tool-result" content of type "image-url"',
@@ -968,7 +981,11 @@ function mapToolResultOutput({
           });
           return {
             type: "file",
-            data: { type: "url", url: new URL(item.url) },
+            data: {
+              type: "url",
+              url,
+              ...url.toString() !== item.url ? { originalUrl: item.url } : {}
+            },
             mediaType: "image",
             providerOptions: item.providerOptions
           };
@@ -1445,7 +1462,10 @@ var toolApprovalRequestSchema = z.object(
     type: z.literal("tool-approval-request"),
     approvalId: z.string(),
     toolCallId: z.string(),
-    reason: z.string().optional()
+    reason: z.string().optional(),
+    isAutomatic: z.boolean().optional(),
+    signature: z.string().optional(),
+    inputSchemaInput: z.unknown().optional()
   }
 );
 var toolApprovalResponseSchema = z.object({
@@ -3096,6 +3116,20 @@ function getOwn(obj, key) {
   return obj != null && Object.hasOwn(obj, key) ? obj[key] : void 0;
 }
 
+// src/generate-text/tool-call.ts
+var inputSchemaInputSymbol = /* @__PURE__ */ Symbol("ai-sdk-tool-call-input-schema-input");
+function setToolCallInputSchemaInput(toolCall, inputSchemaInput) {
+  Object.defineProperty(toolCall, inputSchemaInputSymbol, {
+    value: inputSchemaInput
+  });
+  return toolCall;
+}
+function getToolCallInputSchemaInput(toolCall) {
+  return inputSchemaInputSymbol in toolCall ? {
+    value: toolCall[inputSchemaInputSymbol]
+  } : void 0;
+}
+
 // src/generate-text/parse-tool-call.ts
 async function parseToolCall({
   toolCall,
@@ -3218,10 +3252,12 @@ async function refineParsedToolCallInput({
   if (refine == null) {
     return toolCall;
   }
-  return {
+  const refinedToolCall = {
     ...toolCall,
     input: await refine(toolCall.input)
   };
+  const inputSchemaInput = getToolCallInputSchemaInput(toolCall);
+  return inputSchemaInput == null ? refinedToolCall : setToolCallInputSchemaInput(refinedToolCall, inputSchemaInput.value);
 }
 async function parseProviderExecutedDynamicToolCall(toolCall) {
   const parseResult = toolCall.input.trim() === "" ? { success: true, value: {} } : await safeParseJSON({ text: toolCall.input });
@@ -3266,26 +3302,29 @@ async function doParseToolCall({
       cause: parseResult.error
     });
   }
-  return tool2.type === "dynamic" ? {
-    type: "tool-call",
-    toolCallId: toolCall.toolCallId,
-    toolName: toolCall.toolName,
-    input: parseResult.value,
-    providerExecuted: toolCall.providerExecuted,
-    providerMetadata: toolCall.providerMetadata,
-    ...tool2.metadata != null ? { toolMetadata: tool2.metadata } : {},
-    dynamic: true,
-    title: tool2.title
-  } : {
-    type: "tool-call",
-    toolCallId: toolCall.toolCallId,
-    toolName,
-    input: parseResult.value,
-    providerExecuted: toolCall.providerExecuted,
-    providerMetadata: toolCall.providerMetadata,
-    ...tool2.metadata != null ? { toolMetadata: tool2.metadata } : {},
-    title: tool2.title
-  };
+  return setToolCallInputSchemaInput(
+    tool2.type === "dynamic" ? {
+      type: "tool-call",
+      toolCallId: toolCall.toolCallId,
+      toolName: toolCall.toolName,
+      input: parseResult.value,
+      providerExecuted: toolCall.providerExecuted,
+      providerMetadata: toolCall.providerMetadata,
+      ...tool2.metadata != null ? { toolMetadata: tool2.metadata } : {},
+      dynamic: true,
+      title: tool2.title
+    } : {
+      type: "tool-call",
+      toolCallId: toolCall.toolCallId,
+      toolName,
+      input: parseResult.value,
+      providerExecuted: toolCall.providerExecuted,
+      providerMetadata: toolCall.providerMetadata,
+      ...tool2.metadata != null ? { toolMetadata: tool2.metadata } : {},
+      title: tool2.title
+    },
+    parseResult.rawValue
+  );
 }
 
 // src/generate-text/validate-tool-context.ts
@@ -3607,6 +3646,33 @@ import {
   safeValidateTypes as safeValidateTypes3
 } from "@ai-sdk/provider-utils";
 
+// src/util/is-deep-equal-data.ts
+function isDeepEqualData(obj1, obj2) {
+  if (obj1 === obj2) return true;
+  if (obj1 == null || obj2 == null) return false;
+  if (typeof obj1 !== "object" && typeof obj2 !== "object")
+    return obj1 === obj2;
+  if (obj1.constructor !== obj2.constructor) return false;
+  if (obj1 instanceof Date && obj2 instanceof Date) {
+    return obj1.getTime() === obj2.getTime();
+  }
+  if (Array.isArray(obj1)) {
+    if (obj1.length !== obj2.length) return false;
+    for (let i = 0; i < obj1.length; i++) {
+      if (!isDeepEqualData(obj1[i], obj2[i])) return false;
+    }
+    return true;
+  }
+  const keys1 = Object.keys(obj1);
+  const keys2 = Object.keys(obj2);
+  if (keys1.length !== keys2.length) return false;
+  for (const key of keys1) {
+    if (!keys2.includes(key)) return false;
+    if (!isDeepEqualData(obj1[key], obj2[key])) return false;
+  }
+  return true;
+}
+
 // src/generate-text/resolve-tool-approval.ts
 async function resolveToolApproval({
   tools,
@@ -3670,14 +3736,15 @@ async function validateApprovedToolApprovals({
   messages,
   toolsContext,
   runtimeContext,
-  toolApprovalSecret
+  toolApprovalSecret,
+  refineToolInput
 }) {
   var _a12;
   const approved = [];
   const denied = [];
   const invalid = [];
   for (const approval of approvedToolApprovals) {
-    const { toolCall, approvalRequest } = approval;
+    const { approvalRequest, toolCall } = approval;
     const tool2 = getOwn(tools, toolCall.toolName);
     if (toolApprovalSecret != null) {
       if (approvalRequest.signature == null) {
@@ -3704,17 +3771,42 @@ async function validateApprovedToolApprovals({
       }
     }
     if (isExecutableTool(tool2) && tool2.inputSchema != null) {
+      const hasInputSchemaInput = Object.prototype.hasOwnProperty.call(
+        approvalRequest,
+        "inputSchemaInput"
+      );
       const validation = await safeValidateTypes3({
-        value: toolCall.input,
+        value: hasInputSchemaInput ? approvalRequest.inputSchemaInput : toolCall.input,
         schema: asSchema3(tool2.inputSchema)
       });
+      let validationError;
       if (!validation.success) {
+        validationError = validation.error;
+      } else {
+        try {
+          const revalidatedToolCall = await refineParsedToolCallInput({
+            toolCall: {
+              ...toolCall,
+              input: validation.value
+            },
+            refineToolInput
+          });
+          if (!isDeepEqualData(revalidatedToolCall.input, toolCall.input)) {
+            validationError = new Error(
+              "Approved tool input does not match the validated schema output."
+            );
+          }
+        } catch (error) {
+          validationError = error;
+        }
+      }
+      if (validationError != null) {
         invalid.push({
           ...approval,
           error: new InvalidToolInputError({
             toolName: toolCall.toolName,
             toolInput: JSON.stringify(toolCall.input),
-            cause: validation.error
+            cause: validationError
           })
         });
         continue;
@@ -3852,13 +3944,15 @@ async function toResponseMessages({
         break;
       }
       case "tool-approval-request":
+        const inputSchemaInput = getToolCallInputSchemaInput(part.toolCall);
         content.push({
           type: "tool-approval-request",
           approvalId: part.approvalId,
           toolCallId: part.toolCall.toolCallId,
           ...part.reason != null ? { reason: part.reason } : {},
           isAutomatic: part.isAutomatic,
-          ...part.signature != null ? { signature: part.signature } : {}
+          ...part.signature != null ? { signature: part.signature } : {},
+          ...inputSchemaInput != null && !isDeepEqualData(inputSchemaInput.value, part.toolCall.input) ? { inputSchemaInput: inputSchemaInput.value } : {}
         });
         break;
     }