@eko-ai/eko 1.3.2 → 1.3.4

package/dist/core/eko.d.ts

@@ -14,6 +14,7 @@ export declare class Eko {
     workflow?: Workflow;
     constructor(llmConfig: LLMConfig, ekoConfig?: EkoConfig);
     static getLogger(): Logger<ILogObj>;
+    getLoggerInstaceUUID(): string;
     private buildEkoConfig;
     private registerTools;
     generate(prompt: string, tabs?: chrome.tabs.Tab[], param?: EkoInvokeParam): Promise<Workflow>;

package/dist/extension/tools/tab_management.d.ts

@@ -8,12 +8,6 @@ export declare class TabManagement implements Tool<TabManagementParam, TabManage
     description: string;
     input_schema: InputSchema;
     constructor();
-    /**
-     * Tab management
-     *
-     * @param {*} params { command: `new_tab [url]` | 'tab_all' | 'current_tab' | 'go_back' | 'close_tab' | 'switch_tab [tabId]'  }
-     * @returns > { result, success: true }
-     */
     execute(context: ExecutionContext, params: TabManagementParam): Promise<TabManagementResult>;
     destroy(context: ExecutionContext): void;
 }

package/dist/extension.cjs.js

@@ -600,9 +600,31 @@ class Logger extends BaseLogger {
 }
 
 function transportFormatted(logMetaMarkup, logArgs, logErrors, settings) {
-    const logErrorsStr = (logErrors.length > 0 && logArgs.length > 0 ? "\n" : "") + logErrors.join("\n");
     settings.prettyInspectOptions.colors = settings.stylePrettyLogs;
-    console.log(logMetaMarkup, ...logArgs, logErrorsStr);
+    const logLevel = logMetaMarkup.trim().split(" ")[2];
+    let logFunc;
+    switch (logLevel) {
+        case "WARN":
+            logFunc = console.warn;
+            break;
+        case "ERROR":
+        case "FATAL":
+            logFunc = console.error;
+            break;
+        case "INFO":
+            logFunc = console.info;
+            break;
+        case "DEBUG":
+        case "TRACE":
+        case "SILLY":
+        default:
+            logFunc = console.debug;
+            break;
+    }
+    logFunc(logMetaMarkup, ...logArgs);
+    logErrors.forEach(err => {
+        console.error(logMetaMarkup + err);
+    });
 }
 function formatMeta(logObjMeta) {
     if (!logObjMeta) {
@@ -663,51 +685,34 @@ async function getWindowId(context) {
     return windowId;
 }
 async function getTabId(context) {
-    logger.debug("debug the getTabId()...");
-    let tabId = context.variables.get('tabId');
-    if (tabId) {
-        try {
-            await context.ekoConfig.chromeProxy.tabs.get(tabId);
-        }
-        catch (e) {
-            tabId = null;
-            context.variables.delete('tabId');
-        }
-    }
-    if (!tabId) {
-        logger.debug("tabId is empty");
-        let windowId = await getWindowId(context);
-        logger.debug(`windowId=${windowId}`);
-        if (windowId) {
-            try {
-                tabId = await getCurrentTabId(context.ekoConfig.chromeProxy, windowId);
-                logger.debug("getCurrentTabId(context.ekoConfig.chromeProxy, windowId) returns " + tabId);
-            }
-            catch (e) {
-                tabId = await getCurrentTabId(context.ekoConfig.chromeProxy);
-                logger.debug("getCurrentTabId(context.ekoConfig.chromeProxy, windowId) throws an error");
-                logger.debug("getCurrentTabId(context.ekoConfig.chromeProxy) returns " + tabId);
-                context.variables.delete('windowId');
-            }
+    logger.debug("getTabId()...");
+    let tabs = await context.ekoConfig.chromeProxy.tabs.query({});
+    logger.debug("all tabs:", tabs);
+    const filtered = tabs.filter((tab) => tab.title && tab.url);
+    logger.debug("filtered:", filtered);
+    if (filtered.length > 0) {
+        if (typeof filtered[0].activeTime != "undefined") {
+            const sorted = filtered.sort((a, b) => parseInt(b.activeTime) - parseInt(a.activeTime));
+            logger.debug("sorted tabs:", sorted);
+            const tabId = sorted[0].id;
+            logger.debug("tabId:", tabId);
+            return tabId;
         }
         else {
-            tabId = await getCurrentTabId(context.ekoConfig.chromeProxy);
-            logger.debug("getCurrentTabId(context.ekoConfig.chromeProxy) #2 returns " + tabId);
-        }
-        logger.debug("tabId:", tabId);
-        if (!tabId) {
-            const fellouTabId = window.__FELLOU_TAB_ID__;
-            if (fellouTabId) {
-                tabId = fellouTabId;
+            tabs = await context.ekoConfig.chromeProxy.tabs.query({ active: true, currentWindow: true });
+            if (tabs.length > 0) {
+                const tabId = tabs[0].id;
+                logger.debug("tabId:", tabId);
+                return tabId;
             }
             else {
-                throw new Error('Could not find a valid tab');
+                throw Error("no active tab found");
             }
         }
-        context.variables.set('tabId', tabId);
     }
-    logger.debug(`debug the getTabId()...returns ${tabId}`);
-    return tabId;
+    else {
+        throw Error("no tab found");
+    }
 }
 function getCurrentTabId(chromeProxy, windowId) {
     return new Promise((resolve, reject) => {
@@ -1955,65 +1960,31 @@ class TabManagement {
                     type: 'string',
                     description: `The command to perform. The available commands are:
 * \`tab_all\`: View all tabs and return the tabId and title.
-* \`current_tab\`: Get current tab information (tabId, url, title).
 * \`go_back\`: Go back to the previous page in the current tab.
-* \`close_tab\`: Close the current tab.`,
-                    enum: ['tab_all', 'current_tab', 'go_back', 'close_tab'],
+* \`switch_tab\`: Switch to the specified tab by tabId.`,
+                    enum: ['tab_all', 'go_back', 'switch_tab'],
+                },
+                tabId: {
+                    type: 'integer',
+                    description: "Tab id. Only needed when using 'switch_tab'",
                 },
             },
             required: ['command'],
         };
     }
-    /**
-     * Tab management
-     *
-     * @param {*} params { command: `new_tab [url]` | 'tab_all' | 'current_tab' | 'go_back' | 'close_tab' | 'switch_tab [tabId]'  }
-     * @returns > { result, success: true }
-     */
     async execute(context, params) {
         if (params === null || !params.command) {
             throw new Error('Invalid parameters. Expected an object with a "command" property.');
         }
-        let windowId = await getWindowId(context);
-        let command = params.command.trim();
-        if (command.startsWith('`')) {
-            command = command.substring(1);
-        }
-        if (command.endsWith('`')) {
-            command = command.substring(0, command.length - 1);
-        }
-        let result;
-        if (command == 'tab_all') {
-            result = [];
-            let tabs = await context.ekoConfig.chromeProxy.tabs.query({ windowId: windowId });
-            for (let i = 0; i < tabs.length; i++) {
-                let tab = tabs[i];
-                let tabInfo = {
-                    tabId: tab.id,
-                    windowId: tab.windowId,
-                    title: tab.title,
-                    url: tab.url,
-                };
-                if (tab.active) {
-                    tabInfo.active = true;
-                }
-                result.push(tabInfo);
-            }
-        }
-        else if (command == 'current_tab') {
-            let tabId = await getTabId(context);
-            let tab = await context.ekoConfig.chromeProxy.tabs.get(tabId);
-            let tabInfo = { tabId, windowId: tab.windowId, title: tab.title, url: tab.url };
-            result = tabInfo;
-        }
-        else if (command == 'go_back') {
+        if (params.command == 'tab_all') ;
+        else if (params.command == 'go_back') {
             let tabId = await getTabId(context);
             await context.ekoConfig.chromeProxy.tabs.goBack(tabId);
-            let tab = await context.ekoConfig.chromeProxy.tabs.get(tabId);
-            let tabInfo = { tabId, windowId: tab.windowId, title: tab.title, url: tab.url };
-            result = tabInfo;
         }
-        else if (command == 'close_tab') {
+        else if (params.command == "switch_tab") {
+            await context.ekoConfig.chromeProxy.tabs.select(params.tabId);
+        }
+        else if (params.command == 'close_tab') {
             let closedTabId = await getTabId(context);
             await context.ekoConfig.chromeProxy.tabs.remove(closedTabId);
             await sleep(100);
@@ -2025,16 +1996,28 @@ class TabManagement {
             if (!tab.active) {
                 await context.ekoConfig.chromeProxy.tabs.update(tab.id, { active: true });
             }
-            let newTabId = tab.id;
             context.variables.set('tabId', tab.id);
             context.variables.set('windowId', tab.windowId);
-            let closeTabInfo = { closedTabId, newTabId, newTabTitle: tab.title };
-            result = closeTabInfo;
         }
         else {
-            throw Error('Unknown command: ' + command);
+            throw Error('Unknown command: ' + params.command);
+        }
+        // build return value
+        let tabs = await context.ekoConfig.chromeProxy.tabs.query({});
+        tabs = tabs.filter((tab) => tab.title && tab.url);
+        if (tabs.length > 0) {
+            let result = "After operation, the existing tabs are as follows:\n";
+            for (const tab of tabs) {
+                result += `<tab><id>${tab.id}</id><title>${tab.title}</title><url>${tab.url}</url></tab>\n`;
+            }
+            let currentTabId = await getTabId(context);
+            let currentTab = await context.ekoConfig.chromeProxy.tabs.get(currentTabId);
+            result += `The current active tab: <tab><id>${currentTab.id}</id><title>${currentTab.title}</title><url>${currentTab.url}</url></tab>`;
+            return result;
+        }
+        else {
+            return "No existing tab. Use 'open_url' to open a new tab";
         }
-        return result;
     }
     destroy(context) {
         let windowIds = context.variables.get('windowIds');

package/dist/extension.esm.js

@@ -598,9 +598,31 @@ class Logger extends BaseLogger {
 }
 
 function transportFormatted(logMetaMarkup, logArgs, logErrors, settings) {
-    const logErrorsStr = (logErrors.length > 0 && logArgs.length > 0 ? "\n" : "") + logErrors.join("\n");
     settings.prettyInspectOptions.colors = settings.stylePrettyLogs;
-    console.log(logMetaMarkup, ...logArgs, logErrorsStr);
+    const logLevel = logMetaMarkup.trim().split(" ")[2];
+    let logFunc;
+    switch (logLevel) {
+        case "WARN":
+            logFunc = console.warn;
+            break;
+        case "ERROR":
+        case "FATAL":
+            logFunc = console.error;
+            break;
+        case "INFO":
+            logFunc = console.info;
+            break;
+        case "DEBUG":
+        case "TRACE":
+        case "SILLY":
+        default:
+            logFunc = console.debug;
+            break;
+    }
+    logFunc(logMetaMarkup, ...logArgs);
+    logErrors.forEach(err => {
+        console.error(logMetaMarkup + err);
+    });
 }
 function formatMeta(logObjMeta) {
     if (!logObjMeta) {
@@ -661,51 +683,34 @@ async function getWindowId(context) {
     return windowId;
 }
 async function getTabId(context) {
-    logger.debug("debug the getTabId()...");
-    let tabId = context.variables.get('tabId');
-    if (tabId) {
-        try {
-            await context.ekoConfig.chromeProxy.tabs.get(tabId);
-        }
-        catch (e) {
-            tabId = null;
-            context.variables.delete('tabId');
-        }
-    }
-    if (!tabId) {
-        logger.debug("tabId is empty");
-        let windowId = await getWindowId(context);
-        logger.debug(`windowId=${windowId}`);
-        if (windowId) {
-            try {
-                tabId = await getCurrentTabId(context.ekoConfig.chromeProxy, windowId);
-                logger.debug("getCurrentTabId(context.ekoConfig.chromeProxy, windowId) returns " + tabId);
-            }
-            catch (e) {
-                tabId = await getCurrentTabId(context.ekoConfig.chromeProxy);
-                logger.debug("getCurrentTabId(context.ekoConfig.chromeProxy, windowId) throws an error");
-                logger.debug("getCurrentTabId(context.ekoConfig.chromeProxy) returns " + tabId);
-                context.variables.delete('windowId');
-            }
+    logger.debug("getTabId()...");
+    let tabs = await context.ekoConfig.chromeProxy.tabs.query({});
+    logger.debug("all tabs:", tabs);
+    const filtered = tabs.filter((tab) => tab.title && tab.url);
+    logger.debug("filtered:", filtered);
+    if (filtered.length > 0) {
+        if (typeof filtered[0].activeTime != "undefined") {
+            const sorted = filtered.sort((a, b) => parseInt(b.activeTime) - parseInt(a.activeTime));
+            logger.debug("sorted tabs:", sorted);
+            const tabId = sorted[0].id;
+            logger.debug("tabId:", tabId);
+            return tabId;
         }
         else {
-            tabId = await getCurrentTabId(context.ekoConfig.chromeProxy);
-            logger.debug("getCurrentTabId(context.ekoConfig.chromeProxy) #2 returns " + tabId);
-        }
-        logger.debug("tabId:", tabId);
-        if (!tabId) {
-            const fellouTabId = window.__FELLOU_TAB_ID__;
-            if (fellouTabId) {
-                tabId = fellouTabId;
+            tabs = await context.ekoConfig.chromeProxy.tabs.query({ active: true, currentWindow: true });
+            if (tabs.length > 0) {
+                const tabId = tabs[0].id;
+                logger.debug("tabId:", tabId);
+                return tabId;
             }
             else {
-                throw new Error('Could not find a valid tab');
+                throw Error("no active tab found");
             }
         }
-        context.variables.set('tabId', tabId);
     }
-    logger.debug(`debug the getTabId()...returns ${tabId}`);
-    return tabId;
+    else {
+        throw Error("no tab found");
+    }
 }
 function getCurrentTabId(chromeProxy, windowId) {
     return new Promise((resolve, reject) => {
@@ -1953,65 +1958,31 @@ class TabManagement {
                     type: 'string',
                     description: `The command to perform. The available commands are:
 * \`tab_all\`: View all tabs and return the tabId and title.
-* \`current_tab\`: Get current tab information (tabId, url, title).
 * \`go_back\`: Go back to the previous page in the current tab.
-* \`close_tab\`: Close the current tab.`,
-                    enum: ['tab_all', 'current_tab', 'go_back', 'close_tab'],
+* \`switch_tab\`: Switch to the specified tab by tabId.`,
+                    enum: ['tab_all', 'go_back', 'switch_tab'],
+                },
+                tabId: {
+                    type: 'integer',
+                    description: "Tab id. Only needed when using 'switch_tab'",
                 },
             },
             required: ['command'],
         };
     }
-    /**
-     * Tab management
-     *
-     * @param {*} params { command: `new_tab [url]` | 'tab_all' | 'current_tab' | 'go_back' | 'close_tab' | 'switch_tab [tabId]'  }
-     * @returns > { result, success: true }
-     */
     async execute(context, params) {
         if (params === null || !params.command) {
             throw new Error('Invalid parameters. Expected an object with a "command" property.');
         }
-        let windowId = await getWindowId(context);
-        let command = params.command.trim();
-        if (command.startsWith('`')) {
-            command = command.substring(1);
-        }
-        if (command.endsWith('`')) {
-            command = command.substring(0, command.length - 1);
-        }
-        let result;
-        if (command == 'tab_all') {
-            result = [];
-            let tabs = await context.ekoConfig.chromeProxy.tabs.query({ windowId: windowId });
-            for (let i = 0; i < tabs.length; i++) {
-                let tab = tabs[i];
-                let tabInfo = {
-                    tabId: tab.id,
-                    windowId: tab.windowId,
-                    title: tab.title,
-                    url: tab.url,
-                };
-                if (tab.active) {
-                    tabInfo.active = true;
-                }
-                result.push(tabInfo);
-            }
-        }
-        else if (command == 'current_tab') {
-            let tabId = await getTabId(context);
-            let tab = await context.ekoConfig.chromeProxy.tabs.get(tabId);
-            let tabInfo = { tabId, windowId: tab.windowId, title: tab.title, url: tab.url };
-            result = tabInfo;
-        }
-        else if (command == 'go_back') {
+        if (params.command == 'tab_all') ;
+        else if (params.command == 'go_back') {
             let tabId = await getTabId(context);
             await context.ekoConfig.chromeProxy.tabs.goBack(tabId);
-            let tab = await context.ekoConfig.chromeProxy.tabs.get(tabId);
-            let tabInfo = { tabId, windowId: tab.windowId, title: tab.title, url: tab.url };
-            result = tabInfo;
         }
-        else if (command == 'close_tab') {
+        else if (params.command == "switch_tab") {
+            await context.ekoConfig.chromeProxy.tabs.select(params.tabId);
+        }
+        else if (params.command == 'close_tab') {
             let closedTabId = await getTabId(context);
             await context.ekoConfig.chromeProxy.tabs.remove(closedTabId);
             await sleep(100);
@@ -2023,16 +1994,28 @@ class TabManagement {
             if (!tab.active) {
                 await context.ekoConfig.chromeProxy.tabs.update(tab.id, { active: true });
             }
-            let newTabId = tab.id;
             context.variables.set('tabId', tab.id);
             context.variables.set('windowId', tab.windowId);
-            let closeTabInfo = { closedTabId, newTabId, newTabTitle: tab.title };
-            result = closeTabInfo;
         }
         else {
-            throw Error('Unknown command: ' + command);
+            throw Error('Unknown command: ' + params.command);
+        }
+        // build return value
+        let tabs = await context.ekoConfig.chromeProxy.tabs.query({});
+        tabs = tabs.filter((tab) => tab.title && tab.url);
+        if (tabs.length > 0) {
+            let result = "After operation, the existing tabs are as follows:\n";
+            for (const tab of tabs) {
+                result += `<tab><id>${tab.id}</id><title>${tab.title}</title><url>${tab.url}</url></tab>\n`;
+            }
+            let currentTabId = await getTabId(context);
+            let currentTab = await context.ekoConfig.chromeProxy.tabs.get(currentTabId);
+            result += `The current active tab: <tab><id>${currentTab.id}</id><title>${currentTab.title}</title><url>${currentTab.url}</url></tab>`;
+            return result;
+        }
+        else {
+            return "No existing tab. Use 'open_url' to open a new tab";
         }
-        return result;
     }
     destroy(context) {
         let windowIds = context.variables.get('windowIds');

package/dist/extension_content_script.js

@@ -598,9 +598,31 @@ class Logger extends BaseLogger {
 }
 
 function transportFormatted(logMetaMarkup, logArgs, logErrors, settings) {
-    const logErrorsStr = (logErrors.length > 0 && logArgs.length > 0 ? "\n" : "") + logErrors.join("\n");
     settings.prettyInspectOptions.colors = settings.stylePrettyLogs;
-    console.log(logMetaMarkup, ...logArgs, logErrorsStr);
+    const logLevel = logMetaMarkup.trim().split(" ")[2];
+    let logFunc;
+    switch (logLevel) {
+        case "WARN":
+            logFunc = console.warn;
+            break;
+        case "ERROR":
+        case "FATAL":
+            logFunc = console.error;
+            break;
+        case "INFO":
+            logFunc = console.info;
+            break;
+        case "DEBUG":
+        case "TRACE":
+        case "SILLY":
+        default:
+            logFunc = console.debug;
+            break;
+    }
+    logFunc(logMetaMarkup, ...logArgs);
+    logErrors.forEach(err => {
+        console.error(logMetaMarkup + err);
+    });
 }
 function formatMeta(logObjMeta) {
     if (!logObjMeta) {