@eko-ai/eko 2.2.0 → 2.2.1

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":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,OAAO,EAAE,gBAAgB,EAAc,MAAM,gBAAgB,CAAC;AAC9D,OAAO,EAEL,qBAAqB,EACtB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,IAAI,EAAc,UAAU,EAAE,MAAM,aAAa,CAAC;AAG3D,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;cAwCvD,UAAU,CACxB,YAAY,EAAE,YAAY,EAC1B,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,OAAO,GACb,OAAO,CAAC,GAAG,CAAC;cAOC,aAAa,CAC3B,YAAY,EAAE,YAAY,EAC1B,KAAK,EAAE,MAAM,EACb,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GAAG,OAAO,GAAG,QAAQ,GAClC,OAAO,CAAC,GAAG,CAAC;cAMC,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,EACd,oBAAoB,EAAE,OAAO,GAC5B,OAAO,CAAC,GAAG,CAAC;cAkCC,gBAAgB,CAC9B,YAAY,EAAE,YAAY,EAC1B,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,IAAI,CAAC;cAIA,kBAAkB,CAChC,YAAY,EAAE,YAAY,EAC1B,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,GAAG,CAAC;cAMC,aAAa,CAC3B,YAAY,EAAE,YAAY,EAC1B,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,GAAG,CAAC;cAMC,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;IAwCF,SAAS,CAAC,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAInD,OAAO,CAAC,cAAc;cA+VN,kBAAkB,CAChC,YAAY,EAAE,YAAY,EAC1B,QAAQ,EAAE,qBAAqB,EAC/B,KAAK,EAAE,IAAI,EAAE,GACZ,OAAO,CAAC,OAAO,CAAC;cAIH,cAAc,CAC5B,YAAY,EAAE,YAAY,EAC1B,QAAQ,EAAE,qBAAqB,EAC/B,KAAK,EAAE,IAAI,EAAE,GACZ,OAAO,CAAC,IAAI,CAAC;IA2ChB,OAAO,CAAC,oBAAoB;IAkC5B,OAAO,CAAC,oBAAoB;CA0B7B;AAkSD,OAAO,EAAE,sBAAsB,EAAE,CAAC"}
+{"version":3,"file":"browser_labels.d.ts","sourceRoot":"","sources":["../../../src/agent/browser/browser_labels.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,OAAO,EAAE,gBAAgB,EAAc,MAAM,gBAAgB,CAAC;AAC9D,OAAO,EAEL,qBAAqB,EACtB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,IAAI,EAAc,UAAU,EAAE,MAAM,aAAa,CAAC;AAG3D,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;cAyCvD,UAAU,CACxB,YAAY,EAAE,YAAY,EAC1B,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,OAAO,GACb,OAAO,CAAC,GAAG,CAAC;cAOC,aAAa,CAC3B,YAAY,EAAE,YAAY,EAC1B,KAAK,EAAE,MAAM,EACb,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GAAG,OAAO,GAAG,QAAQ,GAClC,OAAO,CAAC,GAAG,CAAC;cAMC,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,EACd,oBAAoB,EAAE,OAAO,GAC5B,OAAO,CAAC,GAAG,CAAC;cAkCC,gBAAgB,CAC9B,YAAY,EAAE,YAAY,EAC1B,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,IAAI,CAAC;cAIA,kBAAkB,CAChC,YAAY,EAAE,YAAY,EAC1B,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,GAAG,CAAC;cAMC,aAAa,CAC3B,YAAY,EAAE,YAAY,EAC1B,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,GAAG,CAAC;cAMC,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;IAwCF,SAAS,CAAC,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAInD,OAAO,CAAC,cAAc;cA+VN,kBAAkB,CAChC,YAAY,EAAE,YAAY,EAC1B,QAAQ,EAAE,qBAAqB,EAC/B,KAAK,EAAE,IAAI,EAAE,GACZ,OAAO,CAAC,OAAO,CAAC;cAIH,cAAc,CAC5B,YAAY,EAAE,YAAY,EAC1B,QAAQ,EAAE,qBAAqB,EAC/B,KAAK,EAAE,IAAI,EAAE,GACZ,OAAO,CAAC,IAAI,CAAC;IA2ChB,OAAO,CAAC,oBAAoB;IAkC5B,OAAO,CAAC,oBAAoB;CA0B7B;AAkSD,OAAO,EAAE,sBAAsB,EAAE,CAAC"}

package/dist/index.cjs.js

@@ -18602,7 +18602,7 @@ class Agent {
         let agentContext = new AgentContext(context, this, agentChain);
         try {
             this.agentContext = agentContext;
-            mcpClient && !mcpClient.isConnected() && (await mcpClient.connect());
+            mcpClient && !mcpClient.isConnected() && (await mcpClient.connect(context.controller.signal));
             return this.runWithContext(agentContext, mcpClient, config.maxReactNum);
         }
         finally {
@@ -18769,7 +18769,7 @@ class Agent {
     async listTools(context, mcpClient, agentNode, mcpParams) {
         try {
             if (!mcpClient.isConnected()) {
-                await mcpClient.connect();
+                await mcpClient.connect(context.controller.signal);
             }
             let list = await mcpClient.listTools({
                 taskId: context.taskId,
@@ -18779,7 +18779,7 @@ class Agent {
                 params: {},
                 prompt: agentNode?.task || context.chain.taskPrompt,
                 ...(mcpParams || {}),
-            });
+            }, context.controller.signal);
             let mcpTools = [];
             for (let i = 0; i < list.length; i++) {
                 let toolSchema = list[i];
@@ -18811,7 +18811,7 @@ class Agent {
                         environment: config.platform,
                         agent_name: agentContext.agent.Name,
                     },
-                });
+                }, agentContext.context.controller.signal);
             },
         };
     }
