@eko-ai/eko 2.0.2-alpha.4 → 2.0.2-alpha.6

package/dist/agent/base.d.ts

@@ -24,7 +24,7 @@ export declare class Agent {
     protected handleResult(agentContext: AgentContext, messages: LanguageModelV1Prompt, agentTools: Tool[], results: Array<LanguageModelV1TextPart | LanguageModelV1ToolCallPart>): Promise<string | null>;
     protected system_auto_tools(agentNode: WorkflowAgent): Tool[];
     private removeDuplicateToolUse;
-    protected initMessages(agentContext: AgentContext): LanguageModelV1Prompt;
+    protected initMessages(agentContext: AgentContext, tools?: Tool[]): LanguageModelV1Prompt;
     private listTools;
     protected controlMcpTools(agentContext: AgentContext, messages: LanguageModelV1Prompt, loopNum: number): Promise<{
         mcpTools: boolean;

package/dist/agent/base.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../src/agent/base.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../src/agent/base.ts"],"names":[],"mappings":"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"}

package/dist/agent/browser/browser_labels.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"browser_labels.d.ts","sourceRoot":"","sources":["../../../src/agent/browser/browser_labels.ts"],"names":[],"mappings":"AACA,OAAO,gBAAgB,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,IAAI,EAAc,UAAU,EAAE,MAAM,aAAa,CAAC;AAE3D,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAGzD,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,sBAAuB,SAAQ,gBAAgB;gBAC/D,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,SAAS,CAAC,EAAE,IAAI,EAAE,EAAE,SAAS,CAAC,EAAE,UAAU;cAmCvD,UAAU,CACxB,YAAY,EAAE,YAAY,EAC1B,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,OAAO,GACb,OAAO,CAAC,IAAI,CAAC;cAOA,aAAa,CAC3B,YAAY,EAAE,YAAY,EAC1B,KAAK,EAAE,MAAM,EACb,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GAAG,OAAO,GAAG,QAAQ,GAClC,OAAO,CAAC,IAAI,CAAC;cAMA,iBAAiB,CAC/B,YAAY,EAAE,YAAY,EAC1B,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,IAAI,CAAC;cAaA,kBAAkB,CAChC,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC;cAWA,gBAAgB,CAC9B,YAAY,EAAE,YAAY,EAC1B,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,IAAI,CAAC;cAIA,mBAAmB,CAAC,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC;QACvE,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,YAAY,GAAG,WAAW,CAAC;QACtC,UAAU,EAAE,MAAM,CAAC;KACpB,CAAC;IAqCF,SAAS,CAAC,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAInD,OAAO,CAAC,cAAc;cA4RN,cAAc,CAC5B,YAAY,EAAE,YAAY,EAC1B,QAAQ,EAAE,qBAAqB,GAC9B,OAAO,CAAC,IAAI,CAAC;CAyBjB"}
+{"version":3,"file":"browser_labels.d.ts","sourceRoot":"","sources":["../../../src/agent/browser/browser_labels.ts"],"names":[],"mappings":"AACA,OAAO,gBAAgB,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,IAAI,EAAc,UAAU,EAAE,MAAM,aAAa,CAAC;AAE3D,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAGzD,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,sBAAuB,SAAQ,gBAAgB;gBAC/D,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,SAAS,CAAC,EAAE,IAAI,EAAE,EAAE,SAAS,CAAC,EAAE,UAAU;cAmCvD,UAAU,CACxB,YAAY,EAAE,YAAY,EAC1B,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,OAAO,GACb,OAAO,CAAC,IAAI,CAAC;cAOA,aAAa,CAC3B,YAAY,EAAE,YAAY,EAC1B,KAAK,EAAE,MAAM,EACb,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GAAG,OAAO,GAAG,QAAQ,GAClC,OAAO,CAAC,IAAI,CAAC;cAMA,iBAAiB,CAC/B,YAAY,EAAE,YAAY,EAC1B,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,IAAI,CAAC;cAaA,kBAAkB,CAChC,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC;cAgBA,gBAAgB,CAC9B,YAAY,EAAE,YAAY,EAC1B,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,IAAI,CAAC;cAIA,mBAAmB,CAAC,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC;QACvE,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,YAAY,GAAG,WAAW,CAAC;QACtC,UAAU,EAAE,MAAM,CAAC;KACpB,CAAC;IAqCF,SAAS,CAAC,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAInD,OAAO,CAAC,cAAc;cA4RN,cAAc,CAC5B,YAAY,EAAE,YAAY,EAC1B,QAAQ,EAAE,qBAAqB,GAC9B,OAAO,CAAC,IAAI,CAAC;CA6BjB"}

package/dist/index.cjs.js

@@ -12840,12 +12840,19 @@ class RetryLanguageModel {
                 continue;
             }
             try {
-                const result = await call_timeout(async () => await llm.doStream(options), this.stream_first_timeout);
+                const controller = new AbortController();
+                const signal = options.abortSignal
+                    ? AbortSignal.any([options.abortSignal, controller.signal])
+                    : controller.signal;
+                const result = await call_timeout(async () => await llm.doStream({ ...options, abortSignal: signal }), this.stream_first_timeout, (e) => {
+                    controller.abort();
+                });
                 const stream = result.stream;
                 const reader = stream.getReader();
                 const { done, value } = await call_timeout(async () => await reader.read(), this.stream_first_timeout, (e) => {
                     reader.cancel();
                     reader.releaseLock();
+                    controller.abort();
                 });
                 if (done) {
                     Log.warn(`LLM stream done, name: ${name} => `, { done, value });
@@ -15681,93 +15688,57 @@ request_help: Request assistance from the user; for instance, when an operation
                     description: "The type of interaction with users.",
                     enum: ["confirm", "input", "select", "request_help"],
                 },
-                confirm: {
-                    type: "object",
-                    properties: {
-                        prompt: {
-                            type: "string",
-                            description: "Display prompts to users",
-                        },
-                    },
-                    required: ["prompt"],
+                prompt: {
+                    type: "string",
+                    description: "Display prompts to users",
                 },
-                input: {
-                    type: "object",
-                    properties: {
-                        prompt: {
-                            type: "string",
-                            description: "Display prompts to users",
-                        },
+                selectOptions: {
+                    type: "array",
+                    description: "Options provided to users, this parameter is required when interactType is select.",
+                    items: {
+                        type: "string",
                     },
-                    required: ["prompt"],
                 },
-                select: {
-                    type: "object",
-                    properties: {
-                        prompt: {
-                            type: "string",
-                            description: "Display prompts to users",
-                        },
-                        options: {
-                            type: "array",
-                            description: "Options provided to the user",
-                            items: {
-                                type: "string",
-                            },
-                        },
-                        multiple: {
-                            type: "boolean",
-                        },
-                    },
-                    required: ["prompt", "options"],
+                selectMultiple: {
+                    type: "boolean",
+                    description: "isMultiple, used when interactType is select",
                 },
-                request_help: {
-                    type: "object",
-                    properties: {
-                        helpType: {
-                            type: "string",
-                            description: "Display prompts to users",
-                            enum: ["request_login", "request_assistance"],
-                        },
-                        prompt: {
-                            type: "string",
-                            description: "Display prompts to users",
-                        },
-                    },
-                    required: ["helpType", "prompt"],
+                helpType: {
+                    type: "string",
+                    description: "Help type, required when interactType is request_help.",
+                    enum: ["request_login", "request_assistance"],
                 },
             },
-            required: ["interactType"],
+            required: ["interactType", "prompt"],
         };
     }
     async execute(args, agentContext) {
         let interactType = args.interactType;
-        let interact = args[interactType];
         let callback = agentContext.context.config.callback;
         let resultText = "";
         if (callback) {
             switch (interactType) {
                 case "confirm":
                     if (callback.onHumanConfirm) {
-                        let result = await callback.onHumanConfirm(agentContext, interact.prompt);
+                        let result = await callback.onHumanConfirm(agentContext, args.prompt);
                         resultText = `confirm result: ${result ? "Yes" : "No"}`;
                     }
                     break;
                 case "input":
                     if (callback.onHumanInput) {
-                        let result = await callback.onHumanInput(agentContext, interact.prompt);
+                        let result = await callback.onHumanInput(agentContext, args.prompt);
                         resultText = `input result: ${result}`;
                     }
                     break;
                 case "select":
                     if (callback.onHumanSelect) {
-                        let result = await callback.onHumanSelect(agentContext, interact.prompt, interact.options, interact.multiple);
+                        let result = await callback.onHumanSelect(agentContext, args.prompt, (args.selectOptions || []), (args.selectMultiple || false));
                         resultText = `select result: ${JSON.stringify(result)}`;
                     }
                     break;
                 case "request_help":
                     if (callback.onHumanHelp) {
-                        let result = await callback.onHumanHelp(agentContext, interact.helpType, interact.prompt);
+                        let result = await callback.onHumanHelp(agentContext, (args.helpType || "request_assistance"), args.prompt);
                         resultText = `request_help result: ${result ? "Solved" : "Unresolved"}`;
                     }
                     break;
@@ -15980,9 +15951,10 @@ UTC datetime: {datetime}
 </root>
 `;
 const HUMAN_PROMPT = `
-During the task execution process, you can use the \`${TOOL_NAME$3}\` tool to interact with humans. Please do not abuse this tool to harass humans. Please call it in the following situations:
+During the task execution process, you can use the \`${TOOL_NAME$3}\` tool to interact with humans, please call it in the following situations:
 - When performing dangerous operations such as deleting files, confirmation from humans is required
 - When encountering obstacles while accessing websites, such as requiring user login, you need to request human assistance
+- Try not to use the \`${TOOL_NAME$3}\` tool
 `;
 const VARIABLE_PROMPT = `
 If you need to read and write the input/output variables in the node, require the use of the \`${TOOL_NAME$1}\` tool.
@@ -16009,14 +15981,16 @@ const WATCH_NODE = `
 const WATCH_PROMPT = `
 \`watch\`: monitor changes in webpage DOM or file content, when executing to the watch node, require the use of the \`${TOOL_NAME}\` tool.
 `;
-function getAgentSystemPrompt(agent, agentNode, context, systemPrompt) {
+function getAgentSystemPrompt(agent, agentNode, context, tools, systemPrompt) {
     let prompt = "";
     let nodePrompt = "";
     let agentNodeXml = agentNode.xml;
-    let hasForEach = agentNodeXml.indexOf("</forEach>") > -1;
     let hasWatch = agentNodeXml.indexOf("</watch>") > -1;
-    let hasVariable = agentNodeXml.indexOf(" input=") > -1 || agentNodeXml.indexOf(" output=") > -1;
-    let hasHumanTool = agent.Tools.filter((tool) => tool.name == TOOL_NAME$3).length > 0;
+    let hasForEach = agentNodeXml.indexOf("</forEach>") > -1;
+    let hasHumanTool = (tools || agent.Tools).filter((tool) => tool.name == TOOL_NAME$3).length > 0;
+    let hasVariable = agentNodeXml.indexOf("input=") > -1 ||
+        agentNodeXml.indexOf("output=") > -1 ||
+        (tools || agent.Tools).filter((tool) => tool.name == TOOL_NAME$1).length > 0;
     if (hasHumanTool) {
         prompt += HUMAN_PROMPT;
     }
@@ -16040,8 +16014,9 @@ function getAgentSystemPrompt(agent, agentNode, context, systemPrompt) {
         .replace("{nodePrompt}", nodePrompt)
         .trim();
 }
-function getAgentUserPrompt(agent, agentNode, context) {
-    let hasTaskNodeStatusTool = agent.Tools.filter((tool) => tool.name == TOOL_NAME$2).length > 0;
+function getAgentUserPrompt(agent, agentNode, context, tools) {
+    let hasTaskNodeStatusTool = (tools || agent.Tools).filter((tool) => tool.name == TOOL_NAME$2)
+        .length > 0;
     return buildAgentRootXml(agentNode.xml, context.chain.taskPrompt, (nodeId, node) => {
         if (hasTaskNodeStatusTool) {
             node.setAttribute("status", "todo");
@@ -16074,9 +16049,10 @@ class Agent {
         let loopNum = 0;
         let context = agentContext.context;
         let agentNode = agentContext.agentChain.agent;
-        let messages = this.initMessages(agentContext);
+        const tools = [...this.tools, ...this.system_auto_tools(agentNode)];
+        let messages = this.initMessages(agentContext, tools);
         let rlm = new RetryLanguageModel(context.config.llms, this.llms);
-        let agentTools = [...this.tools, ...this.system_auto_tools(agentNode)];
+        let agentTools = tools;
         while (loopNum < maxReactNum) {
             context.checkAborted();
             if (mcpClient) {
@@ -16084,7 +16060,7 @@ class Agent {
                 if (controlMcp.mcpTools) {
                     let mcpTools = await this.listTools(agentNode, context, mcpClient, controlMcp.mcpParams);
                     let usedTools = this.extractUsedTool(messages, agentTools);
-                    let _agentTools = mergeTools(this.tools, usedTools);
+                    let _agentTools = mergeTools(tools, usedTools);
                     agentTools = mergeTools(_agentTools, mcpTools);
                 }
             }
@@ -16176,8 +16152,8 @@ class Agent {
     system_auto_tools(agentNode) {
         let tools = [];
         let agentNodeXml = agentNode.xml;
-        let hasVariable = agentNodeXml.indexOf(" input=") > -1 ||
-            agentNodeXml.indexOf(" output=") > -1;
+        let hasVariable = agentNodeXml.indexOf("input=") > -1 ||
+            agentNodeXml.indexOf("output=") > -1;
         if (hasVariable) {
             tools.push(new VariableStorageTool());
         }
@@ -16206,18 +16182,18 @@ class Agent {
         }
         return _results;
     }
-    initMessages(agentContext) {
+    initMessages(agentContext, tools) {
         let messages = [
             {
                 role: "system",
-                content: getAgentSystemPrompt(this, agentContext.agentChain.agent, agentContext.context),
+                content: getAgentSystemPrompt(this, agentContext.agentChain.agent, agentContext.context, tools),
             },
             {
                 role: "user",
                 content: [
                     {
                         type: "text",
-                        text: getAgentUserPrompt(this, agentContext.agentChain.agent, agentContext.context),
+                        text: getAgentUserPrompt(this, agentContext.agentChain.agent, agentContext.context, tools),
                     },
                 ],
             },
@@ -17287,7 +17263,7 @@ class BaseFileAgent extends Agent {
             tools: _tools_,
             llms: llms,
             mcpClient: mcpClient,
-            planDescription: "File operation agent, handling file-related tasks such as creating, finding, reading, modifying files, etc.",
+            planDescription: "File operation agent, handling file-related tasks such as creating, finding, reading, modifying files, etc, only text file writing is supported.",
         });
         let init_tools = this.buildInitTools();
         if (ext_tools && ext_tools.length > 0) {
@@ -17333,7 +17309,7 @@ class BaseFileAgent extends Agent {
             },
             {
                 name: "file_write",
-                description: "Overwrite or append content to a file. Use for creating new files, appending content, or modifying existing files.",
+                description: "Overwrite or append content to a file. Use for creating new files, appending content, or modifying existing files, only supports txt/md/csv or other text formats.",
                 parameters: {
                     type: "object",
                     properties: {
@@ -18533,7 +18509,11 @@ class BaseBrowserLabelsAgent extends BaseBrowserAgent {
     }
     async scroll_mouse_wheel(agentContext, amount) {
         await this.execute_script(agentContext, (amount) => {
-            window.scrollBy(0, amount * 50);
+            let viewportHeight = window.innerHeight ||
+                document.documentElement.clientHeight ||
+                document.body.clientHeight;
+            let y = Math.max(20, Math.min(viewportHeight / 10, 200));
+            window.scrollBy(0, y * amount);
         }, [amount]);
         await sleep(200);
     }
@@ -18789,7 +18769,9 @@ class BaseBrowserLabelsAgent extends BaseBrowserAgent {
     }
     async handleMessages(agentContext, messages) {
         let lastTool = this.lastToolResult(messages);
-        if (lastTool && lastTool.toolName !== "extract_content" && lastTool.toolName !== "get_all_tabs") {
+        if (lastTool &&
+            lastTool.toolName !== "extract_content" &&
+            lastTool.toolName !== "get_all_tabs") {
             await sleep(200);
             let result = await this.screenshot_and_html(agentContext);
             let image = toImage(result.imageBase64);

package/dist/index.esm.js

@@ -12805,12 +12805,19 @@ class RetryLanguageModel {
                 continue;
             }
             try {
-                const result = await call_timeout(async () => await llm.doStream(options), this.stream_first_timeout);
+                const controller = new AbortController();
+                const signal = options.abortSignal
+                    ? AbortSignal.any([options.abortSignal, controller.signal])
+                    : controller.signal;
+                const result = await call_timeout(async () => await llm.doStream({ ...options, abortSignal: signal }), this.stream_first_timeout, (e) => {
+                    controller.abort();
+                });
                 const stream = result.stream;
                 const reader = stream.getReader();
                 const { done, value } = await call_timeout(async () => await reader.read(), this.stream_first_timeout, (e) => {
                     reader.cancel();
                     reader.releaseLock();
+                    controller.abort();
                 });
                 if (done) {
                     Log.warn(`LLM stream done, name: ${name} => `, { done, value });
@@ -15646,93 +15653,57 @@ request_help: Request assistance from the user; for instance, when an operation
                     description: "The type of interaction with users.",
                     enum: ["confirm", "input", "select", "request_help"],
                 },
-                confirm: {
-                    type: "object",
-                    properties: {
-                        prompt: {
-                            type: "string",
-                            description: "Display prompts to users",
-                        },
-                    },
-                    required: ["prompt"],
+                prompt: {
+                    type: "string",
+                    description: "Display prompts to users",
                 },
-                input: {
-                    type: "object",
-                    properties: {
-                        prompt: {
-                            type: "string",
-                            description: "Display prompts to users",
-                        },
+                selectOptions: {
+                    type: "array",
+                    description: "Options provided to users, this parameter is required when interactType is select.",
+                    items: {
+                        type: "string",
                     },
-                    required: ["prompt"],
                 },
-                select: {
-                    type: "object",
-                    properties: {
-                        prompt: {
-                            type: "string",
-                            description: "Display prompts to users",
-                        },
-                        options: {
-                            type: "array",
-                            description: "Options provided to the user",
-                            items: {
-                                type: "string",
-                            },
-                        },
-                        multiple: {
-                            type: "boolean",
-                        },
-                    },
-                    required: ["prompt", "options"],
+                selectMultiple: {
+                    type: "boolean",
+                    description: "isMultiple, used when interactType is select",
                 },
-                request_help: {
-                    type: "object",
-                    properties: {
-                        helpType: {
-                            type: "string",
-                            description: "Display prompts to users",
-                            enum: ["request_login", "request_assistance"],
-                        },
-                        prompt: {
-                            type: "string",
-                            description: "Display prompts to users",
-                        },
-                    },
-                    required: ["helpType", "prompt"],
+                helpType: {
+                    type: "string",
+                    description: "Help type, required when interactType is request_help.",
+                    enum: ["request_login", "request_assistance"],
                 },
             },
-            required: ["interactType"],
+            required: ["interactType", "prompt"],
         };
     }
     async execute(args, agentContext) {
         let interactType = args.interactType;
-        let interact = args[interactType];
         let callback = agentContext.context.config.callback;
         let resultText = "";
         if (callback) {
             switch (interactType) {
                 case "confirm":
                     if (callback.onHumanConfirm) {
-                        let result = await callback.onHumanConfirm(agentContext, interact.prompt);
+                        let result = await callback.onHumanConfirm(agentContext, args.prompt);
                         resultText = `confirm result: ${result ? "Yes" : "No"}`;
                     }
                     break;
                 case "input":
                     if (callback.onHumanInput) {
-                        let result = await callback.onHumanInput(agentContext, interact.prompt);
+                        let result = await callback.onHumanInput(agentContext, args.prompt);
                         resultText = `input result: ${result}`;
                     }
                     break;
                 case "select":
                     if (callback.onHumanSelect) {
-                        let result = await callback.onHumanSelect(agentContext, interact.prompt, interact.options, interact.multiple);
+                        let result = await callback.onHumanSelect(agentContext, args.prompt, (args.selectOptions || []), (args.selectMultiple || false));
                         resultText = `select result: ${JSON.stringify(result)}`;
                     }
                     break;
                 case "request_help":
                     if (callback.onHumanHelp) {
-                        let result = await callback.onHumanHelp(agentContext, interact.helpType, interact.prompt);
+                        let result = await callback.onHumanHelp(agentContext, (args.helpType || "request_assistance"), args.prompt);
                         resultText = `request_help result: ${result ? "Solved" : "Unresolved"}`;
                     }
                     break;
@@ -15945,9 +15916,10 @@ UTC datetime: {datetime}
 </root>
 `;
 const HUMAN_PROMPT = `
-During the task execution process, you can use the \`${TOOL_NAME$3}\` tool to interact with humans. Please do not abuse this tool to harass humans. Please call it in the following situations:
+During the task execution process, you can use the \`${TOOL_NAME$3}\` tool to interact with humans, please call it in the following situations:
 - When performing dangerous operations such as deleting files, confirmation from humans is required
 - When encountering obstacles while accessing websites, such as requiring user login, you need to request human assistance
+- Try not to use the \`${TOOL_NAME$3}\` tool
 `;
 const VARIABLE_PROMPT = `
 If you need to read and write the input/output variables in the node, require the use of the \`${TOOL_NAME$1}\` tool.
@@ -15974,14 +15946,16 @@ const WATCH_NODE = `
 const WATCH_PROMPT = `
 \`watch\`: monitor changes in webpage DOM or file content, when executing to the watch node, require the use of the \`${TOOL_NAME}\` tool.
 `;
-function getAgentSystemPrompt(agent, agentNode, context, systemPrompt) {
+function getAgentSystemPrompt(agent, agentNode, context, tools, systemPrompt) {
     let prompt = "";
     let nodePrompt = "";
     let agentNodeXml = agentNode.xml;
-    let hasForEach = agentNodeXml.indexOf("</forEach>") > -1;
     let hasWatch = agentNodeXml.indexOf("</watch>") > -1;
-    let hasVariable = agentNodeXml.indexOf(" input=") > -1 || agentNodeXml.indexOf(" output=") > -1;
-    let hasHumanTool = agent.Tools.filter((tool) => tool.name == TOOL_NAME$3).length > 0;
+    let hasForEach = agentNodeXml.indexOf("</forEach>") > -1;
+    let hasHumanTool = (tools || agent.Tools).filter((tool) => tool.name == TOOL_NAME$3).length > 0;
+    let hasVariable = agentNodeXml.indexOf("input=") > -1 ||
+        agentNodeXml.indexOf("output=") > -1 ||
+        (tools || agent.Tools).filter((tool) => tool.name == TOOL_NAME$1).length > 0;
     if (hasHumanTool) {
         prompt += HUMAN_PROMPT;
     }
@@ -16005,8 +15979,9 @@ function getAgentSystemPrompt(agent, agentNode, context, systemPrompt) {
         .replace("{nodePrompt}", nodePrompt)
         .trim();
 }
-function getAgentUserPrompt(agent, agentNode, context) {
-    let hasTaskNodeStatusTool = agent.Tools.filter((tool) => tool.name == TOOL_NAME$2).length > 0;
+function getAgentUserPrompt(agent, agentNode, context, tools) {
+    let hasTaskNodeStatusTool = (tools || agent.Tools).filter((tool) => tool.name == TOOL_NAME$2)
+        .length > 0;
     return buildAgentRootXml(agentNode.xml, context.chain.taskPrompt, (nodeId, node) => {
         if (hasTaskNodeStatusTool) {
             node.setAttribute("status", "todo");
@@ -16039,9 +16014,10 @@ class Agent {
         let loopNum = 0;
         let context = agentContext.context;
         let agentNode = agentContext.agentChain.agent;
-        let messages = this.initMessages(agentContext);
+        const tools = [...this.tools, ...this.system_auto_tools(agentNode)];
+        let messages = this.initMessages(agentContext, tools);
         let rlm = new RetryLanguageModel(context.config.llms, this.llms);
-        let agentTools = [...this.tools, ...this.system_auto_tools(agentNode)];
+        let agentTools = tools;
         while (loopNum < maxReactNum) {
             context.checkAborted();
             if (mcpClient) {
@@ -16049,7 +16025,7 @@ class Agent {
                 if (controlMcp.mcpTools) {
                     let mcpTools = await this.listTools(agentNode, context, mcpClient, controlMcp.mcpParams);
                     let usedTools = this.extractUsedTool(messages, agentTools);
-                    let _agentTools = mergeTools(this.tools, usedTools);
+                    let _agentTools = mergeTools(tools, usedTools);
                     agentTools = mergeTools(_agentTools, mcpTools);
                 }
             }
@@ -16141,8 +16117,8 @@ class Agent {
     system_auto_tools(agentNode) {
         let tools = [];
         let agentNodeXml = agentNode.xml;
-        let hasVariable = agentNodeXml.indexOf(" input=") > -1 ||
-            agentNodeXml.indexOf(" output=") > -1;
+        let hasVariable = agentNodeXml.indexOf("input=") > -1 ||
+            agentNodeXml.indexOf("output=") > -1;
         if (hasVariable) {
             tools.push(new VariableStorageTool());
         }
@@ -16171,18 +16147,18 @@ class Agent {
         }
         return _results;
     }
-    initMessages(agentContext) {
+    initMessages(agentContext, tools) {
         let messages = [
             {
                 role: "system",
-                content: getAgentSystemPrompt(this, agentContext.agentChain.agent, agentContext.context),
+                content: getAgentSystemPrompt(this, agentContext.agentChain.agent, agentContext.context, tools),
             },
             {
                 role: "user",
                 content: [
                     {
                         type: "text",
-                        text: getAgentUserPrompt(this, agentContext.agentChain.agent, agentContext.context),
+                        text: getAgentUserPrompt(this, agentContext.agentChain.agent, agentContext.context, tools),
                     },
                 ],
             },
@@ -17252,7 +17228,7 @@ class BaseFileAgent extends Agent {
             tools: _tools_,
             llms: llms,
             mcpClient: mcpClient,
-            planDescription: "File operation agent, handling file-related tasks such as creating, finding, reading, modifying files, etc.",
+            planDescription: "File operation agent, handling file-related tasks such as creating, finding, reading, modifying files, etc, only text file writing is supported.",
         });
         let init_tools = this.buildInitTools();
         if (ext_tools && ext_tools.length > 0) {
@@ -17298,7 +17274,7 @@ class BaseFileAgent extends Agent {
             },
             {
                 name: "file_write",
-                description: "Overwrite or append content to a file. Use for creating new files, appending content, or modifying existing files.",
+                description: "Overwrite or append content to a file. Use for creating new files, appending content, or modifying existing files, only supports txt/md/csv or other text formats.",
                 parameters: {
                     type: "object",
                     properties: {
@@ -18498,7 +18474,11 @@ class BaseBrowserLabelsAgent extends BaseBrowserAgent {
     }
     async scroll_mouse_wheel(agentContext, amount) {
         await this.execute_script(agentContext, (amount) => {
-            window.scrollBy(0, amount * 50);
+            let viewportHeight = window.innerHeight ||
+                document.documentElement.clientHeight ||
+                document.body.clientHeight;
+            let y = Math.max(20, Math.min(viewportHeight / 10, 200));
+            window.scrollBy(0, y * amount);
         }, [amount]);
         await sleep(200);
     }
@@ -18754,7 +18734,9 @@ class BaseBrowserLabelsAgent extends BaseBrowserAgent {
     }
     async handleMessages(agentContext, messages) {
         let lastTool = this.lastToolResult(messages);
-        if (lastTool && lastTool.toolName !== "extract_content" && lastTool.toolName !== "get_all_tabs") {
+        if (lastTool &&
+            lastTool.toolName !== "extract_content" &&
+            lastTool.toolName !== "get_all_tabs") {
             await sleep(200);
             let result = await this.screenshot_and_html(agentContext);
             let image = toImage(result.imageBase64);

package/dist/llm/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/llm/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,0BAA0B,EAE3B,MAAM,kBAAkB,CAAC;AAQ1B,OAAO,EACL,cAAc,EACd,UAAU,EACV,IAAI,EACJ,YAAY,EACb,MAAM,oBAAoB,CAAC;AAE5B,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,IAAI,CAAO;IACnB,OAAO,CAAC,KAAK,CAAW;IACxB,OAAO,CAAC,oBAAoB,CAAS;gBAEzB,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,EAAE,oBAAoB,CAAC,EAAE,MAAM;IASjE,IAAI,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,cAAc,CAAC;IAkBlD,UAAU,CACd,OAAO,EAAE,0BAA0B,GAClC,OAAO,CAAC,cAAc,CAAC;IAgCpB,UAAU,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,YAAY,CAAC;IAkBtD,QAAQ,CAAC,OAAO,EAAE,0BAA0B,GAAG,OAAO,CAAC,YAAY,CAAC;IAsD1E,OAAO,CAAC,MAAM;IAoCd,OAAO,CAAC,aAAa;CA0BtB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/llm/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,0BAA0B,EAE3B,MAAM,kBAAkB,CAAC;AAQ1B,OAAO,EACL,cAAc,EACd,UAAU,EACV,IAAI,EACJ,YAAY,EACb,MAAM,oBAAoB,CAAC;AAE5B,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,IAAI,CAAO;IACnB,OAAO,CAAC,KAAK,CAAW;IACxB,OAAO,CAAC,oBAAoB,CAAS;gBAEzB,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,EAAE,oBAAoB,CAAC,EAAE,MAAM;IASjE,IAAI,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,cAAc,CAAC;IAkBlD,UAAU,CACd,OAAO,EAAE,0BAA0B,GAClC,OAAO,CAAC,cAAc,CAAC;IAgCpB,UAAU,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,YAAY,CAAC;IAkBtD,QAAQ,CAAC,OAAO,EAAE,0BAA0B,GAAG,OAAO,CAAC,YAAY,CAAC;IA8D1E,OAAO,CAAC,MAAM;IAoCd,OAAO,CAAC,aAAa;CA0BtB"}

package/dist/prompt/agent.d.ts

@@ -1,6 +1,7 @@
 import { Agent } from "../agent";
 import Context from "../core/context";
 import { WorkflowAgent } from "../types/core.types";
-export declare function getAgentSystemPrompt(agent: Agent, agentNode: WorkflowAgent, context: Context, systemPrompt?: string): string;
-export declare function getAgentUserPrompt(agent: Agent, agentNode: WorkflowAgent, context: Context): string;
+import { Tool } from "../types";
+export declare function getAgentSystemPrompt(agent: Agent, agentNode: WorkflowAgent, context: Context, tools?: Tool[], systemPrompt?: string): string;
+export declare function getAgentUserPrompt(agent: Agent, agentNode: WorkflowAgent, context: Context, tools?: Tool[]): string;
 //# sourceMappingURL=agent.d.ts.map

package/dist/prompt/agent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../../src/prompt/agent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAEjC,OAAO,OAAO,MAAM,iBAAiB,CAAC;AAEtC,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAkEpD,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,KAAK,EACZ,SAAS,EAAE,aAAa,EACxB,OAAO,EAAE,OAAO,EAChB,YAAY,CAAC,EAAE,MAAM,GACpB,MAAM,CA8BR;AAED,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,KAAK,EACZ,SAAS,EAAE,aAAa,EACxB,OAAO,EAAE,OAAO,GACf,MAAM,CAOR"}
+{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../../src/prompt/agent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAEjC,OAAO,OAAO,MAAM,iBAAiB,CAAC;AAEtC,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAMpD,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC;AA6DhC,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,KAAK,EACZ,SAAS,EAAE,aAAa,EACxB,OAAO,EAAE,OAAO,EAChB,KAAK,CAAC,EAAE,IAAI,EAAE,EACd,YAAY,CAAC,EAAE,MAAM,GACpB,MAAM,CAkCR;AAED,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,KAAK,EACZ,SAAS,EAAE,aAAa,EACxB,OAAO,EAAE,OAAO,EAChB,KAAK,CAAC,EAAE,IAAI,EAAE,GACb,MAAM,CAaR"}

package/dist/tools/human_interact.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"human_interact.d.ts","sourceRoot":"","sources":["../../src/tools/human_interact.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAExD,eAAO,MAAM,SAAS,mBAAmB,CAAC;AAE1C,MAAM,CAAC,OAAO,OAAO,iBAAkB,YAAW,IAAI;IACpD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAa;IAClC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,UAAU,EAAE,WAAW,CAAC;;IA8E3B,OAAO,CACX,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,YAAY,EAAE,YAAY,GACzB,OAAO,CAAC,UAAU,CAAC;CAuEvB"}
+{"version":3,"file":"human_interact.d.ts","sourceRoot":"","sources":["../../src/tools/human_interact.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAExD,eAAO,MAAM,SAAS,mBAAmB,CAAC;AAE1C,MAAM,CAAC,OAAO,OAAO,iBAAkB,YAAW,IAAI;IACpD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAa;IAClC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,UAAU,EAAE,WAAW,CAAC;;IA4C3B,OAAO,CACX,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,YAAY,EAAE,YAAY,GACzB,OAAO,CAAC,UAAU,CAAC;CAsEvB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eko-ai/eko",
-  "version": "2.0.2-alpha.4",
+  "version": "2.0.2-alpha.6",
   "description": "Empowering language to transform human words into action.",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",