@wdio/browserstack-service 9.27.0 → 9.27.2

package/build/index.js

@@ -23,7 +23,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@wdio/browserstack-service",
-      version: "9.26.1",
+      version: "9.27.1",
       description: "WebdriverIO service for better Browserstack integration",
       author: "Adam Bjerstedt <abjerstedt@gmail.com>",
       homepage: "https://github.com/webdriverio/webdriverio/tree/main/packages/wdio-browserstack-service",
@@ -70,12 +70,11 @@ var init_package = __esm({
         "browserstack-local": "^1.5.1",
         chalk: "^5.3.0",
         "csv-writer": "^1.6.0",
-        "formdata-node": "5.0.1",
         "git-repo-info": "^2.1.1",
         gitconfiglocal: "^2.1.0",
         glob: "^11.0.0",
-        tar: "^7.5.7",
-        undici: "^6.21.3",
+        tar: "^7.5.11",
+        undici: "^6.24.0",
         uuid: "^11.1.0",
         webdriverio: "workspace:*",
         "winston-transport": "^4.5.0",
@@ -98,7 +97,7 @@ var init_package = __esm({
 });
 
 // src/constants.ts
-var bstackServiceVersion, BROWSER_DESCRIPTION, VALID_APP_EXTENSION, DEFAULT_OPTIONS, consoleHolder, APP_ALLY_ISSUES_ENDPOINT, APP_ALLY_ISSUES_SUMMARY_ENDPOINT, DATA_EVENT_ENDPOINT, DATA_BATCH_ENDPOINT, DATA_SCREENSHOT_ENDPOINT, DATA_BATCH_SIZE, DATA_BATCH_INTERVAL, DEFAULT_WAIT_TIMEOUT_FOR_PENDING_UPLOADS, DEFAULT_WAIT_INTERVAL_FOR_PENDING_UPLOADS, BSTACK_SERVICE_VERSION, NOT_ALLOWED_KEYS_IN_CAPS, LOGS_FILE, CLI_DEBUG_LOGS_FILE, UPLOAD_LOGS_ENDPOINT, PERCY_LOGS_FILE, PERCY_DOM_CHANGING_COMMANDS_ENDPOINTS, CAPTURE_MODES, LOG_KIND_USAGE_MAP, SUPPORTED_BROWSERS_FOR_AI, TCG_URL, TCG_INFO, SMART_SELECTION_MODE_RELEVANT_FIRST, SMART_SELECTION_MODE_RELEVANT_ONLY, BROWSERSTACK_TESTHUB_JWT, BSTACK_TCG_AUTH_RESULT, TESTOPS_SCREENSHOT_ENV, BROWSERSTACK_TESTHUB_UUID, TEST_ANALYTICS_ID, PERF_MEASUREMENT_ENV, RERUN_TESTS_ENV, RERUN_ENV, TESTOPS_BUILD_COMPLETED_ENV, BROWSERSTACK_PERCY, BROWSERSTACK_ACCESSIBILITY, BROWSERSTACK_OBSERVABILITY, BROWSERSTACK_TEST_REPORTING, TEST_REPORTING_PROJECT_NAME, MAX_GIT_META_DATA_SIZE_IN_BYTES, GIT_META_DATA_TRUNCATED, CLI_STOP_TIMEOUT, WDIO_NAMING_PREFIX, UPDATED_CLI_ENDPOINT;
+var bstackServiceVersion, BROWSER_DESCRIPTION, VALID_APP_EXTENSION, DEFAULT_OPTIONS, consoleHolder, APP_ALLY_ISSUES_ENDPOINT, APP_ALLY_ISSUES_SUMMARY_ENDPOINT, DATA_EVENT_ENDPOINT, DATA_BATCH_ENDPOINT, DATA_SCREENSHOT_ENDPOINT, DATA_BATCH_SIZE, DATA_BATCH_INTERVAL, DEFAULT_WAIT_TIMEOUT_FOR_PENDING_UPLOADS, DEFAULT_WAIT_INTERVAL_FOR_PENDING_UPLOADS, BSTACK_SERVICE_VERSION, NOT_ALLOWED_KEYS_IN_CAPS, BROWSERSTACK_TEST_PLAN_ID, LOGS_FILE, CLI_DEBUG_LOGS_FILE, UPLOAD_LOGS_ENDPOINT, PERCY_LOGS_FILE, PERCY_DOM_CHANGING_COMMANDS_ENDPOINTS, CAPTURE_MODES, LOG_KIND_USAGE_MAP, SUPPORTED_BROWSERS_FOR_AI, TCG_URL, TCG_INFO, SMART_SELECTION_MODE_RELEVANT_FIRST, SMART_SELECTION_MODE_RELEVANT_ONLY, BROWSERSTACK_TESTHUB_JWT, BSTACK_TCG_AUTH_RESULT, TESTOPS_SCREENSHOT_ENV, BROWSERSTACK_TESTHUB_UUID, TEST_ANALYTICS_ID, PERF_MEASUREMENT_ENV, RERUN_TESTS_ENV, RERUN_ENV, TESTOPS_BUILD_COMPLETED_ENV, BROWSERSTACK_PERCY, BROWSERSTACK_ACCESSIBILITY, BROWSERSTACK_OBSERVABILITY, BROWSERSTACK_TEST_REPORTING, TEST_REPORTING_PROJECT_NAME, MAX_GIT_META_DATA_SIZE_IN_BYTES, GIT_META_DATA_TRUNCATED, CLI_STOP_TIMEOUT, BINARY_BUSY_ERROR_CODES, MAX_SPAWN_RETRIES, SPAWN_RETRY_DELAY_MS, WDIO_NAMING_PREFIX, UPDATED_CLI_ENDPOINT;
 var init_constants = __esm({
   "src/constants.ts"() {
     "use strict";
@@ -122,8 +121,7 @@ var init_constants = __esm({
     DEFAULT_OPTIONS = {
       setSessionName: true,
       setSessionStatus: true,
-      testObservability: true,
-      accessibility: false
+      testObservability: true
     };
     consoleHolder = Object.assign({}, console);
     APP_ALLY_ISSUES_ENDPOINT = "api/v1/issues";
@@ -136,7 +134,8 @@ var init_constants = __esm({
     DEFAULT_WAIT_TIMEOUT_FOR_PENDING_UPLOADS = 5e3;
     DEFAULT_WAIT_INTERVAL_FOR_PENDING_UPLOADS = 100;
     BSTACK_SERVICE_VERSION = bstackServiceVersion;
-    NOT_ALLOWED_KEYS_IN_CAPS = ["includeTagsInTestingScope", "excludeTagsInTestingScope"];
+    NOT_ALLOWED_KEYS_IN_CAPS = ["includeTagsInTestingScope", "excludeTagsInTestingScope", "testManagementOptions"];
+    BROWSERSTACK_TEST_PLAN_ID = "BROWSERSTACK_TEST_PLAN_ID";
     LOGS_FILE = "logs/bstack-wdio-service.log";
     CLI_DEBUG_LOGS_FILE = "log/sdk-cli-debug.log";
     UPLOAD_LOGS_ENDPOINT = "client-logs/upload";
@@ -182,6 +181,9 @@ var init_constants = __esm({
     MAX_GIT_META_DATA_SIZE_IN_BYTES = 64 * 1024;
     GIT_META_DATA_TRUNCATED = "...[TRUNCATED]";
     CLI_STOP_TIMEOUT = 5e3;
+    BINARY_BUSY_ERROR_CODES = ["ETXTBSY", "EBUSY"];
+    MAX_SPAWN_RETRIES = 3;
+    SPAWN_RETRY_DELAY_MS = 1e3;
     WDIO_NAMING_PREFIX = "WebdriverIO-";
     UPDATED_CLI_ENDPOINT = "sdk/v1/update_cli";
   }
@@ -635,6 +637,7 @@ var init_cliUtils = __esm({
           modifiedOpts.browserStackLocalOptions = modifiedOpts.opts;
           delete modifiedOpts.opts;
         }
+        delete modifiedOpts.testManagementOptions;
         modifiedOpts.testContextOptions = {
           skipSessionName: isFalse(modifiedOpts.setSessionName),
           skipSessionStatus: isFalse(modifiedOpts.setSessionStatus),
@@ -653,6 +656,8 @@ var init_cliUtils = __esm({
           options.testObservability
         );
         const observabilityOptions = options.testObservabilityOptions || {};
+        const testManagementOptions = options.testManagementOptions || {};
+        const testPlanId = typeof testManagementOptions.testPlanId === "string" ? testManagementOptions.testPlanId.trim() : "";
         const binconfig = {
           userName: observabilityOptions.user || config.user,
           accessKey: observabilityOptions.key || config.key,
@@ -664,26 +669,26 @@ var init_cliUtils = __esm({
         binconfig.buildName = observabilityOptions.buildName || binconfig.buildName;
         binconfig.projectName = observabilityOptions.projectName || binconfig.projectName;
         binconfig.buildTag = this.getObservabilityBuildTags(observabilityOptions, buildTag) || [];
-        let caps = capabilities;
-        if (capabilities && !Array.isArray(capabilities)) {
-          caps = [capabilities];
-        }
-        if (Array.isArray(caps)) {
-          for (const cap of caps) {
-            const platform4 = {};
-            const capability = cap;
-            Object.keys(capability).filter((key) => key !== "bstack:options").forEach((key) => {
-              platform4[key] = capability[key];
+        if (testPlanId.length > 0) {
+          binconfig.testManagementOptions = {
+            testPlanId
+          };
+        }
+        const caps = Array.isArray(capabilities) ? capabilities : [capabilities];
+        for (const cap of caps) {
+          const platform4 = {};
+          const capability = cap;
+          Object.keys(capability).filter((key) => key !== "bstack:options").forEach((key) => {
+            platform4[key] = capability[key];
+          });
+          if (capability["bstack:options"]) {
+            Object.keys(
+              capability["bstack:options"]
+            ).forEach((key) => {
+              platform4[key] = capability["bstack:options"][key];
             });
-            if (capability["bstack:options"]) {
-              Object.keys(
-                capability["bstack:options"]
-              ).forEach((key) => {
-                platform4[key] = capability["bstack:options"][key];
-              });
-            }
-            binconfig.platforms.push(platform4);
           }
+          binconfig.platforms.push(platform4);
         }
         return JSON.stringify(binconfig);
       }
@@ -742,9 +747,20 @@ var init_cliUtils = __esm({
           sdk_language: this.getSdkLanguage()
         };
         if (!isNullOrEmpty(existingCliPath)) {
-          queryParams.cli_version = await this.runShellCommand(
+          if (this.isBinaryBusy(existingCliPath)) {
+            BStackLogger.warn(`Existing binary is currently in use, skipping update: ${existingCliPath}`);
+            PerformanceTester.end(EVENTS.SDK_CLI_CHECK_UPDATE);
+            return existingCliPath;
+          }
+          const version3 = await this.runShellCommand(
             `${existingCliPath} version`
           );
+          if (version3.toLowerCase().includes("text file busy")) {
+            BStackLogger.warn(`Binary busy during version check, skipping update: ${existingCliPath}`);
+            PerformanceTester.end(EVENTS.SDK_CLI_CHECK_UPDATE);
+            return existingCliPath;
+          }
+          queryParams.cli_version = version3;
         }
         const response = await this.requestToUpdateCLI(queryParams, config);
         if (nestedKeyValue(response, ["updated_cli_version"])) {
@@ -860,6 +876,29 @@ var init_cliUtils = __esm({
           return "";
         }
       }
+      static isBinaryBusy(binaryPath) {
+        if (isNullOrEmpty(binaryPath)) {
+          return false;
+        }
+        if (platform() === "darwin") {
+          return false;
+        }
+        if (!fs2.existsSync(binaryPath)) {
+          return false;
+        }
+        try {
+          const fd = fs2.openSync(binaryPath, "r+");
+          fs2.closeSync(fd);
+          return false;
+        } catch (err) {
+          if (BINARY_BUSY_ERROR_CODES.includes(err.code)) {
+            BStackLogger.debug(`Binary is busy: ${binaryPath}`);
+            return true;
+          }
+          BStackLogger.debug(`Error checking if binary is busy: ${err.message}`);
+          return false;
+        }
+      }
       static requestToUpdateCLI = async (queryParams, config) => {
         const params = new URLSearchParams(queryParams);
         const requestInit = {
@@ -980,8 +1019,11 @@ ${Date.now()}
         const cleanupTemporaryDownloads = (maxAgeMs = CLI_LOCK_TIMEOUT_MS) => {
           try {
             const now2 = Date.now();
+            const tmpExtractRe = /\.tmp\.\d+$/;
             for (const entry of fs2.readdirSync(cliDir)) {
-              if (!entry.startsWith(CLI_DOWNLOAD_TMP_PREFIX) || !entry.endsWith(CLI_DOWNLOAD_TMP_SUFFIX)) {
+              const isDownloadZip = entry.startsWith(CLI_DOWNLOAD_TMP_PREFIX) && entry.endsWith(CLI_DOWNLOAD_TMP_SUFFIX);
+              const isExtractTmp = tmpExtractRe.test(entry);
+              if (!isDownloadZip && !isExtractTmp) {
                 continue;
               }
               const filePath = path2.join(cliDir, entry);
@@ -998,13 +1040,13 @@ ${Date.now()}
                 fs2.unlinkSync(filePath);
               } catch (err) {
                 BStackLogger.debug(
-                  `Failed to delete temp CLI zip file ${filePath}: ${util.format(err)}`
+                  `Failed to delete temp CLI file ${filePath}: ${util.format(err)}`
                 );
               }
             }
           } catch (err) {
             BStackLogger.debug(
-              `Failed to scan temp CLI downloads in ${cliDir}: ${util.format(err)}`
+              `Failed to scan temp CLI files in ${cliDir}: ${util.format(err)}`
             );
           }
         };
@@ -1050,7 +1092,6 @@ ${Date.now()}
           );
           const downloadedFileStream = fs2.createWriteStream(zipFilePath);
           return new Promise((resolve, reject) => {
-            const binaryName = null;
             const processDownload = async () => {
               const abortController = new AbortController();
               const timeout = setTimeout(
@@ -1084,7 +1125,6 @@ ${Date.now()}
                 nodeStream.pipe(downloadedFileStream);
                 _CLIUtils.downloadFileStream(
                   downloadedFileStream,
-                  binaryName,
                   zipFilePath,
                   cliDir,
                   (result) => {
@@ -1118,40 +1158,104 @@ ${Date.now()}
           return null;
         }
       };
-      static downloadFileStream(downloadedFileStream, binaryName, zipFilePath, cliDir, resolve, reject) {
+      static downloadFileStream(downloadedFileStream, zipFilePath, cliDir, resolve, reject) {
         downloadedFileStream.on("close", async function() {
           const yauzlOpenPromise = promisify(yauzl.open);
           try {
             const zipfile = await yauzlOpenPromise(zipFilePath, {
               lazyEntries: true
             });
+            let resolvedBinaryPath = null;
             zipfile.readEntry();
             zipfile.on("entry", async (entry) => {
-              if (!binaryName) {
-                binaryName = entry.fileName;
-              }
               if (/\/$/.test(entry.fileName)) {
                 zipfile.readEntry();
-              } else {
-                const writeStream = fs2.createWriteStream(
-                  path2.join(cliDir, entry.fileName)
-                );
-                const openReadStreamPromise = promisify(
+                return;
+              }
+              const candidatePath = path2.join(cliDir, entry.fileName);
+              const resolvedCandidate = path2.resolve(candidatePath);
+              const resolvedDir = path2.resolve(cliDir) + path2.sep;
+              if (!resolvedCandidate.startsWith(resolvedDir)) {
+                zipfile.close();
+                reject(new Error(`Zip-slip detected: entry "${entry.fileName}" resolves outside ${cliDir}`));
+                return;
+              }
+              const isBinaryEntry = path2.basename(entry.fileName).startsWith("binary-");
+              if (!isBinaryEntry) {
+                const directStream = fs2.createWriteStream(candidatePath);
+                directStream.on("error", (writeErr) => {
+                  zipfile.close();
+                  reject(writeErr);
+                });
+                const openReadStreamPromise2 = promisify(
                   zipfile.openReadStream
                 ).bind(zipfile);
                 try {
-                  const readStream = await openReadStreamPromise(entry);
+                  const readStream = await openReadStreamPromise2(entry);
                   readStream.on("end", function() {
-                    writeStream.close();
-                    zipfile.readEntry();
+                    directStream.end();
+                    directStream.on("close", () => zipfile.readEntry());
                   });
-                  readStream.pipe(writeStream);
+                  readStream.pipe(directStream);
                 } catch (zipErr) {
+                  zipfile.close();
                   reject(zipErr);
                 }
-                if (entry.fileName === binaryName) {
+                return;
+              }
+              const finalPath = candidatePath;
+              const tempPath = path2.join(cliDir, `${entry.fileName}.tmp.${process.pid}`);
+              const writeStream = fs2.createWriteStream(tempPath);
+              let writeStreamErrored = false;
+              writeStream.on("error", (writeErr) => {
+                writeStreamErrored = true;
+                fsp.unlink(tempPath).catch(() => {
+                });
+                zipfile.close();
+                reject(writeErr);
+              });
+              writeStream.on("close", async () => {
+                if (writeStreamErrored) {
+                  return;
+                }
+                try {
+                  await fsp.chmod(tempPath, "0755");
+                  try {
+                    await fsp.rename(tempPath, finalPath);
+                  } catch (renameErr) {
+                    if (renameErr.code !== "EXDEV") {
+                      throw renameErr;
+                    }
+                    BStackLogger.warn(`Atomic rename failed (cross-device), falling back to copy: ${renameErr.message}`);
+                    await fsp.copyFile(tempPath, finalPath);
+                    await fsp.unlink(tempPath).catch(() => {
+                    });
+                  }
+                  if (!resolvedBinaryPath) {
+                    resolvedBinaryPath = finalPath;
+                  }
+                  zipfile.readEntry();
+                } catch (err) {
+                  await fsp.unlink(tempPath).catch(() => {
+                  });
                   zipfile.close();
+                  reject(err);
                 }
+              });
+              const openReadStreamPromise = promisify(
+                zipfile.openReadStream
+              ).bind(zipfile);
+              try {
+                const readStream = await openReadStreamPromise(entry);
+                readStream.on("end", function() {
+                  writeStream.end();
+                });
+                readStream.pipe(writeStream);
+              } catch (zipErr) {
+                fsp.unlink(tempPath).catch(() => {
+                });
+                zipfile.close();
+                reject(zipErr);
               }
             });
             zipfile.on("error", (zipErr) => {
@@ -1159,16 +1263,15 @@ ${Date.now()}
             });
             zipfile.once("end", () => {
               fsp.unlink(zipFilePath).catch(() => {
-                BStackLogger.warn(
-                  `Failed to delete zip file: ${zipFilePath}`
-                );
-              });
-              fsp.chmod(`${cliDir}/${binaryName}`, "0755").then(() => {
-                resolve(`${cliDir}/${binaryName}`);
-              }).catch((err) => {
-                reject(err);
+                BStackLogger.warn(`Failed to delete zip file: ${zipFilePath}`);
               });
+              if (!resolvedBinaryPath) {
+                zipfile.close();
+                reject(new Error("No binary-* entry found in zip; cannot complete CLI binary extraction"));
+                return;
+              }
               zipfile.close();
+              resolve(resolvedBinaryPath);
             });
           } catch (err) {
             reject(err);
@@ -1525,6 +1628,7 @@ var init_performance_tester = __esm({
       static end(event, success = true, failure, details = {}) {
         performance.mark(event + "-end");
         performance.measure(event, event + "-start", event + "-end");
+        delete this.eventsMap[event + "-start"];
         this.details[event] = Object.assign({ success, failure: util2.format(failure) }, Object.assign(Object.assign({
           clientWorkerId: _PerformanceTester.getClientWorkerId(),
           worker: _PerformanceTester.getProcessId(),
@@ -2131,8 +2235,17 @@ var init_crash_reporter = __esm({
           for (const prop in obj) {
             if (keys.includes(prop.toLowerCase())) {
               obj[prop] = "[REDACTED]";
-            } else if (typeof obj[prop] === "object") {
+            } else if (typeof obj[prop] === "object" && obj[prop] !== null) {
               this.recursivelyRedactKeysFromObject(obj[prop], keys);
+            } else if (typeof obj[prop] === "string") {
+              try {
+                const parsed = JSON.parse(obj[prop]);
+                if (typeof parsed === "object" && parsed !== null) {
+                  this.recursivelyRedactKeysFromObject(parsed, keys);
+                  obj[prop] = JSON.stringify(parsed);
+                }
+              } catch {
+              }
             }
           }
         }
@@ -2608,10 +2721,8 @@ import path5 from "node:path";
 import util3 from "node:util";
 import gitRepoInfo from "git-repo-info";
 import gitconfig from "gitconfiglocal";
-import { FormData as FormData2 } from "formdata-node";
 import { performance as performance2 } from "node:perf_hooks";
 import { create } from "tar";
-import { fileFromPath } from "formdata-node/file-from-path";
 function getBrowserDescription(cap) {
   cap = cap || {};
   if (cap["bstack:options"]) {
@@ -3181,6 +3292,25 @@ function getObservabilityBuildTags(options, bstackBuildTag) {
   }
   return [];
 }
+function getTestPlanId(options) {
+  if (process.env[BROWSERSTACK_TEST_PLAN_ID]) {
+    return process.env[BROWSERSTACK_TEST_PLAN_ID];
+  }
+  const CLI_ARG = "--browserstack.testManagementOptions.testPlanId";
+  const argIndex = process.argv.indexOf(CLI_ARG);
+  if (argIndex !== -1 && process.argv[argIndex + 1]) {
+    return process.argv[argIndex + 1];
+  }
+  const argWithEquals = process.argv.find((arg) => arg.startsWith(`${CLI_ARG}=`));
+  if (argWithEquals) {
+    return argWithEquals.split("=")[1];
+  }
+  const testPlanId = options.testManagementOptions?.testPlanId;
+  if (typeof testPlanId === "string" && testPlanId.trim().length > 0) {
+    return testPlanId.trim();
+  }
+  return void 0;
+}
 function getBrowserStackUser(config) {
   if (process.env.BROWSERSTACK_USERNAME) {
     return process.env.BROWSERSTACK_USERNAME;
@@ -3226,8 +3356,14 @@ function getFailureObject(error) {
   };
 }
 async function uploadLogs(user, key, clientBuildUuid) {
+  const eventName = EVENTS.SDK_UPLOAD_LOGS;
+  let success = true;
+  let failure;
+  PerformanceTester.start(eventName);
   try {
     if (!user || !key) {
+      success = false;
+      failure = "skipped: missing_credentials";
       BStackLogger2.debug("Uploading logs failed due to no credentials");
       return;
     }
@@ -3239,10 +3375,20 @@ async function uploadLogs(user, key, clientBuildUuid) {
       CLI_DEBUG_LOGS_FILE
     ].filter((f) => fs6.existsSync(f));
     const copiedFileNames = [];
+    const archiveAddFailures = [];
     for (const f of filesToArchive) {
-      const dest = path5.join(tmpDir, path5.basename(f));
-      fs6.copyFileSync(f, dest);
-      copiedFileNames.push(path5.basename(f));
+      try {
+        const dest = path5.join(tmpDir, path5.basename(f));
+        fs6.copyFileSync(f, dest);
+        copiedFileNames.push(path5.basename(f));
+      } catch (copyErr) {
+        const msg = copyErr?.message || String(copyErr);
+        archiveAddFailures.push(`${path5.basename(f)}: ${msg}`);
+      }
+    }
+    if (archiveAddFailures.length > 0 && failure === void 0) {
+      success = false;
+      failure = `archive_add_failed [${archiveAddFailures.length}]: ${archiveAddFailures.join("; ")}`.substring(0, 300);
     }
     await create(
       {
@@ -3261,8 +3407,8 @@ async function uploadLogs(user, key, clientBuildUuid) {
       dest.on("finish", resolve);
       dest.on("error", reject);
     });
-    const formData = new FormData2();
-    const file = await fileFromPath(tarGzPath);
+    const formData = new FormData();
+    const file = await fs6.openAsBlob(tarGzPath, { type: "application/x-gzip" });
     formData.append("data", file, "logs.tar.gz");
     formData.append("clientBuildUuid", clientBuildUuid);
     const auth = Buffer.from(`${user}:${key}`).toString("base64");
@@ -3289,10 +3435,21 @@ async function uploadLogs(user, key, clientBuildUuid) {
     if (fs6.existsSync(CLI_DEBUG_LOGS_FILE)) {
       fs6.unlinkSync(CLI_DEBUG_LOGS_FILE);
     }
+    if (!response) {
+      success = false;
+      failure = "upload_no_response";
+    } else if (response.status && response.status !== "success") {
+      success = false;
+      failure = `upload_status: ${response.status}${response.message ? " - " + String(response.message).slice(0, 200) : ""}`;
+    }
     return response;
   } catch (error) {
+    success = false;
+    failure = `uploadLogs exception: ${getErrorString(error)}`;
     BStackLogger2.error(`Error while uploading logs: ${getErrorString(error)}`);
     return null;
+  } finally {
+    PerformanceTester.end(eventName, success, failure);
   }
 }
 function truncateString(field, truncateSizeInBytes) {
@@ -3689,7 +3846,10 @@ var init_util = __esm({
         },
         product_map: getProductMapForBuildStartCall(bStackConfig, accessibilityAutomation),
         config: {},
-        test_orchestration: OrchestrationUtils.getInstance(config)?.getBuildStartData() || {}
+        test_orchestration: OrchestrationUtils.getInstance(config)?.getBuildStartData() || {},
+        test_management: {
+          test_plan_id: getTestPlanId(options)
+        }
       };
       if (accessibilityAutomation && (isTurboScale(options) || data.browserstackAutomation === false)) {
         data.accessibility.settings ??= {};
@@ -3718,6 +3878,7 @@ var init_util = __esm({
         const jsonResponse = await response.json();
         delete data?.accessibility?.settings?.includeEncodedExtension;
         BStackLogger2.debug(`[Start_Build] Success response: ${JSON.stringify(jsonResponse)}`);
+        BStackLogger2.debug(`Test Plan Id sent in request: ${getTestPlanId(options)}`);
         process.env[TESTOPS_BUILD_COMPLETED_ENV] = "true";
         if (jsonResponse.jwt) {
           process.env[BROWSERSTACK_TESTHUB_JWT] = jsonResponse.jwt;
@@ -4113,14 +4274,18 @@ var init_bstackLogger = __esm({
       static logFilePath = path6.join(process.cwd(), LOGS_FILE);
       static logFolderPath = path6.join(process.cwd(), "logs");
       static logFileStream;
+      static redactCredentials(logMessage) {
+        return logMessage.replace(/(["']?(?:username|userName|accesskey|accessKey|user|key)["']?\s*[:=]\s*["']?)([^"'\s,}]+)/gi, "$1").replace(/([?&](?:username|userName|access_key|accesskey|accessKey|user|key)=)([^&#\s]+)/gi, "$1");
+      }
       static logToFile(logMessage, logLevel) {
         try {
+          const redactedMessage = this.redactCredentials(logMessage);
           if (!this.logFileStream) {
             this.ensureLogsFolder();
             this.logFileStream = fs7.createWriteStream(this.logFilePath, { flags: "a" });
           }
           if (this.logFileStream && this.logFileStream.writable) {
-            this.logFileStream.write(this.formatLog(logMessage, logLevel));
+            this.logFileStream.write(this.formatLog(redactedMessage, logLevel));
           }
         } catch (error) {
           log2.debug(`Failed to log to file. Error ${error}`);
@@ -4131,28 +4296,33 @@ var init_bstackLogger = __esm({
 `;
       }
       static info(message) {
-        this.logToFile(message, "info");
-        log2.info(message);
+        const redactedMessage = this.redactCredentials(message);
+        this.logToFile(redactedMessage, "info");
+        log2.info(redactedMessage);
       }
       static error(message) {
-        this.logToFile(message, "error");
-        log2.error(message);
+        const redactedMessage = this.redactCredentials(message);
+        this.logToFile(redactedMessage, "error");
+        log2.error(redactedMessage);
       }
       static debug(message, param) {
-        this.logToFile(message, "debug");
+        const redactedMessage = this.redactCredentials(message);
+        this.logToFile(redactedMessage, "debug");
         if (param) {
-          log2.debug(message, param);
+          log2.debug(redactedMessage, param);
         } else {
-          log2.debug(message);
+          log2.debug(redactedMessage);
         }
       }
       static warn(message) {
-        this.logToFile(message, "warn");
-        log2.warn(message);
+        const redactedMessage = this.redactCredentials(message);
+        this.logToFile(redactedMessage, "warn");
+        log2.warn(redactedMessage);
       }
       static trace(message) {
-        this.logToFile(message, "trace");
-        log2.trace(message);
+        const redactedMessage = this.redactCredentials(message);
+        this.logToFile(redactedMessage, "trace");
+        log2.trace(redactedMessage);
       }
       static clearLogger() {
         if (this.logFileStream) {
@@ -4183,13 +4353,14 @@ var init_utils = __esm({
     init_bstackLogger();
     init_util();
     getProductMap = (config) => {
-      return {
-        observability: config.testObservability.enabled,
-        accessibility: config.accessibility,
-        percy: config.percy,
-        automate: config.automate,
-        app_automate: config.appAutomate
-      };
+      const entries = [
+        ["observability", config.testObservability.enabled],
+        ["accessibility", config.accessibility],
+        ["percy", config.percy],
+        ["automate", config.automate],
+        ["app_automate", config.appAutomate]
+      ];
+      return Object.fromEntries(entries.filter(([, v]) => v !== null));
     };
     shouldProcessEventForTesthub = (eventType) => {
       if (isTrue(process.env[BROWSERSTACK_OBSERVABILITY])) {
@@ -4237,13 +4408,14 @@ var init_utils = __esm({
       }
     };
     getProductMapForBuildStartCall = (config, accessibilityAutomation) => {
-      return {
-        observability: config.testObservability.enabled,
-        accessibility: accessibilityAutomation,
-        percy: config.percy,
-        automate: config.automate,
-        app_automate: config.appAutomate
-      };
+      const entries = [
+        ["observability", config.testObservability.enabled],
+        ["accessibility", accessibilityAutomation],
+        ["percy", config.percy],
+        ["automate", config.automate],
+        ["app_automate", config.appAutomate]
+      ];
+      return Object.fromEntries(entries.filter(([, v]) => v !== null));
     };
   }
 });
@@ -4341,7 +4513,7 @@ import {
   DriverInitRequestConstructor,
   FetchDriverExecuteParamsEventRequestConstructor
 } from "@browserstack/wdio-browserstack-service";
-var GrpcClient;
+var GRPC_MESSAGE_LIMIT, GrpcClient;
 var init_grpcClient = __esm({
   "src/cli/grpcClient.ts"() {
     "use strict";
@@ -4349,6 +4521,7 @@ var init_grpcClient = __esm({
     init_performance_tester();
     init_constants2();
     init_cliLogger();
+    GRPC_MESSAGE_LIMIT = 20 * 1024 * 1024;
     GrpcClient = class _GrpcClient {
       static #instance = null;
       binSessionId;
@@ -4410,17 +4583,20 @@ var init_grpcClient = __esm({
         if (!listenAddress) {
           throw new Error("Unable to determine gRPC server listen address");
         }
+        const channelOptions = {
+          "grpc.keepalive_time_ms": 1e4,
+          "grpc.max_send_message_length": GRPC_MESSAGE_LIMIT,
+          "grpc.max_receive_message_length": GRPC_MESSAGE_LIMIT
+        };
         this.channel = new grpcChannel(
           listenAddress,
           grpcCredentials.createInsecure(),
-          {
-            "grpc.keepalive_time_ms": 1e4
-          }
+          channelOptions
         );
         this.client = new SDKClient(
           listenAddress,
           grpcCredentials.createInsecure(),
-          {}
+          channelOptions
         );
         this.logger.info(`Connected to gRPC server at ${listenAddress}`);
       }
@@ -5660,12 +5836,12 @@ var init_automateModule = __esm({
       async onAfterTest(args) {
         this.logger.debug("onAfterTest: inside automate module after test hook!");
         const instace = args.instance;
-        const { error, passed } = args.result;
+        const { error, passed, skipped } = args.result;
         const _failReasons = [];
-        if (!passed) {
+        if (!passed && !skipped) {
           _failReasons.push(error && error.message || "Unknown Error");
         }
-        const status = passed ? "passed" : "failed";
+        const status = passed || skipped ? "passed" : "failed";
         const reason = _failReasons.length > 0 ? _failReasons.join("\n") : void 0;
         const autoInstance = AutomationFramework.getTrackedInstance();
         const sessionId = AutomationFramework.getState(autoInstance, AutomationFrameworkConstants.KEY_FRAMEWORK_SESSION_ID);
@@ -6063,13 +6239,17 @@ var init_wdioMochaTestFramework = __esm({
       }
       loadTestResult(instance, args) {
         const results = args.result;
-        const { error, passed } = results;
+        const { error, passed, skipped } = results;
         let result = "passed";
         let failure = null;
         let failureReason = null;
         let failureType = null;
         if (!passed) {
-          result = error && error.message && error.message.includes("sync skip; aborting execution") ? "ignore" : "failed";
+          if (skipped) {
+            result = "skipped";
+          } else {
+            result = error && error.message && error.message.includes("sync skip; aborting execution") ? "ignore" : "failed";
+          }
           if (error && result !== "skipped") {
             failure = [{ backtrace: [removeAnsiColors(error.message), removeAnsiColors(error.stack || "")] }];
             failureReason = removeAnsiColors(error.message);
@@ -9049,6 +9229,7 @@ var init_cli = __esm({
     init_accessibilityModule();
     init_util();
     init_observabilityModule();
+    init_crash_reporter();
     init_percyModule();
     init_apiUtils();
     BrowserstackCLI = class _BrowserstackCLI {
@@ -9125,7 +9306,9 @@ var init_cli = __esm({
         await this.start();
         this.logger.debug("startMain: main-process started");
         const response = await GrpcClient.getInstance().startBinSession(this.wdioConfig);
-        BStackLogger.debug(`start: startBinSession response=${JSON.stringify(response)}`);
+        const redactedStartResponse = JSON.parse(JSON.stringify(response));
+        CrashReporter.recursivelyRedactKeysFromObject(redactedStartResponse, ["user", "username", "key", "accesskey", "password"]);
+        BStackLogger.debug(`start: startBinSession response=${JSON.stringify(redactedStartResponse)}`);
         this.loadModules(response);
         this.isMainConnected = true;
       }
@@ -9158,6 +9341,17 @@ var init_cli = __esm({
             }
             this.modules[ObservabilityModule.MODULE_NAME] = new ObservabilityModule(startBinResponse.observability);
           }
+          if (startBinResponse.testhub.errors && startBinResponse.testhub.errors.length > 0) {
+            try {
+              const errors = JSON.parse(Buffer.from(startBinResponse.testhub.errors).toString());
+              for (const [code, detail] of Object.entries(errors)) {
+                const { message } = detail;
+                BStackLogger.error(`[Build] ${code}: ${message}`);
+              }
+            } catch (e) {
+              BStackLogger.debug(`Failed to parse testhub errors: ${e}`);
+            }
+          }
           this.modules[TestHubModule.MODULE_NAME] = new TestHubModule(startBinResponse.testhub);
           if (startBinResponse.accessibility?.success) {
             process.env[BROWSERSTACK_ACCESSIBILITY] = "true";
@@ -9202,12 +9396,61 @@ var init_cli = __esm({
           return Promise.resolve();
         }
         const SDK_CLI_BIN_PATH = await this.getCliBinPath();
+        if (!SDK_CLI_BIN_PATH) {
+          throw new Error("Failed to get CLI binary path. CLI setup failed.");
+        }
         const cmd = [SDK_CLI_BIN_PATH, "sdk"];
         this.logger.debug(`spawning command='${cmd}'`);
-        this.process = spawn3(cmd[0], cmd.slice(1), {
-          env: process.env
-        });
+        for (let attempt = 1; attempt <= MAX_SPAWN_RETRIES; attempt++) {
+          try {
+            await this._spawnAndAwaitReady(cmd);
+            if (attempt > 1) {
+              this.logger.info(`Spawn succeeded on attempt ${attempt}/${MAX_SPAWN_RETRIES}`);
+            }
+            PerformanceTester.end(EVENTS.SDK_CLI_START);
+            return;
+          } catch (err) {
+            const isBusy = BINARY_BUSY_ERROR_CODES.includes(err.code) || err.message && (err.message.toLowerCase().includes("text file busy") || err.message.toLowerCase().includes("being used by another process"));
+            if (isBusy && attempt < MAX_SPAWN_RETRIES) {
+              this.logger.warn(
+                `Spawn attempt ${attempt}/${MAX_SPAWN_RETRIES} failed with busy error, retrying in ${SPAWN_RETRY_DELAY_MS}ms: ${err.message}`
+              );
+              if (this.process) {
+                this.process.removeAllListeners();
+                this.process.stdout?.removeAllListeners();
+                this.process.stderr?.removeAllListeners();
+                this.process = null;
+              }
+              await new Promise((r) => setTimeout(r, SPAWN_RETRY_DELAY_MS));
+            } else {
+              PerformanceTester.end(EVENTS.SDK_CLI_START, false, err);
+              throw err;
+            }
+          }
+        }
+      }
+      /**
+       * Spawn the CLI process and wait until it emits "ready".
+       * Handles both synchronous spawn errors and async error/close events.
+       */
+      _spawnAndAwaitReady(cmd) {
         return new Promise((resolve, reject) => {
+          let settled = false;
+          const settle = (fn, val) => {
+            if (settled) {
+              return;
+            }
+            settled = true;
+            fn(val);
+          };
+          try {
+            this.process = spawn3(cmd[0], cmd.slice(1), {
+              env: process.env
+            });
+          } catch (syncErr) {
+            settle(reject, syncErr);
+            return;
+          }
           const cliOut = {};
           this.process.stdout.on("data", (data) => {
             const lines = data.toString().trim().split("\n");
@@ -9220,8 +9463,7 @@ var init_cli = __esm({
               }
               if (line.toLowerCase().includes("ready")) {
                 this.loadCliParams(cliOut);
-                PerformanceTester.end(EVENTS.SDK_CLI_START);
-                resolve();
+                settle(resolve);
                 return;
               }
             }
@@ -9230,14 +9472,11 @@ var init_cli = __esm({
             this.logger.error(`CLI stderr: ${data.toString().trim()}`);
           });
           this.process.on("error", (err) => {
-            cliOut.error = `Error in start: ${err.message}`;
-            PerformanceTester.end(EVENTS.SDK_CLI_START, false, err);
-            reject(new Error(`Failed to start CLI process: ${err.message}`));
+            settle(reject, err);
           });
           this.process.on("close", (code) => {
-            if (code !== 0) {
-              reject(new Error(`CLI process exited with code ${code}`));
-            }
+            const msg = code !== 0 ? `CLI process exited with code ${code}` : "CLI process exited cleanly before emitting ready";
+            settle(reject, new Error(msg));
           });
         });
       }
@@ -9317,7 +9556,9 @@ var init_cli = __esm({
           this.logger.info(`Starting as child process with session ID: ${binSessionId}`);
           GrpcClient.getInstance().connect();
           const response = await GrpcClient.getInstance().connectBinSession();
-          this.logger.info(`Connected to bin session: ${JSON.stringify(response)}`);
+          const redactedResponse = JSON.parse(JSON.stringify(response));
+          CrashReporter.recursivelyRedactKeysFromObject(redactedResponse, ["user", "username", "key", "accesskey", "password"]);
+          this.logger.info(`Connected to bin session: ${JSON.stringify(redactedResponse)}`);
           this.loadModules(response);
           this.isChildConnected = true;
           PerformanceTester.end(EVENTS.SDK_CONNECT_BIN_SESSION);
@@ -9385,7 +9626,9 @@ var init_cli = __esm({
       setConfig(response) {
         try {
           this.config = JSON.parse(response.config);
-          this.logger.debug(`loadModules: config=${JSON.stringify(this.config)}`);
+          const redactedConfig = JSON.parse(response.config);
+          CrashReporter.recursivelyRedactKeysFromObject(redactedConfig, ["user", "username", "key", "accesskey", "password"]);
+          this.logger.debug(`loadModules: config=${JSON.stringify(redactedConfig)}`);
         } catch (error) {
           this.logger.error(`setConfig: error=${util10.format(error)}`);
         }
@@ -10644,7 +10887,7 @@ var BrowserStackConfig = class _BrowserStackConfig {
     this.accessKey = config.key;
     this.testObservability = new testOpsConfig_default(options.testObservability !== false, !isUndefined(options.testObservability));
     this.percy = options.percy || false;
-    this.accessibility = options.accessibility !== void 0 ? options.accessibility : null;
+    this.accessibility = options.accessibility;
     this.app = options.app;
     this.appAutomate = !isUndefined(options.app);
     this.automate = !this.appAutomate;
@@ -11215,7 +11458,7 @@ var BrowserstackLauncherService = class {
     BStackLogger2.debug(`_options data: ${JSON.stringify(_options)}`);
     BStackLogger2.debug(`webdriver capabilities data: ${JSON.stringify(capabilities)}`);
     const configCopy = JSON.parse(JSON.stringify(_config));
-    CrashReporter.recursivelyRedactKeysFromObject(configCopy, ["user", "key", "accesskey", "password"]);
+    CrashReporter.recursivelyRedactKeysFromObject(configCopy, ["user", "username", "key", "accesskey", "password"]);
     BStackLogger2.debug(`_config data: ${JSON.stringify(configCopy)}`);
     if (Array.isArray(capabilities)) {
       capabilities.flatMap((c) => {
@@ -11311,7 +11554,7 @@ var BrowserstackLauncherService = class {
   _projectName;
   _buildTag;
   _buildIdentifier;
-  _accessibilityAutomation = null;
+  _accessibilityAutomation;
   _percy;
   _percyBestPlatformCaps;
   browserStackConfig;
@@ -11451,7 +11694,7 @@ var BrowserstackLauncherService = class {
       this._updateObjectTypeCaps(capabilities, "goog:chromeOptions", overrideOptions);
     }
     if (buildStartResponse?.accessibility) {
-      if (this._accessibilityAutomation === null) {
+      if (isUndefined(this._accessibilityAutomation)) {
         this.browserStackConfig.accessibility = buildStartResponse.accessibility.success;
         this._accessibilityAutomation = buildStartResponse.accessibility.success;
         this._options.accessibility = buildStartResponse.accessibility.success;
@@ -11472,6 +11715,7 @@ var BrowserstackLauncherService = class {
     } else if (isAccessibilityAutomationSession(this._accessibilityAutomation)) {
       this._updateObjectTypeCaps(capabilities, "accessibilityOptions", {});
     }
+    this._removeCliOnlyCapabilityOptions(capabilities);
     if (shouldSetupPercy) {
       try {
         const bestPlatformPercyCaps = getBestPlatformForPercySnapshot(capabilities);
@@ -11749,13 +11993,40 @@ Visit https://automation.browserstack.com/builds/${process.env[BROWSERSTACK_TEST
   }
   async _uploadServiceLogs() {
     const clientBuildUuid = this._getClientBuildUuid();
-    await PerformanceTester.measureWrapper(EVENTS.SDK_UPLOAD_LOGS, async () => {
-      const response = await uploadLogs(getBrowserStackUser(this._config), getBrowserStackKey(this._config), clientBuildUuid);
-      if (response) {
-        BStackLogger2.info(`Upload response: ${JSON.stringify(response, null, 2)}`);
-        BStackLogger2.logToFile(`Response - ${format4(response)}`, "debug");
+    const response = await uploadLogs(getBrowserStackUser(this._config), getBrowserStackKey(this._config), clientBuildUuid);
+    if (response) {
+      BStackLogger2.info(`Upload response: ${JSON.stringify(response, null, 2)}`);
+      BStackLogger2.logToFile(`Response - ${format4(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((c2) => typeof c2 === "object" && c2.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 {
@@ -12546,11 +12817,20 @@ var BrowserstackService = class {
           PerformanceTester.end(EVENTS.SDK_FIND_NEAREST_HUB, false, "Hub URL not found");
         }
       }
-      if (BrowserstackCLI.getInstance().isRunning()) {
-        await BrowserstackCLI.getInstance().getAutomationFramework().trackEvent(AutomationFrameworkState.CREATE, HookState.PRE, { caps: capabilities });
-        const instance = AutomationFramework.getTrackedInstance();
-        const caps = AutomationFramework.getState(instance, AutomationFrameworkConstants.KEY_CAPABILITIES);
-        Object.assign(capabilities, caps);
+      try {
+        if (BrowserstackCLI.getInstance().isRunning()) {
+          await BrowserstackCLI.getInstance().getAutomationFramework().trackEvent(AutomationFrameworkState.CREATE, HookState.PRE, { caps: capabilities });
+          const instance = AutomationFramework.getTrackedInstance();
+          const caps = AutomationFramework.getState(instance, AutomationFrameworkConstants.KEY_CAPABILITIES);
+          Object.assign(capabilities, caps);
+          const bstackOptions = capabilities["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 capabilities[`browserstack.${key}`]);
+        }
+      } catch (err) {
+        BStackLogger2.error(`Error while tracking automation framework event: ${err}`);
       }
     } catch (err) {
       BStackLogger2.error(`Error while connecting to Browserstack CLI: ${err}`);
@@ -12727,8 +13007,8 @@ var BrowserstackService = class {
   }
   async afterTest(test, context, results) {
     this._specsRan = true;
-    const { error, passed } = results;
-    if (!passed) {
+    const { error, passed, skipped } = results;
+    if (!passed && !skipped) {
       const testError = error && error.message || "Unknown Error";
       this._failReasons.push(testError);
       this._pureTestFailReasons.push(testError);