@eko-ai/eko 4.0.8 → 4.0.9

package/dist/index.esm.js

@@ -36671,7 +36671,7 @@ function parseWorkflow(taskId, xml, done, thinking) {
         }
         const parser = new libExports.DOMParser();
         const doc = parser.parseFromString(xml, "text/xml");
-        let root = doc.documentElement;
+        const root = doc.documentElement;
         if (root.tagName !== "root") {
             return _workflow;
         }
@@ -36684,11 +36684,11 @@ function parseWorkflow(taskId, xml, done, thinking) {
             agents: agents,
             xml: xml,
         };
-        let agentsNode = root.getElementsByTagName("agents");
-        let agentsNodes = agentsNode.length > 0 ? agentsNode[0].getElementsByTagName("agent") : [];
+        const agentsNode = root.getElementsByTagName("agents");
+        const agentsNodes = agentsNode.length > 0 ? agentsNode[0].getElementsByTagName("agent") : [];
         for (let i = 0; i < agentsNodes.length; i++) {
-            let agentNode = agentsNodes[i];
-            let name = agentNode.getAttribute("name");
+            const agentNode = agentsNodes[i];
+            const name = agentNode.getAttribute("name");
             if (!name) {
                 break;
             }
@@ -36698,12 +36698,15 @@ function parseWorkflow(taskId, xml, done, thinking) {
             let agent = {
                 name: name,
                 id: getAgentId(taskId, index),
-                dependsOn: dependsOn.split(",").filter(idx => idx.trim() != "").map(idx => getAgentId(taskId, idx)),
+                dependsOn: dependsOn
+                    .split(",")
+                    .filter((idx) => idx.trim() != "")
+                    .map((idx) => getAgentId(taskId, idx)),
                 task: agentNode.getElementsByTagName("task")[0]?.textContent || "",
                 nodes: nodes,
                 status: "init",
                 parallel: undefined,
-                xml: agentNode.toString(),
+                xml: "    " + agentNode.toString(),
             };
             let xmlNodes = agentNode.getElementsByTagName("nodes");
             if (xmlNodes.length > 0) {
@@ -36749,7 +36752,7 @@ function parseWorkflowNodes(nodes, xmlNodes) {
         if (xmlNodes[i].nodeType !== 1) {
             continue;
         }
-        let xmlNode = xmlNodes[i];
+        const xmlNode = xmlNodes[i];
         switch (xmlNode.tagName) {
             case "node": {
                 let node = {
@@ -36797,10 +36800,10 @@ function parseWorkflowNodes(nodes, xmlNodes) {
 function buildAgentRootXml(agentXml, mainTaskPrompt, nodeCallback) {
     const parser = new libExports.DOMParser();
     const doc = parser.parseFromString(agentXml, "text/xml");
-    let agentNode = doc.getElementsByTagName("agent");
-    let nodesNode = doc.getElementsByTagName("nodes");
+    const agentNode = doc.getElementsByTagName("agent");
+    const nodesNode = doc.getElementsByTagName("nodes");
     if (nodesNode.length > 0) {
-        let nodes = nodesNode[0].childNodes;
+        const nodes = nodesNode[0].childNodes;
         let nodeId = 0;
         for (let i = 0; i < nodes.length; i++) {
             let node = nodes[i];
@@ -36811,21 +36814,27 @@ function buildAgentRootXml(agentXml, mainTaskPrompt, nodeCallback) {
             }
         }
     }
-    // <root><mainTask></mainTask><currentTask></currentTask><nodes><node id="0"></node></nodes></root>
     let agentInnerHTML = getInnerXML(agentNode[0]);
-    let prefix = agentInnerHTML.substring(0, agentInnerHTML.indexOf("<task>"));
+    const prefix = agentInnerHTML.substring(0, agentInnerHTML.indexOf("<task>"));
     agentInnerHTML = agentInnerHTML
         .replace("<task>", "<currentTask>")
         .replace("</task>", "</currentTask>");
-    const xmlPrompt = `<root>${prefix}<mainTask>${mainTaskPrompt}</mainTask>${agentInnerHTML}</root>`;
+    let xmlPrompt;
+    if (agentInnerHTML.indexOf(`<currentTask>${mainTaskPrompt}</currentTask>`) > -1) {
+        xmlPrompt = `<root>${agentInnerHTML}</root>`;
+    }
+    else {
+        // <root><mainTask></mainTask><currentTask></currentTask><nodes><node id="0"></node></nodes></root>
+        xmlPrompt = `<root>${prefix}<mainTask>${mainTaskPrompt}</mainTask>${agentInnerHTML}</root>`;
+    }
     return xmlPrompt.replace(/      /g, "  ").replace("    </root>", "</root>");
 }
 function extractAgentXmlNode(agentXml, nodeId) {
     const parser = new libExports.DOMParser();
     const doc = parser.parseFromString(agentXml, "text/xml");
-    let nodesNode = doc.getElementsByTagName("nodes");
+    const nodesNode = doc.getElementsByTagName("nodes");
     if (nodesNode.length > 0) {
-        let nodes = nodesNode[0].childNodes;
+        const nodes = nodesNode[0].childNodes;
         let _nodeId = 0;
         for (let i = 0; i < nodes.length; i++) {
             let node = nodes[i];
@@ -36851,8 +36860,8 @@ function getInnerXML(node) {
     return result;
 }
 function buildSimpleAgentWorkflow({ taskId, name, agentName, task, taskNodes, }) {
-    if (!taskNodes || taskNodes.length == 0) {
-        taskNodes = [task];
+    if (!taskNodes) {
+        taskNodes = [];
     }
     const workflow = {
         taskId: taskId,
@@ -36885,7 +36894,9 @@ function resetWorkflowXml(workflow) {
     const agents = [];
     for (let i = 0; i < workflow.agents.length; i++) {
         const agent = workflow.agents[i];
-        const agentDependsAttr = ` id="${i}" dependsOn="${(agent.dependsOn || []).filter(s => parseInt(s.split("-")[s.split("-").length - 1])).join(",")}"`;
+        const agentDependsAttr = ` id="${i}" dependsOn="${(agent.dependsOn || [])
+            .filter((s) => parseInt(s.split("-")[s.split("-").length - 1]))
+            .join(",")}"`;
         const nodes = agent.nodes
             .map((node) => {
             if (node.type == "forEach") {
@@ -36896,9 +36907,8 @@ function resetWorkflowXml(workflow) {
                     const output = _node.output ? ` output="${_node.output}"` : "";
                     forEachNodes.push(`          <node${input}${output}>${_node.text}</node>`);
                 }
-                return `        <forEach items="${node.items || ""}">
-${forEachNodes.join("\n")}
-        </forEach>`;
+                const items = node.items || "";
+                return `        <forEach items="${items}">\n${forEachNodes.join("\n")}\n        </forEach>`;
             }
             else if (node.type == "watch") {
                 const watchNodes = [];
@@ -36908,12 +36918,9 @@ ${forEachNodes.join("\n")}
                     const output = _node.output ? ` output="${_node.output}"` : "";
                     watchNodes.push(`            <node${input}${output}>${_node.text}</node>`);
                 }
-                return `        <watch event="${node.event || "dom"}" loop="${node.loop ? "true" : "false"}">
-          <description>${node.description}</description>
-          <trigger>
-${watchNodes.join("\n")}
-          </trigger>
-        </watch>`;
+                const event = node.event || "dom";
+                const loop = node.loop ? "true" : "false";
+                return `        <watch event="${event}" loop="${loop}">\n          <description>${node.description}</description>\n          <trigger>\n${watchNodes.join("\n")}\n          </trigger>\n        </watch>`;
             }
             else {
                 const input = node.input ? ` input="${node.input}"` : "";
@@ -36922,22 +36929,17 @@ ${watchNodes.join("\n")}
             }
         })
             .join("\n");
-        const agentXml = `    <agent name="${agent.name}"${agentDependsAttr}>
-      <task>${agent.task}</task>
-      <nodes>
-${nodes}
-      </nodes>
-    </agent>`;
+        let agentXml;
+        if (nodes.trim()) {
+            agentXml = `    <agent name="${agent.name}"${agentDependsAttr}>\n      <task>${agent.task}</task>\n      <nodes>\n${nodes}\n      </nodes>\n    </agent>`;
+        }
+        else {
+            agentXml = `    <agent name="${agent.name}"${agentDependsAttr}>\n      <task>${agent.task}</task>\n    </agent>`;
+        }
         agent.xml = agentXml;
         agents.push(agentXml);
     }
-    const xml = `<root>
-  <name>${workflow.name}</name>
-  <thought>${workflow.thought}</thought>
-  <agents>
-${agents.join("\n")}
-  </agents>
-</root>`;
+    const xml = `<root>\n  <name>${workflow.name}</name>\n  <thought>${workflow.thought}</thought>\n  <agents>\n${agents.join("\n")}\n  </agents>\n</root>`;
     workflow.xml = xml;
 }
 
@@ -38012,7 +38014,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,
@@ -38050,16 +38054,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 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({
@@ -40566,6 +40587,12 @@ class Agent {
         if (hasVariable) {
             tools.push(new VariableStorageTool());
         }
+        else {
+            const dependentVariables = agentContext.context.variables.get("dependentVariables");
+            if (dependentVariables && dependentVariables.length > 0) {
+                tools.push(new VariableStorageTool());
+            }
+        }
         const hasForeach = agentNodeXml.indexOf("</forEach>") > -1;
         if (hasForeach) {
             tools.push(new ForeachTaskTool());
@@ -44263,7 +44290,7 @@ class DeepActionTool {
                 file_url: part.data,
             };
         });
-        const taskWebsite = await this.gettaskWebsite(tabIds);
+        const taskWebsite = await this.getTaskWebsite(tabIds);
         const workflow = await eko.generate(taskDescription, messageId, {
             ...(this.params.extra || {}),
             ...globalVariables,
@@ -44312,7 +44339,7 @@ class DeepActionTool {
             ],
         };
     }
-    async gettaskWebsite(tabIds) {
+    async getTaskWebsite(tabIds) {
         if (!global.browserService) {
             return [];
         }
@@ -44612,6 +44639,9 @@ class ChatAgent {
         }
         tools.push(new WebSearchTool(this.chatContext, params));
         tools.push(new TaskVariableStorageTool(this.chatContext, params));
+        // this.chatContext.getConfig().agents?.forEach((agent) => {
+        //   tools.push(new AgentWrapTool(this.chatContext, params, agent));
+        // });
         return tools;
     }
     getMemory() {