webdriverio 9.0.5 → 9.0.6

package/build/index.js

@@ -5,7 +5,7 @@ var __export = (target, all) => {
 };
 
 // src/index.ts
-import logger18 from "@wdio/logger";
+import logger19 from "@wdio/logger";
 import WebDriver, { DEFAULTS } from "webdriver";
 import { validateConfig } from "@wdio/config";
 import { enableFileLogging, wrapCommand as wrapCommand3 } from "@wdio/utils";
@@ -78,7 +78,7 @@ import { URL as URL2 } from "node:url";
 import cssValue from "css-value";
 import rgb2hex from "rgb2hex";
 import GraphemeSplitter from "grapheme-splitter";
-import logger17 from "@wdio/logger";
+import logger18 from "@wdio/logger";
 import isPlainObject from "is-plain-obj";
 import { ELEMENT_KEY as ELEMENT_KEY17 } from "webdriver";
 import { UNICODE_CHARACTERS as UNICODE_CHARACTERS2, asyncIterators, getBrowserObject as getBrowserObject26 } from "@wdio/utils";
@@ -149,13 +149,13 @@ var WebDriverError = class extends Error {
   }
 };
 var getElement = function findElement(selector, res, props = { isReactElement: false, isShadowElement: false }) {
-  const browser = getBrowserObject(this);
+  const browser2 = getBrowserObject(this);
   const browserCommandKeys = Object.keys(browser_exports);
   const propertiesObject = {
     /**
      * filter out browser commands from object
      */
-    ...Object.entries(clone(browser.__propertiesObject__)).reduce((commands, [name, descriptor]) => {
+    ...Object.entries(clone(browser2.__propertiesObject__)).reduce((commands, [name, descriptor]) => {
       if (!browserCommandKeys.includes(name)) {
         commands[name] = descriptor;
       }
@@ -187,19 +187,19 @@ var getElement = function findElement(selector, res, props = { isReactElement: f
   const elementInstance = element(this.sessionId, elementErrorHandler(wrapCommand));
   const origAddCommand = elementInstance.addCommand.bind(elementInstance);
   elementInstance.addCommand = (name, fn) => {
-    browser.__propertiesObject__[name] = { value: fn };
+    browser2.__propertiesObject__[name] = { value: fn };
     origAddCommand(name, fn);
   };
   return elementInstance;
 };
 var getElements = function getElements2(selector, elemResponse, props = { isReactElement: false, isShadowElement: false }) {
-  const browser = getBrowserObject(this);
+  const browser2 = getBrowserObject(this);
   const browserCommandKeys = Object.keys(browser_exports);
   const propertiesObject = {
     /**
      * filter out browser commands from object
      */
-    ...Object.entries(clone(browser.__propertiesObject__)).reduce((commands, [name, descriptor]) => {
+    ...Object.entries(clone(browser2.__propertiesObject__)).reduce((commands, [name, descriptor]) => {
       if (!browserCommandKeys.includes(name)) {
         commands[name] = descriptor;
       }
@@ -238,7 +238,7 @@ var getElements = function getElements2(selector, elemResponse, props = { isReac
     const elementInstance = element(this.sessionId, elementErrorHandler(wrapCommand));
     const origAddCommand = elementInstance.addCommand.bind(elementInstance);
     elementInstance.addCommand = (name, fn) => {
-      browser.__propertiesObject__[name] = { value: fn };
+      browser2.__propertiesObject__[name] = { value: fn };
       origAddCommand(name, fn);
     };
     return elementInstance;
@@ -951,8 +951,8 @@ var ClockManager = class {
   #browser;
   #resetFn = () => Promise.resolve();
   #isInstalled = false;
-  constructor(browser) {
-    this.#browser = browser;
+  constructor(browser2) {
+    this.#browser = browser2;
   }
   /**
    * Install fake timers on the browser. If you call the `emulate` command, WebdriverIO will automatically install
@@ -2400,13 +2400,13 @@ var deviceDescriptorsSource = {
 };
 
 // src/commands/browser/emulate.ts
-function storeRestoreFunction(browser, scope, fn) {
-  if (!restoreFunctions.has(browser)) {
-    restoreFunctions.set(browser, /* @__PURE__ */ new Map());
+function storeRestoreFunction(browser2, scope, fn) {
+  if (!restoreFunctions.has(browser2)) {
+    restoreFunctions.set(browser2, /* @__PURE__ */ new Map());
   }
-  const restoreFunctionsList = restoreFunctions.get(browser)?.get(scope);
+  const restoreFunctionsList = restoreFunctions.get(browser2)?.get(scope);
   const updatedList = restoreFunctionsList ? [...restoreFunctionsList, fn] : [fn];
-  restoreFunctions.get(browser)?.set(scope, updatedList);
+  restoreFunctions.get(browser2)?.set(scope, updatedList);
 }
 async function emulate(scope, options) {
   if (!this.isBidi) {
@@ -2792,13 +2792,70 @@ var ReferenceValue = class {
   }
 };
 
+// src/context.ts
+import logger4 from "@wdio/logger";
+var contextManager = /* @__PURE__ */ new Map();
+var log4 = logger4("webdriverio:ContextManager");
+function getContextManager(browser2) {
+  const existingContextManager = contextManager.get(browser2);
+  if (existingContextManager) {
+    return existingContextManager;
+  }
+  const newContext = new ContextManager(browser2);
+  contextManager.set(browser2, newContext);
+  return newContext;
+}
+var ContextManager = class {
+  #browser;
+  #initialize;
+  #currentContext;
+  constructor(browser2) {
+    this.#browser = browser2;
+    if (!browser2.isBidi || process.env.VITEST_WORKER_ID || browser2.options?.automationProtocol !== "webdriver") {
+      this.#initialize = Promise.resolve(true);
+      return;
+    }
+    this.#initialize = this.#browser.sessionSubscribe({
+      events: ["browsingContext.navigationStarted"]
+    }).then(() => true, () => false);
+    this.#browser.on("browsingContext.navigationStarted", this.#handleNavigationStarted.bind(this));
+  }
+  async initialize() {
+    return this.#initialize;
+  }
+  /**
+   * We use this handler to observe the current context which is used to navigate to a certain url.
+   * This is most likely the context that the user is using. However if a frame was loaded on the page
+   * then this handler is triggered with the context of the frame. To find out which context we are in
+   * we use the `getWindowHandle` method to validate our assumption before setting the `#currentContext`
+   * value.
+   *
+   * @param {local.BrowsingContextNavigationInfo} context  browsing context used to navigate
+   */
+  #handleNavigationStarted(context) {
+    this.#browser.getWindowHandle().then((windowHandle) => {
+      if (context.context === windowHandle) {
+        log4.info(`Update current context: ${context.context}`);
+        this.#currentContext = context.context;
+      }
+    });
+  }
+  async getCurrentContext() {
+    if (!this.#currentContext) {
+      this.#currentContext = await this.#browser.getWindowHandle();
+    }
+    return this.#currentContext;
+  }
+};
+
 // src/commands/browser/execute.ts
 async function execute(script, ...args) {
   if (typeof script !== "string" && typeof script !== "function") {
     throw new Error("number or type of arguments don't agree with execute protocol command");
   }
   if (this.isBidi) {
-    const context = await this.getWindowHandle();
+    const contextManager2 = getContextManager(browser);
+    const context = await contextManager2.getCurrentContext();
     const result = await this.scriptCallFunction({
       functionDeclaration: script.toString(),
       awaitPromise: false,
@@ -2821,7 +2878,8 @@ async function executeAsync(script, ...args) {
     throw new Error("number or type of arguments don't agree with execute protocol command");
   }
   if (this.isBidi) {
-    const context = await this.getWindowHandle();
+    const contextManager2 = getContextManager(browser);
+    const context = await contextManager2.getCurrentContext();
     const functionDeclaration = `function (...args) {
             return new Promise(async (resolve, reject) => {
                 try {
@@ -2861,9 +2919,9 @@ async function getCookies(names) {
 }
 
 // src/commands/browser/getPuppeteer.ts
-import logger4 from "@wdio/logger";
+import logger5 from "@wdio/logger";
 import { userImport } from "@wdio/utils";
-var log4 = logger4("webdriverio");
+var log5 = logger5("webdriverio");
 async function getPuppeteer() {
   const puppeteer = await userImport("puppeteer-core");
   if (!puppeteer) {
@@ -2872,7 +2930,7 @@ async function getPuppeteer() {
     );
   }
   if (this.puppeteer?.connected) {
-    log4.debug("Reusing existing puppeteer session");
+    log5.debug("Reusing existing puppeteer session");
     return this.puppeteer;
   }
   const { headers } = this.options;
@@ -2942,8 +3000,8 @@ async function getPuppeteer() {
 // src/commands/browser/getWindowSize.ts
 import { getBrowserObject as getBrowserObject2 } from "@wdio/utils";
 async function getWindowSize() {
-  const browser = getBrowserObject2(this);
-  const { width, height } = await browser.getWindowRect();
+  const browser2 = getBrowserObject2(this);
+  const { width, height } = await browser2.getWindowRect();
   return { width, height };
 }
 
@@ -2974,7 +3032,7 @@ import { getBrowserObject as getBrowserObject3 } from "@wdio/utils";
 
 // src/utils/interception/index.ts
 import EventEmitter2 from "node:events";
-import logger5 from "@wdio/logger";
+import logger6 from "@wdio/logger";
 import { URLPattern } from "urlpattern-polyfill";
 
 // src/utils/Timer.ts
@@ -3140,7 +3198,7 @@ function getPatternParam(pattern, key) {
 }
 
 // src/utils/interception/index.ts
-var log5 = logger5("WebDriverInterception");
+var log6 = logger6("WebDriverInterception");
 var hasSubscribedToEvents = false;
 var WebDriverInterception = class _WebDriverInterception {
   #pattern;
@@ -3152,27 +3210,27 @@ var WebDriverInterception = class _WebDriverInterception {
   #requestOverwrites = [];
   #respondOverwrites = [];
   #calls = [];
-  constructor(pattern, mockId, filterOptions, browser) {
+  constructor(pattern, mockId, filterOptions, browser2) {
     this.#pattern = pattern;
     this.#mockId = mockId;
     this.#filterOptions = filterOptions;
-    this.#browser = browser;
-    browser.on("network.beforeRequestSent", this.#handleBeforeRequestSent.bind(this));
-    browser.on("network.responseStarted", this.#handleResponseStarted.bind(this));
+    this.#browser = browser2;
+    browser2.on("network.beforeRequestSent", this.#handleBeforeRequestSent.bind(this));
+    browser2.on("network.responseStarted", this.#handleResponseStarted.bind(this));
   }
-  static async initiate(url6, filterOptions, browser) {
+  static async initiate(url6, filterOptions, browser2) {
     const pattern = parseUrlPattern(url6);
     if (!hasSubscribedToEvents) {
-      await browser.sessionSubscribe({
+      await browser2.sessionSubscribe({
         events: [
           "network.beforeRequestSent",
           "network.responseStarted"
         ]
       });
-      log5.info("subscribed to network events");
+      log6.info("subscribed to network events");
       hasSubscribedToEvents = true;
     }
-    const interception = await browser.networkAddIntercept({
+    const interception = await browser2.networkAddIntercept({
       phases: ["beforeRequestSent", "responseStarted"],
       urlPatterns: [{
         type: "pattern",
@@ -3183,7 +3241,7 @@ var WebDriverInterception = class _WebDriverInterception {
         search: getPatternParam(pattern, "search")
       }]
     });
-    return new _WebDriverInterception(pattern, interception.intercept, filterOptions, browser);
+    return new _WebDriverInterception(pattern, interception.intercept, filterOptions, browser2);
   }
   #handleBeforeRequestSent(request) {
     if (!this.#isRequestMatching(request)) {
@@ -3331,7 +3389,7 @@ var WebDriverInterception = class _WebDriverInterception {
     this.#respondOverwrites = [];
     this.#restored = true;
     const handle = await this.#browser.getWindowHandle();
-    log5.trace(`Restoring mock for ${handle}`);
+    log6.trace(`Restoring mock for ${handle}`);
     SESSION_MOCKS[handle].delete(this);
     if (this.#mockId) {
       await this.#browser.networkRemoveIntercept({ intercept: this.#mockId });
@@ -3459,22 +3517,23 @@ async function mock(url6, filterOptions) {
   if (!this.isBidi) {
     throw new Error("Mocking is only supported when running tests using WebDriver Bidi");
   }
-  const browser = getBrowserObject3(this);
-  const handle = await browser.getWindowHandle();
-  if (!SESSION_MOCKS[handle]) {
-    SESSION_MOCKS[handle] = /* @__PURE__ */ new Set();
+  const browser2 = getBrowserObject3(this);
+  const contextManager2 = getContextManager(browser2);
+  const context = await contextManager2.getCurrentContext();
+  if (!SESSION_MOCKS[context]) {
+    SESSION_MOCKS[context] = /* @__PURE__ */ new Set();
   }
   const networkInterception = await WebDriverInterception.initiate(url6, filterOptions || {}, this);
-  SESSION_MOCKS[handle].add(networkInterception);
+  SESSION_MOCKS[context].add(networkInterception);
   return networkInterception;
 }
 
 // src/commands/browser/mockClearAll.ts
-import logger6 from "@wdio/logger";
-var log6 = logger6("webdriverio:mockClearAll");
+import logger7 from "@wdio/logger";
+var log7 = logger7("webdriverio:mockClearAll");
 async function mockClearAll() {
   for (const [handle, mocks] of Object.entries(SESSION_MOCKS)) {
-    log6.trace(`Clearing mocks for ${handle}`);
+    log7.trace(`Clearing mocks for ${handle}`);
     for (const mock2 of mocks) {
       mock2.clear();
     }
@@ -3482,11 +3541,11 @@ async function mockClearAll() {
 }
 
 // src/commands/browser/mockRestoreAll.ts
-import logger7 from "@wdio/logger";
-var log7 = logger7("webdriverio:mockRestoreAll");
+import logger8 from "@wdio/logger";
+var log8 = logger8("webdriverio:mockRestoreAll");
 async function mockRestoreAll() {
   for (const [handle, mocks] of Object.entries(SESSION_MOCKS)) {
-    log7.trace(`Clearing mocks for ${handle}`);
+    log8.trace(`Clearing mocks for ${handle}`);
     for (const mock2 of mocks) {
       await mock2.restore();
     }
@@ -3579,19 +3638,19 @@ async function react$(selector, { props = {}, state = {} } = {}) {
 }
 
 // src/commands/browser/reloadSession.ts
-import logger8 from "@wdio/logger";
-var log8 = logger8("webdriverio");
+import logger9 from "@wdio/logger";
+var log9 = logger9("webdriverio");
 async function reloadSession(newCapabilities) {
   const oldSessionId = this.sessionId;
   const shutdownDriver = Boolean(newCapabilities?.browserName);
   try {
     await this.deleteSession({ shutdownDriver });
   } catch (err) {
-    log8.warn(`Suppressing error closing the session: ${err.stack}`);
+    log9.warn(`Suppressing error closing the session: ${err.stack}`);
   }
   if (this.puppeteer?.connected) {
     this.puppeteer.disconnect();
-    log8.debug("Disconnected puppeteer session");
+    log9.debug("Disconnected puppeteer session");
   }
   const ProtocolDriver = (await import(
     /* @vite-ignore */
@@ -3670,7 +3729,8 @@ async function saveScreenshot(filepath) {
   await assertDirectoryExists(absoluteFilepath);
   let screenBuffer;
   if (this.isBidi) {
-    const context = await this.getWindowHandle();
+    const contextManager2 = getContextManager(browser);
+    const context = await contextManager2.getCurrentContext();
     const { data } = await this.browsingContextCaptureScreenshot({ context });
     screenBuffer = data;
   } else {
@@ -3682,11 +3742,11 @@ async function saveScreenshot(filepath) {
 }
 
 // src/commands/browser/scroll.ts
-import logger9 from "@wdio/logger";
-var log9 = logger9("webdriverio");
+import logger10 from "@wdio/logger";
+var log10 = logger10("webdriverio");
 function scroll(x = 0, y = 0) {
   if (!x && !y) {
-    return log9.warn('"scroll" command was called with no parameters, skipping execution');
+    return log10.warn('"scroll" command was called with no parameters, skipping execution');
   }
   if (this.isMobile) {
     return this.execute((x2, y2) => window.scrollBy(x2, y2), x, y);
@@ -3740,9 +3800,10 @@ async function setViewport(options) {
   if (options.devicePixelRatio && (typeof options.devicePixelRatio !== "number" || options.devicePixelRatio < 0)) {
     throw new Error("setViewport expects devicePixelRatio to be a number in the 0 to 2^31 \u2212 1 range");
   }
-  const browser = getBrowserObject4(this);
-  const context = await browser.getWindowHandle();
-  await browser.browsingContextSetViewport({
+  const browser2 = getBrowserObject4(this);
+  const contextManager2 = getContextManager(browser2);
+  const context = await contextManager2.getCurrentContext();
+  await browser2.browsingContextSetViewport({
     context,
     devicePixelRatio: options.devicePixelRatio || 1,
     viewport: {
@@ -3763,8 +3824,8 @@ async function setWindowSize(width, height) {
   if (width < minWindowSize2 || width > maxWindowSize2 || height < minWindowSize2 || height > maxWindowSize2) {
     throw new Error("setWindowSize expects width and height to be a number in the 0 to 2^31 \u2212 1 range");
   }
-  const browser = getBrowserObject5(this);
-  await browser.setWindowRect(null, null, width, height);
+  const browser2 = getBrowserObject5(this);
+  await browser2.setWindowRect(null, null, width, height);
 }
 
 // src/commands/browser/switchWindow.ts
@@ -3801,13 +3862,13 @@ async function switchWindow(matcher) {
 }
 
 // src/commands/browser/throttle.ts
-import logger10 from "@wdio/logger";
+import logger11 from "@wdio/logger";
 import { getBrowserObject as getBrowserObject6 } from "@wdio/utils";
-var log10 = logger10("webdriverio:throttle");
+var log11 = logger11("webdriverio:throttle");
 async function throttle(params) {
-  log10.warn('Command "throttle" is deprecated and will be removed with the next major version release! Use `throttleNetwork` instead.');
-  const browser = getBrowserObject6(this);
-  await browser.throttleNetwork(params);
+  log11.warn('Command "throttle" is deprecated and will be removed with the next major version release! Use `throttleNetwork` instead.');
+  const browser2 = getBrowserObject6(this);
+  await browser2.throttleNetwork(params);
 }
 
 // src/commands/browser/throttleCPU.ts
@@ -3906,8 +3967,8 @@ async function throttleNetwork(params) {
     throw new Error(`Invalid parameter for "throttleNetwork". Expected it to be typeof object or one of the following values: ${NETWORK_PRESET_TYPES.join(", ")} but found "${params}"`);
   }
   if (this.isSauce) {
-    const browser = getBrowserObject7(this);
-    await browser.sauceThrottleNetwork(params);
+    const browser2 = getBrowserObject7(this);
+    await browser2.sauceThrottleNetwork(params);
     return null;
   }
   const failedConnectionMessage = "No Puppeteer connection could be established which is required to use this command";
@@ -4023,22 +4084,22 @@ async function uploadFile(localPath) {
 
 // src/networkManager.ts
 var networkManager = /* @__PURE__ */ new Map();
-function getNetworkManager(browser) {
-  const existingNetworkManager = networkManager.get(browser);
+function getNetworkManager(browser2) {
+  const existingNetworkManager = networkManager.get(browser2);
   if (existingNetworkManager) {
     return existingNetworkManager;
   }
-  const newContext = new NetworkManager(browser);
-  networkManager.set(browser, newContext);
+  const newContext = new NetworkManager(browser2);
+  networkManager.set(browser2, newContext);
   return newContext;
 }
 var NetworkManager = class {
   #browser;
   #initialize;
   #requests = /* @__PURE__ */ new Map();
-  constructor(browser) {
-    this.#browser = browser;
-    if (!browser.isBidi || process.env.VITEST_WORKER_ID || browser.options?.automationProtocol !== "webdriver") {
+  constructor(browser2) {
+    this.#browser = browser2;
+    if (!browser2.isBidi || process.env.VITEST_WORKER_ID || browser2.options?.automationProtocol !== "webdriver") {
       this.#initialize = Promise.resolve(true);
       return;
     }
@@ -4058,15 +4119,15 @@ var NetworkManager = class {
   async initialize() {
     return this.#initialize;
   }
-  #beforeRequestSent(log18) {
-    if (log18.navigation) {
+  #beforeRequestSent(log19) {
+    if (log19.navigation) {
       return;
     }
-    const request = log18.context ? this.#requests.get(log18.context) : void 0;
+    const request = log19.context ? this.#requests.get(log19.context) : void 0;
     if (!request) {
       return;
     }
-    const { request: id, headers, cookies, url: url6 } = log18.request;
+    const { request: id, headers, cookies, url: url6 } = log19.request;
     request.children?.push({
       id,
       url: url6,
@@ -4082,66 +4143,66 @@ var NetworkManager = class {
         sameSite: cookie.sameSite,
         expiry: cookie.expiry
       })),
-      timestamp: log18.timestamp
+      timestamp: log19.timestamp
     });
   }
-  #navigationStarted(log18) {
+  #navigationStarted(log19) {
     if (
       /**
        * we need a navigation id to identify the request
        */
-      !log18.navigation || /**
+      !log19.navigation || /**
        * ignore urls that do not start with http
        */
-      !log18.url.startsWith("http")
+      !log19.url.startsWith("http")
     ) {
-      if (log18.navigation === null && log18.url === "") {
-        return this.#requests.set(log18.context, {
+      if (log19.navigation === null && log19.url === "") {
+        return this.#requests.set(log19.context, {
           url: "",
           headers: {},
-          timestamp: log18.timestamp,
+          timestamp: log19.timestamp,
           redirectChain: [],
           children: []
         });
       }
       return;
     }
-    this.#requests.set(log18.context, {
-      url: log18.url,
+    this.#requests.set(log19.context, {
+      url: log19.url,
       headers: {},
-      timestamp: log18.timestamp,
-      navigation: log18.navigation,
+      timestamp: log19.timestamp,
+      navigation: log19.navigation,
       redirectChain: [],
       children: []
     });
   }
-  #fetchError(log18) {
-    const response = log18.context ? this.#requests.get(log18.context) : void 0;
+  #fetchError(log19) {
+    const response = log19.context ? this.#requests.get(log19.context) : void 0;
     if (!response) {
       return;
     }
-    const request = response.children?.find((child) => child.id === log18.request.request);
+    const request = response.children?.find((child) => child.id === log19.request.request);
     if (!request) {
       return;
     }
-    request.error = log18.errorText;
+    request.error = log19.errorText;
   }
-  #responseCompleted(log18) {
-    const response = log18.context ? this.#requests.get(log18.context) : void 0;
+  #responseCompleted(log19) {
+    const response = log19.context ? this.#requests.get(log19.context) : void 0;
     if (!response) {
       return;
     }
     if (!response.navigation && response.url === "") {
-      response.url = log18.request.url;
-      response.navigation = log18.navigation;
+      response.url = log19.request.url;
+      response.navigation = log19.navigation;
     }
-    if (log18.navigation === response.navigation) {
-      if (response.url !== log18.response.url) {
+    if (log19.navigation === response.navigation) {
+      if (response.url !== log19.response.url) {
         response.redirectChain?.push(response.url);
       }
-      response.url = log18.response.url;
-      const { headers: requestHeaders } = log18.request;
-      const { fromCache, headers: responseHeaders, mimeType, status } = log18.response;
+      response.url = log19.response.url;
+      const { headers: requestHeaders } = log19.request;
+      const { fromCache, headers: responseHeaders, mimeType, status } = log19.response;
       response.headers = headerListToObject(requestHeaders), response.response = {
         fromCache,
         headers: headerListToObject(responseHeaders),
@@ -4150,15 +4211,15 @@ var NetworkManager = class {
       };
       return;
     }
-    const request = response.children?.find((child) => child.id === log18.request.request);
+    const request = response.children?.find((child) => child.id === log19.request.request);
     if (!request) {
       return;
     }
     request.response = {
-      fromCache: log18.response.fromCache,
-      headers: headerListToObject(log18.response.headers),
-      mimeType: log18.response.mimeType,
-      status: log18.response.status
+      fromCache: log19.response.fromCache,
+      headers: headerListToObject(log19.response.headers),
+      mimeType: log19.response.mimeType,
+      status: log19.response.status
     };
     response.children?.push(request);
   }
@@ -4206,7 +4267,8 @@ async function url3(path4, options = {}) {
   }
   if (this.isBidi) {
     let resetPreloadScript;
-    const context = await this.getWindowHandle();
+    const contextManager2 = getContextManager(this);
+    const context = await contextManager2.getCurrentContext();
     if (options.onBeforeLoad) {
       if (typeof options.onBeforeLoad !== "function") {
         throw new Error(`Option "onBeforeLoad" must be a function, but received: ${typeof options.onBeforeLoad}`);
@@ -4363,9 +4425,9 @@ function clearValue() {
 }
 
 // src/commands/element/click.ts
-import logger11 from "@wdio/logger";
+import logger12 from "@wdio/logger";
 import { getBrowserObject as getBrowserObject8 } from "@wdio/utils";
-var log11 = logger11("webdriver");
+var log12 = logger12("webdriver");
 function click(options) {
   if (typeof options !== "undefined") {
     if (typeof options !== "object" || Array.isArray(options)) {
@@ -4407,18 +4469,18 @@ async function actionClick(element, options) {
   if (!buttonValue.includes(button)) {
     throw new Error("Button type not supported.");
   }
-  const browser = getBrowserObject8(element);
+  const browser2 = getBrowserObject8(element);
   if (x || y) {
-    const { width, height } = await browser.getElementRect(element.elementId);
+    const { width, height } = await browser2.getElementRect(element.elementId);
     if (x && x < -Math.floor(width / 2) || x && x > Math.floor(width / 2)) {
-      log11.warn("x would cause a out of bounds error as it goes outside of element");
+      log12.warn("x would cause a out of bounds error as it goes outside of element");
     }
     if (y && y < -Math.floor(height / 2) || y && y > Math.floor(height / 2)) {
-      log11.warn("y would cause a out of bounds error as it goes outside of element");
+      log12.warn("y would cause a out of bounds error as it goes outside of element");
     }
   }
   const clickNested = async () => {
-    await browser.action("pointer", {
+    await browser2.action("pointer", {
       parameters: { pointerType: "mouse" }
     }).move({ origin: element, x, y }).down({ button }).up({ button }).perform(skipRelease);
   };
@@ -4478,8 +4540,8 @@ async function custom$2(strategyName, ...strategyArguments) {
 // src/commands/element/doubleClick.ts
 import { getBrowserObject as getBrowserObject11 } from "@wdio/utils";
 async function doubleClick() {
-  const browser = getBrowserObject11(this);
-  return browser.action("pointer", { parameters: { pointerType: "mouse" } }).move({ origin: this }).down().up().pause(10).down().up().perform();
+  const browser2 = getBrowserObject11(this);
+  return browser2.action("pointer", { parameters: { pointerType: "mouse" } }).move({ origin: this }).down().up().pause(10).down().up().perform();
 }
 
 // src/commands/element/dragAndDrop.ts
@@ -4510,8 +4572,8 @@ async function dragAndDrop(target, { duration = 10 } = {}) {
   const targetOrigin = isMovingToElement ? targetRef : "pointer";
   const targetX = isMovingToElement ? 0 : moveToCoordinates.x;
   const targetY = isMovingToElement ? 0 : moveToCoordinates.y;
-  const browser = getBrowserObject12(this);
-  return browser.action("pointer").move({ duration: 0, origin, x: 0, y: 0 }).down({ button: ACTION_BUTTON }).pause(10).move({ duration, origin: targetOrigin, x: targetX, y: targetY }).up({ button: ACTION_BUTTON }).perform();
+  const browser2 = getBrowserObject12(this);
+  return browser2.action("pointer").move({ duration: 0, origin, x: 0, y: 0 }).down({ button: ACTION_BUTTON }).pause(10).move({ duration, origin: targetOrigin, x: targetX, y: targetY }).up({ button: ACTION_BUTTON }).perform();
 }
 
 // src/commands/element/execute.ts
@@ -4520,7 +4582,8 @@ async function execute2(script, ...args) {
     throw new Error("number or type of arguments don't agree with execute protocol command");
   }
   if (this.isBidi) {
-    const context = await this.getWindowHandle();
+    const contextManager2 = getContextManager(browser);
+    const context = await contextManager2.getCurrentContext();
     const result = await this.scriptCallFunction({
       functionDeclaration: script.toString(),
       awaitPromise: false,
@@ -4543,7 +4606,8 @@ async function executeAsync2(script, ...args) {
     throw new Error("number or type of arguments don't agree with execute protocol command");
   }
   if (this.isBidi) {
-    const context = await this.getWindowHandle();
+    const contextManager2 = getContextManager(browser);
+    const context = await contextManager2.getCurrentContext();
     const functionDeclaration = `function (...args) {
             return new Promise(async (resolve, reject) => {
                 try {
@@ -4640,9 +4704,9 @@ function mergeEqualSymmetricalValue(cssValues) {
   return newCssValues.join(" ");
 }
 async function getPseudoElementCSSValue(elem, options) {
-  const browser = getBrowserObject13(elem);
+  const browser2 = getBrowserObject13(elem);
   const { cssProperty, pseudoElement } = options;
-  const cssValue2 = await browser.execute(
+  const cssValue2 = await browser2.execute(
     (elem2, pseudoElement2, cssProperty2) => window.getComputedStyle(elem2, pseudoElement2)[cssProperty2],
     elem,
     pseudoElement,
@@ -4672,17 +4736,17 @@ import { prettify as prettifyFn } from "htmlfy";
 import { getBrowserObject as getBrowserObject14 } from "@wdio/utils";
 
 // src/shadowRoot.ts
-import logger12 from "@wdio/logger";
+import logger13 from "@wdio/logger";
 import customElementWrapper from "./scripts/customElement.js";
 var shadowRootManager = /* @__PURE__ */ new Map();
-var log12 = logger12("webdriverio:ShadowRootManager");
-function getShadowRootManager(browser) {
-  const existingShadowRootManager = shadowRootManager.get(browser);
+var log13 = logger13("webdriverio:ShadowRootManager");
+function getShadowRootManager(browser2) {
+  const existingShadowRootManager = shadowRootManager.get(browser2);
   if (existingShadowRootManager) {
     return existingShadowRootManager;
   }
-  const newContext = new ShadowRootManager(browser);
-  shadowRootManager.set(browser, newContext);
+  const newContext = new ShadowRootManager(browser2);
+  shadowRootManager.set(browser2, newContext);
   return newContext;
 }
 var ShadowRootManager = class {
@@ -4690,9 +4754,9 @@ var ShadowRootManager = class {
   #initialize;
   #shadowRoots = /* @__PURE__ */ new Map();
   #frameDepth = 0;
-  constructor(browser) {
-    this.#browser = browser;
-    if (!browser.isBidi || process.env.VITEST_WORKER_ID || browser.options?.automationProtocol !== "webdriver") {
+  constructor(browser2) {
+    this.#browser = browser2;
+    if (!browser2.isBidi || process.env.VITEST_WORKER_ID || browser2.options?.automationProtocol !== "webdriver") {
       this.#initialize = Promise.resolve(true);
       return;
     }
@@ -4701,7 +4765,7 @@ var ShadowRootManager = class {
     }).then(() => true, () => false);
     this.#browser.on("log.entryAdded", this.handleLogEntry.bind(this));
     this.#browser.on("result", this.#commandResultHandler.bind(this));
-    browser.scriptAddPreloadScript({
+    browser2.scriptAddPreloadScript({
       functionDeclaration: customElementWrapper.toString()
     });
   }
@@ -4772,9 +4836,9 @@ var ShadowRootManager = class {
         !shadowElem.value?.shadowRoot?.sharedId || // we expect the shadow root to have a proper type
         shadowElem.value.shadowRoot.value?.nodeType !== 11
       ) {
-        return log12.warn(`Expected element with shadow root but found <${shadowElem.value?.localName} />`);
+        return log13.warn(`Expected element with shadow root but found <${shadowElem.value?.localName} />`);
       }
-      log12.info(`Registered new shadow root for element <${shadowElem.value.localName} /> with id ${shadowElem.value.shadowRoot.sharedId}`);
+      log13.info(`Registered new shadow root for element <${shadowElem.value.localName} /> with id ${shadowElem.value.shadowRoot.sharedId}`);
       const newTree = new ShadowRootTree(
         shadowElem.sharedId,
         shadowElem.value.shadowRoot.sharedId,
@@ -4919,7 +4983,7 @@ import getHTMLShadowScript from "./scripts/getHTMLShadow.js";
 var SHADOW_ID_ATTR_NAME = "data-wdio-shadow-id";
 var SHADOW_ID_ATTR = `[${SHADOW_ID_ATTR_NAME}]`;
 async function getHTML(options = {}) {
-  const browser = getBrowserObject14(this);
+  const browser2 = getBrowserObject14(this);
   if (typeof options !== "object" && typeof options === "boolean") {
     options = { includeSelectorTag: options };
   } else if (typeof options !== "object") {
@@ -4933,7 +4997,7 @@ async function getHTML(options = {}) {
     excludeElements: []
   }, options);
   const basicGetHTML = (elementId, includeSelectorTag2) => {
-    return browser.execute(getHTMLScript, {
+    return browser2.execute(getHTMLScript, {
       [ELEMENT_KEY11]: elementId,
       // w3c compatible
       ELEMENT: elementId
@@ -4949,11 +5013,12 @@ async function getHTML(options = {}) {
       );
     }
     const { load } = await import("cheerio");
-    const shadowRootManager2 = getShadowRootManager(browser);
-    const handle = await browser.getWindowHandle();
-    const shadowRootElementPairs = shadowRootManager2.getShadowElementPairsByContextId(handle, this.elementId);
+    const shadowRootManager2 = getShadowRootManager(browser2);
+    const contextManager2 = getContextManager(browser2);
+    const context = await contextManager2.getCurrentContext();
+    const shadowRootElementPairs = shadowRootManager2.getShadowElementPairsByContextId(context, this.elementId);
     const elementsWithShadowRootAndIdVerified = (await Promise.all(
-      shadowRootElementPairs.map(([elemId, elem]) => browser.execute((elem2) => elem2.tagName, { [ELEMENT_KEY11]: elemId }).then(
+      shadowRootElementPairs.map(([elemId, elem]) => browser2.execute((elem2) => elem2.tagName, { [ELEMENT_KEY11]: elemId }).then(
         () => [elemId, elem],
         () => void 0
       ))
@@ -4962,7 +5027,7 @@ async function getHTML(options = {}) {
       { [ELEMENT_KEY11]: elemId },
       shadowId ? { [ELEMENT_KEY11]: shadowId } : void 0
     ]);
-    const { html, shadowElementHTML } = await browser.execute(
+    const { html, shadowElementHTML } = await browser2.execute(
       getHTMLShadowScript,
       { [ELEMENT_KEY11]: this.elementId },
       includeSelectorTag,
@@ -4972,7 +5037,7 @@ async function getHTML(options = {}) {
     populateHTML($3, shadowElementHTML.map(({ id, ...props }) => ({
       ...props,
       id,
-      mode: shadowRootManager2.getShadowRootModeById(handle, id) || "open"
+      mode: shadowRootManager2.getShadowRootModeById(context, id) || "open"
     })));
     return sanitizeHTML($3, { removeCommentNodes, prettify, excludeElements });
   }
@@ -5072,8 +5137,8 @@ async function isClickable() {
   if (this.isMobile && await this.getContext().catch(() => void 0) === "NATIVE_APP") {
     throw new Error("Method not supported in mobile native environment. It is unlikely that you need to use this command.");
   }
-  const browser = getBrowserObject15(this);
-  return browser.execute(isElementClickableScript, {
+  const browser2 = getBrowserObject15(this);
+  return browser2.execute(isElementClickableScript, {
     [ELEMENT_KEY12]: this.elementId,
     // w3c compatible
     ELEMENT: this.elementId
@@ -5086,12 +5151,12 @@ import { getBrowserObject as getBrowserObject16 } from "@wdio/utils";
 import isElementDisplayedScript from "./scripts/isElementDisplayed.js";
 import isElementInViewportScript from "./scripts/isElementInViewport.js";
 async function isDisplayed(commandParams = { withinViewport: false }) {
-  const browser = getBrowserObject16(this);
+  const browser2 = getBrowserObject16(this);
   if (!await hasElementId(this)) {
     return false;
   }
-  const isNativeApplication = !browser.capabilities.browserName;
-  if (browser.isMobile && isNativeApplication) {
+  const isNativeApplication = !browser2.capabilities.browserName;
+  if (browser2.isMobile && isNativeApplication) {
     if (commandParams?.withinViewport) {
       throw new Error(
         "Cannot determine element visibility within viewport for native mobile apps as it is not feasible to determine full vertical and horizontal application bounds. In most cases a basic visibility check should suffice."
@@ -5099,9 +5164,9 @@ async function isDisplayed(commandParams = { withinViewport: false }) {
     }
     return await this.isElementDisplayed(this.elementId);
   }
-  const isDisplayed2 = await browser.execute(isElementDisplayedScript, this);
+  const isDisplayed2 = await browser2.execute(isElementDisplayedScript, this);
   if (isDisplayed2 && commandParams?.withinViewport) {
-    return browser.execute(isElementInViewportScript, this);
+    return browser2.execute(isElementInViewportScript, this);
   }
   return isDisplayed2;
 }
@@ -5121,9 +5186,9 @@ var getWebElement = (el) => ({
   // jsonwp compatible
 });
 async function isEqual(el) {
-  const browser = getBrowserObject17(this);
-  if (browser.isMobile) {
-    const context = await browser.getContext().catch(() => void 0);
+  const browser2 = getBrowserObject17(this);
+  if (browser2.isMobile) {
+    const context = await browser2.getContext().catch(() => void 0);
     const contextId = typeof context === "string" ? context : context?.id;
     if (contextId && contextId.toLowerCase().includes("native")) {
       return this.elementId === el.elementId;
@@ -5131,7 +5196,7 @@ async function isEqual(el) {
   }
   let result;
   try {
-    result = await browser.execute(
+    result = await browser2.execute(
       /* istanbul ignore next */
       function(el1, el2) {
         return el1 === el2;
@@ -5162,8 +5227,8 @@ import { ELEMENT_KEY as ELEMENT_KEY14 } from "webdriver";
 import { getBrowserObject as getBrowserObject18 } from "@wdio/utils";
 import isFocusedScript from "./scripts/isFocused.js";
 async function isFocused() {
-  const browser = await getBrowserObject18(this);
-  return browser.execute(isFocusedScript, {
+  const browser2 = await getBrowserObject18(this);
+  return browser2.execute(isFocusedScript, {
     [ELEMENT_KEY14]: this.elementId,
     // w3c compatible
     ELEMENT: this.elementId
@@ -5181,8 +5246,8 @@ import { ELEMENT_KEY as ELEMENT_KEY15 } from "webdriver";
 import { getBrowserObject as getBrowserObject19 } from "@wdio/utils";
 import isElementStable from "./scripts/isElementStable.js";
 async function isStable() {
-  const browser = getBrowserObject19(this);
-  return await browser.executeAsync(isElementStable, {
+  const browser2 = getBrowserObject19(this);
+  return await browser2.executeAsync(isElementStable, {
     [ELEMENT_KEY15]: this.elementId,
     // w3c compatible
     ELEMENT: this.elementId
@@ -5191,22 +5256,22 @@ async function isStable() {
 }
 
 // src/commands/element/moveTo.ts
-import logger13 from "@wdio/logger";
+import logger14 from "@wdio/logger";
 import { getBrowserObject as getBrowserObject20 } from "@wdio/utils";
-var log13 = logger13("webdriver");
+var log14 = logger14("webdriver");
 async function moveTo({ xOffset, yOffset } = {}) {
-  const browser = getBrowserObject20(this);
+  const browser2 = getBrowserObject20(this);
   if (xOffset || yOffset) {
-    const { width, height } = await browser.getElementRect(this.elementId);
+    const { width, height } = await browser2.getElementRect(this.elementId);
     if (xOffset && xOffset < -Math.floor(width / 2) || xOffset && xOffset > Math.floor(width / 2)) {
-      log13.warn("xOffset would cause a out of bounds error as it goes outside of element");
+      log14.warn("xOffset would cause a out of bounds error as it goes outside of element");
     }
     if (yOffset && yOffset < -Math.floor(height / 2) || yOffset && yOffset > Math.floor(height / 2)) {
-      log13.warn("yOffset would cause a out of bounds error as it goes outside of element");
+      log14.warn("yOffset would cause a out of bounds error as it goes outside of element");
     }
   }
   const moveToNested = async () => {
-    await browser.action("pointer", { parameters: { pointerType: "mouse" } }).move({ origin: this, x: xOffset || 0, y: yOffset || 0 }).perform();
+    await browser2.action("pointer", { parameters: { pointerType: "mouse" } }).move({ origin: this, x: xOffset || 0, y: yOffset || 0 }).perform();
   };
   try {
     await moveToNested();
@@ -5258,10 +5323,10 @@ async function react$$2(selector, { props = {}, state = {} } = {}) {
     const resqScriptPath = url4.fileURLToPath(await resolve3("resq", import.meta.url));
     resqScript3 = (await fs8.readFile(resqScriptPath)).toString();
   }
-  const browser = await getBrowserObject21(this);
+  const browser2 = await getBrowserObject21(this);
   await this.executeScript(resqScript3.toString(), []);
-  await browser.execute(waitToLoadReact3);
-  const res = await browser.execute(
+  await browser2.execute(waitToLoadReact3);
+  const res = await browser2.execute(
     react$$Script2,
     selector,
     props,
@@ -5284,10 +5349,10 @@ async function react$2(selector, { props = {}, state = {} } = {}) {
     const resqScriptPath = url5.fileURLToPath(await resolve4("resq", import.meta.url));
     resqScript4 = (await fs9.readFile(resqScriptPath)).toString();
   }
-  const browser = await getBrowserObject22(this);
+  const browser2 = await getBrowserObject22(this);
   await this.executeScript(resqScript4.toString(), []);
-  await browser.execute(waitToLoadReact4);
-  const res = await browser.execute(
+  await browser2.execute(waitToLoadReact4);
+  const res = await browser2.execute(
     react$Script2,
     selector,
     props,
@@ -5312,13 +5377,13 @@ async function saveScreenshot2(filepath) {
 }
 
 // src/commands/element/scrollIntoView.ts
-import logger14 from "@wdio/logger";
+import logger15 from "@wdio/logger";
 import { ELEMENT_KEY as ELEMENT_KEY16 } from "webdriver";
 import { getBrowserObject as getBrowserObject23 } from "@wdio/utils";
-var log14 = logger14("webdriverio");
+var log15 = logger15("webdriverio");
 function scrollIntoViewWeb(options = { block: "start", inline: "nearest" }) {
-  const browser = getBrowserObject23(this);
-  return browser.execute(
+  const browser2 = getBrowserObject23(this);
+  return browser2.execute(
     (elem, options2) => elem.scrollIntoView(options2),
     {
       [ELEMENT_KEY16]: this.elementId,
@@ -5330,14 +5395,14 @@ function scrollIntoViewWeb(options = { block: "start", inline: "nearest" }) {
   );
 }
 async function scrollIntoView(options = { block: "start", inline: "nearest" }) {
-  const browser = getBrowserObject23(this);
-  if (browser.isMobile) {
+  const browser2 = getBrowserObject23(this);
+  if (browser2.isMobile) {
     return scrollIntoViewWeb.call(this, options);
   }
   try {
-    const elemRect = await browser.getElementRect(this.elementId);
-    const viewport = await browser.getWindowSize();
-    let [scrollX, scrollY] = await browser.execute(() => [
+    const elemRect = await browser2.getElementRect(this.elementId);
+    const viewport = await browser2.getWindowSize();
+    let [scrollX, scrollY] = await browser2.execute(() => [
       window.scrollX,
       window.scrollY
     ]);
@@ -5372,9 +5437,9 @@ async function scrollIntoView(options = { block: "start", inline: "nearest" }) {
     }
     deltaX = Math.round(deltaX - scrollX);
     deltaY = Math.round(deltaY - scrollY);
-    await browser.action("wheel").scroll({ duration: 0, x: deltaX, y: deltaY, origin: this }).perform();
+    await browser2.action("wheel").scroll({ duration: 0, x: deltaX, y: deltaY, origin: this }).perform();
   } catch (err) {
-    log14.warn(
+    log15.warn(
       `Failed to execute "scrollIntoView" using WebDriver Actions API: ${err.message}!
 Re-attempting using \`Element.scrollIntoView\` via Web API.`
     );
@@ -5439,7 +5504,7 @@ async function setValue(value) {
 }
 
 // src/commands/element/shadow$$.ts
-import logger15 from "@wdio/logger";
+import logger16 from "@wdio/logger";
 import { getBrowserObject as getBrowserObject24 } from "@wdio/utils";
 import { SHADOW_ELEMENT_KEY } from "webdriver";
 import { shadowFnFactory } from "./scripts/shadowFnFactory.js";
@@ -5766,17 +5831,17 @@ var createRoleBaseXpathSelector = (role) => {
 };
 
 // src/commands/element/shadow$$.ts
-var log15 = logger15("webdriverio");
+var log16 = logger16("webdriverio");
 async function shadow$$(selector) {
-  const browser = getBrowserObject24(this);
+  const browser2 = getBrowserObject24(this);
   try {
-    const shadowRoot = await browser.getElementShadowRoot(this.elementId);
+    const shadowRoot = await browser2.getElementShadowRoot(this.elementId);
     const { using, value } = findStrategy(selector, this.isW3C, this.isMobile);
-    const res = await browser.findElementsFromShadowRoot(shadowRoot[SHADOW_ELEMENT_KEY], using, value);
+    const res = await browser2.findElementsFromShadowRoot(shadowRoot[SHADOW_ELEMENT_KEY], using, value);
     const elements = await getElements.call(this, selector, res, { isShadowElement: true });
     return enhanceElementsArray(elements, this, selector);
   } catch (err) {
-    log15.warn(
+    log16.warn(
       `Failed to fetch element within shadow DOM using WebDriver command: ${err.message}!
 Falling back to JavaScript shim.`
     );
@@ -5785,20 +5850,20 @@ Falling back to JavaScript shim.`
 }
 
 // src/commands/element/shadow$.ts
-import logger16 from "@wdio/logger";
+import logger17 from "@wdio/logger";
 import { SHADOW_ELEMENT_KEY as SHADOW_ELEMENT_KEY2 } from "webdriver";
 import { shadowFnFactory as shadowFnFactory2 } from "./scripts/shadowFnFactory.js";
 import { getBrowserObject as getBrowserObject25 } from "@wdio/utils";
-var log16 = logger16("webdriverio");
+var log17 = logger17("webdriverio");
 async function shadow$(selector) {
-  const browser = getBrowserObject25(this);
+  const browser2 = getBrowserObject25(this);
   try {
-    const shadowRoot = await browser.getElementShadowRoot(this.elementId);
+    const shadowRoot = await browser2.getElementShadowRoot(this.elementId);
     const { using, value } = findStrategy(selector, this.isW3C, this.isMobile);
-    const res = await browser.findElementFromShadowRoot(shadowRoot[SHADOW_ELEMENT_KEY2], using, value);
+    const res = await browser2.findElementFromShadowRoot(shadowRoot[SHADOW_ELEMENT_KEY2], using, value);
     return getElement.call(this, selector, res, { isShadowElement: true });
   } catch (err) {
-    log16.warn(
+    log17.warn(
       `Failed to fetch element within shadow DOM using WebDriver command: ${err.message}!
 Falling back to JavaScript shim.`
     );
@@ -6097,7 +6162,7 @@ function querySelectorAllDeep(findMany, s, r) {
 }
 
 // src/utils/index.ts
-var log17 = logger17("webdriverio");
+var log18 = logger18("webdriverio");
 var INVALID_SELECTOR_ERROR = "selector needs to be typeof `string` or `function`";
 var IGNORED_COMMAND_FILE_EXPORTS = ["SESSION_MOCKS", "CDP_SESSIONS"];
 var scopes = {
@@ -6221,9 +6286,10 @@ function transformClassicToBidiSelector(using, value) {
   throw new Error(`Can't transform classic selector ${using} to Bidi selector`);
 }
 async function findDeepElement(selector) {
-  const browser = getBrowserObject26(this);
-  const shadowRootManager2 = getShadowRootManager(browser);
-  const context = await browser.getWindowHandle();
+  const browser2 = getBrowserObject26(this);
+  const shadowRootManager2 = getShadowRootManager(browser2);
+  const contextManager2 = getContextManager(browser2);
+  const context = await contextManager2.getCurrentContext();
   const shadowRoots = shadowRootManager2.getShadowElementsByContextId(
     context,
     this.elementId
@@ -6231,7 +6297,7 @@ async function findDeepElement(selector) {
   const { using, value } = findStrategy(selector, this.isW3C, this.isMobile);
   const locator = transformClassicToBidiSelector(using, value);
   const startNodes = shadowRoots.length > 0 ? shadowRoots.map((shadowRootNodeId) => ({ sharedId: shadowRootNodeId })) : this.elementId ? [{ sharedId: this.elementId }] : void 0;
-  const deepElementResult = await browser.browsingContextLocateNodes({ locator, context, startNodes }).then(async (result) => {
+  const deepElementResult = await browser2.browsingContextLocateNodes({ locator, context, startNodes }).then(async (result) => {
     const nodes = result.nodes.filter((node) => Boolean(node.sharedId)).map((node) => ({
       [ELEMENT_KEY17]: node.sharedId,
       locator
@@ -6240,7 +6306,7 @@ async function findDeepElement(selector) {
       return nodes[0];
     }
     const scopedNodes = await Promise.all(nodes.map(async (node) => {
-      const isIn = await browser.execute(
+      const isIn = await browser2.execute(
         elementContains,
         { [ELEMENT_KEY17]: this.elementId },
         node
@@ -6249,8 +6315,8 @@ async function findDeepElement(selector) {
     })).then((elems) => elems.filter(([isIn]) => isIn).map(([, elem]) => elem));
     return scopedNodes[0];
   }, (err) => {
-    log17.warn(`Failed to execute browser.browsingContextLocateNodes({ ... }) due to ${err}, falling back to regular WebDriver Classic command`);
-    return browser.findElement(using, value);
+    log18.warn(`Failed to execute browser.browsingContextLocateNodes({ ... }) due to ${err}, falling back to regular WebDriver Classic command`);
+    return browser2.findElement(using, value);
   });
   if (!deepElementResult) {
     return new Error(`Couldn't find element with selector "${selector}"`);
@@ -6258,9 +6324,10 @@ async function findDeepElement(selector) {
   return deepElementResult;
 }
 async function findDeepElements(selector) {
-  const browser = getBrowserObject26(this);
-  const shadowRootManager2 = getShadowRootManager(browser);
-  const context = await browser.getWindowHandle();
+  const browser2 = getBrowserObject26(this);
+  const shadowRootManager2 = getShadowRootManager(browser2);
+  const contextManager2 = getContextManager(browser2);
+  const context = await contextManager2.getCurrentContext();
   const shadowRoots = shadowRootManager2.getShadowElementsByContextId(
     context,
     this.elementId
@@ -6268,7 +6335,7 @@ async function findDeepElements(selector) {
   const { using, value } = findStrategy(selector, this.isW3C, this.isMobile);
   const locator = transformClassicToBidiSelector(using, value);
   const startNodes = shadowRoots.length > 0 ? shadowRoots.map((shadowRootNodeId) => ({ sharedId: shadowRootNodeId })) : this.elementId ? [{ sharedId: this.elementId }] : void 0;
-  const deepElementResult = await browser.browsingContextLocateNodes({ locator, context, startNodes }).then(async (result) => {
+  const deepElementResult = await browser2.browsingContextLocateNodes({ locator, context, startNodes }).then(async (result) => {
     const nodes = result.nodes.filter((node) => Boolean(node.sharedId)).map((node) => ({
       [ELEMENT_KEY17]: node.sharedId,
       locator
@@ -6277,7 +6344,7 @@ async function findDeepElements(selector) {
       return nodes;
     }
     const scopedNodes = await Promise.all(nodes.map(async (node) => {
-      const isIn = await browser.execute(
+      const isIn = await browser2.execute(
         elementContains,
         { [ELEMENT_KEY17]: this.elementId },
         node
@@ -6286,8 +6353,8 @@ async function findDeepElements(selector) {
     })).then((elems) => elems.filter(([isIn]) => isIn).map(([, elem]) => elem));
     return scopedNodes;
   }, (err) => {
-    log17.warn(`Failed to execute browser.browsingContextLocateNodes({ ... }) due to ${err}, falling back to regular WebDriver Classic command`);
-    return browser.findElements(using, value);
+    log18.warn(`Failed to execute browser.browsingContextLocateNodes({ ... }) due to ${err}, falling back to regular WebDriver Classic command`);
+    return browser2.findElements(using, value);
   });
   return deepElementResult;
 }
@@ -6414,7 +6481,7 @@ async function getElementRect(scope) {
       if (rectJs && typeof rectJs[key] === "number") {
         rect[key] = Math.floor(rectJs[key]);
       } else {
-        log17.error("getElementRect", { rect, rectJs, key });
+        log18.error("getElementRect", { rect, rectJs, key });
         throw new Error("Failed to receive element rects via execute command");
       }
     });
@@ -6788,7 +6855,7 @@ import { capabilitiesEnvironmentDetector } from "@wdio/utils";
 var ProtocolStub = class {
   static async newSession(options) {
     const capabilities = emulateSessionCapabilities(options.capabilities);
-    const browser = {
+    const browser2 = {
       options,
       capabilities,
       requestedCapabilities: capabilities,
@@ -6799,9 +6866,9 @@ var ProtocolStub = class {
       commandList: [],
       ...capabilitiesEnvironmentDetector(capabilities)
     };
-    browser.addCommand = (...args) => browser.customCommands.push(args);
-    browser.overwriteCommand = (...args) => browser.overwrittenCommands.push(args);
-    return browser;
+    browser2.addCommand = (...args) => browser2.customCommands.push(args);
+    browser2.overwriteCommand = (...args) => browser2.overwrittenCommands.push(args);
+    return browser2;
   }
   /**
    * added just in case user wants to somehow reload webdriver before it was started.
@@ -6849,22 +6916,22 @@ async function getProtocolDriver(options) {
 
 // src/dialog.ts
 var dialogManager = /* @__PURE__ */ new Map();
-function getDialogManager(browser) {
-  const existingDialogManager = dialogManager.get(browser);
+function getDialogManager(browser2) {
+  const existingDialogManager = dialogManager.get(browser2);
   if (existingDialogManager) {
     return existingDialogManager;
   }
-  const newContext = new DialogManager(browser);
-  dialogManager.set(browser, newContext);
+  const newContext = new DialogManager(browser2);
+  dialogManager.set(browser2, newContext);
   return newContext;
 }
 var DialogManager = class {
   #browser;
   #initialize;
   #autoHandleDialog = true;
-  constructor(browser) {
-    this.#browser = browser;
-    if (!browser.isBidi || process.env.VITEST_WORKER_ID || browser.options?.automationProtocol !== "webdriver") {
+  constructor(browser2) {
+    this.#browser = browser2;
+    if (!browser2.isBidi || process.env.VITEST_WORKER_ID || browser2.options?.automationProtocol !== "webdriver") {
       this.#initialize = Promise.resolve(true);
       return;
     }
@@ -6881,14 +6948,14 @@ var DialogManager = class {
   /**
    * capture shadow root elements propagated through console.debug
    */
-  async #handleUserPrompt(log18) {
+  async #handleUserPrompt(log19) {
     if (this.#autoHandleDialog) {
       return this.#browser.browsingContextHandleUserPrompt({
         accept: false,
-        context: log18.context
+        context: log19.context
       });
     }
-    const dialog = new Dialog(log18, this.#browser);
+    const dialog = new Dialog(log19, this.#browser);
     this.#browser.emit("dialog", dialog);
   }
   /**
@@ -6906,12 +6973,12 @@ var Dialog = class {
   #message;
   #defaultValue;
   #type;
-  constructor(event, browser) {
+  constructor(event, browser2) {
     this.#message = event.message;
     this.#defaultValue = event.defaultValue;
     this.#type = event.type;
     this.#context = event.context;
-    this.#browser = browser;
+    this.#browser = browser2;
   }
   message() {
     return this.#message;
@@ -6951,7 +7018,7 @@ var remote = async function(params, remoteModifier) {
   const keysToKeep = Object.keys(process.env.WDIO_WORKER_ID ? params : DEFAULTS);
   const config = validateConfig(WDIO_DEFAULTS, params, keysToKeep);
   await enableFileLogging(config.outputDir);
-  logger18.setLogLevelsConfig(config.logLevels, config.logLevel);
+  logger19.setLogLevelsConfig(config.logLevels, config.logLevel);
   const modifier = (client, options2) => {
     Object.assign(options2, Object.entries(config).reduce((a, [k, v]) => typeof v === "undefined" ? a : { ...a, [k]: v }, {}));
     if (typeof remoteModifier === "function") {
@@ -6972,7 +7039,8 @@ var remote = async function(params, remoteModifier) {
   await Promise.all([
     getShadowRootManager(instance).initialize(),
     getNetworkManager(instance).initialize(),
-    getDialogManager(instance).initialize()
+    getDialogManager(instance).initialize(),
+    getContextManager(instance).initialize()
   ]);
   return instance;
 };
@@ -6996,7 +7064,8 @@ var attach = async function(attachOptions) {
   await driver._bidiHandler?.connect().then(() => Promise.all([
     getShadowRootManager(driver).initialize(),
     getNetworkManager(driver).initialize(),
-    getDialogManager(driver).initialize()
+    getDialogManager(driver).initialize(),
+    getContextManager(driver).initialize()
   ]));
   return driver;
 };