@eko-ai/eko 4.0.7-alpha.1 → 4.0.8-alpha.1

package/dist/index.cjs.js

@@ -38047,7 +38047,9 @@ async function callWithReAct(rlm, request, toolCallsOrCallback, streamCallback,
         };
     }
     if (typeof toolCallsOrCallback !== "function") {
-        request.tools = toolCallsOrCallback.map((tool) => ({
+        request.tools = (Array.isArray(toolCallsOrCallback)
+            ? toolCallsOrCallback
+            : toolCallsOrCallback.tools).map((tool) => ({
             type: "function",
             name: tool.name,
             description: tool.description,
@@ -38057,6 +38059,11 @@ async function callWithReAct(rlm, request, toolCallsOrCallback, streamCallback,
     let loopNum = 0;
     let assistantParts = null;
     while (true) {
+        await streamCallback?.({
+            type: "loop_start",
+            request,
+            loopNum,
+        });
         assistantParts = await callLLM(rlm, request, streamCallback, errorHandler, finishHandler);
         if (assistantParts.length > 0) {
             request.messages.push({
@@ -38066,6 +38073,12 @@ async function callWithReAct(rlm, request, toolCallsOrCallback, streamCallback,
         }
         const continueLoop = await loopControl(request, assistantParts, loopNum);
         if (!continueLoop) {
+            await streamCallback?.({
+                type: "loop_end",
+                request,
+                loopNum,
+                continueLoop,
+            });
             break;
         }
         const toolUses = assistantParts.filter((s) => s.type == "tool-call");
@@ -38074,16 +38087,33 @@ async function callWithReAct(rlm, request, toolCallsOrCallback, streamCallback,
             toolResults = await toolCallsOrCallback(request, toolUses);
         }
         else {
-            toolResults = await Promise.all(toolUses.map(async (toolUse) => {
-                const tool = toolCallsOrCallback.find((t) => t.name === toolUse.toolName);
-                if (!tool) {
-                    throw new Error(`Tool ${toolUse.toolName} not found`);
-                }
-                const args = typeof toolUse.input === "string"
-                    ? JSON.parse(toolUse.input || "{}")
-                    : toolUse.input || {};
-                return await tool.execute(args, toolUse);
-            }));
+            const tools = Array.isArray(toolCallsOrCallback)
+                ? toolCallsOrCallback
+                : toolCallsOrCallback.tools;
+            if (!Array.isArray(toolCallsOrCallback) && toolCallsOrCallback.callback) {
+                toolResults = await toolCallsOrCallback.callback(request, toolUses, tools);
+            }
+            else {
+                toolResults = await Promise.all(toolUses.map(async (toolUse) => {
+                    const tool = tools.find((t) => t.name === toolUse.toolName);
+                    if (!tool) {
+                        throw new Error(`Tool ${toolUse.toolName} not found`);
+                    }
+                    const args = typeof toolUse.input === "string"
+                        ? JSON.parse(toolUse.input || "{}")
+                        : toolUse.input || {};
+                    try {
+                        return await tool.execute(args, toolUse);
+                    }
+                    catch (e) {
+                        Log.error("tool call error: ", toolUse.toolName, toolUse.input, e);
+                        return {
+                            type: "error-text",
+                            value: "Error: " + (e + "") || "Unknown error",
+                        };
+                    }
+                }));
+            }
         }
         if (toolResults.length > 0) {
             request.messages.push({
@@ -38096,6 +38126,12 @@ async function callWithReAct(rlm, request, toolCallsOrCallback, streamCallback,
                 })),
             });
         }
+        await streamCallback?.({
+            type: "loop_end",
+            request,
+            loopNum,
+            continueLoop,
+        });
         loopNum++;
     }
     return assistantParts;