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

package/dist/agent/llm.d.ts

@@ -1,11 +1,13 @@
 import { RetryLanguageModel } from "../llm";
 import { AgentContext } from "../core/context";
-import { LLMRequest, StreamCallback, HumanCallback, Tool, ToolResult, DialogueTool } from "../types";
-import { LanguageModelV2FunctionTool, LanguageModelV2Prompt, LanguageModelV2TextPart, LanguageModelV2ToolCallPart, LanguageModelV2ToolChoice, LanguageModelV2ToolResultPart, SharedV2ProviderOptions } from "@ai-sdk/provider";
+import { Tool, LLMRequest, ToolResult, DialogueTool, HumanCallback, StreamCallback } from "../types";
+import { LanguageModelV2Prompt, LanguageModelV2TextPart, SharedV2ProviderOptions, LanguageModelV2ToolChoice, LanguageModelV2ToolCallPart, LanguageModelV2FunctionTool, LanguageModelV2ToolResultPart } from "@ai-sdk/provider";
 export declare function defaultLLMProviderOptions(): SharedV2ProviderOptions;
 export declare function defaultMessageProviderOptions(): SharedV2ProviderOptions;
 export declare function convertTools(tools: Tool[] | DialogueTool[]): LanguageModelV2FunctionTool[];
 export declare function getTool<T extends Tool | DialogueTool>(tools: T[], name: string): T | null;
 export declare function convertToolResult(toolUse: LanguageModelV2ToolCallPart, toolResult: ToolResult, user_messages: LanguageModelV2Prompt): LanguageModelV2ToolResultPart;
 export declare function callAgentLLM(agentContext: AgentContext, rlm: RetryLanguageModel, messages: LanguageModelV2Prompt, tools: LanguageModelV2FunctionTool[], noCompress?: boolean, toolChoice?: LanguageModelV2ToolChoice, retryNum?: number, callback?: StreamCallback & HumanCallback, requestHandler?: (request: LLMRequest) => void): Promise<Array<LanguageModelV2TextPart | LanguageModelV2ToolCallPart>>;
+export declare function estimatePromptTokens(messages: LanguageModelV2Prompt, tools?: LanguageModelV2FunctionTool[]): number;
+export declare function estimateTokens(text: string): number;
 //# sourceMappingURL=llm.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"llm.d.ts","sourceRoot":"","sources":["../../src/agent/llm.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,kBAAkB,EAAE,MAAM,QAAQ,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,OAAO,EACL,UAAU,EAEV,cAAc,EACd,aAAa,EAEb,IAAI,EACJ,UAAU,EACV,YAAY,EACb,MAAM,UAAU,CAAC;AAClB,OAAO,EACL,2BAA2B,EAC3B,qBAAqB,EAErB,uBAAuB,EACvB,2BAA2B,EAC3B,yBAAyB,EAEzB,6BAA6B,EAC7B,uBAAuB,EACxB,MAAM,kBAAkB,CAAC;AAE1B,wBAAgB,yBAAyB,IAAI,uBAAuB,CAanE;AAED,wBAAgB,6BAA6B,IAAI,uBAAuB,CAYvE;AAED,wBAAgB,YAAY,CAC1B,KAAK,EAAE,IAAI,EAAE,GAAG,YAAY,EAAE,GAC7B,2BAA2B,EAAE,CAQ/B;AAED,wBAAgB,OAAO,CAAC,CAAC,SAAS,IAAI,GAAG,YAAY,EACnD,KAAK,EAAE,CAAC,EAAE,EACV,IAAI,EAAE,MAAM,GACX,CAAC,GAAG,IAAI,CAOV;AAED,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,2BAA2B,EACpC,UAAU,EAAE,UAAU,EACtB,aAAa,EAAE,qBAAqB,GACnC,6BAA6B,CA2F/B;AAED,wBAAsB,YAAY,CAChC,YAAY,EAAE,YAAY,EAC1B,GAAG,EAAE,kBAAkB,EACvB,QAAQ,EAAE,qBAAqB,EAC/B,KAAK,EAAE,2BAA2B,EAAE,EACpC,UAAU,CAAC,EAAE,OAAO,EACpB,UAAU,CAAC,EAAE,yBAAyB,EACtC,QAAQ,GAAE,MAAU,EACpB,QAAQ,CAAC,EAAE,cAAc,GAAG,aAAa,EACzC,cAAc,CAAC,EAAE,CAAC,OAAO,EAAE,UAAU,KAAK,IAAI,GAC7C,OAAO,CAAC,KAAK,CAAC,uBAAuB,GAAG,2BAA2B,CAAC,CAAC,CA0VvE"}
