@eko-ai/eko 3.0.7 → 3.0.8-alpha.2

package/dist/index.esm.js

@@ -6,6 +6,7 @@ const config$1 = {
     maxRetryNum: 3,
     agentParallel: false,
     compressThreshold: 80,
+    compressTokensThreshold: 100000,
     largeTextLength: 5000,
     fileTextMaxLength: 20000,
     maxDialogueImgFileNum: 1,
@@ -31569,7 +31570,8 @@ function convertToolResult(toolUse, toolResult, user_messages) {
             value: "Error",
         };
     }
-    else if (toolResult.content.length == 1 && toolResult.content[0].type == "text") {
+    else if (toolResult.content.length == 1 &&
+        toolResult.content[0].type == "text") {
         let text = toolResult.content[0].text;
         result = {
             type: "text",
@@ -31659,7 +31661,9 @@ function convertToolResult(toolUse, toolResult, user_messages) {
 }
 async function callAgentLLM(agentContext, rlm, messages, tools, noCompress, toolChoice, retryNum = 0, callback, requestHandler) {
     await agentContext.context.checkAborted();
-    if (messages.length >= config$1.compressThreshold && !noCompress) {
+    if (!noCompress &&
+        (messages.length >= config$1.compressThreshold || (messages.length >= 10 && estimatePromptTokens(messages, tools) >= config$1.compressTokensThreshold))) {
+        // Compress messages
         await compressAgentMessages(agentContext, rlm, messages, tools);
     }
     if (!toolChoice) {
@@ -31929,6 +31933,9 @@ async function callAgentLLM(agentContext, rlm, messages, tools, noCompress, tool
         await context.checkAborted();
         if (retryNum < config$1.maxRetryNum) {
             await sleep(300 * (retryNum + 1) * (retryNum + 1));
+            if ((e + "").indexOf("is too long") > -1) {
+                await compressAgentMessages(agentContext, rlm, messages, tools);
+            }
             return callAgentLLM(agentContext, rlm, messages, tools, noCompress, toolChoice, ++retryNum, streamCallback);
         }
         throw e;
@@ -31945,6 +31952,100 @@ async function callAgentLLM(agentContext, rlm, messages, tools, noCompress, tool
         ]
         : toolParts;
 }
+function estimatePromptTokens(messages, tools) {
+    let tokens = messages.reduce((total, message) => {
+        if (message.role == "system") {
+            return total + estimateTokens(message.content);
+        }
+        else if (message.role == "user") {
+            return (total +
+                estimateTokens(message.content
+                    .filter((part) => part.type == "text")
+                    .map((part) => part.text)
+                    .join("\n")));
+        }
+        else if (message.role == "assistant") {
+            return (total +
+                estimateTokens(message.content
+                    .map((part) => {
+                    if (part.type == "text") {
+                        return part.text;
+                    }
+                    else if (part.type == "reasoning") {
+                        return part.text;
+                    }
+                    else if (part.type == "tool-call") {
+                        return part.toolName + JSON.stringify(part.input || {});
+                    }
+                    else if (part.type == "tool-result") {
+                        return part.toolName + JSON.stringify(part.output || {});
+                    }
+                    return "";
+                })
+                    .join("")));
+        }
+        else if (message.role == "tool") {
+            return (total +
+                estimateTokens(message.content
+                    .map((part) => part.toolName + JSON.stringify(part.output || {}))
+                    .join("")));
+        }
+        return total;
+    }, 0);
+    if (tools) {
+        tokens += tools.reduce((total, tool) => {
+            return total + estimateTokens(JSON.stringify(tool));
+        }, 0);
+    }
+    return tokens;
+}
+function estimateTokens(text) {
+    if (!text) {
+        return 0;
+    }
+    let tokenCount = 0;
+    for (let i = 0; i < text.length; i++) {
+        const char = text[i];
+        const code = char.charCodeAt(0);
+        if ((code >= 0x4e00 && code <= 0x9fff) ||
+            (code >= 0x3400 && code <= 0x4dbf) ||
+            (code >= 0x3040 && code <= 0x309f) ||
+            (code >= 0x30a0 && code <= 0x30ff) ||
+            (code >= 0xac00 && code <= 0xd7af)) {
+            tokenCount += 2;
+        }
+        else if (/\s/.test(char)) {
+            continue;
+        }
+        else if (/[a-zA-Z]/.test(char)) {
+            let word = "";
+            while (i < text.length && /[a-zA-Z]/.test(text[i])) {
+                word += text[i];
+                i++;
+            }
+            i--;
+            if (word.length <= 4) {
+                tokenCount += 1;
+            }
+            else {
+                tokenCount += Math.ceil(word.length / 4);
+            }
+        }
+        else if (/\d/.test(char)) {
+            let number = "";
+            while (i < text.length && /\d/.test(text[i])) {
+                number += text[i];
+                i++;
+            }
+            i--;
+            tokenCount += Math.max(1, Math.ceil(number.length / 3));
+        }
+        else {
+            tokenCount += 1;
+        }
+    }
+    return Math.max(1, tokenCount);
+}
 function appendUserConversation(agentContext, messages) {
     const userPrompts = agentContext.context.conversation
         .splice(0, agentContext.context.conversation.length)
@@ -34125,7 +34226,10 @@ class SimpleSseMcpClient {
                 version: "1.0.0",
             },
         });
-        // this.request("notifications/initialized", {});
+        try {
+            await this.request("notifications/initialized", {});
+        }
+        catch (ignored) { }
     }
     ping() {
         this.request("ping", {});
@@ -34143,7 +34247,7 @@ class SimpleSseMcpClient {
         return message.result;
     }
     async request(method, params, signal) {
-        const id = uuidv4();
+        const id = method.startsWith("notifications/") ? null : uuidv4();
         try {
             const callback = new Promise((resolve, reject) => {
                 if (signal) {
@@ -34153,7 +34257,7 @@ class SimpleSseMcpClient {
                         reject(error);
                     });
                 }
-                this.requestMap.set(id, resolve);
+                id && this.requestMap.set(id, resolve);
             });
             Log.debug(`MCP Client, ${method}`, id, params);
             const response = await fetch(this.msgUrl, {
@@ -34200,7 +34304,7 @@ class SimpleSseMcpClient {
             }
         }
         finally {
-            this.requestMap.delete(id);
+            id && this.requestMap.delete(id);
         }
     }
     isConnected() {
@@ -34210,6 +34314,13 @@ class SimpleSseMcpClient {
         return false;
     }
     async close() {
+        try {
+            await this.request("notifications/cancelled", {
+                requestId: uuidv4(),
+                reason: "User requested cancellation",
+            });
+        }
+        catch (ignored) { }
         this.pingTimer && clearInterval(this.pingTimer);
         this.reconnectTimer && clearTimeout(this.reconnectTimer);
         this.sseHandler && this.sseHandler.close && this.sseHandler.close();
@@ -34322,6 +34433,12 @@ class SimpleHttpMcpClient {
                 version: "1.0.0",
             },
         }, signal);
+        if (this.mcpSessionId) {
+            try {
+                await this.request("notifications/initialized", {});
+            }
+            catch (ignored) { }
+        }
         this.connected = true;
     }
     async listTools(param, signal) {
@@ -34342,16 +34459,19 @@ class SimpleHttpMcpClient {
     async close() {
         this.connected = false;
         if (this.mcpSessionId) {
-            this.request("notifications/cancelled", {
-                requestId: uuidv4(),
-                reason: "User requested cancellation",
-            });
+            try {
+                await this.request("notifications/cancelled", {
+                    requestId: uuidv4(),
+                    reason: "User requested cancellation",
+                });
+            }
+            catch (ignored) { }
             this.mcpSessionId = null;
         }
     }
     async request(method, params, signal) {
         try {
-            const id = uuidv4();
+            const id = method.startsWith("notifications/") ? null : uuidv4();
             const extHeaders = {};
             if (this.mcpSessionId && method !== "initialize") {
                 extHeaders["Mcp-Session-Id"] = this.mcpSessionId;
@@ -35297,6 +35417,7 @@ During the task execution process, you can use the \`${TOOL_NAME$5}\` tool to in
 - When performing dangerous operations such as deleting files, confirmation from humans is required.
 - When encountering obstacles while accessing websites, such as requiring user login, captcha verification, QR code scanning, or human verification, you need to request manual assistance.
 - Please do not use the \`${TOOL_NAME$5}\` tool frequently.
+- The \`${TOOL_NAME$5}\` tool does not support parallel calls.
 `;
 const VARIABLE_PROMPT = `
 * VARIABLE STORAGE