@@ -19633,12 +19633,14 @@ class Eko {
 }
 
 class SimpleSseMcpClient {
-    constructor(sseServerUrl, clientName = "EkoMcpClient") {
+    constructor(sseServerUrl, clientName = "EkoMcpClient", headers = {}) {
+        this.protocolVersion = "2024-11-05";
         this.sseUrl = sseServerUrl;
         this.clientName = clientName;
+        this.headers = headers;
         this.requestMap = new Map();
     }
-    async connect() {
+    async connect(signal) {
         Log.info("MCP Client, connecting...", this.sseUrl);
         if (this.sseHandler && this.sseHandler.readyState == 1) {
             this.sseHandler.close && this.sseHandler.close();
@@ -19647,7 +19649,7 @@ class SimpleSseMcpClient {
         this.pingTimer && clearInterval(this.pingTimer);
         this.reconnectTimer && clearTimeout(this.reconnectTimer);
         await new Promise((resolve) => {
-            let timer = setTimeout(resolve, 15000);
+            const timer = setTimeout(resolve, 15000);
             this.sseHandler = {
                 onopen: () => {
                     Log.info("MCP Client, connection successful", this.sseUrl);
@@ -19667,7 +19669,7 @@ class SimpleSseMcpClient {
                     resolve();
                 },
             };
-            connectSse(this.sseUrl, this.sseHandler);
+            connectSse(this.sseUrl, this.sseHandler, this.headers, signal);
         });
         this.pingTimer = setInterval(() => this.ping(), 10000);
     }
@@ -19694,7 +19696,7 @@ class SimpleSseMcpClient {
     }
     async initialize() {
         await this.request("initialize", {
-            protocolVersion: "2024-11-05",
+            protocolVersion: this.protocolVersion,
             capabilities: {
                 tools: {
                     listChanged: true,
@@ -19706,14 +19708,20 @@ class SimpleSseMcpClient {
                 version: "1.0.0",
             },
         });
+        this.request("notifications/initialized", {});
     }
     ping() {
         this.request("ping", {});
     }
-    async request(method, params) {
-        let id = uuidv4();
+    async request(method, params, signal) {
+        const id = uuidv4();
         try {
-            let callback = new Promise((resolve) => {
+            const callback = new Promise((resolve, reject) => {
+                if (signal) {
+                    signal.addEventListener("abort", () => {
+                        reject(new Error("AbortError"));
+                    });
+                }
                 this.requestMap.set(id, resolve);
             });
             Log.debug(`MCP Client, ${method}`, id, params);
@@ -19721,6 +19729,7 @@ class SimpleSseMcpClient {
                 method: "POST",
                 headers: {
                     "Content-Type": "application/json",
+                    ...this.headers,
                 },
                 body: JSON.stringify({
                     jsonrpc: "2.0",
@@ -19730,8 +19739,9 @@ class SimpleSseMcpClient {
                         ...params,
                     },
                 }),
+                signal: signal,
             });
-            let body = await response.text();
+            const body = await response.text();
             if (body == "Accepted") {
                 return await callback;
             }
@@ -19743,20 +19753,20 @@ class SimpleSseMcpClient {
             this.requestMap.delete(id);
         }
     }
-    async listTools(param) {
-        let message = await this.request("tools/list", {
+    async listTools(param, signal) {
+        const message = await this.request("tools/list", {
             ...param,
-        });
+        }, signal);
         if (message.error) {
             Log.error("McpClient listTools error: ", param, message);
             throw new Error("listTools Exception");
         }
         return message.result.tools || [];
     }
-    async callTool(param) {
-        let message = await this.request("tools/call", {
+    async callTool(param, signal) {
+        const message = await this.request("tools/call", {
             ...param,
-        });
+        }, signal);
         if (message.error) {
             Log.error("McpClient callTool error: ", param, message);
             throw new Error("callTool Exception");
@@ -19778,19 +19788,23 @@ class SimpleSseMcpClient {
         this.reconnectTimer = undefined;
     }
 }
-async function connectSse(sseUrl, hander) {
+async function connectSse(sseUrl, hander, headers = {}, _signal) {
     try {
         hander.readyState = 0;
         const controller = new AbortController();
+        const signal = _signal
+            ? AbortSignal.any([controller.signal, _signal])
+            : controller.signal;
         const response = await fetch(sseUrl, {
             method: "GET",
             headers: {
                 "Content-Type": "text/event-stream",
                 "Cache-Control": "no-cache",
+                ...headers,
             },
             body: null,
             keepalive: true,
-            signal: controller.signal,
+            signal: signal,
         });
         const reader = response.body?.getReader();
         hander.close = () => {
@@ -19799,7 +19813,7 @@ async function connectSse(sseUrl, hander) {
             Log.debug("McpClient close abort.", sseUrl);
         };
         let str = "";
-        let decoder = new TextDecoder();
+        const decoder = new TextDecoder();
         hander.readyState = 1;
         hander.onopen();
         while (hander.readyState == 1) {
@@ -19810,10 +19824,10 @@ async function connectSse(sseUrl, hander) {
             const text = decoder.decode(value);
             str += text;
             if (str.indexOf("\n\n") > -1) {
-                let chunks = str.split("\n\n");
+                const chunks = str.split("\n\n");
                 for (let i = 0; i < chunks.length - 1; i++) {
-                    let chunk = chunks[i];
-                    let chunkData = parseChunk(chunk);
+                    const chunk = chunks[i];
+                    const chunkData = parseChunk(chunk);
                     hander.onmessage(chunkData);
                 }
                 str = chunks[chunks.length - 1];
@@ -19821,7 +19835,7 @@ async function connectSse(sseUrl, hander) {
         }
     }
     catch (e) {
-        if (e?.name !== 'AbortError') {
+        if (e?.name !== "AbortError") {
             Log.error("MCP Client, connectSse error:", e);
             hander.onerror(e);
         }
@@ -19831,10 +19845,10 @@ async function connectSse(sseUrl, hander) {
     }
 }
 function parseChunk(chunk) {
-    let lines = chunk.split("\n");
-    let chunk_obj = {};
+    const lines = chunk.split("\n");
+    const chunk_obj = {};
     for (let j = 0; j < lines.length; j++) {
-        let line = lines[j];
+        const line = lines[j];
         if (line.startsWith("id:")) {
             chunk_obj["id"] = line.substring(3).trim();
         }
@@ -19845,7 +19859,7 @@ function parseChunk(chunk) {
             chunk_obj["data"] = line.substring(5).trim();
         }
         else {
-            let idx = line.indexOf(":");
+            const idx = line.indexOf(":");
             if (idx > -1) {
                 chunk_obj[line.substring(0, idx)] = line.substring(idx + 1).trim();
             }
@@ -19854,6 +19868,166 @@ function parseChunk(chunk) {
     return chunk_obj;
 }
 
+class SimpleHttpMcpClient {
+    constructor(httpUrl, clientName = "EkoMcpClient", headers = {}) {
+        this.protocolVersion = "2025-06-18";
+        this.connected = false;
+        this.httpUrl = httpUrl;
+        this.clientName = clientName;
+        this.headers = headers;
+    }
+    async connect(signal) {
+        Log.info("MCP Client, connecting...", this.httpUrl);
+        await this.request("initialize", {
+            protocolVersion: this.protocolVersion,
+            capabilities: {
+                tools: {
+                    listChanged: true,
+                },
+                sampling: {},
+            },
+            clientInfo: {
+                name: this.clientName,
+                version: "1.0.0",
+            },
+        }, signal);
+        if (this.mcpSessionId) {
+            this.request("notifications/initialized", {}, signal);
+        }
+        this.connected = true;
+    }
+    async listTools(param, signal) {
+        const message = await this.request("tools/list", {
+            ...param,
+        }, signal);
+        if (message.error) {
+            Log.error("McpClient listTools error: ", param, message);
+            throw new Error("listTools Exception");
+        }
+        return message.result.tools || [];
+    }
+    async callTool(param, signal) {
+        const message = await this.request("tools/call", {
+            ...param,
+        }, signal);
+        if (message.error) {
+            Log.error("McpClient callTool error: ", param, message);
+            throw new Error("callTool Exception");
+        }
+        return message.result;
+    }
+    isConnected() {
+        return this.connected;
+    }
+    async close() {
+        this.connected = false;
+        if (this.mcpSessionId) {
+            this.request("notifications/cancelled", {
+                requestId: uuidv4(),
+                reason: "User requested cancellation",
+            });
+        }
+    }
+    async request(method, params, signal) {
+        try {
+            const id = uuidv4();
+            const response = await fetch(this.httpUrl, {
+                method: "POST",
+                headers: {
+                    "Cache-Control": "no-cache",
+                    "Content-Type": "application/json",
+                    "Accept": "application/json, text/event-stream",
+                    "MCP-Protocol-Version": this.protocolVersion,
+                    ...(this.mcpSessionId ? { "Mcp-Session-Id": this.mcpSessionId } : {}),
+                    ...this.headers,
+                },
+                body: JSON.stringify({
+                    jsonrpc: "2.0",
+                    id: id,
+                    method: method,
+                    params: {
+                        ...params,
+                    },
+                }),
+                keepalive: true,
+                signal: signal,
+            });
+            if (method == "initialize") {
+                this.mcpSessionId =
+                    response.headers.get("Mcp-Session-Id") ||
+                        response.headers.get("mcp-session-id");
+            }
+            const contentType = response.headers.get("Content-Type") ||
+                response.headers.get("content-type") ||
+                "application/json";
+            if (contentType?.includes("text/event-stream")) {
+                // SSE
+                const reader = response.body?.getReader();
+                let str = "";
+                let message;
+                const decoder = new TextDecoder();
+                while (true) {
+                    const { value, done } = await reader?.read();
+                    if (done) {
+                        break;
+                    }
+                    const text = decoder.decode(value);
+                    str += text;
+                    if (str.indexOf("\n\n") > -1) {
+                        const chunks = str.split("\n\n");
+                        for (let i = 0; i < chunks.length - 1; i++) {
+                            const chunk = chunks[i];
+                            const chunkData = this.parseChunk(chunk);
+                            if (chunkData.event == "message") {
+                                message = JSON.parse(chunkData.data);
+                                if (message.id == id) {
+                                    return message;
+                                }
+                            }
+                        }
+                        str = chunks[chunks.length - 1];
+                    }
+                }
+                return message;
+            }
+            else {
+                // JSON
+                const message = await response.json();
+                return message;
+            }
+        }
+        catch (e) {
+            if (e?.name !== "AbortError") {
+                Log.error("MCP Client, connectSse error:", e);
+            }
+            throw e;
+        }
+    }
+    parseChunk(chunk) {
+        const lines = chunk.split("\n");
+        const chunk_obj = {};
+        for (let j = 0; j < lines.length; j++) {
+            const line = lines[j];
+            if (line.startsWith("id:")) {
+                chunk_obj["id"] = line.substring(3).trim();
+            }
+            else if (line.startsWith("event:")) {
+                chunk_obj["event"] = line.substring(6).trim();
+            }
+            else if (line.startsWith("data:")) {
+                chunk_obj["data"] = line.substring(5).trim();
+            }
+            else {
+                const idx = line.indexOf(":");
+                if (idx > -1) {
+                    chunk_obj[line.substring(0, idx)] = line.substring(idx + 1).trim();
+                }
+            }
+        }
+        return chunk_obj;
+    }
+}
+
 const AGENT_NAME$3 = "File";
 class BaseFileAgent extends Agent {
     constructor(work_path, llms, ext_tools, mcpClient, planDescription) {
@@ -20560,7 +20734,7 @@ class BaseBrowserAgent extends Agent {
                         agent_name: agentContext.agent.Name,
                         browser_url: agentContext.variables.get("lastUrl"),
                     },
-                });
+                }, agentContext.context.controller.signal);
                 if (result.extInfo &&
                     result.extInfo["javascript"] &&
                     result.content[0].type == "text") {
@@ -21269,6 +21443,7 @@ class BaseBrowserLabelsAgent extends BaseBrowserAgent {
    - If no suitable elements exist, use other functions to complete the task
    - If stuck, try alternative approaches, don't refuse tasks
    - Handle popups/cookies by accepting or closing them
+   - When encountering scenarios that require user assistance such as login, verification codes, QR code scanning, etc., you can request user help
 * BROWSER OPERATION:
    - Use scroll to find elements you are looking for, When extracting content, prioritize using extract_page_content, only scroll when you need to load more content
 * During execution, please output user-friendly step information. Do not output HTML-related element and index information to users, as this would cause user confusion.
@@ -22313,6 +22488,7 @@ exports.HumanInteractTool = HumanInteractTool;
 exports.Log = Log;
 exports.Planner = Planner;
 exports.RetryLanguageModel = RetryLanguageModel;
+exports.SimpleHttpMcpClient = SimpleHttpMcpClient;
 exports.SimpleSseMcpClient = SimpleSseMcpClient;
 exports.TaskNodeStatusTool = TaskNodeStatusTool;
 exports.VariableStorageTool = VariableStorageTool;