automation_model 1.0.616-dev → 1.0.616-stage

package/lib/stable_browser.js

@@ -10,19 +10,23 @@ import { getDateTimeValue } from "./date_time.js";
 import drawRectangle from "./drawRect.js";
 //import { closeUnexpectedPopups } from "./popups.js";
 import { getTableCells, getTableData } from "./table_analyze.js";
-import { _convertToRegexQuery, _copyContext, _fixLocatorUsingParams, _fixUsingParams, _getServerUrl, extractStepExampleParameters, KEYBOARD_EVENTS, maskValue, replaceWithLocalTestData, scrollPageToLoadLazyElements, unEscapeString, _getDataFile, } from "./utils.js";
+import { _convertToRegexQuery, _copyContext, _fixLocatorUsingParams, _fixUsingParams, _getServerUrl, extractStepExampleParameters, KEYBOARD_EVENTS, maskValue, replaceWithLocalTestData, scrollPageToLoadLazyElements, unEscapeString, _getDataFile, testForRegex, performAction, } from "./utils.js";
 import csv from "csv-parser";
 import { Readable } from "node:stream";
 import readline from "readline";
 import { getContext, refreshBrowser } from "./init_browser.js";
+import { getTestData } from "./auto_page.js";
 import { locate_element } from "./locate_element.js";
 import { randomUUID } from "crypto";
 import { _commandError, _commandFinally, _preCommand, _validateSelectors, _screenshot, _reportToWorld, } from "./command_common.js";
 import { registerDownloadEvent, registerNetworkEvents } from "./network.js";
 import { LocatorLog } from "./locator_log.js";
 import axios from "axios";
