From f2a1c068a13da19338f6c096b129b79b6a1647e4 Mon Sep 17 00:00:00 2001
From: Vishnu Vardhan <vishnu.p@browserstack.com>
Date: Tue, 19 May 2026 15:42:33 +0530
Subject: [PATCH 1/8] [BUG-195] - Regex fix

---
 .../app/src/components/browser/snapshot.ts    | 104 +++++++++++---
 packages/backend/src/index.ts                 |  16 ++-
 packages/backend/src/runner.ts                |  36 ++++-
 packages/service/src/constants.ts             |  16 +--
 packages/service/src/index.ts                 |  83 +++++++++--
 packages/service/src/launcher.ts              | 136 ++++++++++++++++++
 packages/service/src/reporter.ts              |  10 +-
 packages/service/src/session.ts               |  92 ++++++++++++
 packages/service/src/types.ts                 |   4 +
 packages/service/src/utils.ts                 |  23 +++
 10 files changed, 477 insertions(+), 43 deletions(-)

diff --git a/packages/app/src/components/browser/snapshot.ts b/packages/app/src/components/browser/snapshot.ts
index 20024e52..d74e0f25 100644
--- a/packages/app/src/components/browser/snapshot.ts
+++ b/packages/app/src/components/browser/snapshot.ts
@@ -133,10 +133,11 @@ export class DevtoolsBrowser extends Element {
 
       iframe {
         background-color: white;
-        flex: 1;
+        position: absolute;
+        top: 0;
+        left: 0;
         border: none;
         border-radius: 0 0 0.5rem 0.5rem;
-        min-height: 0;
       }
 
       .screenshot-overlay {
@@ -169,6 +170,7 @@ export class DevtoolsBrowser extends Element {
         position: relative;
         flex: 1;
         min-height: 0;
+        overflow: hidden;
         display: flex;
         flex-direction: column;
       }
@@ -249,7 +251,7 @@ export class DevtoolsBrowser extends Element {
 
   #setIframeSize() {
     const metadata = this.metadata
-    if (!this.section || !this.iframe || !this.header || !metadata) {
+    if (!this.section || !this.header || !metadata) {
       return
     }
 
@@ -262,26 +264,72 @@ export class DevtoolsBrowser extends Element {
       return
     }
 
-    this.iframe.removeAttribute('style')
-    const frameSize = this.getBoundingClientRect()
-    const headerSize = this.header.getBoundingClientRect()
-
-    let scale = frameSize.width / viewportWidth
-    if (scale > 0.85) {
-      /**
-       * Make sure we stop scaling at 85% of the viewport width to ensure
-       * we keep the aspect ratio. We substract 0.05 to have a bit of a
-       * padding
-       */
-      scale = frameSize.height / viewportHeight - 0.05
-    }
+    this.iframe?.removeAttribute('style')
 
-    this.section.style.width = `${viewportWidth * scale}px`
-    this.section.style.height = `${Math.min(frameSize.height, viewportHeight * scale)}px`
-    this.iframe.style.width = `${viewportWidth}px`
-    // this.iframe.style.height = `${(Math.min(frameSize.height, viewportHeight * scale) - headerSize.height)}px`
-    this.iframe.style.height = `${viewportHeight - headerSize.height / scale}px`
-    this.iframe.style.transform = `scale(${scale})`
+    // Defer the measurement to the next frame so we read post-reflow
+    // dimensions when the surrounding panel has just resized (e.g. Chrome
+    // DevTools opening/closing). Reading on the same tick as the resize
+    // event can return the pre-reflow size.
+    requestAnimationFrame(() => {
+      if (!this.section || !this.header) {
+        return
+      }
+      const frameSize = this.getBoundingClientRect()
+      const headerSize = this.header.getBoundingClientRect()
+      const hostStyle = getComputedStyle(this)
+
+      // getBoundingClientRect returns the padding-box; the section lives
+      // inside the content box, so the host's padding eats into what the
+      // section can actually claim. Subtract it explicitly — otherwise a
+      // height-limited scale can push section.width past the visible edge.
+      const padX =
+        parseFloat(hostStyle.paddingLeft || '0') +
+        parseFloat(hostStyle.paddingRight || '0')
+      const padY =
+        parseFloat(hostStyle.paddingTop || '0') +
+        parseFloat(hostStyle.paddingBottom || '0')
+
+      // Use the recorded viewport as authoritative — the iframe renders at
+      // that size and the section mirrors it. We tried fitting to the
+      // measured contentDocument scrollHeight to remove dead space below
+      // short pages, but the measurement races with async CSS loading:
+      // sites whose stylesheets arrive late report a near-zero scrollHeight
+      // at first paint, which made the section collapse to a strip even
+      // for full-height pages like github.com/login. Easier and more
+      // reliable to mirror what a real browser shows at the recorded size.
+      const effectiveViewportH = viewportHeight
+
+      // Fit the (effective) viewport into the area beneath the mock browser's
+      // header, preserving aspect ratio. min(scaleW, scaleH) is the standard
+      // "contain" sizing — guarantees no overflow on either axis whether the
+      // container is wider or taller than the viewport.
+      const availW = Math.max(0, frameSize.width - padX)
+      const availH = Math.max(0, frameSize.height - padY - headerSize.height)
+      const scale = Math.max(
+        0,
+        Math.min(availW / viewportWidth, availH / effectiveViewportH)
+      )
+
+      this.section.style.width = `${viewportWidth * scale}px`
+      this.section.style.height = `${effectiveViewportH * scale + headerSize.height}px`
+
+      // The iframe only exists in mutation-replay view — in screenshot/video
+      // modes the section is filled by an <img> or <video> instead, and
+      // there's nothing extra to size. Skip iframe-specific styling rather
+      // than bailing out: the section sizing above still needs to run so
+      // those modes also rescale on panel resize.
+      if (this.iframe) {
+        // The iframe is `position: absolute` inside an overflow:hidden
+        // wrapper, so the declared 1280×800 layout is honored regardless of
+        // the wrapper's flex sizing. transform-origin 0 0 anchors the scaled
+        // content to the wrapper's top-left, and the wrapper's overflow
+        // clips any sub-pixel overshoot.
+        this.iframe.style.width = `${viewportWidth}px`
+        this.iframe.style.height = `${viewportHeight}px`
+        this.iframe.style.transformOrigin = '0 0'
+        this.iframe.style.transform = `scale(${scale})`
+      }
+    })
   }
 
   #handleShowCommand = (event: Event) =>
@@ -320,6 +368,14 @@ export class DevtoolsBrowser extends Element {
     this.requestUpdate()
   }
 
+  // Re-fit on every render. View-mode flips (clicking an action, toggling
+  // video/snapshot) replace the iframe in the DOM with an <img> or <video>,
+  // which doesn't fire `resize` — without this, the section keeps its
+  // previous pixel size and the new content stays mis-sized.
+  updated() {
+    this.#setIframeSize()
+  }
+
   async #renderNewDocument(doc: SimplifiedVNode, baseUrl: string) {
     const root = transform(doc)
     const baseTag = h('base', { href: baseUrl })
@@ -351,6 +407,10 @@ export class DevtoolsBrowser extends Element {
      */
     ;[...this.#vdom.querySelectorAll('script')].forEach((el) => el.remove())
     docEl.ownerDocument.replaceChild(this.#vdom, docEl)
+
+    // The iframe's content just changed, so its measured height likely
+    // changed too. Re-fit the section so it hugs the new content.
+    this.#setIframeSize()
   }
 
   async #handleMutation(mutation: TraceMutation) {
diff --git a/packages/backend/src/index.ts b/packages/backend/src/index.ts
index d21dd4a6..664a4e50 100644
--- a/packages/backend/src/index.ts
+++ b/packages/backend/src/index.ts
@@ -199,7 +199,21 @@ export async function start(
             return
           }
 
-          // Strip videoPath before forwarding — the UI fetches via /api/video/:sessionId.
+          // Capture the WDIO/Nightwatch config file path the worker was
+          // launched with, so the rerun resolver targets the same config
+          // (handles non-standard names like `wdio.BUILD.conf.ts`). Stays
+          // backend-only — no need to forward to UI clients.
+          if (parsed.scope === 'config' && parsed.data?.configFile) {
+            testRunner.registerConfigFile(parsed.data.configFile)
+            log.info(
+              `Registered config file for reruns: ${parsed.data.configFile}`
+            )
+            return
+          }
+
+          // Intercept screencast messages: store the absolute videoPath in the
+          // registry (backend-only), then forward only the sessionId to the UI
+          // so the UI can request the video via GET /api/video/:sessionId.
           if (parsed.scope === 'screencast' && parsed.data?.sessionId) {
             const { sessionId, videoPath } = parsed.data
             if (videoPath) {
diff --git a/packages/backend/src/runner.ts b/packages/backend/src/runner.ts
index 56871dd1..a51bc03f 100644
--- a/packages/backend/src/runner.ts
+++ b/packages/backend/src/runner.ts
@@ -150,6 +150,7 @@ FRAMEWORK_FILTERS['nightwatch-cucumber'] = ({
 class TestRunner {
   #child?: ChildProcess
   #lastPayload?: RunnerRequestBody
+  #registeredConfigFile?: string
   #baseDir = process.cwd()
   // Set on rerun spawn; consumed once by the next worker handshake so the
   // accumulated suite tree is preserved instead of wiped.
@@ -160,6 +161,19 @@ class TestRunner {
     return v
   }
 
+  /**
+   * Remember the config path a live worker reported (via the `/worker`
+   * websocket on session start). #resolveConfigPath consults this first,
+   * so reruns target the same config the user originally invoked — even
+   * non-standard names like `wdio.BUILD.conf.ts` that wouldn't be found
+   * by the default-filename search.
+   */
+  registerConfigFile(configFile: string) {
+    if (configFile && fs.existsSync(configFile)) {
+      this.#registeredConfigFile = configFile
+    }
+  }
+
   async run(payload: RunnerRequestBody) {
     if (this.#child) {
       this.stop()
@@ -328,7 +342,24 @@ class TestRunner {
       typeof builderCandidate === 'function'
         ? builderCandidate
         : DEFAULT_FILTERS
-    return builder({ specArg, payload })
+    const baseFilters = builder({ specArg, payload })
+
+    // "Run All" should rerun the original invocation's scope, not every
+    // spec WDIO can find. The launcher captured the user's CLI --spec
+    // arg(s) into DEVTOOLS_WDIO_INITIAL_SPECS; inject them here so the UI
+    // button matches what the user expects. Non-Nightwatch (WDIO) only —
+    // Nightwatch resolves specs differently and handled by its own filter.
+    if (payload.runAll && !framework.startsWith('nightwatch')) {
+      const initialSpecs = process.env.DEVTOOLS_WDIO_INITIAL_SPECS
+      if (initialSpecs) {
+        const specs = initialSpecs.split(path.delimiter).filter(Boolean)
+        for (const spec of specs) {
+          baseFilters.push('--spec', spec)
+        }
+      }
+    }
+
+    return baseFilters
   }
 
   #resolveLineNumber(payload: RunnerRequestBody) {
@@ -385,6 +416,9 @@ class TestRunner {
     const candidates = this.#dedupeCandidates([
       payload?.configFile,
       this.#lastPayload?.configFile,
+      // What the live worker registered on session-start over the /worker
+      // websocket — authoritative for the config the user actually invoked.
+      this.#registeredConfigFile,
       process.env.DEVTOOLS_WDIO_CONFIG,
       process.env.DEVTOOLS_NIGHTWATCH_CONFIG,
       this.#findConfigFromSpec(specCandidate, isNightwatch),
diff --git a/packages/service/src/constants.ts b/packages/service/src/constants.ts
index ef9b78a6..fbd8c49f 100644
--- a/packages/service/src/constants.ts
+++ b/packages/service/src/constants.ts
@@ -83,7 +83,14 @@ export const INTERNAL_COMMANDS = [
   'execute',
   'findElement',
   'getElementText',
-  'getElementShadowRoot'
+  'getElementShadowRoot',
+  // Service-internal — fired by the devtools service itself (preload
+  // injection, Puppeteer handle for CDP screencast, post-command screenshots
+  // & screencast polling). Recording them would pollute the Actions list
+  // with commands the user never wrote.
+  'scriptAddPreloadScript',
+  'getPuppeteer',
+  'takeScreenshot'
 ]
 
 export const CONTEXT_CHANGE_COMMANDS = [
@@ -97,13 +104,6 @@ export const CONTEXT_CHANGE_COMMANDS = [
   'closeWindow'
 ]
 
-/**
- * Shared pattern for identifying test-related file paths.
- * Kept as a public export for consumers and may be expanded as supported locations evolve.
- */
-export const SPEC_FILE_PATTERN =
-  /\/(test|spec|features|steps|step[-_]?definitions|pageobjects|@wdio\/expect-webdriverio)\//i
-
 /**
  * Parser options
  */
diff --git a/packages/service/src/index.ts b/packages/service/src/index.ts
index c1b7ca50..196a448a 100644
--- a/packages/service/src/index.ts
+++ b/packages/service/src/index.ts
@@ -10,7 +10,7 @@ import type { WebDriverCommands } from '@wdio/protocols'
 import { SessionCapturer } from './session.js'
 import { TestReporter } from './reporter.js'
 import { DevToolsAppLauncher } from './launcher.js'
-import { getBrowserObject } from './utils.js'
+import { getBrowserObject, isUserSpecFile } from './utils.js'
 import { ScreencastRecorder } from './screencast.js'
 import { encodeToVideo } from './video-encoder.js'
 import { parse } from 'stack-trace'
@@ -21,11 +21,7 @@ import {
   type ScreencastOptions,
   type ScreencastInfo
 } from './types.js'
-import {
-  INTERNAL_COMMANDS,
-  SPEC_FILE_PATTERN,
-  CONTEXT_CHANGE_COMMANDS
-} from './constants.js'
+import { INTERNAL_COMMANDS, CONTEXT_CHANGE_COMMANDS } from './constants.js'
 
 export * from './types.js'
 export const launcher = DevToolsAppLauncher
@@ -92,6 +88,38 @@ export function setupForDevtools(opts: Options.WebdriverIO) {
   return opts
 }
 
+/**
+ * Resolve the WDIO/Nightwatch config file path this run was launched with.
+ * Prefer DEVTOOLS_WDIO_CONFIG (set by DevToolsAppLauncher in the launcher
+ * process and inherited by forked workers) since workers' own argv doesn't
+ * carry the positional config. Falls back to argv scanning for standalone
+ * use (e.g. setupForDevtools) where the launcher hook didn't run.
+ */
+function detectInvocationConfigPath(): string | undefined {
+  const envPath = process.env.DEVTOOLS_WDIO_CONFIG
+  if (envPath) {
+    return path.isAbsolute(envPath)
+      ? envPath
+      : path.resolve(process.cwd(), envPath)
+  }
+  const argv = process.argv
+  for (let i = 0; i < argv.length - 1; i++) {
+    if (argv[i] === '--config' || argv[i] === '-c') {
+      const next = argv[i + 1]
+      if (next && /\.(conf|config)\.(ts|js|cjs|mjs)$/i.test(next)) {
+        return path.isAbsolute(next) ? next : path.resolve(process.cwd(), next)
+      }
+    }
+  }
+  const positional = argv.find((a) => /\.conf\.(ts|js|cjs|mjs)$/i.test(a))
+  if (!positional) {
+    return undefined
+  }
+  return path.isAbsolute(positional)
+    ? positional
+    : path.resolve(process.cwd(), positional)
+}
+
 export default class DevToolsHookService implements Services.ServiceInstance {
   #testReporters: TestReporter[] = []
   #sessionCapturer = new SessionCapturer()
@@ -188,6 +216,19 @@ export default class DevToolsHookService implements Services.ServiceInstance {
       )
     }
 
+    // Tell the backend which config file this run was launched with so the
+    // UI's rerun button targets the SAME config. Without this the backend's
+    // resolver only knows the default names (wdio.conf.{ts,js,...}) and
+    // silently picks the wrong one for projects using non-standard names
+    // like `wdio.BUILD.conf.ts` — leading to reruns that miss headless
+    // flags, beforeFeature hooks, etc. and time out.
+    const detectedConfig = detectInvocationConfigPath()
+    if (detectedConfig) {
+      this.#sessionCapturer.sendUpstream('config', {
+        configFile: detectedConfig
+      })
+    }
+
     if ('reporters' in config) {
       const self = this
       config.reporters = [
@@ -197,8 +238,13 @@ export default class DevToolsHookService implements Services.ServiceInstance {
          */
         class DevToolsReporter extends TestReporter {
           constructor(options: Reporters.Options) {
-            super(options, (upstreamData: any) =>
-              self.#sessionCapturer.sendUpstream('suites', upstreamData)
+            super(
+              options,
+              (upstreamData: any) =>
+                self.#sessionCapturer.sendUpstream('suites', upstreamData),
+              (location: string) => {
+                self.#sessionCapturer.ensureSourceLoaded(location)
+              }
             )
             self.#testReporters.push(this)
           }
@@ -253,7 +299,24 @@ export default class DevToolsHookService implements Services.ServiceInstance {
         this.#sessionCapturer.handleNetworkFetchError(event)
       })
 
-      log.info('✓ BiDi network event listeners registered')
+      this.#browser.on('log.entryAdded', (event: any) => {
+        this.#sessionCapturer.handleLogEntryAdded(event)
+      })
+
+      // Subscribe explicitly to the log module — WDIO auto-subscribes to
+      // network events when listeners are attached, but log events need an
+      // explicit subscription on most browsers.
+      try {
+        ;(this.#browser as any).sessionSubscribe?.({
+          events: ['log.entryAdded']
+        })
+      } catch (err) {
+        log.warn(
+          `Could not subscribe to log.entryAdded: ${(err as Error).message}`
+        )
+      }
+
+      log.info('✓ BiDi network + log event listeners registered')
     }
 
     /**
@@ -276,7 +339,7 @@ export default class DevToolsHookService implements Services.ServiceInstance {
     const source = stack.find((frame) => {
       const file = frame.getFileName()
       // Only consider command frames from user spec/test files
-      return file && SPEC_FILE_PATTERN.test(file)
+      return isUserSpecFile(file)
     })
 
     if (
diff --git a/packages/service/src/launcher.ts b/packages/service/src/launcher.ts
index 0769a1da..2c9424cb 100644
--- a/packages/service/src/launcher.ts
+++ b/packages/service/src/launcher.ts
@@ -1,3 +1,5 @@
+import path from 'node:path'
+import http from 'node:http'
 import { remote } from 'webdriverio'
 import { start } from '@wdio/devtools-backend'
 import logger from '@wdio/logger'
@@ -5,6 +7,111 @@ import { DEFAULT_LAUNCH_CAPS } from './constants.js'
 import type { ServiceOptions, ExtendedCapabilities } from './types.js'
 
 const log = logger('@wdio/devtools-service:Launcher')
+
+/**
+ * When the UI re-runs a test, the backend spawns a fresh WDIO process with
+ * DEVTOOLS_APP_REUSE=1. The original CLI process is typically still alive
+ * and its port-binding services (static-server, mock-server, etc.) still
+ * own their ports. The rerun process loads the same config and those
+ * services' `onPrepare` call `app.listen(port)` again — EADDRINUSE.
+ *
+ * WDIO runs service onPrepare hooks in parallel (Promise.all in
+ * runServiceHook), so we can't mutate `config.services` to splice out the
+ * conflicting service from our own onPrepare — by the time we run it's
+ * already racing. Instead, patch http.Server.prototype.listen at module
+ * load time (which runs before any onPrepare fires) and quietly swallow
+ * EADDRINUSE specifically when we know we're a rerun. The demo app is
+ * still served by the original process, so the test still works — we
+ * just stop the noisy "service failed in onPrepare hook" log.
+ *
+ * Scope is narrow: only DEVTOOLS_APP_REUSE=1, only EADDRINUSE, only the
+ * one offending server (we revert the per-instance override once the
+ * error has been consumed so future emits behave normally).
+ */
+if (process.env.DEVTOOLS_APP_REUSE === '1') {
+  const originalListen = http.Server.prototype.listen
+  http.Server.prototype.listen = function patchedListen(
+    this: http.Server,
+    ...args: unknown[]
+  ): http.Server {
+    const originalEmit = this.emit.bind(this)
+    this.emit = (event: string, ...emitArgs: unknown[]) => {
+      if (
+        event === 'error' &&
+        (emitArgs[0] as { code?: string })?.code === 'EADDRINUSE'
+      ) {
+        log.warn(
+          `Suppressed EADDRINUSE on rerun (port ${String(args[0])}); reusing existing server from the originating CLI process`
+        )
+        this.emit = originalEmit
+        process.nextTick(() => originalEmit('listening'))
+        return true
+      }
+      return originalEmit(event, ...emitArgs)
+    }
+    return originalListen.apply(this, args as never) as http.Server
+  }
+}
+
+/**
+ * Find the config file the user invoked WDIO/Nightwatch with by scanning
+ * the launcher's argv. Handles `wdio run <config>` positional form and the
+ * `--config <path>` (Nightwatch) flagged form. Returns an absolute path.
+ *
+ * Detection lives in the launcher (not the worker) because workers are
+ * forked with their own argv and don't see the original config arg.
+ */
+function detectInvocationConfigPath(): string | undefined {
+  const argv = process.argv
+  for (let i = 0; i < argv.length - 1; i++) {
+    if (argv[i] === '--config' || argv[i] === '-c') {
+      const next = argv[i + 1]
+      if (next && /\.(conf|config)\.(ts|js|cjs|mjs)$/i.test(next)) {
+        return path.isAbsolute(next) ? next : path.resolve(process.cwd(), next)
+      }
+    }
+  }
+  const positional = argv.find((a) => /\.conf\.(ts|js|cjs|mjs)$/i.test(a))
+  if (!positional) {
+    return undefined
+  }
+  return path.isAbsolute(positional)
+    ? positional
+    : path.resolve(process.cwd(), positional)
+}
+
+/**
+ * Collect any `--spec` / `-s` paths the user passed at the CLI. Used to
+ * scope the UI's "Run All" button to the spec(s) that were originally
+ * invoked, rather than letting WDIO walk every file matched by
+ * `config.specs`. WDIO accepts both repeated `--spec foo --spec bar`
+ * and comma-separated `--spec foo,bar` forms.
+ */
+function detectInvocationSpecs(): string[] {
+  const argv = process.argv
+  const out: string[] = []
+  for (let i = 0; i < argv.length - 1; i++) {
+    if (argv[i] === '--spec' || argv[i] === '-s') {
+      const raw = argv[i + 1]
+      if (!raw) {
+        continue
+      }
+      for (const part of raw.split(',')) {
+        const trimmed = part.trim()
+        if (!trimmed) {
+          continue
+        }
+        out.push(
+          path.isAbsolute(trimmed)
+            ? trimmed
+            : path.resolve(process.cwd(), trimmed)
+        )
+      }
+    }
+  }
+  return out
+}
+
 export class DevToolsAppLauncher {
   #options: ServiceOptions
   #browser?: WebdriverIO.Browser
@@ -15,6 +122,35 @@ export class DevToolsAppLauncher {
 
   async onPrepare(_: never, caps: ExtendedCapabilities[]) {
     try {
+      // Capture the config the user invoked with so the rerun resolver in
+      // the backend can target the same file (handles non-standard names
+      // like `wdio.BUILD.conf.ts` that the default-name search won't find).
+      // Set in process.env so:
+      //   - in-process backend reads it dynamically in `#resolveConfigPath`
+      //   - the WDIO worker inherits it and forwards it to the backend over
+      //     the /worker WS for the reused-app case.
+      const detectedConfig = detectInvocationConfigPath()
+      if (detectedConfig && !process.env.DEVTOOLS_WDIO_CONFIG) {
+        process.env.DEVTOOLS_WDIO_CONFIG = detectedConfig
+        log.info(`Detected config for reruns: ${detectedConfig}`)
+      }
+
+      // Remember the spec(s) the user invoked with so the UI's "Run All"
+      // button reruns the same scope rather than expanding to every spec
+      // matched by `config.specs`. The backend reads this dynamically when
+      // building rerun filters for runAll payloads.
+      if (!process.env.DEVTOOLS_WDIO_INITIAL_SPECS) {
+        const detectedSpecs = detectInvocationSpecs()
+        if (detectedSpecs.length) {
+          process.env.DEVTOOLS_WDIO_INITIAL_SPECS = detectedSpecs.join(
+            path.delimiter
+          )
+          log.info(
+            `Detected initial specs for Run All: ${detectedSpecs.join(', ')}`
+          )
+        }
+      }
+
       const reusePort = process.env.DEVTOOLS_APP_PORT
       const reuseHost =
         process.env.DEVTOOLS_APP_HOST || this.#options.hostname || 'localhost'
diff --git a/packages/service/src/reporter.ts b/packages/service/src/reporter.ts
index 97cd7e0f..46d1d571 100644
--- a/packages/service/src/reporter.ts
+++ b/packages/service/src/reporter.ts
@@ -149,12 +149,18 @@ function parseFeatureFileForExampleLines(
 
 export class TestReporter extends WebdriverIOReporter {
   #report: (data: any) => void
+  #loadSource: (location: string) => void
   #currentSpecFile?: string
   #suitePath: string[] = []
 
-  constructor(options: any, report: (data: any) => void) {
+  constructor(
+    options: any,
+    report: (data: any) => void,
+    loadSource: (location: string) => void = () => {}
+  ) {
     super(options)
     this.#report = report
+    this.#loadSource = loadSource
     // Reset signature counters for each new reporter instance (new test run)
     resetSignatureCounters()
   }
@@ -197,6 +203,7 @@ export class TestReporter extends WebdriverIOReporter {
     if ((suiteStats as any).file && (suiteStats as any).line !== null) {
       ;(suiteStats as any).callSource =
         `${(suiteStats as any).file}:${(suiteStats as any).line}`
+      this.#loadSource((suiteStats as any).file)
     }
 
     this.#sendUpstream()
@@ -218,6 +225,7 @@ export class TestReporter extends WebdriverIOReporter {
     if ((testStats as any).file && (testStats as any).line !== null) {
       ;(testStats as any).callSource =
         `${(testStats as any).file}:${(testStats as any).line}`
+      this.#loadSource((testStats as any).file)
     }
 
     // Generate stable UID after enriching metadata for consistent test identification
diff --git a/packages/service/src/session.ts b/packages/service/src/session.ts
index bb4c3c8e..5055fc75 100644
--- a/packages/service/src/session.ts
+++ b/packages/service/src/session.ts
@@ -190,6 +190,37 @@ export class SessionCapturer {
     return Boolean(this.#ws) && this.#ws?.readyState === WebSocket.OPEN
   }
 
+  /**
+   * Read a source file from disk (once) and add it to the trace's sources map
+   * so the UI's Source tab can render it. Accepts either a bare path or a
+   * "path:line[:col]" location; the line/column are stripped.
+   *
+   * Step-definition files, feature files, etc. never appear on the runtime
+   * call stack of a WebDriver command (cucumber dispatches step handlers
+   * directly), so afterCommand's stack-walk can't load them. The reporter
+   * computes those locations via mapTestToSource and calls this method so
+   * the lens icon in the UI can jump straight to the step.
+   */
+  async ensureSourceLoaded(location?: string): Promise<void> {
+    if (!location) {
+      return
+    }
+    const absolutePath = location.startsWith('file://')
+      ? url.fileURLToPath(location)
+      : location
+    const sourceFilePath = absolutePath.split(':')[0]
+    if (!sourceFilePath || this.sources.has(sourceFilePath)) {
+      return
+    }
+    try {
+      const sourceCode = (await fs.readFile(sourceFilePath, 'utf-8')).toString()
+      this.sources.set(sourceFilePath, sourceCode)
+      this.sendUpstream('sources', { [sourceFilePath]: sourceCode })
+    } catch {
+      // file unreadable / missing — nothing to surface
+    }
+  }
+
   async afterCommand(
     browser: WebdriverIO.Browser,
     command: keyof WebDriverCommands,
@@ -332,6 +363,67 @@ export class SessionCapturer {
     }
   }
 
+  /**
+   * Capture a browser-side console message from a WebDriver BiDi
+   * `log.entryAdded` event. Going through the protocol stream means we no
+   * longer depend on the page-side `console.*` patch surviving — pages that
+   * rewrite `console` (or were already loaded before the preload ran)
+   * still surface their output here.
+   */
+  handleLogEntryAdded(event: {
+    type?: 'console' | 'javascript'
+    level?: 'debug' | 'info' | 'warn' | 'error'
+    text?: string
+    method?: string
+    timestamp?: number
+    args?: Array<{ type?: string; value?: unknown }>
+  }) {
+    const methodToType: Record<string, ConsoleLogs['type']> = {
+      log: 'log',
+      info: 'info',
+      warn: 'warn',
+      error: 'error',
+      debug: 'log',
+      trace: 'log'
+    }
+    const levelToType: Record<string, ConsoleLogs['type']> = {
+      info: 'info',
+      warn: 'warn',
+      error: 'error',
+      debug: 'log'
+    }
+    const type: ConsoleLogs['type'] =
+      methodToType[event.method ?? ''] ??
+      levelToType[event.level ?? ''] ??
+      'log'
+
+    const args: string[] = Array.isArray(event.args)
+      ? event.args.map((a) => {
+          if (a && 'value' in a && a.value !== undefined) {
+            try {
+              return typeof a.value === 'string'
+                ? a.value
+                : JSON.stringify(a.value)
+            } catch {
+              return String(a.value)
+            }
+          }
+          return `[${a?.type ?? 'unknown'}]`
+        })
+      : event.text
+        ? [event.text]
+        : []
+
+    const entry: ConsoleLogs = {
+      timestamp: typeof event.timestamp === 'number' ? event.timestamp : Date.now(),
+      type,
+      args,
+      source: LOG_SOURCES.BROWSER
+    }
+    this.consoleLogs.push(entry)
+    this.sendUpstream('consoleLogs', [entry])
+  }
+
   handleNetworkRequestStarted(event: {
     request: {
       request: string
diff --git a/packages/service/src/types.ts b/packages/service/src/types.ts
index 6fc90cba..ece5f726 100644
--- a/packages/service/src/types.ts
+++ b/packages/service/src/types.ts
@@ -104,6 +104,10 @@ export interface TraceLog {
   sources: Record<string, string>
   suites?: Record<string, SuiteStats>[]
   screencast?: ScreencastInfo
+  // Out-of-band run metadata: the absolute path of the WDIO/Nightwatch
+  // config that launched this session, used by the backend to re-target
+  // reruns at the same config (rather than falling back to wdio.conf.ts).
+  config?: { configFile?: string }
 }
 
 export interface ExtendedCapabilities extends WebdriverIO.Capabilities {
diff --git a/packages/service/src/utils.ts b/packages/service/src/utils.ts
index 66502b16..87888456 100644
--- a/packages/service/src/utils.ts
+++ b/packages/service/src/utils.ts
@@ -57,6 +57,29 @@ export function setCurrentSpecFile(file?: string) {
   CURRENT_SPEC_FILE = file
 }
 
+/**
+ * Whether a stack frame's file is user-authored test code (specs, steps,
+ * page objects, etc.) as opposed to framework internals.
+ *
+ * Inverted allowlist: anything outside `node_modules` and Node internals
+ * is user code, regardless of directory name. The single exception is
+ * `@wdio/expect-webdriverio`, which lives in node_modules but holds
+ * user-written assertion frames we want to treat as origin.
+ */
+export function isUserSpecFile(file?: string | null): boolean {
+  if (!file) {
+    return false
+  }
+  if (file.startsWith('node:')) {
+    return false
+  }
+  const normalized = file.replace(/\\/g, '/')
+  if (normalized.includes('/@wdio/expect-webdriverio/')) {
+    return true
+  }
+  return !normalized.includes('/node_modules/')
+}
+
 /**
  * Get the top-level browser object from an element/browser
  */

From a2649de023cac004827432e9a48ea1de5b47527c Mon Sep 17 00:00:00 2001
From: Vishnu Vardhan <vishnu.p@browserstack.com>
Date: Wed, 20 May 2026 16:01:44 +0530
Subject: [PATCH 2/8] Build error fix

---
 .../app/src/components/browser/snapshot.ts    | 41 ++--------------
 packages/backend/src/index.ts                 |  4 --
 packages/backend/src/runner.ts                | 24 ++++-----
 packages/service/src/constants.ts             |  5 +-
 packages/service/src/index.ts                 | 17 +------
 packages/service/src/launcher.ts              | 49 ++-----------------
 packages/service/src/session.ts               | 24 ++-------
 packages/service/src/types.ts                 |  3 --
 packages/service/src/utils.ts                 |  9 ----
 9 files changed, 24 insertions(+), 152 deletions(-)

diff --git a/packages/app/src/components/browser/snapshot.ts b/packages/app/src/components/browser/snapshot.ts
index d74e0f25..6bce7775 100644
--- a/packages/app/src/components/browser/snapshot.ts
+++ b/packages/app/src/components/browser/snapshot.ts
@@ -266,10 +266,7 @@ export class DevtoolsBrowser extends Element {
 
     this.iframe?.removeAttribute('style')
 
-    // Defer the measurement to the next frame so we read post-reflow
-    // dimensions when the surrounding panel has just resized (e.g. Chrome
-    // DevTools opening/closing). Reading on the same tick as the resize
-    // event can return the pre-reflow size.
+    // Defer to next frame so we read post-reflow dimensions on resize events.
     requestAnimationFrame(() => {
       if (!this.section || !this.header) {
         return
@@ -278,10 +275,8 @@ export class DevtoolsBrowser extends Element {
       const headerSize = this.header.getBoundingClientRect()
       const hostStyle = getComputedStyle(this)
 
-      // getBoundingClientRect returns the padding-box; the section lives
-      // inside the content box, so the host's padding eats into what the
-      // section can actually claim. Subtract it explicitly — otherwise a
-      // height-limited scale can push section.width past the visible edge.
+      // getBoundingClientRect returns the padding-box; subtract host padding
+      // so a height-limited scale doesn't push section.width past the edge.
       const padX =
         parseFloat(hostStyle.paddingLeft || '0') +
         parseFloat(hostStyle.paddingRight || '0')
@@ -289,20 +284,8 @@ export class DevtoolsBrowser extends Element {
         parseFloat(hostStyle.paddingTop || '0') +
         parseFloat(hostStyle.paddingBottom || '0')
 
-      // Use the recorded viewport as authoritative — the iframe renders at
-      // that size and the section mirrors it. We tried fitting to the
-      // measured contentDocument scrollHeight to remove dead space below
-      // short pages, but the measurement races with async CSS loading:
-      // sites whose stylesheets arrive late report a near-zero scrollHeight
-      // at first paint, which made the section collapse to a strip even
-      // for full-height pages like github.com/login. Easier and more
-      // reliable to mirror what a real browser shows at the recorded size.
       const effectiveViewportH = viewportHeight
 
-      // Fit the (effective) viewport into the area beneath the mock browser's
-      // header, preserving aspect ratio. min(scaleW, scaleH) is the standard
-      // "contain" sizing — guarantees no overflow on either axis whether the
-      // container is wider or taller than the viewport.
       const availW = Math.max(0, frameSize.width - padX)
       const availH = Math.max(0, frameSize.height - padY - headerSize.height)
       const scale = Math.max(
@@ -313,17 +296,8 @@ export class DevtoolsBrowser extends Element {
       this.section.style.width = `${viewportWidth * scale}px`
       this.section.style.height = `${effectiveViewportH * scale + headerSize.height}px`
 
-      // The iframe only exists in mutation-replay view — in screenshot/video
-      // modes the section is filled by an <img> or <video> instead, and
-      // there's nothing extra to size. Skip iframe-specific styling rather
-      // than bailing out: the section sizing above still needs to run so
-      // those modes also rescale on panel resize.
+      // Iframe absent in screenshot/video modes — section sizing above still runs.
       if (this.iframe) {
-        // The iframe is `position: absolute` inside an overflow:hidden
-        // wrapper, so the declared 1280×800 layout is honored regardless of
-        // the wrapper's flex sizing. transform-origin 0 0 anchors the scaled
-        // content to the wrapper's top-left, and the wrapper's overflow
-        // clips any sub-pixel overshoot.
         this.iframe.style.width = `${viewportWidth}px`
         this.iframe.style.height = `${viewportHeight}px`
         this.iframe.style.transformOrigin = '0 0'
@@ -368,10 +342,7 @@ export class DevtoolsBrowser extends Element {
     this.requestUpdate()
   }
 
-  // Re-fit on every render. View-mode flips (clicking an action, toggling
-  // video/snapshot) replace the iframe in the DOM with an <img> or <video>,
-  // which doesn't fire `resize` — without this, the section keeps its
-  // previous pixel size and the new content stays mis-sized.
+  // View-mode flips swap the iframe with <img>/<video> and don't fire resize.
   updated() {
     this.#setIframeSize()
   }
@@ -408,8 +379,6 @@ export class DevtoolsBrowser extends Element {
     ;[...this.#vdom.querySelectorAll('script')].forEach((el) => el.remove())
     docEl.ownerDocument.replaceChild(this.#vdom, docEl)
 
-    // The iframe's content just changed, so its measured height likely
-    // changed too. Re-fit the section so it hugs the new content.
     this.#setIframeSize()
   }
 
diff --git a/packages/backend/src/index.ts b/packages/backend/src/index.ts
index 664a4e50..388e224a 100644
--- a/packages/backend/src/index.ts
+++ b/packages/backend/src/index.ts
@@ -199,10 +199,6 @@ export async function start(
             return
           }
 
-          // Capture the WDIO/Nightwatch config file path the worker was
-          // launched with, so the rerun resolver targets the same config
-          // (handles non-standard names like `wdio.BUILD.conf.ts`). Stays
-          // backend-only — no need to forward to UI clients.
           if (parsed.scope === 'config' && parsed.data?.configFile) {
             testRunner.registerConfigFile(parsed.data.configFile)
             log.info(
diff --git a/packages/backend/src/runner.ts b/packages/backend/src/runner.ts
index a51bc03f..8141590c 100644
--- a/packages/backend/src/runner.ts
+++ b/packages/backend/src/runner.ts
@@ -161,13 +161,6 @@ class TestRunner {
     return v
   }
 
-  /**
-   * Remember the config path a live worker reported (via the `/worker`
-   * websocket on session start). #resolveConfigPath consults this first,
-   * so reruns target the same config the user originally invoked — even
-   * non-standard names like `wdio.BUILD.conf.ts` that wouldn't be found
-   * by the default-filename search.
-   */
   registerConfigFile(configFile: string) {
     if (configFile && fs.existsSync(configFile)) {
       this.#registeredConfigFile = configFile
@@ -337,18 +330,21 @@ class TestRunner {
         : specFile
       : undefined
 
-    const builderCandidate = FRAMEWORK_FILTERS[framework]
+    // hasOwnProperty.call: payload-supplied `framework` mustn't reach
+    // prototype methods (__proto__, constructor, etc.).
+    const builderCandidate = Object.prototype.hasOwnProperty.call(
+      FRAMEWORK_FILTERS,
+      framework
+    )
+      ? FRAMEWORK_FILTERS[framework]
+      : undefined
     const builder =
       typeof builderCandidate === 'function'
         ? builderCandidate
         : DEFAULT_FILTERS
     const baseFilters = builder({ specArg, payload })
 
-    // "Run All" should rerun the original invocation's scope, not every
-    // spec WDIO can find. The launcher captured the user's CLI --spec
-    // arg(s) into DEVTOOLS_WDIO_INITIAL_SPECS; inject them here so the UI
-    // button matches what the user expects. Non-Nightwatch (WDIO) only —
-    // Nightwatch resolves specs differently and handled by its own filter.
+    // Scope "Run All" to the user's original --spec args. Nightwatch resolves specs via its own filter.
     if (payload.runAll && !framework.startsWith('nightwatch')) {
       const initialSpecs = process.env.DEVTOOLS_WDIO_INITIAL_SPECS
       if (initialSpecs) {
@@ -416,8 +412,6 @@ class TestRunner {
     const candidates = this.#dedupeCandidates([
       payload?.configFile,
       this.#lastPayload?.configFile,
-      // What the live worker registered on session-start over the /worker
-      // websocket — authoritative for the config the user actually invoked.
       this.#registeredConfigFile,
       process.env.DEVTOOLS_WDIO_CONFIG,
       process.env.DEVTOOLS_NIGHTWATCH_CONFIG,
diff --git a/packages/service/src/constants.ts b/packages/service/src/constants.ts
index fbd8c49f..fd27b2ed 100644
--- a/packages/service/src/constants.ts
+++ b/packages/service/src/constants.ts
@@ -84,10 +84,7 @@ export const INTERNAL_COMMANDS = [
   'findElement',
   'getElementText',
   'getElementShadowRoot',
-  // Service-internal — fired by the devtools service itself (preload
-  // injection, Puppeteer handle for CDP screencast, post-command screenshots
-  // & screencast polling). Recording them would pollute the Actions list
-  // with commands the user never wrote.
+  // Fired by the service itself; keep out of the user-facing Actions list.
   'scriptAddPreloadScript',
   'getPuppeteer',
   'takeScreenshot'
diff --git a/packages/service/src/index.ts b/packages/service/src/index.ts
index 196a448a..3dffebef 100644
--- a/packages/service/src/index.ts
+++ b/packages/service/src/index.ts
@@ -88,13 +88,6 @@ export function setupForDevtools(opts: Options.WebdriverIO) {
   return opts
 }
 
-/**
- * Resolve the WDIO/Nightwatch config file path this run was launched with.
- * Prefer DEVTOOLS_WDIO_CONFIG (set by DevToolsAppLauncher in the launcher
- * process and inherited by forked workers) since workers' own argv doesn't
- * carry the positional config. Falls back to argv scanning for standalone
- * use (e.g. setupForDevtools) where the launcher hook didn't run.
- */
 function detectInvocationConfigPath(): string | undefined {
   const envPath = process.env.DEVTOOLS_WDIO_CONFIG
   if (envPath) {
@@ -216,12 +209,6 @@ export default class DevToolsHookService implements Services.ServiceInstance {
       )
     }
 
-    // Tell the backend which config file this run was launched with so the
-    // UI's rerun button targets the SAME config. Without this the backend's
-    // resolver only knows the default names (wdio.conf.{ts,js,...}) and
-    // silently picks the wrong one for projects using non-standard names
-    // like `wdio.BUILD.conf.ts` — leading to reruns that miss headless
-    // flags, beforeFeature hooks, etc. and time out.
     const detectedConfig = detectInvocationConfigPath()
     if (detectedConfig) {
       this.#sessionCapturer.sendUpstream('config', {
@@ -303,9 +290,7 @@ export default class DevToolsHookService implements Services.ServiceInstance {
         this.#sessionCapturer.handleLogEntryAdded(event)
       })
 
-      // Subscribe explicitly to the log module — WDIO auto-subscribes to
-      // network events when listeners are attached, but log events need an
-      // explicit subscription on most browsers.
+      // WDIO auto-subscribes to network events but not log events.
       try {
         ;(this.#browser as any).sessionSubscribe?.({
           events: ['log.entryAdded']
diff --git a/packages/service/src/launcher.ts b/packages/service/src/launcher.ts
index 2c9424cb..8a121737 100644
--- a/packages/service/src/launcher.ts
+++ b/packages/service/src/launcher.ts
@@ -8,26 +8,8 @@ import type { ServiceOptions, ExtendedCapabilities } from './types.js'
 
 const log = logger('@wdio/devtools-service:Launcher')
 
-/**
- * When the UI re-runs a test, the backend spawns a fresh WDIO process with
- * DEVTOOLS_APP_REUSE=1. The original CLI process is typically still alive
- * and its port-binding services (static-server, mock-server, etc.) still
- * own their ports. The rerun process loads the same config and those
- * services' `onPrepare` call `app.listen(port)` again — EADDRINUSE.
- *
- * WDIO runs service onPrepare hooks in parallel (Promise.all in
- * runServiceHook), so we can't mutate `config.services` to splice out the
- * conflicting service from our own onPrepare — by the time we run it's
- * already racing. Instead, patch http.Server.prototype.listen at module
- * load time (which runs before any onPrepare fires) and quietly swallow
- * EADDRINUSE specifically when we know we're a rerun. The demo app is
- * still served by the original process, so the test still works — we
- * just stop the noisy "service failed in onPrepare hook" log.
- *
- * Scope is narrow: only DEVTOOLS_APP_REUSE=1, only EADDRINUSE, only the
- * one offending server (we revert the per-instance override once the
- * error has been consumed so future emits behave normally).
- */
+// On rerun the original CLI process still owns its port-binding services;
+// swallow EADDRINUSE so other services' onPrepare don't fail loudly.
 if (process.env.DEVTOOLS_APP_REUSE === '1') {
   const originalListen = http.Server.prototype.listen
   http.Server.prototype.listen = function patchedListen(
@@ -53,14 +35,7 @@ if (process.env.DEVTOOLS_APP_REUSE === '1') {
   }
 }
 
-/**
- * Find the config file the user invoked WDIO/Nightwatch with by scanning
- * the launcher's argv. Handles `wdio run <config>` positional form and the
- * `--config <path>` (Nightwatch) flagged form. Returns an absolute path.
- *
- * Detection lives in the launcher (not the worker) because workers are
- * forked with their own argv and don't see the original config arg.
- */
+// Lives in the launcher: forked workers have their own argv without the config arg.
 function detectInvocationConfigPath(): string | undefined {
   const argv = process.argv
   for (let i = 0; i < argv.length - 1; i++) {
@@ -80,13 +55,6 @@ function detectInvocationConfigPath(): string | undefined {
     : path.resolve(process.cwd(), positional)
 }
 
-/**
- * Collect any `--spec` / `-s` paths the user passed at the CLI. Used to
- * scope the UI's "Run All" button to the spec(s) that were originally
- * invoked, rather than letting WDIO walk every file matched by
- * `config.specs`. WDIO accepts both repeated `--spec foo --spec bar`
- * and comma-separated `--spec foo,bar` forms.
- */
 function detectInvocationSpecs(): string[] {
   const argv = process.argv
   const out: string[] = []
@@ -122,23 +90,12 @@ export class DevToolsAppLauncher {
 
   async onPrepare(_: never, caps: ExtendedCapabilities[]) {
     try {
-      // Capture the config the user invoked with so the rerun resolver in
-      // the backend can target the same file (handles non-standard names
-      // like `wdio.BUILD.conf.ts` that the default-name search won't find).
-      // Set in process.env so:
-      //   - in-process backend reads it dynamically in `#resolveConfigPath`
-      //   - the WDIO worker inherits it and forwards it to the backend over
-      //     the /worker WS for the reused-app case.
       const detectedConfig = detectInvocationConfigPath()
       if (detectedConfig && !process.env.DEVTOOLS_WDIO_CONFIG) {
         process.env.DEVTOOLS_WDIO_CONFIG = detectedConfig
         log.info(`Detected config for reruns: ${detectedConfig}`)
       }
 
-      // Remember the spec(s) the user invoked with so the UI's "Run All"
-      // button reruns the same scope rather than expanding to every spec
-      // matched by `config.specs`. The backend reads this dynamically when
-      // building rerun filters for runAll payloads.
       if (!process.env.DEVTOOLS_WDIO_INITIAL_SPECS) {
         const detectedSpecs = detectInvocationSpecs()
         if (detectedSpecs.length) {
diff --git a/packages/service/src/session.ts b/packages/service/src/session.ts
index 5055fc75..a538b795 100644
--- a/packages/service/src/session.ts
+++ b/packages/service/src/session.ts
@@ -190,17 +190,8 @@ export class SessionCapturer {
     return Boolean(this.#ws) && this.#ws?.readyState === WebSocket.OPEN
   }
 
-  /**
-   * Read a source file from disk (once) and add it to the trace's sources map
-   * so the UI's Source tab can render it. Accepts either a bare path or a
-   * "path:line[:col]" location; the line/column are stripped.
-   *
-   * Step-definition files, feature files, etc. never appear on the runtime
-   * call stack of a WebDriver command (cucumber dispatches step handlers
-   * directly), so afterCommand's stack-walk can't load them. The reporter
-   * computes those locations via mapTestToSource and calls this method so
-   * the lens icon in the UI can jump straight to the step.
-   */
+  // Cucumber step files never appear on the WebDriver call stack;
+  // the reporter feeds their paths here so the Source tab can resolve them.
   async ensureSourceLoaded(location?: string): Promise<void> {
     if (!location) {
       return
@@ -363,13 +354,7 @@ export class SessionCapturer {
     }
   }
 
-  /**
-   * Capture a browser-side console message from a WebDriver BiDi
-   * `log.entryAdded` event. Going through the protocol stream means we no
-   * longer depend on the page-side `console.*` patch surviving — pages that
-   * rewrite `console` (or were already loaded before the preload ran)
-   * still surface their output here.
-   */
+  // Protocol-level capture survives pages that rewrite their own console.
   handleLogEntryAdded(event: {
     type?: 'console' | 'javascript'
     level?: 'debug' | 'info' | 'warn' | 'error'
@@ -415,7 +400,8 @@ export class SessionCapturer {
         : []
 
     const entry: ConsoleLogs = {
-      timestamp: typeof event.timestamp === 'number' ? event.timestamp : Date.now(),
+      timestamp:
+        typeof event.timestamp === 'number' ? event.timestamp : Date.now(),
       type,
       args,
       source: LOG_SOURCES.BROWSER
diff --git a/packages/service/src/types.ts b/packages/service/src/types.ts
index ece5f726..d40898f6 100644
--- a/packages/service/src/types.ts
+++ b/packages/service/src/types.ts
@@ -104,9 +104,6 @@ export interface TraceLog {
   sources: Record<string, string>
   suites?: Record<string, SuiteStats>[]
   screencast?: ScreencastInfo
-  // Out-of-band run metadata: the absolute path of the WDIO/Nightwatch
-  // config that launched this session, used by the backend to re-target
-  // reruns at the same config (rather than falling back to wdio.conf.ts).
   config?: { configFile?: string }
 }
 
diff --git a/packages/service/src/utils.ts b/packages/service/src/utils.ts
index 87888456..19ab0d42 100644
--- a/packages/service/src/utils.ts
+++ b/packages/service/src/utils.ts
@@ -57,15 +57,6 @@ export function setCurrentSpecFile(file?: string) {
   CURRENT_SPEC_FILE = file
 }
 
-/**
- * Whether a stack frame's file is user-authored test code (specs, steps,
- * page objects, etc.) as opposed to framework internals.
- *
- * Inverted allowlist: anything outside `node_modules` and Node internals
- * is user code, regardless of directory name. The single exception is
- * `@wdio/expect-webdriverio`, which lives in node_modules but holds
- * user-written assertion frames we want to treat as origin.
- */
 export function isUserSpecFile(file?: string | null): boolean {
   if (!file) {
     return false

From 1ac436e1b63776ea1d2fc642204a2cba48520879 Mon Sep 17 00:00:00 2001
From: Vishnu Vardhan <vishnu.p@browserstack.com>
Date: Wed, 20 May 2026 16:15:30 +0530
Subject: [PATCH 3/8] Build error fix

---
 packages/backend/src/runner.ts | 186 +++++++++++++++------------------
 1 file changed, 85 insertions(+), 101 deletions(-)

diff --git a/packages/backend/src/runner.ts b/packages/backend/src/runner.ts
index 8141590c..255f16b5 100644
--- a/packages/backend/src/runner.ts
+++ b/packages/backend/src/runner.ts
@@ -18,101 +18,101 @@ function escapeRegex(str: string): string {
   return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
 }
 
-const FRAMEWORK_FILTERS: Record<
-  string,
-  (ctx: { specArg?: string; payload: RunnerRequestBody }) => string[]
-> = {
-  cucumber: ({ specArg, payload }) => {
-    const filters: string[] = []
-
-    // For feature-level suites, run the entire feature file
-    if (payload.suiteType === 'feature' && specArg) {
-      // Remove any line number from specArg for feature-level execution
-      const featureFile = specArg.split(':')[0]
-      filters.push('--spec', featureFile)
-      return filters
-    }
+type FilterBuilder = (ctx: {
+  specArg?: string
+  payload: RunnerRequestBody
+}) => string[]
 
-    // Priority 1: Use feature file with line number for exact scenario targeting (works for examples)
-    // Note: Cucumber scenarios are type 'suite', not 'test'
-    if (payload.featureFile && payload.featureLine) {
-      filters.push('--spec', `${payload.featureFile}:${payload.featureLine}`)
-      return filters
-    }
+// Map (not object) keeps payload-supplied `framework` from reaching
+// prototype methods at dispatch time — CodeQL: unvalidated-dynamic-method-call.
+const FRAMEWORK_FILTERS = new Map<string, FilterBuilder>()
 
-    // Priority 2: For specific test reruns with example row number, use exact regex match
-    if (payload.entryType === 'test' && payload.fullTitle) {
-      // Cucumber fullTitle format: "1: Scenario name" or "2: Scenario name"
-      // Extract the row number and scenario name
-      // Avoid ReDoS by removing ambiguous \s* before .* - use string operations instead
-      const colonIndex = payload.fullTitle.indexOf(':')
-      if (colonIndex > 0) {
-        const rowNumber = payload.fullTitle.substring(0, colonIndex)
-        const scenarioName = payload.fullTitle.substring(colonIndex + 1).trim()
-        // Validate row number is digits only
-        if (/^\d+$/.test(rowNumber)) {
-          // Use spec file filter
-          if (specArg) {
-            filters.push('--spec', specArg)
-          }
-          // Use regex to match the exact "rowNumber: scenarioName" pattern
-          // This ensures we only run that specific example row
-          filters.push(
-            '--cucumberOpts.name',
-            `^${rowNumber}:\\s*${escapeRegex(scenarioName)}$`
-          )
-          return filters
-        }
-      }
-      // No row number - use plain name filter
-      if (specArg) {
-        filters.push('--spec', specArg)
-      }
-      filters.push('--cucumberOpts.name', payload.fullTitle.trim())
-      return filters
-    }
+FRAMEWORK_FILTERS.set('cucumber', ({ specArg, payload }) => {
+  const filters: string[] = []
 
-    // Suite-level rerun
-    if (specArg) {
-      filters.push('--spec', specArg)
-    }
+  // For feature-level suites, run the entire feature file
+  if (payload.suiteType === 'feature' && specArg) {
+    // Remove any line number from specArg for feature-level execution
+    const featureFile = specArg.split(':')[0]
+    filters.push('--spec', featureFile)
     return filters
-  },
-  mocha: ({ specArg, payload }) => {
-    const filters: string[] = []
-    if (specArg) {
-      filters.push('--spec', specArg)
-    }
-    // For both tests and suites, use grep to filter
-    if (payload.fullTitle) {
-      filters.push('--mochaOpts.grep', payload.fullTitle)
-    }
+  }
+
+  // Priority 1: Use feature file with line number for exact scenario targeting (works for examples)
+  // Note: Cucumber scenarios are type 'suite', not 'test'
+  if (payload.featureFile && payload.featureLine) {
+    filters.push('--spec', `${payload.featureFile}:${payload.featureLine}`)
     return filters
-  },
-  jasmine: ({ specArg, payload }) => {
-    const filters: string[] = []
+  }
+
+  // Priority 2: For specific test reruns with example row number, use exact regex match
+  if (payload.entryType === 'test' && payload.fullTitle) {
+    // Cucumber fullTitle format: "1: Scenario name" or "2: Scenario name"
+    // Extract the row number and scenario name
+    // Avoid ReDoS by removing ambiguous \s* before .* - use string operations instead
+    const colonIndex = payload.fullTitle.indexOf(':')
+    if (colonIndex > 0) {
+      const rowNumber = payload.fullTitle.substring(0, colonIndex)
+      const scenarioName = payload.fullTitle.substring(colonIndex + 1).trim()
+      // Validate row number is digits only
+      if (/^\d+$/.test(rowNumber)) {
+        // Use spec file filter
+        if (specArg) {
+          filters.push('--spec', specArg)
+        }
+        // Use regex to match the exact "rowNumber: scenarioName" pattern
+        // This ensures we only run that specific example row
+        filters.push(
+          '--cucumberOpts.name',
+          `^${rowNumber}:\\s*${escapeRegex(scenarioName)}$`
+        )
+        return filters
+      }
+    }
+    // No row number - use plain name filter
     if (specArg) {
       filters.push('--spec', specArg)
     }
-    // For both tests and suites, use grep to filter
-    if (payload.fullTitle) {
-      filters.push('--jasmineOpts.grep', payload.fullTitle)
-    }
+    filters.push('--cucumberOpts.name', payload.fullTitle.trim())
     return filters
   }
-}
 
-const DEFAULT_FILTERS = ({ specArg }: { specArg?: string }) =>
+  // Suite-level rerun
+  if (specArg) {
+    filters.push('--spec', specArg)
+  }
+  return filters
+})
+
+FRAMEWORK_FILTERS.set('mocha', ({ specArg, payload }) => {
+  const filters: string[] = []
+  if (specArg) {
+    filters.push('--spec', specArg)
+  }
+  // For both tests and suites, use grep to filter
+  if (payload.fullTitle) {
+    filters.push('--mochaOpts.grep', payload.fullTitle)
+  }
+  return filters
+})
+
+FRAMEWORK_FILTERS.set('jasmine', ({ specArg, payload }) => {
+  const filters: string[] = []
+  if (specArg) {
+    filters.push('--spec', specArg)
+  }
+  // For both tests and suites, use grep to filter
+  if (payload.fullTitle) {
+    filters.push('--jasmineOpts.grep', payload.fullTitle)
+  }
+  return filters
+})
+
+const DEFAULT_FILTERS: FilterBuilder = ({ specArg }) =>
   specArg ? ['--spec', specArg] : []
 
 // Nightwatch CLI: positional spec file + optional --testcase filter
-FRAMEWORK_FILTERS.nightwatch = ({
-  specArg,
-  payload
-}: {
-  specArg?: string
-  payload: RunnerRequestBody
-}) => {
+FRAMEWORK_FILTERS.set('nightwatch', ({ specArg, payload }) => {
   const filters: string[] = []
   if (specArg) {
     // Nightwatch doesn't support file:line — strip any trailing line number
@@ -122,17 +122,12 @@ FRAMEWORK_FILTERS.nightwatch = ({
     filters.push('--testcase', payload.label)
   }
   return filters
-}
+})
 
 // Nightwatch + Cucumber: feature files are resolved via the config's feature_path.
 // Never pass .feature files as positional args — Nightwatch rejects them.
 // Nightwatch forwards --name and --tags to the underlying Cucumber runner.
-FRAMEWORK_FILTERS['nightwatch-cucumber'] = ({
-  payload
-}: {
-  specArg?: string
-  payload: RunnerRequestBody
-}) => {
+FRAMEWORK_FILTERS.set('nightwatch-cucumber', ({ payload }) => {
   const filters: string[] = []
 
   // Only pass --name for scenario-level reruns. Feature/file-level suites
@@ -145,7 +140,7 @@ FRAMEWORK_FILTERS['nightwatch-cucumber'] = ({
     filters.push('--name', `^${escaped}$`)
   }
   return filters
-}
+})
 
 class TestRunner {
   #child?: ChildProcess
@@ -330,18 +325,7 @@ class TestRunner {
         : specFile
       : undefined
 
-    // hasOwnProperty.call: payload-supplied `framework` mustn't reach
-    // prototype methods (__proto__, constructor, etc.).
-    const builderCandidate = Object.prototype.hasOwnProperty.call(
-      FRAMEWORK_FILTERS,
-      framework
-    )
-      ? FRAMEWORK_FILTERS[framework]
-      : undefined
-    const builder =
-      typeof builderCandidate === 'function'
-        ? builderCandidate
-        : DEFAULT_FILTERS
+    const builder = FRAMEWORK_FILTERS.get(framework) ?? DEFAULT_FILTERS
     const baseFilters = builder({ specArg, payload })
 
     // Scope "Run All" to the user's original --spec args. Nightwatch resolves specs via its own filter.

From 3fef344f358a56b301b8f6d4869a256801ca1dc2 Mon Sep 17 00:00:00 2001
From: Vishnu Vardhan <vishnu.p@browserstack.com>
Date: Wed, 20 May 2026 16:26:15 +0530
Subject: [PATCH 4/8] CodeQl fix

---
 packages/backend/src/runner.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/backend/src/runner.ts b/packages/backend/src/runner.ts
index 255f16b5..4fc20f07 100644
--- a/packages/backend/src/runner.ts
+++ b/packages/backend/src/runner.ts
@@ -325,7 +325,11 @@ class TestRunner {
         : specFile
       : undefined
 
-    const builder = FRAMEWORK_FILTERS.get(framework) ?? DEFAULT_FILTERS
+    const candidateBuilder = FRAMEWORK_FILTERS.get(framework)
+    const builder =
+      typeof candidateBuilder === 'function'
+        ? candidateBuilder
+        : DEFAULT_FILTERS
     const baseFilters = builder({ specArg, payload })
 
     // Scope "Run All" to the user's original --spec args. Nightwatch resolves specs via its own filter.

From 85ffaa29849999bb065e376b241c0f2912a58b15 Mon Sep 17 00:00:00 2001
From: Vishnu Vardhan <vishnu.p@browserstack.com>
Date: Wed, 20 May 2026 16:47:38 +0530
Subject: [PATCH 5/8] Unit test case addition

---
 packages/backend/tests/runner.test.ts   |  81 ++++++++++++++++++
 packages/service/tests/index.test.ts    |  16 ++++
 packages/service/tests/reporter.test.ts |  60 +++++++++++++
 packages/service/tests/session.test.ts  | 109 ++++++++++++++++++++++++
 4 files changed, 266 insertions(+)

diff --git a/packages/backend/tests/runner.test.ts b/packages/backend/tests/runner.test.ts
index bff09752..7c3bf9b5 100644
--- a/packages/backend/tests/runner.test.ts
+++ b/packages/backend/tests/runner.test.ts
@@ -264,6 +264,7 @@ describe('TestRunner', () => {
 
   describe('runAll mode', () => {
     it('should not use spec filter when runAll is true', async () => {
+      delete process.env.DEVTOOLS_WDIO_INITIAL_SPECS
       vi.mocked(spawn).mockReturnValue(createMockChild())
       await testRunner.run({
         uid: 'run-all',
@@ -275,5 +276,85 @@ describe('TestRunner', () => {
       const args = vi.mocked(spawn).mock.calls[0][1] as string[]
       expect(args).not.toContain('--spec')
     })
+
+    it('scopes runAll to DEVTOOLS_WDIO_INITIAL_SPECS when set', async () => {
+      const initial = ['/abs/a.feature', '/abs/b.feature'].join(path.delimiter)
+      process.env.DEVTOOLS_WDIO_INITIAL_SPECS = initial
+      vi.mocked(spawn).mockReturnValue(createMockChild())
+
+      await testRunner.run({
+        uid: 'run-all',
+        entryType: 'suite',
+        runAll: true,
+        configFile: mockConfigPath
+      })
+
+      const args = vi.mocked(spawn).mock.calls[0][1] as string[]
+      // Each detected spec should appear as its own --spec entry.
+      const specPositions = args
+        .map((a, i) => (a === '--spec' ? i : -1))
+        .filter((i) => i >= 0)
+      expect(specPositions).toHaveLength(2)
+      const specValues = specPositions.map((i) => args[i + 1])
+      expect(specValues).toEqual(['/abs/a.feature', '/abs/b.feature'])
+
+      delete process.env.DEVTOOLS_WDIO_INITIAL_SPECS
+    })
+  })
+
+  describe('framework dispatch via Map (CodeQL hardening)', () => {
+    beforeEach(() => {
+      vi.mocked(spawn).mockReturnValue(createMockChild())
+    })
+
+    // Unknown framework names — including prototype keys — must not reach a
+    // builder. They fall through to DEFAULT_FILTERS which only emits --spec.
+    it.each(['unknown', '__proto__', 'constructor', 'hasOwnProperty'])(
+      'falls back to DEFAULT_FILTERS for framework %s',
+      async (framework) => {
+        await testRunner.run({
+          uid: `t-${framework}`,
+          entryType: 'test',
+          framework: framework as any,
+          specFile: mockSpecFile,
+          configFile: mockConfigPath
+        })
+        const args = vi.mocked(spawn).mock.calls.at(-1)![1] as string[]
+        expect(args).toContain('--spec')
+        expect(args).not.toContain('--mochaOpts.grep')
+        expect(args).not.toContain('--jasmineOpts.grep')
+        expect(args).not.toContain('--cucumberOpts.name')
+        testRunner.stop()
+      }
+    )
+  })
+
+  describe('registerConfigFile', () => {
+    it('uses a worker-registered config path ahead of the default search', async () => {
+      const registered = '/proj/wdio.BUILD.conf.ts'
+      vi.mocked(fs.existsSync).mockImplementation(
+        (p) => p === registered || p === mockConfigPath
+      )
+      const { testRunner: tr } = await import('../src/runner.js')
+      tr.registerConfigFile(registered)
+
+      vi.mocked(spawn).mockReturnValue(createMockChild())
+      await tr.run({ uid: 'reg-1', entryType: 'test' })
+
+      const args = vi.mocked(spawn).mock.calls.at(-1)![1] as string[]
+      expect(args).toContain(registered)
+    })
+
+    it('ignores a non-existent path', async () => {
+      vi.mocked(fs.existsSync).mockReturnValue(false)
+      const { testRunner: tr } = await import('../src/runner.js')
+      tr.registerConfigFile('/does/not/exist.ts')
+
+      // Internal state stays unchanged; tr.run still fails to locate any config
+      // (no change in behaviour from non-existent path).
+      await expect(tr.run({ uid: 'reg-2', entryType: 'test' })).rejects.toThrow(
+        'Cannot locate WDIO config'
+      )
+    })
   })
 })
diff --git a/packages/service/tests/index.test.ts b/packages/service/tests/index.test.ts
index 25a6e78e..59338114 100644
--- a/packages/service/tests/index.test.ts
+++ b/packages/service/tests/index.test.ts
@@ -136,6 +136,22 @@ describe('DevtoolsService - Internal Command Filtering', () => {
       expect(capturedCommands).not.toContain('getTitle')
       expect(capturedCommands).not.toContain('waitUntil')
     })
+
+    // Service-fired commands (preload injection, Puppeteer handle for CDP,
+    // post-command screenshots) must not surface as user actions.
+    it.each(['scriptAddPreloadScript', 'getPuppeteer', 'takeScreenshot'])(
+      'filters service-internal %s out of the command stack',
+      (cmd) => {
+        executeCommand('click', ['.user'])
+        executeCommand(cmd as any, [], 'noop')
+        const captured =
+          mockSessionCapturerInstance.afterCommand.mock.calls.map(
+            (call) => call[1]
+          )
+        expect(captured).toContain('click')
+        expect(captured).not.toContain(cmd)
+      }
+    )
   })
 })
 
diff --git a/packages/service/tests/reporter.test.ts b/packages/service/tests/reporter.test.ts
index 3c53df30..03962bed 100644
--- a/packages/service/tests/reporter.test.ts
+++ b/packages/service/tests/reporter.test.ts
@@ -124,4 +124,64 @@ describe('TestReporter - Rerun & Stable UID', () => {
       }).not.toThrow()
     })
   })
+
+  describe('loadSource callback', () => {
+    it('invokes loadSource with the file mapped to a test', () => {
+      const loadSource = vi.fn()
+      const r = new TestReporter(
+        { logFile: '/tmp/test.log' },
+        sendUpstream as any,
+        loadSource
+      )
+
+      r.onTestStart(
+        createTestStats({
+          title: 'Given I open the url',
+          fullTitle: 'Given I open the url',
+          file: '/proj/src/features/x.feature',
+          argument: { uri: '/proj/src/features/x.feature', line: 5 } as any
+        })
+      )
+
+      // mapTestToSource may rewrite `testStats.file` (it can fall back to the
+      // runtime stack when no spec file is on disk), so don't pin to a path —
+      // just assert the callback fired with the resolved file.
+      expect(loadSource).toHaveBeenCalledTimes(1)
+      expect(typeof loadSource.mock.calls[0][0]).toBe('string')
+      expect(loadSource.mock.calls[0][0].length).toBeGreaterThan(0)
+    })
+
+    it('invokes loadSource for suites that get mapped to a file', () => {
+      const loadSource = vi.fn()
+      const r = new TestReporter(
+        { logFile: '/tmp/test.log' },
+        sendUpstream as any,
+        loadSource
+      )
+
+      const suiteStats = createSuiteStats({
+        title: 'Login feature',
+        file: '/proj/src/features/login.feature'
+      })
+
+      r.onSuiteStart(suiteStats)
+
+      expect(loadSource).toHaveBeenCalledWith(
+        expect.stringContaining('login.feature')
+      )
+    })
+
+    it('treats loadSource as optional (default no-op)', () => {
+      const r = new TestReporter(
+        { logFile: '/tmp/test.log' },
+        sendUpstream as any
+      )
+
+      // No loadSource passed — must not throw when test/suite events fire.
+      expect(() => {
+        r.onSuiteStart(createSuiteStats())
+        r.onTestStart(createTestStats())
+      }).not.toThrow()
+    })
+  })
 })
diff --git a/packages/service/tests/session.test.ts b/packages/service/tests/session.test.ts
index d6aa538f..da5bba96 100644
--- a/packages/service/tests/session.test.ts
+++ b/packages/service/tests/session.test.ts
@@ -574,4 +574,113 @@ describe('SessionCapturer', () => {
       })
     })
   })
+
+  describe('ensureSourceLoaded', () => {
+    it('reads a file once and emits a sources message', async () => {
+      const capturer = new SessionCapturer()
+      const send = vi.spyOn(capturer, 'sendUpstream' as any)
+      vi.mocked(fs.readFile).mockResolvedValueOnce(
+        Buffer.from('export default 1\n')
+      )
+
+      await capturer.ensureSourceLoaded('/abs/path/given.ts:24')
+
+      expect(fs.readFile).toHaveBeenCalledWith('/abs/path/given.ts', 'utf-8')
+      expect(capturer.sources.get('/abs/path/given.ts')).toBe(
+        'export default 1\n'
+      )
+      expect(send).toHaveBeenCalledWith('sources', {
+        '/abs/path/given.ts': 'export default 1\n'
+      })
+
+      // Second call for same path is a no-op.
+      vi.mocked(fs.readFile).mockClear()
+      send.mockClear()
+      await capturer.ensureSourceLoaded('/abs/path/given.ts')
+      expect(fs.readFile).not.toHaveBeenCalled()
+      expect(send).not.toHaveBeenCalled()
+    })
+
+    it('is a no-op on missing path or unreadable file', async () => {
+      const capturer = new SessionCapturer()
+      const send = vi.spyOn(capturer, 'sendUpstream' as any)
+
+      await capturer.ensureSourceLoaded(undefined)
+      await capturer.ensureSourceLoaded('')
+      vi.mocked(fs.readFile).mockRejectedValueOnce(new Error('ENOENT'))
+      await capturer.ensureSourceLoaded('/missing.ts')
+
+      expect(capturer.sources.size).toBe(0)
+      expect(send).not.toHaveBeenCalled()
+    })
+
+    it('converts file:// URLs to filesystem paths', async () => {
+      const capturer = new SessionCapturer()
+      vi.mocked(fs.readFile).mockResolvedValueOnce(Buffer.from('content'))
+
+      await capturer.ensureSourceLoaded('file:///home/u/spec.ts:1:1')
+
+      expect(fs.readFile).toHaveBeenCalledWith('/home/u/spec.ts', 'utf-8')
+    })
+  })
+
+  describe('handleLogEntryAdded', () => {
+    it('records a console-method entry with browser source', () => {
+      const capturer = new SessionCapturer()
+      capturer.handleLogEntryAdded({
+        type: 'console',
+        method: 'warn',
+        text: 'oops',
+        timestamp: 12345,
+        args: [{ type: 'string', value: 'oops' }]
+      })
+
+      expect(capturer.consoleLogs).toHaveLength(1)
+      expect(capturer.consoleLogs[0]).toMatchObject({
+        type: 'warn',
+        source: LOG_SOURCES.BROWSER,
+        timestamp: 12345,
+        args: ['oops']
+      })
+    })
+
+    it('falls back to level when method is absent (javascript log entries)', () => {
+      const capturer = new SessionCapturer()
+      capturer.handleLogEntryAdded({
+        type: 'javascript',
+        level: 'error',
+        text: 'uncaught TypeError'
+      })
+
+      expect(capturer.consoleLogs[0].type).toBe('error')
+      expect(capturer.consoleLogs[0].args).toEqual(['uncaught TypeError'])
+    })
+
+    it('maps unknown method/level to "log"', () => {
+      const capturer = new SessionCapturer()
+      capturer.handleLogEntryAdded({ method: 'table', text: 'x' } as any)
+
+      expect(capturer.consoleLogs[0].type).toBe('log')
+    })
+
+    it('serialises non-string remote values via JSON.stringify', () => {
+      const capturer = new SessionCapturer()
+      capturer.handleLogEntryAdded({
+        type: 'console',
+        method: 'log',
+        args: [
+          { type: 'number', value: 42 },
+          { type: 'object', value: { a: 1 } } as any,
+          { type: 'undefined' } as any
+        ],
+        timestamp: 0
+      })
+
+      expect(capturer.consoleLogs[0].args).toEqual([
+        '42',
+        '{"a":1}',
+        '[undefined]'
+      ])
+    })
+  })
 })

From 40c805c7ec07aae6c497af89d8c50d387084d04b Mon Sep 17 00:00:00 2001
From: Vishnu Vardhan <vishnu.p@browserstack.com>
Date: Wed, 20 May 2026 17:32:03 +0530
Subject: [PATCH 6/8] Removed regex for nightwatch devtools

---
 package.json                                        |  2 +-
 .../nightwatch-devtools/example/nightwatch.conf.cjs |  2 +-
 packages/nightwatch-devtools/package.json           |  2 +-
 packages/nightwatch-devtools/src/constants.ts       |  4 ----
 packages/nightwatch-devtools/src/helpers/utils.ts   | 13 ++++++++-----
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index 583f34cc..783835e6 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
       "@types/node": "25.5.2",
       "@codemirror/state": "6.5.4"
     },
-    "ignoredBuiltDependencies": [
+    "onlyBuiltDependencies": [
       "chromedriver"
     ]
   },
diff --git a/packages/nightwatch-devtools/example/nightwatch.conf.cjs b/packages/nightwatch-devtools/example/nightwatch.conf.cjs
index 32b7fa00..5e2467d7 100644
--- a/packages/nightwatch-devtools/example/nightwatch.conf.cjs
+++ b/packages/nightwatch-devtools/example/nightwatch.conf.cjs
@@ -10,7 +10,7 @@ module.exports = {
 
   webdriver: {
     start_process: true,
-    server_path: '/opt/homebrew/bin/chromedriver',
+    // server_path: '/opt/homebrew/bin/chromedriver',
     port: 9515
   },
 
diff --git a/packages/nightwatch-devtools/package.json b/packages/nightwatch-devtools/package.json
index 57a81d8c..5b967c0f 100644
--- a/packages/nightwatch-devtools/package.json
+++ b/packages/nightwatch-devtools/package.json
@@ -51,7 +51,7 @@
   "devDependencies": {
     "@types/node": "25.5.2",
     "@types/ws": "^8.18.1",
-    "chromedriver": "^147.0.1",
+    "chromedriver": "^148.0.3",
     "nightwatch": "^3.0.0",
     "typescript": "^6.0.2"
   },
diff --git a/packages/nightwatch-devtools/src/constants.ts b/packages/nightwatch-devtools/src/constants.ts
index 0f1973cd..270070bc 100644
--- a/packages/nightwatch-devtools/src/constants.ts
+++ b/packages/nightwatch-devtools/src/constants.ts
@@ -92,10 +92,6 @@ export const NAVIGATION_COMMANDS = ['url', 'navigate', 'navigateTo'] as const
 /** Spinner progress frames — suppress from UI Console output. */
 export const SPINNER_RE = /^[⠋⠙⠹⠸⠼⠴⠦⠧⠇⠏]/u
 
-/** Matches a path segment that indicates a test/spec directory (e.g. /tests/, /spec/, /nightwatch/examples/, /features/). */
-export const TEST_PATH_PATTERN =
-  /\/(test|spec|tests|nightwatch|examples?|features|step-definitions)\//i
-
 /** Matches file names that follow the *.test.ts / *.spec.js naming convention. */
 export const TEST_FILE_PATTERN = /\.(?:test|spec)\.[cm]?[jt]sx?$/i
 
diff --git a/packages/nightwatch-devtools/src/helpers/utils.ts b/packages/nightwatch-devtools/src/helpers/utils.ts
index aecf1e4f..cc6a408d 100644
--- a/packages/nightwatch-devtools/src/helpers/utils.ts
+++ b/packages/nightwatch-devtools/src/helpers/utils.ts
@@ -6,7 +6,6 @@ import logger from '@wdio/logger'
 import {
   ANSI_REGEX,
   LOG_LEVEL_PATTERNS,
-  TEST_PATH_PATTERN,
   TEST_FILE_PATTERN,
   CONFIG_FILENAMES
 } from '../constants.js'
@@ -107,11 +106,15 @@ export function findTestFileFromStack(): string | undefined {
     return undefined
   }
 
-  const frame = parseStackTrace(stack).find(
-    (f) =>
-      isUserCodeFrame(f) &&
-      (TEST_PATH_PATTERN.test(f.file) || TEST_FILE_PATTERN.test(f.file))
+  // Prefer a frame whose filename matches *.test.ts / *.spec.ts (strong
+  // signal). Fall back to the first plain user-code frame so arbitrary
+  // project layouts (e.g. Cucumber step files under `src/steps/`) still
+  // surface their owning file instead of going undetected.
+  const frames = parseStackTrace(stack)
+  const preferred = frames.find(
+    (f) => isUserCodeFrame(f) && TEST_FILE_PATTERN.test(f.file)
   )
+  const frame = preferred ?? frames.find(isUserCodeFrame)
   if (!frame?.file) {
     return undefined
   }

From 0b26a92f81f5064b2eeea44aeaf4b2e4bcd879e7 Mon Sep 17 00:00:00 2001
From: Vishnu Vardhan <vishnu.p@browserstack.com>
Date: Wed, 20 May 2026 17:33:44 +0530
Subject: [PATCH 7/8] pnpm-lock.yaml update

---
 pnpm-lock.yaml | 210 +++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 205 insertions(+), 5 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index eb7be55f..64fa8383 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -288,11 +288,11 @@ importers:
         specifier: ^8.18.1
         version: 8.18.1
       chromedriver:
-        specifier: ^147.0.1
-        version: 147.0.1
+        specifier: ^148.0.3
+        version: 148.0.3
       nightwatch:
         specifier: ^3.0.0
-        version: 3.15.0(@cucumber/cucumber@11.3.0)(chromedriver@147.0.1)
+        version: 3.15.0(@cucumber/cucumber@11.3.0)(chromedriver@148.0.3)
       typescript:
         specifier: ^6.0.2
         version: 6.0.2
@@ -2333,10 +2333,22 @@ packages:
     engines: {node: '>=0.4.0'}
     hasBin: true
 
+  adm-zip@0.5.17:
+    resolution: {integrity: sha512-+Ut8d9LLqwEvHHJl1+PIHqoyDxFgVN847JTVM3Izi3xHDWPE4UtzzXysMZQs64DMcrJfBeS/uoEP4AD3HQHnQQ==}
+    engines: {node: '>=12.0'}
+
+  agent-base@6.0.2:
+    resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==}
+    engines: {node: '>= 6.0.0'}
+
   agent-base@7.1.4:
     resolution: {integrity: sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==}
     engines: {node: '>= 14'}
 
+  agent-base@9.0.0:
+    resolution: {integrity: sha512-TQf59BsZnytt8GdJKLPfUZ54g/iaUL2OWDSFCCvMOhsHduDQxO8xC4PNeyIkVcA5KwL2phPSv0douC0fgWzmnA==}
+    engines: {node: '>= 20'}
+
   ajv-draft-04@1.0.0:
     resolution: {integrity: sha512-mv00Te6nmYbRp5DCwclxtt7yV/joXJPGS7nM+97GdxvuttCOfgI3K4U25zboyeX0O+myI8ERluxQe5wljMmVIw==}
     peerDependencies:
@@ -2546,6 +2558,9 @@ packages:
   axios@1.14.0:
     resolution: {integrity: sha512-3Y8yrqLSwjuzpXuZ0oIYZ/XGgLwUIBU3uLvbcpb0pidD9ctpShJd43KSlEEkVQg6DS0G9NKyzOvBfUtDKEyHvQ==}
 
+  axios@1.16.1:
+    resolution: {integrity: sha512-caYkukvroVPO8KrzuJEb50Hm07KwfBZPEC3VeFHTsqWHvKTsy54hjJz9BS/cdaypROE2rH6xvm9mHX4fgWkr3A==}
+
   b4a@1.8.0:
     resolution: {integrity: sha512-qRuSmNSkGQaHwNbM7J78Wwy+ghLEYF1zNrSeMxj4Kgw6y33O3mXcQ6Ie9fRvfU/YnxWkOchPXbaLb73TkIsfdg==}
     peerDependencies:
@@ -2644,6 +2659,10 @@ packages:
     engines: {node: '>=10.0.0'}
     deprecated: Security vulnerability fixed in 5.2.1, please upgrade
 
+  basic-ftp@5.3.1:
+    resolution: {integrity: sha512-bopVNp6ugyA150DDuZfPFdt1KZ5a94ZDiwX4hMgZDzF+GttD80lEy8kj98kbyhLXnPvhtIo93mdnLIjpCAeeOw==}
+    engines: {node: '>=10.0.0'}
+
   big-integer@1.6.52:
     resolution: {integrity: sha512-QxD8cf2eVqJOOz63z6JIN9BzvVs/dlySa5HGSBH5xtR8dPteIRQnBxxKqkNTiT6jbDTF6jAfrd4oMcND9RGbQg==}
     engines: {node: '>=0.6'}
@@ -2838,6 +2857,11 @@ packages:
     engines: {node: '>=20'}
     hasBin: true
 
+  chromedriver@148.0.3:
+    resolution: {integrity: sha512-efk4NIkjjRr3Zy0C8Trj8jpMGgDY+ZA6kVpYFerH3M4tM4fguKCi81PguWwmHVx8FZdMmhFYczb1PaPvJqUkZQ==}
+    engines: {node: '>=22'}
+    hasBin: true
+
   chromium-bidi@0.5.8:
     resolution: {integrity: sha512-blqh+1cEQbHBKmok3rVJkBlBxt9beKBgOsxbFgs7UJcoVbbeZ+K7+6liAsjgpc8l1Xd55cQUy14fXZdGSb4zIw==}
     peerDependencies:
@@ -3073,6 +3097,10 @@ packages:
     resolution: {integrity: sha512-7hvf7/GW8e86rW0ptuwS3OcBGDjIi6SZva7hCyWC0yYry2cOPmLIjXAUHI6DK2HsnwJd9ifmt57i8eV2n4YNpw==}
     engines: {node: '>= 14'}
 
+  data-uri-to-buffer@8.0.0:
+    resolution: {integrity: sha512-6UHfyCux51b8PTGDgveqtz1tvphBku5DrMKKJbFAZAJOI2zsjDpDoYE1+QGj7FOMS4BdTFNJsJiR3zEB0xH0yQ==}
+    engines: {node: '>= 20'}
+
   data-urls@5.0.0:
     resolution: {integrity: sha512-ZYP5VBHshaDAiVZxjbRVcFJpc+4xGgT0bK3vzy1HLN8jTO975HEbuYzZJcHoQEY5K1a0z8YayJkyVETa08eNTg==}
     engines: {node: '>=18'}
@@ -3192,6 +3220,12 @@ packages:
     resolution: {integrity: sha512-TllpMR/t0M5sqCXfj85i4XaAzxmS5tVA16dqvdkMwGmzI+dXLXnw3J+3Vdv7VKw+ThlTMboK6i9rnZ6Nntj5CQ==}
     engines: {node: '>= 14'}
 
+  degenerator@7.0.1:
+    resolution: {integrity: sha512-ABErK0IefDSyHjlPH7WUEenIAX2rPPnrDcDM+TS3z3+zu9TfyKKi07BQM+8rmxpdE2y1v5fjjdoAS/x4D2U60w==}
+    engines: {node: '>= 20'}
+    peerDependencies:
+      quickjs-wasi: ^2.2.0
+
   delayed-stream@1.0.0:
     resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==}
     engines: {node: '>=0.4.0'}
@@ -3744,6 +3778,15 @@ packages:
       debug:
         optional: true
 
+  follow-redirects@1.16.0:
+    resolution: {integrity: sha512-y5rN/uOsadFT/JfYwhxRS5R7Qce+g3zG97+JrtFZlC9klX/W5hD7iiLzScI4nZqUS7DNUdhPgw4xI8W2LuXlUw==}
+    engines: {node: '>=4.0'}
+    peerDependencies:
+      debug: '*'
+    peerDependenciesMeta:
+      debug:
+        optional: true
+
   for-each@0.3.5:
     resolution: {integrity: sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==}
     engines: {node: '>= 0.4'}
@@ -3868,6 +3911,10 @@ packages:
     resolution: {integrity: sha512-b1O07XYq8eRuVzBNgJLstU6FYc1tS6wnMtF1I1D9lE8LxZSOGZ7LhxN54yPP6mGw5f2CkXY2BQUL9Fx41qvcIg==}
     engines: {node: '>= 14'}
 
+  get-uri@8.0.0:
+    resolution: {integrity: sha512-CqtZlMKvfJeY0Zxv8wazDwXmSKmnMnsmNy8j8+wudi8EyG/pMUB1NqHc+Tv1QaNtpYsK9nOYjb7r7Ufu32RPSw==}
+    engines: {node: '>= 20'}
+
   glob-parent@5.1.2:
     resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==}
     engines: {node: '>= 6'}
@@ -4027,10 +4074,22 @@ packages:
     resolution: {integrity: sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==}
     engines: {node: '>= 14'}
 
+  http-proxy-agent@9.0.0:
+    resolution: {integrity: sha512-FcF8VhXYLQcxWCnt/cCpT2apKsRDUGeVEeMqGu4HSTu29U8Yw0TLOjdYIlDsYk3IkUh+taX4IDWpPcCqKDhCjA==}
+    engines: {node: '>= 20'}
+
+  https-proxy-agent@5.0.1:
+    resolution: {integrity: sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==}
+    engines: {node: '>= 6'}
+
   https-proxy-agent@7.0.6:
     resolution: {integrity: sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==}
     engines: {node: '>= 14'}
 
+  https-proxy-agent@9.0.0:
+    resolution: {integrity: sha512-/MVmHp58WkOypgFhCLk4fzpPcFQvTJ/e6LBI7irpIO2HfxUbpmYoHF+KzipzJpxxzJu7aJNWQ0xojJ/dzV2G5g==}
+    engines: {node: '>= 20'}
+
   human-signals@2.1.0:
     resolution: {integrity: sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==}
     engines: {node: '>=10.17.0'}
@@ -5185,10 +5244,20 @@ packages:
     resolution: {integrity: sha512-TEB8ESquiLMc0lV8vcd5Ql/JAKAoyzHFXaStwjkzpOpC5Yv+pIzLfHvjTSdf3vpa2bMiUQrg9i6276yn8666aA==}
     engines: {node: '>= 14'}
 
+  pac-proxy-agent@9.0.1:
+    resolution: {integrity: sha512-3ZOSpLboOlpW4yp8Cuv21KlTULRqyJ5Uuad3wXpSKFrxdNgcHEyoa22GRaZ2UlgCVuR6z+5BiavtYVvbajL/Yw==}
+    engines: {node: '>= 20'}
+
   pac-resolver@7.0.1:
     resolution: {integrity: sha512-5NPgf87AT2STgwa2ntRMr45jTKrYBGkVU36yT0ig/n/GMAa3oPqhZfIQ2kMEimReg0+t9kZViDVZ83qfVUlckg==}
     engines: {node: '>= 14'}
 
+  pac-resolver@9.0.1:
+    resolution: {integrity: sha512-lJbS008tmkj08VhoM8Hzuv/VE5tK9MS0OIQ/7+s0lIF+BYhiQWFYzkSpML7lXs9iBu2jfmzBTLzhe9n6BX+dYw==}
+    engines: {node: '>= 20'}
+    peerDependencies:
+      quickjs-wasi: ^2.2.0
+
   package-json-from-dist@1.0.1:
     resolution: {integrity: sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==}
 
@@ -5479,6 +5548,10 @@ packages:
     resolution: {integrity: sha512-TmatMXdr2KlRiA2CyDu8GqR8EjahTG3aY3nXjdzFyoZbmB8hrBsTyMezhULIXKnC0jpfjlmiZ3+EaCzoInSu/A==}
     engines: {node: '>= 14'}
 
+  proxy-agent@8.0.1:
+    resolution: {integrity: sha512-kccqGBqHZXR8onQhY/ganJjoO8QIKKRiFBhPOzbTZK16attzSZ/0XSmp9H7jrRxPKHjhGyx1q32lMPrJ3uLFgA==}
+    engines: {node: '>= 20'}
+
   proxy-from-env@1.1.0:
     resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==}
 
@@ -5528,6 +5601,9 @@ packages:
   quick-format-unescaped@4.0.4:
     resolution: {integrity: sha512-tYC1Q1hgyRuHgloV/YXs2w15unPVh8qfu/qCTfhTYamaw7fyhumKa2yGpdSo87vY32rIclj+4fWYQXUMs9EHvg==}
 
+  quickjs-wasi@2.2.0:
+    resolution: {integrity: sha512-zQxXmQMrEoD3S+jQdYsloq4qAuaxKFHZj6hHqOYGwB2iQZH+q9e/lf5zQPXCKOk0WJuAjzRFbO4KwHIp2D05Iw==}
+
   randombytes@2.1.0:
     resolution: {integrity: sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==}
 
@@ -5903,6 +5979,10 @@ packages:
     resolution: {integrity: sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==}
     engines: {node: '>= 6.0.0', npm: '>= 3.0.0'}
 
+  socks-proxy-agent@10.0.0:
+    resolution: {integrity: sha512-pyp2YR3mNxAMu0mGLtzs4g7O3uT4/9sQOLAKcViAkaS9fJWkud7nmaf6ZREFqQEi24IPkBcjfHjXhPTUWjo3uA==}
+    engines: {node: '>= 20'}
+
   socks-proxy-agent@8.0.5:
     resolution: {integrity: sha512-HehCEsotFqbPW9sJ8WVYB6UbmIMv7kUUORIF2Nncq4VQvBfNBLibW9YZR5dlYCSUhwcD628pRllm7n+E+YTzJw==}
     engines: {node: '>= 14'}
@@ -6493,6 +6573,7 @@ packages:
 
   uuid@10.0.0:
     resolution: {integrity: sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==}
+    deprecated: uuid@10 and below is no longer supported.  For ESM codebases, update to uuid@latest.  For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028).
     hasBin: true
 
   uuid@11.0.5:
@@ -6501,10 +6582,12 @@ packages:
 
   uuid@8.3.2:
     resolution: {integrity: sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==}
+    deprecated: uuid@10 and below is no longer supported.  For ESM codebases, update to uuid@latest.  For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028).
     hasBin: true
 
   uuid@9.0.1:
     resolution: {integrity: sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==}
+    deprecated: uuid@10 and below is no longer supported.  For ESM codebases, update to uuid@latest.  For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028).
     hasBin: true
 
   v8-compile-cache-lib@3.0.1:
@@ -9106,8 +9189,18 @@ snapshots:
 
   acorn@8.16.0: {}
 
+  adm-zip@0.5.17: {}
+
+  agent-base@6.0.2:
+    dependencies:
+      debug: 4.4.3
+    transitivePeerDependencies:
+      - supports-color
+
   agent-base@7.1.4: {}
 
+  agent-base@9.0.0: {}
+
   ajv-draft-04@1.0.0(ajv@8.13.0):
     optionalDependencies:
       ajv: 8.13.0
@@ -9379,6 +9472,16 @@ snapshots:
     transitivePeerDependencies:
       - debug
 
+  axios@1.16.1:
+    dependencies:
+      follow-redirects: 1.16.0
+      form-data: 4.0.5
+      https-proxy-agent: 5.0.1
+      proxy-from-env: 2.1.0
+    transitivePeerDependencies:
+      - debug
+      - supports-color
+
   b4a@1.8.0: {}
 
   babel-jest@29.7.0(@babel/core@7.29.0):
@@ -9480,6 +9583,8 @@ snapshots:
 
   basic-ftp@5.0.5: {}
 
+  basic-ftp@5.3.1: {}
+
   big-integer@1.6.52: {}
 
   binary-extensions@2.3.0: {}
@@ -9721,6 +9826,19 @@ snapshots:
       - debug
       - supports-color
 
+  chromedriver@148.0.3:
+    dependencies:
+      '@testim/chrome-version': 1.1.4
+      adm-zip: 0.5.17
+      axios: 1.16.1
+      compare-versions: 6.1.1
+      proxy-agent: 8.0.1
+      proxy-from-env: 2.1.0
+      tcp-port-used: 1.0.2
+    transitivePeerDependencies:
+      - debug
+      - supports-color
+
   chromium-bidi@0.5.8(devtools-protocol@0.0.1232444):
     dependencies:
       devtools-protocol: 0.0.1232444
@@ -9964,6 +10082,8 @@ snapshots:
 
   data-uri-to-buffer@6.0.2: {}
 
+  data-uri-to-buffer@8.0.0: {}
+
   data-urls@5.0.0:
     dependencies:
       whatwg-mimetype: 4.0.0
@@ -10084,6 +10204,13 @@ snapshots:
       escodegen: 2.1.0
       esprima: 4.0.1
 
+  degenerator@7.0.1(quickjs-wasi@2.2.0):
+    dependencies:
+      ast-types: 0.13.4
+      escodegen: 2.1.0
+      esprima: 4.0.1
+      quickjs-wasi: 2.2.0
+
   delayed-stream@1.0.0: {}
 
   depd@2.0.0: {}
@@ -10808,6 +10935,8 @@ snapshots:
 
   follow-redirects@1.15.11: {}
 
+  follow-redirects@1.16.0: {}
+
   for-each@0.3.5:
     dependencies:
       is-callable: 1.2.7
@@ -10956,6 +11085,14 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  get-uri@8.0.0:
+    dependencies:
+      basic-ftp: 5.3.1
+      data-uri-to-buffer: 8.0.0
+      debug: 4.4.3
+    transitivePeerDependencies:
+      - supports-color
+
   glob-parent@5.1.2:
     dependencies:
       is-glob: 4.0.3
@@ -11130,6 +11267,20 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  http-proxy-agent@9.0.0:
+    dependencies:
+      agent-base: 9.0.0
+      debug: 4.4.3
+    transitivePeerDependencies:
+      - supports-color
+
+  https-proxy-agent@5.0.1:
+    dependencies:
+      agent-base: 6.0.2
+      debug: 4.4.3
+    transitivePeerDependencies:
+      - supports-color
+
   https-proxy-agent@7.0.6:
     dependencies:
       agent-base: 7.1.4
@@ -11137,6 +11288,13 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  https-proxy-agent@9.0.0:
+    dependencies:
+      agent-base: 9.0.0
+      debug: 4.4.3
+    transitivePeerDependencies:
+      - supports-color
+
   human-signals@2.1.0: {}
 
   human-signals@8.0.1: {}
@@ -12243,7 +12401,7 @@ snapshots:
     dependencies:
       axe-core: 4.11.1
 
-  nightwatch@3.15.0(@cucumber/cucumber@11.3.0)(chromedriver@147.0.1):
+  nightwatch@3.15.0(@cucumber/cucumber@11.3.0)(chromedriver@148.0.3):
     dependencies:
       '@nightwatch/chai': 5.0.3
       '@nightwatch/html-reporter-template': 0.3.0
@@ -12281,7 +12439,7 @@ snapshots:
       uuid: 8.3.2
     optionalDependencies:
       '@cucumber/cucumber': 11.3.0
-      chromedriver: 147.0.1
+      chromedriver: 148.0.3
     transitivePeerDependencies:
       - bufferutil
       - canvas
@@ -12498,11 +12656,30 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  pac-proxy-agent@9.0.1:
+    dependencies:
+      agent-base: 9.0.0
+      debug: 4.4.3
+      get-uri: 8.0.0
+      http-proxy-agent: 9.0.0
+      https-proxy-agent: 9.0.0
+      pac-resolver: 9.0.1(quickjs-wasi@2.2.0)
+      quickjs-wasi: 2.2.0
+      socks-proxy-agent: 10.0.0
+    transitivePeerDependencies:
+      - supports-color
+
   pac-resolver@7.0.1:
     dependencies:
       degenerator: 5.0.1
       netmask: 2.0.2
 
+  pac-resolver@9.0.1(quickjs-wasi@2.2.0):
+    dependencies:
+      degenerator: 7.0.1(quickjs-wasi@2.2.0)
+      netmask: 2.0.2
+      quickjs-wasi: 2.2.0
+
   package-json-from-dist@1.0.1: {}
 
   package-manager-detector@1.5.0: {}
@@ -12790,6 +12967,19 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  proxy-agent@8.0.1:
+    dependencies:
+      agent-base: 9.0.0
+      debug: 4.4.3
+      http-proxy-agent: 9.0.0
+      https-proxy-agent: 9.0.0
+      lru-cache: 7.18.3
+      pac-proxy-agent: 9.0.1
+      proxy-from-env: 2.1.0
+      socks-proxy-agent: 10.0.0
+    transitivePeerDependencies:
+      - supports-color
+
   proxy-from-env@1.1.0: {}
 
   proxy-from-env@2.1.0: {}
@@ -12845,6 +13035,8 @@ snapshots:
 
   quick-format-unescaped@4.0.4: {}
 
+  quickjs-wasi@2.2.0: {}
+
   randombytes@2.1.0:
     dependencies:
       safe-buffer: 5.2.1
@@ -13275,6 +13467,14 @@ snapshots:
 
   smart-buffer@4.2.0: {}
 
+  socks-proxy-agent@10.0.0:
+    dependencies:
+      agent-base: 9.0.0
+      debug: 4.4.3
+      socks: 2.8.7
+    transitivePeerDependencies:
+      - supports-color
+
   socks-proxy-agent@8.0.5:
     dependencies:
       agent-base: 7.1.4

From 6b1e0f3380cc3e57439e353230ed26754ab4f6a5 Mon Sep 17 00:00:00 2001
From: Vishnu Vardhan <vishnu.p@browserstack.com>
Date: Wed, 20 May 2026 17:36:46 +0530
Subject: [PATCH 8/8] Nightwatch devtools version bump

---
 packages/nightwatch-devtools/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nightwatch-devtools/package.json b/packages/nightwatch-devtools/package.json
index 5b967c0f..d811ee5d 100644
--- a/packages/nightwatch-devtools/package.json
+++ b/packages/nightwatch-devtools/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@wdio/nightwatch-devtools",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "description": "Nightwatch adapter for WebdriverIO DevTools - reuses existing backend, UI, and capture infrastructure",
   "type": "module",
   "main": "dist/index.js",