+{"version":3,"file":"llm.d.ts","sourceRoot":"","sources":["../../src/agent/llm.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,kBAAkB,EAAE,MAAM,QAAQ,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,OAAO,EACL,IAAI,EACJ,UAAU,EACV,UAAU,EACV,YAAY,EAEZ,aAAa,EACb,cAAc,EAEf,MAAM,UAAU,CAAC;AAClB,OAAO,EACL,qBAAqB,EACrB,uBAAuB,EACvB,uBAAuB,EACvB,yBAAyB,EAEzB,2BAA2B,EAC3B,2BAA2B,EAC3B,6BAA6B,EAE9B,MAAM,kBAAkB,CAAC;AAE1B,wBAAgB,yBAAyB,IAAI,uBAAuB,CAanE;AAED,wBAAgB,6BAA6B,IAAI,uBAAuB,CAYvE;AAED,wBAAgB,YAAY,CAC1B,KAAK,EAAE,IAAI,EAAE,GAAG,YAAY,EAAE,GAC7B,2BAA2B,EAAE,CAQ/B;AAED,wBAAgB,OAAO,CAAC,CAAC,SAAS,IAAI,GAAG,YAAY,EACnD,KAAK,EAAE,CAAC,EAAE,EACV,IAAI,EAAE,MAAM,GACX,CAAC,GAAG,IAAI,CAOV;AAED,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,2BAA2B,EACpC,UAAU,EAAE,UAAU,EACtB,aAAa,EAAE,qBAAqB,GACnC,6BAA6B,CA8F/B;AAED,wBAAsB,YAAY,CAChC,YAAY,EAAE,YAAY,EAC1B,GAAG,EAAE,kBAAkB,EACvB,QAAQ,EAAE,qBAAqB,EAC/B,KAAK,EAAE,2BAA2B,EAAE,EACpC,UAAU,CAAC,EAAE,OAAO,EACpB,UAAU,CAAC,EAAE,yBAAyB,EACtC,QAAQ,GAAE,MAAU,EACpB,QAAQ,CAAC,EAAE,cAAc,GAAG,aAAa,EACzC,cAAc,CAAC,EAAE,CAAC,OAAO,EAAE,UAAU,KAAK,IAAI,GAC7C,OAAO,CAAC,KAAK,CAAC,uBAAuB,GAAG,2BAA2B,CAAC,CAAC,CAgWvE;AAED,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,qBAAqB,EAC/B,KAAK,CAAC,EAAE,2BAA2B,EAAE,UAqDtC;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,UA2C1C"}

package/dist/config/index.d.ts

@@ -6,6 +6,7 @@ type GlobalConfig = {
     maxRetryNum: number;
     agentParallel: boolean;
     compressThreshold: number;
+    compressTokensThreshold: number;
     largeTextLength: number;
     fileTextMaxLength: number;
     maxDialogueImgFileNum: number;

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AAAA,KAAK,YAAY,GAAG;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,SAAS,GAAG,KAAK,GAAG,OAAO,CAAC;IACtC,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,OAAO,CAAC;IACvB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,eAAe,EAAE,MAAM,CAAC;IACxB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,oBAAoB,EAAE,OAAO,CAAC;IAC9B,iBAAiB,EAAE,OAAO,CAAC;IAC3B,UAAU,EAAE,OAAO,CAAC;IACpB,qBAAqB,EAAE,MAAM,CAAC;CAC/B,CAAA;AAED,QAAA,MAAM,MAAM,EAAE,YAeb,CAAC;AAEF,eAAe,MAAM,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AAAA,KAAK,YAAY,GAAG;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,SAAS,GAAG,KAAK,GAAG,OAAO,CAAC;IACtC,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,OAAO,CAAC;IACvB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,uBAAuB,EAAE,MAAM,CAAC;IAChC,eAAe,EAAE,MAAM,CAAC;IACxB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,oBAAoB,EAAE,OAAO,CAAC;IAC9B,iBAAiB,EAAE,OAAO,CAAC;IAC3B,UAAU,EAAE,OAAO,CAAC;IACpB,qBAAqB,EAAE,MAAM,CAAC;CAC/B,CAAA;AAED,QAAA,MAAM,MAAM,EAAE,YAgBb,CAAC;AAEF,eAAe,MAAM,CAAC"}

package/dist/index.cjs.js

@@ -12,6 +12,7 @@ const config$1 = {
     maxRetryNum: 3,
     agentParallel: false,
     compressThreshold: 80,
+    compressTokensThreshold: 100000,
     largeTextLength: 5000,
     fileTextMaxLength: 20000,
     maxDialogueImgFileNum: 1,
@@ -31604,7 +31605,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",
@@ -31694,7 +31696,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) {
@@ -31964,6 +31968,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;
@@ -31980,6 +31987,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)
@@ -34160,7 +34261,10 @@ class SimpleSseMcpClient {
                 version: "1.0.0",
             },
         });
-        // this.request("notifications/initialized", {});
+        try {
+            await this.request("notifications/initialized", {});
+        }
+        catch (ignored) { }
     }
     ping() {
         this.request("ping", {});
@@ -34178,7 +34282,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) {
@@ -34188,7 +34292,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, {
@@ -34235,7 +34339,7 @@ class SimpleSseMcpClient {
             }
         }
         finally {
-            this.requestMap.delete(id);
+            id && this.requestMap.delete(id);
         }
     }
     isConnected() {
@@ -34245,6 +34349,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();
@@ -34357,6 +34468,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) {
@@ -34377,16 +34494,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;
@@ -35332,6 +35452,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