@eko-ai/eko 2.0.8 → 2.0.9

package/dist/index.d.ts

@@ -10,5 +10,5 @@ export { Eko, Log, config, Context, AgentContext, Chain, AgentChain, SimpleSseMc
 export { Agent, type AgentParams, BaseChatAgent, BaseFileAgent, BaseShellAgent, BaseTimerAgent, BaseComputerAgent, BaseBrowserAgent, BaseBrowserLabelsAgent, BaseBrowserScreenAgent, } from "./agent";
 export { HumanInteractTool, TaskNodeStatusTool, VariableStorageTool, ForeachTaskTool, WatchTriggerTool, } from "./tools";
 export { type LLMs, type LLMRequest, type StreamCallback, type HumanCallback, type EkoConfig, type Workflow, type WorkflowAgent, type WorkflowNode, type StreamCallbackMessage, } from "./types";
-export { mergeTools, toImage, convertToolSchema } from "./common/utils";
+export { mergeTools, toImage, convertToolSchema, uuidv4, call_timeout, } from "./common/utils";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,UAAU,CAAC;AAC9B,OAAO,GAAG,MAAM,cAAc,CAAC;AAC/B,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,kBAAkB,EAAE,MAAM,OAAO,CAAC;AAC3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,OAAO,CAAC;AAC3C,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,OAAO,EAAE,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAEvD,eAAe,GAAG,CAAC;AAEnB,OAAO,EACL,GAAG,EACH,GAAG,EACH,MAAM,EACN,OAAO,EACP,YAAY,EACZ,KAAK,EACL,UAAU,EACV,kBAAkB,EAClB,kBAAkB,GACnB,CAAC;AAEF,OAAO,EACL,KAAK,EACL,KAAK,WAAW,EAChB,aAAa,EACb,aAAa,EACb,cAAc,EACd,cAAc,EACd,iBAAiB,EACjB,gBAAgB,EAChB,sBAAsB,EACtB,sBAAsB,GACvB,MAAM,SAAS,CAAC;AAEjB,OAAO,EACL,iBAAiB,EACjB,kBAAkB,EAClB,mBAAmB,EACnB,eAAe,EACf,gBAAgB,GACjB,MAAM,SAAS,CAAC;AAEjB,OAAO,EACL,KAAK,IAAI,EACT,KAAK,UAAU,EACf,KAAK,cAAc,EACnB,KAAK,aAAa,EAClB,KAAK,SAAS,EACd,KAAK,QAAQ,EACb,KAAK,aAAa,EAClB,KAAK,YAAY,EACjB,KAAK,qBAAqB,GAC3B,MAAM,SAAS,CAAC;AAEjB,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,UAAU,CAAC;AAC9B,OAAO,GAAG,MAAM,cAAc,CAAC;AAC/B,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,kBAAkB,EAAE,MAAM,OAAO,CAAC;AAC3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,OAAO,CAAC;AAC3C,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,OAAO,EAAE,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAEvD,eAAe,GAAG,CAAC;AAEnB,OAAO,EACL,GAAG,EACH,GAAG,EACH,MAAM,EACN,OAAO,EACP,YAAY,EACZ,KAAK,EACL,UAAU,EACV,kBAAkB,EAClB,kBAAkB,GACnB,CAAC;AAEF,OAAO,EACL,KAAK,EACL,KAAK,WAAW,EAChB,aAAa,EACb,aAAa,EACb,cAAc,EACd,cAAc,EACd,iBAAiB,EACjB,gBAAgB,EAChB,sBAAsB,EACtB,sBAAsB,GACvB,MAAM,SAAS,CAAC;AAEjB,OAAO,EACL,iBAAiB,EACjB,kBAAkB,EAClB,mBAAmB,EACnB,eAAe,EACf,gBAAgB,GACjB,MAAM,SAAS,CAAC;AAEjB,OAAO,EACL,KAAK,IAAI,EACT,KAAK,UAAU,EACf,KAAK,cAAc,EACnB,KAAK,aAAa,EAClB,KAAK,SAAS,EACd,KAAK,QAAQ,EACb,KAAK,aAAa,EAClB,KAAK,YAAY,EACjB,KAAK,qBAAqB,GAC3B,MAAM,SAAS,CAAC;AAEjB,OAAO,EACL,UAAU,EACV,OAAO,EACP,iBAAiB,EACjB,MAAM,EACN,YAAY,GACb,MAAM,gBAAgB,CAAC"}

package/dist/index.esm.js

@@ -1,5 +1,5 @@
 const config = {
-    name: "Fellou",
+    name: "Eko",
     platform: "mac",
     maxReactNum: 200,
     maxTokens: 16000,
@@ -18108,12 +18108,14 @@ UTC datetime: {datetime}
   <mainTask>main task</mainTask>
   <!-- The tasks that the current agent needs to complete, the current agent only needs to complete the currentTask -->
   <currentTask>specific task</currentTask>
-  <!-- Complete the corresponding step nodes of the task -->
+  <!-- Complete the corresponding step nodes of the task, Only for reference -->
   <nodes>
     <!-- node supports input/output variables to pass dependencies -->
     <node input="variable name" output="variable name" status="todo / done">task step node</node>{nodePrompt}
   </nodes>
 </root>
+
+The output language should follow the language corresponding to the user's task.
 `;
 const HUMAN_PROMPT = `
 * HUMAN INTERACT
@@ -18255,7 +18257,7 @@ class Agent {
             if (mcpClient) {
                 let controlMcp = await this.controlMcpTools(agentContext, messages, loopNum);
                 if (controlMcp.mcpTools) {
-                    let mcpTools = await this.listTools(agentNode, context, mcpClient, controlMcp.mcpParams);
+                    let mcpTools = await this.listTools(context, mcpClient, agentNode, controlMcp.mcpParams);
                     let usedTools = extractUsedTool(messages, agentTools);
                     let _agentTools = mergeTools(tools, usedTools);
                     agentTools = mergeTools(_agentTools, mcpTools);
@@ -18374,24 +18376,33 @@ class Agent {
     async extSysPrompt(agentContext, tools) {
         return "";
     }
-    async listTools(agentNode, context, mcpClient, mcpParams) {
-        let list = await mcpClient.listTools({
-            taskId: context.taskId,
-            nodeId: agentNode.id,
-            environment: config.platform,
-            agent_name: agentNode.name,
-            params: {},
-            prompt: agentNode.task,
-            ...(mcpParams || {}),
-        });
-        let mcpTools = [];
-        for (let i = 0; i < list.length; i++) {
-            let toolSchema = list[i];
-            let execute = this.toolExecuter(mcpClient, toolSchema.name);
-            let toolWrapper = new ToolWrapper(toolSchema, execute);
-            mcpTools.push(new McpTool(toolWrapper));
+    async listTools(context, mcpClient, agentNode, mcpParams) {
+        try {
+            if (!mcpClient.isConnected()) {
+                await mcpClient.connect();
+            }
+            let list = await mcpClient.listTools({
+                taskId: context.taskId,
+                nodeId: agentNode?.id,
+                environment: config.platform,
+                agent_name: agentNode?.name || this.name,
+                params: {},
+                prompt: agentNode?.task || context.chain.taskPrompt,
+                ...(mcpParams || {}),
+            });
+            let mcpTools = [];
+            for (let i = 0; i < list.length; i++) {
+                let toolSchema = list[i];
+                let execute = this.toolExecuter(mcpClient, toolSchema.name);
+                let toolWrapper = new ToolWrapper(toolSchema, execute);
+                mcpTools.push(new McpTool(toolWrapper));
+            }
+            return mcpTools;
+        }
+        catch (e) {
+            Log.error("Mcp listTools error", e);
+            return [];
         }
-        return mcpTools;
     }
     async controlMcpTools(agentContext, messages, loopNum) {
         return {
@@ -18502,6 +18513,15 @@ class Agent {
             ],
         };
     }
+    async loadTools(context) {
+        if (this.mcpClient) {
+            let mcpTools = await this.listTools(context, this.mcpClient);
+            if (mcpTools && mcpTools.length > 0) {
+                return mergeTools(this.tools, mcpTools);
+            }
+        }
+        return this.tools;
+    }
     get Name() {
         return this.name;
     }
@@ -18518,7 +18538,7 @@ class Agent {
         return this.mcpClient;
     }
 }
-async function callLLM(agentContext, rlm, messages, tools, noCompress, toolChoice) {
+async function callLLM(agentContext, rlm, messages, tools, noCompress, toolChoice, retry) {
     if (messages.length >= config.compressThreshold && !noCompress) {
         await compressAgentMessages(agentContext, rlm, messages, tools);
     }
@@ -18667,6 +18687,10 @@ async function callLLM(agentContext, rlm, messages, tools, noCompress, toolChoic
                         finishReason: chunk.finishReason,
                         usage: chunk.usage,
                     });
+                    if (chunk.finishReason === "length" && messages.length >= 10 && !noCompress && !retry) {
+                        await compressAgentMessages(agentContext, rlm, messages, tools);
+                        return callLLM(agentContext, rlm, messages, tools, noCompress, toolChoice, true);
+                    }
                     break;
                 }
             }
@@ -18864,19 +18888,24 @@ User Platform: {platform}
 Task Website: {task_website}
 Task Description: {taskPrompt}
 `;
-function getPlanSystemPrompt(agents) {
-    let agents_prompt = agents
-        .map((agent) => {
-        return (`<agent name="${agent.Name}">\n` +
-            `Description: ${agent.PlanDescription || agent.Description}\nTools:\n` +
-            agent.Tools.filter((tool) => !tool.noPlan)
-                .map((tool) => `- ${tool.name}: ${tool.planDescription || tool.description || ""}`)
-                .join("\n") +
-            `\n</agent>`);
-    })
-        .join("\n\n");
+async function getPlanSystemPrompt(context) {
+    let agents_prompt = "";
+    let agents = context.agents;
+    for (let i = 0; i < agents.length; i++) {
+        let agent = agents[i];
+        let tools = await agent.loadTools(context);
+        agents_prompt +=
+            `<agent name="${agent.Name}">\n` +
+                `Description: ${agent.PlanDescription || agent.Description}\n` +
+                "Tools:\n" +
+                tools
+                    .filter((tool) => !tool.noPlan)
+                    .map((tool) => `  - ${tool.name}: ${tool.planDescription || tool.description || ""}`)
+                    .join("\n") +
+                "\n</agent>\n\n";
+    }
     let example_prompt = "";
-    let hasChatAgent = agents.filter((a) => a.Name == AGENT_NAME$4).length > 0;
+    let hasChatAgent = context.agents.filter((a) => a.Name == AGENT_NAME$4).length > 0;
     const example_list = hasChatAgent
         ? [PLAN_CHAT_EXAMPLE, ...PLAN_EXAMPLE_LIST]
         : [...PLAN_EXAMPLE_LIST];
@@ -18884,7 +18913,7 @@ function getPlanSystemPrompt(agents) {
         example_prompt += `## Example ${i + 1}\n${example_list[i]}\n\n`;
     }
     return PLAN_SYSTEM_TEMPLATE.replace("{name}", config.name)
-        .replace("{agents}", agents_prompt)
+        .replace("{agents}", agents_prompt.trim())
         .replace("{datetime}", new Date().toISOString())
         .replace("{example_prompt}", example_prompt)
         .trim();
@@ -18934,7 +18963,10 @@ class Planner {
         }
         else {
             messages = [
-                { role: "system", content: getPlanSystemPrompt(this.context.agents) },
+                {
+                    role: "system",
+                    content: await getPlanSystemPrompt(this.context),
+                },
                 {
                     role: "user",
                     content: [
@@ -19365,7 +19397,9 @@ const AGENT_NAME$3 = "File";
 class BaseFileAgent extends Agent {
     constructor(work_path, llms, ext_tools, mcpClient, planDescription) {
         const _tools_ = [];
-        const prompt = work_path ? `Your default working path is: ${work_path}` : "";
+        const prompt = work_path
+            ? `Your default working path is: ${work_path}`
+            : "";
         super({
             name: AGENT_NAME$3,
             description: `You are a file agent, handling file-related tasks such as creating, finding, reading, modifying files, etc.${prompt}`,
@@ -19499,7 +19533,10 @@ class BaseShellAgent extends Agent {
         const _tools_ = [];
         super({
             name: AGENT_NAME$2,
-            description: "Shell command agent, use to execute shell commands.\nYou must first call create_session to create a new session when using it for the first time.",
+            description: `Run commands in a bash shell,
+* You must first call create_session to create a new session when using it for the first time.
+* Please execute delete commands with caution, and never perform dangerous operations like \`rm -rf /\`.
+* Please avoid commands that may produce a very large amount of output.`,
             tools: _tools_,
             llms: llms,
             mcpClient: mcpClient,
@@ -19589,7 +19626,7 @@ This is a computer GUI interface, observe the execution through screenshots, and
             tools: _tools_,
             llms: llms,
             mcpClient: mcpClient,
-            planDescription: "Computer operation agent, interact with the computer using the mouse and keyboard, operation application."
+            planDescription: "Computer operation agent, interact with the computer using the mouse and keyboard."
         });
         if (!keyboardKeys) {
             if (config.platform == "windows") {
@@ -20864,7 +20901,7 @@ class BaseBrowserLabelsAgent extends BaseBrowserAgent {
             },
             {
                 name: "get_select_options",
-                description: "Get all options from a native dropdown element",
+                description: "Get all options from a native dropdown element (<select>).",
                 parameters: {
                     type: "object",
                     properties: {
@@ -20881,7 +20918,7 @@ class BaseBrowserLabelsAgent extends BaseBrowserAgent {
             },
             {
                 name: "select_option",
-                description: "Select the native dropdown option",
+                description: "Select the native dropdown option, Use this after get_select_options and when you need to select an option from a dropdown.",
                 parameters: {
                     type: "object",
                     properties: {
@@ -21420,5 +21457,5 @@ class BaseBrowserScreenAgent extends BaseBrowserAgent {
     }
 }
 
-export { Agent, AgentChain, AgentContext, BaseBrowserAgent, BaseBrowserLabelsAgent, BaseBrowserScreenAgent, BaseChatAgent, BaseComputerAgent, BaseFileAgent, BaseShellAgent, BaseTimerAgent, Chain, Context, Eko, ForeachTaskTool, HumanInteractTool, Log, RetryLanguageModel, SimpleSseMcpClient, TaskNodeStatusTool, VariableStorageTool, WatchTriggerTool, config, convertToolSchema, Eko as default, mergeTools, toImage };
+export { Agent, AgentChain, AgentContext, BaseBrowserAgent, BaseBrowserLabelsAgent, BaseBrowserScreenAgent, BaseChatAgent, BaseComputerAgent, BaseFileAgent, BaseShellAgent, BaseTimerAgent, Chain, Context, Eko, ForeachTaskTool, HumanInteractTool, Log, RetryLanguageModel, SimpleSseMcpClient, TaskNodeStatusTool, VariableStorageTool, WatchTriggerTool, call_timeout, config, convertToolSchema, Eko as default, mergeTools, toImage, uuidv4 };
 //# sourceMappingURL=index.esm.js.map