@lambdatest/smartui-cli 4.1.31 → 4.1.32

package/dist/index.cjs

@@ -11,7 +11,7 @@ var fs5 = require('fs');
 var Ajv = require('ajv');
 var addErrors = require('ajv-errors');
 var test = require('@playwright/test');
-var util = require('util');
+var util$1 = require('util');
 var winston = require('winston');
 var stringify = require('json-stringify-safe');
 var FormData = require('form-data');
@@ -751,6 +751,11 @@ var ConfigSchema = {
         logFile: {
           type: "string",
           errorMessage: "Invalid config; logFile should be a string value"
+        },
+        environment: {
+          type: "string",
+          enum: ["stage", "prod"],
+          errorMessage: "Invalid config; environment should be a string value either stage or prod"
         }
       },
       required: ["type"],
@@ -787,6 +792,18 @@ var ConfigSchema = {
     loadDomContent: {
       type: "boolean",
       errorMessage: "Invalid config; loadDomContent must be true/false"
+    },
+    approvalThreshold: {
+      type: "number",
+      minimum: 0,
+      maximum: 100,
+      errorMessage: "Invalid config; approvalThreshold must be a number"
+    },
+    rejectionThreshold: {
+      type: "number",
+      minimum: 0,
+      maximum: 100,
+      errorMessage: "Invalid config; rejectionThreshold must be a number"
     }
   },
   anyOf: [
@@ -1048,6 +1065,18 @@ var SnapshotSchema = {
         useExtendedViewport: {
           type: "boolean",
           errorMessage: "Invalid snapshot options; useExtendedViewport must be a boolean"
+        },
+        approvalThreshold: {
+          type: "number",
+          minimum: 0,
+          maximum: 100,
+          errorMessage: "Invalid snapshot options; approvalThreshold must be a number between 0 and 100"
+        },
+        rejectionThreshold: {
+          type: "number",
+          minimum: 0,
+          maximum: 100,
+          errorMessage: "Invalid snapshot options; rejectionThreshold must be a number between 0 and 100"
         }
       },
       additionalProperties: false
@@ -1335,8 +1364,9 @@ var validateConfigForScheduled = (config) => {
   return true;
 };
 validateConfigForScheduled.errors = null;
+var util = __require("util");
 var lambdaTunnel = __require("@lambdatest/node-tunnel");
-util.promisify(setTimeout);
+util$1.promisify(setTimeout);
 var tunnelInstance;
 function delDir(dir) {
   if (fs5__default.default.existsSync(dir)) {
@@ -1526,9 +1556,9 @@ function startPolling(ctx, build_id, baseline, projectToken) {
       try {
         let resp;
         if (build_id) {
-          resp = yield ctx.client.getScreenshotData(build_id, baseline, ctx.log, projectToken);
+          resp = yield ctx.client.getScreenshotData(build_id, baseline, ctx.log, projectToken, "");
         } else if (ctx.build && ctx.build.id) {
-          resp = yield ctx.client.getScreenshotData(ctx.build.id, ctx.build.baseline, ctx.log, "");
+          resp = yield ctx.client.getScreenshotData(ctx.build.id, ctx.build.baseline, ctx.log, "", "");
         } else {
           return;
         }
@@ -1600,11 +1630,12 @@ function startPingPolling(ctx) {
     } catch (error) {
       ctx.log.error(`Error during initial ping: ${error.message}`);
     }
+    let sourceCommand = ctx.sourceCommand ? ctx.sourceCommand : "";
     pingIntervalId = setInterval(() => __async(this, null, function* () {
       try {
-        ctx.log.debug("Sending ping to server...");
+        ctx.log.debug("Sending ping to server... " + sourceCommand);
         yield ctx.client.ping(ctx.build.id, ctx.log);
-        ctx.log.debug("Ping sent successfully.");
+        ctx.log.debug("Ping sent successfully. " + sourceCommand);
       } catch (error) {
         ctx.log.error(`Error during ping polling: ${error.message}`);
       }
@@ -1654,6 +1685,9 @@ function startTunnelBinary(ctx) {
       tunnelArguments.tunnelName = randomTunnelName;
       ctx.config.tunnel.tunnelName = randomTunnelName;
     }
+    if (tunnelConfig == null ? void 0 : tunnelConfig.environment) {
+      tunnelArguments.environment = tunnelConfig.environment;
+    }
     ctx.log.debug(`tunnel config ${JSON.stringify(tunnelArguments)}`);
     if (((_a = ctx.config.tunnel) == null ? void 0 : _a.type) === "auto") {
       tunnelInstance = new lambdaTunnel();
@@ -1664,50 +1698,59 @@ function startTunnelBinary(ctx) {
     }
   });
 }
-function startPollingForTunnel(ctx, build_id, baseline, projectToken) {
+var isTunnelPolling = null;
+function startPollingForTunnel(ctx, build_id, baseline, projectToken, buildName) {
   return __async(this, null, function* () {
+    if (isTunnelPolling) {
+      ctx.log.debug("Tunnel polling is already active. Skipping for build_id: " + build_id);
+      return;
+    }
     const intervalId = setInterval(() => __async(this, null, function* () {
       try {
         let resp;
-        if (build_id) ; else if (ctx.build && ctx.build.id) {
-          resp = yield ctx.client.getScreenshotData(ctx.build.id, ctx.build.baseline, ctx.log, "");
+        if (build_id) {
+          resp = yield ctx.client.getScreenshotData(build_id, baseline, ctx.log, projectToken, buildName);
+        } else if (ctx.build && ctx.build.id) {
+          resp = yield ctx.client.getScreenshotData(ctx.build.id, ctx.build.baseline, ctx.log, "", "");
         } else {
+          ctx.log.debug("No build information available for polling tunnel status.");
+          clearInterval(intervalId);
+          yield stopTunnelHelper(ctx);
           return;
         }
+        ctx.log.debug(" resp from polling for tunnel status: " + JSON.stringify(resp));
         if (!resp.build) {
           ctx.log.info("Error: Build data is null.");
           clearInterval(intervalId);
-          const tunnelRunningStatus = yield tunnelInstance.isRunning();
-          ctx.log.debug("Running status of tunnel before stopping ? " + tunnelRunningStatus);
-          const status = yield tunnelInstance.stop();
-          ctx.log.debug("Tunnel is Stopped ? " + status);
+          yield stopTunnelHelper(ctx);
           return;
         }
         if (resp.build.build_status_ind === constants_default.BUILD_COMPLETE || resp.build.build_status_ind === constants_default.BUILD_ERROR) {
           clearInterval(intervalId);
-          const tunnelRunningStatus = yield tunnelInstance.isRunning();
-          ctx.log.debug("Running status of tunnel before stopping ? " + tunnelRunningStatus);
-          const status = yield tunnelInstance.stop();
-          ctx.log.debug("Tunnel is Stopped ? " + status);
+          yield stopTunnelHelper(ctx);
+          return;
         }
       } catch (error) {
-        if (error.message.includes("ENOTFOUND")) {
+        if (error == null ? void 0 : error.message.includes("ENOTFOUND")) {
           ctx.log.error("Error: Network error occurred while fetching build status while polling. Please check your connection and try again.");
           clearInterval(intervalId);
         } else {
-          ctx.log.error(`Error fetching build status while polling: ${error.message}`);
+          ctx.log.debug(util.inspect(error, { showHidden: false, depth: null }));
+          ctx.log.error(`Error fetching build status while polling: ${JSON.stringify(error)}`);
         }
         clearInterval(intervalId);
       }
     }), 5e3);
+    isTunnelPolling = intervalId;
   });
 }
 function stopTunnelHelper(ctx) {
   return __async(this, null, function* () {
+    ctx.log.debug("stop-tunnel:: Stopping the tunnel now");
     const tunnelRunningStatus = yield tunnelInstance.isRunning();
-    ctx.log.debug("Running status of tunnel before stopping ? " + tunnelRunningStatus);
+    ctx.log.debug("stop-tunnel:: Running status of tunnel before stopping ? " + tunnelRunningStatus);
     const status = yield tunnelInstance.stop();
-    ctx.log.debug("Tunnel is Stopped ? " + status);
+    ctx.log.debug("stop-tunnel:: Tunnel is Stopped ? " + status);
   });
 }
 function calculateVariantCount(config) {
@@ -1936,23 +1979,28 @@ var server_default = (ctx) => __async(void 0, null, function* () {
     reply.code(200).send({ data: { dom: SMARTUI_DOM } });
   });
   server.post("/snapshot", opts, (request, reply) => __async(void 0, null, function* () {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
     let replyCode;
     let replyBody;
     try {
       let { snapshot, testType } = request.body;
       if (!validateSnapshot(snapshot))
         throw new Error(validateSnapshot.errors[0].message);
-      const sessionId = (_a = snapshot == null ? void 0 : snapshot.options) == null ? void 0 : _a.sessionId;
+      if (((_a = snapshot == null ? void 0 : snapshot.options) == null ? void 0 : _a.approvalThreshold) !== void 0 && ((_b = snapshot == null ? void 0 : snapshot.options) == null ? void 0 : _b.rejectionThreshold) !== void 0) {
+        if (((_c = snapshot == null ? void 0 : snapshot.options) == null ? void 0 : _c.rejectionThreshold) <= ((_d = snapshot == null ? void 0 : snapshot.options) == null ? void 0 : _d.approvalThreshold)) {
+          throw new Error(`Invalid snapshot options; rejectionThreshold (${snapshot.options.rejectionThreshold}) must be greater than approvalThreshold (${snapshot.options.approvalThreshold})`);
+        }
+      }
+      const sessionId = (_e = snapshot == null ? void 0 : snapshot.options) == null ? void 0 : _e.sessionId;
       let capsBuildId = "";
-      const contextId = (_b = snapshot == null ? void 0 : snapshot.options) == null ? void 0 : _b.contextId;
+      const contextId = (_f = snapshot == null ? void 0 : snapshot.options) == null ? void 0 : _f.contextId;
       if (sessionId) {
-        if ((_c = ctx.sessionCapabilitiesMap) == null ? void 0 : _c.has(sessionId)) {
+        if ((_g = ctx.sessionCapabilitiesMap) == null ? void 0 : _g.has(sessionId)) {
           const cachedCapabilities = ctx.sessionCapabilitiesMap.get(sessionId);
           capsBuildId = (cachedCapabilities == null ? void 0 : cachedCapabilities.buildId) || "";
         } else {
           try {
-            let fetchedCapabilitiesResp = yield ctx.client.getSmartUICapabilities(sessionId, ctx.config, ctx.git, ctx.log);
+            let fetchedCapabilitiesResp = yield ctx.client.getSmartUICapabilities(sessionId, ctx.config, ctx.git, ctx.log, ctx.isStartExec);
             capsBuildId = (fetchedCapabilitiesResp == null ? void 0 : fetchedCapabilitiesResp.buildId) || "";
             ctx.log.debug(`fetch caps for sessionId: ${sessionId} are ${JSON.stringify(fetchedCapabilitiesResp)}`);
             if (capsBuildId) {
@@ -1978,9 +2026,9 @@ var server_default = (ctx) => __async(void 0, null, function* () {
         ctx.log.debug(`Marking contextId as captured and added to queue: ${contextId}`);
       }
       if (contextId) {
-        (_d = ctx.snapshotQueue) == null ? void 0 : _d.enqueueFront(snapshot);
+        (_h = ctx.snapshotQueue) == null ? void 0 : _h.enqueueFront(snapshot);
       } else {
-        (_e = ctx.snapshotQueue) == null ? void 0 : _e.enqueue(snapshot);
+        (_i = ctx.snapshotQueue) == null ? void 0 : _i.enqueue(snapshot);
       }
       ctx.isSnapshotCaptured = true;
       replyCode = 200;
@@ -1993,10 +2041,11 @@ var server_default = (ctx) => __async(void 0, null, function* () {
     return reply.code(replyCode).send(replyBody);
   }));
   server.post("/stop", opts, (_, reply) => __async(void 0, null, function* () {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     let replyCode;
     let replyBody;
     try {
+      ctx.log.info("Received stop command. Finalizing build ...");
       if (ctx.config.delayedUpload) {
         ctx.log.debug("started after processing because of delayedUpload");
         (_a = ctx.snapshotQueue) == null ? void 0 : _a.startProcessingfunc();
@@ -2010,6 +2059,8 @@ var server_default = (ctx) => __async(void 0, null, function* () {
           }
         }, 1e3);
       });
+      let buildUrls = `build url: ${ctx.build.url}
+`;
       for (const [sessionId, capabilities] of ctx.sessionCapabilitiesMap.entries()) {
         try {
           const buildId = (capabilities == null ? void 0 : capabilities.buildId) || "";
@@ -2017,8 +2068,12 @@ var server_default = (ctx) => __async(void 0, null, function* () {
           const totalSnapshots = (capabilities == null ? void 0 : capabilities.snapshotCount) || 0;
           const sessionBuildUrl = (capabilities == null ? void 0 : capabilities.buildURL) || "";
           const testId = (capabilities == null ? void 0 : capabilities.id) || "";
+          ctx.log.debug(`Capabilities for sessionId ${sessionId}: ${JSON.stringify(capabilities)}`);
           if (buildId && projectToken) {
             yield ctx.client.finalizeBuildForCapsWithToken(buildId, totalSnapshots, projectToken, ctx.log);
+            if (ctx.autoTunnelStarted) {
+              yield startPollingForTunnel(ctx, buildId, false, projectToken, capabilities == null ? void 0 : capabilities.buildName);
+            }
           }
           if (testId && buildId) {
             buildUrls += `TestId ${testId}: ${sessionBuildUrl}
@@ -2039,7 +2094,13 @@ var server_default = (ctx) => __async(void 0, null, function* () {
           ctx.log.debug(`Skipping upload of CLI logs as useLambdaInternal is set`);
         }
       }
-      yield (_c = ctx.browser) == null ? void 0 : _c.close();
+      if (ctx.tunnelDetails && ctx.tunnelDetails.tunnelHost != "" && ((_c = ctx.build) == null ? void 0 : _c.id)) {
+        yield startPollingForTunnel(ctx, ctx.build.id, false, "", "");
+      }
+      if (ctx.autoTunnelStarted && isTunnelPolling === null) {
+        yield stopTunnelHelper(ctx);
+      }
+      yield (_d = ctx.browser) == null ? void 0 : _d.close();
       if (ctx.server) {
         ctx.server.close();
       }
@@ -2055,6 +2116,7 @@ var server_default = (ctx) => __async(void 0, null, function* () {
       replyCode = 500;
       replyBody = { error: { message: error.message } };
     }
+    ctx.log.info("Stop command processed. Tearing down server.");
     return reply.code(replyCode).send(replyBody);
   }));
   server.get("/ping", opts, (_, reply) => {
@@ -2295,7 +2357,7 @@ var authExec_default = (ctx) => {
 };
 
 // package.json
-var version = "4.1.31";
+var version = "4.1.32";
 var package_default = {
   name: "@lambdatest/smartui-cli",
   version,
@@ -2347,6 +2409,9 @@ var package_default = {
     which: "^4.0.0",
     winston: "^3.10.0"
   },
+  overrides: {
+    "simple-swizzle": "0.2.2"
+  },
   devDependencies: {
     typescript: "^5.3.2"
   }
@@ -2406,8 +2471,9 @@ var httpClient = class {
     this.axiosInstance.interceptors.response.use(
       (response) => response,
       (error) => __async(this, null, function* () {
+        var _a;
         const { config } = error;
-        if (config && config.url === "/screenshot" && config.method === "post") {
+        if (config && config.url === "/screenshot" && config.method === "post" && ((_a = error == null ? void 0 : error.response) == null ? void 0 : _a.status) !== 401) {
           if (!config.retryCount) {
             config.retryCount = 0;
             config.retry = 2;
@@ -2566,11 +2632,12 @@ var httpClient = class {
       }
     }, log2);
   }
-  getScreenshotData(buildId, baseline, log2, projectToken) {
+  getScreenshotData(buildId, baseline, log2, projectToken, buildName) {
+    log2.debug(`Fetching screenshot data for buildId: ${buildId}  having  buildName: ${buildName} with baseline: ${baseline}`);
     return this.request({
       url: "/screenshot",
       method: "GET",
-      params: { buildId, baseline },
+      params: { buildId, baseline, buildName },
       headers: { projectToken }
     }, log2);
   }
@@ -2600,7 +2667,7 @@ var httpClient = class {
       }
     }, log2);
   }
-  getSmartUICapabilities(sessionId, config, git, log2) {
+  getSmartUICapabilities(sessionId, config, git, log2, isStartExec) {
     return this.request({
       url: "/sessions/capabilities",
       method: "GET",
@@ -2609,7 +2676,8 @@ var httpClient = class {
       },
       data: {
         git,
-        config
+        config,
+        isStartExec
       },
       headers: {
         projectToken: "",
@@ -2658,24 +2726,31 @@ var httpClient = class {
       }
     }, ctx.log);
   }
-  processSnapshot(ctx, snapshot, snapshotUuid, discoveryErrors, variantCount, sync = false) {
+  processSnapshot(ctx, snapshot, snapshotUuid, discoveryErrors, variantCount, sync = false, approvalThreshold, rejectionThreshold) {
+    const requestData = {
+      name: snapshot.name,
+      url: snapshot.url,
+      snapshotUuid,
+      variantCount,
+      test: {
+        type: ctx.testType,
+        source: "cli"
+      },
+      discoveryErrors,
+      doRemoteDiscovery: snapshot.options.doRemoteDiscovery,
+      sync
+    };
+    if (approvalThreshold !== void 0) {
+      requestData.approvalThreshold = approvalThreshold;
+    }
+    if (rejectionThreshold !== void 0) {
+      requestData.rejectionThreshold = rejectionThreshold;
+    }
     return this.request({
       url: `/build/${ctx.build.id}/snapshot`,
       method: "POST",
       headers: { "Content-Type": "application/json" },
-      data: {
-        name: snapshot.name,
-        url: snapshot.url,
-        snapshotUuid,
-        variantCount,
-        test: {
-          type: ctx.testType,
-          source: "cli"
-        },
-        doRemoteDiscovery: snapshot.options.doRemoteDiscovery,
-        discoveryErrors,
-        sync
-      }
+      data: requestData
     }, ctx.log);
   }
   processSnapshotCaps(ctx, snapshot, snapshotUuid, capsBuildId, capsProjectToken, discoveryErrors) {
@@ -3032,6 +3107,11 @@ var ctx_default = (options) => {
         config.web.viewports = config.web.resolutions;
         delete config.web.resolutions;
       }
+      if (config.approvalThreshold && config.rejectionThreshold) {
+        if (config.rejectionThreshold <= config.approvalThreshold) {
+          throw new Error("Invalid config; rejectionThreshold must be greater than approvalThreshold");
+        }
+      }
       let validateConfigFn = options.scheduled ? validateConfigForScheduled : validateConfig;
       if (!validateConfigFn(config)) {
         throw new Error(validateConfigFn.errors[0].message);
@@ -3128,7 +3208,9 @@ var ctx_default = (options) => {
       allowDuplicateSnapshotNames,
       useLambdaInternal,
       useExtendedViewport,
-      loadDomContent
+      loadDomContent,
+      approvalThreshold: config.approvalThreshold,
+      rejectionThreshold: config.rejectionThreshold
     },
     uploadFilePath: "",
     webStaticConfig: [],
@@ -3304,7 +3386,6 @@ var createBuildExec_default = (ctx) => {
   return {
     title: `Creating SmartUI build`,
     task: (ctx2, task) => __async(void 0, null, function* () {
-      var _a, _b, _c;
       updateLogContext({ task: "createBuild" });
       try {
         if (ctx2.authenticatedInitially && !ctx2.config.skipBuildCreation) {
@@ -3332,17 +3413,17 @@ var createBuildExec_default = (ctx) => {
           }
           task.output = chalk__default.default.gray(`build id: ${resp.data.buildId}`);
           task.title = "SmartUI build created";
+          if (ctx2.env.USE_REMOTE_DISCOVERY) {
+            task.output += chalk__default.default.gray(`
+ Using remote discovery for this build`);
+          }
         } else {
           task.output = chalk__default.default.gray(`Empty PROJECT_TOKEN and PROJECT_NAME. Skipping Creation of Build!`);
           task.title = "Skipped SmartUI build creation";
-          if (ctx2.config.tunnel && ((_a = ctx2.config.tunnel) == null ? void 0 : _a.type) === "auto") {
-            yield stopTunnelHelper(ctx2);
-          }
         }
-        if (ctx2.config.tunnel && ((_b = ctx2.config.tunnel) == null ? void 0 : _b.type) === "auto") {
-          startPingPolling(ctx2);
-          if (ctx2.build && ctx2.build.id) {
-            startPollingForTunnel(ctx2, "", false, "");
+        if (ctx2.autoTunnelStarted) {
+          if (ctx2.build && ctx2.build.id && ctx2.sourceCommand != "exec-start") {
+            startPingPolling(ctx2);
           }
         }
         if (ctx2.config.tunnel) {
@@ -3355,6 +3436,13 @@ var createBuildExec_default = (ctx) => {
               tunnelName: tunnelResp.data.tunnel_name
             };
             ctx2.log.debug(`Tunnel Details: ${JSON.stringify(ctx2.tunnelDetails)}`);
+            if (process.env.USE_REMOTE_DISCOVERY === void 0) {
+              ctx2.env.USE_REMOTE_DISCOVERY = true;
+              process.env.USE_REMOTE_DISCOVERY = "true";
+              task.output += chalk__default.default.gray(`
+ Using remote discovery by default for this build`);
+            }
+            ctx2.log.debug(`USE_REMOTE_DISCOVERY is set to ${ctx2.env.USE_REMOTE_DISCOVERY}`);
           } else if (tunnelResp && tunnelResp.error) {
             if (tunnelResp.error.message) {
               if (tunnelResp.error.code && tunnelResp.error.code === 400) {
@@ -3367,7 +3455,7 @@ var createBuildExec_default = (ctx) => {
         }
       } catch (error) {
         ctx2.log.debug(error);
-        if (ctx2.config.tunnel && ((_c = ctx2.config.tunnel) == null ? void 0 : _c.type) === "auto") {
+        if (ctx2.autoTunnelStarted) {
           yield stopTunnelHelper(ctx2);
         }
         task.output = chalk__default.default.gray(error.message);
@@ -3425,7 +3513,7 @@ var processSnapshot_default = (ctx) => {
   return {
     title: `Processing snapshots`,
     task: (ctx2, task) => __async(void 0, null, function* () {
-      var _a, _b;
+      var _a, _b, _c, _d;
       try {
         if (ctx2.config.delayedUpload) {
           ctx2.log.debug("started after processing because of delayedUpload");
@@ -3434,12 +3522,12 @@ var processSnapshot_default = (ctx) => {
         yield new Promise((resolve) => {
           let output2 = "";
           const intervalId = setInterval(() => {
-            var _a2, _b2, _c;
+            var _a2, _b2, _c2;
             if (((_a2 = ctx2.snapshotQueue) == null ? void 0 : _a2.isEmpty()) && !((_b2 = ctx2.snapshotQueue) == null ? void 0 : _b2.isProcessing())) {
               clearInterval(intervalId);
               resolve();
             } else {
-              task.title = `Processing snapshot ${(_c = ctx2.snapshotQueue) == null ? void 0 : _c.getProcessingSnapshot()}`;
+              task.title = `Processing snapshot ${(_c2 = ctx2.snapshotQueue) == null ? void 0 : _c2.getProcessingSnapshot()}`;
             }
           }, 500);
         });
@@ -3457,6 +3545,9 @@ ${snapshot.warnings.length ? chalk__default.default.gray(`[warning] ${snapshot.w
         }
         task.output = output;
         task.title = "Processed snapshots";
+        if (((_d = (_c = ctx2.snapshotQueue) == null ? void 0 : _c.getProcessedSnapshots()) == null ? void 0 : _d.length) === 0) {
+          task.title = "No snapshots processed";
+        }
       } catch (error) {
         ctx2.log.debug(error);
         task.output = chalk__default.default.gray(error.message);
@@ -3472,7 +3563,7 @@ var finalizeBuild_default = (ctx) => {
   return {
     title: `Finalizing build`,
     task: (ctx2, task) => __async(void 0, null, function* () {
-      var _a, _b;
+      var _a, _b, _c;
       updateLogContext({ task: "finalizeBuild" });
       try {
         if (ctx2.build.id) {
@@ -3486,11 +3577,11 @@ var finalizeBuild_default = (ctx) => {
         task.output = chalk__default.default.gray(error.message);
         throw new Error("Finalize build failed");
       }
-      let buildUrls2 = `build url: ${ctx2.build.url}
+      let buildUrls = `build url: ${ctx2.build.url}
 `;
       if (pingIntervalId !== null) {
         clearInterval(pingIntervalId);
-        ctx2.log.debug("Ping polling stopped immediately.");
+        ctx2.log.debug("Ping polling stopped immediately from Finalize Build");
       }
       for (const [sessionId, capabilities] of ctx2.sessionCapabilitiesMap.entries()) {
         try {
@@ -3512,23 +3603,33 @@ var finalizeBuild_default = (ctx) => {
               ctx2.fetchResultsForBuild.push(buildId);
             }
           }
+          ctx2.log.debug(`Capabilities for sessionId ${sessionId}: ${JSON.stringify(capabilities)}`);
           if (buildId && projectToken) {
             yield ctx2.client.finalizeBuildForCapsWithToken(buildId, totalSnapshots, projectToken, ctx2.log);
+            if (ctx2.autoTunnelStarted) {
+              yield startPollingForTunnel(ctx2, buildId, false, projectToken, capabilities == null ? void 0 : capabilities.buildName);
+            }
           }
           if (testId && buildId) {
-            buildUrls2 += `TestId ${testId}: ${sessionBuildUrl}
+            buildUrls += `TestId ${testId}: ${sessionBuildUrl}
 `;
           }
         } catch (error) {
           ctx2.log.debug(`Error finalizing build for session ${sessionId}: ${error.message}`);
         }
       }
-      task.output = chalk__default.default.gray(buildUrls2);
+      task.output = chalk__default.default.gray(buildUrls);
       task.title = "Finalized build";
+      if (ctx2.tunnelDetails && ctx2.tunnelDetails.tunnelHost != "" && ((_a = ctx2.build) == null ? void 0 : _a.id)) {
+        yield startPollingForTunnel(ctx2, ctx2.build.id, false, "", "");
+      }
+      if (ctx2.autoTunnelStarted && isTunnelPolling === null) {
+        yield stopTunnelHelper(ctx2);
+      }
       try {
-        yield (_a = ctx2.browser) == null ? void 0 : _a.close();
+        yield (_b = ctx2.browser) == null ? void 0 : _b.close();
         ctx2.log.debug(`Closed browser`);
-        yield (_b = ctx2.server) == null ? void 0 : _b.close();
+        yield (_c = ctx2.server) == null ? void 0 : _c.close();
         ctx2.log.debug(`Closed server`);
         if (ctx2.isSnapshotCaptured) {
           let uploadCLILogsToS3 = ctx2.config.useLambdaInternal || uploadDomToS3ViaEnv2;
@@ -4488,7 +4589,7 @@ var Queue = class {
   }
   processNext() {
     return __async(this, null, function* () {
-      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
+      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o;
       if (!this.isEmpty()) {
         let snapshot;
         if (this.ctx.config.delayedUpload) {
@@ -4577,7 +4678,7 @@ var Queue = class {
                     useKafkaFlow: resp.data.useKafkaFlow || false
                   };
                 } else {
-                  if (this.ctx.config.tunnel && ((_d = this.ctx.config.tunnel) == null ? void 0 : _d.type) === "auto") {
+                  if (this.ctx.autoTunnelStarted) {
                     yield stopTunnelHelper(this.ctx);
                   }
                   throw new Error("SmartUI capabilities are missing in env variables or in driver capabilities");
@@ -4591,7 +4692,7 @@ var Queue = class {
               if (this.ctx.build && this.ctx.build.useKafkaFlow) {
                 let snapshotUuid = uuid.v4();
                 let snapshotUploadResponse;
-                if (((_e = snapshot == null ? void 0 : snapshot.options) == null ? void 0 : _e.contextId) && ((_f = this.ctx.contextToSnapshotMap) == null ? void 0 : _f.has(snapshot.options.contextId))) {
+                if (((_d = snapshot == null ? void 0 : snapshot.options) == null ? void 0 : _d.contextId) && ((_e = this.ctx.contextToSnapshotMap) == null ? void 0 : _e.has(snapshot.options.contextId))) {
                   snapshotUuid = snapshot.options.contextId;
                 }
                 let uploadDomToS3 = this.ctx.config.useLambdaInternal || uploadDomToS3ViaEnv3;
@@ -4617,16 +4718,18 @@ var Queue = class {
                       this.ctx.log.debug(`Closed browser context for snapshot ${snapshot.name}`);
                     }
                   }
-                  if ((_g = snapshot == null ? void 0 : snapshot.options) == null ? void 0 : _g.contextId) {
-                    (_i = this.ctx.contextToSnapshotMap) == null ? void 0 : _i.set((_h = snapshot == null ? void 0 : snapshot.options) == null ? void 0 : _h.contextId, 2);
+                  if ((_f = snapshot == null ? void 0 : snapshot.options) == null ? void 0 : _f.contextId) {
+                    (_h = this.ctx.contextToSnapshotMap) == null ? void 0 : _h.set((_g = snapshot == null ? void 0 : snapshot.options) == null ? void 0 : _g.contextId, 2);
                   }
                   this.processNext();
                 } else {
-                  yield this.ctx.client.processSnapshot(this.ctx, processedSnapshot, snapshotUuid, discoveryErrors, calculateVariantCountFromSnapshot(processedSnapshot, this.ctx.config), (_j = snapshot == null ? void 0 : snapshot.options) == null ? void 0 : _j.sync);
-                  if (((_k = snapshot == null ? void 0 : snapshot.options) == null ? void 0 : _k.contextId) && ((_l = this.ctx.contextToSnapshotMap) == null ? void 0 : _l.has(snapshot.options.contextId))) {
+                  let approvalThreshold = ((_i = snapshot == null ? void 0 : snapshot.options) == null ? void 0 : _i.approvalThreshold) || this.ctx.config.approvalThreshold;
+                  let rejectionThreshold = ((_j = snapshot == null ? void 0 : snapshot.options) == null ? void 0 : _j.rejectionThreshold) || this.ctx.config.rejectionThreshold;
+                  yield this.ctx.client.processSnapshot(this.ctx, processedSnapshot, snapshotUuid, discoveryErrors, calculateVariantCountFromSnapshot(processedSnapshot, this.ctx.config), (_k = snapshot == null ? void 0 : snapshot.options) == null ? void 0 : _k.sync, approvalThreshold, rejectionThreshold);
+                  if (((_l = snapshot == null ? void 0 : snapshot.options) == null ? void 0 : _l.contextId) && ((_m = this.ctx.contextToSnapshotMap) == null ? void 0 : _m.has(snapshot.options.contextId))) {
                     this.ctx.contextToSnapshotMap.set(snapshot.options.contextId, 1);
                   }
-                  this.ctx.log.debug(`ContextId: ${(_m = snapshot == null ? void 0 : snapshot.options) == null ? void 0 : _m.contextId} status set to uploaded`);
+                  this.ctx.log.debug(`ContextId: ${(_n = snapshot == null ? void 0 : snapshot.options) == null ? void 0 : _n.contextId} status set to uploaded`);
                 }
               } else {
                 this.ctx.log.info(`Uploading snapshot to S3`);
@@ -4639,7 +4742,7 @@ var Queue = class {
         } catch (error) {
           this.ctx.log.debug(`snapshot failed; ${error}`);
           this.processedSnapshots.push({ name: snapshot == null ? void 0 : snapshot.name, error: error.message });
-          if (((_n = snapshot == null ? void 0 : snapshot.options) == null ? void 0 : _n.contextId) && this.ctx.contextToSnapshotMap) {
+          if (((_o = snapshot == null ? void 0 : snapshot.options) == null ? void 0 : _o.contextId) && this.ctx.contextToSnapshotMap) {
             this.ctx.contextToSnapshotMap.set(snapshot.options.contextId, 2);
           }
         }
@@ -4680,6 +4783,7 @@ var startTunnel_default = (ctx) => {
       try {
         yield startTunnelBinary(ctx2);
         ctx2.isStartExec = true;
+        ctx2.autoTunnelStarted = true;
         task.title = "Tunnel Started";
         task.output = chalk__default.default.gray("Tunnel started successfully");
       } catch (error) {
@@ -4710,6 +4814,7 @@ command.name("exec").description("Run test commands around SmartUI").argument("<
     ctx.args.execCommand = execCommand;
     ctx.snapshotQueue = new Queue(ctx);
     ctx.totalSnapshots = 0;
+    ctx.sourceCommand = "exec";
     let tasks = new listr2.Listr(
       [
         authExec_default(),
@@ -5526,7 +5631,8 @@ var uploadWebFigma_default = (ctx) => __async(void 0, null, function* () {
       web: webConfig,
       figma: figmaConfig,
       smartIgnore: ctx.config.smartIgnore,
-      git: ctx.git
+      git: ctx.git,
+      markBaseline: ctx.options.markBaseline
     };
     const responseData = yield ctx.client.processWebFigma(requestBody, ctx.log);
     ctx.log.debug("responseData : " + JSON.stringify(responseData));
@@ -5641,7 +5747,8 @@ var uploadAppFigma_default = (ctx) => __async(void 0, null, function* () {
       figma: figmaConfig,
       smartIgnore: ctx.config.smartIgnore,
       git: ctx.git,
-      platformType: "app"
+      platformType: "app",
+      markBaseline: ctx.options.markBaseline
     };
     const responseData = yield ctx.client.processWebFigma(requestBody, ctx.log);
     ctx.log.debug("responseData : " + JSON.stringify(responseData));
@@ -5850,6 +5957,7 @@ uploadAppFigmaCommand.name("upload-figma-app").description("Capture figma screen
 var command4 = new commander.Command();
 command4.name("exec:start").description("Start SmartUI server").option("-P, --port <number>", "Port number for the server").option("--fetch-results [filename]", "Fetch results and optionally specify an output file, e.g., <filename>.json").option("--buildName <string>", "Specify the build name").action(function() {
   return __async(this, null, function* () {
+    var _a;
     const options = command4.optsWithGlobals();
     if (options.buildName === "") {
       console.log(`Error: The '--buildName' option cannot be an empty string.`);
@@ -5859,11 +5967,13 @@ command4.name("exec:start").description("Start SmartUI server").option("-P, --po
     ctx.snapshotQueue = new Queue(ctx);
     ctx.totalSnapshots = 0;
     ctx.isStartExec = true;
+    ctx.sourceCommand = "exec-start";
     let tasks = new listr2.Listr(
       [
         authExec_default(),
         startServer_default(),
         getGitInfo_default(),
+        ...ctx.config.tunnel && ((_a = ctx.config.tunnel) == null ? void 0 : _a.type) === "auto" ? [startTunnel_default()] : [],
         createBuildExec_default()
       ],
       {
@@ -5879,7 +5989,7 @@ command4.name("exec:start").description("Start SmartUI server").option("-P, --po
     );
     try {
       yield tasks.run(ctx);
-      if (ctx.build && ctx.build.id) {
+      if (ctx.build && ctx.build.id && !ctx.autoTunnelStarted) {
         startPingPolling(ctx);
       }
       if (ctx.options.fetchResults && ctx.build && ctx.build.id) {
@@ -5887,6 +5997,7 @@ command4.name("exec:start").description("Start SmartUI server").option("-P, --po
       }
     } catch (error) {
       console.error("Error during server execution:", error);
+      process.exit(1);
     }
   });
 });
@@ -5914,8 +6025,11 @@ command5.name("exec:stop").description("Stop the SmartUI server").action(functio
         console.log(chalk__default.default.red("Failed to stop server"));
       }
     } catch (error) {
-      if (error.code === "ECONNABORTED") {
+      if (error && error.code === "ECONNABORTED") {
         console.error(chalk__default.default.red("Error: SmartUI server did not respond in 15 seconds"));
+      }
+      if (error && error.code === "ECONNREFUSED") {
+        console.error(chalk__default.default.red("Error: Looks like smartui cli server is already stopped"));
       } else {
         console.error(chalk__default.default.red("Error while stopping server"));
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambdatest/smartui-cli",
-  "version": "4.1.31",
+  "version": "4.1.32",
   "description": "A command line interface (CLI) to run SmartUI tests on LambdaTest",
   "files": [
     "dist/**/*"
@@ -43,6 +43,9 @@
     "which": "^4.0.0",
     "winston": "^3.10.0"
   },
+  "overrides": {
+    "simple-swizzle": "0.2.2"
+  },
   "devDependencies": {
     "typescript": "^5.3.2"
   },