@wdio/browserstack-service 8.48.0 → 8.48.3

package/build/instrumentation/performance/constants.js

@@ -24,7 +24,44 @@ export const EVENTS = {
     SDK_CLI_ON_CONNECT: 'sdk:cli:on-connect',
     SDK_CLI_ON_STOP: 'sdk:cli:on-stop',
     SDK_START_BIN_SESSION: 'sdk:startBinSession',
-    SDK_CONNECT_BIN_SESSION: 'sdk:connectBinSession'
+    SDK_CONNECT_BIN_SESSION: 'sdk:connectBinSession',
+    // New events from Python SDK
+    SDK_DRIVER_INIT: 'sdk:driverInit',
+    SDK_FIND_NEAREST_HUB: 'sdk:findNearestHub',
+    SDK_AUTOMATION_FRAMEWORK_INIT: 'sdk:automationFrameworkInit',
+    SDK_AUTOMATION_FRAMEWORK_START: 'sdk:automationFrameworkStart',
+    SDK_AUTOMATION_FRAMEWORK_STOP: 'sdk:automationFrameworkStop',
+    SDK_ACCESSIBILITY_CONFIG: 'sdk:accessibilityConfig',
+    SDK_OBSERVABILITY_CONFIG: 'sdk:observabilityConfig',
+    SDK_AI_SELF_HEAL_STEP: 'sdk:aiSelfHealStep',
+    SDK_AI_SELF_HEAL_GET_RESULT: 'sdk:aiSelfHealGetResult',
+    SDK_TEST_FRAMEWORK_EVENT: 'sdk:testFrameworkEvent',
+    SDK_TEST_SESSION_EVENT: 'sdk:testSessionEvent',
+    SDK_CLI_LOG_CREATED_EVENT: 'sdk:cli:logCreatedEvent',
+    SDK_CLI_ENQUEUE_TEST_EVENT: 'sdk:cli:enqueueTestEvent',
+    SDK_ON_STOP: 'sdk:onStop',
+    SDK_SEND_LOGS: 'sdk:sendlogs',
+    // Funnel Events
+    SDK_FUNNEL_TEST_ATTEMPTED: 'sdk:funnel:test-attempted',
+    SDK_FUNNEL_TEST_SUCCESSFUL: 'sdk:funnel:test-successful',
+    // Log Upload Events
+    SDK_UPLOAD_LOGS: 'sdk:upload-logs',
+    // Key Metrics Events
+    SDK_SEND_KEY_METRICS: 'sdk:send-key-metrics',
+    SDK_KEY_METRICS_PREPARATION: 'sdk:key-metrics:preparation',
+    SDK_KEY_METRICS_UPLOAD: 'sdk:key-metrics:upload',
+    // CLI Binary Events
+    SDK_CLI_DOWNLOAD_BINARY: 'sdk:cli:download-binary',
+    SDK_CLI_BINARY_VERIFICATION: 'sdk:cli:binary-verification',
+    // Cleanup & Shutdown Events (tracking gap between driver:quit and funnel:test-successful)
+    SDK_LISTENER_WORKER_END: 'sdk:listener:worker-end',
+    SDK_PERCY_TEARDOWN: 'sdk:percy:teardown',
+    SDK_WORKER_SAVE_DATA: 'sdk:worker:save-data',
+    SDK_PERFORMANCE_REPORT_GEN: 'sdk:performance:report-generation',
+    SDK_PERFORMANCE_JSON_WRITE: 'sdk:performance:json-write',
+    SDK_PERFORMANCE_HTML_GEN: 'sdk:performance:html-generation',
+    // Device Allocation Event (tracking gap between beforeSession and before hooks)
+    SDK_DEVICE_ALLOCATION: 'sdk:device-allocation'
 };
 export const TESTHUB_EVENTS = {
     START: `${EVENTS.SDK_TESTHUB}:start`,
@@ -82,5 +119,39 @@ export const DRIVER_EVENT = {
     QUIT: `${EVENTS.SDK_DRIVER}:quit`,
     GET: `${EVENTS.SDK_DRIVER}:get`,
     PRE_EXECUTE: `${EVENTS.SDK_DRIVER}:pre-execute`,
-    POST_EXECUTE: `${EVENTS.SDK_DRIVER}:post-execute`
+    POST_EXECUTE: `${EVENTS.SDK_DRIVER}:post-execute`,
+    INIT: EVENTS.SDK_DRIVER_INIT,
+    PRE_INITIALIZE: EVENTS.SDK_PRE_INITIALIZE,
+    POST_INITIALIZE: EVENTS.SDK_POST_INITIALIZE
+};
+/**
+ * Framework lifecycle events for automation framework tracking
+ */
+export const FRAMEWORK_EVENTS = {
+    INIT: EVENTS.SDK_AUTOMATION_FRAMEWORK_INIT,
+    START: EVENTS.SDK_AUTOMATION_FRAMEWORK_START,
+    STOP: EVENTS.SDK_AUTOMATION_FRAMEWORK_STOP
+};
+/**
+ * Module configuration events
+ */
+export const CONFIG_EVENTS = {
+    ACCESSIBILITY: EVENTS.SDK_ACCESSIBILITY_CONFIG,
+    OBSERVABILITY: EVENTS.SDK_OBSERVABILITY_CONFIG
+};
+/**
+ * AI self-healing events
+ */
+export const AI_EVENTS = {
+    SELF_HEAL_STEP: EVENTS.SDK_AI_SELF_HEAL_STEP,
+    SELF_HEAL_GET_RESULT: EVENTS.SDK_AI_SELF_HEAL_GET_RESULT
+};
+/**
+ * Event dispatcher events for test framework and session tracking
+ */
+export const DISPATCHER_EVENTS = {
+    TEST_FRAMEWORK: EVENTS.SDK_TEST_FRAMEWORK_EVENT,
+    TEST_SESSION: EVENTS.SDK_TEST_SESSION_EVENT,
+    LOG_CREATED: EVENTS.SDK_CLI_LOG_CREATED_EVENT,
+    ENQUEUE_TEST: EVENTS.SDK_CLI_ENQUEUE_TEST_EVENT
 };

package/build/instrumentation/performance/performance-tester.d.ts

@@ -4,6 +4,7 @@ type PerformanceDetails = {
     failure?: string;
     testName?: string;
     worker?: string | number;
+    clientWorkerId?: string;
     command?: string;
     hookType?: string;
     platform?: string | number;
@@ -13,6 +14,8 @@ export default class PerformanceTester {
     static _csvWriter: any;
     private static _events;
     private static _measuredEvents;
+    private static _hasStoppedGeneration;
+    private static _stopGenerateCallCount;
     static started: boolean;
     static details: {
         [key: string]: PerformanceDetails;
@@ -36,6 +39,14 @@ export default class PerformanceTester {
     static measure(label: string, fn: Function, details?: {}, args?: IArguments, thisArg?: any): any;
     static start(event: string): void;
     static end(event: string, success?: boolean, failure?: string | unknown, details?: {}): void;
+    /**
+     * Get client worker ID in format "threadId-processId".
+     * This method provides a consistent identifier across the SDK for tracking
+     * worker-specific events and performance metrics.
+     *
+     * @returns Worker ID string in format "threadId-processId"
+     */
+    static getClientWorkerId(): string;
     static getProcessId(): string;
     static sleep: (ms?: number) => Promise<unknown>;
     static uploadEventsData(): Promise<void>;

package/build/instrumentation/performance/performance-tester.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"performance-tester.d.ts","sourceRoot":"","sources":["../../../src/instrumentation/performance/performance-tester.ts"],"names":[],"mappings":"AAIA,OAAO,EAAe,mBAAmB,EAAE,MAAM,iBAAiB,CAAA;AAYlE,KAAK,kBAAkB,GAAG;IACtB,OAAO,CAAC,EAAE,IAAI,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;CAC7B,CAAA;AAED,MAAM,CAAC,OAAO,OAAO,iBAAiB;IAClC,MAAM,CAAC,SAAS,EAAE,mBAAmB,CAAA;IACrC,MAAM,CAAC,UAAU,EAAE,GAAG,CAAA;IACtB,OAAO,CAAC,MAAM,CAAC,OAAO,CAAyB;IAC/C,OAAO,CAAC,MAAM,CAAC,eAAe,CAAyB;IACvD,MAAM,CAAC,OAAO,UAAQ;IACtB,MAAM,CAAC,OAAO,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,kBAAkB,CAAA;KAAC,CAAK;IACxD,MAAM,CAAC,SAAS,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAC,CAAK;IAC9C,MAAM,CAAC,OAAO,CAAC,EAAE,WAAW,CAAC,OAAO,CAAA;IACpC,MAAM,CAAC,eAAe,EAAE,MAAM,EAAE,CAAA;IAChC,MAAM,CAAC,iBAAiB,SAAuB;IAC/C,MAAM,CAAC,iBAAiB,SAA2D;IACnF,MAAM,CAAC,kBAAkB,SAA0F;IAEnH,MAAM,CAAC,eAAe,CAAC,OAAO,GAAE,MAAiC;IAwCjE,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,GAAI,MAAM;WAepC,eAAe,CAAC,QAAQ,GAAE,MAA+B;IAsCtE,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,gBAAgB,EAAE;IAWjD,MAAM,CAAC,WAAW,CAAC,OAAO,EAAE,gBAAgB,EAAE;IAwB9C,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,GAAE,kBAAuB,YAG9C,MAAM,OACT,MAAM,GAAG,MAAM,cACR,uBAAuB,CAAC,GAAG,CAAC;IAUhD,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,OAAO,GAAE,kBAAuB,aAOpD,GAAG,EAAE;IAQnC,MAAM,CAAC,SAAS;IAIhB,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,OAAO,KAAK,EAAE,IAAI,CAAC,EAAE,UAAU,EAAE,OAAO,GAAE,GAAU;IA6BhG,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,MAAM;IAO1B,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,UAAO,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,EAAE,OAAO,KAAK;IAUlF,MAAM,CAAC,YAAY;IAInB,MAAM,CAAC,KAAK,oCAAkE;WAEjE,gBAAgB;CA0EhC"}
+{"version":3,"file":"performance-tester.d.ts","sourceRoot":"","sources":["../../../src/instrumentation/performance/performance-tester.ts"],"names":[],"mappings":"AAIA,OAAO,EAAe,mBAAmB,EAAE,MAAM,iBAAiB,CAAA;AAclE,KAAK,kBAAkB,GAAG;IACtB,OAAO,CAAC,EAAE,IAAI,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACzB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;CAC7B,CAAA;AAED,MAAM,CAAC,OAAO,OAAO,iBAAiB;IAClC,MAAM,CAAC,SAAS,EAAE,mBAAmB,CAAA;IACrC,MAAM,CAAC,UAAU,EAAE,GAAG,CAAA;IACtB,OAAO,CAAC,MAAM,CAAC,OAAO,CAAyB;IAC/C,OAAO,CAAC,MAAM,CAAC,eAAe,CAAyB;IACvD,OAAO,CAAC,MAAM,CAAC,qBAAqB,CAAQ;IAC5C,OAAO,CAAC,MAAM,CAAC,sBAAsB,CAAI;IACzC,MAAM,CAAC,OAAO,UAAQ;IACtB,MAAM,CAAC,OAAO,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,kBAAkB,CAAA;KAAC,CAAK;IACxD,MAAM,CAAC,SAAS,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAC,CAAK;IAC9C,MAAM,CAAC,OAAO,CAAC,EAAE,WAAW,CAAC,OAAO,CAAA;IACpC,MAAM,CAAC,eAAe,EAAE,MAAM,EAAE,CAAA;IAChC,MAAM,CAAC,iBAAiB,SAAuB;IAC/C,MAAM,CAAC,iBAAiB,SAA2D;IACnF,MAAM,CAAC,kBAAkB,SAA0F;IAEnH,MAAM,CAAC,eAAe,CAAC,OAAO,GAAE,MAAiC;IAkDjE,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,GAAI,MAAM;WAepC,eAAe,CAAC,QAAQ,GAAE,MAA+B;IAkCtE,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,gBAAgB,EAAE;IAWjD,MAAM,CAAC,WAAW,CAAC,OAAO,EAAE,gBAAgB,EAAE;IAwB9C,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,GAAE,kBAAuB,YAG9C,MAAM,OACT,MAAM,GAAG,MAAM,cACR,uBAAuB,CAAC,GAAG,CAAC;IAUhD,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,OAAO,GAAE,kBAAuB,aAOpD,GAAG,EAAE;IAQnC,MAAM,CAAC,SAAS;IAIhB,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,OAAO,KAAK,EAAE,IAAI,CAAC,EAAE,UAAU,EAAE,OAAO,GAAE,GAAU;IA6FhG,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,MAAM;IAO1B,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,UAAO,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,EAAE,OAAO,KAAK;IAWlF;;;;;;OAMG;IACH,MAAM,CAAC,iBAAiB,IAAI,MAAM;IAIlC,MAAM,CAAC,YAAY;IAInB,MAAM,CAAC,KAAK,oCAAkE;WAEjE,gBAAgB;CA4GhC"}

package/build/instrumentation/performance/performance-tester.js

@@ -8,13 +8,17 @@ import path from 'node:path';
 import { arch, hostname, platform, type, version } from 'node:os';
 import got from 'got';
 import { BStackLogger } from '../../bstackLogger.js';
-import { PERF_MEASUREMENT_ENV, PERF_METRICS_WAIT_TIME } from '../../constants.js';
+import { PERF_MEASUREMENT_ENV } from '../../constants.js';
 import APIUtils from '../../cli/apiUtils.js';
+import { CLIUtils } from '../../cli/cliUtils.js';
+import { EVENTS } from './constants.js';
 export default class PerformanceTester {
     static _observer;
     static _csvWriter;
     static _events = [];
     static _measuredEvents = [];
+    static _hasStoppedGeneration = false;
+    static _stopGenerateCallCount = 0;
     static started = false;
     static details = {};
     static eventsMap = {};
@@ -34,6 +38,14 @@ export default class PerformanceTester {
                 .forEach(entry => {
                 let finalEntry = entry;
                 finalEntry = entry.toJSON();
+                try {
+                    if (typeof finalEntry.startTime === 'number' && typeof performance.timeOrigin === 'number') {
+                        finalEntry.startTime = performance.timeOrigin + finalEntry.startTime;
+                    }
+                }
+                catch (e) {
+                    BStackLogger.debug(`Error converting startTime to epoch: ${util.format(e)}`);
+                }
                 if (this.details[entry.name]) {
                     finalEntry = Object.assign(finalEntry, this.details[entry.name]);
                 }
@@ -78,7 +90,6 @@ export default class PerformanceTester {
         if (!this.started) {
             return;
         }
-        await PerformanceTester.sleep(PERF_METRICS_WAIT_TIME); // Wait to ensure all pending measurements are processed by the observer
         try {
             const eventsJson = JSON.stringify(this._measuredEvents);
             // remove enclosing array and add a trailing comma so that we
@@ -93,8 +104,8 @@ export default class PerformanceTester {
         if (!process.env[PERF_MEASUREMENT_ENV]) {
             return;
         }
-        await PerformanceTester.sleep(PERF_METRICS_WAIT_TIME); // Wait to 2s just to finish any running callbacks for timerify
         this.started = false;
+        // Generate CSV and HTML reports using directly collected events
         this.generateCSV(this._events);
         const content = this.generateReport(this._events);
         const dir = path.join(process.cwd(), filename);
@@ -166,27 +177,78 @@ export default class PerformanceTester {
         if (!this.started || !this.isEnabled()) {
             return fn.apply(thisArg, args);
         }
-        PerformanceTester.start(label);
-        this.details && (this.details[label] = details);
+        // Generate unique mark names for this specific call to avoid timing conflicts
+        const uniqueId = `${Date.now()}-${Math.random().toString(36).substring(7)}`;
+        const startMark = `${label}-start-${uniqueId}`;
+        const endMark = `${label}-end-${uniqueId}`;
+        // Create the start mark with unique ID
+        performance.mark(startMark);
+        // Store details with measurement context
+        const detailsWithContext = {
+            ...details,
+            measurementId: uniqueId
+        };
         try {
             const returnVal = fn.apply(thisArg, args);
             if (returnVal instanceof Promise) {
                 return new Promise((resolve, reject) => {
                     returnVal
                         .then(v => {
-                        PerformanceTester.end(label);
+                        // Use specific marks for this call
+                        performance.mark(endMark);
+                        performance.measure(label, startMark, endMark);
+                        this.details[label] = Object.assign({
+                            success: true,
+                            failure: undefined
+                        }, Object.assign(Object.assign({
+                            clientWorkerId: PerformanceTester.getClientWorkerId(),
+                            worker: PerformanceTester.getProcessId(),
+                            platform: PerformanceTester.browser?.sessionId,
+                            testName: PerformanceTester.scenarioThatRan?.pop()
+                        }, detailsWithContext), this.details[label] || {}));
                         resolve(v);
                     }).catch(e => {
-                        PerformanceTester.end(label, false, util.format(e));
+                        performance.mark(endMark);
+                        performance.measure(label, startMark, endMark);
+                        this.details[label] = Object.assign({
+                            success: false,
+                            failure: util.format(e)
+                        }, Object.assign(Object.assign({
+                            clientWorkerId: PerformanceTester.getClientWorkerId(),
+                            worker: PerformanceTester.getProcessId(),
+                            platform: PerformanceTester.browser?.sessionId,
+                            testName: PerformanceTester.scenarioThatRan?.pop()
+                        }, detailsWithContext), this.details[label] || {}));
                         reject(e);
                     });
                 });
             }
-            PerformanceTester.end(label);
+            // Synchronous execution
+            performance.mark(endMark);
+            performance.measure(label, startMark, endMark);
+            this.details[label] = Object.assign({
+                success: true,
+                failure: undefined
+            }, Object.assign(Object.assign({
+                clientWorkerId: PerformanceTester.getClientWorkerId(),
+                worker: PerformanceTester.getProcessId(),
+                platform: PerformanceTester.browser?.sessionId,
+                testName: PerformanceTester.scenarioThatRan?.pop()
+            }, detailsWithContext), this.details[label] || {}));
             return returnVal;
         }
         catch (er) {
-            PerformanceTester.end(label, false, util.format(er));
+            performance.mark(endMark);
+            performance.measure(label, startMark, endMark);
+            this.details[label] = Object.assign({
+                success: false,
+                failure: util.format(er)
+            }, Object.assign(Object.assign({
+                clientWorkerId: PerformanceTester.getClientWorkerId(),
+                worker: PerformanceTester.getProcessId(),
+                platform: PerformanceTester.browser?.sessionId,
+                testName: PerformanceTester.scenarioThatRan?.pop()
+            }, detailsWithContext), this.details[label] || {}));
             throw er;
         }
     }
@@ -202,25 +264,59 @@ export default class PerformanceTester {
         performance.mark(event + '-end');
         performance.measure(event, event + '-start', event + '-end');
         this.details[event] = Object.assign({ success, failure: util.format(failure) }, Object.assign(Object.assign({
+            clientWorkerId: PerformanceTester.getClientWorkerId(),
             worker: PerformanceTester.getProcessId(),
             platform: PerformanceTester.browser?.sessionId,
             testName: PerformanceTester.scenarioThatRan?.pop()
         }, details), this.details[event] || {}));
     }
+    /**
+     * Get client worker ID in format "threadId-processId".
+     * This method provides a consistent identifier across the SDK for tracking
+     * worker-specific events and performance metrics.
+     *
+     * @returns Worker ID string in format "threadId-processId"
+     */
+    static getClientWorkerId() {
+        return CLIUtils.getClientWorkerId();
+    }
     static getProcessId() {
         return `${process.pid}-${worker.threadId}`;
     }
     static sleep = (ms = 100) => new Promise((resolve) => setTimeout(resolve, ms));
     static async uploadEventsData() {
+        // Track overall key metrics operation
+        this.start(EVENTS.SDK_SEND_KEY_METRICS);
         try {
+            const workerId = `${process.pid}`;
+            BStackLogger.debug(`[Performance Upload] Starting upload for worker ${workerId}`);
+            // Track preparation phase (collection and deduplication)
+            this.start(EVENTS.SDK_KEY_METRICS_PREPARATION);
+            // Collect all measures from performance report files and in-memory events
             let measures = [];
             if (await fsPromise.access(this.jsonReportDirPath).then(() => true).catch(() => false)) {
                 const files = (await fsPromise.readdir(this.jsonReportDirPath)).map(file => path.resolve(this.jsonReportDirPath, file));
                 measures = (await Promise.all(files.map((file) => fsPromise.readFile(file, 'utf-8')))).map(el => `[${el.slice(0, -1)}]`).map(el => JSON.parse(el)).flat();
             }
+            BStackLogger.debug(`[Performance Upload] Total events from files: ${measures.length}`);
             if (this._measuredEvents.length > 0) {
+                BStackLogger.debug(`[Performance Upload] Adding ${this._measuredEvents.length} in-memory events`);
                 measures = measures.concat(this._measuredEvents);
             }
+            const ensureEpochTimes = (arr) => {
+                const now = Date.now();
+                const cutoff = 1e12; // ~year 2001, ms epoch
+                const timeOrigin = (typeof performance !== 'undefined' && typeof performance.timeOrigin === 'number')
+                    ? performance.timeOrigin
+                    : (now - process.uptime() * 1000);
+                return arr.map(entry => {
+                    if (typeof entry.startTime === 'number' && entry.startTime < cutoff) {
+                        entry.startTime = timeOrigin + entry.startTime;
+                    }
+                    return entry;
+                });
+            };
+            measures = ensureEpochTimes(measures);
             const date = new Date();
             // yyyy-MM-dd'T'HH:mm:ss.SSSSSS Z
             const options = {
@@ -240,6 +336,7 @@ export default class PerformanceTester {
                 .map(({ type, value }) => type === 'timeZoneName' ? 'Z' : value)
                 .join('')
                 .replace(',', 'T');
+            this.end(EVENTS.SDK_KEY_METRICS_PREPARATION, true);
             const payload = {
                 event_type: 'sdk_events',
                 data: {
@@ -262,10 +359,15 @@ export default class PerformanceTester {
                     'content-type': 'application/json'
                 }, json: payload
             });
-            BStackLogger.debug(`Successfully uploaded performance events ${util.format(result.body)}`);
+            BStackLogger.debug(`[Performance Upload] Successfully uploaded to EDS: ${util.format(result.body)}`);
+            this.end(EVENTS.SDK_KEY_METRICS_UPLOAD, true);
+            this.end(EVENTS.SDK_SEND_KEY_METRICS, true);
         }
         catch (er) {
-            BStackLogger.debug(`Failed to upload performance events ${util.format(er)}`);
+            BStackLogger.debug(`[Performance Upload] Failed to upload events: ${util.format(er)}`);
+            this.end(EVENTS.SDK_KEY_METRICS_UPLOAD, false, er);
+            this.end(EVENTS.SDK_KEY_METRICS_PREPARATION, false, er);
+            this.end(EVENTS.SDK_SEND_KEY_METRICS, false, er);
         }
         try {
             if (await fsPromise.access(this.jsonReportDirPath).then(() => true, () => false)) {
@@ -273,10 +375,11 @@ export default class PerformanceTester {
                 for (const file of files) {
                     await fsPromise.unlink(path.join(this.jsonReportDirPath, file));
                 }
+                BStackLogger.debug(`[Performance Upload] Cleaned up ${files.length} temporary report files`);
             }
         }
         catch (er) {
-            BStackLogger.debug(`Failed to delete performance related files ${util.format(er)}`);
+            BStackLogger.debug(`[Performance Upload] Failed to delete temporary files: ${util.format(er)}`);
         }
     }
 }

package/build/launcher.d.ts

@@ -30,6 +30,7 @@ export default class BrowserstackLauncherService implements Services.ServiceInst
      */
     _validateApp(appConfig: AppConfig | string): Promise<App>;
     _uploadServiceLogs(): Promise<void>;
+    private _removeCliOnlyCapabilityOptions;
     _updateObjectTypeCaps(capabilities?: Capabilities.RemoteCapabilities, capType?: string, value?: {
         [key: string]: any;
     }): void;

package/build/launcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"launcher.d.ts","sourceRoot":"","sources":["../src/launcher.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,yBAAyB,MAAM,oBAAoB,CAAA;AAE/D,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAIlE,OAAO,KAAK,EAAE,kBAAkB,EAAE,GAAG,EAAE,SAAS,EAAE,iBAAiB,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAA;AAiDxH,KAAK,iBAAiB,GAAG,yBAAyB,CAAC,KAAK,GAAG;IACvD,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,IAAI,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,KAAK,IAAI,GAAG,IAAI,CAAA;CAC9C,CAAA;AAED,MAAM,CAAC,OAAO,OAAO,2BAA4B,YAAW,QAAQ,CAAC,eAAe;IAY5E,OAAO,CAAC,QAAQ;IAEhB,OAAO,CAAC,OAAO;IAbnB,iBAAiB,CAAC,EAAE,iBAAiB,CAAA;IACrC,OAAO,CAAC,UAAU,CAAC,CAAQ;IAC3B,OAAO,CAAC,YAAY,CAAC,CAAQ;IAC7B,OAAO,CAAC,SAAS,CAAC,CAAQ;IAC1B,OAAO,CAAC,gBAAgB,CAAC,CAAQ;IACjC,OAAO,CAAC,wBAAwB,CAAC,CAAuB;IACxD,OAAO,CAAC,MAAM,CAAC,CAAO;IACtB,OAAO,CAAC,sBAAsB,CAAC,CAAkC;IACjE,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAoB;gBAG3C,QAAQ,EAAE,kBAAkB,GAAG,mBAAmB,EAC1D,YAAY,EAAE,YAAY,CAAC,gBAAgB,EACnC,OAAO,EAAE,OAAO,CAAC,UAAU;IAqHjC,aAAa,CAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG;IAclC,SAAS,CAAE,MAAM,EAAE,OAAO,CAAC,UAAU,EAAE,YAAY,EAAE,YAAY,CAAC,kBAAkB;IAmNpF,UAAU;IA8FV,UAAU,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,UAAU,EAAE,QAAQ,EAAE,UAAU;IA0B7G,SAAS;IAaT,UAAU,CAAC,GAAG,EAAC,GAAG,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAuBrD;;;OAGG;IACG,YAAY,CAAE,SAAS,EAAE,SAAS,GAAG,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAyB1D,kBAAkB;IASxB,qBAAqB,CAAC,YAAY,CAAC,EAAE,YAAY,CAAC,kBAAkB,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE;IA8GtH,WAAW,CAAC,YAAY,CAAC,EAAE,YAAY,CAAC,kBAAkB,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM;IA+H5F,8BAA8B;IAgB9B,sBAAsB,CAAC,YAAY,CAAC,EAAE,YAAY,CAAC,kBAAkB;IAyCrE;;;OAGG;IACH,oBAAoB;IA6BpB,sBAAsB,CAAC,QAAQ,CAAC,EAAC,MAAM,EAAE,SAAS,CAAC,EAAC,MAAM,EAAE,eAAe,CAAC,EAAC,MAAM;IASnF,mBAAmB;CAStB"}
+{"version":3,"file":"launcher.d.ts","sourceRoot":"","sources":["../src/launcher.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,yBAAyB,MAAM,oBAAoB,CAAA;AAE/D,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAIlE,OAAO,KAAK,EAAE,kBAAkB,EAAE,GAAG,EAAE,SAAS,EAAE,iBAAiB,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAA;AAmDxH,KAAK,iBAAiB,GAAG,yBAAyB,CAAC,KAAK,GAAG;IACvD,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,IAAI,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,KAAK,IAAI,GAAG,IAAI,CAAA;CAC9C,CAAA;AAED,MAAM,CAAC,OAAO,OAAO,2BAA4B,YAAW,QAAQ,CAAC,eAAe;IAY5E,OAAO,CAAC,QAAQ;IAEhB,OAAO,CAAC,OAAO;IAbnB,iBAAiB,CAAC,EAAE,iBAAiB,CAAA;IACrC,OAAO,CAAC,UAAU,CAAC,CAAQ;IAC3B,OAAO,CAAC,YAAY,CAAC,CAAQ;IAC7B,OAAO,CAAC,SAAS,CAAC,CAAQ;IAC1B,OAAO,CAAC,gBAAgB,CAAC,CAAQ;IACjC,OAAO,CAAC,wBAAwB,CAAC,CAAuB;IACxD,OAAO,CAAC,MAAM,CAAC,CAAO;IACtB,OAAO,CAAC,sBAAsB,CAAC,CAAkC;IACjE,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAoB;gBAG3C,QAAQ,EAAE,kBAAkB,GAAG,mBAAmB,EAC1D,YAAY,EAAE,YAAY,CAAC,gBAAgB,EACnC,OAAO,EAAE,OAAO,CAAC,UAAU;IAqHjC,aAAa,CAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG;IAclC,SAAS,CAAE,MAAM,EAAE,OAAO,CAAC,UAAU,EAAE,YAAY,EAAE,YAAY,CAAC,kBAAkB;IA8UpF,UAAU;IAwGV,UAAU,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,UAAU,EAAE,QAAQ,EAAE,UAAU;IA0B7G,SAAS;IAaT,UAAU,CAAC,GAAG,EAAC,GAAG,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAuBrD;;;OAGG;IACG,YAAY,CAAE,SAAS,EAAE,SAAS,GAAG,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAyB1D,kBAAkB;IASxB,OAAO,CAAC,+BAA+B;IAmCvC,qBAAqB,CAAC,YAAY,CAAC,EAAE,YAAY,CAAC,kBAAkB,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE;IA8GtH,WAAW,CAAC,YAAY,CAAC,EAAE,YAAY,CAAC,kBAAkB,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM;IA+H5F,8BAA8B;IAgB9B,sBAAsB,CAAC,YAAY,CAAC,EAAE,YAAY,CAAC,kBAAkB;IAyCrE;;;OAGG;IACH,oBAAoB;IA6BpB,sBAAsB,CAAC,QAAQ,CAAC,EAAC,MAAM,EAAE,SAAS,CAAC,EAAC,MAAM,EAAE,eAAe,CAAC,EAAC,MAAM;IASnF,mBAAmB;CAStB"}

package/build/launcher.js

@@ -16,7 +16,7 @@ import { SevereServiceError } from 'webdriverio';
 import * as BrowserstackLocalLauncher from 'browserstack-local';
 import { startPercy, stopPercy, getBestPlatformForPercySnapshot } from './Percy/PercyHelper.js';
 import { BSTACK_SERVICE_VERSION, NOT_ALLOWED_KEYS_IN_CAPS, PERF_MEASUREMENT_ENV, RERUN_ENV, RERUN_TESTS_ENV, BROWSERSTACK_TESTHUB_UUID, VALID_APP_EXTENSION, BROWSERSTACK_PERCY, BROWSERSTACK_OBSERVABILITY, WDIO_NAMING_PREFIX } from './constants.js';
-import { launchTestSession, shouldAddServiceVersion, stopBuildUpstream, getCiInfo, isBStackSession, isUndefined, isAccessibilityAutomationSession, isTrue, getBrowserStackUser, getBrowserStackKey, uploadLogs, ObjectsAreEqual, isValidCapsForHealing, getBooleanValueFromString, validateCapsWithNonBstackA11y, mergeChromeOptions, normalizeTestReportingConfig, normalizeTestReportingEnvVariables } from './util.js';
+import { launchTestSession, shouldAddServiceVersion, stopBuildUpstream, getCiInfo, isBStackSession, isUndefined, isAccessibilityAutomationSession, isTrue, getBrowserStackUser, getBrowserStackKey, uploadLogs, ObjectsAreEqual, isValidCapsForHealing, getBooleanValueFromString, validateCapsWithNonBstackA11y, mergeChromeOptions, normalizeTestReportingConfig, normalizeTestReportingEnvVariables, isValidEnabledValue, isMultiRemoteCaps } from './util.js';
 import { getProductMap } from './testHub/utils.js';
 import CrashReporter from './crash-reporter.js';
 import { BStackLogger } from './bstackLogger.js';
@@ -175,19 +175,76 @@ export default class BrowserstackLauncherService {
         }
     }
     async onPrepare(config, capabilities) {
+        PerformanceTester.start(PERFORMANCE_SDK_EVENTS.FRAMEWORK_EVENTS.INIT);
         // // Send Funnel start request
         await sendStart(this.browserStackConfig);
+        // Convert glob patterns in specs to resolved relative paths
+        if (config.specs && Array.isArray(config.specs) && isValidEnabledValue(this._options.testOrchestrationOptions?.runSmartSelection?.enabled)) {
+            try {
+                // Import glob for expanding file patterns
+                const glob = (await import('glob')).sync;
+                const path = await import('node:path');
+                // Use ConfigParser.getFilePaths equivalent logic to expand specs
+                const expandedSpecs = [];
+                for (const specPattern of config.specs) {
+                    if (typeof specPattern === 'string') {
+                        if (specPattern.startsWith('file://')) {
+                            expandedSpecs.push(specPattern);
+                            continue;
+                        }
+                        // Expand glob pattern to relative paths
+                        const pattern = specPattern.replace(/\\/g, '/');
+                        // Use config.rootDir which is set to the config file's directory
+                        const rootDir = config.rootDir || process.cwd();
+                        // Get current working directory for final relative path calculation
+                        const cwd = process.cwd();
+                        const filenames = glob(pattern, {
+                            cwd: rootDir,
+                            matchBase: true
+                        }) || [];
+                        // Convert paths to be relative to the current working directory (where command is run)
+                        filenames
+                            .forEach((filename) => {
+                            let absolutePath = filename;
+                            // If filename is not absolute, resolve it relative to rootDir (config file's directory)
+                            if (!path.isAbsolute(filename)) {
+                                absolutePath = path.resolve(rootDir, filename);
+                            }
+                            // Make path relative to current working directory
+                            let relativePath = path.relative(cwd, absolutePath);
+                            // Normalize path separators for consistency (Windows compatibility)
+                            relativePath = relativePath.replace(/\\/g, '/');
+                            expandedSpecs.push(relativePath);
+                        });
+                    }
+                }
+                if (expandedSpecs.length > 0) {
+                    BStackLogger.info(`Expanded specs from glob patterns to ${expandedSpecs.length} files`);
+                    config.specs = expandedSpecs;
+                }
+            }
+            catch (error) {
+                BStackLogger.error(`Failed to expand spec patterns: ${error}`);
+            }
+        }
         try {
-            if (CLIUtils.checkCLISupportedFrameworks(config.framework)) {
+            // Detect if multi-remote and disable CLI for those sessions
+            const isMultiremote = isMultiRemoteCaps(capabilities);
+            process.env.BROWSERSTACK_IS_MULTIREMOTE = String(isMultiremote);
+            if (CLIUtils.checkCLISupportedFrameworks(config.framework) && !isMultiremote) {
+                PerformanceTester.start(PERFORMANCE_SDK_EVENTS.FRAMEWORK_EVENTS.START);
                 CLIUtils.setFrameworkDetail(WDIO_NAMING_PREFIX + config.framework, 'WebdriverIO'); // TODO: make this constant
                 const binconfig = CLIUtils.getBinConfig(config, capabilities, this._options, this._buildTag);
                 await BrowserstackCLI.getInstance().bootstrap(this._options, config, binconfig);
                 BStackLogger.debug(`Is CLI running ${BrowserstackCLI.getInstance().isRunning()}`);
+                PerformanceTester.end(PERFORMANCE_SDK_EVENTS.FRAMEWORK_EVENTS.START);
             }
         }
         catch (err) {
             BStackLogger.error(`Error while starting CLI ${err}`);
+            PerformanceTester.end(PERFORMANCE_SDK_EVENTS.FRAMEWORK_EVENTS.START, false, util.format(err));
         }
+        PerformanceTester.end(PERFORMANCE_SDK_EVENTS.FRAMEWORK_EVENTS.INIT);
         // Setting up healing for those sessions where we don't add the service version capability as it indicates that the session is not being run on BrowserStack
         if (!shouldAddServiceVersion(this._config, this._options.testObservability, capabilities)) {
             try {
@@ -301,6 +358,7 @@ export default class BrowserstackLauncherService {
             else if (isAccessibilityAutomationSession(this._accessibilityAutomation)) {
                 this._updateObjectTypeCaps(capabilities, 'accessibilityOptions', {});
             }
+            this._removeCliOnlyCapabilityOptions(capabilities);
             if (shouldSetupPercy) {
                 try {
                     const bestPlatformPercyCaps = getBestPlatformForPercySnapshot(capabilities);
@@ -319,6 +377,51 @@ export default class BrowserstackLauncherService {
         // send testhub build uuid and product map instrumentation
         this._updateCaps(capabilities, 'testhubBuildUuid');
         this._updateCaps(capabilities, 'buildProductMap');
+        if (isValidEnabledValue(this._options.testOrchestrationOptions?.runSmartSelection?.enabled)) {
+            // Helper function to convert specs from cwd-relative to rootDir-relative
+            const convertToRootDirRelative = (specs) => {
+                const rootDir = config.rootDir || process.cwd();
+                const cwd = process.cwd();
+                return specs.map((spec) => {
+                    if (typeof spec !== 'string') {
+                        return spec;
+                    }
+                    // Convert from cwd-relative to absolute
+                    const absolutePath = path.isAbsolute(spec) ? spec : path.resolve(cwd, spec);
+                    // Then make it relative to rootDir (config file's directory)
+                    const relativePath = path.relative(rootDir, absolutePath);
+                    // Normalize path separators
+                    return relativePath.replace(/\\/g, '/');
+                });
+            };
+            // Apply test orchestration if enabled
+            try {
+                // Import dynamically to avoid circular dependencies
+                const { applyOrchestrationIfEnabled } = await import('./testorchestration/apply-orchestration.js');
+                if (config.specs && config.specs.length > 0 && this._options.testObservability && isValidEnabledValue(this._options.testOrchestrationOptions?.runSmartSelection?.enabled)) {
+                    BStackLogger.info('Applying test orchestration');
+                    // Ensure we're passing string[] to applyOrchestrationIfEnabled
+                    const specs = config.specs.filter(spec => typeof spec === 'string');
+                    console.log(`Specs before orchestration: ${specs}`);
+                    const orderedSpecs = await applyOrchestrationIfEnabled(specs, this._options);
+                    console.log(`Specs after orchestration before conversion: ${orderedSpecs}`);
+                    // Use ordered specs if available, otherwise use original specs
+                    const specsToConvert = orderedSpecs && orderedSpecs.length > 0 ? orderedSpecs : specs;
+                    config.specs = convertToRootDirRelative(specsToConvert);
+                    console.log(`Specs after orchestration: ${config.specs}`);
+                    BStackLogger.info('Test specs updated with orchestrated order');
+                }
+            }
+            catch (error) {
+                BStackLogger.error(`Error applying test orchestration: ${error}`);
+                // On error, we still need to convert specs from cwd-relative to rootDir-relative
+                if (config.specs && config.specs.length > 0) {
+                    const specs = config.specs.filter(spec => typeof spec === 'string');
+                    config.specs = convertToRootDirRelative(specs);
+                    BStackLogger.debug(`Specs converted back to rootDir-relative after error: ${config.specs}`);
+                }
+            }
+        }
         // local binary will be handled by CLI
         if (BrowserstackCLI.getInstance().isRunning()) {
             return;
@@ -368,14 +471,19 @@ export default class BrowserstackLauncherService {
     }
     async onComplete() {
         PerformanceTester.start(PERFORMANCE_SDK_EVENTS.EVENTS.SDK_CLEANUP);
+        PerformanceTester.start(PERFORMANCE_SDK_EVENTS.EVENTS.SDK_ON_STOP);
+        PerformanceTester.start(PERFORMANCE_SDK_EVENTS.FRAMEWORK_EVENTS.STOP);
         try {
             BStackLogger.debug('Inside OnComplete hook..');
             BStackLogger.debug('Sending stop launch event');
+            const isCLIEnabled = BrowserstackCLI.getInstance().isRunning();
             try {
-                await (BrowserstackCLI.getInstance().isRunning() ? BrowserstackCLI.getInstance().stop() : stopBuildUpstream());
+                await (isCLIEnabled ? BrowserstackCLI.getInstance().stop() : stopBuildUpstream());
+                PerformanceTester.end(PERFORMANCE_SDK_EVENTS.FRAMEWORK_EVENTS.STOP);
             }
             catch (err) {
-                BStackLogger.error(`Error while stoping CLI ${err}`);
+                BStackLogger.error(`Error while stopping CLI ${err}`);
+                PerformanceTester.end(PERFORMANCE_SDK_EVENTS.FRAMEWORK_EVENTS.STOP, false, util.format(err));
             }
             if (process.env[BROWSERSTACK_OBSERVABILITY] && process.env[BROWSERSTACK_TESTHUB_UUID]) {
                 console.log(`\nVisit https://automation.browserstack.com/builds/${process.env[BROWSERSTACK_TESTHUB_UUID]} to view build report, insights, and many more debugging information all at one place!\n`);
@@ -392,17 +500,22 @@ export default class BrowserstackLauncherService {
                 BStackLogger.info(`Total duration is ${duration / 1000} s`);
             }
             BStackLogger.info(`BrowserStack service run ended for id: ${this.browserStackConfig?.sdkRunID} testhub id: ${TestOpsConfig.getInstance()?.buildHashedId}`);
-            await sendFinish(this.browserStackConfig);
+            await sendFinish(this.browserStackConfig, isCLIEnabled);
             try {
+                PerformanceTester.start(PERFORMANCE_SDK_EVENTS.EVENTS.SDK_SEND_LOGS);
                 await this._uploadServiceLogs();
+                PerformanceTester.end(PERFORMANCE_SDK_EVENTS.EVENTS.SDK_SEND_LOGS);
             }
             catch (error) {
                 BStackLogger.debug(`Failed to upload BrowserStack WDIO Service logs ${error}`);
+                PerformanceTester.end(PERFORMANCE_SDK_EVENTS.EVENTS.SDK_SEND_LOGS, false, util.format(error));
             }
+            PerformanceTester.end(PERFORMANCE_SDK_EVENTS.EVENTS.SDK_ON_STOP);
             PerformanceTester.end(PERFORMANCE_SDK_EVENTS.EVENTS.SDK_CLEANUP);
             await PerformanceTester.stopAndGenerate('performance-launcher.html');
         }
         catch (error) {
+            PerformanceTester.end(PERFORMANCE_SDK_EVENTS.EVENTS.SDK_ON_STOP, false, util.format(error));
             PerformanceTester.end(PERFORMANCE_SDK_EVENTS.EVENTS.SDK_CLEANUP, false, util.format(error));
             await PerformanceTester.stopAndGenerate('performance-launcher.html');
             BStackLogger.error(`Error in onComplete hook: ${error}`);
@@ -532,11 +645,43 @@ export default class BrowserstackLauncherService {
     }
     async _uploadServiceLogs() {
         const clientBuildUuid = this._getClientBuildUuid();
-        await PerformanceTester.measureWrapper(PERFORMANCE_SDK_EVENTS.EVENTS.SDK_AUTO_CAPTURE, async () => {
+        await PerformanceTester.measureWrapper(PERFORMANCE_SDK_EVENTS.EVENTS.SDK_UPLOAD_LOGS, async () => {
             const response = await uploadLogs(getBrowserStackUser(this._config), getBrowserStackKey(this._config), clientBuildUuid);
             BStackLogger.logToFile(`Response - ${format(response)}`, 'debug');
         })();
     }
+    _removeCliOnlyCapabilityOptions(capabilities) {
+        if (!capabilities || typeof capabilities !== 'object') {
+            return;
+        }
+        const strip = (capability) => {
+            const capabilityRecord = capability;
+            const bstackOptions = capabilityRecord['bstack:options'];
+            if (bstackOptions && typeof bstackOptions === 'object') {
+                NOT_ALLOWED_KEYS_IN_CAPS.forEach(key => delete bstackOptions[key]);
+            }
+            NOT_ALLOWED_KEYS_IN_CAPS.forEach(key => delete capabilityRecord[`browserstack.${key}`]);
+            const alwaysMatch = capability.alwaysMatch;
+            if (alwaysMatch && typeof alwaysMatch === 'object') {
+                strip(alwaysMatch);
+            }
+        };
+        if (Array.isArray(capabilities)) {
+            capabilities
+                .flatMap((c) => {
+                if (Object.values(c).length > 0 && Object.values(c).every(c => typeof c === 'object' && c.capabilities)) {
+                    return Object.values(c).map((o) => o.capabilities);
+                }
+                return c;
+            })
+                .forEach(strip);
+        }
+        else {
+            Object.entries(capabilities).forEach(([, caps]) => {
+                strip(caps.capabilities);
+            });
+        }
+    }
     _updateObjectTypeCaps(capabilities, capType, value) {
         try {
             if (Array.isArray(capabilities)) {

package/build/service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"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"}