@elizaos/core 1.5.9 → 1.5.10-beta.0

package/dist/node/index.node.js

@@ -32021,7 +32021,7 @@ function _mergeDicts(left, right) {
     } else if (typeof merged[key] === "string") {
       if (key === "type") {
         continue;
-      } else if (["id", "output_version", "model_provider"].includes(key)) {
+      } else if (["id", "name", "output_version", "model_provider"].includes(key)) {
         merged[key] = value;
       } else {
         merged[key] += value;
@@ -32047,7 +32047,13 @@ function _mergeLists(left, right) {
     const merged = [...left];
     for (const item of right) {
       if (typeof item === "object" && item !== null && "index" in item && typeof item.index === "number") {
-        const toMerge = merged.findIndex((leftItem) => leftItem !== null && typeof leftItem === "object" && ("index" in leftItem) && leftItem.index === item.index && ("id" in leftItem && "id" in item ? leftItem.id === item.id : !("id" in leftItem) && !("id" in item)));
+        const toMerge = merged.findIndex((leftItem) => {
+          const isObject = typeof leftItem === "object";
+          const indiciesMatch = "index" in leftItem && leftItem.index === item.index;
+          const idsMatch = "id" in leftItem && "id" in item && leftItem?.id === item?.id;
+          const eitherItemMissingID = !("id" in leftItem) || !leftItem?.id || !("id" in item) || !item?.id;
+          return isObject && indiciesMatch && (idsMatch || eitherItemMissingID);
+        });
         if (toMerge !== -1 && typeof merged[toMerge] === "object" && merged[toMerge] !== null) {
           merged[toMerge] = _mergeDicts(merged[toMerge], item);
         } else {
@@ -32085,36 +32091,50 @@ class AIMessageChunk extends BaseMessageChunk {
         usage_metadata: fields.usage_metadata !== undefined ? fields.usage_metadata : undefined
       };
     } else {
-      const groupedToolCallChunk = fields.tool_call_chunks.reduce((acc, chunk) => {
-        const chunkId = chunk.id || `fallback-${chunk.index || 0}`;
-        acc[chunkId] = acc[chunkId] ?? [];
-        acc[chunkId].push(chunk);
+      const groupedToolCallChunks = fields.tool_call_chunks.reduce((acc, chunk) => {
+        const matchedChunkIndex = acc.findIndex(([match]) => {
+          if ("id" in chunk && chunk.id && "index" in chunk && chunk.index !== undefined) {
+            return chunk.id === match.id && chunk.index === match.index;
+          }
+          if ("id" in chunk && chunk.id) {
+            return chunk.id === match.id;
+          }
+          if ("index" in chunk && chunk.index !== undefined) {
+            return chunk.index === match.index;
+          }
+          return false;
+        });
+        if (matchedChunkIndex !== -1) {
+          acc[matchedChunkIndex].push(chunk);
+        } else {
+          acc.push([chunk]);
+        }
         return acc;
-      }, {});
+      }, []);
       const toolCalls = [];
       const invalidToolCalls = [];
-      for (const [id, chunks] of Object.entries(groupedToolCallChunk)) {
+      for (const chunks of groupedToolCallChunks) {
         let parsedArgs = {};
         const name = chunks[0]?.name ?? "";
         const joinedArgs = chunks.map((c) => c.args || "").join("");
         const argsStr = joinedArgs.length ? joinedArgs : "{}";
-        const originalId = chunks[0]?.id || id;
+        const id = chunks[0]?.id;
         try {
           parsedArgs = parsePartialJson(argsStr);
-          if (parsedArgs === null || typeof parsedArgs !== "object" || Array.isArray(parsedArgs)) {
+          if (!id || parsedArgs === null || typeof parsedArgs !== "object" || Array.isArray(parsedArgs)) {
             throw new Error("Malformed tool call chunk args.");
           }
           toolCalls.push({
             name,
             args: parsedArgs,
-            id: originalId,
+            id,
             type: "tool_call"
           });
         } catch (e) {
           invalidToolCalls.push({
             name,
             args: argsStr,
-            id: originalId,
+            id,
             error: "Malformed args.",
             type: "invalid_tool_call"
           });
@@ -46152,5 +46172,5 @@ export {
   AgentRuntime
 };
 
-//# debugId=E4CB56E0851C3CD864756E2164756E21
+//# debugId=919E5D09308269D664756E2164756E21
 //# sourceMappingURL=index.node.js.map