+import { _findCellArea, findElementsInArea } from "./table_helper.js";
+import { loadBrunoParams } from "./bruno.js";
 export const Types = {
     CLICK: "click_element",
+    WAIT_ELEMENT: "wait_element",
     NAVIGATE: "navigate",
     FILL: "fill_element",
     EXECUTE: "execute_page_method",
@@ -44,6 +48,7 @@ export const Types = {
     UNCHECK: "uncheck_element",
     EXTRACT: "extract_attribute",
     CLOSE_PAGE: "close_page",
+    TABLE_OPERATION: "table_operation",
     SET_DATE_TIME: "set_date_time",
     SET_VIEWPORT: "set_viewport",
     VERIFY_VISUAL: "verify_visual",
@@ -52,6 +57,9 @@ export const Types = {
     WAIT_FOR_TEXT_TO_DISAPPEAR: "wait_for_text_to_disappear",
     VERIFY_ATTRIBUTE: "verify_element_attribute",
     VERIFY_TEXT_WITH_RELATION: "verify_text_with_relation",
+    BRUNO: "bruno",
+    VERIFY_FILE_EXISTS: "verify_file_exists",
+    SET_INPUT_FILES: "set_input_files",
 };
 export const apps = {};
 const formatElementName = (elementName) => {
@@ -70,6 +78,7 @@ class StableBrowser {
     appName = "main";
     tags = null;
     isRecording = false;
+    initSnapshotTaken = false;
     constructor(browser, page, logger = null, context = null, world = null) {
         this.browser = browser;
         this.page = page;
@@ -176,6 +185,30 @@ class StableBrowser {
             await this.waitForPageLoad();
         }
     }
+    async switchTab(tabTitleOrIndex) {
+        // first check if the tabNameOrIndex is a number
+        let index = parseInt(tabTitleOrIndex);
+        if (!isNaN(index)) {
+            if (index >= 0 && index < this.context.pages.length) {
+                this.page = this.context.pages[index];
+                this.context.page = this.page;
+                await this.page.bringToFront();
+                return;
+            }
+        }
+        // if the tabNameOrIndex is a string, find the tab by name
+        for (let i = 0; i < this.context.pages.length; i++) {
+            let page = this.context.pages[i];
+            let title = await page.title();
+            if (title.includes(tabTitleOrIndex)) {
+                this.page = page;
+                this.context.page = this.page;
+                await this.page.bringToFront();
+                return;
+            }
+        }
+        throw new Error("Tab not found: " + tabTitleOrIndex);
+    }
     registerConsoleLogListener(page, context) {
         if (!this.context.webLogger) {
             this.context.webLogger = [];
@@ -271,7 +304,7 @@ class StableBrowser {
             _commandError(state, error, this);
         }
         finally {
-            _commandFinally(state, this);
+            await _commandFinally(state, this);
         }
     }
     async _getLocator(locator, scope, _params) {
@@ -352,7 +385,7 @@ class StableBrowser {
         return resultCss;
     }
     async _locateElementByText(scope, text1, tag1, regex1 = false, partial1, ignoreCase = true, _params) {
-        const query = _convertToRegexQuery(text1, regex1, !partial1, ignoreCase);
+        const query = `${_convertToRegexQuery(text1, regex1, !partial1, ignoreCase)}`;
         const locator = scope.locator(query);
         const count = await locator.count();
         if (!tag1) {
@@ -372,6 +405,12 @@ class StableBrowser {
                 if (!el.setAttribute) {
                     el = el.parentElement;
                 }
+                // remove any attributes start with data-blinq-id
+                // for (let i = 0; i < el.attributes.length; i++) {
+                //   if (el.attributes[i].name.startsWith("data-blinq-id")) {
+                //     el.removeAttribute(el.attributes[i].name);
+                //   }
+                // }
                 el.setAttribute("data-blinq-id-" + randomToken, "");
                 return true;
             }, [tag1, randomToken]))) {
@@ -558,12 +597,24 @@ class StableBrowser {
                 element.evaluate((el, randomToken) => {
                     el.setAttribute("data-blinq-id-" + randomToken, "");
                 }, randomToken);
-                if (element._frame) {
-                    return element;
-                }
-                const scope = element.page();
-                const newSelector = scope.locator("[data-blinq-id-" + randomToken + "]");
-                return newSelector;
+                // if (element._frame) {
+                //   return element;
+                // }
+                const scope = element._frame ?? element.page();
+                let newElementSelector = "[data-blinq-id-" + randomToken + "]";
+                let prefixSelector = "";
+                const frameControlSelector = " >> internal:control=enter-frame";
+                const frameSelectorIndex = element._selector.lastIndexOf(frameControlSelector);
+                if (frameSelectorIndex !== -1) {
+                    // remove everything after the >> internal:control=enter-frame
+                    const frameSelector = element._selector.substring(0, frameSelectorIndex);
+                    prefixSelector = frameSelector + " >> internal:control=enter-frame >>";
+                }
+                // if (element?._frame?._selector) {
+                //   prefixSelector = element._frame._selector + " >> " + prefixSelector;
+                // }
+                const newSelector = prefixSelector + newElementSelector;
+                return scope.locator(newSelector);
             }
         }
         throw new Error("unable to locate element " + JSON.stringify(selectors));
@@ -715,14 +766,9 @@ class StableBrowser {
                 // info.log += "scanning locators in priority 2" + "\n";
                 result = await this._scanLocatorsGroup(locatorsByPriority["2"], scope, _params, info, visibleOnly, allowDisabled, selectors?.element_name);
             }
-            if (result.foundElements.length === 0 && onlyPriority3) {
+            if (result.foundElements.length === 0 && (onlyPriority3 || !highPriorityOnly)) {
                 result = await this._scanLocatorsGroup(locatorsByPriority["3"], scope, _params, info, visibleOnly, allowDisabled, selectors?.element_name);
             }
-            else {
-                if (result.foundElements.length === 0 && !highPriorityOnly) {
-                    result = await this._scanLocatorsGroup(locatorsByPriority["3"], scope, _params, info, visibleOnly, allowDisabled, selectors?.element_name);
-                }
-            }
             let foundElements = result.foundElements;
             if (foundElements.length === 1 && foundElements[0].unique) {
                 info.box = foundElements[0].box;
@@ -777,6 +823,11 @@ class StableBrowser {
                 visibleOnly = false;
             }
             await new Promise((resolve) => setTimeout(resolve, 1000));
+            // sheck of more of half of the timeout has passed
+            if (Date.now() - startTime > timeout / 2) {
+                highPriorityOnly = false;
+                visibleOnly = false;
+            }
         }
         this.logger.debug("unable to locate unique element, total elements found " + locatorsCount);
         // if (info.locatorLog) {
@@ -823,9 +874,40 @@ class StableBrowser {
                 result.locatorIndex = i;
             }
             if (foundLocators.length > 1) {
-                info.failCause.foundMultiple = true;
-                if (info.locatorLog) {
-                    info.locatorLog.setLocatorSearchStatus(JSON.stringify(locatorsGroup[i]), "FOUND_NOT_UNIQUE");
+                // remove elements that consume the same space with 10 pixels tolerance
+                const boxes = [];
+                for (let j = 0; j < foundLocators.length; j++) {
+                    boxes.push({ box: await foundLocators[j].boundingBox(), locator: foundLocators[j] });
+                }
+                for (let j = 0; j < boxes.length; j++) {
+                    for (let k = 0; k < boxes.length; k++) {
+                        if (j === k) {
+                            continue;
+                        }
+                        // check if x, y, width, height are the same with 10 pixels tolerance
+                        if (Math.abs(boxes[j].box.x - boxes[k].box.x) < 10 &&
+                            Math.abs(boxes[j].box.y - boxes[k].box.y) < 10 &&
+                            Math.abs(boxes[j].box.width - boxes[k].box.width) < 10 &&
+                            Math.abs(boxes[j].box.height - boxes[k].box.height) < 10) {
+                            // as the element is not unique, will remove it
+                            boxes.splice(k, 1);
+                            k--;
+                        }
+                    }
+                }
+                if (boxes.length === 1) {
+                    result.foundElements.push({
+                        locator: boxes[0].locator.first(),
+                        box: boxes[0].box,
+                        unique: true,
+                    });
+                    result.locatorIndex = i;
+                }
+                else {
+                    info.failCause.foundMultiple = true;
+                    if (info.locatorLog) {
+                        info.locatorLog.setLocatorSearchStatus(JSON.stringify(locatorsGroup[i]), "FOUND_NOT_UNIQUE");
+                    }
                 }
             }
         }
@@ -873,7 +955,7 @@ class StableBrowser {
                         await _commandError(state, "timeout looking for " + elementDescription, this);
                     }
                     finally {
-                        _commandFinally(state, this);
+                        await _commandFinally(state, this);
                     }
                 }
             }
@@ -922,7 +1004,7 @@ class StableBrowser {
                         await _commandError(state, "timeout looking for " + elementDescription, this);
                     }
                     finally {
-                        _commandFinally(state, this);
+                        await _commandFinally(state, this);
                     }
                 }
             }
@@ -936,25 +1018,14 @@ class StableBrowser {
             options,
             world,
             text: "Click element",
+            _text: "Click on " + selectors.element_name,
             type: Types.CLICK,
             operation: "click",
             log: "***** click on " + selectors.element_name + " *****\n",
         };
         try {
             await _preCommand(state, this);
-            // if (state.options && state.options.context) {
-            //   state.selectors.locators[0].text = state.options.context;
-            // }
-            try {
-                await state.element.click();
-                // await new Promise((resolve) => setTimeout(resolve, 1000));
-            }
-            catch (e) {
-                // await this.closeUnexpectedPopups();
-                state.element = await this._locate(selectors, state.info, _params);
-                await state.element.dispatchEvent("click");
-                // await new Promise((resolve) => setTimeout(resolve, 1000));
-            }
+            await performAction("click", state.element, options, this, state, _params);
             await this.waitForPageLoad();
             return state.info;
         }
@@ -962,8 +1033,40 @@ class StableBrowser {
             await _commandError(state, e, this);
         }
         finally {
-            _commandFinally(state, this);
+            await _commandFinally(state, this);
+        }
+    }
+    async waitForElement(selectors, _params, options = {}, world = null) {
+        const timeout = this._getFindElementTimeout(options);
+        const state = {
+            selectors,
+            _params,
+            options,
+            world,
+            text: "Wait for element",
+            _text: "Wait for " + selectors.element_name,
+            type: Types.WAIT_ELEMENT,
+            operation: "waitForElement",
+            log: "***** wait for " + selectors.element_name + " *****\n",
+        };
+        let found = false;
+        try {
+            await _preCommand(state, this);
+            // if (state.options && state.options.context) {
+            //   state.selectors.locators[0].text = state.options.context;
+            // }
+            await state.element.waitFor({ timeout: timeout });
+            found = true;
+            // await new Promise((resolve) => setTimeout(resolve, 1000));
+        }
+        catch (e) {
+            console.error("Error on waitForElement", e);
+            // await _commandError(state, e, this);
+        }
+        finally {
+            await _commandFinally(state, this);
         }
+        return found;
     }
     async setCheck(selectors, checked = true, _params, options = {}, world = null) {
         const state = {
@@ -973,6 +1076,7 @@ class StableBrowser {
             world,
             type: checked ? Types.CHECK : Types.UNCHECK,
             text: checked ? `Check element` : `Uncheck element`,
+            _text: checked ? `Check ${selectors.element_name}` : `Uncheck ${selectors.element_name}`,
             operation: "setCheck",
             log: "***** check " + selectors.element_name + " *****\n",
         };
@@ -984,7 +1088,7 @@ class StableBrowser {
             try {
                 // if (world && world.screenshot && !world.screenshotPath) {
                 // console.log(`Highlighting while running from recorder`);
-                await this._highlightElements(element);
+                await this._highlightElements(state.element);
                 await state.element.setChecked(checked);
                 await new Promise((resolve) => setTimeout(resolve, 1000));
                 // await this._unHighlightElements(element);
@@ -1011,7 +1115,7 @@ class StableBrowser {
             await _commandError(state, e, this);
         }
         finally {
-            _commandFinally(state, this);
+            await _commandFinally(state, this);
         }
     }
     async hover(selectors, _params, options = {}, world = null) {
@@ -1022,24 +1126,13 @@ class StableBrowser {
             world,
             type: Types.HOVER,
             text: `Hover element`,
+            _text: `Hover on ${selectors.element_name}`,
             operation: "hover",
             log: "***** hover " + selectors.element_name + " *****\n",
         };
         try {
             await _preCommand(state, this);
-            try {
-                await state.element.hover();
-                // await _screenshot(state, this);
-                await new Promise((resolve) => setTimeout(resolve, 1000));
-            }
-            catch (e) {
-                //await this.closeUnexpectedPopups();
-                state.info.log += "hover failed, will try again" + "\n";
-                state.element = await this._locate(selectors, state.info, _params);
-                await state.element.hover({ timeout: 10000 });
-                // await _screenshot(state, this);
-                await new Promise((resolve) => setTimeout(resolve, 1000));
-            }
+            await performAction("hover", state.element, options, this, state, _params);
             await _screenshot(state, this);
             await this.waitForPageLoad();
             return state.info;
@@ -1048,7 +1141,7 @@ class StableBrowser {
             await _commandError(state, e, this);
         }
         finally {
-            _commandFinally(state, this);
+            await _commandFinally(state, this);
         }
     }
     async selectOption(selectors, values, _params = null, options = {}, world = null) {
@@ -1063,6 +1156,7 @@ class StableBrowser {
             value: values.toString(),
             type: Types.SELECT,
             text: `Select option: ${values}`,
+            _text: `Select option: ${values} on ${selectors.element_name}`,
             operation: "selectOption",
             log: "***** select option " + selectors.element_name + " *****\n",
         };
@@ -1083,7 +1177,7 @@ class StableBrowser {
             await _commandError(state, e, this);
         }
         finally {
-            _commandFinally(state, this);
+            await _commandFinally(state, this);
         }
     }
     async type(_value, _params = null, options = {}, world = null) {
@@ -1097,6 +1191,7 @@ class StableBrowser {
             highlight: false,
             type: Types.TYPE_PRESS,
             text: `Type value: ${_value}`,
+            _text: `Type value: ${_value}`,
             operation: "type",
             log: "",
         };
@@ -1128,7 +1223,7 @@ class StableBrowser {
             await _commandError(state, e, this);
         }
         finally {
-            _commandFinally(state, this);
+            await _commandFinally(state, this);
         }
     }
     async setInputValue(selectors, value, _params = null, options = {}, world = null) {
@@ -1164,7 +1259,7 @@ class StableBrowser {
             await _commandError(state, e, this);
         }
         finally {
-            _commandFinally(state, this);
+            await _commandFinally(state, this);
         }
     }
     async setDateTime(selectors, value, format = null, enter = false, _params = null, options = {}, world = null) {
@@ -1176,6 +1271,7 @@ class StableBrowser {
             world,
             type: Types.SET_DATE_TIME,
             text: `Set date time value: ${value}`,
+            _text: `Set date time value: ${value} on ${selectors.element_name}`,
             operation: "setDateTime",
             log: "***** set date time value " + selectors.element_name + " *****\n",
             throwError: false,
@@ -1183,7 +1279,7 @@ class StableBrowser {
         try {
             await _preCommand(state, this);
             try {
-                await state.element.click();
+                await performAction("click", state.element, options, this, state, _params);
                 await new Promise((resolve) => setTimeout(resolve, 500));
                 if (format) {
                     state.value = dayjs(state.value).format(format);
@@ -1232,7 +1328,7 @@ class StableBrowser {
             await _commandError(state, e, this);
         }
         finally {
-            _commandFinally(state, this);
+            await _commandFinally(state, this);
         }
     }
     async clickType(selectors, _value, enter = false, _params = null, options = {}, world = null) {
@@ -1247,9 +1343,13 @@ class StableBrowser {
             world,
             type: Types.FILL,
             text: `Click type input with value: ${_value}`,
+            _text: "Fill " + selectors.element_name + " with value " + maskValue(_value),
             operation: "clickType",
             log: "***** clickType on " + selectors.element_name + " with value " + maskValue(_value) + "*****\n",
         };
+        if (!options) {
+            options = {};
+        }
         if (newValue !== _value) {
             //this.logger.info(_value + "=" + newValue);
             _value = newValue;
@@ -1257,7 +1357,7 @@ class StableBrowser {
         try {
             await _preCommand(state, this);
             state.info.value = _value;
-            if (options === null || options === undefined || !options.press) {
+            if (!options.press) {
                 try {
                     let currentValue = await state.element.inputValue();
                     if (currentValue) {
@@ -1268,13 +1368,9 @@ class StableBrowser {
                     this.logger.info("unable to clear input value");
                 }
             }
-            if (options === null || options === undefined || options.press) {
-                try {
-                    await state.element.click({ timeout: 5000 });
-                }
-                catch (e) {
-                    await state.element.dispatchEvent("click");
-                }
+            if (options.press) {
+                options.timeout = 5000;
+                await performAction("click", state.element, options, this, state, _params);
             }
             else {
                 try {
@@ -1332,7 +1428,7 @@ class StableBrowser {
             await _commandError(state, e, this);
         }
         finally {
-            _commandFinally(state, this);
+            await _commandFinally(state, this);
         }
     }
     async fill(selectors, value, enter = false, _params = null, options = {}, world = null) {
@@ -1362,13 +1458,49 @@ class StableBrowser {
             await _commandError(state, e, this);
         }
         finally {
-            _commandFinally(state, this);
+            await _commandFinally(state, this);
+        }
+    }
+    async setInputFiles(selectors, files, _params = null, options = {}, world = null) {
+        const state = {
+            selectors,
+            _params,
+            files,
+            value: '"' + files.join('", "') + '"',
+            options,
+            world,
+            type: Types.SET_INPUT_FILES,
+            text: `Set input files`,
+            _text: `Set input files on ${selectors.element_name}`,
+            operation: "setInputFiles",
+            log: "***** set input files " + selectors.element_name + " *****\n",
+        };
+        const uploadsFolder = this.configuration.uploadsFolder ?? "data/uploads";
+        try {
+            await _preCommand(state, this);
+            for (let i = 0; i < files.length; i++) {
+                const file = files[i];
+                const filePath = path.join(uploadsFolder, file);
+                if (!fs.existsSync(filePath)) {
+                    throw new Error(`File not found: ${filePath}`);
+                }
+                state.files[i] = filePath;
+            }
+            await state.element.setInputFiles(files);
+            return state.info;
+        }
+        catch (e) {
+            await _commandError(state, e, this);
+        }
+        finally {
+            await _commandFinally(state, this);
         }
     }
     async getText(selectors, _params = null, options = {}, info = {}, world = null) {
         return await this._getText(selectors, 0, _params, options, info, world);
     }
     async _getText(selectors, climb, _params = null, options = {}, info = {}, world = null) {
+        const timeout = this._getFindElementTimeout(options);
         _validateSelectors(selectors);
         let screenshotId = null;
         let screenshotPath = null;
@@ -1378,7 +1510,7 @@ class StableBrowser {
         }
         info.operation = "getText";
         info.selectors = selectors;
-        let element = await this._locate(selectors, info, _params);
+        let element = await this._locate(selectors, info, _params, timeout);
         if (climb > 0) {
             const climbArray = [];
             for (let i = 0; i < climb; i++) {
@@ -1445,6 +1577,7 @@ class StableBrowser {
             highlight: false,
             type: Types.VERIFY_ELEMENT_CONTAINS_TEXT,
             text: `Verify element contains pattern: ${pattern}`,
+            _text: "Verify element " + selectors.element_name + " contains pattern " + pattern,
             operation: "containsPattern",
             log: "***** verify element " + selectors.element_name + " contains pattern " + pattern + " *****\n",
         };
@@ -1476,10 +1609,12 @@ class StableBrowser {
             await _commandError(state, e, this);
         }
         finally {
-            _commandFinally(state, this);
+            await _commandFinally(state, this);
         }
     }
     async containsText(selectors, text, climb, _params = null, options = {}, world = null) {
+        const timeout = this._getFindElementTimeout(options);
+        const startTime = Date.now();
         const state = {
             selectors,
             _params,
@@ -1506,44 +1641,124 @@ class StableBrowser {
         }
         let foundObj = null;
         try {
-            await _preCommand(state, this);
-            foundObj = await this._getText(selectors, climb, _params, options, state.info, world);
-            if (foundObj && foundObj.element) {
-                await this.scrollIfNeeded(foundObj.element, state.info);
-            }
-            await _screenshot(state, this);
-            const dateAlternatives = findDateAlternatives(text);
-            const numberAlternatives = findNumberAlternatives(text);
-            if (dateAlternatives.date) {
-                for (let i = 0; i < dateAlternatives.dates.length; i++) {
-                    if (foundObj?.text.includes(dateAlternatives.dates[i]) ||
-                        foundObj?.value?.includes(dateAlternatives.dates[i])) {
+            while (Date.now() - startTime < timeout) {
+                try {
+                    await _preCommand(state, this);
+                    foundObj = await this._getText(selectors, climb, _params, { timeout: 3000 }, state.info, world);
+                    if (foundObj && foundObj.element) {
+                        await this.scrollIfNeeded(foundObj.element, state.info);
+                    }
+                    await _screenshot(state, this);
+                    const dateAlternatives = findDateAlternatives(text);
+                    const numberAlternatives = findNumberAlternatives(text);
+                    if (dateAlternatives.date) {
+                        for (let i = 0; i < dateAlternatives.dates.length; i++) {
+                            if (foundObj?.text.includes(dateAlternatives.dates[i]) ||
+                                foundObj?.value?.includes(dateAlternatives.dates[i])) {
+                                return state.info;
+                            }
+                        }
+                    }
+                    else if (numberAlternatives.number) {
+                        for (let i = 0; i < numberAlternatives.numbers.length; i++) {
+                            if (foundObj?.text.includes(numberAlternatives.numbers[i]) ||
+                                foundObj?.value?.includes(numberAlternatives.numbers[i])) {
+                                return state.info;
+                            }
+                        }
+                    }
+                    else if (foundObj?.text.includes(text) || foundObj?.value?.includes(text)) {
                         return state.info;
                     }
                 }
-                throw new Error("element doesn't contain text " + text);
+                catch (e) {
+                    // Log error but continue retrying until timeout is reached
+                    this.logger.warn("Retrying containsText due to: " + e.message);
+                }
+                await new Promise((resolve) => setTimeout(resolve, 1000)); // Wait 1 second before retrying
             }
-            else if (numberAlternatives.number) {
-                for (let i = 0; i < numberAlternatives.numbers.length; i++) {
-                    if (foundObj?.text.includes(numberAlternatives.numbers[i]) ||
-                        foundObj?.value?.includes(numberAlternatives.numbers[i])) {
-                        return state.info;
+            state.info.foundText = foundObj?.text;
+            state.info.value = foundObj?.value;
+            throw new Error("element doesn't contain text " + text);
+        }
+        catch (e) {
+            await _commandError(state, e, this);
+            throw e;
+        }
+        finally {
+            await _commandFinally(state, this);
+        }
+    }
+    async snapshotValidation(frameSelectors, referanceSnapshot, _params = null, options = {}, world = null) {
+        const timeout = this._getFindElementTimeout(options);
+        const startTime = Date.now();
+        const state = {
+            _params,
+            value: referanceSnapshot,
+            options,
+            world,
+            locate: false,
+            scroll: false,
+            screenshot: true,
+            highlight: false,
+            type: Types.SNAPSHOT_VALIDATION,
+            text: `verify snapshot: ${referanceSnapshot}`,
+            operation: "snapshotValidation",
+            log: "***** verify snapshot *****\n",
+        };
+        if (!referanceSnapshot) {
+            throw new Error("referanceSnapshot is null");
+        }
+        let text = null;
+        if (fs.existsSync(path.join(this.project_path, "data", "snapshots", this.context.environment.name, referanceSnapshot + ".yml"))) {
+            text = fs.readFileSync(path.join(this.project_path, "data", "snapshots", this.context.environment.name, referanceSnapshot + ".yml"), "utf8");
+        }
+        else if (fs.existsSync(path.join(this.project_path, "data", "snapshots", this.context.environment.name, referanceSnapshot + ".yaml"))) {
+            text = fs.readFileSync(path.join(this.project_path, "data", "snapshots", this.context.environment.name, referanceSnapshot + ".yaml"), "utf8");
+        }
+        else if (referanceSnapshot.startsWith("yaml:")) {
+            text = referanceSnapshot.substring(5);
+        }
+        else {
+            throw new Error("referenceSnapshot file not found: " + referanceSnapshot);
+        }
+        state.text = text;
+        const newValue = await this._replaceWithLocalData(text, world);
+        await _preCommand(state, this);
+        let foundObj = null;
+        try {
+            let matchResult = null;
+            while (Date.now() - startTime < timeout) {
+                try {
+                    let scope = null;
+                    if (!frameSelectors) {
+                        scope = this.page;
                     }
+                    else {
+                        scope = await this._findFrameScope(frameSelectors, timeout, state.info);
+                    }
+                    const snapshot = await scope.locator("body").ariaSnapshot({ timeout });
+                    matchResult = snapshotValidation(snapshot, newValue);
+                    if (matchResult.errorLine !== -1) {
+                        throw new Error("Snapshot validation failed at line " + matchResult.errorLineText);
+                    }
+                    // highlight and screenshot
+                    return state.info;
                 }
-                throw new Error("element doesn't contain text " + text);
-            }
-            else if (!foundObj?.text.includes(text) && !foundObj?.value?.includes(text)) {
-                state.info.foundText = foundObj?.text;
-                state.info.value = foundObj?.value;
-                throw new Error("element doesn't contain text " + text);
+                catch (e) {
+                    // Log error but continue retrying until timeout is reached
+                    this.logger.warn("Retrying containsText due to: " + e.message);
+                }
+                await new Promise((resolve) => setTimeout(resolve, 1000)); // Wait 1 second before retrying
             }
-            return state.info;
+            throw new Error("No snapshot match " + matchResult?.errorLineText);
         }
         catch (e) {
             await _commandError(state, e, this);
+            throw e;
         }
         finally {
-            _commandFinally(state, this);
+            await _commandFinally(state, this);
         }
     }
     async waitForUserInput(message, world = null) {
@@ -1581,6 +1796,15 @@ class StableBrowser {
         // save the data to the file
         fs.writeFileSync(dataFile, JSON.stringify(data, null, 2));
     }
+    overwriteTestData(testData, world = null) {
+        if (!testData) {
+            return;
+        }
+        // if data file exists, load it
+        const dataFile = _getDataFile(world, this.context, this);
+        // save the data to the file
+        fs.writeFileSync(dataFile, JSON.stringify(testData, null, 2));
+    }
     _getDataFilePath(fileName) {
         let dataFile = path.join(this.project_path, "data", fileName);
         if (fs.existsSync(dataFile)) {
@@ -1833,7 +2057,7 @@ class StableBrowser {
             await _commandError(state, e, this);
         }
         finally {
-            _commandFinally(state, this);
+            await _commandFinally(state, this);
         }
     }
     async extractAttribute(selectors, attribute, variable, _params = null, options = {}, world = null) {
@@ -1846,6 +2070,7 @@ class StableBrowser {
             world,
             type: Types.EXTRACT,
             text: `Extract attribute from element`,
+            _text: `Extract attribute ${attribute} from ${selectors.element_name}`,
             operation: "extractAttribute",
             log: "***** extract attribute " + attribute + " from " + selectors.element_name + " *****\n",
             allowDisabled: true,
@@ -1863,10 +2088,31 @@ class StableBrowser {
                 case "value":
                     state.value = await state.element.inputValue();
                     break;
+                case "text":
+                    state.value = await state.element.textContent();
+                    break;
                 default:
                     state.value = await state.element.getAttribute(attribute);
                     break;
             }
+            if (options !== null) {
+                if (options.regex && options.regex !== "") {
+                    // Construct a regex pattern from the provided string
+                    const regex = options.regex.slice(1, -1);
+                    const regexPattern = new RegExp(regex, "g");
+                    const matches = state.value.match(regexPattern);
+                    if (matches) {
+                        let newValue = "";
+                        for (const match of matches) {
+                            newValue += match;
+                        }
+                        state.value = newValue;
+                    }
+                }
+                if (options.trimSpaces && options.trimSpaces === true) {
+                    state.value = state.value.trim();
+                }
+            }
             state.info.value = state.value;
             this.setTestData({ [variable]: state.value }, world);
             this.logger.info("set test data: " + variable + "=" + state.value);
@@ -1877,7 +2123,7 @@ class StableBrowser {
             await _commandError(state, e, this);
         }
         finally {
-            _commandFinally(state, this);
+            await _commandFinally(state, this);
         }
     }
     async verifyAttribute(selectors, attribute, value, _params = null, options = {}, world = null) {
@@ -1892,6 +2138,7 @@ class StableBrowser {
             highlight: true,
             screenshot: true,
             text: `Verify element attribute`,
+            _text: `Verify attribute ${attribute} from ${selectors.element_name} is ${value}`,
             operation: "verifyAttribute",
             log: "***** verify attribute " + attribute + " from " + selectors.element_name + " *****\n",
             allowDisabled: true,
@@ -1901,12 +2148,15 @@ class StableBrowser {
         let expectedValue;
         try {
             await _preCommand(state, this);
-            expectedValue = state.value;
+            expectedValue = await replaceWithLocalTestData(state.value, world);
             state.info.expectedValue = expectedValue;
             switch (attribute) {
                 case "innerText":
                     val = String(await state.element.innerText());
                     break;
+                case "text":
+                    val = String(await state.element.textContent());
+                    break;
                 case "value":
                     val = String(await state.element.inputValue());
                     break;
@@ -1946,7 +2196,7 @@ class StableBrowser {
             await _commandError(state, e, this);
         }
         finally {
-            _commandFinally(state, this);
+            await _commandFinally(state, this);
         }
     }
     async extractEmailData(emailAddress, options, world) {
@@ -2198,6 +2448,69 @@ class StableBrowser {
             _reportToWorld(world, {
                 type: Types.VERIFY_PAGE_PATH,
                 text: "Verify page path",
+                _text: "Verify the page path contains " + pathPart,
+                screenshotId,
+                result: error
+                    ? {
+                        status: "FAILED",
+                        startTime,
+                        endTime,
+                        message: error?.message,
+                    }
+                    : {
+                        status: "PASSED",
+                        startTime,
+                        endTime,
+                    },
+                info: info,
+            });
+        }
+    }
+    async verifyPageTitle(title, options = {}, world = null) {
+        const startTime = Date.now();
+        let error = null;
+        let screenshotId = null;
+        let screenshotPath = null;
+        await new Promise((resolve) => setTimeout(resolve, 2000));
+        const info = {};
+        info.log = "***** verify page title " + title + " *****\n";
+        info.operation = "verifyPageTitle";
+        const newValue = await this._replaceWithLocalData(title, world);
+        if (newValue !== title) {
+            this.logger.info(title + "=" + newValue);
+            title = newValue;
+        }
+        info.title = title;
+        try {
+            for (let i = 0; i < 30; i++) {
+                const foundTitle = await this.page.title();
+                if (!foundTitle.includes(title)) {
+                    if (i === 29) {
+                        throw new Error(`url ${foundTitle} doesn't contain ${title}`);
+                    }
+                    await new Promise((resolve) => setTimeout(resolve, 1000));
+                    continue;
+                }
+                ({ screenshotId, screenshotPath } = await this._screenShot(options, world, info));
+                return info;
+            }
+        }
+        catch (e) {
+            //await this.closeUnexpectedPopups();
+            this.logger.error("verify page title failed " + info.log);
+            ({ screenshotId, screenshotPath } = await this._screenShot(options, world, info));
+            info.screenshotPath = screenshotPath;
+            Object.assign(e, { info: info });
+            error = e;
+            // throw e;
+            await _commandError({ text: "verifyPageTitle", operation: "verifyPageTitle", title, info, throwError: true }, e, this);
+        }
+        finally {
+            const endTime = Date.now();
+            _reportToWorld(world, {
+                type: Types.VERIFY_PAGE_PATH,
+                text: "Verify page title",
+                _text: "Verify the page title contains " + title,
                 screenshotId,
                 result: error
                     ? {
@@ -2215,27 +2528,27 @@ class StableBrowser {
             });
         }
     }
-    async findTextInAllFrames(dateAlternatives, numberAlternatives, text, state) {
+    async findTextInAllFrames(dateAlternatives, numberAlternatives, text, state, partial = true, ignoreCase = false) {
         const frames = this.page.frames();
         let results = [];
-        let ignoreCase = false;
+        // let ignoreCase = false;
         for (let i = 0; i < frames.length; i++) {
             if (dateAlternatives.date) {
                 for (let j = 0; j < dateAlternatives.dates.length; j++) {
-                    const result = await this._locateElementByText(frames[i], dateAlternatives.dates[j], "*:not(script, style, head)", false, true, ignoreCase, {});
+                    const result = await this._locateElementByText(frames[i], dateAlternatives.dates[j], "*:not(script, style, head)", false, partial, ignoreCase, {});
                     result.frame = frames[i];
                     results.push(result);
                 }
             }
             else if (numberAlternatives.number) {
                 for (let j = 0; j < numberAlternatives.numbers.length; j++) {
-                    const result = await this._locateElementByText(frames[i], numberAlternatives.numbers[j], "*:not(script, style, head)", false, true, ignoreCase, {});
+                    const result = await this._locateElementByText(frames[i], numberAlternatives.numbers[j], "*:not(script, style, head)", false, partial, ignoreCase, {});
                     result.frame = frames[i];
                     results.push(result);
                 }
             }
             else {
-                const result = await this._locateElementByText(frames[i], text, "*:not(script, style, head)", false, true, ignoreCase, {});
+                const result = await this._locateElementByText(frames[i], text, "*:not(script, style, head)", false, partial, ignoreCase, {});
                 result.frame = frames[i];
                 results.push(result);
             }
@@ -2254,11 +2567,15 @@ class StableBrowser {
             scroll: false,
             highlight: false,
             type: Types.VERIFY_PAGE_CONTAINS_TEXT,
-            text: `Verify text exists in page`,
+            text: `Verify the text '${maskValue(text)}' exists in page`,
+            _text: `Verify the text '${text}' exists in page`,
             operation: "verifyTextExistInPage",
             log: "***** verify text " + text + " exists in page *****\n",
         };
-        const timeout = this._getLoadTimeout(options);
+        if (testForRegex(text)) {
+            text = text.replace(/\\"/g, '"');
+        }
+        const timeout = this._getFindElementTimeout(options);
         await new Promise((resolve) => setTimeout(resolve, 2000));
         const newValue = await this._replaceWithLocalData(text, world);
         if (newValue !== text) {
@@ -2328,7 +2645,7 @@ class StableBrowser {
             await _commandError(state, e, this);
         }
         finally {
-            _commandFinally(state, this);
+            await _commandFinally(state, this);
         }
     }
     async waitForTextToDisappear(text, options = {}, world = null) {
@@ -2341,11 +2658,15 @@ class StableBrowser {
             scroll: false,
             highlight: false,
             type: Types.WAIT_FOR_TEXT_TO_DISAPPEAR,
-            text: `Verify text does not exist in page`,
+            text: `Verify the text '${maskValue(text)}' does not exist in page`,
+            _text: `Verify the text '${text}' does not exist in page`,
             operation: "verifyTextNotExistInPage",
             log: "***** verify text " + text + " does not exist in page *****\n",
         };
-        const timeout = this._getLoadTimeout(options);
+        if (testForRegex(text)) {
+            text = text.replace(/\\"/g, '"');
+        }
+        const timeout = this._getFindElementTimeout(options);
         await new Promise((resolve) => setTimeout(resolve, 2000));
         const newValue = await this._replaceWithLocalData(text, world);
         if (newValue !== text) {
@@ -2381,7 +2702,7 @@ class StableBrowser {
             await _commandError(state, e, this);
         }
         finally {
-            _commandFinally(state, this);
+            await _commandFinally(state, this);
         }
     }
     async verifyTextRelatedToText(textAnchor, climb, textToVerify, options = {}, world = null) {
@@ -2396,10 +2717,11 @@ class StableBrowser {
             highlight: false,
             type: Types.VERIFY_TEXT_WITH_RELATION,
             text: `Verify text with relation to another text`,
+            _text: "Search for " + textAnchor + " climb " + climb + " and verify " + textToVerify + " found",
             operation: "verify_text_with_relation",
             log: "***** search for " + textAnchor + " climb " + climb + " and verify " + textToVerify + " found *****\n",
         };
-        const timeout = this._getLoadTimeout(options);
+        const timeout = this._getFindElementTimeout(options);
         await new Promise((resolve) => setTimeout(resolve, 2000));
         let newValue = await this._replaceWithLocalData(textAnchor, world);
         if (newValue !== textAnchor) {
@@ -2422,7 +2744,7 @@ class StableBrowser {
             };
             while (true) {
                 try {
-                    resultWithElementsFound = await this.findTextInAllFrames(dateAlternatives, numberAlternatives, textAnchor, state);
+                    resultWithElementsFound = await this.findTextInAllFrames(findDateAlternatives(textAnchor), findNumberAlternatives(textAnchor), textAnchor, state, false);
                 }
                 catch (error) {
                     // ignore
@@ -2450,7 +2772,7 @@ class StableBrowser {
                         const count = await frame.locator(css).count();
                         for (let j = 0; j < count; j++) {
                             const continer = await frame.locator(css).nth(j);
-                            const result = await this._locateElementByText(continer, textToVerify, "*", false, true, true, {});
+                            const result = await this._locateElementByText(continer, textToVerify, "*:not(script, style, head)", false, true, true, {});
                             if (result.elementCount > 0) {
                                 const dataAttribute = "[data-blinq-id-" + result.randomToken + "]";
                                 await this._highlightElements(frame, dataAttribute);
@@ -2491,8 +2813,32 @@ class StableBrowser {
             await _commandError(state, e, this);
         }
         finally {
-            _commandFinally(state, this);
+            await _commandFinally(state, this);
+        }
+    }
+    async findRelatedTextInAllFrames(textAnchor, climb, textToVerify, params = {}, options = {}, world = null) {
+        const frames = this.page.frames();
+        let results = [];
+        let ignoreCase = false;
+        for (let i = 0; i < frames.length; i++) {
+            const result = await this._locateElementByText(frames[i], textAnchor, "*:not(script, style, head)", false, true, ignoreCase, {});
+            result.frame = frames[i];
+            const climbArray = [];
+            for (let i = 0; i < climb; i++) {
+                climbArray.push("..");
+            }
+            let climbXpath = "xpath=" + climbArray.join("/");
+            const newLocator = `[data-blinq-id-${result.randomToken}] ${climb > 0 ? ">> " + climbXpath : ""} >> internal:text=${testForRegex(textToVerify) ? textToVerify : unEscapeString(textToVerify)}`;
+            const count = await frames[i].locator(newLocator).count();
+            if (count > 0) {
+                result.elementCount = count;
+                result.locator = newLocator;
+                results.push(result);
+            }
         }
+        // state.info.results = results;
+        const resultWithElementsFound = results.filter((result) => result.elementCount > 0);
+        return resultWithElementsFound;
     }
     async visualVerification(text, options = {}, world = null) {
         const startTime = Date.now();
@@ -2555,6 +2901,7 @@ class StableBrowser {
             _reportToWorld(world, {
                 type: Types.VERIFY_VISUAL,
                 text: "Visual verification",
+                _text: "Visual verification of " + text,
                 screenshotId,
                 result: error
                     ? {
@@ -2809,7 +3156,13 @@ class StableBrowser {
         }
     }
     async _replaceWithLocalData(value, world, _decrypt = true, totpWait = true) {
-        return await replaceWithLocalTestData(value, world, _decrypt, totpWait, this.context, this);
+        try {
+            return await replaceWithLocalTestData(value, world, _decrypt, totpWait, this.context, this);
+        }
+        catch (error) {
+            this.logger.debug(error);
+            throw error;
+        }
     }
     _getLoadTimeout(options) {
         let timeout = 15000;
@@ -2821,6 +3174,15 @@ class StableBrowser {
         }
         return timeout;
     }
+    _getFindElementTimeout(options) {
+        if (options && options.timeout) {
+            return options.timeout;
+        }
+        if (this.configuration.find_element_timeout) {
+            return this.configuration.find_element_timeout;
+        }
+        return 30000;
+    }
     async saveStoreState(path = null, world = null) {
         const storageState = await this.page.context().storageState();
         //const testDataFile = _getDataFile(world, this.context, this);
@@ -2837,6 +3199,9 @@ class StableBrowser {
         this.registerEventListeners(this.context);
         registerNetworkEvents(this.world, this, this.context, this.page);
         registerDownloadEvent(this.page, this.world, this.context);
+        if (this.onRestoreSaveState) {
+            this.onRestoreSaveState(path);
+        }
     }
     async waitForPageLoad(options = {}, world = null) {
         let timeout = this._getLoadTimeout(options);
@@ -2905,6 +3270,7 @@ class StableBrowser {
             highlight: false,
             type: Types.CLOSE_PAGE,
             text: `Close page`,
+            _text: `Close the page`,
             operation: "closePage",
             log: "***** close page *****\n",
             throwError: false,
@@ -2918,11 +3284,98 @@ class StableBrowser {
             await _commandError(state, e, this);
         }
         finally {
-            _commandFinally(state, this);
+            await _commandFinally(state, this);
+        }
+    }
+    async tableCellOperation(headerText, rowText, options, _params, world = null) {
+        let operation = null;
+        if (!options || !options.operation) {
+            throw new Error("operation is not defined");
+        }
+        operation = options.operation;
+        // validate operation is one of the supported operations
+        if (operation != "click" && operation != "hover+click") {
+            throw new Error("operation is not supported");
+        }
+        const state = {
+            options,
+            world,
+            locate: false,
+            scroll: false,
+            highlight: false,
+            type: Types.TABLE_OPERATION,
+            text: `Table operation`,
+            _text: `Table ${operation} operation`,
+            operation: operation,
+            log: "***** Table operation *****\n",
+        };
+        const timeout = this._getFindElementTimeout(options);
+        try {
+            await _preCommand(state, this);
+            const start = Date.now();
+            let cellArea = null;
+            while (true) {
+                try {
+                    cellArea = await _findCellArea(headerText, rowText, this, state);
+                    if (cellArea) {
+                        break;
+                    }
+                }
+                catch (e) {
+                    // ignore
+                }
+                if (Date.now() - start > timeout) {
+                    throw new Error(`Cell not found in table`);
+                }
+                await new Promise((resolve) => setTimeout(resolve, 1000));
+            }
+            switch (operation) {
+                case "click":
+                    if (!options.css) {
+                        // will click in the center of the cell
+                        let xOffset = 0;
+                        let yOffset = 0;
+                        if (options.xOffset) {
+                            xOffset = options.xOffset;
+                        }
+                        if (options.yOffset) {
+                            yOffset = options.yOffset;
+                        }
+                        await this.page.mouse.click(cellArea.x + cellArea.width / 2 + xOffset, cellArea.y + cellArea.height / 2 + yOffset);
+                    }
+                    else {
+                        const results = await findElementsInArea(options.css, cellArea, this, options);
+                        if (results.length === 0) {
+                            throw new Error(`Element not found in cell area`);
+                        }
+                        state.element = results[0];
+                        await performAction("click", state.element, options, this, state, _params);
+                    }
+                    break;
+                case "hover+click":
+                    if (!options.css) {
+                        throw new Error("css is not defined");
+                    }
+                    const results = await findElementsInArea(options.css, cellArea, this, options);
+                    if (results.length === 0) {
+                        throw new Error(`Element not found in cell area`);
+                    }
+                    state.element = results[0];
+                    await performAction("hover+click", state.element, options, this, state, _params);
+                    break;
+                default:
+                    throw new Error("operation is not supported");
+            }
+        }
+        catch (e) {
+            await _commandError(state, e, this);
+        }
+        finally {
+            await _commandFinally(state, this);
         }
     }
     saveTestDataAsGlobal(options, world) {
-        const dataFile = this._getDataFile(world);
+        const dataFile = _getDataFile(world, this.context, this);
         process.env.GLOBAL_TEST_DATA_FILE = dataFile;
         this.logger.info("Save the scenario test data as global for the following scenarios.");
     }
@@ -2952,6 +3405,7 @@ class StableBrowser {
             _reportToWorld(world, {
                 type: Types.SET_VIEWPORT,
                 text: "set viewport size to " + width + "x" + hight,
+                _text: "Set the viewport size to " + width + "x" + hight,
                 screenshotId,
                 result: error
                     ? {
@@ -3022,7 +3476,39 @@ class StableBrowser {
             console.log("#-#");
         }
     }
+    async beforeScenario(world, scenario) {
+        this.beforeScenarioCalled = true;
+        if (scenario && scenario.pickle && scenario.pickle.name) {
+            this.scenarioName = scenario.pickle.name;
+        }
+        if (scenario && scenario.gherkinDocument && scenario.gherkinDocument.feature) {
+            this.featureName = scenario.gherkinDocument.feature.name;
+        }
+        if (this.context) {
+            this.context.examplesRow = extractStepExampleParameters(scenario);
+        }
+        if (this.tags === null && scenario && scenario.pickle && scenario.pickle.tags) {
+            this.tags = scenario.pickle.tags.map((tag) => tag.name);
+            // check if @global_test_data tag is present
+            if (this.tags.includes("@global_test_data")) {
+                this.saveTestDataAsGlobal({}, world);
+            }
+        }
+        // update test data based on feature/scenario
+        let envName = null;
+        if (this.context && this.context.environment) {
+            envName = this.context.environment.name;
+        }
+        if (!process.env.TEMP_RUN) {
+            await getTestData(envName, world, undefined, this.featureName, this.scenarioName);
+        }
+        await loadBrunoParams(this.context, this.context.environment.name);
+    }
+    async afterScenario(world, scenario) { }
     async beforeStep(world, step) {
+        if (!this.beforeScenarioCalled) {
+            this.beforeScenario(world, step);
+        }
         if (this.stepIndex === undefined) {
             this.stepIndex = 0;
         }
@@ -3039,21 +3525,53 @@ class StableBrowser {
         else {
             this.stepName = "step " + this.stepIndex;
         }
-        if (this.context) {
-            this.context.examplesRow = extractStepExampleParameters(step);
-        }
         if (this.context && this.context.browserObject && this.context.browserObject.trace === true) {
             if (this.context.browserObject.context) {
                 await this.context.browserObject.context.tracing.startChunk({ title: this.stepName });
             }
         }
-        if (this.tags === null && step && step.pickle && step.pickle.tags) {
-            this.tags = step.pickle.tags.map((tag) => tag.name);
-            // check if @global_test_data tag is present
-            if (this.tags.includes("@global_test_data")) {
-                this.saveTestDataAsGlobal({}, world);
+        if (this.initSnapshotTaken === false) {
+            this.initSnapshotTaken = true;
+            if (world && world.attach && !process.env.DISABLE_SNAPSHOT) {
+                const snapshot = await this.getAriaSnapshot();
+                if (snapshot) {
+                    await world.attach(JSON.stringify(snapshot), "application/json+snapshot-before");
+                }
+            }
+        }
+    }
+    async getAriaSnapshot() {
+        try {
+            // find the page url
+            const url = await this.page.url();
+            // extract the path from the url
+            const path = new URL(url).pathname;
+            // get the page title
+            const title = await this.page.title();
+            // go over other frams
+            const frames = this.page.frames();
+            const snapshots = [];
+            const content = [`- path: ${path}`, `- title: ${title}`];
+            const timeout = this.configuration.ariaSnapshotTimeout ? this.configuration.ariaSnapshotTimeout : 3000;
+            for (let i = 0; i < frames.length; i++) {
+                const frame = frames[i];
+                try {
+                    // Ensure frame is attached and has body
+                    const body = frame.locator("body");
+                    await body.waitFor({ timeout }); // wait explicitly
+                    const snapshot = await body.ariaSnapshot({ timeout });
+                    content.push(`- frame: ${i}`);
+                    content.push(snapshot);
+                }
+                catch (innerErr) { }
             }
+            return content.join("\n");
         }
+        catch (e) {
+            console.log("Error in getAriaSnapshot");
+            //console.debug(e);
+        }
+        return null;
     }
     async afterStep(world, step) {
         this.stepName = null;
@@ -3062,11 +3580,25 @@ class StableBrowser {
                 await this.context.browserObject.context.tracing.stopChunk({
                     path: path.join(this.context.browserObject.traceFolder, `trace-${this.stepIndex}.zip`),
                 });
+                if (world && world.attach) {
+                    await world.attach(JSON.stringify({
+                        type: "trace",
+                        traceFilePath: `trace-${this.stepIndex}.zip`,
+                    }), "application/json+trace");
+                }
+                // console.log("trace file created", `trace-${this.stepIndex}.zip`);
             }
         }
         if (this.context) {
             this.context.examplesRow = null;
         }
+        if (world && world.attach && !process.env.DISABLE_SNAPSHOT) {
+            const snapshot = await this.getAriaSnapshot();
+            if (snapshot) {
+                const obj = {};
+                await world.attach(JSON.stringify(snapshot), "application/json+snapshot-after");
+            }
+        }
     }
 }
 function createTimedPromise(promise, label) {