ai 7.0.18 → 7.0.19

package/dist/internal/index.js

@@ -85,7 +85,7 @@ import {
 } from "@ai-sdk/provider-utils";
 
 // src/version.ts
-var VERSION = true ? "7.0.18" : "0.0.0-test";
+var VERSION = true ? "7.0.19" : "0.0.0-test";
 
 // src/util/download/download.ts
 var download = async ({
@@ -2869,6 +2869,13 @@ import {
   safeParseJSON,
   safeValidateTypes as safeValidateTypes2
 } from "@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/generate-text/parse-tool-call.ts
 async function parseToolCall({
   toolCall,
   tools,
@@ -2902,7 +2909,8 @@ async function parseToolCall({
           toolCall,
           tools,
           inputSchema: async ({ toolName }) => {
-            const { inputSchema } = tools[toolName];
+            var _a12;
+            const inputSchema = (_a12 = getOwn(tools, toolName)) == null ? void 0 : _a12.inputSchema;
             return await asSchema2(inputSchema).jsonSchema;
           },
           instructions,
@@ -2927,7 +2935,7 @@ async function parseToolCall({
   } catch (error) {
     const parsedInput = await safeParseJSON({ text: toolCall.input });
     const input = parsedInput.success ? parsedInput.value : toolCall.input;
-    const tool = tools == null ? void 0 : tools[toolCall.toolName];
+    const tool = getOwn(tools, toolCall.toolName);
     return {
       type: "tool-call",
       toolCallId: toolCall.toolCallId,
@@ -2947,7 +2955,7 @@ async function refineParsedToolCallInput({
   toolCall,
   refineToolInput
 }) {
-  const refine = refineToolInput == null ? void 0 : refineToolInput[toolCall.toolName];
+  const refine = getOwn(refineToolInput, toolCall.toolName);
   if (refine == null) {
     return toolCall;
   }
@@ -2980,7 +2988,7 @@ async function doParseToolCall({
   tools
 }) {
   const toolName = toolCall.toolName;
-  const tool = tools[toolName];
+  const tool = getOwn(tools, toolName);
   if (tool == null) {
     if (toolCall.providerExecuted && toolCall.dynamic) {
       return await parseProviderExecutedDynamicToolCall(toolCall);
@@ -3032,7 +3040,7 @@ function collectToolApprovals({
       deniedToolApprovals: []
     };
   }
-  const toolCallsByToolCallId = {};
+  const toolCallsByToolCallId = /* @__PURE__ */ Object.create(null);
   for (const message of messages) {
     if (message.role === "assistant" && typeof message.content !== "string") {
       const content = message.content;
@@ -3043,7 +3051,7 @@ function collectToolApprovals({
       }
     }
   }
-  const toolApprovalRequestsByApprovalId = {};
+  const toolApprovalRequestsByApprovalId = /* @__PURE__ */ Object.create(null);
   for (const message of messages) {
     if (message.role === "assistant" && typeof message.content !== "string") {
       const content = message.content;
@@ -3054,7 +3062,9 @@ function collectToolApprovals({
       }
     }
   }
-  const toolResults = {};
+  const toolResults = /* @__PURE__ */ Object.create(
+    null
+  );
   for (const part of lastMessage.content) {
     if (part.type === "tool-result") {
       toolResults[part.toolCallId] = part;
@@ -3144,16 +3154,16 @@ async function resolveToolApproval({
     );
   }
   const toolName = toolCall.toolName;
-  const tool = tools == null ? void 0 : tools[toolName];
+  const tool = getOwn(tools, toolName);
   const input = toolCall.input;
-  const userDefinedToolApprovalStatus = toolApproval == null ? void 0 : toolApproval[toolName];
+  const userDefinedToolApprovalStatus = getOwn(toolApproval, toolName);
   if (userDefinedToolApprovalStatus != null) {
     const approvalStatus = typeof userDefinedToolApprovalStatus === "function" ? await userDefinedToolApprovalStatus(input, {
       toolCallId: toolCall.toolCallId,
       messages,
       toolContext: await validateToolContext({
         toolName,
-        context: toolsContext == null ? void 0 : toolsContext[toolName],
+        context: getOwn(toolsContext, toolName),
         contextSchema: tool == null ? void 0 : tool.contextSchema
       }),
       runtimeContext
@@ -3168,7 +3178,7 @@ async function resolveToolApproval({
     messages,
     context: await validateToolContext({
       toolName,
-      context: toolsContext == null ? void 0 : toolsContext[toolName],
+      context: getOwn(toolsContext, toolName),
       contextSchema: tool == null ? void 0 : tool.contextSchema
     })
   }) : tool.needsApproval;
@@ -3179,10 +3189,10 @@ function normalizeToolApprovalStatus(status) {
 }
 
 // src/generate-text/tool-approval-signature.ts
-import {
-  convertBase64ToUint8Array,
-  convertUint8ArrayToBase64
-} from "@ai-sdk/provider-utils";
+import { convertBase64ToUint8Array } from "@ai-sdk/provider-utils";
+
+// src/util/canonical-hash.ts
+import { convertUint8ArrayToBase64 } from "@ai-sdk/provider-utils";
 var encoder = new TextEncoder();
 function canonicalJSON(value) {
   if (value === null || value === void 0) {
@@ -3203,11 +3213,21 @@ function canonicalJSON(value) {
 function toBase64url(bytes) {
   return convertUint8ArrayToBase64(bytes).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/g, "");
 }
+async function hashCanonical(value) {
+  const digest = await crypto.subtle.digest(
+    "SHA-256",
+    encoder.encode(canonicalJSON(value))
+  );
+  return toBase64url(new Uint8Array(digest));
+}
+
+// src/generate-text/tool-approval-signature.ts
+var encoder2 = new TextEncoder();
 function fromBase64url(str) {
   return convertBase64ToUint8Array(str);
 }
 async function importKey(secret) {
-  const keyData = typeof secret === "string" ? encoder.encode(secret) : secret;
+  const keyData = typeof secret === "string" ? encoder2.encode(secret) : secret;
   return crypto.subtle.importKey(
     "raw",
     keyData,
@@ -3216,16 +3236,8 @@ async function importKey(secret) {
     ["sign", "verify"]
   );
 }
-async function hashInput(input) {
-  const canonical = canonicalJSON(input);
-  const digest = await crypto.subtle.digest(
-    "SHA-256",
-    encoder.encode(canonical)
-  );
-  return toBase64url(new Uint8Array(digest));
-}
 function buildPayload(approvalId, toolCallId, toolName, inputDigest) {
-  return encoder.encode(
+  return encoder2.encode(
     `${approvalId}
 ${toolCallId}
 ${toolName}
@@ -3241,7 +3253,7 @@ async function verifyToolApprovalSignature({
   input
 }) {
   const key = await importKey(secret);
-  const inputDigest = await hashInput(input);
+  const inputDigest = await hashCanonical(input);
   const payload = buildPayload(approvalId, toolCallId, toolName, inputDigest);
   const sigBytes = fromBase64url(signature);
   return crypto.subtle.verify("HMAC", key, sigBytes, payload);
@@ -3262,7 +3274,7 @@ async function validateApprovedToolApprovals({
   const denied = [];
   for (const approval of approvedToolApprovals) {
     const { toolCall, approvalRequest } = approval;
-    const tool = tools == null ? void 0 : tools[toolCall.toolName];
+    const tool = getOwn(tools, toolCall.toolName);
     if (toolApprovalSecret != null) {
       if (approvalRequest.signature == null) {
         throw new InvalidToolApprovalSignatureError({
@@ -3397,7 +3409,7 @@ async function toResponseMessages({
         const output = await createToolModelOutput({
           toolCallId: part.toolCallId,
           input: part.input,
-          tool: tools == null ? void 0 : tools[part.toolName],
+          tool: getOwn(tools, part.toolName),
           output: part.output,
           errorMode: "none"
         });
@@ -3414,7 +3426,7 @@ async function toResponseMessages({
         const output = await createToolModelOutput({
           toolCallId: part.toolCallId,
           input: part.input,
-          tool: tools == null ? void 0 : tools[part.toolName],
+          tool: getOwn(tools, part.toolName),
           output: part.error,
           errorMode: "json"
         });
@@ -3476,7 +3488,7 @@ async function toResponseMessages({
     const output = await createToolModelOutput({
       toolCallId: part.toolCallId,
       input: part.input,
-      tool: tools == null ? void 0 : tools[part.toolName],
+      tool: getOwn(tools, part.toolName),
       output: part.type === "tool-result" ? part.output : part.error,
       errorMode: part.type === "tool-error" ? "text" : "none"
     });